From 44db8e2eabc065ac32a1f4e12a53a482fc0c8122 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Mon, 24 Feb 2020 10:14:27 +0100 Subject: [PATCH] Dumper: replace import * with explicit imports Using imports like from foo import * is considered as bad habit and it reduces static code analysis usability. Change-Id: I56a175f4c7b231e2b8e486bd9d1c65543720f56a Reviewed-by: Christian Stenger --- share/qtcreator/debugger/boosttypes.py | 2 +- share/qtcreator/debugger/cdbbridge.py | 3 ++- share/qtcreator/debugger/creatortypes.py | 2 -- share/qtcreator/debugger/dumper.py | 6 +++--- share/qtcreator/debugger/gdbbridge.py | 2 +- share/qtcreator/debugger/lldbbridge.py | 8 ++++---- share/qtcreator/debugger/misctypes.py | 6 +++--- share/qtcreator/debugger/opencvtypes.py | 4 ++-- share/qtcreator/debugger/personaltypes.py | 2 +- share/qtcreator/debugger/qttypes.py | 2 +- share/qtcreator/debugger/stdtypes.py | 2 +- 11 files changed, 19 insertions(+), 20 deletions(-) diff --git a/share/qtcreator/debugger/boosttypes.py b/share/qtcreator/debugger/boosttypes.py index e61d1e4bb8f..215ccc6922e 100644 --- a/share/qtcreator/debugger/boosttypes.py +++ b/share/qtcreator/debugger/boosttypes.py @@ -23,7 +23,7 @@ # ############################################################################ -from dumper import * +from dumper import Children def qdump__boost__bimaps__bimap(d, value): #leftType = value.type[0] diff --git a/share/qtcreator/debugger/cdbbridge.py b/share/qtcreator/debugger/cdbbridge.py index d31f13e7f17..ad63a19b388 100644 --- a/share/qtcreator/debugger/cdbbridge.py +++ b/share/qtcreator/debugger/cdbbridge.py @@ -28,11 +28,12 @@ import os import sys import cdbext import re +import threading from utils import TypeCode sys.path.insert(1, os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) -from dumper import * +from dumper import DumperBase, SubItem class FakeVoidType(cdbext.Type): def __init__(self, name , dumper): diff --git a/share/qtcreator/debugger/creatortypes.py b/share/qtcreator/debugger/creatortypes.py index 52c2b4a97cf..346b53ae7da 100644 --- a/share/qtcreator/debugger/creatortypes.py +++ b/share/qtcreator/debugger/creatortypes.py @@ -23,8 +23,6 @@ # ############################################################################ -from dumper import * - def typeTarget(type): target = type.target() if target: diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index 6d363685370..6b0416c563d 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -164,11 +164,11 @@ class DumperBase: @staticmethod def showException(msg, exType, exValue, exTraceback): - self.warn('**** CAUGHT EXCEPTION: %s ****' % msg) + DumperBase.warn('**** CAUGHT EXCEPTION: %s ****' % msg) try: import traceback for line in traceback.format_exception(exType, exValue, exTraceback): - self.warn('%s' % line) + DumperBase.warn('%s' % line) except: pass @@ -335,7 +335,7 @@ class DumperBase: # (self.currentIName, self.currentValue, self.currentType)) if not exType is None: if self.passExceptions: - showException('SUBITEM', exType, exValue, exTraceBack) + self.showException('SUBITEM', exType, exValue, exTraceBack) self.putSpecialValue('notaccessible') self.putNumChild(0) if not self.isCli: diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py index d58ed75384d..c50ba14281c 100644 --- a/share/qtcreator/debugger/gdbbridge.py +++ b/share/qtcreator/debugger/gdbbridge.py @@ -37,7 +37,7 @@ import struct import tempfile import types -from dumper import * +from dumper import DumperBase, Children, toInteger, TopLevelItem from utils import TypeCode ####################################################################### diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index 9b4e54c195f..3617d398a6a 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -42,7 +42,7 @@ sys.path.insert(1, os.path.dirname(os.path.abspath(inspect.getfile(inspect.curre if 'dumper' in sys.modules: reload(sys.modules['dumper']) -from dumper import * +from dumper import DumperBase, SubItem, Children, TopLevelItem ####################################################################### # @@ -1897,8 +1897,8 @@ class Tester(Dumper): break else: - d.warn('TIMEOUT') - d.warn('Cannot determined stopped thread') + self.warn('TIMEOUT') + self.warn('Cannot determined stopped thread') lldb.SBDebugger.Destroy(self.debugger) @@ -1984,7 +1984,7 @@ class SummaryDumper(Dumper, LogMixin): return # Don't mess up lldb output def lookupNativeTypeInAllModules(self, name): - d.warn('Failed to resolve type %s' % name) + self.warn('Failed to resolve type %s' % name) return None def dump_summary(self, valobj, expanded = False): diff --git a/share/qtcreator/debugger/misctypes.py b/share/qtcreator/debugger/misctypes.py index a05c5f52940..a1343eb9dc8 100644 --- a/share/qtcreator/debugger/misctypes.py +++ b/share/qtcreator/debugger/misctypes.py @@ -23,8 +23,8 @@ # ############################################################################ -from dumper import * -from utils import TypeCode +from dumper import Children, SubItem +from utils import TypeCode, DisplayFormat import re ####################################################################### @@ -323,7 +323,7 @@ def qdump__KDSoapValue1(d, value): d.putPlainChildren(inner) def qdump__KDSoapValue(d, value): - p = (value.cast(lookupType('char*')) + 4).dereference().cast(lookupType('QString')) + p = (value.cast(d.lookupType('char*')) + 4).dereference().cast(d.lookupType('QString')) d.putStringValue(p) d.putPlainChildren(value['d']['d'].dereference()) diff --git a/share/qtcreator/debugger/opencvtypes.py b/share/qtcreator/debugger/opencvtypes.py index 2cbbc0cf57e..7a62af7041f 100644 --- a/share/qtcreator/debugger/opencvtypes.py +++ b/share/qtcreator/debugger/opencvtypes.py @@ -23,8 +23,8 @@ # ############################################################################ -from dumper import * -from utils import TypeCode +from dumper import Children, SubItem +from utils import TypeCode, DisplayFormat def qdump__cv__Size_(d, value): d.putValue('(%s, %s)' % (value[0].display(), value[1].display())) diff --git a/share/qtcreator/debugger/personaltypes.py b/share/qtcreator/debugger/personaltypes.py index b4d34db10c8..7f82cc57dfb 100644 --- a/share/qtcreator/debugger/personaltypes.py +++ b/share/qtcreator/debugger/personaltypes.py @@ -56,6 +56,6 @@ # for more details or look at qttypes.py, stdtypes.py, boosttypes.py # for more complex examples. -from dumper import * +import dumper ######################## Your code below ####################### diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index 8f8fa10faa1..705a0051c22 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -25,7 +25,7 @@ import platform import re -from dumper import * +from dumper import Children, SubItem, UnnamedSubItem, toInteger from utils import DisplayFormat def qdump__QAtomicInt(d, value): diff --git a/share/qtcreator/debugger/stdtypes.py b/share/qtcreator/debugger/stdtypes.py index 3b8542707ae..83201e42e83 100644 --- a/share/qtcreator/debugger/stdtypes.py +++ b/share/qtcreator/debugger/stdtypes.py @@ -24,7 +24,7 @@ ############################################################################ from utils import DisplayFormat -from dumper import * +from dumper import Children, SubItem def qform__std__array(): return [DisplayFormat.ArrayPlotFormat]