feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Reduce scope of usage of Python's importlib module

Browse Source 
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 <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-09-17 11:57:30 +02:00
parent 6b89f80e64
commit a7dd2ed4ce
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/debugger/dumper.py
View File

@@ -34,7 +34,6 @@ import sys
import base64 import base64
import re import re
import time import time
import importlib
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
xrange = range xrange = range
@@ -1690,7 +1689,7 @@ class DumperBase:
self.resetCaches() self.resetCaches()
for mod in self.dumpermodules: for mod in self.dumpermodules:
m = importlib.import_module(mod) m = __import__(mod)
dic = m.__dict__ dic = m.__dict__
for name in dic.keys(): for name in dic.keys():
item = dic[name] item = dic[name]
@@ -1708,6 +1707,7 @@ class DumperBase:
for mod in self.dumpermodules: for mod in self.dumpermodules:
m = sys.modules[mod] m = sys.modules[mod]
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
import importlib
importlib.reload(m) importlib.reload(m)
else: else:
reload(m) reload(m)