tracetool: use Python 2.4-compatible __import__() arguments
authorStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Fri, 27 Apr 2012 13:24:41 +0000 (14:24 +0100)
committerStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Tue, 1 May 2012 19:15:28 +0000 (20:15 +0100)
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>
scripts/tracetool/__init__.py

index 74fe21b226ea8f0401b8f433811b4008adc9d1e6..49858c9e33db2a2ad0ceb5f8c27ac5a1792ce31d 100644 (file)
@@ -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)