Mercurial Repositories > eric / changeset
changeset
Continued fixing code style issues detected by the extended style checker.
Thu, 09 Mar 2017 19:28:59 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 09 Mar 2017 19:28:59 +0100
- changeset 5597
- 3d88d53f8c2b
- parent 5596
- 4550d8e34765
- child 5599
- 033967644b1f
Continued fixing code style issues detected by the extended style checker.
--- a/Cooperation/Connection.py Thu Mar 09 17:56:06 2017 +0100 +++ b/Cooperation/Connection.py Thu Mar 09 19:28:59 2017 +0100 @@ -398,9 +398,9 @@ participantsList = msg.split(SeparatorToken) self.participants.emit(participantsList[:]) elif self.__currentDataType == Connection.Editor: - hash, fn, msg = \ + hashStr, fn, msg = \ str(self.__buffer, encoding="utf-8").split(SeparatorToken) - self.editorCommand.emit(hash, fn, msg) + self.editorCommand.emit(hashStr, fn, msg) self.__currentDataType = Connection.Undefined self.__numBytesForCurrentDataType = 0
--- a/DataViews/CodeMetrics.py Thu Mar 09 17:56:06 2017 +0100 +++ b/DataViews/CodeMetrics.py Thu Mar 09 19:28:59 2017 +0100 @@ -170,8 +170,8 @@ @param key the key to be incremented @param value the increment (int) """ - for id, level, row in self.active: - counters = self.counters.setdefault(id, {}) + for counterId, level, row in self.active: + counters = self.counters.setdefault(counterId, {}) counters[key] = counters.setdefault(key, 0) + value def getCounter(self, counterId, key):
--- a/DataViews/CodeMetricsDialog.py Thu Mar 09 17:56:06 2017 +0100 +++ b/DataViews/CodeMetricsDialog.py Thu Mar 09 19:28:59 2017 +0100 @@ -270,9 +270,9 @@ self.__data) filterList = filterString.split(",") if filterList: - for filter in filterList: + for filterString in filterList: fileList = [f for f in fileList - if not fnmatch.fnmatch(f, filter.strip())] + if not fnmatch.fnmatch(f, filterString.strip())] self.resultList.clear() self.summaryList.clear()
--- a/E5Gui/E5ErrorMessage.py Thu Mar 09 17:56:06 2017 +0100 +++ b/E5Gui/E5ErrorMessage.py Thu Mar 09 19:28:59 2017 +0100 @@ -57,9 +57,9 @@ @return flag indicating that the message should be filtered out (boolean) """ - for filter in Globals.toList(self.settings.value( + for filterStr in Globals.toList(self.settings.value( "MessageFilters", self.__defaultFilters)): - if filter in message: + if filterStr in message: return True return False
--- a/E5Gui/E5GenericDiffHighlighter.py Thu Mar 09 17:56:06 2017 +0100 +++ b/E5Gui/E5GenericDiffHighlighter.py Thu Mar 09 19:28:59 2017 +0100 @@ -137,14 +137,14 @@ self.setFormat(0, len(text), self.normalFormat) return - for match, format in formats: + for match, formatStr in formats: start = match.start() groups = match.groups() # No groups in the regex, assume this is a single rule # that spans the entire line if not groups: - self.setFormat(0, len(text), format) + self.setFormat(0, len(text), formatStr) continue # Groups exist, rule is a tuple corresponding to group @@ -155,7 +155,7 @@ # allow None as a no-op format length = len(group) - if format[groupIndex]: + if formatStr[groupIndex]: self.setFormat(start, start + length, - format[groupIndex]) + formatStr[groupIndex]) start += length
--- a/Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py Thu Mar 09 17:56:06 2017 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py Thu Mar 09 19:28:59 2017 +0100 @@ -108,11 +108,12 @@ importRootNode = BookmarkNode(BookmarkNode.Folder) folders[self.__fileName] = importRootNode - for dir, subdirs, files in os.walk(self.__fileName): + for directory, subdirs, files in os.walk(self.__fileName): for subdir in subdirs: - path = os.path.join(dir, subdir) - if dir in folders: - folder = BookmarkNode(BookmarkNode.Folder, folders[dir]) + path = os.path.join(directory, subdir) + if directory in folders: + folder = BookmarkNode(BookmarkNode.Folder, + folders[directory]) else: folder = BookmarkNode(BookmarkNode.Folder, importRootNode) folder.title = subdir.replace("&", "&&") @@ -121,7 +122,7 @@ for file in files: name, ext = os.path.splitext(file) if ext.lower() == ".url": - path = os.path.join(dir, file) + path = os.path.join(directory, file) try: f = open(path, "r") contents = f.read() @@ -134,9 +135,9 @@ url = line.replace("URL=", "") break if url: - if dir in folders: + if directory in folders: bookmark = BookmarkNode(BookmarkNode.Bookmark, - folders[dir]) + folders[directory]) else: bookmark = BookmarkNode(BookmarkNode.Bookmark, importRootNode)
--- a/Helpviewer/Passwords/PasswordManager.py Thu Mar 09 17:56:06 2017 +0100 +++ b/Helpviewer/Passwords/PasswordManager.py Thu Mar 09 19:28:59 2017 +0100 @@ -486,13 +486,13 @@ # extract the forms from Helpviewer.JavaScriptResources import parseForms_js lst = webPage.mainFrame().evaluateJavaScript(parseForms_js) - for map in lst: + for formMap in lst: formHasPasswords = False - formName = map["name"] - formIndex = map["index"] + formName = formMap["name"] + formIndex = formMap["index"] if isinstance(formIndex, float) and formIndex.is_integer(): formIndex = int(formIndex) - elements = map["elements"] + elements = formMap["elements"] formElements = set() formElementTypes = {} deadElements = set() @@ -637,9 +637,10 @@ for key in self.__logins: progress.setValue(count) QCoreApplication.processEvents() - username, hash = self.__logins[key] - pwHash = Utilities.crypto.pwRecode(hash, oldPassword, newPassword) - self.__logins[key] = (username, pwHash) + username, oldPwHash = self.__logins[key] + newPwHash = Utilities.crypto.pwRecode(oldPwHash, oldPassword, + newPassword) + self.__logins[key] = (username, newPwHash) count += 1 progress.setValue(len(self.__logins))
--- a/Helpviewer/QtHelpDocumentationDialog.py Thu Mar 09 17:56:06 2017 +0100 +++ b/Helpviewer/QtHelpDocumentationDialog.py Thu Mar 09 19:28:59 2017 +0100 @@ -176,9 +176,9 @@ if not res: return self.__unregisteredDocs.append(ns) - for id in openedDocs: - if openedDocs[id] == ns and id not in self.__tabsToClose: - self.__tabsToClose.append(id) + for docId in openedDocs: + if openedDocs[docId] == ns and docId not in self.__tabsToClose: + self.__tabsToClose.append(docId) itm = self.documentsList.takeItem(self.documentsList.row(item)) del itm
--- a/Helpviewer/QtHelpFiltersDialog.py Thu Mar 09 17:56:06 2017 +0100 +++ b/Helpviewer/QtHelpFiltersDialog.py Thu Mar 09 19:28:59 2017 +0100 @@ -51,11 +51,11 @@ self.__filterMapBackup = {} self.__removedAttributes = [] - for filter in helpEngineCore.customFilters(): - atts = helpEngineCore.filterAttributes(filter) - self.__filterMapBackup[filter] = atts - if filter not in self.__filterMap: - self.__filterMap[filter] = atts + for customFilter in helpEngineCore.customFilters(): + atts = helpEngineCore.filterAttributes(customFilter) + self.__filterMapBackup[customFilter] = atts + if customFilter not in self.__filterMap: + self.__filterMap[customFilter] = atts self.filtersList.addItems(sorted(self.__filterMap.keys())) for attr in helpEngineCore.filterAttributes(): @@ -127,19 +127,20 @@ """ Private slot to add a new filter. """ - filter, ok = QInputDialog.getText( + customFilter, ok = QInputDialog.getText( None, self.tr("Add Filter"), self.tr("Filter name:"), QLineEdit.Normal) - if not filter: + if not customFilter: return - if filter not in self.__filterMap: - self.__filterMap[filter] = [] - self.filtersList.addItem(filter) + if customFilter not in self.__filterMap: + self.__filterMap[customFilter] = [] + self.filtersList.addItem(customFilter) - itm = self.filtersList.findItems(filter, Qt.MatchCaseSensitive)[0] + itm = self.filtersList.findItems( + customFilter, Qt.MatchCaseSensitive)[0] self.filtersList.setCurrentItem(itm) @pyqtSlot() @@ -193,9 +194,9 @@ attr = itm.text(0) self.__removedAttributes.append(attr) - for filter in self.__filterMap: - if attr in self.__filterMap[filter]: - self.__filterMap[filter].remove(attr) + for customFilter in self.__filterMap: + if attr in self.__filterMap[customFilter]: + self.__filterMap[customFilter].remove(attr) del itm @@ -206,8 +207,8 @@ """ # step 1: determine all used attributes attributes = set() - for filter in self.__filterMap: - attributes |= set(self.__filterMap[filter]) + for customFilter in self.__filterMap: + attributes |= set(self.__filterMap[customFilter]) # step 2: select all unused attribute items self.attributesList.clearSelection() @@ -241,12 +242,12 @@ if len(self.__filterMapBackup) != len(self.__filterMap): filtersChanged = True else: - for filter in self.__filterMapBackup: - if filter not in self.__filterMap: + for customFilter in self.__filterMapBackup: + if customFilter not in self.__filterMap: filtersChanged = True else: - oldFilterAtts = self.__filterMapBackup[filter] - newFilterAtts = self.__filterMap[filter] + oldFilterAtts = self.__filterMapBackup[customFilter] + newFilterAtts = self.__filterMap[customFilter] if len(oldFilterAtts) != len(newFilterAtts): filtersChanged = True else: @@ -259,10 +260,11 @@ break if filtersChanged: - for filter in self.__removedFilters: - self.__engine.removeCustomFilter(filter) - for filter in self.__filterMap: - self.__engine.addCustomFilter(filter, self.__filterMap[filter]) + for customFilter in self.__removedFilters: + self.__engine.removeCustomFilter(customFilter) + for customFilter in self.__filterMap: + self.__engine.addCustomFilter( + customFilter, self.__filterMap[customFilter]) if self.__removedAttributes: self.__removeAttributes()
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Thu Mar 09 17:56:06 2017 +0100 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Thu Mar 09 19:28:59 2017 +0100 @@ -392,10 +392,10 @@ filterString = self.excludeFilesEdit.text() filterList = [f.strip() for f in filterString.split(",") if f.strip()] - for filter in filterList: + for fileFilter in filterList: self.files = \ [f for f in self.files - if not fnmatch.fnmatch(f, filter.strip())] + if not fnmatch.fnmatch(f, fileFilter.strip())] self.__errorItem = None self.__resetStatistics()
--- a/Plugins/CheckerPlugins/CodeStyleChecker/NamingStyleChecker.py Thu Mar 09 17:56:06 2017 +0100 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/NamingStyleChecker.py Thu Mar 09 19:28:59 2017 +0100 @@ -268,7 +268,7 @@ if isinstance(node, ast.Assign): for target in node.targets: if isinstance(target, ast.Name): - name = target.id + name = target.id if not name: return @@ -279,7 +279,7 @@ elif isinstance(target, (ast.Tuple, ast.List)): for element in target.elts: if isinstance(element, ast.Name): - name = element.id + name = element.id if not name: return
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Thu Mar 09 17:56:06 2017 +0100 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Thu Mar 09 19:28:59 2017 +0100 @@ -432,9 +432,9 @@ filterList = [f.strip() for f in filterString.split(",") if f.strip()] if filterList: - for filter in filterList: + for fileFilter in filterList: fileList = \ - [f for f in fileList if not fnmatch.fnmatch(f, filter)] + [f for f in fileList if not fnmatch.fnmatch(f, fileFilter)] self.resultList.clear() self.noResults = True
--- a/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py Thu Mar 09 17:56:06 2017 +0100 +++ b/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py Thu Mar 09 19:28:59 2017 +0100 @@ -448,8 +448,8 @@ indents = [Whitespace("")] check_equal = 0 - for (type, token, start, end, line) in tokens: - if type == NEWLINE: + for (tokenType, token, start, end, line) in tokens: + if tokenType == NEWLINE: # a program statement, or ENDMARKER, will eventually follow, # after some (possibly empty) run of tokens of the form # (NL | COMMENT)* (INDENT | DEDENT+)? @@ -457,7 +457,7 @@ # be undone when we see the INDENT. check_equal = 1 - elif type == INDENT: + elif tokenType == INDENT: check_equal = 0 thisguy = Whitespace(token) if not indents[-1].less(thisguy): @@ -466,7 +466,7 @@ raise NannyNag(start[0], msg, line) indents.append(thisguy) - elif type == DEDENT: + elif tokenType == DEDENT: # there's nothing we need to check here! what's important is # that when the run of DEDENTs ends, the indentation of the # program statement (or ENDMARKER) that triggered the run is @@ -481,7 +481,7 @@ del indents[-1] - elif check_equal and type not in JUNK: + elif check_equal and tokenType not in JUNK: # this is the first "real token" following a NEWLINE, so it # must be the first token of the next program statement, or an # ENDMARKER; the "line" argument exposes the leading whitespace
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Thu Mar 09 17:56:06 2017 +0100 +++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Thu Mar 09 19:28:59 2017 +0100 @@ -368,9 +368,9 @@ filterList = [f.strip() for f in filterString.split(",") if f.strip()] if filterList: - for filter in filterList: + for fileFilter in filterList: fileList = \ - [f for f in fileList if not fnmatch.fnmatch(f, filter)] + [f for f in fileList if not fnmatch.fnmatch(f, fileFilter)] self.resultList.clear() self.noResults = True
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Thu Mar 09 17:56:06 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Thu Mar 09 19:28:59 2017 +0100 @@ -350,7 +350,7 @@ else: if not tag.startswith('tags') and \ not tag.startswith('branches'): - type, ok = QInputDialog.getItem( + tagType, ok = QInputDialog.getItem( None, self.tr("Subversion Checkout"), self.tr( @@ -361,7 +361,7 @@ 0, False) if not ok: return False - tag = '{0}/{1}'.format(type, tag) + tag = '{0}/{1}'.format(tagType, tag) svnUrl = '{0}/{1}'.format(vcsDir, tag) else: svnUrl = vcsDir @@ -406,7 +406,7 @@ else: if not tag.startswith('tags') and \ not tag.startswith('branches'): - type, ok = QInputDialog.getItem( + tagType, ok = QInputDialog.getItem( None, self.tr("Subversion Export"), self.tr( @@ -417,7 +417,7 @@ 0, False) if not ok: return False - tag = '{0}/{1}'.format(type, tag) + tag = '{0}/{1}'.format(tagType, tag) svnUrl = '{0}/{1}'.format(vcsDir, tag) else: svnUrl = vcsDir
--- a/install-debugclients.py Thu Mar 09 17:56:06 2017 +0100 +++ b/install-debugclients.py Thu Mar 09 19:28:59 2017 +0100 @@ -127,8 +127,8 @@ if not skipIt: srcname = os.path.join(src, name) dstname = os.path.join(dst, name) - for filter in filters: - if fnmatch.fnmatch(srcname, filter): + for fileFilter in filters: + if fnmatch.fnmatch(srcname, fileFilter): if not os.path.isdir(dst): os.makedirs(dst) shutil.copy2(srcname, dstname)
--- a/install.py Thu Mar 09 17:56:06 2017 +0100 +++ b/install.py Thu Mar 09 19:28:59 2017 +0100 @@ -452,8 +452,8 @@ if not skipIt: srcname = os.path.join(src, name) dstname = os.path.join(dst, name) - for filter in filters: - if fnmatch.fnmatch(srcname, filter): + for fileFilter in filters: + if fnmatch.fnmatch(srcname, fileFilter): if not os.path.isdir(dst): os.makedirs(dst) shutil.copy2(srcname, dstname)
