From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Date: Fri, 27 Apr 2012 13:24:41 +0000 (+0100)
Subject: tracetool: use Python 2.4-compatible __import__() arguments
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=45d6c787751650ac332447444c192201dfc526af;p=qemu.git

tracetool: use Python 2.4-compatible __import__() arguments

In Python 2.5 keyword arguments were added to __import__().  Avoid using
them to achieve Python 2.4 compatibility.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu>
---

diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index 74fe21b226..49858c9e33 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -204,7 +204,7 @@ def try_import(mod_name, attr_name = None, attr_default = None):
     object or attribute value.
     """
     try:
-        module = __import__(mod_name, fromlist=["__package__"])
+        module = __import__(mod_name, globals(), locals(), ["__package__"])
         if attr_name is None:
             return True, module
         return True, getattr(module, str(attr_name), attr_default)