From a7dd2ed4ce0f88eb548dfc1dbb6eb7c5d5c7fd8d Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 17 Sep 2015 11:57:30 +0200 Subject: [PATCH] Debugger: Reduce scope of usage of Python's importlib module The module doesn't exist in Python 2.6, so we can't use it unconditionally if 2.6 is to be supported again. Task-number: QTCREATORBUG-15076 Change-Id: Ic91cdf451ce846d892cd914bf850a4fd4b18c488 Reviewed-by: Christian Stenger --- share/qtcreator/debugger/dumper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index b7667a5c29e..3d82e743cdb 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -34,7 +34,6 @@ import sys import base64 import re import time -import importlib if sys.version_info[0] >= 3: xrange = range @@ -1690,7 +1689,7 @@ class DumperBase: self.resetCaches() for mod in self.dumpermodules: - m = importlib.import_module(mod) + m = __import__(mod) dic = m.__dict__ for name in dic.keys(): item = dic[name] @@ -1708,6 +1707,7 @@ class DumperBase: for mod in self.dumpermodules: m = sys.modules[mod] if sys.version_info[0] >= 3: + import importlib importlib.reload(m) else: reload(m)