Mercurial Repositories > eric / changeset
changeset
Continued fixing code style issues detected by the extended style checker.
Fri, 10 Mar 2017 17:32:19 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 10 Mar 2017 17:32:19 +0100
- changeset 5599
- 033967644b1f
- parent 5597
- 3d88d53f8c2b
- child 5602
- 77755a5ea30c
Continued fixing code style issues detected by the extended style checker.
--- a/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Thu Mar 09 19:28:59 2017 +0100 +++ b/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Fri Mar 10 17:32:19 2017 +0100 @@ -279,15 +279,15 @@ self.bTest.setDisabled( self.cStartWith.isChecked() or self.cFilters.isChecked()) - def __toggleInitialFilterAndResult(self, id): + def __toggleInitialFilterAndResult(self, checkedId): """ Private slot to enable/disable the initial filter elements and the results entries. - @param id id of the clicked button (integer) + @param checkedId id of the clicked button (integer) """ - if (self.__pyqtVariant == 4 and id in [11, 12, 13]) or \ - (self.__pyqtVariant == 5 and id in [1, 2, 3]): + if (self.__pyqtVariant == 4 and checkedId in [11, 12, 13]) or \ + (self.__pyqtVariant == 5 and checkedId in [1, 2, 3]): enable = True else: enable = False @@ -380,14 +380,14 @@ code += fmt.format(self.eFilters.text()) if self.rfOpenFile.isChecked() or self.__pyqtVariant == 5: if self.eInitialFilter.text() == "": - filter = "None" + initialFilter = "None" else: if self.cInitialFilter.isChecked(): fmt = '{0}' else: fmt = 'self.tr("{0}")' - filter = fmt.format(self.eInitialFilter.text()) - code += ',{0}{1}{2}'.format(os.linesep, istring, filter) + initialFilter = fmt.format(self.eInitialFilter.text()) + code += ',{0}{1}{2}'.format(os.linesep, istring, initialFilter) if not self.cSymlinks.isChecked(): code += \ ',{0}{1}QFileDialog.Options(' \ @@ -424,14 +424,14 @@ code += fmt.format(self.eFilters.text()) if self.rfOpenFiles.isChecked() or self.__pyqtVariant == 5: if self.eInitialFilter.text() == "": - filter = "None" + initialFilter = "None" else: if self.cInitialFilter.isChecked(): fmt = '{0}' else: fmt = 'self.tr("{0}")' - filter = fmt.format(self.eInitialFilter.text()) - code += ',{0}{1}{2}'.format(os.linesep, istring, filter) + initialFilter = fmt.format(self.eInitialFilter.text()) + code += ',{0}{1}{2}'.format(os.linesep, istring, initialFilter) if not self.cSymlinks.isChecked(): code += \ ',{0}{1}QFileDialog.Options(' \ @@ -468,14 +468,14 @@ code += fmt.format(self.eFilters.text()) if self.rfSaveFile.isChecked() or self.__pyqtVariant == 5: if self.eInitialFilter.text() == "": - filter = "None" + initialFilter = "None" else: if self.cInitialFilter.isChecked(): fmt = '{0}' else: fmt = 'self.tr("{0}")' - filter = fmt.format(self.eInitialFilter.text()) - code += ',{0}{1}{2}'.format(os.linesep, istring, filter) + initialFilter = fmt.format(self.eInitialFilter.text()) + code += ',{0}{1}{2}'.format(os.linesep, istring, initialFilter) if (not self.cSymlinks.isChecked()) or \ (not self.cConfirmOverwrite.isChecked()): code += ',{0}{1}QFileDialog.Options('.format(
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Thu Mar 09 19:28:59 2017 +0100 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Fri Mar 10 17:32:19 2017 +0100 @@ -489,56 +489,57 @@ self.rangesEntries.append([cb1, le1, le2]) - def __populateW3cCharacterCombo(self, combo, format): + def __populateW3cCharacterCombo(self, combo, formatIdentifier): """ Private method to populate a W3C character selection combo. @param combo combo box to be populated (QComboBox) - @param format format identifier (one of "-ccp", "-ccn", "-cbp", "-cbn") + @param formatIdentifier format identifier (one of "-ccp", "-ccn", + "-cbp", "-cbn") """ combo.clear() - if format in ["-ccp", "-ccn"]: + if formatIdentifier in ["-ccp", "-ccn"]: comboLen = 0 for txt, code in self.__characterCategories: combo.addItem(txt, code) comboLen = max(comboLen, len(txt)) combo.setMinimumContentsLength(comboLen) - elif format in ["-cbp", "-cbn"]: + elif formatIdentifier in ["-cbp", "-cbn"]: comboLen = 0 for txt, code in self.__characterBlocks: combo.addItem(txt, code) comboLen = max(comboLen, len(txt)) combo.setMinimumContentsLength(comboLen) - def __performSelectedAction(self, format, lineedit, combo): + def __performSelectedAction(self, formatIdentifier, lineedit, combo): """ Private method performing some actions depending on the input. - @param format format of the selected entry (string) + @param formatIdentifier format of the selected entry (string) @param lineedit line edit widget to act on (QLineEdit) @param combo combo box widget to act on (QComboBox) """ - if format == "-i": + if formatIdentifier == "-i": return - if format in ["-c", "-h", "-o"]: + if formatIdentifier in ["-c", "-h", "-o"]: lineedit.show() lineedit.setEnabled(True) if combo is not None: combo.hide() - if format == "-c": + if formatIdentifier == "-c": lineedit.setValidator(self.charValidator) - elif format == "-h": + elif formatIdentifier == "-h": lineedit.setValidator(self.hexValidator) - elif format == "-o": + elif formatIdentifier == "-o": lineedit.setValidator(self.octValidator) - elif format in ["-ccp", "-ccn", "-cbp", "-cbn"]: + elif formatIdentifier in ["-ccp", "-ccn", "-cbp", "-cbn"]: lineedit.setEnabled(False) lineedit.hide() if combo is not None: combo.show() - self.__populateW3cCharacterCombo(combo, format) + self.__populateW3cCharacterCombo(combo, formatIdentifier) else: lineedit.setEnabled(False) lineedit.hide() @@ -556,9 +557,9 @@ combo = self.sender() for entriesList in self.singlesEntries: if combo == entriesList[0]: - format = combo.itemData(index) + formatIdentifier = combo.itemData(index) self.__performSelectedAction( - format, entriesList[1], entriesList[2]) + formatIdentifier, entriesList[1], entriesList[2]) break def __rangesCharTypeSelected(self, index): @@ -571,37 +572,39 @@ combo = self.sender() for entriesList in self.rangesEntries: if combo == entriesList[0]: - format = combo.itemData(index) - self.__performSelectedAction(format, entriesList[1], None) - self.__performSelectedAction(format, entriesList[2], None) + formatIdentifier = combo.itemData(index) + self.__performSelectedAction(formatIdentifier, entriesList[1], + None) + self.__performSelectedAction(formatIdentifier, entriesList[2], + None) break - def __formatCharacter(self, char, format): + def __formatCharacter(self, char, formatIdentifier): """ Private method to format the characters entered into the dialog. @param char character string entered into the dialog (string) - @param format string giving a special format (-c, -h, -i or -o) or - the already formatted character (string) + @param formatIdentifier string giving a special format (-c, -h, -i or + -o) or the already formatted character (string) @return formatted character string (string) """ - if format == "-c": + if formatIdentifier == "-c": return char - elif format == "-i": + elif formatIdentifier == "-i": return "" if self.__mode in [QRegExpWizardCharactersDialog.RegExpMode, QRegExpWizardCharactersDialog.W3CMode]: - if format == "-h": + if formatIdentifier == "-h": return "\\x{0}".format(char.lower()) - elif format == "-o": + elif formatIdentifier == "-o": return "\\0{0}".format(char) - elif format in ["-ccp", "-cbp"]: + elif formatIdentifier in ["-ccp", "-cbp"]: return "\\p{{{0}}}".format(char) - elif format in ["-ccn", "-cbn"]: + elif formatIdentifier in ["-ccn", "-cbn"]: return "\\P{{{0}}}".format(char) else: - return format + return formatIdentifier def getCharacters(self): """ @@ -639,24 +642,26 @@ # single characters for entrieslist in self.singlesEntries: - format = entrieslist[0].itemData(entrieslist[0].currentIndex()) - if format in ["-ccp", "-ccn", "-cbp", "-cbn"]: + formatIdentifier = entrieslist[0].itemData( + entrieslist[0].currentIndex()) + if formatIdentifier in ["-ccp", "-ccn", "-cbp", "-cbn"]: char = entrieslist[2].itemData(entrieslist[2].currentIndex()) else: char = entrieslist[1].text() - regexp += self.__formatCharacter(char, format) + regexp += self.__formatCharacter(char, formatIdentifier) # character ranges for entrieslist in self.rangesEntries: if not entrieslist[1].text() or \ not entrieslist[2].text(): continue - format = entrieslist[0].itemData(entrieslist[0].currentIndex()) + formatIdentifier = entrieslist[0].itemData( + entrieslist[0].currentIndex()) char1 = entrieslist[1].text() char2 = entrieslist[2].text() regexp += "{0}-{1}".format( - self.__formatCharacter(char1, format), - self.__formatCharacter(char2, format)) + self.__formatCharacter(char1, formatIdentifier), + self.__formatCharacter(char2, formatIdentifier)) if regexp: if (regexp.startswith("\\") and
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py Thu Mar 09 19:28:59 2017 +0100 +++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py Fri Mar 10 17:32:19 2017 +0100 @@ -403,23 +403,23 @@ self.rangesEntries.append([cb1, le1, le2]) - def __populateCharacterCombo(self, combo, format): + def __populateCharacterCombo(self, combo, formatIdentifier): """ Private method to populate a character selection combo. @param combo combo box to be populated (QComboBox) - @param format format identifier (one of "-ccp", "-ccn", + @param formatIdentifier format identifier (one of "-ccp", "-ccn", "-cbp", "-cbn", "-csp", "-csn", "-psp", "-psn") """ combo.clear() - if format in ["-ccp", "-ccn"]: + if formatIdentifier in ["-ccp", "-ccn"]: items = self.__characterCategories - elif format in ["-csp", "-csn"]: + elif formatIdentifier in ["-csp", "-csn"]: items = self.__specialCharacterCategories - elif format in ["-cbp", "-cbn"]: + elif formatIdentifier in ["-cbp", "-cbn"]: items = self.__characterBlocks - elif format in ["-psp", "-psn"]: + elif formatIdentifier in ["-psp", "-psn"]: items = self.__posixNamedSets comboLen = 0 @@ -428,35 +428,35 @@ comboLen = max(comboLen, len(txt)) combo.setMinimumContentsLength(comboLen) - def __performSelectedAction(self, format, lineedit, combo): + def __performSelectedAction(self, formatIdentifier, lineedit, combo): """ Private method performing some actions depending on the input. - @param format format of the selected entry (string) + @param formatIdentifier format of the selected entry (string) @param lineedit line edit widget to act on (QLineEdit) @param combo combo box widget to act on (QComboBox) """ - if format == "-i": + if formatIdentifier == "-i": return - if format in ["-c", "-h", "-o"]: + if formatIdentifier in ["-c", "-h", "-o"]: lineedit.show() lineedit.setEnabled(True) if combo is not None: combo.hide() - if format == "-c": + if formatIdentifier == "-c": lineedit.setValidator(self.charValidator) - elif format == "-h": + elif formatIdentifier == "-h": lineedit.setValidator(self.hexValidator) - elif format == "-o": + elif formatIdentifier == "-o": lineedit.setValidator(self.octValidator) - elif format in ["-ccp", "-ccn", "-cbp", "-cbn", "-csp", "-csn", - "-psp", "-psn"]: + elif formatIdentifier in ["-ccp", "-ccn", "-cbp", "-cbn", "-csp", + "-csn", "-psp", "-psn"]: lineedit.setEnabled(False) lineedit.hide() if combo is not None: combo.show() - self.__populateCharacterCombo(combo, format) + self.__populateCharacterCombo(combo, formatIdentifier) else: lineedit.setEnabled(False) lineedit.hide() @@ -474,9 +474,9 @@ combo = self.sender() for entriesList in self.singlesEntries: if combo == entriesList[0]: - format = combo.itemData(index) + formatIdentifier = combo.itemData(index) self.__performSelectedAction( - format, entriesList[1], entriesList[2]) + formatIdentifier, entriesList[1], entriesList[2]) break def __rangesCharTypeSelected(self, index): @@ -489,48 +489,50 @@ combo = self.sender() for entriesList in self.rangesEntries: if combo == entriesList[0]: - format = combo.itemData(index) - self.__performSelectedAction(format, entriesList[1], None) - self.__performSelectedAction(format, entriesList[2], None) + formatIdentifier = combo.itemData(index) + self.__performSelectedAction(formatIdentifier, entriesList[1], + None) + self.__performSelectedAction(formatIdentifier, entriesList[2], + None) break - def __formatCharacter(self, char, format): + def __formatCharacter(self, char, formatIdentifier): """ Private method to format the characters entered into the dialog. @param char character string entered into the dialog (string) - @param format string giving a special format (-c, -h, -i or -o) or - the already formatted character (string) + @param formatIdentifier string giving a special format (-c, -h, -i or + -o) or the already formatted character (string) @return formatted character string (string) """ - if format == "-c": + if formatIdentifier == "-c": return char - elif format == "-i": + elif formatIdentifier == "-i": return "" - if format == "-h": + if formatIdentifier == "-h": while len(char) < 2: char = "0" + char if len(char) > 2: return "\\x{{{0}}}".format(char.lower()) else: return "\\x{0}".format(char.lower()) - elif format == "-o": + elif formatIdentifier == "-o": while len(char) < 3: char = "0" + char if len(char) > 3: char = char[:3] return "\\{0}".format(char) - elif format in ["-ccp", "-cbp", "-csp"]: + elif formatIdentifier in ["-ccp", "-cbp", "-csp"]: return "\\p{{{0}}}".format(char) - elif format in ["-ccn", "-cbn", "-csn"]: + elif formatIdentifier in ["-ccn", "-cbn", "-csn"]: return "\\P{{{0}}}".format(char) - elif format == "-psp": + elif formatIdentifier == "-psp": return "[:{0}:]".format(char) - elif format == "-psn": + elif formatIdentifier == "-psn": return "[:^{0}:]".format(char) else: - return format + return formatIdentifier def getCharacters(self): """ @@ -572,25 +574,27 @@ # single characters for entrieslist in self.singlesEntries: - format = entrieslist[0].itemData(entrieslist[0].currentIndex()) - if format in ["-ccp", "-ccn", "-cbp", "-cbn", "-csp", "-csn", - "-psp", "-psn"]: + formatIdentifier = entrieslist[0].itemData( + entrieslist[0].currentIndex()) + if formatIdentifier in ["-ccp", "-ccn", "-cbp", "-cbn", "-csp", + "-csn", "-psp", "-psn"]: char = entrieslist[2].itemData(entrieslist[2].currentIndex()) else: char = entrieslist[1].text() - regexp += self.__formatCharacter(char, format) + regexp += self.__formatCharacter(char, formatIdentifier) # character ranges for entrieslist in self.rangesEntries: if not entrieslist[1].text() or \ not entrieslist[2].text(): continue - format = entrieslist[0].itemData(entrieslist[0].currentIndex()) + formatIdentifier = entrieslist[0].itemData( + entrieslist[0].currentIndex()) char1 = entrieslist[1].text() char2 = entrieslist[2].text() regexp += "{0}-{1}".format( - self.__formatCharacter(char1, format), - self.__formatCharacter(char2, format)) + self.__formatCharacter(char1, formatIdentifier), + self.__formatCharacter(char2, formatIdentifier)) if regexp: if (regexp.startswith("\\") and
--- a/Preferences/ConfigurationPages/EditorFilePage.py Thu Mar 09 19:28:59 2017 +0100 +++ b/Preferences/ConfigurationPages/EditorFilePage.py Fri Mar 10 17:32:19 2017 +0100 @@ -203,24 +203,24 @@ else: self.saveFileFilters = filters - def __checkFileFilter(self, filter): + def __checkFileFilter(self, fileFilter): """ Private method to check a file filter for validity. - @param filter file filter pattern to check (string) + @param fileFilter file filter pattern to check (string) @return flag indicating validity (boolean) """ if not self.__showsOpenFilters and \ - filter.count("*") != 1: + fileFilter.count("*") != 1: E5MessageBox.critical( self, self.tr("Add File Filter"), self.tr("""A Save File Filter must contain exactly one""" """ wildcard pattern. Yours contains {0}.""") - .format(filter.count("*"))) + .format(fileFilter.count("*"))) return False - if filter.count("*") == 0: + if fileFilter.count("*") == 0: E5MessageBox.critical( self, self.tr("Add File Filter"), @@ -235,14 +235,14 @@ """ Private slot to add a file filter to the list. """ - filter, ok = QInputDialog.getText( + fileFilter, ok = QInputDialog.getText( self, self.tr("Add File Filter"), self.tr("Enter the file filter entry:"), QLineEdit.Normal) - if ok and filter: - if self.__checkFileFilter(filter): - self.fileFiltersList.addItem(filter) + if ok and fileFilter: + if self.__checkFileFilter(fileFilter): + self.fileFiltersList.addItem(fileFilter) self.__extractFileFilters() self.__setDefaultFiltersLists(keepSelection=True) @@ -251,16 +251,16 @@ """ Private slot called to edit a file filter entry. """ - filter = self.fileFiltersList.currentItem().text() - filter, ok = QInputDialog.getText( + fileFilter = self.fileFiltersList.currentItem().text() + fileFilter, ok = QInputDialog.getText( self, self.tr("Add File Filter"), self.tr("Enter the file filter entry:"), QLineEdit.Normal, - filter) - if ok and filter: - if self.__checkFileFilter(filter): - self.fileFiltersList.currentItem().setText(filter) + fileFilter) + if ok and fileFilter: + if self.__checkFileFilter(fileFilter): + self.fileFiltersList.currentItem().setText(fileFilter) self.__extractFileFilters() self.__setDefaultFiltersLists(keepSelection=True)
--- a/Preferences/ConfigurationPages/EditorHighlightersPage.py Thu Mar 09 19:28:59 2017 +0100 +++ b/Preferences/ConfigurationPages/EditorHighlightersPage.py Fri Mar 10 17:32:19 2017 +0100 @@ -58,7 +58,7 @@ QScintilla.Lexers.getLanguageIcon(lang, False), lang) - pygmentsLexers = [''] + sorted([l[0] for l in get_all_lexers()]) + pygmentsLexers = [''] + sorted(l[0] for l in get_all_lexers()) self.pygmentsLexerCombo.addItems(pygmentsLexers) # set initial values
--- a/Preferences/ConfigurationPages/IconsPage.py Thu Mar 09 19:28:59 2017 +0100 +++ b/Preferences/ConfigurationPages/IconsPage.py Fri Mar 10 17:32:19 2017 +0100 @@ -36,9 +36,9 @@ # set initial values dirList = Preferences.getIcons("Path")[:] - for dir in dirList: - if dir: - QListWidgetItem(dir, self.iconDirectoryList) + for directory in dirList: + if directory: + QListWidgetItem(directory, self.iconDirectoryList) def save(self): """ @@ -124,9 +124,9 @@ """ Private slot to add the icon directory displayed to the listbox. """ - dir = self.iconDirectoryPicker.text() - if dir: - QListWidgetItem(dir, self.iconDirectoryList) + directory = self.iconDirectoryPicker.text() + if directory: + QListWidgetItem(directory, self.iconDirectoryList) self.iconDirectoryPicker.clear() row = self.iconDirectoryList.currentRow() self.on_iconDirectoryList_currentRowChanged(row) @@ -147,14 +147,14 @@ """ Private slot to display a preview of an icons directory. """ - dir = self.iconDirectoryPicker.text() - if not dir: + directory = self.iconDirectoryPicker.text() + if not directory: itm = self.iconDirectoryList.currentItem() if itm is not None: - dir = itm.text() - if dir: + directory = itm.text() + if directory: from .IconsPreviewDialog import IconsPreviewDialog - dlg = IconsPreviewDialog(self, dir) + dlg = IconsPreviewDialog(self, directory) dlg.exec_()
--- a/Preferences/ConfigurationPages/IconsPreviewDialog.py Thu Mar 09 19:28:59 2017 +0100 +++ b/Preferences/ConfigurationPages/IconsPreviewDialog.py Fri Mar 10 17:32:19 2017 +0100 @@ -32,8 +32,8 @@ super(IconsPreviewDialog, self).__init__(parent) self.setupUi(self) - dir = QDir(dirName) - for icon in dir.entryList(["*.png"]): + directory = QDir(dirName) + for icon in directory.entryList(["*.png"]): QListWidgetItem( QIcon(os.path.join(dirName, icon)), icon, self.iconView)
--- a/Project/AddDirectoryDialog.py Thu Mar 09 19:28:59 2017 +0100 +++ b/Project/AddDirectoryDialog.py Fri Mar 10 17:32:19 2017 +0100 @@ -21,13 +21,13 @@ """ Class implementing a dialog to add files of a directory to the project. """ - def __init__(self, pro, filter='source', parent=None, name=None, + def __init__(self, pro, fileTypeFilter='source', parent=None, name=None, startdir=None): """ Constructor @param pro reference to the project object - @param filter file type filter (string) + @param fileTypeFilter file type filter (string) @param parent parent widget of this dialog (QWidget) @param name name of this dialog (string) @param startdir start directory for the selection dialog @@ -46,19 +46,19 @@ self.targetDirPicker.setText(self.ppath) self.on_filterComboBox_highlighted('(*.py)') # enable all dialog elements - if filter == 'source': # it is a source file + if fileTypeFilter == 'source': # it is a source file self.filterComboBox.addItem( self.tr("Source Files"), "SOURCES") - elif filter == 'form': + elif fileTypeFilter == 'form': self.filterComboBox.addItem( self.tr("Forms Files"), "FORMS") - elif filter == 'resource': + elif fileTypeFilter == 'resource': self.filterComboBox.addItem( self.tr("Resource Files"), "RESOURCES") - elif filter == 'interface': + elif fileTypeFilter == 'interface': self.filterComboBox.addItem( self.tr("Interface Files"), "INTERFACES") - elif filter == 'others': + elif fileTypeFilter == 'others': self.filterComboBox.addItem( self.tr("Other Files (*)"), "OTHERS") self.on_filterComboBox_highlighted('(*)') @@ -95,7 +95,7 @@ self.recursiveCheckBox.setEnabled(True) @pyqtSlot(str) - def on_sourceDirPicker_textChanged(self, dir): + def on_sourceDirPicker_textChanged(self, directory): """ Private slot to handle the source directory text changed. @@ -104,10 +104,10 @@ It is assumed, that the user wants to add a bunch of files to the project in place. - @param dir the text of the source directory line edit (string) + @param directory the text of the source directory line edit (string) """ - if dir.startswith(self.ppath): - self.targetDirPicker.setText(dir) + if directory.startswith(self.ppath): + self.targetDirPicker.setText(directory) def getData(self): """
--- a/Project/AddFileDialog.py Thu Mar 09 19:28:59 2017 +0100 +++ b/Project/AddFileDialog.py Fri Mar 10 17:32:19 2017 +0100 @@ -23,14 +23,14 @@ """ Class implementing a dialog to add a file to the project. """ - def __init__(self, pro, parent=None, filter=None, name=None, + def __init__(self, pro, parent=None, fileTypeFilter=None, name=None, startdir=None): """ Constructor @param pro reference to the project object @param parent parent widget of this dialog (QWidget) - @param filter filter specification for the file to add (string) + @param fileTypeFilter filter specification for the file to add (string) @param name name of this dialog (string) @param startdir start directory for the selection dialog """ @@ -44,13 +44,13 @@ self.targetDirPicker.setDefaultDirectory(startdir) self.targetDirPicker.setText(pro.ppath) - self.filter = filter + self.fileTypeFilter = fileTypeFilter self.ppath = pro.ppath self.startdir = startdir self.filetypes = pro.pdata["FILETYPES"] # save a reference to the filetypes dict - if self.filter is not None: + if self.fileTypeFilter is not None: self.sourcecodeCheckBox.hide() msh = self.minimumSizeHint() @@ -67,7 +67,7 @@ path = self.startdir self.sourceFilesPicker.setDefaultDirectory(path) - if self.filter is None: + if self.fileTypeFilter is None: patterns = { "SOURCES": [], "FORMS": [], @@ -92,7 +92,7 @@ " ".join(patterns["INTERFACES"]), " ".join(patterns["TRANSLATIONS"])) caption = self.tr("Select Files") - elif self.filter == 'form': + elif self.fileTypeFilter == 'form': patterns = [] for pattern, filetype in list(self.filetypes.items()): if filetype == "FORMS": @@ -100,7 +100,7 @@ dfilter = self.tr("Forms Files ({0})")\ .format(" ".join(patterns)) caption = self.tr("Select user-interface files") - elif self.filter == "resource": + elif self.fileTypeFilter == "resource": patterns = [] for pattern, filetype in list(self.filetypes.items()): if filetype == "RESOURCES": @@ -108,7 +108,7 @@ dfilter = self.tr("Resource Files ({0})")\ .format(" ".join(patterns)) caption = self.tr("Select resource files") - elif self.filter == 'source': + elif self.fileTypeFilter == 'source': patterns = [] for pattern, filetype in list(self.filetypes.items()): if filetype == "SOURCES": @@ -116,7 +116,7 @@ dfilter = self.tr("Source Files ({0});;All Files (*)")\ .format(" ".join(patterns)) caption = self.tr("Select source files") - elif self.filter == 'interface': + elif self.fileTypeFilter == 'interface': patterns = [] for pattern, filetype in list(self.filetypes.items()): if filetype == "INTERFACES": @@ -124,7 +124,7 @@ dfilter = self.tr("Interface Files ({0})")\ .format(" ".join(patterns)) caption = self.tr("Select interface files") - elif self.filter == 'translation': + elif self.fileTypeFilter == 'translation': patterns = [] for pattern, filetype in list(self.filetypes.items()): if filetype == "TRANSLATIONS": @@ -132,7 +132,7 @@ dfilter = self.tr("Translation Files ({0})")\ .format(" ".join(patterns)) caption = self.tr("Select translation files") - elif self.filter == 'others': + elif self.fileTypeFilter == 'others': dfilter = self.tr("All Files (*)") caption = self.tr("Select files") else: @@ -157,10 +157,10 @@ sfile = self.sourceFilesPicker.firstPath() if sfile.startswith(self.ppath): if os.path.isdir(sfile): - dir = sfile + directory = sfile else: - dir = os.path.dirname(sfile) - self.targetDirPicker.setText(dir) + directory = os.path.dirname(sfile) + self.targetDirPicker.setText(directory) def getData(self): """
--- a/Project/LexerAssociationDialog.py Thu Mar 09 19:28:59 2017 +0100 +++ b/Project/LexerAssociationDialog.py Fri Mar 10 17:32:19 2017 +0100 @@ -57,7 +57,7 @@ lang) from pygments.lexers import get_all_lexers - pygmentsLexers = [''] + sorted([l[0] for l in get_all_lexers()]) + pygmentsLexers = [''] + sorted(l[0] for l in get_all_lexers()) self.pygmentsLexerCombo.addItems(pygmentsLexers) # set initial values
--- a/Project/Project.py Thu Mar 09 19:28:59 2017 +0100 +++ b/Project/Project.py Fri Mar 10 17:32:19 2017 +0100 @@ -784,11 +784,11 @@ # create hash value, if it doesn't have one if reader.version.startswith("5.") and not self.pdata["HASH"]: - hash = str(QCryptographicHash.hash( + hashStr = str(QCryptographicHash.hash( QByteArray(self.ppath.encode("utf-8")), QCryptographicHash.Sha1).toHex(), encoding="utf-8") - self.pdata["HASH"] = hash + self.pdata["HASH"] = hashStr self.setDirty(True) return res @@ -811,11 +811,11 @@ copy.deepcopy(self.vcs.vcsGetOtherData()) if not self.pdata["HASH"]: - hash = str(QCryptographicHash.hash( + hashStr = str(QCryptographicHash.hash( QByteArray(self.ppath.encode("utf-8")), QCryptographicHash.Sha1).toHex(), encoding="utf-8") - self.pdata["HASH"] = hash + self.pdata["HASH"] = hashStr if fn is None: fn = self.pfile @@ -1512,18 +1512,19 @@ self.setDirty(True) @pyqtSlot() - def addFiles(self, filter=None, startdir=None): + def addFiles(self, fileTypeFilter=None, startdir=None): """ Public slot used to add files to the project. - @param filter filter to be used by the add file dialog + @param fileTypeFilter filter to be used by the add file dialog (string out of source, form, resource, interface, others) @param startdir start directory for the selection dialog """ if startdir is None: startdir = self.ppath from .AddFileDialog import AddFileDialog - dlg = AddFileDialog(self, self.parent(), filter, startdir=startdir) + dlg = AddFileDialog(self, self.parent(), fileTypeFilter, + startdir=startdir) if dlg.exec_() == QDialog.Accepted: fnames, target, isSource = dlg.getData() if target != '': @@ -1558,7 +1559,8 @@ .format(fn, target, str(why))) continue - self.appendFile(targetfile, isSource or filter == 'source') + self.appendFile(targetfile, + isSource or fileTypeFilter == 'source') else: E5MessageBox.critical( self.ui, @@ -1661,11 +1663,11 @@ self.__addRecursiveDirectory(filetype, ns, nt) @pyqtSlot() - def addDirectory(self, filter=None, startdir=None): + def addDirectory(self, fileTypeFilter=None, startdir=None): """ Public method used to add all files of a directory to the project. - @param filter filter to be used by the add directory dialog + @param fileTypeFilter filter to be used by the add directory dialog (string out of source, form, resource, interface, others) @param startdir start directory for the selection dialog (string) """ @@ -1673,7 +1675,7 @@ startdir = self.ppath from .AddDirectoryDialog import AddDirectoryDialog dlg = AddDirectoryDialog( - self, filter, self.parent(), startdir=startdir) + self, fileTypeFilter, self.parent(), startdir=startdir) if dlg.exec_() == QDialog.Accepted: filetype, source, target, recursive = dlg.getData() if target == '': @@ -2172,11 +2174,11 @@ self.projectAboutToBeCreated.emit() - hash = str(QCryptographicHash.hash( + hashStr = str(QCryptographicHash.hash( QByteArray(self.ppath.encode("utf-8")), QCryptographicHash.Sha1).toHex(), encoding="utf-8") - self.pdata["HASH"] = hash + self.pdata["HASH"] = hashStr # create the project directory if it doesn't exist already if not os.path.isdir(self.ppath): @@ -4246,8 +4248,8 @@ newFiles = [] dirs = self.subdirs[:] - for dir in dirs: - curpath = os.path.join(self.ppath, dir) + for directory in dirs: + curpath = os.path.join(self.ppath, directory) try: newSources = os.listdir(curpath) except OSError: @@ -4271,10 +4273,10 @@ # set fn to project relative name # then reset ns to fully qualified name for insertion, # possibly. - if dir == "": + if directory == "": fn = ns else: - fn = os.path.join(dir, ns) + fn = os.path.join(directory, ns) ns = os.path.abspath(os.path.join(curpath, ns)) # do not bother with dirs here...
--- a/Project/ProjectBaseBrowser.py Thu Mar 09 19:28:59 2017 +0100 +++ b/Project/ProjectBaseBrowser.py Fri Mar 10 17:32:19 2017 +0100 @@ -482,13 +482,13 @@ # nothing to do for now return - def _selectEntries(self, local=True, filter=None): + def _selectEntries(self, local=True, filterList=None): """ Protected method to select entries based on their VCS status. @param local flag indicating local (i.e. non VCS controlled) file/directory entries should be selected (boolean) - @param filter list of classes to check against + @param filterList list of classes to check against """ if self.project.vcs is None: return @@ -514,7 +514,7 @@ index = self.model().index(0, 0) while index.isValid(): itm = self.model().item(index) - if self.wantedItem(itm, filter) and \ + if self.wantedItem(itm, filterList) and \ compareString == itm.data(1): if startIndex is not None and \ startIndex.parent() != index.parent(): @@ -547,13 +547,13 @@ """ Public slot to handle the select local files context menu entries. """ - self._selectEntries(local=True, filter=[ProjectBrowserFileItem]) + self._selectEntries(local=True, filterList=[ProjectBrowserFileItem]) def selectVCSEntries(self): """ Public slot to handle the select VCS files context menu entries. """ - self._selectEntries(local=False, filter=[ProjectBrowserFileItem]) + self._selectEntries(local=False, filterList=[ProjectBrowserFileItem]) def selectLocalDirEntries(self): """ @@ -562,8 +562,8 @@ """ self._selectEntries( local=True, - filter=[ProjectBrowserSimpleDirectoryItem, - ProjectBrowserDirectoryItem]) + filterList=[ProjectBrowserSimpleDirectoryItem, + ProjectBrowserDirectoryItem]) def selectVCSDirEntries(self): """ @@ -571,8 +571,8 @@ """ self._selectEntries( local=False, - filter=[ProjectBrowserSimpleDirectoryItem, - ProjectBrowserDirectoryItem]) + filterList=[ProjectBrowserSimpleDirectoryItem, + ProjectBrowserDirectoryItem]) def getExpandedItemNames(self): """
--- a/Project/ProjectBrowserModel.py Thu Mar 09 19:28:59 2017 +0100 +++ b/Project/ProjectBrowserModel.py Fri Mar 10 17:32:19 2017 +0100 @@ -341,12 +341,12 @@ qdir = QDir(parentItem.dirName()) if Preferences.getUI("BrowsersListHiddenFiles"): - filter = QDir.Filters(QDir.AllEntries | - QDir.Hidden | - QDir.NoDotAndDotDot) + fileFilter = QDir.Filters( + QDir.AllEntries | QDir.Hidden | QDir.NoDotAndDotDot) else: - filter = QDir.Filters(QDir.AllEntries | QDir.NoDot | QDir.NoDotDot) - entryInfoList = qdir.entryInfoList(filter) + fileFilter = QDir.Filters( + QDir.AllEntries | QDir.NoDot | QDir.NoDotDot) + entryInfoList = qdir.entryInfoList(fileFilter) if len(entryInfoList) > 0: if repopulate: @@ -671,18 +671,18 @@ return if Preferences.getUI("BrowsersListHiddenFiles"): - filter = QDir.Filters(QDir.AllEntries | - QDir.Hidden | - QDir.NoDotAndDotDot) + fileFilter = QDir.Filters( + QDir.AllEntries | QDir.Hidden | QDir.NoDotAndDotDot) else: - filter = QDir.Filters(QDir.AllEntries | QDir.NoDot | QDir.NoDotDot) + fileFilter = QDir.Filters( + QDir.AllEntries | QDir.NoDot | QDir.NoDotDot) for itm in self.watchedItems[path]: oldCnt = itm.childCount() qdir = QDir(itm.dirName()) - entryInfoList = qdir.entryInfoList(filter) + entryInfoList = qdir.entryInfoList(fileFilter) # step 1: check for new entries children = itm.children()
--- a/Project/ProjectInterfacesBrowser.py Thu Mar 09 19:28:59 2017 +0100 +++ b/Project/ProjectInterfacesBrowser.py Fri Mar 10 17:32:19 2017 +0100 @@ -486,8 +486,8 @@ poaList = glob.glob(os.path.join(path, "*__POA")) npoaList = [f.replace("__POA", "") for f in poaList] fileList = glob.glob(os.path.join(path, "*_idl.py")) - for dir in poaList + npoaList: - fileList += Utilities.direntries(dir, True, "*.py") + for directory in poaList + npoaList: + fileList += Utilities.direntries(directory, True, "*.py") for file in fileList: self.project.appendFile(file) if not self.noDialog and not ui.notificationsEnabled():
--- a/Project/ProjectTranslationsBrowser.py Thu Mar 09 19:28:59 2017 +0100 +++ b/Project/ProjectTranslationsBrowser.py Fri Mar 10 17:32:19 2017 +0100 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - str = unicode + str = unicode # __IGNORE_WARNING_M131__ except NameError: pass @@ -731,7 +731,7 @@ ## Methods to support the generation and release commands ########################################################################### - def __writeTempProjectFile(self, langs, filter): + def __writeTempProjectFile(self, langs, filterList): """ Private method to write a temporary project file suitable for pylupdate and lrelease. @@ -739,8 +739,8 @@ @param langs list of languages to include in the process. An empty list (default) means that all translations should be included. (list of ProjectBrowserFileItem) - @param filter list of source file extension that should be considered - (list of strings) + @param filterList list of source file extension that should be + considered (list of strings) @return flag indicating success """ path, ext = os.path.splitext(self.project.pfile) @@ -748,7 +748,7 @@ # only consider files satisfying the filter criteria _sources = [s for s in self.project.pdata["SOURCES"] - if os.path.splitext(s)[1] in filter] + if os.path.splitext(s)[1] in filterList] sources = [] for s in _sources: addIt = True @@ -808,28 +808,29 @@ ("TRANSLATIONS", [prefix + lang for lang in langs])) - dir, name = os.path.split(pfile) - outFile = os.path.join(dir, os.path.dirname(langs[0]), name) + directory, name = os.path.split(pfile) + outFile = os.path.join(directory, os.path.dirname(langs[0]), name) outDir = os.path.dirname(outFile) if not os.path.exists(outDir): os.makedirs(outDir) try: pf = open(outFile, "w", encoding="utf-8") - for key, list in sections: - if len(list) > 0: + for key, fileList in sections: + if len(fileList) > 0: pf.write('{0} = '.format(key)) - last = len(list) - 1 + last = len(fileList) - 1 if last > 0: pf.write('{0} \\{1}'.format( - list[0].replace(os.sep, '/'), "\n")) + fileList[0].replace(os.sep, '/'), "\n")) for i in range(1, last): pf.write('\t{0} \\{1}'.format( - list[i].replace(os.sep, '/'), "\n")) + fileList[i].replace(os.sep, '/'), "\n")) pf.write('\t{0} {1}{2}'.format( - list[last].replace(os.sep, '/'), "\n", "\n")) + fileList[last].replace(os.sep, '/'), + "\n", "\n")) else: pf.write('{0} {1}{2}'.format( - list[0].replace(os.sep, '/'), "\n", "\n")) + fileList[0].replace(os.sep, '/'), "\n", "\n")) pf.close() self.__tmpProjects.append(outFile)
--- a/UI/Browser.py Thu Mar 09 19:28:59 2017 +0100 +++ b/UI/Browser.py Fri Mar 10 17:32:19 2017 +0100 @@ -640,26 +640,26 @@ """ self.__model.interpreterChanged(interpreter) - def wantedItem(self, itm, filter=None): + def wantedItem(self, itm, filterList=None): """ Public method to check type of an item. @param itm the item to check (BrowserItem) - @param filter list of classes to check against + @param filterList list of classes to check against @return flag indicating item is a valid type (boolean) """ - if filter is None: - filter = self.selectedItemsFilter - for typ in filter: + if filterList is None: + filterList = self.selectedItemsFilter + for typ in filterList: if isinstance(itm, typ): return True return False - def getSelectedItems(self, filter=None): + def getSelectedItems(self, filterList=None): """ Public method to get the selected items. - @param filter list of classes to check against + @param filterList list of classes to check against @return list of selected items (list of BroweserItem) """ selectedItems = [] @@ -667,15 +667,15 @@ for index in indexes: if index.column() == 0: itm = self.model().item(index) - if self.wantedItem(itm, filter): + if self.wantedItem(itm, filterList): selectedItems.append(itm) return selectedItems - def getSelectedItemsCount(self, filter=None): + def getSelectedItemsCount(self, filterList=None): """ Public method to get the count of items selected. - @param filter list of classes to check against + @param filterList list of classes to check against @return count of items selected (integer) """ count = 0 @@ -683,15 +683,15 @@ for index in indexes: if index.column() == 0: itm = self.model().item(index) - if self.wantedItem(itm, filter): + if self.wantedItem(itm, filterList): count += 1 return count - def getSelectedItemsCountCategorized(self, filter=None): + def getSelectedItemsCountCategorized(self, filterList=None): """ Public method to get a categorized count of selected items. - @param filter list of classes to check against + @param filterList list of classes to check against @return a dictionary containing the counts of items belonging to the individual filter classes. The keys of the dictionary are the string representation of the classes given in the @@ -699,18 +699,18 @@ an additional entry with key "sum", that stores the sum of all selected entries fulfilling the filter criteria. """ - if filter is None: - filter = self.selectedItemsFilter + if filterList is None: + filterList = self.selectedItemsFilter categories = {} categories["sum"] = 0 - for typ in filter: + for typ in filterList: categories[str(typ)] = 0 indexes = self.selectedIndexes() for index in indexes: if index.column() == 0: itm = self.model().item(index) - for typ in filter: + for typ in filterList: if isinstance(itm, typ): categories["sum"] += 1 categories[str(typ)] += 1
