Mercurial Repositories > eric / changeset
changeset
Started to fix code style issues detected by the extended style checker.
Tue, 07 Mar 2017 18:53:18 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 07 Mar 2017 18:53:18 +0100
- changeset 5587
- ea526b78ee6c
- parent 5586
- 0e5421d679e7
- child 5588
- 6ba512d9f46a
Started to fix code style issues detected by the extended style checker.
--- a/Cooperation/ChatWidget.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Cooperation/ChatWidget.py Tue Mar 07 18:53:18 2017 +0100 @@ -33,7 +33,7 @@ @signal connected(connected) emitted to signal a change of the connected state (bool) - @signal editorCommand(hash, filename, message) emitted when an editor + @signal editorCommand(hashStr, filename, message) emitted when an editor command has been received (string, string, string) @signal shareEditor(share) emitted to signal a share is requested (bool) @signal startEdit() emitted to start a shared edit session @@ -391,15 +391,15 @@ """ return self.__client - def __editorCommandMessage(self, hash, fileName, message): + def __editorCommandMessage(self, hashStr, fileName, message): """ Private slot to handle editor command messages from the client. - @param hash hash of the project (string) + @param hashStr hash of the project (string) @param fileName project relative file name of the editor (string) @param message command message (string) """ - self.editorCommand.emit(hash, fileName, message) + self.editorCommand.emit(hashStr, fileName, message) from QScintilla.Editor import Editor if message.startswith(Editor.StartEditToken + Editor.Separator) or \
--- a/Cooperation/Connection.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Cooperation/Connection.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/DataViews/CodeMetrics.py Tue Mar 07 18:46:09 2017 +0100 +++ b/DataViews/CodeMetrics.py Tue Mar 07 18:53:18 2017 +0100 @@ -174,15 +174,15 @@ counters = self.counters.setdefault(id, {}) counters[key] = counters.setdefault(key, 0) + value - def getCounter(self, id, key): + def getCounter(self, counterId, key): """ Public method used to get a specific counter value. - @param id id of the counter (string) + @param counterId id of the counter (string) @param key key of the value to be retrieved (string) @return the value of the requested counter (int) """ - return self.counters.get(id, {}).get(key, 0) + return self.counters.get(counterId, {}).get(key, 0) def summarize(total, key, value):
--- a/DebugClients/Python/DebugBase.py Tue Mar 07 18:46:09 2017 +0100 +++ b/DebugClients/Python/DebugBase.py Tue Mar 07 18:53:18 2017 +0100 @@ -421,25 +421,25 @@ sys.settrace(None) sys.setprofile(None) - def run(self, cmd, globals=None, locals=None, debug=True): + def run(self, cmd, globalsDict=None, localsDict=None, debug=True): """ Public method to start a given command under debugger control. @param cmd command / code to execute under debugger control @type str or CodeType - @keyparam globals dictionary of global variables for cmd + @keyparam globalsDict dictionary of global variables for cmd @type dict - @keyparam locals dictionary of local variables for cmd + @keyparam localsDict dictionary of local variables for cmd @type dict @keyparam debug flag if command should run under debugger control @type bool """ - if globals is None: + if globalsDict is None: import __main__ - globals = __main__.__dict__ + globalsDict = __main__.__dict__ - if locals is None: - locals = globals + if localsDict is None: + localsDict = globalsDict if not isinstance(cmd, types.CodeType): cmd = compile(cmd, "<string>", "exec") @@ -452,7 +452,7 @@ sys.settrace(self.trace_dispatch) try: - exec(cmd, globals, locals) + exec(cmd, globalsDict, localsDict) atexit._run_exitfuncs() self._dbgClient.progTerminated(0) except SystemExit:
--- a/DebugClients/Python/DebugClientBase.py Tue Mar 07 18:46:09 2017 +0100 +++ b/DebugClients/Python/DebugClientBase.py Tue Mar 07 18:53:18 2017 +0100 @@ -292,12 +292,12 @@ """ return eval(self.raw_input(prompt, True)) - def sessionClose(self, exit=True): + def sessionClose(self, terminate=True): """ Public method to close the session with the debugger and optionally terminate. - @param exit flag indicating to terminate (boolean) + @param terminate flag indicating to terminate (boolean) """ try: self.set_quit() @@ -313,7 +313,7 @@ self.writestream.close(True) self.errorstream.close(True) - if exit: + if terminate: # Ok, go away. sys.exit() @@ -1320,14 +1320,14 @@ # reset coding self.__coding = self.defaultCoding - def __dumpVariables(self, frmnr, scope, filter): + def __dumpVariables(self, frmnr, scope, filterList): """ Private method to return the variables of a frame to the debug server. @param frmnr distance of frame reported on. 0 is the current frame (int) @param scope 1 to report global variables, 0 for local variables (int) - @param filter the indices of variable types to be filtered + @param filterList the indices of variable types to be filtered (list of int) """ if self.currentThread is None: @@ -1345,22 +1345,23 @@ if f is None: if scope: - dict = self.debugMod.__dict__ + varDict = self.debugMod.__dict__ else: scope = -1 elif scope: - dict = f.f_globals + varDict = f.f_globals elif f.f_globals is f.f_locals: scope = -1 else: - dict = f.f_locals + varDict = f.f_locals varlist = [] if scope != -1: - keylist = dict.keys() + keylist = varDict.keys() - vlist = self.__formatVariablesList(keylist, dict, scope, filter) + vlist = self.__formatVariablesList( + keylist, varDict, scope, filterList) varlist.extend(vlist) self.sendJsonCommand("ResponseVariables", { @@ -1368,7 +1369,7 @@ "variables": varlist, }) - def __dumpVariable(self, var, frmnr, scope, filter): + def __dumpVariable(self, var, frmnr, scope, filterList): """ Private method to return the variables of a frame to the debug server. @@ -1377,7 +1378,7 @@ @param frmnr distance of frame reported on. 0 is the current frame (int) @param scope 1 to report global variables, 0 for local variables (int) - @param filter the indices of variable types to be filtered + @param filterList the indices of variable types to be filtered (list of int) """ if self.currentThread is None: @@ -1392,20 +1393,20 @@ if f is None: if scope: - dict = self.debugMod.__dict__ + varDict = self.debugMod.__dict__ else: scope = -1 elif scope: - dict = f.f_globals + varDict = f.f_globals elif f.f_globals is f.f_locals: scope = -1 else: - dict = f.f_locals + varDict = f.f_locals varlist = [] if scope != -1: - variable = dict + variable = varDict for attribute in var: attribute = self.__extractIndicators(attribute)[0] typeObject, typeName, typeStr, resolver = \ @@ -1425,9 +1426,9 @@ vlist = self.__formatQtVariable(variable, typeName) varlist.extend(vlist) elif resolver: - dict = resolver.getDictionary(variable) + varDict = resolver.getDictionary(variable) vlist = self.__formatVariablesList( - list(dict.keys()), dict, scope, filter) + list(dict.keys()), varDict, scope, filterList) varlist.extend(vlist) self.sendJsonCommand("ResponseVariable", { @@ -1597,7 +1598,7 @@ return varlist - def __formatVariablesList(self, keylist, dict_, scope, filter=[], + def __formatVariablesList(self, keylist, dict_, scope, filterList=[], formatSequences=False): """ Private method to produce a formated variables list. @@ -1614,9 +1615,9 @@ filter (int). Variables are only added to the list, if their name do not match any of the filter expressions. - @param filter the indices of variable types to be filtered. Variables - are only added to the list, if their type is not contained in the - filter list. + @param filterList the indices of variable types to be filtered. + Variables are only added to the list, if their type is not + contained in the filter list. @param formatSequences flag indicating, that sequence or dictionary variables should be formatted. If it is 0 (or false), just the number of items contained in these variables is returned. (boolean) @@ -1641,7 +1642,7 @@ continue # filter hidden attributes (filter #0) - if 0 in filter and str(key)[:2] == '__' and not ( + if 0 in filterList and str(key)[:2] == '__' and not ( key == "___len___" and DebugVariables.TooLargeAttribute in keylist): continue @@ -1658,19 +1659,19 @@ valtypename = type(value).__name__ if valtype not in ConfigVarTypeStrings: if valtype in ["numpy.ndarray", "array.array"]: - if ConfigVarTypeStrings.index('list') in filter: + if ConfigVarTypeStrings.index('list') in filterList: continue elif valtypename == "MultiValueDict": - if ConfigVarTypeStrings.index('dict') in filter: + if ConfigVarTypeStrings.index('dict') in filterList: continue elif valtype == "sip.methoddescriptor": if ConfigVarTypeStrings.index( - 'method') in filter: + 'method') in filterList: continue elif valtype == "sip.enumtype": - if ConfigVarTypeStrings.index('class') in filter: + if ConfigVarTypeStrings.index('class') in filterList: continue - elif ConfigVarTypeStrings.index('instance') in filter: + elif ConfigVarTypeStrings.index('instance') in filterList: continue if (not valtypestr.startswith('type ') and @@ -1683,22 +1684,24 @@ if valtype == "instancemethod": valtype = "method" - if ConfigVarTypeStrings.index(valtype) in filter: + if ConfigVarTypeStrings.index(valtype) in filterList: continue except ValueError: if valtype == "classobj": if ConfigVarTypeStrings.index( - 'instance') in filter: + 'instance') in filterList: continue elif valtype == "sip.methoddescriptor": if ConfigVarTypeStrings.index( - 'method') in filter: + 'method') in filterList: continue elif valtype == "sip.enumtype": - if ConfigVarTypeStrings.index('class') in filter: + if ConfigVarTypeStrings.index('class') in \ + filterList: continue elif not valtype.startswith("PySide") and \ - ConfigVarTypeStrings.index('other') in filter: + (ConfigVarTypeStrings.index('other') in + filterList): continue try:
--- a/DebugClients/Python/DebugUtilities.py Tue Mar 07 18:46:09 2017 +0100 +++ b/DebugClients/Python/DebugUtilities.py Tue Mar 07 18:53:18 2017 +0100 @@ -84,7 +84,7 @@ return args, varargs, kwonlyargs, varkw -def formatargvalues(args, varargs, varkw, locals, +def formatargvalues(args, varargs, varkw, localsDict, formatarg=str, formatvarargs=lambda name: '*' + name, formatvarkw=lambda name: '**' + name, @@ -99,7 +99,7 @@ @type str @param varkw name of the keyword arguments @type str - @param locals reference to the local variables dictionary + @param localsDict reference to the local variables dictionary @type dict @keyparam formatarg argument formatting function @type func @@ -115,14 +115,14 @@ specs = [] for i in range(len(args)): name = args[i] - specs.append(formatarg(name) + formatvalue(locals[name])) + specs.append(formatarg(name) + formatvalue(localsDict[name])) if varargs: - specs.append(formatvarargs(varargs) + formatvalue(locals[varargs])) + specs.append(formatvarargs(varargs) + formatvalue(localsDict[varargs])) if varkw: - specs.append(formatvarkw(varkw) + formatvalue(locals[varkw])) + specs.append(formatvarkw(varkw) + formatvalue(localsDict[varkw])) argvalues = '(' + ', '.join(specs) + ')' - if '__return__' in locals: - argvalues += " -> " + formatvalue(locals['__return__']) + if '__return__' in localsDict: + argvalues += " -> " + formatvalue(localsDict['__return__']) return argvalues
--- a/DebugClients/Python/ThreadExtension.py Tue Mar 07 18:46:09 2017 +0100 +++ b/DebugClients/Python/ThreadExtension.py Tue Mar 07 18:53:18 2017 +0100 @@ -140,19 +140,19 @@ except AssertionError: pass - def setCurrentThread(self, id): + def setCurrentThread(self, threadId): """ Public method to set the current thread. - @param id the id the current thread should be set to. + @param threadId the id the current thread should be set to. @type int """ try: self.lockClient() - if id is None: + if threadId is None: self.currentThread = None else: - self.currentThread = self.threads.get(id) + self.currentThread = self.threads.get(threadId) finally: self.unlockClient() @@ -167,10 +167,10 @@ # update thread names set by user (threading.setName) threadNames = {t.ident: t.getName() for t in threading.enumerate()} - for id, thd in self.threads.items(): - d = {"id": id} + for threadId, thd in self.threads.items(): + d = {"id": threadId} try: - d["name"] = threadNames.get(id, thd.name) + d["name"] = threadNames.get(threadId, thd.name) d["broken"] = thd.isBroken except Exception: d["name"] = 'UnknownThread' @@ -215,28 +215,28 @@ Public method to update the list of running threads. """ frames = sys._current_frames() - for id, frame in frames.items(): + for threadId, frame in frames.items(): # skip our own timer thread if frame.f_code.co_name == '__eventPollTimer': continue # Unknown thread - if id not in self.threads: + if threadId not in self.threads: newThread = DebugBase(self) name = 'Thread-{0}'.format(self.threadNumber) self.threadNumber += 1 - newThread.id = id + newThread.id = threadId newThread.name = name - self.threads[id] = newThread + self.threads[threadId] = newThread # adjust current frame if "__pypy__" not in sys.builtin_module_names: # Don't update with None currentFrame = self.getExecutedFrame(frame) if (currentFrame is not None and - self.threads[id].isBroken is False): - self.threads[id].currentFrame = currentFrame + self.threads[threadId].isBroken is False): + self.threads[threadId].currentFrame = currentFrame # Clean up obsolet because terminated threads self.threads = {id_: thrd for id_, thrd in self.threads.items()
--- a/Debugger/DebugServer.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Debugger/DebugServer.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass @@ -693,15 +693,15 @@ self.__addWatchPoints( QModelIndex(), startIndex.row(), endIndex.row()) - def getClientCapabilities(self, type): + def getClientCapabilities(self, clientType): """ Public method to retrieve the debug clients capabilities. - @param type debug client type (string) + @param clientType debug client type (string) @return debug client capabilities (integer) """ try: - return self.__debuggerInterfaceRegistry[type][0] + return self.__debuggerInterfaceRegistry[clientType][0] except KeyError: return 0 # no capabilities @@ -996,17 +996,19 @@ """ self.debuggerInterface.remoteContinue(special) - def remoteBreakpoint(self, fn, line, set, cond=None, temp=False): + def remoteBreakpoint(self, fn, line, setBreakpoint, cond=None, temp=False): """ Public method to set or clear a breakpoint. @param fn filename the breakpoint belongs to (string) @param line linenumber of the breakpoint (int) - @param set flag indicating setting or resetting a breakpoint (boolean) + @param setBreakpoint flag indicating setting or resetting a breakpoint + (boolean) @param cond condition of the breakpoint (string) @param temp flag indicating a temporary breakpoint (boolean) """ - self.debuggerInterface.remoteBreakpoint(fn, line, set, cond, temp) + self.debuggerInterface.remoteBreakpoint(fn, line, setBreakpoint, cond, + temp) def __remoteBreakpointEnable(self, fn, line, enable): """ @@ -1029,17 +1031,17 @@ """ self.debuggerInterface.remoteBreakpointIgnore(fn, line, count) - def __remoteWatchpoint(self, cond, set, temp=False): + def __remoteWatchpoint(self, cond, setWatch, temp=False): """ Private method to set or clear a watch expression. @param cond expression of the watch expression (string) - @param set flag indicating setting or resetting a watch expression + @param setWatch flag indicating setting or resetting a watch expression (boolean) @param temp flag indicating a temporary watch expression (boolean) """ # cond is combination of cond and special (s. watch expression viewer) - self.debuggerInterface.remoteWatchpoint(cond, set, temp) + self.debuggerInterface.remoteWatchpoint(cond, setWatch, temp) def __remoteWatchpointEnable(self, cond, enable): """ @@ -1086,36 +1088,38 @@ """ self.debuggerInterface.remoteSetThread(tid) - def remoteClientVariables(self, scope, filter, framenr=0): + def remoteClientVariables(self, scope, filterList, framenr=0): """ Public method to request the variables of the debugged program. @param scope the scope of the variables (0 = local, 1 = global) - @param filter list of variable types to filter out (list of int) + @param filterList list of variable types to filter out (list of int) @param framenr framenumber of the variables to retrieve (int) """ - self.debuggerInterface.remoteClientVariables(scope, filter, framenr) + self.debuggerInterface.remoteClientVariables(scope, filterList, + framenr) - def remoteClientVariable(self, scope, filter, var, framenr=0): + def remoteClientVariable(self, scope, filterList, var, framenr=0): """ Public method to request the variables of the debugged program. @param scope the scope of the variables (0 = local, 1 = global) - @param filter list of variable types to filter out (list of int) + @param filterList list of variable types to filter out (list of int) @param var list encoded name of variable to retrieve (string) @param framenr framenumber of the variables to retrieve (int) """ self.debuggerInterface.remoteClientVariable( - scope, filter, var, framenr) + scope, filterList, var, framenr) - def remoteClientSetFilter(self, scope, filter): + def remoteClientSetFilter(self, scope, filterStr): """ Public method to set a variables filter list. @param scope the scope of the variables (0 = local, 1 = global) - @param filter regexp string for variable names to filter out (string) + @param filterStr regexp string for variable names to filter out + (string) """ - self.debuggerInterface.remoteClientSetFilter(scope, filter) + self.debuggerInterface.remoteClientSetFilter(scope, filterStr) def setCallTraceEnabled(self, on): """ @@ -1447,54 +1451,54 @@ """ self.utStopTest.emit() - def clientUtTestFailed(self, testname, traceback, id): + def clientUtTestFailed(self, testname, traceback, testId): """ Public method to process the client test failed info. @param testname name of the test (string) @param traceback lines of traceback info (list of strings) - @param id id of the test (string) + @param testId id of the test (string) """ - self.utTestFailed.emit(testname, traceback, id) + self.utTestFailed.emit(testname, traceback, testId) - def clientUtTestErrored(self, testname, traceback, id): + def clientUtTestErrored(self, testname, traceback, testId): """ Public method to process the client test errored info. @param testname name of the test (string) @param traceback lines of traceback info (list of strings) - @param id id of the test (string) + @param testId id of the test (string) """ - self.utTestErrored.emit(testname, traceback, id) + self.utTestErrored.emit(testname, traceback, testId) - def clientUtTestSkipped(self, testname, reason, id): + def clientUtTestSkipped(self, testname, reason, testId): """ Public method to process the client test skipped info. @param testname name of the test (string) @param reason reason for skipping the test (string) - @param id id of the test (string) + @param testId id of the test (string) """ - self.utTestSkipped.emit(testname, reason, id) + self.utTestSkipped.emit(testname, reason, testId) - def clientUtTestFailedExpected(self, testname, traceback, id): + def clientUtTestFailedExpected(self, testname, traceback, testId): """ Public method to process the client test failed expected info. @param testname name of the test (string) @param traceback lines of traceback info (list of strings) - @param id id of the test (string) + @param testId id of the test (string) """ - self.utTestFailedExpected.emit(testname, traceback, id) + self.utTestFailedExpected.emit(testname, traceback, testId) - def clientUtTestSucceededUnexpected(self, testname, id): + def clientUtTestSucceededUnexpected(self, testname, testId): """ Public method to process the client test succeeded unexpected info. @param testname name of the test (string) - @param id id of the test (string) + @param testId id of the test (string) """ - self.utTestSucceededUnexpected.emit(testname, id) + self.utTestSucceededUnexpected.emit(testname, testId) def clientUtFinished(self): """
--- a/Debugger/DebugViewer.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Debugger/DebugViewer.py Tue Mar 07 18:53:18 2017 +0100 @@ -362,37 +362,37 @@ """ self.callTraceViewer.setProjectMode(enabled) - def showVariables(self, vlist, globals): + def showVariables(self, vlist, showGlobals): """ Public method to show the variables in the respective window. @param vlist list of variables to display - @param globals flag indicating global/local state + @param showGlobals flag indicating global/local state """ - if globals: + if showGlobals: self.globalsViewer.showVariables(vlist, self.framenr) else: self.localsViewer.showVariables(vlist, self.framenr) - def showVariable(self, vlist, globals): + def showVariable(self, vlist, showGlobals): """ Public method to show the variables in the respective window. @param vlist list of variables to display - @param globals flag indicating global/local state + @param showGlobals flag indicating global/local state """ - if globals: + if showGlobals: self.globalsViewer.showVariable(vlist) else: self.localsViewer.showVariable(vlist) - def showVariablesTab(self, globals): + def showVariablesTab(self, showGlobals): """ Public method to make a variables tab visible. - @param globals flag indicating global/local state + @param showGlobals flag indicating global/local state """ - if globals: + if showGlobals: self.__tabWidget.setCurrentWidget(self.glvWidget) else: self.__tabWidget.setCurrentWidget(self.lvWidget) @@ -465,16 +465,16 @@ """ Public slot to set the global variable filter. """ - filter = self.globalsFilterEdit.text() - self.debugServer.remoteClientSetFilter(1, filter) + filterStr = self.globalsFilterEdit.text() + self.debugServer.remoteClientSetFilter(1, filterStr) self.debugServer.remoteClientVariables(2, self.globalsFilter) def setLocalsFilter(self): """ Public slot to set the local variable filter. """ - filter = self.localsFilterEdit.text() - self.debugServer.remoteClientSetFilter(0, filter) + filterStr = self.localsFilterEdit.text() + self.debugServer.remoteClientSetFilter(0, filterStr) if self.currentStack: self.debugServer.remoteClientVariables( 0, self.localsFilter, self.framenr)
--- a/Debugger/DebuggerInterfaceNone.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Debugger/DebuggerInterfaceNone.py Tue Mar 07 18:53:18 2017 +0100 @@ -210,13 +210,14 @@ """ return - def remoteBreakpoint(self, fn, line, set, cond=None, temp=False): + def remoteBreakpoint(self, fn, line, setBreakpoint, cond=None, temp=False): """ Public method to set or clear a breakpoint. @param fn filename the breakpoint belongs to (string) @param line linenumber of the breakpoint (int) - @param set flag indicating setting or resetting a breakpoint (boolean) + @param setBreakpoint flag indicating setting or resetting a + breakpoint (boolean) @param cond condition of the breakpoint (string) @param temp flag indicating a temporary breakpoint (boolean) """ @@ -243,12 +244,12 @@ """ return - def remoteWatchpoint(self, cond, set, temp=False): + def remoteWatchpoint(self, cond, setWatch, temp=False): """ Public method to set or clear a watch expression. @param cond expression of the watch expression (string) - @param set flag indicating setting or resetting a watch expression + @param setWatch flag indicating setting or resetting a watch expression (boolean) @param temp flag indicating a temporary watch expression (boolean) """ @@ -296,33 +297,34 @@ """ return - def remoteClientVariables(self, scope, filter, framenr=0): + def remoteClientVariables(self, scope, filterList, framenr=0): """ Public method to request the variables of the debugged program. @param scope the scope of the variables (0 = local, 1 = global) - @param filter list of variable types to filter out (list of int) + @param filterList list of variable types to filter out (list of int) @param framenr framenumber of the variables to retrieve (int) """ return - def remoteClientVariable(self, scope, filter, var, framenr=0): + def remoteClientVariable(self, scope, filterList, var, framenr=0): """ Public method to request the variables of the debugged program. @param scope the scope of the variables (0 = local, 1 = global) - @param filter list of variable types to filter out (list of int) + @param filterList list of variable types to filter out (list of int) @param var list encoded name of variable to retrieve (string) @param framenr framenumber of the variables to retrieve (int) """ return - def remoteClientSetFilter(self, scope, filter): + def remoteClientSetFilter(self, scope, filterStr): """ Public method to set a variables filter list. @param scope the scope of the variables (0 = local, 1 = global) - @param filter regexp string for variable names to filter out (string) + @param filterStr regexp string for variable names to filter out + (string) """ return
--- a/Debugger/DebuggerInterfacePython2.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Debugger/DebuggerInterfacePython2.py Tue Mar 07 18:53:18 2017 +0100 @@ -681,26 +681,26 @@ "threadID": tid, }) - def remoteClientVariables(self, scope, filter, framenr=0): + def remoteClientVariables(self, scope, filterList, framenr=0): """ Public method to request the variables of the debugged program. @param scope the scope of the variables (0 = local, 1 = global) - @param filter list of variable types to filter out (list of int) + @param filterList list of variable types to filter out (list of int) @param framenr framenumber of the variables to retrieve (int) """ self.__sendJsonCommand("RequestVariables", { "frameNumber": framenr, "scope": scope, - "filters": filter, + "filters": filterList, }) - def remoteClientVariable(self, scope, filter, var, framenr=0): + def remoteClientVariable(self, scope, filterList, var, framenr=0): """ Public method to request the variables of the debugged program. @param scope the scope of the variables (0 = local, 1 = global) - @param filter list of variable types to filter out (list of int) + @param filterList list of variable types to filter out (list of int) @param var list encoded name of variable to retrieve (string) @param framenr framenumber of the variables to retrieve (int) """ @@ -708,19 +708,20 @@ "variable": var, "frameNumber": framenr, "scope": scope, - "filters": filter, + "filters": filterList, }) - def remoteClientSetFilter(self, scope, filter): + def remoteClientSetFilter(self, scope, filterStr): """ Public method to set a variables filter list. @param scope the scope of the variables (0 = local, 1 = global) - @param filter regexp string for variable names to filter out (string) + @param filterStr regexp string for variable names to filter out + (string) """ self.__sendJsonCommand("RequestSetFilter", { "scope": scope, - "filter": filter, + "filter": filterStr, }) def setCallTraceEnabled(self, on):
--- a/Debugger/DebuggerInterfacePython3.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Debugger/DebuggerInterfacePython3.py Tue Mar 07 18:53:18 2017 +0100 @@ -681,26 +681,26 @@ "threadID": tid, }) - def remoteClientVariables(self, scope, filter, framenr=0): + def remoteClientVariables(self, scope, filterList, framenr=0): """ Public method to request the variables of the debugged program. @param scope the scope of the variables (0 = local, 1 = global) - @param filter list of variable types to filter out (list of int) + @param filterList list of variable types to filter out (list of int) @param framenr framenumber of the variables to retrieve (int) """ self.__sendJsonCommand("RequestVariables", { "frameNumber": framenr, "scope": scope, - "filters": filter, + "filters": filterList, }) - def remoteClientVariable(self, scope, filter, var, framenr=0): + def remoteClientVariable(self, scope, filterList, var, framenr=0): """ Public method to request the variables of the debugged program. @param scope the scope of the variables (0 = local, 1 = global) - @param filter list of variable types to filter out (list of int) + @param filterList list of variable types to filter out (list of int) @param var list encoded name of variable to retrieve (string) @param framenr framenumber of the variables to retrieve (int) """ @@ -708,19 +708,20 @@ "variable": var, "frameNumber": framenr, "scope": scope, - "filters": filter, + "filters": filterList, }) - def remoteClientSetFilter(self, scope, filter): + def remoteClientSetFilter(self, scope, filterStr): """ Public method to set a variables filter list. @param scope the scope of the variables (0 = local, 1 = global) - @param filter regexp string for variable names to filter out (string) + @param filterStr regexp string for variable names to filter out + (string) """ self.__sendJsonCommand("RequestSetFilter", { "scope": scope, - "filter": filter, + "filter": filterStr, }) def setCallTraceEnabled(self, on):
--- a/Debugger/EditBreakpointDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Debugger/EditBreakpointDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -22,12 +22,12 @@ """ Class implementing a dialog to edit breakpoint properties. """ - def __init__(self, id, properties, condHistory, parent=None, name=None, - modal=False, addMode=False, filenameHistory=None): + def __init__(self, breakPointId, properties, condHistory, parent=None, + name=None, modal=False, addMode=False, filenameHistory=None): """ Constructor - @param id id of the breakpoint (tuple) + @param breakPointId id of the breakpoint (tuple) (filename, linenumber) @param properties properties for the breakpoint (tuple) (condition, temporary flag, enabled flag, ignore count) @@ -49,7 +49,7 @@ self.okButton = self.buttonBox.button(QDialogButtonBox.Ok) - fn, lineno = id + fn, lineno = breakPointId if not addMode: cond, temp, enabled, count = properties
--- a/Debugger/StartDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Debugger/StartDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -26,9 +26,9 @@ whether exception reporting should be disabled. """ def __init__(self, caption, argvList, wdList, envList, exceptions, - parent=None, type=0, modfuncList=None, tracePython=False, - autoClearShell=True, autoContinue=True, autoFork=False, - forkChild=False): + parent=None, dialogType=0, modfuncList=None, + tracePython=False, autoClearShell=True, autoContinue=True, + autoFork=False, forkChild=False): """ Constructor @@ -38,7 +38,7 @@ @param envList history list of environment settings (list of strings) @param exceptions exception reporting flag (boolean) @param parent parent widget of this dialog (QWidget) - @param type type of the start dialog + @param dialogType type of the start dialog <ul> <li>0 = start debug dialog</li> <li>1 = start run dialog</li> @@ -60,17 +60,17 @@ super(StartDialog, self).__init__(parent) self.setModal(True) - self.type = type - if type == 0: + self.dialogType = dialogType + if dialogType == 0: from .Ui_StartDebugDialog import Ui_StartDebugDialog self.ui = Ui_StartDebugDialog() - elif type == 1: + elif dialogType == 1: from .Ui_StartRunDialog import Ui_StartRunDialog self.ui = Ui_StartRunDialog() - elif type == 2: + elif dialogType == 2: from .Ui_StartCoverageDialog import Ui_StartCoverageDialog self.ui = Ui_StartCoverageDialog() - elif type == 3: + elif dialogType == 3: from .Ui_StartProfileDialog import Ui_StartProfileDialog self.ui = Ui_StartProfileDialog() self.ui.setupUi(self) @@ -103,18 +103,18 @@ Preferences.getDebugger("ConsoleDbgCommand") != "") self.ui.consoleCheckBox.setChecked(False) - if type == 0: # start debug dialog + if dialogType == 0: # start debug dialog self.ui.tracePythonCheckBox.setChecked(tracePython) self.ui.tracePythonCheckBox.show() self.ui.autoContinueCheckBox.setChecked(autoContinue) self.ui.forkModeCheckBox.setChecked(autoFork) self.ui.forkChildCheckBox.setChecked(forkChild) - if type == 1: # start run dialog + if dialogType == 1: # start run dialog self.ui.forkModeCheckBox.setChecked(autoFork) self.ui.forkChildCheckBox.setChecked(forkChild) - if type == 3: # start coverage or profile dialog + if dialogType == 3: # start coverage or profile dialog self.ui.eraseCheckBox.setChecked(True) self.__clearHistoryLists = False @@ -161,7 +161,7 @@ indicating, that the debugger should debug the child process after forking automatically (boolean) """ - if self.type == 0: + if self.dialogType == 0: return (self.ui.tracePythonCheckBox.isChecked(), self.ui.autoContinueCheckBox.isChecked(), self.ui.forkModeCheckBox.isChecked(), @@ -177,7 +177,7 @@ should debug the child process after forking automatically (boolean) """ - if self.type == 1: + if self.dialogType == 1: return (self.ui.forkModeCheckBox.isChecked(), self.ui.forkChildCheckBox.isChecked()) @@ -188,7 +188,7 @@ @return flag indicating erasure of coverage info (boolean) """ - if self.type == 2: + if self.dialogType == 2: return self.ui.eraseCheckBox.isChecked() def getProfilingData(self): @@ -198,7 +198,7 @@ @return flag indicating erasure of profiling info (boolean) """ - if self.type == 3: + if self.dialogType == 3: return self.ui.eraseCheckBox.isChecked() def __clearHistories(self):
--- a/Debugger/VariablesViewer.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Debugger/VariablesViewer.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass @@ -238,9 +238,10 @@ par = par.parent() # step 2: request the variable from the debugger - filter = e5App().getObject("DebugUI").variablesFilter(self.globalScope) + variablesFilter = e5App().getObject("DebugUI").variablesFilter( + self.globalScope) e5App().getObject("DebugServer").remoteClientVariable( - self.globalScope, filter, pathlist, self.framenr) + self.globalScope, variablesFilter, pathlist, self.framenr) class ArrayElementVarItem(VariableItem):
--- a/DocumentationTools/APIGenerator.py Tue Mar 07 18:46:09 2017 +0100 +++ b/DocumentationTools/APIGenerator.py Tue Mar 07 18:53:18 2017 +0100 @@ -87,13 +87,13 @@ for globalName in sorted(self.module.globals.keys()): if not self.__isPrivate(self.module.globals[globalName]): if self.module.globals[globalName].isPublic(): - id = Editor.AttributeID + iconId = Editor.AttributeID elif self.module.globals[globalName].isProtected(): - id = Editor.AttributeProtectedID + iconId = Editor.AttributeProtectedID else: - id = Editor.AttributePrivateID + iconId = Editor.AttributePrivateID self.api.append("{0}{1}?{2:d}".format( - moduleNameStr, globalName, id)) + moduleNameStr, globalName, iconId)) def __addClassesAPI(self): """ @@ -118,28 +118,28 @@ if '__init__' in methods: methods.remove('__init__') if _class.isPublic(): - id = Editor.ClassID + iconId = Editor.ClassID elif _class.isProtected(): - id = Editor.ClassProtectedID + iconId = Editor.ClassProtectedID else: - id = Editor.ClassPrivateID + iconId = Editor.ClassPrivateID self.api.append( '{0}{1}?{2:d}({3})'.format( - self.moduleName, _class.name, id, + self.moduleName, _class.name, iconId, ', '.join(_class.methods['__init__'].parameters[1:]))) classNameStr = "{0}{1}.".format(self.moduleName, className) for method in methods: if not self.__isPrivate(_class.methods[method]): if _class.methods[method].isPublic(): - id = Editor.MethodID + iconId = Editor.MethodID elif _class.methods[method].isProtected(): - id = Editor.MethodProtectedID + iconId = Editor.MethodProtectedID else: - id = Editor.MethodPrivateID + iconId = Editor.MethodPrivateID self.api.append( '{0}{1}?{2:d}({3})'.format( - classNameStr, method, id, + classNameStr, method, iconId, ', '.join(_class.methods[method].parameters[1:]))) def __addClassVariablesAPI(self, className): @@ -156,13 +156,13 @@ for variable in sorted(_class.globals.keys()): if not self.__isPrivate(_class.globals[variable]): if _class.globals[variable].isPublic(): - id = Editor.AttributeID + iconId = Editor.AttributeID elif _class.globals[variable].isProtected(): - id = Editor.AttributeProtectedID + iconId = Editor.AttributeProtectedID else: - id = Editor.AttributePrivateID + iconId = Editor.AttributePrivateID self.api.append('{0}{1}?{2:d}'.format( - classNameStr, variable, id)) + classNameStr, variable, iconId)) def __addFunctionsAPI(self): """ @@ -174,13 +174,13 @@ for funcName in funcNames: if not self.__isPrivate(self.module.functions[funcName]): if self.module.functions[funcName].isPublic(): - id = Editor.MethodID + iconId = Editor.MethodID elif self.module.functions[funcName].isProtected(): - id = Editor.MethodProtectedID + iconId = Editor.MethodProtectedID else: - id = Editor.MethodPrivateID + iconId = Editor.MethodPrivateID self.api.append( '{0}{1}?{2:d}({3})'.format( self.moduleName, self.module.functions[funcName].name, - id, + iconId, ', '.join(self.module.functions[funcName].parameters)))
--- a/DocumentationTools/IndexGenerator.py Tue Mar 07 18:46:09 2017 +0100 +++ b/DocumentationTools/IndexGenerator.py Tue Mar 07 18:53:18 2017 +0100 @@ -84,8 +84,8 @@ file = file.replace(basename, "") if "__init__" in file: - dir = os.path.dirname(file) - udir = os.path.dirname(dir) + dirName = os.path.dirname(file) + udir = os.path.dirname(dirName) if udir: upackage = udir.replace(os.sep, ".") try: @@ -94,7 +94,7 @@ elt = self.packages["00index"] else: elt = self.packages["00index"] - package = dir.replace(os.sep, ".") + package = dirName.replace(os.sep, ".") elt["subpackages"][package] = moduleDocument.shortDescription() self.packages[package] = {
--- a/DocumentationTools/ModuleDocumentor.py Tue Mar 07 18:46:09 2017 +0100 +++ b/DocumentationTools/ModuleDocumentor.py Tue Mar 07 18:53:18 2017 +0100 @@ -302,24 +302,25 @@ return "{0}{1}{2}{3}".format( modBody, classesSection, rbModulesSection, functionsSection) - def __genListSection(self, names, dict, kwSuffix=""): + def __genListSection(self, names, sectionDict, kwSuffix=""): """ Private method to generate a list section of the document. @param names The names to appear in the list. (list of strings) - @param dict A dictionary containing all relevant information. + @param sectionDict dictionary containing all relevant information + (dict) @param kwSuffix suffix to be used for the QtHelp keywords (string) - @return The list section. (string) + @return list section (string) """ lst = [] for name in names: lst.append(self.listEntryTemplate.format( **{'Link': "{0}".format(name), - 'Name': dict[name].name, + 'Name': sectionDict[name].name, 'Description': - self.__getShortDescription(dict[name].description), + self.__getShortDescription(sectionDict[name].description), 'Deprecated': - self.__checkDeprecated(dict[name].description) and + self.__checkDeprecated(sectionDict[name].description) and self.listEntryDeprecatedTemplate or "", })) if kwSuffix: @@ -342,8 +343,8 @@ scope = class_ else: scope = self.module - attrNames = sorted([attr for attr in scope.globals.keys() - if not scope.globals[attr].isSignal]) + attrNames = sorted(attr for attr in scope.globals.keys() + if not scope.globals[attr].isSignal) if attrNames: s = ''.join( [self.listEntrySimpleTemplate.format(**{'Name': name}) @@ -449,13 +450,14 @@ return ''.join(classes) - def __genMethodsListSection(self, names, dict, className, clsName, + def __genMethodsListSection(self, names, sectionDict, className, clsName, includeInit=True): """ Private method to generate the methods list section of a class. @param names names to appear in the list (list of strings) - @param dict dictionary containing all relevant information + @param sectionDict dictionary containing all relevant information + (dict) @param className class name containing the names @param clsName visible class name containing the names @param includeInit flag indicating to include the __init__ method @@ -469,9 +471,9 @@ **{'Link': "{0}.{1}".format(className, '__init__'), 'Name': clsName, 'Description': self.__getShortDescription( - dict['__init__'].description), + sectionDict['__init__'].description), 'Deprecated': self.__checkDeprecated( - dict['__init__'].description) and + sectionDict['__init__'].description) and self.listEntryDeprecatedTemplate or "", })) self.keywords.append( @@ -483,30 +485,30 @@ for name in names: lst.append(self.listEntryTemplate.format( **{'Link': "{0}.{1}".format(className, name), - 'Name': dict[name].name, + 'Name': sectionDict[name].name, 'Description': - self.__getShortDescription(dict[name].description), + self.__getShortDescription(sectionDict[name].description), 'Deprecated': - self.__checkDeprecated(dict[name].description) and + self.__checkDeprecated(sectionDict[name].description) and self.listEntryDeprecatedTemplate or "", })) self.keywords.append(("{0}.{1}".format(className, name), "#{0}.{1}".format(className, name))) return ''.join(lst) - def __genMethodSection(self, obj, className, filter): + def __genMethodSection(self, obj, className, modifierFilter): """ Private method to generate the method details section. @param obj reference to the object being formatted @param className name of the class containing the method (string) - @param filter filter value designating the method types + @param modifierFilter filter value designating the method types @return method list and method details section (tuple of two string) """ methList = [] methBodies = [] - methods = sorted([k for k in obj.methods.keys() - if obj.methods[k].modifier == filter]) + methods = sorted(k for k in obj.methods.keys() + if obj.methods[k].modifier == modifierFilter) if '__init__' in methods: methods.remove('__init__') try: @@ -530,9 +532,9 @@ methBody = "" methBodies.append(methBody) - if filter == Function.Class: + if modifierFilter == Function.Class: methodClassifier = " (class method)" - elif filter == Function.Static: + elif modifierFilter == Function.Static: methodClassifier = " (static)" else: methodClassifier = "" @@ -560,7 +562,7 @@ methList = self.__genMethodsListSection( methods, obj.methods, className, obj.name, - includeInit=filter == Function.General) + includeInit=modifierFilter == Function.General) if not methList: methList = self.listEntryNoneTemplate @@ -660,13 +662,14 @@ return (self.listTemplate.format(**{'Entries': classesList}), ''.join(classes)) - def __genRbModulesClassesListSection(self, names, dict, moduleName): + def __genRbModulesClassesListSection(self, names, sectionDict, moduleName): """ Private method to generate the classes list section of a Ruby module. @param names The names to appear in the list. (list of strings) - @param dict A dictionary containing all relevant information. - @param moduleName Name of the Ruby module containing the classes. + @param sectionDict dictionary containing all relevant information + (dict) + @param moduleName name of the Ruby module containing the classes (string) @return The list section. (string) """ @@ -674,11 +677,11 @@ for name in names: lst.append(self.listEntryTemplate.format( **{'Link': "{0}.{1}".format(moduleName, name), - 'Name': dict[name].name, + 'Name': sectionDict[name].name, 'Description': - self.__getShortDescription(dict[name].description), + self.__getShortDescription(sectionDict[name].description), 'Deprecated': - self.__checkDeprecated(dict[name].description) and + self.__checkDeprecated(sectionDict[name].description) and self.listEntryDeprecatedTemplate or "", })) self.keywords.append(("{0}.{1}".format(moduleName, name),
--- a/DocumentationTools/QtHelpGenerator.py Tue Mar 07 18:46:09 2017 +0100 +++ b/DocumentationTools/QtHelpGenerator.py Tue Mar 07 18:53:18 2017 +0100 @@ -113,8 +113,8 @@ file = file.replace(basename, "") if "__init__" in file: - dir = os.path.dirname(file) - udir = os.path.dirname(dir) + dirName = os.path.dirname(file) + udir = os.path.dirname(dirName) if udir: upackage = udir.replace(os.sep, ".") try: @@ -123,7 +123,7 @@ elt = self.packages["00index"] else: elt = self.packages["00index"] - package = dir.replace(os.sep, ".") + package = dirName.replace(os.sep, ".") elt["subpackages"][package] = moduleDocument.name() self.packages[package] = { @@ -220,8 +220,8 @@ basename = "{0}.".format(basename) sections = self.__generateSections("00index", 3) - filesList = sorted( - [e for e in os.listdir(self.htmlDir) if e.endswith('.html')]) + filesList = sorted(e for e in os.listdir(self.htmlDir) + if e.endswith('.html')) files = "\n".join( [" <file>{0}</file>".format(f) for f in filesList]) filterAttribs = "\n".join(
--- a/E5Graphics/E5ArrowItem.py Tue Mar 07 18:46:09 2017 +0100 +++ b/E5Graphics/E5ArrowItem.py Tue Mar 07 18:53:18 2017 +0100 @@ -27,14 +27,14 @@ Class implementing an arrow graphics item subclass. """ def __init__(self, origin=QPointF(), end=QPointF(), - filled=False, type=NormalArrow, parent=None): + filled=False, arrowType=NormalArrow, parent=None): """ Constructor @param origin origin of the arrow (QPointF) @param end end point of the arrow (QPointF) @param filled flag indicating a filled arrow head (boolean) - @param type arrow type (NormalArrow, WideArrow) + @param arrowType arrow type (NormalArrow, WideArrow) @keyparam parent reference to the parent object (QGraphicsItem) """ super(E5ArrowItem, self).__init__(parent) @@ -42,7 +42,7 @@ self._origin = origin self._end = end self._filled = filled - self._type = type + self._type = arrowType self._halfLength = 13.0
--- a/E5Graphics/E5GraphicsView.py Tue Mar 07 18:46:09 2017 +0100 +++ b/E5Graphics/E5GraphicsView.py Tue Mar 07 18:53:18 2017 +0100 @@ -239,13 +239,13 @@ return QSizeF(endx + 1, endy + 1) - def __getDiagram(self, rect, format="PNG", filename=None): + def __getDiagram(self, rect, imageFormat="PNG", filename=None): """ Private method to retrieve the diagram from the scene fitting it in the minimum rectangle. @param rect minimum rectangle fitting the diagram (QRectF) - @param format format for the image file (string) + @param imageFormat format for the image file (string) @param filename name of the file for non pixmaps (string) @return diagram pixmap to receive the diagram (QPixmap) """ @@ -257,7 +257,7 @@ item.setSelected(False) # step 2: grab the diagram - if format == "PNG": + if imageFormat == "PNG": paintDevice = QPixmap(int(rect.width()), int(rect.height())) paintDevice.fill(self.backgroundBrush().color()) else: @@ -278,21 +278,21 @@ return paintDevice - def saveImage(self, filename, format="PNG"): + def saveImage(self, filename, imageFormat="PNG"): """ Public method to save the scene to a file. @param filename name of the file to write the image to (string) - @param format format for the image file (string) + @param imageFormat format for the image file (string) @return flag indicating success (boolean) """ rect = self._getDiagramRect(self.border) - if format == "SVG": - self.__getDiagram(rect, format=format, filename=filename) + if imageFormat == "SVG": + self.__getDiagram(rect, imageFormat=imageFormat, filename=filename) return True else: pixmap = self.__getDiagram(rect) - return pixmap.save(filename, format) + return pixmap.save(filename, imageFormat) def printDiagram(self, printer, diagramName=""): """
--- a/E5Gui/E5Application.py Tue Mar 07 18:46:09 2017 +0100 +++ b/E5Gui/E5Application.py Tue Mar 07 18:53:18 2017 +0100 @@ -28,18 +28,18 @@ self.__objectRegistry = {} self.__pluginObjectRegistry = {} - def registerObject(self, name, object): + def registerObject(self, name, objectRef): """ Public method to register an object in the object registry. @param name name of the object (string) - @param object reference to the object + @param objectRef reference to the object @exception KeyError raised when the given name is already in use """ if name in self.__objectRegistry: raise KeyError('Object "{0}" already registered.'.format(name)) else: - self.__objectRegistry[name] = object + self.__objectRegistry[name] = objectRef def getObject(self, name): """ @@ -54,12 +54,12 @@ else: raise KeyError('Object "{0}" is not registered.'.format(name)) - def registerPluginObject(self, name, object, pluginType=None): + def registerPluginObject(self, name, objectRef, pluginType=None): """ Public method to register a plugin object in the object registry. @param name name of the plugin object (string) - @param object reference to the plugin object + @param objectRef reference to the plugin object @keyparam pluginType type of the plugin object (string) @exception KeyError raised when the given name is already in use """ @@ -67,7 +67,7 @@ raise KeyError( 'Pluginobject "{0}" already registered.'.format(name)) else: - self.__pluginObjectRegistry[name] = (object, pluginType) + self.__pluginObjectRegistry[name] = (objectRef, pluginType) def unregisterPluginObject(self, name): """
--- a/E5Gui/E5FileDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/E5Gui/E5FileDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -27,34 +27,34 @@ DontUseSheet = QFileDialog.DontUseSheet -def __reorderFilter(filter, initialFilter=""): +def __reorderFilter(filterStr, initialFilter=""): """ Private function to reorder the file filter to cope with a KDE issue introduced by distributor's usage of KDE file dialogs. - @param filter Qt file filter (string) + @param filterStr Qt file filter (string) @param initialFilter initial filter (string) @return the rearranged Qt file filter (string) """ if initialFilter and not Globals.isMacPlatform(): - fileFilters = filter.split(';;') + fileFilters = filterStr.split(';;') if len(fileFilters) < 10 and initialFilter in fileFilters: fileFilters.remove(initialFilter) fileFilters.insert(0, initialFilter) return ";;".join(fileFilters) else: - return filter + return filterStr def getOpenFileName(parent=None, caption="", directory="", - filter="", options=QFileDialog.Options()): + filterStr="", options=QFileDialog.Options()): """ Module function to get the name of a file for opening it. @param parent parent widget of the dialog (QWidget) @param caption window title of the dialog (string) @param directory working directory of the dialog (string) - @param filter filter string for the dialog (string) + @param filterStr filter string for the dialog (string) @param options various options for the dialog (QFileDialog.Options) @return name of file to be opened (string) """ @@ -62,14 +62,14 @@ options |= QFileDialog.DontUseNativeDialog if PYQT_VERSION_STR >= "5.0.0": return QFileDialog.getOpenFileName( - parent, caption, directory, filter, "", options)[0] + parent, caption, directory, filterStr, "", options)[0] else: return QFileDialog.getOpenFileName( - parent, caption, directory, filter, options) + parent, caption, directory, filterStr, options) def getOpenFileNameAndFilter(parent=None, caption="", directory="", - filter="", initialFilter="", + filterStr="", initialFilter="", options=QFileDialog.Options()): """ Module function to get the name of a file for opening it and the selected @@ -78,14 +78,14 @@ @param parent parent widget of the dialog (QWidget) @param caption window title of the dialog (string) @param directory working directory of the dialog (string) - @param filter filter string for the dialog (string) + @param filterStr filter string for the dialog (string) @param initialFilter initial filter for the dialog (string) @param options various options for the dialog (QFileDialog.Options) @return name of file to be opened and selected filter (string, string) """ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog - newfilter = __reorderFilter(filter, initialFilter) + newfilter = __reorderFilter(filterStr, initialFilter) if PYQT_VERSION_STR >= "5.0.0": return QFileDialog.getOpenFileName( parent, caption, directory, newfilter, initialFilter, options) @@ -95,14 +95,14 @@ def getOpenFileNames(parent=None, caption="", directory="", - filter="", options=QFileDialog.Options()): + filterStr="", options=QFileDialog.Options()): """ Module function to get a list of names of files for opening. @param parent parent widget of the dialog (QWidget) @param caption window title of the dialog (string) @param directory working directory of the dialog (string) - @param filter filter string for the dialog (string) + @param filterStr filter string for the dialog (string) @param options various options for the dialog (QFileDialog.Options) @return list of file names to be opened (list of string) """ @@ -110,14 +110,14 @@ options |= QFileDialog.DontUseNativeDialog if PYQT_VERSION_STR >= "5.0.0": return QFileDialog.getOpenFileNames( - parent, caption, directory, filter, "", options)[0] + parent, caption, directory, filterStr, "", options)[0] else: return QFileDialog.getOpenFileNames( - parent, caption, directory, filter, options) + parent, caption, directory, filterStr, options) def getOpenFileNamesAndFilter(parent=None, caption="", directory="", - filter="", initialFilter="", + filterStr="", initialFilter="", options=QFileDialog.Options()): """ Module function to get a list of names of files for opening and the @@ -126,7 +126,7 @@ @param parent parent widget of the dialog (QWidget) @param caption window title of the dialog (string) @param directory working directory of the dialog (string) - @param filter filter string for the dialog (string) + @param filterStr filter string for the dialog (string) @param initialFilter initial filter for the dialog (string) @param options various options for the dialog (QFileDialog.Options) @return list of file names to be opened and selected filter @@ -134,7 +134,7 @@ """ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog - newfilter = __reorderFilter(filter, initialFilter) + newfilter = __reorderFilter(filterStr, initialFilter) if PYQT_VERSION_STR >= "5.0.0": return QFileDialog.getOpenFileNames( parent, caption, directory, newfilter, initialFilter, options) @@ -144,14 +144,14 @@ def getSaveFileName(parent=None, caption="", directory="", - filter="", options=QFileDialog.Options()): + filterStr="", options=QFileDialog.Options()): """ Module function to get the name of a file for saving it. @param parent parent widget of the dialog (QWidget) @param caption window title of the dialog (string) @param directory working directory of the dialog (string) - @param filter filter string for the dialog (string) + @param filterStr filter string for the dialog (string) @param options various options for the dialog (QFileDialog.Options) @return name of file to be saved (string) """ @@ -159,14 +159,14 @@ options |= QFileDialog.DontUseNativeDialog if PYQT_VERSION_STR >= "5.0.0": return QFileDialog.getSaveFileName( - parent, caption, directory, filter, "", options)[0] + parent, caption, directory, filterStr, "", options)[0] else: return QFileDialog.getSaveFileName( - parent, caption, directory, filter, options) + parent, caption, directory, filterStr, options) def getSaveFileNameAndFilter(parent=None, caption="", directory="", - filter="", initialFilter="", + filterStr="", initialFilter="", options=QFileDialog.Options()): """ Module function to get the name of a file for saving it and the selected @@ -175,14 +175,14 @@ @param parent parent widget of the dialog (QWidget) @param caption window title of the dialog (string) @param directory working directory of the dialog (string) - @param filter filter string for the dialog (string) + @param filterStr filter string for the dialog (string) @param initialFilter initial filter for the dialog (string) @param options various options for the dialog (QFileDialog.Options) @return name of file to be saved and selected filter (string, string) """ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog - newfilter = __reorderFilter(filter, initialFilter) + newfilter = __reorderFilter(filterStr, initialFilter) if PYQT_VERSION_STR >= "5.0.0": return QFileDialog.getSaveFileName( parent, caption, directory, newfilter, initialFilter, options)
--- a/E5Gui/E5GenericDiffHighlighter.py Tue Mar 07 18:46:09 2017 +0100 +++ b/E5Gui/E5GenericDiffHighlighter.py Tue Mar 07 18:53:18 2017 +0100 @@ -110,20 +110,20 @@ @return format definiton (QTextCharFormat) """ font = Preferences.getEditorOtherFonts("MonospacedFont") - format = QTextCharFormat() - format.setFontFamily(font.family()) - format.setFontPointSize(font.pointSize()) + charFormat = QTextCharFormat() + charFormat.setFontFamily(font.family()) + charFormat.setFontPointSize(font.pointSize()) if fg: - format.setForeground(fg) + charFormat.setForeground(fg) if bg: - format.setBackground(bg) + charFormat.setBackground(bg) if bold: - format.setFontWeight(QFont.Bold) + charFormat.setFontWeight(QFont.Bold) - return format + return charFormat def highlightBlock(self, text): """
--- a/E5Gui/E5MessageBox.py Tue Mar 07 18:46:09 2017 +0100 +++ b/E5Gui/E5MessageBox.py Tue Mar 07 18:53:18 2017 +0100 @@ -21,7 +21,7 @@ Critical = QMessageBox.Critical Information = QMessageBox.Information Question = QMessageBox.Question -Warning = QMessageBox.Warning +Warning = QMessageBox.Warning # __IGNORE_WARNING_M131__ StandardButtons = QMessageBox.StandardButtons
--- a/E5Gui/E5ProgressDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/E5Gui/E5ProgressDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -19,7 +19,7 @@ label. """ def __init__(self, labelText, cancelButtonText, minimum, maximum, - format=None, parent=None, flags=Qt.WindowFlags()): + labelFormat=None, parent=None, flags=Qt.WindowFlags()): """ Constructor @@ -27,7 +27,7 @@ @param cancelButtonText text of the cancel button (string) @param minimum minimum value (integer) @param maximum maximum value (integer) - @keyparam format label format of the progress bar (string) + @keyparam labelFormat label format of the progress bar (string) @keyparam parent reference to the parent widget (QWidget) @keyparam flags window flags of the dialog (Qt.WindowFlags) """ @@ -37,8 +37,8 @@ self.__progressBar = QProgressBar(self) self.__progressBar.setMinimum(minimum) self.__progressBar.setMaximum(maximum) - if format: - self.__progressBar.setFormat(format) + if labelFormat: + self.__progressBar.setFormat(labelFormat) self.setBar(self.__progressBar) @@ -50,10 +50,10 @@ """ return self.__progressBar.format() - def setFormat(self, format): + def setFormat(self, labelFormat): """ Public method to set the progress bar format. - @param format progress bar format (string) + @param labelFormat progress bar format (string) """ - self.__progressBar.setFormat(format) + self.__progressBar.setFormat(labelFormat)
--- a/E5Gui/E5TreeWidget.py Tue Mar 07 18:46:09 2017 +0100 +++ b/E5Gui/E5TreeWidget.py Tue Mar 07 18:53:18 2017 +0100 @@ -188,17 +188,17 @@ for item in items: self.deleteItem(item) - def filterString(self, filter): + def filterString(self, filterStr): """ Public slot to set a new filter. - @param filter filter to be set (string) + @param filterStr filter to be set (string) """ self.expandAll() allItems = self.allItems() - if filter: - lFilter = filter.lower() + if filterStr: + lFilter = filterStr.lower() for itm in allItems: itm.setHidden(lFilter not in itm.text(0).lower()) itm.setExpanded(True)
--- a/E5Gui/E5ZoomWidget.py Tue Mar 07 18:46:09 2017 +0100 +++ b/E5Gui/E5ZoomWidget.py Tue Mar 07 18:53:18 2017 +0100 @@ -282,7 +282,7 @@ Private slot to determine the width of the zoom value label. """ if self.__mapped: - labelLen = max([len(str(v)) for v in self.__mapping]) + labelLen = max(len(str(v)) for v in self.__mapping) else: labelLen = max( len(str(self.slider.maximum())),
--- a/E5Network/E5SslCertificatesInfoWidget.py Tue Mar 07 18:46:09 2017 +0100 +++ b/E5Network/E5SslCertificatesInfoWidget.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/E5XML/TasksReader.py Tue Mar 07 18:46:09 2017 +0100 +++ b/E5XML/TasksReader.py Tue Mar 07 18:53:18 2017 +0100 @@ -68,9 +68,9 @@ elif self.name() == "Task": self.__readTask() elif self.name() == "ProjectScanFilter": - filter = self.readElementText() + scanFilter = self.readElementText() if self.forProject: - self.viewer.projectTasksScanFilter = filter + self.viewer.projectTasksScanFilter = scanFilter else: self.raiseUnexpectedStartTag(self.name())
--- a/E5XML/XMLStreamWriterBase.py Tue Mar 07 18:46:09 2017 +0100 +++ b/E5XML/XMLStreamWriterBase.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Globals/compatibility_fixes.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Globals/compatibility_fixes.py Tue Mar 07 18:53:18 2017 +0100 @@ -152,12 +152,12 @@ """ -def open(file, mode='r', buffering=-1, encoding=None, +def open(filein, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True): """ Replacement for the build in open function. - @param file filename or file descriptor (string) + @param filein filename or file descriptor (string) @keyparam mode access mode (string) @keyparam buffering size of the read buffer (string) @keyparam encoding character encoding for reading/ writing (string) @@ -168,7 +168,7 @@ parameter (boolean) @return Returns the new file object """ - return File(file, mode, buffering, encoding, errors, newline, closefd) + return File(filein, mode, buffering, encoding, errors, newline, closefd) class File(file): # __IGNORE_WARNING__
--- a/Graphics/AssociationItem.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Graphics/AssociationItem.py Tue Mar 07 18:53:18 2017 +0100 @@ -41,14 +41,14 @@ The association is drawn as an arrow starting at the first items and ending at the second. """ - def __init__(self, itemA, itemB, type=Normal, topToBottom=False, + def __init__(self, itemA, itemB, assocType=Normal, topToBottom=False, parent=None): """ Constructor @param itemA first widget of the association @param itemB second widget of the association - @param type type of the association. This must be one of + @param assocType type of the association. This must be one of <ul> <li>Normal (default)</li> <li>Generalisation</li> @@ -58,13 +58,13 @@ from item A top to item B bottom (boolean) @keyparam parent reference to the parent object (QGraphicsItem) """ - if type == Normal: + if assocType == Normal: arrowType = NormalArrow arrowFilled = True - elif type == Imports: + elif assocType == Imports: arrowType = NormalArrow arrowFilled = True - elif type == Generalisation: + elif assocType == Generalisation: arrowType = WideArrow arrowFilled = False @@ -83,7 +83,7 @@ self.itemA = itemA self.itemB = itemB - self.assocType = type + self.assocType = assocType self.topToBottom = topToBottom self.regionA = NoRegion
--- a/Graphics/UMLGraphicsView.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Graphics/UMLGraphicsView.py Tue Mar 07 18:53:18 2017 +0100 @@ -650,16 +650,16 @@ self.__itemId += 1 return self.__itemId - def findItem(self, id): + def findItem(self, itemId): """ Public method to find an UML item based on the ID. - @param id of the item to search for (integer) + @param itemId of the item to search for (integer) @return item found (UMLItem) or None """ for item in self.scene().items(): try: - if item.getId() == id: + if item.getId() == itemId: return item except AttributeError: continue @@ -732,9 +732,9 @@ key, value = line.split(": ", 1) if key == "item": - id, x, y, itemType, itemData = value.split(", ", 4) + itemId, x, y, itemType, itemData = value.split(", ", 4) try: - id = int(id.split("=", 1)[1].strip()) + itemId = int(itemId.split("=", 1)[1].strip()) x = float(x.split("=", 1)[1].strip()) y = float(y.split("=", 1)[1].strip()) itemType = itemType.split("=", 1)[1].strip() @@ -744,8 +744,8 @@ itm = ModuleItem(x=x, y=y, scene=self.scene()) elif itemType == PackageItem.ItemType: itm = PackageItem(x=x, y=y, scene=self.scene()) - itm.setId(id) - umlItems[id] = itm + itm.setId(itemId) + umlItems[itemId] = itm if not itm.parseItemDataString(version, itemData): return False, linenum except ValueError:
--- a/Graphics/UMLItem.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Graphics/UMLItem.py Tue Mar 07 18:53:18 2017 +0100 @@ -196,13 +196,13 @@ painter.drawRect(self.rect()) self.adjustAssociations() - def setId(self, id): + def setId(self, itemId): """ Public method to assign an ID to the item. - @param id assigned ID (integer) + @param itemId assigned ID (integer) """ - self.__id = id + self.__id = itemId def getId(self): """
--- a/Helpviewer/AdBlock/AdBlockDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/AdBlock/AdBlockDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -150,15 +150,15 @@ menu.addAction(self.tr("Learn more about writing rules..."), self.__learnAboutWritingFilters) - def addCustomRule(self, filter): + def addCustomRule(self, filterRule): """ Public slot to add a custom AdBlock rule. - @param filter filter to be added (string) + @param filterRule filter to be added (string) """ self.subscriptionsTabWidget.setCurrentIndex( self.subscriptionsTabWidget.count() - 1) - self.__currentTreeWidget.addRule(filter) + self.__currentTreeWidget.addRule(filterRule) def __addCustomRule(self): """ @@ -303,14 +303,14 @@ self.__currentTreeWidget.subscription() @pyqtSlot(str) - def on_searchEdit_textChanged(self, filter): + def on_searchEdit_textChanged(self, filterRule): """ Private slot to set a new filter on the current widget. - @param filter filter to be set (string) + @param filterRule filter to be set (string) """ if self.__currentTreeWidget and self.adBlockGroup.isChecked(): - self.__currentTreeWidget.filterString(filter) + self.__currentTreeWidget.filterString(filterRule) @pyqtSlot(bool) def on_adBlockGroup_toggled(self, state):
--- a/Helpviewer/AdBlock/AdBlockRule.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/AdBlock/AdBlockRule.py Tue Mar 07 18:53:18 2017 +0100 @@ -55,11 +55,11 @@ """ Class implementing the AdBlock rule. """ - def __init__(self, filter="", subscription=None): + def __init__(self, filterRule="", subscription=None): """ Constructor - @param filter filter string of the rule (string) + @param filterRule filter string of the rule (string) @param subscription reference to the subscription object (AdBlockSubscription) """ @@ -90,7 +90,7 @@ self.__elemhide = False self.__caseSensitivity = Qt.CaseInsensitive - self.setFilter(filter) + self.setFilter(filterRule) def subscription(self): """ @@ -108,13 +108,13 @@ """ return self.__filter - def setFilter(self, filter): + def setFilter(self, filterRule): """ Public method to set the rule filter string. - @param filter rule filter string (string) + @param filterRule rule filter string (string) """ - self.__filter = filter + self.__filter = filterRule self.__parseFilter() def __parseFilter(self):
--- a/Helpviewer/AdBlock/AdBlockTreeWidget.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/AdBlock/AdBlockTreeWidget.py Tue Mar 07 18:53:18 2017 +0100 @@ -106,26 +106,26 @@ QApplication.restoreOverrideCursor() QApplication.processEvents() - def addRule(self, filter=""): + def addRule(self, filterRule=""): """ Public slot to add a new rule. - @param filter filter to be added (string) + @param filterRule filter to be added (string) """ if not self.__subscription.canEditRules(): return - if not filter: - filter, ok = QInputDialog.getText( + if not filterRule: + filterRule, ok = QInputDialog.getText( self, self.tr("Add Custom Rule"), self.tr("Write your rule here:"), QLineEdit.Normal) - if not ok or filter == "": + if not ok or filterRule == "": return from .AdBlockRule import AdBlockRule - rule = AdBlockRule(filter, self.__subscription) + rule = AdBlockRule(filterRule, self.__subscription) self.__subscription.addRule(rule) def removeRule(self):
--- a/Helpviewer/Bookmarks/BookmarksImportDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImportDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -115,11 +115,11 @@ else: self.filePicker.setMode(E5PathPickerModes.OpenFileMode) if Globals.isMacPlatform(): - filter = "*{0}".format( + filterStr = "*{0}".format( os.path.splitext(self.__sourceFile)[1]) else: - filter = self.__sourceFile - self.filePicker.setFilters(filter) + filterStr = self.__sourceFile + self.filePicker.setFilters(filterStr) self.filePicker.setDefaultDirectory(self.__sourceDir) elif self.__currentPage == 1:
--- a/Helpviewer/Bookmarks/BookmarksImporters/BookmarksImporter.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImporters/BookmarksImporter.py Tue Mar 07 18:53:18 2017 +0100 @@ -16,11 +16,11 @@ """ Class implementing the base class for the bookmarks importers. """ - def __init__(self, id="", parent=None): + def __init__(self, sourceId="", parent=None): """ Constructor - @param id source ID (string) + @param sourceId source ID (string) @param parent reference to the parent object (QObject) """ super(BookmarksImporter, self).__init__(parent) @@ -29,7 +29,7 @@ self._file = "" self._error = False self._errorString = "" - self._id = id + self._id = sourceId def setPath(self, path): """
--- a/Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py Tue Mar 07 18:53:18 2017 +0100 @@ -20,18 +20,18 @@ import Globals -def getImporterInfo(id): +def getImporterInfo(sourceId): """ Module function to get information for the given source id. - @param id id of the browser ("chrome" or "chromium") + @param sourceId id of the browser ("chrome" or "chromium") @return tuple with an icon (QPixmap), readable name (string), name of the default bookmarks file (string), an info text (string), a prompt (string) and the default directory of the bookmarks file (string) @exception ValueError raised to indicate an invalid browser ID """ - if id == "chrome": + if sourceId == "chrome": if Globals.isWindowsPlatform(): standardDir = os.path.expandvars( "%USERPROFILE%\\AppData\\Local\\Google\\Chrome\\" @@ -55,7 +55,7 @@ """Please choose the file to begin importing bookmarks."""), standardDir, ) - elif id == "chromium": + elif sourceId == "chromium": if Globals.isWindowsPlatform(): standardDir = os.path.expandvars( "%USERPROFILE%\\AppData\\Local\\Google\\Chrome\\" @@ -76,21 +76,22 @@ standardDir, ) else: - raise ValueError("Unsupported browser ID given ({0}).".format(id)) + raise ValueError( + "Unsupported browser ID given ({0}).".format(sourceId)) class ChromeImporter(BookmarksImporter): """ Class implementing the Chrome bookmarks importer. """ - def __init__(self, id="", parent=None): + def __init__(self, sourceId="", parent=None): """ Constructor - @param id source ID (string) + @param sourceId source ID (string) @param parent reference to the parent object (QObject) """ - super(ChromeImporter, self).__init__(id, parent) + super(ChromeImporter, self).__init__(sourceId, parent) self.__fileName = ""
--- a/Helpviewer/Bookmarks/BookmarksImporters/FirefoxImporter.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImporters/FirefoxImporter.py Tue Mar 07 18:53:18 2017 +0100 @@ -20,18 +20,18 @@ import Globals -def getImporterInfo(id): +def getImporterInfo(sourceId): """ Module function to get information for the given source id. - @param id id of the browser ("chrome" or "chromium") + @param sourceId id of the browser ("chrome" or "chromium") @return tuple with an icon (QPixmap), readable name (string), name of the default bookmarks file (string), an info text (string), a prompt (string) and the default directory of the bookmarks file (string) @exception ValueError raised to indicate an invalid browser ID """ - if id == "firefox": + if sourceId == "firefox": if Globals.isWindowsPlatform(): standardDir = os.path.expandvars( "%APPDATA%\\Mozilla\\Firefox\\Profiles") @@ -55,21 +55,22 @@ standardDir, ) else: - raise ValueError("Unsupported browser ID given ({0}).".format(id)) + raise ValueError( + "Unsupported browser ID given ({0}).".format(sourceId)) class FirefoxImporter(BookmarksImporter): """ Class implementing the Chrome bookmarks importer. """ - def __init__(self, id="", parent=None): + def __init__(self, sourceId="", parent=None): """ Constructor - @param id source ID (string) + @param sourceId source ID (string) @param parent reference to the parent object (QObject) """ - super(FirefoxImporter, self).__init__(id, parent) + super(FirefoxImporter, self).__init__(sourceId, parent) self.__fileName = "" self.__db = None
--- a/Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py Tue Mar 07 18:53:18 2017 +0100 @@ -18,18 +18,18 @@ import UI.PixmapCache -def getImporterInfo(id): +def getImporterInfo(sourceId): """ Module function to get information for the given HTML source id. - @param id id of the browser ("chrome" or "chromium") + @param sourceId id of the browser ("chrome" or "chromium") @return tuple with an icon (QPixmap), readable name (string), name of the default bookmarks file (string), an info text (string), a prompt (string) and the default directory of the bookmarks file (string) @exception ValueError raised to indicate an invalid browser ID """ - if id == "html": + if sourceId == "html": return ( UI.PixmapCache.getPixmap("html.png"), "HTML Netscape Bookmarks", @@ -47,21 +47,22 @@ "", ) else: - raise ValueError("Unsupported browser ID given ({0}).".format(id)) + raise ValueError( + "Unsupported browser ID given ({0}).".format(sourceId)) class HtmlImporter(BookmarksImporter): """ Class implementing the HTML bookmarks importer. """ - def __init__(self, id="", parent=None): + def __init__(self, sourceId="", parent=None): """ Constructor - @param id source ID (string) + @param sourceId source ID (string) @param parent reference to the parent object (QObject) """ - super(HtmlImporter, self).__init__(id, parent) + super(HtmlImporter, self).__init__(sourceId, parent) self.__fileName = "" self.__inFile = None
--- a/Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py Tue Mar 07 18:53:18 2017 +0100 @@ -19,18 +19,18 @@ import Globals -def getImporterInfo(id): +def getImporterInfo(sourceId): """ Module function to get information for the given source id. - @param id id of the browser ("chrome" or "chromium") + @param sourceId id of the browser ("chrome" or "chromium") @return tuple with an icon (QPixmap), readable name (string), name of the default bookmarks file (string), an info text (string), a prompt (string) and the default directory of the bookmarks file (string) @exception ValueError raised to indicate an invalid browser ID """ - if id == "ie": + if sourceId == "ie": if Globals.isWindowsPlatform(): standardDir = os.path.expandvars( "%USERPROFILE%\\Favorites") @@ -51,21 +51,22 @@ standardDir, ) else: - raise ValueError("Unsupported browser ID given ({0}).".format(id)) + raise ValueError( + "Unsupported browser ID given ({0}).".format(sourceId)) class IExplorerImporter(BookmarksImporter): """ Class implementing the Chrome bookmarks importer. """ - def __init__(self, id="", parent=None): + def __init__(self, sourceId="", parent=None): """ Constructor - @param id source ID (string) + @param sourceId source ID (string) @param parent reference to the parent object (QObject) """ - super(IExplorerImporter, self).__init__(id, parent) + super(IExplorerImporter, self).__init__(sourceId, parent) self.__fileName = ""
--- a/Helpviewer/Bookmarks/BookmarksImporters/OperaImporter.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImporters/OperaImporter.py Tue Mar 07 18:53:18 2017 +0100 @@ -19,18 +19,18 @@ import Globals -def getImporterInfo(id): +def getImporterInfo(sourceId): """ Module function to get information for the given source id. - @param id id of the browser ("chrome" or "chromium") + @param sourceId id of the browser ("chrome" or "chromium") @return tuple with an icon (QPixmap), readable name (string), name of the default bookmarks file (string), an info text (string), a prompt (string) and the default directory of the bookmarks file (string) @exception ValueError raised to indicate an invalid browser ID """ - if id == "opera": + if sourceId == "opera": if Globals.isWindowsPlatform(): standardDir = os.path.expandvars("%APPDATA%\\Opera\\Opera") elif Globals.isMacPlatform(): @@ -52,21 +52,22 @@ standardDir, ) else: - raise ValueError("Unsupported browser ID given ({0}).".format(id)) + raise ValueError( + "Unsupported browser ID given ({0}).".format(sourceId)) class OperaImporter(BookmarksImporter): """ Class implementing the Opera bookmarks importer. """ - def __init__(self, id="", parent=None): + def __init__(self, sourceId="", parent=None): """ Constructor - @param id source ID (string) + @param sourceId source ID (string) @param parent reference to the parent object (QObject) """ - super(OperaImporter, self).__init__(id, parent) + super(OperaImporter, self).__init__(sourceId, parent) self.__fileName = ""
--- a/Helpviewer/Bookmarks/BookmarksImporters/SafariImporter.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImporters/SafariImporter.py Tue Mar 07 18:53:18 2017 +0100 @@ -21,18 +21,18 @@ from Utilities import binplistlib -def getImporterInfo(id): +def getImporterInfo(sourceId): """ Module function to get information for the given source id. - @param id id of the browser ("chrome" or "chromium") + @param sourceId id of the browser ("chrome" or "chromium") @return tuple with an icon (QPixmap), readable name (string), name of the default bookmarks file (string), an info text (string), a prompt (string) and the default directory of the bookmarks file (string) @exception ValueError raised to indicate an invalid browser ID """ - if id == "safari": + if sourceId == "safari": if Globals.isWindowsPlatform(): standardDir = os.path.expandvars( "%APPDATA%\\Apple Computer\\Safari") @@ -55,21 +55,22 @@ standardDir, ) else: - raise ValueError("Unsupported browser ID given ({0}).".format(id)) + raise ValueError( + "Unsupported browser ID given ({0}).".format(sourceId)) class SafariImporter(BookmarksImporter): """ Class implementing the Apple Safari bookmarks importer. """ - def __init__(self, id="", parent=None): + def __init__(self, sourceId="", parent=None): """ Constructor - @param id source ID (string) + @param sourceId source ID (string) @param parent reference to the parent object (QObject) """ - super(SafariImporter, self).__init__(id, parent) + super(SafariImporter, self).__init__(sourceId, parent) self.__fileName = ""
--- a/Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py Tue Mar 07 18:53:18 2017 +0100 @@ -18,18 +18,18 @@ import UI.PixmapCache -def getImporterInfo(id): +def getImporterInfo(sourceId): """ Module function to get information for the given XBEL source id. - @param id id of the browser ("chrome" or "chromium") + @param sourceId id of the browser ("chrome" or "chromium") @return tuple with an icon (QPixmap), readable name (string), name of the default bookmarks file (string), an info text (string), a prompt (string) and the default directory of the bookmarks file (string) @exception ValueError raised to indicate an invalid browser ID """ - if id == "e5browser": + if sourceId == "e5browser": from ..BookmarksManager import BookmarksManager bookmarksFile = BookmarksManager.getFileName() return ( @@ -46,7 +46,7 @@ """Please choose the file to begin importing bookmarks."""), os.path.dirname(bookmarksFile), ) - elif id == "konqueror": + elif sourceId == "konqueror": if os.path.exists(os.path.expanduser("~/.kde4")): standardDir = os.path.expanduser("~/.kde4/share/apps/konqueror") elif os.path.exists(os.path.expanduser("~/.kde")): @@ -67,7 +67,7 @@ """Please choose the file to begin importing bookmarks."""), standardDir, ) - elif id == "xbel": + elif sourceId == "xbel": return ( UI.PixmapCache.getPixmap("xbel.png"), "XBEL Bookmarks", @@ -84,21 +84,22 @@ "", ) else: - raise ValueError("Unsupported browser ID given ({0}).".format(id)) + raise ValueError( + "Unsupported browser ID given ({0}).".format(sourceId)) class XbelImporter(BookmarksImporter): """ Class implementing the XBEL bookmarks importer. """ - def __init__(self, id="", parent=None): + def __init__(self, sourceId="", parent=None): """ Constructor - @param id source ID (string) + @param sourceId source ID (string) @param parent reference to the parent object (QObject) """ - super(XbelImporter, self).__init__(id, parent) + super(XbelImporter, self).__init__(sourceId, parent) self.__fileName = ""
--- a/Helpviewer/Bookmarks/BookmarksImporters/__init__.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImporters/__init__.py Tue Mar 07 18:53:18 2017 +0100 @@ -55,71 +55,71 @@ return importers -def getImporterInfo(id): +def getImporterInfo(sourceId): """ Module function to get information for the given source id. - @param id source id to get info for (string) + @param sourceId source id to get info for (string) @return tuple with an icon (QPixmap), readable name (string), name of the default bookmarks file (string), an info text (string), a prompt (string) and the default directory of the bookmarks file (string) @exception ValueError raised to indicate an unsupported importer """ - if id in ["e5browser", "xbel", "konqueror"]: + if sourceId in ["e5browser", "xbel", "konqueror"]: from . import XbelImporter - return XbelImporter.getImporterInfo(id) - elif id == "html": + return XbelImporter.getImporterInfo(sourceId) + elif sourceId == "html": from . import HtmlImporter - return HtmlImporter.getImporterInfo(id) - elif id in ["chrome", "chromium"]: + return HtmlImporter.getImporterInfo(sourceId) + elif sourceId in ["chrome", "chromium"]: from . import ChromeImporter - return ChromeImporter.getImporterInfo(id) - elif id == "opera": + return ChromeImporter.getImporterInfo(sourceId) + elif sourceId == "opera": from . import OperaImporter - return OperaImporter.getImporterInfo(id) - elif id == "firefox": + return OperaImporter.getImporterInfo(sourceId) + elif sourceId == "firefox": from . import FirefoxImporter - return FirefoxImporter.getImporterInfo(id) - elif id == "ie": + return FirefoxImporter.getImporterInfo(sourceId) + elif sourceId == "ie": from . import IExplorerImporter - return IExplorerImporter.getImporterInfo(id) - elif id == "safari": + return IExplorerImporter.getImporterInfo(sourceId) + elif sourceId == "safari": from . import SafariImporter - return SafariImporter.getImporterInfo(id) + return SafariImporter.getImporterInfo(sourceId) else: - raise ValueError("Invalid importer ID given ({0}).".format(id)) + raise ValueError("Invalid importer ID given ({0}).".format(sourceId)) -def getImporter(id, parent=None): +def getImporter(sourceId, parent=None): """ Module function to get an importer for the given source id. - @param id source id to get an importer for (string) + @param sourceId source id to get an importer for (string) @param parent reference to the parent object (QObject) @return bookmarks importer (BookmarksImporter) @exception ValueError raised to indicate an unsupported importer """ - if id in ["e5browser", "xbel", "konqueror"]: + if sourceId in ["e5browser", "xbel", "konqueror"]: from . import XbelImporter - return XbelImporter.XbelImporter(id, parent) - elif id == "html": + return XbelImporter.XbelImporter(sourceId, parent) + elif sourceId == "html": from . import HtmlImporter - return HtmlImporter.HtmlImporter(id, parent) - elif id in ["chrome", "chromium"]: + return HtmlImporter.HtmlImporter(sourceId, parent) + elif sourceId in ["chrome", "chromium"]: from . import ChromeImporter - return ChromeImporter.ChromeImporter(id, parent) - elif id == "opera": + return ChromeImporter.ChromeImporter(sourceId, parent) + elif sourceId == "opera": from . import OperaImporter - return OperaImporter.OperaImporter(id, parent) - elif id == "firefox": + return OperaImporter.OperaImporter(sourceId, parent) + elif sourceId == "firefox": from . import FirefoxImporter - return FirefoxImporter.FirefoxImporter(id, parent) - elif id == "ie": + return FirefoxImporter.FirefoxImporter(sourceId, parent) + elif sourceId == "ie": from . import IExplorerImporter - return IExplorerImporter.IExplorerImporter(id, parent) - elif id == "safari": + return IExplorerImporter.IExplorerImporter(sourceId, parent) + elif sourceId == "safari": from . import SafariImporter - return SafariImporter.SafariImporter(id, parent) + return SafariImporter.SafariImporter(sourceId, parent) else: - raise ValueError("No importer for ID {0}.".format(id)) + raise ValueError("No importer for ID {0}.".format(sourceId))
--- a/Helpviewer/Bookmarks/NsHtmlReader.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Bookmarks/NsHtmlReader.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Helpviewer/Download/DownloadItem.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Download/DownloadItem.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Helpviewer/Feeds/FeedsManager.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Feeds/FeedsManager.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Helpviewer/FlashCookieManager/FlashCookieManager.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/FlashCookieManager/FlashCookieManager.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode # __IGNORE_EXCEPTION__ + str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__ except NameError: pass
--- a/Helpviewer/FlashCookieManager/FlashCookieManagerDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/FlashCookieManager/FlashCookieManagerDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -149,26 +149,26 @@ self.blackList.addItem(origin) @pyqtSlot(str) - def on_filterEdit_textChanged(self, filter): + def on_filterEdit_textChanged(self, filterStr): """ Private slot to filter the cookies list. - @param filter filter text + @param filterStr filter text @type str """ - if not filter: + if not filterStr: # show all in collapsed state for index in range(self.cookiesList.topLevelItemCount()): self.cookiesList.topLevelItem(index).setHidden(False) self.cookiesList.topLevelItem(index).setExpanded(False) else: # show matching in expanded state - filter = filter.lower() + filterStr = filterStr.lower() for index in range(self.cookiesList.topLevelItemCount()): txt = "." + self.cookiesList.topLevelItem(index)\ .text(0).lower() self.cookiesList.topLevelItem(index).setHidden( - filter not in txt) + filterStr not in txt) self.cookiesList.topLevelItem(index).setExpanded(True) @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem)
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyScript.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyScript.py Tue Mar 07 18:53:18 2017 +0100 @@ -134,10 +134,10 @@ @return list of included URLs (list of strings) """ - list = [] + urlList = [] for matcher in self.__include: - list.append(matcher.pattern()) - return list + urlList.append(matcher.pattern()) + return urlList def exclude(self): """ @@ -145,10 +145,10 @@ @return list of excluded URLs (list of strings) """ - list = [] + urlList = [] for matcher in self.__exclude: - list.append(matcher.pattern()) - return list + urlList.append(matcher.pattern()) + return urlList def script(self): """
--- a/Helpviewer/HelpBrowserWV.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/HelpBrowserWV.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode # __IGNORE_EXCEPTION__ + str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__ except NameError: pass
--- a/Helpviewer/HelpIndexWidget.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/HelpIndexWidget.py Tue Mar 07 18:53:18 2017 +0100 @@ -122,16 +122,16 @@ link = dlg.link() return link - def __filterIndices(self, filter): + def __filterIndices(self, filterStr): """ Private slot to filter the indices according to the given filter. - @param filter filter to be used (string) + @param filterStr filter to be used (string) """ - if '*' in filter: - self.__index.filterIndices(filter, filter) + if '*' in filterStr: + self.__index.filterIndices(filterStr, filterStr) else: - self.__index.filterIndices(filter) + self.__index.filterIndices(filterStr) def __enableSearchEdit(self): """
--- a/Helpviewer/HelpWindow.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/HelpWindow.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Helpviewer/Network/FileReply.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Network/FileReply.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass @@ -191,8 +191,8 @@ """ Private slot loading the directory and preparing the listing page. """ - dir = QDir(self.url().toLocalFile()) - dirItems = dir.entryInfoList( + qdir = QDir(self.url().toLocalFile()) + dirItems = qdir.entryInfoList( QDir.AllEntries | QDir.Hidden | QDir.NoDotAndDotDot, QDir.Name | QDir.DirsFirst)
--- a/Helpviewer/Network/FtpReply.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Network/FtpReply.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Helpviewer/OpenSearch/OpenSearchManager.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/OpenSearch/OpenSearchManager.py Tue Mar 07 18:53:18 2017 +0100 @@ -279,17 +279,17 @@ @param dirName name of the directory to write the files to (string) """ - dir = QDir() - if not dir.mkpath(dirName): + qdir = QDir() + if not qdir.mkpath(dirName): return - dir.setPath(dirName) + qdir.setPath(dirName) from .OpenSearchWriter import OpenSearchWriter writer = OpenSearchWriter() for engine in list(self.__engines.values()): name = self.generateEngineFileName(engine.name()) - fileName = dir.filePath(name) + fileName = qdir.filePath(name) file = QFile(fileName) if not file.open(QIODevice.WriteOnly): @@ -325,9 +325,9 @@ success = False - dir = QDir(dirName) - for name in dir.entryList(["*.xml"]): - fileName = dir.filePath(name) + qdir = QDir(dirName) + for name in qdir.entryList(["*.xml"]): + fileName = qdir.filePath(name) if self.__addEngineByFile(fileName): success = True
--- a/Helpviewer/Passwords/PasswordManager.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Passwords/PasswordManager.py Tue Mar 07 18:53:18 2017 +0100 @@ -638,8 +638,8 @@ progress.setValue(count) QCoreApplication.processEvents() username, hash = self.__logins[key] - hash = Utilities.crypto.pwRecode(hash, oldPassword, newPassword) - self.__logins[key] = (username, hash) + pwHash = Utilities.crypto.pwRecode(hash, oldPassword, newPassword) + self.__logins[key] = (username, pwHash) count += 1 progress.setValue(len(self.__logins))
--- a/Helpviewer/QtHelpDocumentationSelectionDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/QtHelpDocumentationSelectionDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Helpviewer/QtHelpFiltersDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/QtHelpFiltersDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -43,22 +43,22 @@ self.filtersList.clear() self.attributesList.clear() - help = QHelpEngineCore(self.__engine.collectionFile()) - help.setupData() + helpEngineCore = QHelpEngineCore(self.__engine.collectionFile()) + helpEngineCore.setupData() self.__removedFilters = [] self.__filterMap = {} self.__filterMapBackup = {} self.__removedAttributes = [] - for filter in help.customFilters(): - atts = help.filterAttributes(filter) + for filter in helpEngineCore.customFilters(): + atts = helpEngineCore.filterAttributes(filter) self.__filterMapBackup[filter] = atts if filter not in self.__filterMap: self.__filterMap[filter] = atts self.filtersList.addItems(sorted(self.__filterMap.keys())) - for attr in help.filterAttributes(): + for attr in helpEngineCore.filterAttributes(): QTreeWidgetItem(self.attributesList, [attr]) self.attributesList.sortItems(0, Qt.AscendingOrder) @@ -103,8 +103,8 @@ if self.filtersList.currentItem() is None: return - filter = self.filtersList.currentItem().text() - if filter not in self.__filterMap: + filterText = self.filtersList.currentItem().text() + if filterText not in self.__filterMap: return newAtts = [] @@ -112,7 +112,7 @@ itm = self.attributesList.topLevelItem(index) if itm.checkState(0) == Qt.Checked: newAtts.append(itm.text(0)) - self.__filterMap[filter] = newAtts + self.__filterMap[filterText] = newAtts @pyqtSlot() def on_attributesList_itemSelectionChanged(self):
--- a/Helpviewer/SiteInfo/SiteInfoDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/SiteInfo/SiteInfoDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -307,13 +307,13 @@ if current is None: return - id = current.data(Qt.UserRole) + dbId = current.data(Qt.UserRole) databases = self.__mainFrame.securityOrigin().databases() - if id >= len(databases): + if dbId >= len(databases): return - db = databases[id] + db = databases[dbId] self.databaseName.setText( "{0} ({1})".format(db.displayName(), db.name())) self.databasePath.setText(db.fileName())
--- a/Helpviewer/SpeedDial/SpeedDial.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/SpeedDial/SpeedDial.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Helpviewer/UrlBar/FavIconLabel.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/UrlBar/FavIconLabel.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Helpviewer/UrlBar/UrlBar.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/UrlBar/UrlBar.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Helpviewer/VirusTotal/VirusTotalApi.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/VirusTotal/VirusTotalApi.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py Tue Mar 07 18:53:18 2017 +0100 @@ -142,11 +142,11 @@ """ self.__plugin.removeFromWhitelist(self.__url.host()) - def __load(self, all=False): + def __load(self, allPlayers=False): """ Private slot to load the flash content. - @param all flag indicating to load all flash players. (boolean) + @param allPlayers flag indicating to load all flash players (boolean) """ self.__findElement() if not self.__element.isNull():
--- a/HexEdit/HexEditGotoWidget.py Tue Mar 07 18:46:09 2017 +0100 +++ b/HexEdit/HexEditGotoWidget.py Tue Mar 07 18:53:18 2017 +0100 @@ -48,9 +48,9 @@ self.closeButton.setIcon(UI.PixmapCache.getIcon("close.png")) - for format in formatOrder: - formatStr, validator = self.__formatAndValidators[format] - self.formatCombo.addItem(formatStr, format) + for dataFormat in formatOrder: + formatStr, validator = self.__formatAndValidators[dataFormat] + self.formatCombo.addItem(formatStr, dataFormat) self.formatCombo.setCurrentIndex(0) @@ -71,16 +71,16 @@ @type int """ if idx >= 0: - format = self.formatCombo.itemData(idx) + dataFormat = self.formatCombo.itemData(idx) - if format != self.__currentFormat: + if dataFormat != self.__currentFormat: txt = self.offsetEdit.text() newTxt = self.__convertText( - txt, self.__currentFormat, format) - self.__currentFormat = format + txt, self.__currentFormat, dataFormat) + self.__currentFormat = dataFormat self.offsetEdit.setValidator( - self.__formatAndValidators[format][1]) + self.__formatAndValidators[dataFormat][1]) self.offsetEdit.setText(newTxt) @@ -99,8 +99,8 @@ """ Private slot to move the cursor and extend the selection. """ - format = self.formatCombo.itemData(self.formatCombo.currentIndex()) - if format == "hex": + dataFormat = self.formatCombo.itemData(self.formatCombo.currentIndex()) + if dataFormat == "hex": offset = self.offsetEdit.text().replace(":", "") # get rid of ':' address separators offset = int(offset, 16)
--- a/HexEdit/HexEditSearchReplaceWidget.py Tue Mar 07 18:46:09 2017 +0100 +++ b/HexEdit/HexEditSearchReplaceWidget.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode # __IGNORE_EXCEPTION__ + str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__ except NameError: pass @@ -85,13 +85,13 @@ self.__ui.replaceAllButton.setIcon( UI.PixmapCache.getIcon("editReplaceAll.png")) - for format in formatOrder: - formatStr, validator = self.__formatAndValidators[format] - self.__ui.findFormatCombo.addItem(formatStr, format) + for dataFormat in formatOrder: + formatStr, validator = self.__formatAndValidators[dataFormat] + self.__ui.findFormatCombo.addItem(formatStr, dataFormat) if replace: - for format in formatOrder: - formatStr, validator = self.__formatAndValidators[format] - self.__ui.replaceFormatCombo.addItem(formatStr, format) + for dataFormat in formatOrder: + formatStr, validator = self.__formatAndValidators[dataFormat] + self.__ui.replaceFormatCombo.addItem(formatStr, dataFormat) self.__ui.findtextCombo.setCompleter(None) self.__ui.findtextCombo.lineEdit().returnPressed.connect( @@ -128,16 +128,16 @@ @type int """ if idx >= 0: - format = self.__ui.findFormatCombo.itemData(idx) + findFormat = self.__ui.findFormatCombo.itemData(idx) - if format != self.__currentFindFormat: + if findFormat != self.__currentFindFormat: txt = self.__ui.findtextCombo.currentText() newTxt = self.__convertText( - txt, self.__currentFindFormat, format) - self.__currentFindFormat = format + txt, self.__currentFindFormat, findFormat) + self.__currentFindFormat = findFormat self.__ui.findtextCombo.setValidator( - self.__formatAndValidators[format][1]) + self.__formatAndValidators[findFormat][1]) self.__ui.findtextCombo.setEditText(newTxt) @@ -202,8 +202,8 @@ txt = textCombo.currentText() idx = formatCombo.currentIndex() - format = formatCombo.itemData(idx) - ba = self.__text2bytearray(txt, format) + findFormat = formatCombo.itemData(idx) + ba = self.__text2bytearray(txt, findFormat) # This moves any previous occurrence of this statement to the head # of the list and updates the combobox @@ -292,16 +292,16 @@ @type int """ if idx >= 0: - format = self.__ui.replaceFormatCombo.itemData(idx) + replaceFormat = self.__ui.replaceFormatCombo.itemData(idx) - if format != self.__currentReplaceFormat: + if replaceFormat != self.__currentReplaceFormat: txt = self.__ui.replacetextCombo.currentText() newTxt = self.__convertText( - txt, self.__currentReplaceFormat, format) - self.__currentReplaceFormat = format + txt, self.__currentReplaceFormat, replaceFormat) + self.__currentReplaceFormat = replaceFormat self.__ui.replacetextCombo.setValidator( - self.__formatAndValidators[format][1]) + self.__formatAndValidators[replaceFormat][1]) self.__ui.replacetextCombo.setEditText(newTxt) @@ -531,59 +531,59 @@ return value - def __text2bytearray(self, txt, format): + def __text2bytearray(self, txt, dataFormat): """ Private method to convert a text to a byte array. @param txt text to be converted @type str - @param format format of the text + @param dataFormat format of the text @type str @return converted text @rtype bytearray """ - assert format in self.__formatAndValidators.keys() + assert dataFormat in self.__formatAndValidators.keys() - if format == "hex": # hex format + if dataFormat == "hex": # hex format ba = bytearray(QByteArray.fromHex( bytes(txt, encoding="ascii"))) - elif format == "dec": # decimal format + elif dataFormat == "dec": # decimal format ba = self.__int2bytearray(int(txt, 10)) - elif format == "oct": # octal format + elif dataFormat == "oct": # octal format ba = self.__int2bytearray(int(txt, 8)) - elif format == "bin": # binary format + elif dataFormat == "bin": # binary format ba = self.__int2bytearray(int(txt, 2)) - elif format == "iso-8859-1": # latin-1/iso-8859-1 text + elif dataFormat == "iso-8859-1": # latin-1/iso-8859-1 text ba = bytearray(txt, encoding="iso-8859-1") - elif format == "utf-8": # utf-8 text + elif dataFormat == "utf-8": # utf-8 text ba = bytearray(txt, encoding="utf-8") return ba - def __bytearray2text(self, array, format): + def __bytearray2text(self, array, dataFormat): """ Private method to convert a byte array to a text. @param array byte array to be converted @type bytearray - @param format format of the text + @param dataFormat format of the text @type str @return formatted text @rtype str """ - assert format in self.__formatAndValidators.keys() + assert dataFormat in self.__formatAndValidators.keys() - if format == "hex": # hex format + if dataFormat == "hex": # hex format txt = "{0:x}".format(self.__bytearray2int(array)) - elif format == "dec": # decimal format + elif dataFormat == "dec": # decimal format txt = "{0:d}".format(self.__bytearray2int(array)) - elif format == "oct": # octal format + elif dataFormat == "oct": # octal format txt = "{0:o}".format(self.__bytearray2int(array)) - elif format == "bin": # binary format + elif dataFormat == "bin": # binary format txt = "{0:b}".format(self.__bytearray2int(array)) - elif format == "iso-8859-1": # latin-1/iso-8859-1 text + elif dataFormat == "iso-8859-1": # latin-1/iso-8859-1 text txt = str(array, encoding="iso-8859-1") - elif format == "utf-8": # utf-8 text + elif dataFormat == "utf-8": # utf-8 text txt = str(array, encoding="utf-8", errors="replace") return txt
--- a/HexEdit/HexEditWidget.py Tue Mar 07 18:46:09 2017 +0100 +++ b/HexEdit/HexEditWidget.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals, division try: - chr = unichr # __IGNORE_EXCEPTION__ + chr = unichr # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__ except NameError: pass @@ -706,18 +706,18 @@ self.__undoStack.insertByteArray(pos, bytearray(byteArray)) self.__refresh() - def replaceByteArray(self, pos, len, byteArray): + def replaceByteArray(self, pos, length, byteArray): """ Public method to replace bytes. @param pos position to replace the bytes at @type int - @param len amount of bytes to replace + @param length amount of bytes to replace @type int @param byteArray bytes to replace with @type bytearray or QByteArray """ - self.__undoStack.overwriteByteArray(pos, len, bytearray(byteArray)) + self.__undoStack.overwriteByteArray(pos, length, bytearray(byteArray)) self.__refresh() def cursorPositionFromPoint(self, point): @@ -1426,9 +1426,10 @@ 3 * self.__pxCharWidth, self.__pxCharHeight) painter.fillRect(r, c) - hex = chr(self.__hexDataShown[(bPosLine + colIdx) * 2]) + \ + hexStr = \ + chr(self.__hexDataShown[(bPosLine + colIdx) * 2]) + \ chr(self.__hexDataShown[(bPosLine + colIdx) * 2 + 1]) - painter.drawText(pxPosX, pxPosY, hex) + painter.drawText(pxPosX, pxPosY, hexStr) pxPosX += 3 * self.__pxCharWidth # render ascii value
--- a/Network/IRC/IrcWidget.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Network/IRC/IrcWidget.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgClient.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgClient.py Tue Mar 07 18:53:18 2017 +0100 @@ -8,7 +8,7 @@ """ try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Preferences/ProgramsDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Preferences/ProgramsDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Project/Project.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Project/Project.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode # __IGNORE_EXCEPTION__ + str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__ except NameError: pass
--- a/Project/ProjectFormsBrowser.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Project/ProjectFormsBrowser.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Project/ProjectInterfacesBrowser.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Project/ProjectInterfacesBrowser.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/Project/ProjectResourcesBrowser.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Project/ProjectResourcesBrowser.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/QScintilla/Editor.py Tue Mar 07 18:46:09 2017 +0100 +++ b/QScintilla/Editor.py Tue Mar 07 18:53:18 2017 +0100 @@ -8,8 +8,8 @@ """ from __future__ import unicode_literals try: - str = unicode - chr = unichr + str = unicode # __IGNORE_WARNING_M131__ + chr = unichr # __IGNORE_WARNING_M131__ except NameError: pass
--- a/ThirdParty/Send2Trash/send2trash/plat_other.py Tue Mar 07 18:46:09 2017 +0100 +++ b/ThirdParty/Send2Trash/send2trash/plat_other.py Tue Mar 07 18:53:18 2017 +0100 @@ -16,7 +16,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/UI/BrowserModel.py Tue Mar 07 18:46:09 2017 +0100 +++ b/UI/BrowserModel.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/UI/SymbolsWidget.py Tue Mar 07 18:46:09 2017 +0100 +++ b/UI/SymbolsWidget.py Tue Mar 07 18:53:18 2017 +0100 @@ -11,9 +11,9 @@ try: # Py2 - str = unicode # __IGNORE_WARNING__ - chr = unichr # __IGNORE_WARNING__ - import htmlentitydefs as html_entities # __IGNORE_WARNING__ + str = unicode # __IGNORE_WARNING_M131__ + chr = unichr # __IGNORE_WARNING_M131__ + import htmlentitydefs as html_entities except (NameError, ImportError): # Py3 import html.entities as html_entities
--- a/UI/UserInterface.py Tue Mar 07 18:46:09 2017 +0100 +++ b/UI/UserInterface.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode # __IGNORE_EXCEPTION__ + str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__ except NameError: pass
--- a/Utilities/__init__.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Utilities/__init__.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ import locale import urllib
--- a/Utilities/binplistlib.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Utilities/binplistlib.py Tue Mar 07 18:53:18 2017 +0100 @@ -54,7 +54,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/WebBrowser/Bookmarks/NsHtmlReader.py Tue Mar 07 18:46:09 2017 +0100 +++ b/WebBrowser/Bookmarks/NsHtmlReader.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/WebBrowser/Feeds/FeedsManager.py Tue Mar 07 18:46:09 2017 +0100 +++ b/WebBrowser/Feeds/FeedsManager.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode # __IGNORE_EXCEPTION__ + str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__ except NameError: pass
--- a/WebBrowser/FlashCookieManager/FlashCookieManager.py Tue Mar 07 18:46:09 2017 +0100 +++ b/WebBrowser/FlashCookieManager/FlashCookieManager.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode # __IGNORE_EXCEPTION__ + str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__ except NameError: pass
--- a/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py Tue Mar 07 18:46:09 2017 +0100 +++ b/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/WebBrowser/SpeedDial/SpeedDial.py Tue Mar 07 18:46:09 2017 +0100 +++ b/WebBrowser/SpeedDial/SpeedDial.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/WebBrowser/Tools/WebBrowserTools.py Tue Mar 07 18:46:09 2017 +0100 +++ b/WebBrowser/Tools/WebBrowserTools.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode # __IGNORE_EXCEPTION__ + str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__ except NameError: pass
--- a/WebBrowser/UrlBar/FavIconLabel.py Tue Mar 07 18:46:09 2017 +0100 +++ b/WebBrowser/UrlBar/FavIconLabel.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass
--- a/WebBrowser/UrlBar/UrlBar.py Tue Mar 07 18:46:09 2017 +0100 +++ b/WebBrowser/UrlBar/UrlBar.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode # __IGNORE_EXCEPTION__ + str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__ except NameError: pass
--- a/WebBrowser/VirusTotal/VirusTotalApi.py Tue Mar 07 18:46:09 2017 +0100 +++ b/WebBrowser/VirusTotal/VirusTotalApi.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode # __IGNORE_EXCEPTION__ + str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__ except NameError: pass
--- a/WebBrowser/WebBrowserPage.py Tue Mar 07 18:46:09 2017 +0100 +++ b/WebBrowser/WebBrowserPage.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode # __IGNORE_EXCEPTION__ + str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__ except NameError: pass
--- a/WebBrowser/WebBrowserView.py Tue Mar 07 18:46:09 2017 +0100 +++ b/WebBrowser/WebBrowserView.py Tue Mar 07 18:53:18 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode # __IGNORE_EXCEPTION__ + str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__ except NameError: pass
--- a/WebBrowser/WebBrowserWindow.py Tue Mar 07 18:46:09 2017 +0100 +++ b/WebBrowser/WebBrowserWindow.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode # __IGNORE_EXCEPTION__ + str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__ except NameError: pass
--- a/WebBrowser/WebInspector.py Tue Mar 07 18:46:09 2017 +0100 +++ b/WebBrowser/WebInspector.py Tue Mar 07 18:53:18 2017 +0100 @@ -9,7 +9,7 @@ from __future__ import unicode_literals try: - str = unicode # __IGNORE_EXCEPTION__ + str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__ except NameError: pass
--- a/eric6_doc.py Tue Mar 07 18:46:09 2017 +0100 +++ b/eric6_doc.py Tue Mar 07 18:53:18 2017 +0100 @@ -269,7 +269,6 @@ qtHelpTitle == ""): usage() - input = output = 0 basename = "" if outputDir: @@ -385,8 +384,6 @@ sys.stderr.write("{0} error: {1}\n".format(file, v)) continue - input = input + 1 - f = Utilities.joinext(os.path.join( outputDir, moduleDocument.name()), ".html") @@ -410,8 +407,7 @@ sys.stderr.write("{0} error: {1}\n".format(file, v[1])) else: sys.stdout.write("{0} ok\n".format(f)) - - output = output + 1 + sys.stdout.flush() sys.stderr.flush()
--- a/eric6_webbrowser.py Tue Mar 07 18:46:09 2017 +0100 +++ b/eric6_webbrowser.py Tue Mar 07 18:53:18 2017 +0100 @@ -93,8 +93,9 @@ except IndexError: home = "" - help = HelpWindow(home, '.', None, 'help viewer', searchWord=searchWord) - return help + helpWindow = HelpWindow(home, '.', None, 'help viewer', + searchWord=searchWord) + return helpWindow def main():
