Mercurial Repositories > eric / changeset
changeset
Fixed various coding style issues.
Sat, 19 Oct 2013 13:03:39 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 19 Oct 2013 13:03:39 +0200
- changeset 3034
- 7ce719013078
- parent 3033
- 58fe260e7469
- child 3035
- 36e9f388958b
Fixed various coding style issues.
--- a/E5Gui/E5Completers.py Sat Oct 19 12:28:12 2013 +0200 +++ b/E5Gui/E5Completers.py Sat Oct 19 13:03:39 2013 +0200 @@ -33,7 +33,7 @@ self.__model = QFileSystemModel(self) if showHidden: self.__model.setFilter( - QDir.Filters(QDir.Dirs | QDir.Files | QDir.Drives | \ + QDir.Filters(QDir.Dirs | QDir.Files | QDir.Drives | QDir.AllDirs | QDir.Hidden)) else: self.__model.setFilter(QDir.Filters(
--- a/E5Gui/E5ModelMenu.py Sat Oct 19 12:28:12 2013 +0200 +++ b/E5Gui/E5ModelMenu.py Sat Oct 19 13:03:39 2013 +0200 @@ -363,7 +363,7 @@ super().mouseMoveEvent(evt) return - manhattanLength = (evt.pos() - + manhattanLength = (evt.pos() - self.__dragStartPosition).manhattanLength() if manhattanLength <= QApplication.startDragDistance(): super().mouseMoveEvent(evt)
--- a/E5Gui/E5ModelToolBar.py Sat Oct 19 12:28:12 2013 +0200 +++ b/E5Gui/E5ModelToolBar.py Sat Oct 19 13:03:39 2013 +0200 @@ -232,7 +232,7 @@ super().mouseMoveEvent(evt) return - manhattanLength = (evt.pos() - + manhattanLength = (evt.pos() - self.__dragStartPosition).manhattanLength() if manhattanLength <= QApplication.startDragDistance(): super().mouseMoveEvent(evt)
--- a/E5Gui/E5PassivePopup.py Sat Oct 19 12:28:12 2013 +0200 +++ b/E5Gui/E5PassivePopup.py Sat Oct 19 13:03:39 2013 +0200 @@ -210,5 +210,5 @@ DEFAULT_POPUP_TYPE = E5PassivePopup.Boxed DEFAULT_POPUP_TIME = 6 * 1000 POPUP_FLAGS = Qt.WindowFlags( - Qt.Tool | Qt.X11BypassWindowManagerHint | \ + Qt.Tool | Qt.X11BypassWindowManagerHint | Qt.WindowStaysOnTopHint | Qt.FramelessWindowHint)
--- a/E5Gui/E5SqueezeLabels.py Sat Oct 19 12:28:12 2013 +0200 +++ b/E5Gui/E5SqueezeLabels.py Sat Oct 19 13:03:39 2013 +0200 @@ -107,7 +107,7 @@ @param event reference to the paint event (QPaintEvent) """ fm = self.fontMetrics() - if (fm.width(self.__surrounding.format(self.__path)) > + if (fm.width(self.__surrounding.format(self.__path)) > self.contentsRect().width()): super().setText( self.__surrounding.format(compactPath(self.__path,
--- a/E5Network/E5SslCertificatesDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/E5Network/E5SslCertificatesDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -156,7 +156,7 @@ """<p>If the server certificate is deleted, the""" """ normal security checks will be reinstantiated""" """ and the server has to present a valid""" - """ certificate.</p>""")\ + """ certificate.</p>""") .format(itm.text(0))) if res: server = itm.text(1) @@ -364,7 +364,7 @@ """<p>Shall the CA certificate really be deleted?</p>""" """<p>{0}</p>""" """<p>If the CA certificate is deleted, the browser""" - """ will not trust any certificate issued by this CA.</p>""")\ + """ will not trust any certificate issued by this CA.</p>""") .format(itm.text(0))) if res: cert = self.caCertificatesTree.currentItem().data(0, self.CertRole)
--- a/E5Network/E5SslErrorHandler.py Sat Oct 19 12:28:12 2013 +0200 +++ b/E5Network/E5SslErrorHandler.py Sat Oct 19 13:03:39 2013 +0200 @@ -133,7 +133,7 @@ self.trUtf8("SSL Errors"), self.trUtf8("""<p>SSL Errors for <br /><b>{0}</b>""" """<ul><li>{1}</li></ul></p>""" - """<p>Do you want to ignore these errors?</p>""")\ + """<p>Do you want to ignore these errors?</p>""") .format(server, errorString), icon=E5MessageBox.Warning) @@ -149,7 +149,7 @@ self.trUtf8( """<p>Certificates:<br/>{0}<br/>""" """Do you want to accept all these certificates?""" - """</p>""")\ + """</p>""") .format("".join(certinfos))) if caRet: if server not in caMerge:
--- a/E5XML/MultiProjectWriter.py Sat Oct 19 12:28:12 2013 +0200 +++ b/E5XML/MultiProjectWriter.py Sat Oct 19 13:03:39 2013 +0200 @@ -39,11 +39,11 @@ """ XMLStreamWriterBase.writeXML(self) - self.writeDTD('<!DOCTYPE MultiProject SYSTEM "MultiProject-{0}.dtd">'\ + self.writeDTD('<!DOCTYPE MultiProject SYSTEM "MultiProject-{0}.dtd">' .format(multiProjectFileFormatVersion)) # add some generation comments - self.writeComment(" eric5 multi project file for multi project {0} "\ + self.writeComment(" eric5 multi project file for multi project {0} " .format(self.name)) if Preferences.getMultiProject("XMLTimestamp"): self.writeComment(
--- a/E5XML/XMLStreamReaderBase.py Sat Oct 19 12:28:12 2013 +0200 +++ b/E5XML/XMLStreamReaderBase.py Sat Oct 19 13:03:39 2013 +0200 @@ -157,11 +157,11 @@ # backward compatibility to 4.6 val = self.readElementText() elif self.name() == "bytes": - by = bytes([int(b) for b in + by = bytes([int(b) for b in self.readElementText().split(",")]) val = by elif self.name() == "bytearray": - by = bytearray([int(b) for b in + by = bytearray([int(b) for b in self.readElementText().split(",")]) val = by elif self.name() == "tuple": @@ -209,13 +209,13 @@ @return Python tuple """ - l = [] + li = [] while not self.atEnd(): val = self._readBasics() if self.isEndElement() and self.name() == "tuple" and val is None: - return tuple(l) + return tuple(li) else: - l.append(val) + li.append(val) def __readList(self): """ @@ -223,13 +223,13 @@ @return Python list """ - l = [] + li = [] while not self.atEnd(): val = self._readBasics() if self.isEndElement() and self.name() == "list" and val is None: - return l + return li else: - l.append(val) + li.append(val) def __readDict(self): """ @@ -257,13 +257,13 @@ @return Python set """ - l = [] + li = [] while not self.atEnd(): val = self._readBasics() if self.isEndElement() and self.name() == "set" and val is None: - return set(l) + return set(li) else: - l.append(val) + li.append(val) def __readFrozenset(self): """ @@ -271,12 +271,12 @@ @return Python set """ - l = [] + li = [] while not self.atEnd(): val = self._readBasics() if self.isEndElement() and \ self.name() == "frozenset" and \ val is None: - return frozenset(l) + return frozenset(li) else: - l.append(val) + li.append(val)
--- a/Globals/__init__.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Globals/__init__.py Sat Oct 19 13:03:39 2013 +0200 @@ -94,7 +94,7 @@ # check for blacklisted versions for vers in BlackLists["PyQt4"] + PlatformBlackLists["PyQt4"]: if vers == pyqtVersion: - print('Sorry, PyQt4 version {0} is not compatible with eric5.'\ + print('Sorry, PyQt4 version {0} is not compatible with eric5.' .format(vers)) print('Please install another version.') return False
--- a/Graphics/ApplicationDiagramBuilder.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Graphics/ApplicationDiagramBuilder.py Sat Oct 19 13:03:39 2013 +0200 @@ -105,17 +105,17 @@ # step 1: build a dictionary of packages for module in sortedkeys: - l = module.split('.') - package = '.'.join(l[:-1]) + li = module.split('.') + package = '.'.join(li[:-1]) if package in packages: - packages[package][0].append(l[-1]) + packages[package][0].append(li[-1]) else: - packages[package] = ([l[-1]], []) + packages[package] = ([li[-1]], []) # step 2: assign modules to dictionaries and update import relationship for module in sortedkeys: - l = module.split('.') - package = '.'.join(l[:-1]) + li = module.split('.') + package = '.'.join(li[:-1]) impLst = [] for i in modules[module].imports: if i in modules: @@ -154,7 +154,7 @@ packageList = shortPackage.split('.')[1:] packageListLen = len(packageList) i = '.'.join( - packageList[:packageListLen - dots + 1] + + packageList[:packageListLen - dots + 1] + [i[dots:]]) if i in modules:
--- a/Graphics/PackageDiagramBuilder.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Graphics/PackageDiagramBuilder.py Sat Oct 19 13:03:39 2013 +0200 @@ -71,9 +71,9 @@ import Utilities.ModuleParser supportedExt = \ - ['*{0}'.format(ext) for ext in + ['*{0}'.format(ext) for ext in Preferences.getPython("PythonExtensions")] + \ - ['*{0}'.format(ext) for ext in + ['*{0}'.format(ext) for ext in Preferences.getPython("Python3Extensions")] + \ ['*.rb'] extensions = Preferences.getPython("PythonExtensions") + \ @@ -122,9 +122,9 @@ import Utilities.ModuleParser supportedExt = \ - ['*{0}'.format(ext) for ext in + ['*{0}'.format(ext) for ext in Preferences.getPython("PythonExtensions")] + \ - ['*{0}'.format(ext) for ext in + ['*{0}'.format(ext) for ext in Preferences.getPython("Python3Extensions")] + \ ['*.rb'] extensions = Preferences.getPython("PythonExtensions") + \ @@ -195,7 +195,7 @@ if len(initlist) == 0: ct = QGraphicsTextItem(None, self.scene) ct.setHtml( - self.trUtf8("The directory <b>'{0}'</b> is not a package.")\ + self.trUtf8("The directory <b>'{0}'</b> is not a package.") .format(self.package)) return @@ -241,7 +241,7 @@ self.allClasses[className] = cw if cw and cw.noAttrs != self.noAttrs: cw = None - if cw and not (cw.external and \ + if cw and not (cw.external and (className in module.classes or className in module.modules) ):
--- a/Graphics/PixmapDiagram.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Graphics/PixmapDiagram.py Sat Oct 19 13:03:39 2013 +0200 @@ -296,7 +296,7 @@ @return current zoom factor in percent (integer) """ - return int(self.pixmapLabel.width() / + return int(self.pixmapLabel.width() / self.pixmapLabel.pixmap().width() * 100.0) def __printDiagram(self):
--- a/Graphics/SvgDiagram.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Graphics/SvgDiagram.py Sat Oct 19 13:03:39 2013 +0200 @@ -263,7 +263,7 @@ @return current zoom factor in percent (integer) """ - return int(self.svgWidget.width() / + return int(self.svgWidget.width() / self.svgWidget.sizeHint().width() * 100.0) def __printDiagram(self):
--- a/Graphics/UMLClassDiagramBuilder.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Graphics/UMLClassDiagramBuilder.py Sat Oct 19 13:03:39 2013 +0200 @@ -103,7 +103,7 @@ self.allModules[self.file].append(className) if cw and cw.noAttrs != self.noAttrs: cw = None - if cw and not (cw.external and \ + if cw and not (cw.external and (className in module.classes or className in module.modules) ):
--- a/Helpviewer/AdBlock/AdBlockNetwork.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/AdBlock/AdBlockNetwork.py Sat Oct 19 13:03:39 2013 +0200 @@ -43,7 +43,7 @@ blockedRule = subscription.match(request, urlDomain, urlString) if blockedRule: webPage = request.attribute(QNetworkRequest.User + 100) - if webPage is not None: + if webPage is not None: if not self.__canBeBlocked(webPage.url()): return None
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Sat Oct 19 13:03:39 2013 +0200 @@ -269,7 +269,7 @@ None, self.trUtf8("Load subscription rules"), self.trUtf8( - """Unable to open adblock file '{0}' for reading.""")\ + """Unable to open adblock file '{0}' for reading.""") .format(fileName)) else: textStream = QTextStream(f) @@ -279,7 +279,7 @@ None, self.trUtf8("Load subscription rules"), self.trUtf8("""AdBlock file '{0}' does not start""" - """ with [Adblock.""")\ + """ with [Adblock.""") .format(fileName)) f.close() f.remove() @@ -331,8 +331,8 @@ else: updatePeriod = Preferences.getHelp("AdBlockUpdatePeriod") * 24 if not self.__lastUpdate.isValid() or \ - (self.__remoteModified.isValid() and \ - self.__remoteModified.addSecs(updatePeriod * 3600) < \ + (self.__remoteModified.isValid() and + self.__remoteModified.addSecs(updatePeriod * 3600) < QDateTime.currentDateTime()) or \ self.__lastUpdate.addSecs(updatePeriod * 3600) < \ QDateTime.currentDateTime(): @@ -400,7 +400,7 @@ None, self.trUtf8("Downloading subscription rules"), self.trUtf8( - """Unable to open adblock file '{0}' for writing.""")\ + """Unable to open adblock file '{0}' for writing.""") .file(fileName)) return f.write(response) @@ -456,7 +456,7 @@ """ checksum.<br/>""" """Found: {1}<br/>""" """Calculated: {2}<br/>""" - """Use it anyway?</p>""")\ + """Use it anyway?</p>""") .format(self.__title, expectedChecksum, calculatedChecksum)) return res @@ -475,7 +475,7 @@ None, self.trUtf8("Saving subscription rules"), self.trUtf8( - """Unable to open adblock file '{0}' for writing.""")\ + """Unable to open adblock file '{0}' for writing.""") .format(fileName)) return
--- a/Helpviewer/Bookmarks/BookmarkPropertiesDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/Bookmarks/BookmarkPropertiesDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -42,7 +42,7 @@ """ from .BookmarkNode import BookmarkNode - if (self.__node.type() == BookmarkNode.Bookmark and \ + if (self.__node.type() == BookmarkNode.Bookmark and not self.addressEdit.text()) or \ not self.nameEdit.text(): super().accept()
--- a/Helpviewer/Bookmarks/BookmarksManager.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/Bookmarks/BookmarksManager.py Sat Oct 19 13:03:39 2013 +0200 @@ -139,7 +139,7 @@ self.trUtf8("Loading Bookmarks"), self.trUtf8( """Error when loading bookmarks on line {0},""" - """ column {1}:\n {2}""")\ + """ column {1}:\n {2}""") .format(reader.lineNumber(), reader.columnNumber(), reader.errorString())) @@ -149,13 +149,13 @@ len(self.__bookmarkRootNode.children()) - 1, -1, -1): node = self.__bookmarkRootNode.children()[index] if node.type() == BookmarkNode.Folder: - if (node.title == self.trUtf8("Toolbar Bookmarks") or \ + if (node.title == self.trUtf8("Toolbar Bookmarks") or node.title == BOOKMARKBAR) and \ self.__toolbar is None: node.title = self.trUtf8(BOOKMARKBAR) self.__toolbar = node - if (node.title == self.trUtf8("Menu") or \ + if (node.title == self.trUtf8("Menu") or node.title == BOOKMARKMENU) and \ self.__menu is None: node.title = self.trUtf8(BOOKMARKMENU) @@ -204,7 +204,7 @@ E5MessageBox.warning( None, self.trUtf8("Saving Bookmarks"), - self.trUtf8("""Error saving bookmarks to <b>{0}</b>.""")\ + self.trUtf8("""Error saving bookmarks to <b>{0}</b>.""") .format(bookmarkFile)) # restore localized titles @@ -390,7 +390,7 @@ E5MessageBox.critical( None, self.trUtf8("Exporting Bookmarks"), - self.trUtf8("""Error exporting bookmarks to <b>{0}</b>.""")\ + self.trUtf8("""Error exporting bookmarks to <b>{0}</b>.""") .format(fileName)) def __convertFromOldBookmarks(self):
--- a/Helpviewer/Bookmarks/BookmarksMenu.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/Bookmarks/BookmarksMenu.py Sat Oct 19 13:03:39 2013 +0200 @@ -234,7 +234,7 @@ self.__bookmarksManager = Helpviewer.HelpWindow.HelpWindow\ .bookmarksManager() self.setModel(self.__bookmarksManager.bookmarksModel()) - self.setRootIndex(self.__bookmarksManager.bookmarksModel()\ + self.setRootIndex(self.__bookmarksManager.bookmarksModel() .nodeIndex(self.__bookmarksManager.menu())) # initial actions @@ -247,7 +247,7 @@ self.addSeparator() self.createMenu( - self.__bookmarksManager.bookmarksModel()\ + self.__bookmarksManager.bookmarksModel() .nodeIndex(self.__bookmarksManager.toolbar()), 1, self) return True
--- a/Helpviewer/CookieJar/CookieJar.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/CookieJar/CookieJar.py Sat Oct 19 13:03:39 2013 +0200 @@ -258,7 +258,7 @@ soon = soon.addDays(90) for cookie in cookieList: lst = [] - if not (self.__filterTrackingCookies and \ + if not (self.__filterTrackingCookies and cookie.name().startsWith("__utm")): if eAllowSession: cookie.setExpirationDate(QDateTime())
--- a/Helpviewer/Download/DownloadItem.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/Download/DownloadItem.py Sat Oct 19 13:03:39 2013 +0200 @@ -220,7 +220,7 @@ self.__reply.close() self.on_stopButton_clicked() self.filenameLabel.setText( - self.trUtf8("Download canceled: {0}")\ + self.trUtf8("Download canceled: {0}") .format(QFileInfo(defaultFileName).fileName())) self.__canceledFileSelect = True return @@ -240,7 +240,7 @@ self.progressBar.setVisible(False) self.on_stopButton_clicked() self.infoLabel.setText(self.trUtf8( - "Download directory ({0}) couldn't be created.")\ + "Download directory ({0}) couldn't be created.") .format(saveDirPath.absolutePath())) return @@ -416,7 +416,7 @@ self.__getFileName() if not self.__output.open(QIODevice.WriteOnly): self.infoLabel.setText( - self.trUtf8("Error opening save file: {0}")\ + self.trUtf8("Error opening save file: {0}") .format(self.__output.errorString())) self.on_stopButton_clicked() self.statusChanged.emit() @@ -428,7 +428,7 @@ self.__md5Hash.addData(buffer) bytesWritten = self.__output.write(buffer) if bytesWritten == -1: - self.infoLabel.setText(self.trUtf8("Error saving: {0}")\ + self.infoLabel.setText(self.trUtf8("Error saving: {0}") .format(self.__output.errorString())) self.on_stopButton_clicked() else: @@ -440,7 +440,7 @@ """ Private slot to handle a network error. """ - self.infoLabel.setText(self.trUtf8("Network Error: {0}")\ + self.infoLabel.setText(self.trUtf8("Network Error: {0}") .format(self.__reply.errorString())) self.tryAgainButton.setEnabled(True) self.tryAgainButton.setVisible(True) @@ -511,7 +511,7 @@ if self.bytesTotal() == -1: return -1.0 - timeRemaining = (self.bytesTotal() - + timeRemaining = (self.bytesTotal() - self.bytesReceived()) / self.currentSpeed() # ETA should never be 0 @@ -554,7 +554,7 @@ info = self.trUtf8("{0} of {1} ({2}/sec)\n{3}")\ .format( dataString(self.__bytesReceived), - bytesTotal == -1 and self.trUtf8("?") \ + bytesTotal == -1 and self.trUtf8("?") or dataString(bytesTotal), dataString(int(speed)), remaining)
--- a/Helpviewer/Download/DownloadManager.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/Download/DownloadManager.py Sat Oct 19 13:03:39 2013 +0200 @@ -106,9 +106,9 @@ menu.addSeparator() menu.addAction(self.trUtf8("Select All"), self.__contextMenuSelectAll) if selectedRowsCount > 1 or \ - (selectedRowsCount == 1 and \ + (selectedRowsCount == 1 and not self.__downloads[ - self.downloadsView.selectionModel().selectedRows()[0].row()]\ + self.downloadsView.selectionModel().selectedRows()[0].row()] .downloading()): menu.addSeparator() menu.addAction(
--- a/Helpviewer/Feeds/FeedsManager.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/Feeds/FeedsManager.py Sat Oct 19 13:03:39 2013 +0200 @@ -360,7 +360,7 @@ return self.__openMessage( - QApplication.keyboardModifiers() & + QApplication.keyboardModifiers() & Qt.ControlModifier == Qt.ControlModifier) def __openMessageInCurrentTab(self):
--- a/Helpviewer/HelpBrowserWV.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/HelpBrowserWV.py Sat Oct 19 13:03:39 2013 +0200 @@ -139,7 +139,7 @@ @return search URL (string) """ return bytes( - self.__mw.openSearchManager().currentEngine()\ + self.__mw.openSearchManager().currentEngine() .searchUrl(searchStr).toEncoded()).decode() ############################################################################### @@ -351,7 +351,7 @@ html = html.replace("@TITLE@", title.encode("utf8")) html = html.replace("@H1@", info.errorString.encode("utf8")) html = html.replace( - "@H2@", self.trUtf8("When connecting to: {0}.")\ + "@H2@", self.trUtf8("When connecting to: {0}.") .format(urlString).encode("utf8")) html = html.replace( "@LI-1@", @@ -372,7 +372,7 @@ html = html.replace( "@LI-4@", self.trUtf8("If your cache policy is set to offline browsing," - "only pages in the local cache are available.")\ + "only pages in the local cache are available.") .encode("utf8")) html = html.replace( "@BUTTON@", self.trUtf8("Try Again").encode("utf8")) @@ -823,7 +823,7 @@ self, self.trUtf8("eric5 Web Browser"), self.trUtf8( - """<p>The file <b>{0}</b> does not exist.</p>""")\ + """<p>The file <b>{0}</b> does not exist.</p>""") .format(name.toLocalFile())) return @@ -1723,7 +1723,7 @@ if self.__enableAccessKeys: self.__accessKeysPressed = ( - evt.modifiers() == Qt.ControlModifier and \ + evt.modifiers() == Qt.ControlModifier and evt.key() == Qt.Key_Control) if not self.__accessKeysPressed: if self.__checkForAccessKey(evt): @@ -1952,7 +1952,7 @@ html = html.replace("@TITLE@", title.encode("utf8")) html = html.replace("@H1@", reply.errorString().encode("utf8")) html = html.replace( - "@H2@", self.trUtf8("When connecting to: {0}.")\ + "@H2@", self.trUtf8("When connecting to: {0}.") .format(urlString).encode("utf8")) html = html.replace( "@LI-1@", @@ -1972,7 +1972,7 @@ html = html.replace( "@LI-4@", self.trUtf8("If your cache policy is set to offline browsing," - "only pages in the local cache are available.")\ + "only pages in the local cache are available.") .encode("utf8")) html = html.replace( "@BUTTON@", self.trUtf8("Try Again").encode("utf8")) @@ -2008,7 +2008,7 @@ self.trUtf8( """<p>The database quota of <strong>{0}</strong> has""" """ been exceeded while accessing database <strong>{1}""" - """</strong>.</p><p>Shall it be changed?</p>""")\ + """</strong>.</p><p>Shall it be changed?</p>""") .format(self.__dataString(securityOrigin.databaseQuota()), databaseName), yesDefault=True) @@ -2018,7 +2018,7 @@ self.trUtf8("New Web Database Quota"), self.trUtf8( "Enter the new quota in MB (current = {0}, used = {1}; " - "step size = 5 MB):"\ + "step size = 5 MB):" .format( self.__dataString(securityOrigin.databaseQuota()), self.__dataString(securityOrigin.databaseUsage()))), @@ -2250,7 +2250,7 @@ for linkElement in linkElementsList: # only atom+xml and rss+xml will be processed if linkElement.attribute("rel") != "alternate" or \ - (linkElement.attribute("type") != "application/rss+xml" and \ + (linkElement.attribute("type") != "application/rss+xml" and linkElement.attribute("type") != "application/atom+xml"): continue
--- a/Helpviewer/HelpDocsInstaller.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/HelpDocsInstaller.py Sat Oct 19 13:03:39 2013 +0200 @@ -111,7 +111,7 @@ if version == 4: docsPath = QDir( - QLibraryInfo.location(QLibraryInfo.DocumentationPath) + \ + QLibraryInfo.location(QLibraryInfo.DocumentationPath) + QDir.separator() + "qch") elif version == 5: docsPath = QDir( @@ -149,14 +149,14 @@ self.errorMessage.emit( self.trUtf8( """<p>The file <b>{0}</b> could not be""" - """ registered. <br/>Reason: {1}</p>""")\ + """ registered. <br/>Reason: {1}</p>""") .format(fi.absoluteFilePath, engine.error()) ) return False engine.setCustomValue( versionKey, - fi.lastModified().toString(Qt.ISODate) + '|' + \ + fi.lastModified().toString(Qt.ISODate) + '|' + fi.absoluteFilePath()) return True @@ -210,14 +210,14 @@ self.errorMessage.emit( self.trUtf8( """<p>The file <b>{0}</b> could not be""" - """ registered. <br/>Reason: {1}</p>""")\ + """ registered. <br/>Reason: {1}</p>""") .format(fi.absoluteFilePath, engine.error()) ) return False engine.setCustomValue( versionKey, - fi.lastModified().toString(Qt.ISODate) + '|' + \ + fi.lastModified().toString(Qt.ISODate) + '|' + fi.absoluteFilePath()) return True
--- a/Helpviewer/HelpIndexWidget.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/HelpIndexWidget.py Sat Oct 19 13:03:39 2013 +0200 @@ -41,11 +41,11 @@ self.__index = None self.__layout = QVBoxLayout(self) - l = QLabel(self.trUtf8("&Look for:")) - self.__layout.addWidget(l) + label = QLabel(self.trUtf8("&Look for:")) + self.__layout.addWidget(label) self.__searchEdit = QLineEdit() - l.setBuddy(self.__searchEdit) + label.setBuddy(self.__searchEdit) self.__searchEdit.textChanged.connect(self.__filterIndices) self.__searchEdit.installEventFilter(self) self.__layout.addWidget(self.__searchEdit)
--- a/Helpviewer/HelpLanguagesDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/HelpLanguagesDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -157,7 +157,7 @@ return cls.expand(QLocale(language).language()) @classmethod - def expand(self, language): + def expand(cls, language): """ Class method to expand a language enum to a readable languages list.
--- a/Helpviewer/HelpTabBar.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/HelpTabBar.py Sat Oct 19 13:03:39 2013 +0200 @@ -59,10 +59,10 @@ self.__previewPopup.setFixedSize(w, h) from .HelpSnap import renderTabPreview - l = QLabel() - l.setPixmap(renderTabPreview(indexedBrowser.page(), w, h)) + label = QLabel() + label.setPixmap(renderTabPreview(indexedBrowser.page(), w, h)) - self.__previewPopup.setView(l) + self.__previewPopup.setView(label) self.__previewPopup.layout().setAlignment(Qt.AlignTop) self.__previewPopup.layout().setContentsMargins(0, 0, 0, 0)
--- a/Helpviewer/HelpTabWidget.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/HelpTabWidget.py Sat Oct 19 13:03:39 2013 +0200 @@ -475,10 +475,10 @@ @return list of references to browsers (list of HelpBrowser) """ - l = [] + li = [] for index in range(self.count()): - l.append(self.widget(index)) - return l + li.append(self.widget(index)) + return li def printBrowser(self, browser=None): """
--- a/Helpviewer/HelpTopicDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/HelpTopicDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -29,7 +29,7 @@ super().__init__(parent) self.setupUi(self) - self.label.setText(self.trUtf8("Choose a &topic for <b>{0}</b>:")\ + self.label.setText(self.trUtf8("Choose a &topic for <b>{0}</b>:") .format(keyword)) self.__links = links
--- a/Helpviewer/HelpWebSearchWidget.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/HelpWebSearchWidget.py Sat Oct 19 13:03:39 2013 +0200 @@ -113,7 +113,7 @@ Private method to create the completer menu. """ if not self.__suggestions or \ - (self.__model.rowCount() > 0 and \ + (self.__model.rowCount() > 0 and self.__model.item(0) != self.__suggestionsItem): self.__model.clear() self.__suggestionsItem = None
--- a/Helpviewer/HelpWindow.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/HelpWindow.py Sat Oct 19 13:03:39 2013 +0200 @@ -351,7 +351,7 @@ os.makedirs(webDatabaseDir) settings.setOfflineStoragePath(webDatabaseDir) settings.setOfflineStorageDefaultQuota( - Preferences.getHelp("OfflineStorageDatabaseQuota") * \ + Preferences.getHelp("OfflineStorageDatabaseQuota") * 1024 * 1024) if hasattr(QWebSettings, "OfflineWebApplicationCacheEnabled"): @@ -364,7 +364,7 @@ os.makedirs(appCacheDir) settings.setOfflineWebApplicationCachePath(appCacheDir) settings.setOfflineWebApplicationCacheQuota( - Preferences.getHelp("OfflineWebApplicationCacheQuota") * \ + Preferences.getHelp("OfflineWebApplicationCacheQuota") * 1024 * 1024) if hasattr(QWebSettings, "LocalStorageEnabled"): @@ -3567,8 +3567,8 @@ @param txt contents of the search (string) """ self.virustotalSearchAct.setEnabled( - txt != "" and \ - Preferences.getHelp("VirusTotalEnabled") and \ + txt != "" and + Preferences.getHelp("VirusTotalEnabled") and Preferences.getHelp("VirusTotalServiceKey") != "") def __virusTotalSearch(self):
--- a/Helpviewer/History/HistoryFilterModel.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/History/HistoryFilterModel.py Sat Oct 19 13:03:39 2013 +0200 @@ -35,7 +35,7 @@ @return flag indicating equality (boolean) """ return self.tailOffset == other.tailOffset and \ - (self.frequency == -1 or other.frequency == -1 or \ + (self.frequency == -1 or other.frequency == -1 or self.frequency == other.frequency) def __lt__(self, other):
--- a/Helpviewer/History/HistoryManager.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/History/HistoryManager.py Sat Oct 19 13:03:39 2013 +0200 @@ -387,7 +387,7 @@ self.trUtf8("Loading History"), self.trUtf8( """<p>Unable to open history file <b>{0}</b>.<br/>""" - """Reason: {1}</p>""")\ + """Reason: {1}</p>""") .format(historyFile.fileName, historyFile.errorString())) return @@ -467,7 +467,7 @@ self.trUtf8("Saving History"), self.trUtf8( """<p>Unable to open history file <b>{0}</b>.<br/>""" - """Reason: {1}</p>""")\ + """Reason: {1}</p>""") .format(f.fileName(), f.errorString())) return @@ -490,7 +490,7 @@ self.trUtf8("Saving History"), self.trUtf8( """<p>Error removing old history file <b>{0}</b>.""" - """<br/>Reason: {1}</p>""")\ + """<br/>Reason: {1}</p>""") .format(historyFile.fileName(), historyFile.errorString())) if not f.copy(historyFile.fileName()): @@ -499,7 +499,7 @@ self.trUtf8("Saving History"), self.trUtf8( """<p>Error moving new history file over old one """ - """(<b>{0}</b>).<br/>Reason: {1}</p>""")\ + """(<b>{0}</b>).<br/>Reason: {1}</p>""") .format(historyFile.fileName(), f.errorString())) self.historySaved.emit() try:
--- a/Helpviewer/OpenSearch/OpenSearchManager.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchManager.py Sat Oct 19 13:03:39 2013 +0200 @@ -359,8 +359,8 @@ from .OpenSearchReader import OpenSearchReader from .DefaultSearchEngines import DefaultSearchEngines_rc # __IGNORE_WARNING__ - defaultEngineFiles = ["YouTube.xml", "Amazoncom.xml", "Bing.xml", - "DeEn_Beolingus.xml", "Facebook.xml", + defaultEngineFiles = ["YouTube.xml", "Amazoncom.xml", "Bing.xml", + "DeEn_Beolingus.xml", "Facebook.xml", "Google_Im_Feeling_Lucky.xml", "Google.xml", "LEO_DeuEng.xml", "LinuxMagazin.xml", "Reddit.xml", "Wikia_en.xml", "Wikia.xml",
--- a/Helpviewer/OpenSearch/OpenSearchReader.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchReader.py Sat Oct 19 13:03:39 2013 +0200 @@ -69,8 +69,8 @@ engine.suggestionsUrlTemplate(): continue - if (not type_ or \ - type_ == "text/html" or \ + if (not type_ or + type_ == "text/html" or type_ == "application/xhtml+xml") and \ engine.suggestionsUrlTemplate(): continue
--- a/Helpviewer/PageScreenDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/PageScreenDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -88,7 +88,7 @@ E5MessageBox.warning( self, self.trUtf8("Save Page Screen"), - self.trUtf8("Cannot write file '{0}:\n{1}.")\ + self.trUtf8("Cannot write file '{0}:\n{1}.") .format(fileName, file.errorString())) return False @@ -99,7 +99,7 @@ E5MessageBox.warning( self, self.trUtf8("Save Page Screen"), - self.trUtf8("Cannot write file '{0}:\n{1}.")\ + self.trUtf8("Cannot write file '{0}:\n{1}.") .format(fileName, file.errorString())) return False
--- a/Helpviewer/Passwords/PasswordManager.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/Passwords/PasswordManager.py Sat Oct 19 13:03:39 2013 +0200 @@ -100,7 +100,7 @@ key = self.__createKey(url, realm) self.__logins[key] = ( - username, + username, Utilities.crypto.pwConvert(password, encode=True) ) self.changed.emit() @@ -166,7 +166,7 @@ None, self.trUtf8("Loading login data"), self.trUtf8("""Error when loading login data on""" - """ line {0}, column {1}:\n{2}""")\ + """ line {0}, column {1}:\n{2}""") .format(reader.lineNumber(), reader.columnNumber(), reader.errorString())) @@ -193,7 +193,7 @@ self.trUtf8("Loading login data"), self.trUtf8("""<p>Login data could not be loaded """ """from <b>{0}</b></p>""" - """<p>Reason: {1}</p>""")\ + """<p>Reason: {1}</p>""") .format(loginFile, str(err))) return @@ -219,7 +219,7 @@ self.trUtf8( """<p>Login data could not be loaded """ """from <b>{0}</b></p>""" - """<p>Reason: Wrong input format</p>""")\ + """<p>Reason: Wrong input format</p>""") .format(loginFile)) return self.__logins[data[0]] = (data[1], data[2]) @@ -355,7 +355,7 @@ # determine the QWebPage webPage = request.attribute(QNetworkRequest.User + 100) - if webPage is None: + if webPage is None: return # determine the requests content type @@ -466,7 +466,7 @@ formHasPasswords = False formName = map["name"] formIndex = map["index"] - if type(formIndex) == type(0.0) and formIndex.is_integer(): + if isinstance(formIndex, float) and formIndex.is_integer(): formIndex = int(formIndex) elements = map["elements"] formElements = set()
--- a/Helpviewer/QtHelpDocumentationDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/QtHelpDocumentationDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -80,7 +80,7 @@ self, self.trUtf8("Add Documentation"), self.trUtf8( - """The namespace <b>{0}</b> is already registered.""")\ + """The namespace <b>{0}</b> is already registered.""") .format(ns) ) continue
--- a/Helpviewer/SiteInfo/SiteInfoDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/SiteInfo/SiteInfoDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -91,7 +91,7 @@ # populate the Security info and the Security tab if sslInfo and \ - ((qVersion() >= "5.0.0" and not sslInfo[0].isBlacklisted()) or \ + ((qVersion() >= "5.0.0" and not sslInfo[0].isBlacklisted()) or (qVersion() < "5.0.0" and sslInfo[0].isValid())): self.securityLabel.setStyleSheet(SiteInfoDialog.okStyle) self.securityLabel.setText('<b>Connection is encrypted.</b>')
--- a/Helpviewer/Sync/DirectorySyncHandler.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/Sync/DirectorySyncHandler.py Sat Oct 19 13:03:39 2013 +0200 @@ -63,7 +63,7 @@ self.__remoteFilesFound = [] - # check the existence of the shared directory; create it, if it is + # check the existence of the shared directory; create it, if it is # not there if not os.path.exists(Preferences.getHelp("SyncDirectoryPath")): try: @@ -179,7 +179,7 @@ if Preferences.getHelp("SyncBookmarks"): self.__initialSyncFile( "bookmarks", - Helpviewer.HelpWindow.HelpWindow.bookmarksManager()\ + Helpviewer.HelpWindow.HelpWindow.bookmarksManager() .getFileName()) QCoreApplication.processEvents() @@ -187,7 +187,7 @@ if Preferences.getHelp("SyncHistory"): self.__initialSyncFile( "history", - Helpviewer.HelpWindow.HelpWindow.historyManager()\ + Helpviewer.HelpWindow.HelpWindow.historyManager() .getFileName()) QCoreApplication.processEvents()
--- a/Helpviewer/Sync/SyncEncryptionPage.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/Sync/SyncEncryptionPage.py Sat Oct 19 13:03:39 2013 +0200 @@ -99,7 +99,7 @@ if self.encryptionKeyEdit.text() != "" and \ self.reencryptCheckBox.isChecked() and \ - (self.encryptionKeyEdit.text() != + (self.encryptionKeyEdit.text() != self.encryptionKeyAgainEdit.text()): error = error or self.trUtf8( "Repeated encryption key is wrong.")
--- a/Helpviewer/Sync/SyncHandler.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/Sync/SyncHandler.py Sat Oct 19 13:03:39 2013 +0200 @@ -215,8 +215,8 @@ return QByteArray() if Preferences.getHelp("SyncEncryptData") and \ - (not Preferences.getHelp("SyncEncryptPasswordsOnly") or \ - (Preferences.getHelp("SyncEncryptPasswordsOnly") and \ + (not Preferences.getHelp("SyncEncryptPasswordsOnly") or + (Preferences.getHelp("SyncEncryptPasswordsOnly") and type_ == "passwords")): key = Preferences.getHelp("SyncEncryptionKey") if not key: @@ -253,7 +253,7 @@ if Preferences.getHelp("SyncEncryptData") and \ (not Preferences.getHelp("SyncEncryptPasswordsOnly") or - (Preferences.getHelp("SyncEncryptPasswordsOnly") and + (Preferences.getHelp("SyncEncryptPasswordsOnly") and type_ == "passwords")): key = Preferences.getHelp("SyncEncryptionKey") if not key:
--- a/Helpviewer/UrlBar/StackedUrlBar.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/UrlBar/StackedUrlBar.py Sat Oct 19 13:03:39 2013 +0200 @@ -62,7 +62,7 @@ @return list of references to url bars (list of UrlBar) """ - l = [] + li = [] for index in range(self.count()): - l.append(self.widget(index)) - return l + li.append(self.widget(index)) + return li
--- a/Helpviewer/UrlBar/UrlBar.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/UrlBar/UrlBar.py Sat Oct 19 13:03:39 2013 +0200 @@ -316,7 +316,7 @@ b = (highlight.blue() + 2 * backgroundColor.blue()) // 3 loadingColor = QColor(r, g, b) - if abs(loadingColor.lightness() - + if abs(loadingColor.lightness() - backgroundColor.lightness()) < 20: # special handling for special color schemes (e.g Gaia) r = (2 * highlight.red() + backgroundColor.red()) // 3
--- a/Helpviewer/UserAgent/UserAgentManager.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Helpviewer/UserAgent/UserAgentManager.py Sat Oct 19 13:03:39 2013 +0200 @@ -88,7 +88,7 @@ None, self.trUtf8("Loading user agent data"), self.trUtf8("""Error when loading user agent data on""" - """ line {0}, column {1}:\n{2}""")\ + """ line {0}, column {1}:\n{2}""") .format(reader.lineNumber(), reader.columnNumber(), reader.errorString())) @@ -115,7 +115,7 @@ self.trUtf8("Loading user agent data"), self.trUtf8("""<p>User agent data could not be loaded """ """from <b>{0}</b></p>""" - """<p>Reason: {1}</p>""")\ + """<p>Reason: {1}</p>""") .format(agentFile, str(err))) return
--- a/IconEditor/IconEditorGrid.py Sat Oct 19 12:28:12 2013 +0200 +++ b/IconEditor/IconEditorGrid.py Sat Oct 19 13:03:39 2013 +0200 @@ -649,19 +649,20 @@ elif self.__curTool in [self.Rectangle, self.FilledRectangle, self.RectangleSelection]: - l = min(start.x(), end.x()) - t = min(start.y(), end.y()) - r = max(start.x(), end.x()) - b = max(start.y(), end.y()) + left = min(start.x(), end.x()) + top = min(start.y(), end.y()) + right = max(start.x(), end.x()) + bottom = max(start.y(), end.y()) if self.__curTool == self.RectangleSelection: painter.setBrush(QBrush(drawColor)) if self.__curTool == self.FilledRectangle: - for y in range(t, b + 1): - painter.drawLine(l, y, r, y) + for y in range(top, bottom + 1): + painter.drawLine(left, y, right, y) else: - painter.drawRect(l, t, r - l, b - t) + painter.drawRect(left, top, right - left, bottom - top) if self.__selecting: - self.__selRect = QRect(l, t, r - l + 1, b - t + 1) + self.__selRect = QRect( + left, top, right - left + 1, bottom - top + 1) self.__selectionAvailable = True self.selectionAvailable.emit(True)
--- a/MultiProject/AddProjectDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/MultiProject/AddProjectDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -104,5 +104,5 @@ """ Private method to update the dialog. """ - self.__okButton.setEnabled(self.nameEdit.text() != "" and \ + self.__okButton.setEnabled(self.nameEdit.text() != "" and self.filenameEdit.text() != "")
--- a/MultiProject/MultiProject.py Sat Oct 19 12:28:12 2013 +0200 +++ b/MultiProject/MultiProject.py Sat Oct 19 13:03:39 2013 +0200 @@ -418,7 +418,7 @@ fn = E5FileDialog.getOpenFileName( self.parent(), self.trUtf8("Open multiproject"), - Preferences.getMultiProject("Workspace") or \ + Preferences.getMultiProject("Workspace") or Utilities.getHomeDir(), self.trUtf8("Multiproject Files (*.e4m)"))
--- a/Network/IRC/IrcChannelWidget.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Network/IRC/IrcChannelWidget.py Sat Oct 19 13:03:39 2013 +0200 @@ -170,8 +170,8 @@ @return flag indicating that the topic can be changed (boolean) """ - return(bool(self.__privilege & IrcUserItem.Operator) or \ - bool(self.__privilege & IrcUserItem.Admin) or \ + return(bool(self.__privilege & IrcUserItem.Operator) or + bool(self.__privilege & IrcUserItem.Admin) or bool(self.__privilege & IrcUserItem.Owner)) @@ -726,7 +726,7 @@ self.__addManagementMessage( IrcChannelWidget.MessageIndicator, self.trUtf8("The topic was set by {0} on {1}.").format( - match.group(2), QDateTime.fromTime_t(int(match.group(3)))\ + match.group(2), QDateTime.fromTime_t(int(match.group(3))) .toString("yyyy-MM-dd hh:mm"))) return True @@ -795,7 +795,7 @@ self.__addManagementMessage( IrcChannelWidget.MessageIndicator, self.trUtf8("This channel was created on {0}.").format( - QDateTime.fromTime_t(int(match.group(2)))\ + QDateTime.fromTime_t(int(match.group(2))) .toString("yyyy-MM-dd hh:mm"))) return True
--- a/Network/IRC/IrcIdentitiesEditDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Network/IRC/IrcIdentitiesEditDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -88,7 +88,7 @@ """ Private slot to update the status of the identity related buttons. """ - enable = (self.identitiesCombo.currentText() != + enable = (self.identitiesCombo.currentText() != IrcIdentity.DefaultIdentityDisplay) self.renameButton.setEnabled(enable) self.deleteButton.setEnabled(enable)
--- a/Network/IRC/IrcNetworkWidget.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Network/IRC/IrcNetworkWidget.py Sat Oct 19 13:03:39 2013 +0200 @@ -408,7 +408,7 @@ self.trUtf8("Error saving Messages"), self.trUtf8( """<p>The messages contents could not be written""" - """ to <b>{0}</b></p><p>Reason: {1}</p>""")\ + """ to <b>{0}</b></p><p>Reason: {1}</p>""") .format(fname, str(err))) def __initMessagesMenu(self):
--- a/Network/IRC/IrcWidget.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Network/IRC/IrcWidget.py Sat Oct 19 13:03:39 2013 +0200 @@ -237,7 +237,7 @@ self.trUtf8("Disconnect from Server"), self.trUtf8("""<p>Do you really want to disconnect from""" """ <b>{0}</b>?</p><p>All channels will be""" - """ closed.</p>""")\ + """ closed.</p>""") .format(self.__server.getName())) if ok: self.networkWidget.addServerMessage(
--- a/PluginManager/PluginInfoDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/PluginManager/PluginInfoDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -93,7 +93,7 @@ """ itm = self.pluginList.itemAt(coord) if itm is not None: - autoactivate = (itm.text(self.__autoActivateColumn) == + autoactivate = (itm.text(self.__autoActivateColumn) == self.trUtf8("Yes")) if itm.text(self.__activeColumn) == self.trUtf8("Yes"): self.__activateAct.setEnabled(False)
--- a/PluginManager/PluginInstallDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/PluginManager/PluginInstallDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -380,7 +380,7 @@ activatePlugin = \ not self.__pluginManager.isPluginLoaded( installedPluginName) or \ - (self.__pluginManager.isPluginLoaded(installedPluginName) and \ + (self.__pluginManager.isPluginLoaded(installedPluginName) and self.__pluginManager.isPluginActive(installedPluginName)) # try to unload a plugin with the same name self.__pluginManager.unloadPlugin(installedPluginName)
--- a/PluginManager/PluginManager.py Sat Oct 19 12:28:12 2013 +0200 +++ b/PluginManager/PluginManager.py Sat Oct 19 13:03:39 2013 +0200 @@ -161,7 +161,7 @@ except IOError: return ( False, - self.trUtf8("Could not create a package for {0}.")\ + self.trUtf8("Could not create a package for {0}.") .format(self.__develPluginFile)) if Preferences.getPluginManager("ActivateExternal"): @@ -221,7 +221,7 @@ self.__foundUserModules = \ self.getPluginModules(self.pluginDirs["user"]) - return len(self.__foundCoreModules + self.__foundGlobalModules + \ + return len(self.__foundCoreModules + self.__foundGlobalModules + self.__foundUserModules) > 0 def getPluginModules(self, pluginPath): @@ -231,7 +231,7 @@ @param pluginPath name of the path to search (string) @return list of plugin module names (list of string) """ - pluginFiles = [f[:-3] for f in os.listdir(pluginPath) \ + pluginFiles = [f[:-3] for f in os.listdir(pluginPath) if self.isValidPluginName(f)] return pluginFiles[:]
--- a/PluginManager/PluginRepositoryDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/PluginManager/PluginRepositoryDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -170,7 +170,7 @@ self.urlEdit.setText(current.data(0, urlRole) or "") self.descriptionEdit.setPlainText( - current.data(0, descrRole) and \ + current.data(0, descrRole) and self.__formatDescription(current.data(0, descrRole)) or "") self.authorEdit.setText(current.data(0, authorRole) or "") @@ -335,7 +335,7 @@ self, self.trUtf8("Read plugins repository file"), self.trUtf8("<p>The plugins repository file <b>{0}</b> " - "could not be read. Select Update</p>")\ + "could not be read. Select Update</p>") .format(self.pluginRepositoryFile)) else: self.__repositoryMissing = True
--- a/PluginManager/PluginUninstallDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/PluginManager/PluginUninstallDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -132,7 +132,7 @@ internalPackages = [] if hasattr(module, "internalPackages"): # it is a comma separated string - internalPackages = [p.strip() for p in + internalPackages = [p.strip() for p in module.internalPackages.split(",")] del module @@ -183,7 +183,7 @@ self.trUtf8("Plugin Uninstallation"), self.trUtf8( """<p>The plugin <b>{0}</b> was uninstalled""" - """ successfully from {1}.</p>""")\ + """ successfully from {1}.</p>""") .format(pluginName, pluginDirectory)) return True @@ -192,7 +192,7 @@ self.trUtf8("Plugin Uninstallation"), self.trUtf8( """<p>The plugin <b>{0}</b> was uninstalled successfully""" - """ from {1}.</p>""")\ + """ from {1}.</p>""") .format(pluginName, pluginDirectory)) return True
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -348,10 +348,10 @@ [f for f in files if not fnmatch.fnmatch(f, filter.strip())] - py3files = [f for f in files \ + py3files = [f for f in files if f.endswith( tuple(Preferences.getPython("Python3Extensions")))] - py2files = [f for f in files \ + py2files = [f for f in files if f.endswith( tuple(Preferences.getPython("PythonExtensions")))] @@ -398,7 +398,7 @@ self.noResults = False self.__createResultItem( file, "1", "1", - self.trUtf8("Error: {0}").format(str(msg))\ + self.trUtf8("Error: {0}").format(str(msg)) .rstrip()[1:-1], False, False) progress += 1 continue @@ -416,10 +416,10 @@ if ("FileType" in flags and flags["FileType"] in ["Python", "Python2"]) or \ file in py2files or \ - (ext in [".py", ".pyw"] and \ - Preferences.getProject("DeterminePyFromProject") and \ - self.__project.isOpen() and \ - self.__project.isProjectFile(file) and \ + (ext in [".py", ".pyw"] and + Preferences.getProject("DeterminePyFromProject") and + self.__project.isOpen() and + self.__project.isProjectFile(file) and self.__project.getProjectLanguage() in ["Python", "Python2"]): from .CodeStyleChecker import CodeStyleCheckerPy2 @@ -436,12 +436,12 @@ stats.update(report.counters) else: if includeMessages: - select = [s.strip() for s in + select = [s.strip() for s in includeMessages.split(',') if s.strip()] else: select = [] if excludeMessages: - ignore = [i.strip() for i in + ignore = [i.strip() for i in excludeMessages.split(',') if i.strip()] else: ignore = [] @@ -825,7 +825,7 @@ fixesDict[filename].append(( (itm.data(0, self.lineRole), itm.data(0, self.positionRole), - "{0} {1}".format(itm.data(0, self.codeRole), + "{0} {1}".format(itm.data(0, self.codeRole), itm.data(0, self.messageRole))), itm ))
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -152,10 +152,10 @@ Utilities.direntries(fn, 1, '*{0}'.format(ext), 0)) else: files = [fn] - py3files = [f for f in files \ + py3files = [f for f in files if f.endswith( tuple(Preferences.getPython("Python3Extensions")))] - py2files = [f for f in files \ + py2files = [f for f in files if f.endswith( tuple(Preferences.getPython("PythonExtensions")))] @@ -191,7 +191,7 @@ self.noResults = False self.__createResultItem( file, "1", 0, - self.trUtf8("Error: {0}").format(str(msg))\ + self.trUtf8("Error: {0}").format(str(msg)) .rstrip()[1:-1], "") progress += 1 continue @@ -201,10 +201,10 @@ if ("FileType" in flags and flags["FileType"] in ["Python", "Python2"]) or \ file in py2files or \ - (ext in [".py", ".pyw"] and \ - Preferences.getProject("DeterminePyFromProject") and \ - self.__project.isOpen() and \ - self.__project.isProjectFile(file) and \ + (ext in [".py", ".pyw"] and + Preferences.getProject("DeterminePyFromProject") and + self.__project.isOpen() and + self.__project.isProjectFile(file) and self.__project.getProjectLanguage() in ["Python", "Python2"]): isPy3 = False
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -160,10 +160,10 @@ if ("FileType" in flags and flags["FileType"] in ["Python", "Python2"]) or \ file in py2files or \ - (ext in [".py", ".pyw"] and \ - Preferences.getProject("DeterminePyFromProject") and \ - self.__project.isOpen() and \ - self.__project.isProjectFile(file) and \ + (ext in [".py", ".pyw"] and + Preferences.getProject("DeterminePyFromProject") and + self.__project.isOpen() and + self.__project.isProjectFile(file) and self.__project.getProjectLanguage() in ["Python", "Python2"]): nok, fname, line, error = self.__py2check(file)
--- a/Plugins/PluginEricapi.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginEricapi.py Sat Oct 19 13:03:39 2013 +0200 @@ -134,7 +134,7 @@ if menuName == "Apidoc": if self.__projectAct is not None: self.__projectAct.setEnabled( - e5App().getObject("Project").getProjectLanguage() in \ + e5App().getObject("Project").getProjectLanguage() in ["Python", "Python2", "Python3", "Ruby"]) def __doEricapi(self):
--- a/Plugins/PluginEricdoc.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginEricdoc.py Sat Oct 19 13:03:39 2013 +0200 @@ -169,7 +169,7 @@ if menuName == "Apidoc": if self.__projectAct is not None: self.__projectAct.setEnabled( - e5App().getObject("Project").getProjectLanguage() in \ + e5App().getObject("Project").getProjectLanguage() in ["Python", "Python2", "Python3", "Ruby"]) def __doEricdoc(self):
--- a/Plugins/PluginSyntaxChecker.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginSyntaxChecker.py Sat Oct 19 13:03:39 2013 +0200 @@ -148,7 +148,7 @@ """ if menuName == "Checks" and self.__projectAct is not None: self.__projectAct.setEnabled( - e5App().getObject("Project").getProjectLanguage() in \ + e5App().getObject("Project").getProjectLanguage() in ["Python3", "Python2", "Python"]) def __projectBrowserShowMenu(self, menuName, menu): @@ -184,8 +184,8 @@ project = e5App().getObject("Project") project.saveAllScripts() ppath = project.getProjectPath() - files = [os.path.join(ppath, file) \ - for file in project.pdata["SOURCES"] \ + files = [os.path.join(ppath, file) + for file in project.pdata["SOURCES"] if file.endswith( tuple(Preferences.getPython("Python3Extensions")) + tuple(Preferences.getPython("PythonExtensions")))]
--- a/Plugins/PluginTabnanny.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginTabnanny.py Sat Oct 19 13:03:39 2013 +0200 @@ -150,7 +150,7 @@ """ if menuName == "Checks" and self.__projectAct is not None: self.__projectAct.setEnabled( - e5App().getObject("Project").getProjectLanguage() in \ + e5App().getObject("Project").getProjectLanguage() in ["Python3", "Python2", "Python"]) def __projectBrowserShowMenu(self, menuName, menu): @@ -187,8 +187,8 @@ project = e5App().getObject("Project") project.saveAllScripts() ppath = project.getProjectPath() - files = [os.path.join(ppath, file) \ - for file in project.pdata["SOURCES"] \ + files = [os.path.join(ppath, file) + for file in project.pdata["SOURCES"] if file.endswith( tuple(Preferences.getPython("Python3Extensions")) + tuple(Preferences.getPython("PythonExtensions")))]
--- a/Plugins/PluginVcsMercurial.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginVcsMercurial.py Sat Oct 19 13:03:39 2013 +0200 @@ -125,7 +125,7 @@ data """ return { - "zzz_mercurialPage": \ + "zzz_mercurialPage": [QApplication.translate("VcsMercurialPlugin", "Mercurial"), os.path.join("VcsPlugins", "vcsMercurial", "icons", "preferences-mercurial.png"),
--- a/Plugins/PluginVcsPySvn.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginVcsPySvn.py Sat Oct 19 13:03:39 2013 +0200 @@ -119,7 +119,7 @@ data """ return { - "zzz_subversionPage": \ + "zzz_subversionPage": [QApplication.translate("VcsPySvnPlugin", "Subversion"), os.path.join("VcsPlugins", "vcsPySvn", "icons", "preferences-subversion.png"),
--- a/Plugins/PluginVcsSubversion.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginVcsSubversion.py Sat Oct 19 13:03:39 2013 +0200 @@ -126,7 +126,7 @@ data """ return { - "zzz_subversionPage": \ + "zzz_subversionPage": [QApplication.translate("VcsSubversionPlugin", "Subversion"), os.path.join("VcsPlugins", "vcsSubversion", "icons", "preferences-subversion.png"),
--- a/Plugins/PluginWizardE5MessageBox.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginWizardE5MessageBox.py Sat Oct 19 13:03:39 2013 +0200 @@ -117,7 +117,7 @@ """ editor = e5App().getObject("ViewManager").activeWindow() - if editor == None: + if editor is None: E5MessageBox.critical( self.__ui, self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardPyRegExp.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginWizardPyRegExp.py Sat Oct 19 13:03:39 2013 +0200 @@ -117,7 +117,7 @@ """ editor = e5App().getObject("ViewManager").activeWindow() - if editor == None: + if editor is None: E5MessageBox.critical( self.__ui, self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardQColorDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginWizardQColorDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -117,7 +117,7 @@ """ editor = e5App().getObject("ViewManager").activeWindow() - if editor == None: + if editor is None: E5MessageBox.critical( self.__ui, self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardQFileDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginWizardQFileDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -117,7 +117,7 @@ """ editor = e5App().getObject("ViewManager").activeWindow() - if editor == None: + if editor is None: E5MessageBox.critical( self.__ui, self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardQFontDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginWizardQFontDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -117,7 +117,7 @@ """ editor = e5App().getObject("ViewManager").activeWindow() - if editor == None: + if editor is None: E5MessageBox.critical( self.__ui, self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardQInputDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginWizardQInputDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -117,7 +117,7 @@ """ editor = e5App().getObject("ViewManager").activeWindow() - if editor == None: + if editor is None: E5MessageBox.critical( self.__ui, self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardQMessageBox.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginWizardQMessageBox.py Sat Oct 19 13:03:39 2013 +0200 @@ -117,7 +117,7 @@ """ editor = e5App().getObject("ViewManager").activeWindow() - if editor == None: + if editor is None: E5MessageBox.critical( self.__ui, self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardQRegExp.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginWizardQRegExp.py Sat Oct 19 13:03:39 2013 +0200 @@ -117,7 +117,7 @@ """ editor = e5App().getObject("ViewManager").activeWindow() - if editor == None: + if editor is None: E5MessageBox.critical( self.__ui, self.trUtf8('No current editor'),
--- a/Plugins/PluginWizardQRegularExpression.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/PluginWizardQRegularExpression.py Sat Oct 19 13:03:39 2013 +0200 @@ -118,7 +118,7 @@ """ editor = e5App().getObject("ViewManager").activeWindow() - if editor == None: + if editor is None: E5MessageBox.critical( self.__ui, self.trUtf8('No current editor'),
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -36,7 +36,7 @@ Private slot to update the UI. """ self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( - self.nameEdit.text() != "" and \ + self.nameEdit.text() != "" and self.bookmarkCombo.currentText() != "" )
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -248,10 +248,10 @@ @param line output line to be processed (string) """ if line.startswith(" "): - l = line.strip().split() - changeset = l[-1] - del l[-1] - name = " ".join(l) + li = line.strip().split() + changeset = li[-1] + del li[-1] + name = " ".join(li) self.__generateItem(changeset, name) def __readStderr(self):
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -237,17 +237,17 @@ @param line output line to be processed (string) """ - l = line.split() - if l[-1][0] in "1234567890": + li = line.split() + if li[-1][0] in "1234567890": # last element is a rev:changeset - rev, changeset = l[-1].split(":", 1) - del l[-1] - if l[0] == "*": + rev, changeset = li[-1].split(":", 1) + del li[-1] + if li[0] == "*": status = "current" - del l[0] + del li[0] else: status = "" - name = " ".join(l) + name = " ".join(li) self.__generateItem(rev, changeset, status, name) if self.__bookmarksList is not None: self.__bookmarksList.append(name)
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py Sat Oct 19 13:03:39 2013 +0200 @@ -85,13 +85,13 @@ self.bookmarksList = [] for line in output.splitlines(): - l = line.strip().split() - if l[-1][0] in "1234567890": + li = line.strip().split() + if li[-1][0] in "1234567890": # last element is a rev:changeset - del l[-1] - if l[0] == "*": - del l[0] - name = " ".join(l) + del li[-1] + if li[0] == "*": + del li[0] + name = " ".join(li) self.bookmarksList.append(name) return self.bookmarksList[:] @@ -282,9 +282,9 @@ for line in output.splitlines(): if line.startswith(" "): - l = line.strip().split() - del l[-1] - name = " ".join(l) + li = line.strip().split() + del li[-1] + name = " ".join(li) bookmarksList.append(name) return bookmarksList
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -238,12 +238,12 @@ @param line output line to be processed (string) """ - l = line.split() - if l[-1][0] in "1234567890": + li = line.split() + if li[-1][0] in "1234567890": # last element is a rev:changeset - rev, changeset = l[-1].split(":", 1) - del l[-1] - signature = " ".join(l) + rev, changeset = li[-1].split(":", 1) + del li[-1] + signature = " ".join(li) self.__generateItem(rev, changeset, signature) def __readStderr(self):
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -119,7 +119,7 @@ if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", "transplant", "update", "import", "revert", "graft"] or \ - (args[0] in ["pull", "unbundle"] and \ + (args[0] in ["pull", "unbundle"] and ("--update" in args[1:] or "--rebase" in args[1:])): self.__updateCommand = True else:
--- a/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -48,7 +48,7 @@ enable = self.revisionsEdit.toPlainText() != "" if self.userGroup.isChecked(): enable = enable and \ - (self.currentUserCheckBox.isChecked() or \ + (self.currentUserCheckBox.isChecked() or self.userEdit.text() != "") self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -1041,7 +1041,7 @@ # step 2: set the status of the phase button if public == 0 and \ - ((secret > 0 and draft == 0) or \ + ((secret > 0 and draft == 0) or (secret == 0 and draft > 0)): self.phaseButton.setEnabled(True) else: @@ -1253,8 +1253,8 @@ topItem = self.logTree.topLevelItem(topIndex) if topItem.text(self.DateColumn) <= to_ and \ topItem.text(self.DateColumn) >= from_ and \ - (branch == self.__allBranchesFilter or \ - topItem.text(self.BranchColumn) in \ + (branch == self.__allBranchesFilter or + topItem.text(self.BranchColumn) in [branch, closedBranch]) and \ searchRx.indexIn(topItem.text(fieldIndex)) > -1: topItem.setHidden(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -278,7 +278,7 @@ self.contents.clear() if not self.logEntries: - self.errors.append(self.trUtf8("No log available for '{0}'")\ + self.errors.append(self.trUtf8("No log available for '{0}'") .format(self.filename)) self.errorGroup.show() return
--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -54,7 +54,7 @@ self.localProtocol = True self.vcsProjectDirEdit.setText(Utilities.toNativeSeparators( - Preferences.getMultiProject("Workspace") or \ + Preferences.getMultiProject("Workspace") or Utilities.getHomeDir())) @pyqtSlot()
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -589,7 +589,7 @@ if self.__mq: self.vcs.vcsCommit(self.dname, "", mq=True) else: - names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getCommitableItems()] if not names: E5MessageBox.information( @@ -629,7 +629,7 @@ """ Private slot to handle the Add context menu entry. """ - names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getUnversionedItems()] if not names: E5MessageBox.information( @@ -651,7 +651,7 @@ """ Private slot to handle the Remove context menu entry. """ - names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getMissingItems()] if not names: E5MessageBox.information( @@ -668,7 +668,7 @@ """ Private slot to handle the Revert context menu entry. """ - names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getModifiedItems()] if not names: E5MessageBox.information(
--- a/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -417,19 +417,19 @@ if infoDict["remote"] == (0, 0, 0, 0): rinfo = self.trUtf8("synched") else: - l = [] + li = [] if infoDict["remote"][0]: - l.append(self.trUtf8("1 or more incoming")) + li.append(self.trUtf8("1 or more incoming")) if infoDict["remote"][1]: - l.append(self.trUtf8("{0} outgoing")\ - .format(infoDict["remote"][1])) + li.append(self.trUtf8("{0} outgoing") + .format(infoDict["remote"][1])) if infoDict["remote"][2]: - l.append(self.trUtf8("%n incoming bookmark(s)", "", - infoDict["remote"][2])) + li.append(self.trUtf8("%n incoming bookmark(s)", "", + infoDict["remote"][2])) if infoDict["remote"][3]: - l.append(self.trUtf8("%n outgoing bookmark(s)", "", - infoDict["remote"][3])) - rinfo = "<br/>".join(l) + li.append(self.trUtf8("%n outgoing bookmark(s)", "", + infoDict["remote"][3])) + rinfo = "<br/>".join(li) info.append(self.trUtf8( "<tr><td><b>Remote Status</b></td><td>{0}</td></tr>") .format(rinfo)) @@ -437,14 +437,14 @@ if infoDict["mq"] == (0, 0): qinfo = self.trUtf8("empty queue") else: - l = [] + li = [] if infoDict["mq"][0]: - l.append(self.trUtf8("{0} applied") - .format(infoDict["mq"][0])) + li.append(self.trUtf8("{0} applied") + .format(infoDict["mq"][0])) if infoDict["mq"][1]: - l.append(self.trUtf8("{0} unapplied") - .format(infoDict["mq"][1])) - qinfo = "<br/>".join(l) + li.append(self.trUtf8("{0} unapplied") + .format(infoDict["mq"][1])) + qinfo = "<br/>".join(li) info.append(self.trUtf8( "<tr><td><b>Queues Status</b></td><td>{0}</td></tr>") .format(qinfo))
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -245,23 +245,23 @@ @param line output line to be processed (string) """ - l = line.split() - if l[-1][0] in "1234567890": + li = line.split() + if li[-1][0] in "1234567890": # last element is a rev:changeset if self.tagsMode: status = "" else: status = self.trUtf8("active") - rev, changeset = l[-1].split(":", 1) - del l[-1] + rev, changeset = li[-1].split(":", 1) + del li[-1] else: if self.tagsMode: status = self.trUtf8("yes") else: - status = l[-1][1:-1] - rev, changeset = l[-2].split(":", 1) - del l[-2:] - name = " ".join(l) + status = li[-1][1:-1] + rev, changeset = li[-2].split(":", 1) + del li[-2:] + name = " ".join(li) self.__generateItem(rev, changeset, status, name) if name not in ["tip", "default"]: if self.tagsList is not None:
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sat Oct 19 13:03:39 2013 +0200 @@ -697,7 +697,7 @@ else: items = self.browser.getSelectedItems() names = [itm.fileName() for itm in items] - files = [self.browser.project.getRelativePath(name) \ + files = [self.browser.project.getRelativePath(name) for name in names] dlg = DeleteFilesConfirmationDialog(
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -77,7 +77,7 @@ self.trUtf8("""The guards list has been changed.""" """ Shall the changes be applied?"""), E5MessageBox.StandardButtons( - E5MessageBox.Apply | \ + E5MessageBox.Apply | E5MessageBox.Discard), E5MessageBox.Apply) if res == E5MessageBox.Apply: @@ -120,7 +120,7 @@ self.trUtf8("""The guards list has been changed.""" """ Shall the changes be applied?"""), E5MessageBox.StandardButtons( - E5MessageBox.Apply | \ + E5MessageBox.Apply | E5MessageBox.Discard), E5MessageBox.Apply) if res == E5MessageBox.Apply: @@ -312,7 +312,7 @@ self, self.trUtf8("Apply Guard Definitions"), self.trUtf8("""<p>The defined guards could not be""" - """ applied.</p><p>Reason: {0}</p>""")\ + """ applied.</p><p>Reason: {0}</p>""") .format(error)) else: self.__dirtyList = False
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -352,17 +352,17 @@ if self.__mode == "qtop": self.__markTopItem(line) else: - l = line.split(": ", 1) - if len(l) == 1: - data, summary = l[0][:-1], "" + li = line.split(": ", 1) + if len(li) == 1: + data, summary = li[0][:-1], "" else: - data, summary = l[0], l[1] - l = data.split(None, 2) - if len(l) == 2: + data, summary = li[0], li[1] + li = data.split(None, 2) + if len(li) == 2: # missing entry - index, status, name = -1, l[0], l[1] - elif len(l) == 3: - index, status, name = l[:3] + index, status, name = -1, li[0], li[1] + elif len(li) == 3: + index, status, name = li[:3] else: return self.__generateItem(index, status, name, summary)
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -61,7 +61,7 @@ self.messageEdit.toPlainText() != "" if self.userGroup.isChecked(): enable = enable and \ - (self.currentUserCheckBox.isChecked() or \ + (self.currentUserCheckBox.isChecked() or self.userEdit.text() != "") self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Sat Oct 19 13:03:39 2013 +0200 @@ -117,11 +117,11 @@ for line in output.splitlines(): if withSummary: - l = line.strip().split(": ") - if len(l) == 1: - patch, summary = l[0][:-1], "" + li = line.strip().split(": ") + if len(li) == 1: + patch, summary = li[0][:-1], "" else: - patch, summary = l[0], l[1] + patch, summary = li[0], li[1] patchesList.append("{0}@@{1}".format(patch, summary)) else: patchesList.append(line.strip())
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -94,7 +94,7 @@ Private slot to update the state of the OK button. """ self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( - self.revisionsEdit.toPlainText() != "" or + self.revisionsEdit.toPlainText() != "" or self.allCheckBox.isChecked()) @pyqtSlot()
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Oct 19 13:03:39 2013 +0200 @@ -1356,28 +1356,28 @@ info.append(QApplication.translate( "mercurial", """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n""" - """<tr><td><b>Changeset</b></td><td>{1}</td></tr>""")\ + """<tr><td><b>Changeset</b></td><td>{1}</td></tr>""") .format(index, changeset)) if tags: info.append(QApplication.translate( "mercurial", - """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\ + """<tr><td><b>Tags</b></td><td>{0}</td></tr>""") .format('<br/>'.join(tags.split()))) if bookmarks: info.append(QApplication.translate( "mercurial", - """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")\ + """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""") .format('<br/>'.join(bookmarks.split()))) if branches: info.append(QApplication.translate( "mercurial", - """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\ + """<tr><td><b>Branches</b></td><td>{0}</td></tr>""") .format('<br/>'.join(branches.split()))) info.append(QApplication.translate( "mercurial", """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n""" - """<tr><td><b>Committed time</b></td><td>{2}</td></tr>""")\ + """<tr><td><b>Committed time</b></td><td>{2}</td></tr>""") .format(author, cdate, ctime)) infoBlock.append("\n".join(info)) if infoBlock: @@ -1541,13 +1541,13 @@ if output: self.tagsList = [] for line in output.splitlines(): - l = line.strip().split() - if l[-1][0] in "1234567890": + li = line.strip().split() + if li[-1][0] in "1234567890": # last element is a rev:changeset - del l[-1] + del li[-1] else: - del l[-2:] - name = " ".join(l) + del li[-2:] + name = " ".join(li) if name not in ["tip", "default"]: self.tagsList.append(name) @@ -1583,13 +1583,13 @@ if output: self.branchesList = [] for line in output.splitlines(): - l = line.strip().split() - if l[-1][0] in "1234567890": + li = line.strip().split() + if li[-1][0] in "1234567890": # last element is a rev:changeset - del l[-1] + del li[-1] else: - del l[-2:] - name = " ".join(l) + del li[-2:] + name = " ".join(li) if name not in ["tip", "default"]: self.branchesList.append(name) @@ -2014,34 +2014,34 @@ """<tr><td><b>Tip</b></td><td></td></tr>\n""")) info.append(QApplication.translate( "mercurial", - """<tr><td><b>Changeset</b></td><td>{0}</td></tr>""")\ + """<tr><td><b>Changeset</b></td><td>{0}</td></tr>""") .format(changeset)) if tags: info.append(QApplication.translate( "mercurial", - """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\ + """<tr><td><b>Tags</b></td><td>{0}</td></tr>""") .format('<br/>'.join(tags.split()))) if bookmarks: info.append(QApplication.translate( "mercurial", - """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")\ + """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""") .format('<br/>'.join(bookmarks.split()))) if branches: info.append(QApplication.translate( "mercurial", - """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\ + """<tr><td><b>Branches</b></td><td>{0}</td></tr>""") .format('<br/>'.join(branches.split()))) if parents: info.append(QApplication.translate( "mercurial", - """<tr><td><b>Parents</b></td><td>{0}</td></tr>""")\ + """<tr><td><b>Parents</b></td><td>{0}</td></tr>""") .format('<br/>'.join(parents.split()))) info.append(QApplication.translate( "mercurial", """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n""" """<tr><td><b>Committed time</b></td><td>{2}</td></tr>\n""" - """</table></p>""")\ + """</table></p>""") .format(author, cdate, ctime)) dlg = VcsRepositoryInfoDialog(None, "\n".join(info))
--- a/Plugins/VcsPlugins/vcsPySvn/SvnConst.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnConst.py Sat Oct 19 13:03:39 2013 +0200 @@ -12,44 +12,44 @@ import pysvn svnNotifyActionMap = { - pysvn.wc_notify_action.add: \ + pysvn.wc_notify_action.add: QT_TRANSLATE_NOOP('Subversion', 'Add'), - pysvn.wc_notify_action.commit_added: \ + pysvn.wc_notify_action.commit_added: QT_TRANSLATE_NOOP('Subversion', 'Add'), - pysvn.wc_notify_action.commit_deleted: \ + pysvn.wc_notify_action.commit_deleted: QT_TRANSLATE_NOOP('Subversion', 'Delete'), - pysvn.wc_notify_action.commit_modified: \ + pysvn.wc_notify_action.commit_modified: QT_TRANSLATE_NOOP('Subversion', 'Modify'), pysvn.wc_notify_action.commit_postfix_txdelta: None, - pysvn.wc_notify_action.commit_replaced: \ + pysvn.wc_notify_action.commit_replaced: QT_TRANSLATE_NOOP('Subversion', 'Replace'), - pysvn.wc_notify_action.copy: \ + pysvn.wc_notify_action.copy: QT_TRANSLATE_NOOP('Subversion', 'Copy'), - pysvn.wc_notify_action.delete: \ + pysvn.wc_notify_action.delete: QT_TRANSLATE_NOOP('Subversion', 'Delete'), - pysvn.wc_notify_action.failed_revert: \ + pysvn.wc_notify_action.failed_revert: QT_TRANSLATE_NOOP('Subversion', 'Failed revert'), - pysvn.wc_notify_action.resolved: \ + pysvn.wc_notify_action.resolved: QT_TRANSLATE_NOOP('Subversion', 'Resolve'), - pysvn.wc_notify_action.restore: \ + pysvn.wc_notify_action.restore: QT_TRANSLATE_NOOP('Subversion', 'Restore'), - pysvn.wc_notify_action.revert: \ + pysvn.wc_notify_action.revert: QT_TRANSLATE_NOOP('Subversion', 'Revert'), - pysvn.wc_notify_action.skip: \ + pysvn.wc_notify_action.skip: QT_TRANSLATE_NOOP('Subversion', 'Skip'), pysvn.wc_notify_action.status_completed: None, - pysvn.wc_notify_action.status_external: \ + pysvn.wc_notify_action.status_external: QT_TRANSLATE_NOOP('Subversion', 'External'), - pysvn.wc_notify_action.update_add: \ + pysvn.wc_notify_action.update_add: QT_TRANSLATE_NOOP('Subversion', 'Add'), pysvn.wc_notify_action.update_completed: None, - pysvn.wc_notify_action.update_delete: \ + pysvn.wc_notify_action.update_delete: QT_TRANSLATE_NOOP('Subversion', 'Delete'), - pysvn.wc_notify_action.update_external: \ + pysvn.wc_notify_action.update_external: QT_TRANSLATE_NOOP('Subversion', 'External'), - pysvn.wc_notify_action.update_update: \ + pysvn.wc_notify_action.update_update: QT_TRANSLATE_NOOP('Subversion', 'Update'), - pysvn.wc_notify_action.annotate_revision: \ + pysvn.wc_notify_action.annotate_revision: QT_TRANSLATE_NOOP('Subversion', 'Annotate'), } if hasattr(pysvn.wc_notify_action, 'locked'): @@ -70,32 +70,32 @@ QT_TRANSLATE_NOOP('Subversion', 'Changelist moved') svnStatusMap = { - pysvn.wc_status_kind.added: \ + pysvn.wc_status_kind.added: QT_TRANSLATE_NOOP('Subversion', 'added'), - pysvn.wc_status_kind.conflicted: \ + pysvn.wc_status_kind.conflicted: QT_TRANSLATE_NOOP('Subversion', 'conflict'), - pysvn.wc_status_kind.deleted: \ + pysvn.wc_status_kind.deleted: QT_TRANSLATE_NOOP('Subversion', 'deleted'), - pysvn.wc_status_kind.external: \ + pysvn.wc_status_kind.external: QT_TRANSLATE_NOOP('Subversion', 'external'), - pysvn.wc_status_kind.ignored: \ + pysvn.wc_status_kind.ignored: QT_TRANSLATE_NOOP('Subversion', 'ignored'), - pysvn.wc_status_kind.incomplete: \ + pysvn.wc_status_kind.incomplete: QT_TRANSLATE_NOOP('Subversion', 'incomplete'), - pysvn.wc_status_kind.missing: \ + pysvn.wc_status_kind.missing: QT_TRANSLATE_NOOP('Subversion', 'missing'), - pysvn.wc_status_kind.merged: \ + pysvn.wc_status_kind.merged: QT_TRANSLATE_NOOP('Subversion', 'merged'), - pysvn.wc_status_kind.modified: \ + pysvn.wc_status_kind.modified: QT_TRANSLATE_NOOP('Subversion', 'modified'), - pysvn.wc_status_kind.none: \ + pysvn.wc_status_kind.none: QT_TRANSLATE_NOOP('Subversion', 'normal'), - pysvn.wc_status_kind.normal: \ + pysvn.wc_status_kind.normal: QT_TRANSLATE_NOOP('Subversion', 'normal'), - pysvn.wc_status_kind.obstructed: \ + pysvn.wc_status_kind.obstructed: QT_TRANSLATE_NOOP('Subversion', 'type error'), - pysvn.wc_status_kind.replaced: \ + pysvn.wc_status_kind.replaced: QT_TRANSLATE_NOOP('Subversion', 'replaced'), - pysvn.wc_status_kind.unversioned: \ + pysvn.wc_status_kind.unversioned: QT_TRANSLATE_NOOP('Subversion', 'unversioned'), }
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Sat Oct 19 13:03:39 2013 +0200 @@ -103,7 +103,7 @@ """<tr><td>Valid from:</td><td>{3}</td></tr>""" """<tr><td>Valid until:</td><td>{4}</td></tr>""" """<tr><td>Issuer name:</td><td>{5}</td></tr>""" - """</table>""")\ + """</table>""") .format(trust_dict["realm"], trust_dict["hostname"], trust_dict["finger_print"],
--- a/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -53,11 +53,11 @@ Private method used to enable/disable the OK-button. """ self.okButton.setDisabled( - self.tag1Combo.currentText() == "" or \ - self.tag2Combo.currentText() == "" or \ - not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and \ - self.rx_url.exactMatch(self.tag2Combo.currentText())) or \ - (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and \ + self.tag1Combo.currentText() == "" or + self.tag2Combo.currentText() == "" or + not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and + self.rx_url.exactMatch(self.tag2Combo.currentText())) or + (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and self.rx_rev.exactMatch(self.tag2Combo.currentText())) ) )
--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -54,7 +54,7 @@ self.localProtocol = True self.vcsProjectDirEdit.setText(Utilities.toNativeSeparators( - Preferences.getMultiProject("Workspace") or + Preferences.getMultiProject("Workspace") or Utilities.getHomeDir())) @pyqtSlot()
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -634,7 +634,7 @@ """ Private slot to handle the Add context menu entry. """ - names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getUnversionedItems()] if not names: E5MessageBox.information( @@ -656,7 +656,7 @@ """ Private slot to handle the Revert context menu entry. """ - names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getModifiedItems()] if not names: E5MessageBox.information( @@ -742,7 +742,7 @@ """ Private slot to handle the Lock context menu entry. """ - names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getLockActionItems(self.unlockedIndicators)] if not names: E5MessageBox.information( @@ -759,7 +759,7 @@ """ Private slot to handle the Unlock context menu entry. """ - names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getLockActionItems(self.lockedIndicators)] if not names: E5MessageBox.information( @@ -812,7 +812,7 @@ """ Private slot to add entries to a changelist. """ - names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getNonChangelistItems()] if not names: E5MessageBox.information( @@ -831,7 +831,7 @@ """ Private slot to remove entries from their changelists. """ - names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ + names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getChangelistItems()] if not names: E5MessageBox.information(
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Sat Oct 19 13:03:39 2013 +0200 @@ -310,7 +310,7 @@ dlg.showError(e.args[0]) locker.unlock() if not noDialog: - rev and dlg.showMessage(self.trUtf8("Imported revision {0}.\n")\ + rev and dlg.showMessage(self.trUtf8("Imported revision {0}.\n") .format(rev.number)) dlg.finish() dlg.exec_() @@ -560,7 +560,7 @@ (not recurse) and " --non-recursive" or "", keeplocks and " --keep-locks" or "", keepChangelists and " --keep-changelists" or "", - changelists and \ + changelists and " --changelist ".join([""] + changelists) or "", msg, " ".join(fnames)), client) @@ -663,8 +663,8 @@ if os.path.splitdrive(repodir)[1] == os.sep: return # oops, project is not version controlled while os.path.normcase(dname) != os.path.normcase(repodir) and \ - (os.path.normcase(dname) not in self.statusCache or \ - self.statusCache[os.path.normcase(dname)] == + (os.path.normcase(dname) not in self.statusCache or + self.statusCache[os.path.normcase(dname)] == self.canBeAdded): # add directories recursively, if they aren't in the # repository already @@ -694,8 +694,8 @@ while os.path.normcase(d) != \ os.path.normcase(repodir) and \ (d not in tree2 + tree) and \ - (os.path.normcase(d) not in self.statusCache or \ - self.statusCache[os.path.normcase(d)] == + (os.path.normcase(d) not in self.statusCache or + self.statusCache[os.path.normcase(d)] == self.canBeAdded): tree2.append(d) d = os.path.dirname(d) @@ -774,8 +774,8 @@ while os.path.normcase(d) != \ os.path.normcase(repodir) and \ (d not in tree) and \ - (os.path.normcase(d) not in self.statusCache or \ - self.statusCache[os.path.normcase(d)] == + (os.path.normcase(d) not in self.statusCache or + self.statusCache[os.path.normcase(d)] == self.canBeAdded): tree.append(d) d = os.path.dirname(d) @@ -798,8 +798,8 @@ return # oops, project is not version controlled while os.path.normcase(dname) != \ os.path.normcase(repodir) and \ - (os.path.normcase(dname) not in self.statusCache or \ - self.statusCache[os.path.normcase(dname)] == + (os.path.normcase(dname) not in self.statusCache or + self.statusCache[os.path.normcase(dname)] == self.canBeAdded): # add directories recursively, if they aren't in the # repository already @@ -988,7 +988,7 @@ Subversion repository. If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted.
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -63,7 +63,7 @@ if msg in self.recentCommitMessages: self.recentCommitMessages.remove(msg) self.recentCommitMessages.insert(0, msg) - no = int(Preferences.Prefs.settings\ + no = int(Preferences.Prefs.settings .value('Subversion/CommitMessages', 20)) del self.recentCommitMessages[no:] Preferences.Prefs.settings.setValue(
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -326,7 +326,7 @@ log["date"] = self.rx_rev2.cap(3) # number of lines is ignored elif self.rx_flags1.exactMatch(s): - changedPaths.append({\ + changedPaths.append({ "action": self.rx_flags1.cap(1).strip(), "path": @@ -337,7 +337,7 @@ self.rx_flags1.cap(4).strip(), }) elif self.rx_flags2.exactMatch(s): - changedPaths.append({\ + changedPaths.append({ "action": self.rx_flags2.cap(1).strip(), "path":
--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -53,11 +53,11 @@ Private method used to enable/disable the OK-button. """ self.okButton.setDisabled( - self.tag1Combo.currentText() != "" or \ - self.tag2Combo.currentText() != "" or \ - not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and \ - self.rx_url.exactMatch(self.tag2Combo.currentText())) or \ - (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and \ + self.tag1Combo.currentText() != "" or + self.tag2Combo.currentText() != "" or + not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and + self.rx_url.exactMatch(self.tag2Combo.currentText())) or + (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and self.rx_rev.exactMatch(self.tag2Combo.currentText())) ) )
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -64,7 +64,7 @@ return numberSpinBox.value() elif dateButton.isChecked(): return "{{{0}}}".format( - QDateTime(dateEdit.date(), timeEdit.time())\ + QDateTime(dateEdit.date(), timeEdit.time()) .toString(Qt.ISODate)) elif headButton.isChecked(): return "HEAD"
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Sat Oct 19 13:03:39 2013 +0200 @@ -622,8 +622,8 @@ if os.path.splitdrive(repodir)[1] == os.sep: return # oops, project is not version controlled while os.path.normcase(dname) != os.path.normcase(repodir) and \ - (os.path.normcase(dname) not in self.statusCache or \ - self.statusCache[os.path.normcase(dname)] == + (os.path.normcase(dname) not in self.statusCache or + self.statusCache[os.path.normcase(dname)] == self.canBeAdded): # add directories recursively, if they aren't in the # repository already @@ -653,8 +653,8 @@ while os.path.normcase(d) != \ os.path.normcase(repodir) and \ (d not in tree2 + tree) and \ - (os.path.normcase(d) not in self.statusCache or \ - self.statusCache[os.path.normcase(d)] == \ + (os.path.normcase(d) not in self.statusCache or + self.statusCache[os.path.normcase(d)] == self.canBeAdded): tree2.append(d) d = os.path.dirname(d) @@ -718,8 +718,8 @@ while os.path.normcase(d) != \ os.path.normcase(repodir) and \ (d not in tree) and \ - (os.path.normcase(d) not in self.statusCache or \ - self.statusCache[os.path.normcase(d)] == \ + (os.path.normcase(d) not in self.statusCache or + self.statusCache[os.path.normcase(d)] == self.canBeAdded): tree.append(d) d = os.path.dirname(d) @@ -742,8 +742,8 @@ return # oops, project is not version controlled while os.path.normcase(dname) != \ os.path.normcase(repodir) and \ - (os.path.normcase(dname) not in self.statusCache or \ - self.statusCache[os.path.normcase(dname)] == \ + (os.path.normcase(dname) not in self.statusCache or + self.statusCache[os.path.normcase(dname)] == self.canBeAdded): # add directories recursively, if they aren't in the # repository already @@ -1530,7 +1530,7 @@ @param ppath local path to get the repository infos (string) @return string with ready formated info for display (string) """ - info = {\ + info = { 'committed-rev': '', 'committed-date': '', 'committed-time': '',
--- a/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -107,23 +107,23 @@ Private method to enable/disable some group boxes. """ self.standardButtons.setEnabled( - self.rInformation.isChecked() or \ - self.rQuestion.isChecked() or \ - self.rWarning.isChecked() or \ - self.rCritical.isChecked() or \ + self.rInformation.isChecked() or + self.rQuestion.isChecked() or + self.rWarning.isChecked() or + self.rCritical.isChecked() or self.rStandard.isChecked() ) self.defaultButton.setEnabled( - self.rInformation.isChecked() or \ - self.rQuestion.isChecked() or \ - self.rWarning.isChecked() or \ + self.rInformation.isChecked() or + self.rQuestion.isChecked() or + self.rWarning.isChecked() or self.rCritical.isChecked() ) self.iconBox.setEnabled( - self.rYesNo.isChecked() or \ - self.rRetryAbort.isChecked() or \ + self.rYesNo.isChecked() or + self.rRetryAbort.isChecked() or self.rStandard.isChecked() )
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -656,8 +656,8 @@ self.__formatCharacter(char2, format)) if regexp: - if (regexp.startswith("\\") and \ - regexp.count("\\") == 1 and \ + if (regexp.startswith("\\") and + regexp.count("\\") == 1 and "-" not in regexp) or \ len(regexp) == 1: return regexp
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -590,8 +590,8 @@ self.__formatCharacter(char2, format)) if regexp: - if (regexp.startswith("\\") and \ - regexp.count("\\") == 1 and \ + if (regexp.startswith("\\") and + regexp.count("\\") == 1 and "-" not in regexp) or \ len(regexp) == 1: return regexp
--- a/Preferences/ConfigurationDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ConfigurationDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -118,192 +118,192 @@ # The dialog module must have the module function create to # create the configuration page. This must have the method # save to save the settings. - "applicationPage": \ + "applicationPage": [self.trUtf8("Application"), "preferences-application.png", "ApplicationPage", None, None], - "cooperationPage": \ + "cooperationPage": [self.trUtf8("Cooperation"), "preferences-cooperation.png", "CooperationPage", None, None], - "corbaPage": \ + "corbaPage": [self.trUtf8("CORBA"), "preferences-orbit.png", "CorbaPage", None, None], - "emailPage": \ + "emailPage": [self.trUtf8("Email"), "preferences-mail_generic.png", "EmailPage", None, None], - "graphicsPage": \ + "graphicsPage": [self.trUtf8("Graphics"), "preferences-graphics.png", "GraphicsPage", None, None], - "iconsPage": \ + "iconsPage": [self.trUtf8("Icons"), "preferences-icons.png", "IconsPage", None, None], - "ircPage": \ + "ircPage": [self.trUtf8("IRC"), "irc.png", "IrcPage", None, None], - "networkPage": \ + "networkPage": [self.trUtf8("Network"), "preferences-network.png", "NetworkPage", None, None], - "notificationsPage": \ + "notificationsPage": [self.trUtf8("Notifications"), "preferences-notifications.png", "NotificationsPage", None, None], - "pluginManagerPage": \ + "pluginManagerPage": [self.trUtf8("Plugin Manager"), "preferences-pluginmanager.png", "PluginManagerPage", None, None], - "printerPage": \ + "printerPage": [self.trUtf8("Printer"), "preferences-printer.png", "PrinterPage", None, None], - "pythonPage": \ + "pythonPage": [self.trUtf8("Python"), "preferences-python.png", "PythonPage", None, None], - "qtPage": \ + "qtPage": [self.trUtf8("Qt"), "preferences-qtlogo.png", "QtPage", None, None], - "securityPage": \ + "securityPage": [self.trUtf8("Security"), "preferences-security.png", "SecurityPage", None, None], - "shellPage": \ + "shellPage": [self.trUtf8("Shell"), "preferences-shell.png", "ShellPage", None, None], - "tasksPage": \ + "tasksPage": [self.trUtf8("Tasks"), "task.png", "TasksPage", None, None], - "templatesPage": \ + "templatesPage": [self.trUtf8("Templates"), "preferences-template.png", "TemplatesPage", None, None], - "trayStarterPage": \ + "trayStarterPage": [self.trUtf8("Tray Starter"), "erict.png", "TrayStarterPage", None, None], - "vcsPage": \ + "vcsPage": [self.trUtf8("Version Control Systems"), "preferences-vcs.png", "VcsPage", None, None], - "0debuggerPage": \ + "0debuggerPage": [self.trUtf8("Debugger"), "preferences-debugger.png", None, None, None], - "debuggerGeneralPage": \ + "debuggerGeneralPage": [self.trUtf8("General"), "preferences-debugger.png", "DebuggerGeneralPage", "0debuggerPage", None], - "debuggerPythonPage": \ + "debuggerPythonPage": [self.trUtf8("Python"), "preferences-pyDebugger.png", "DebuggerPythonPage", "0debuggerPage", None], - "debuggerPython3Page": \ + "debuggerPython3Page": [self.trUtf8("Python3"), "preferences-pyDebugger.png", "DebuggerPython3Page", "0debuggerPage", None], - "debuggerRubyPage": \ + "debuggerRubyPage": [self.trUtf8("Ruby"), "preferences-rbDebugger.png", "DebuggerRubyPage", "0debuggerPage", None], - "0editorPage": \ + "0editorPage": [self.trUtf8("Editor"), "preferences-editor.png", None, None, None], - "editorAPIsPage": \ + "editorAPIsPage": [self.trUtf8("APIs"), "preferences-api.png", "EditorAPIsPage", "0editorPage", None], - "editorAutocompletionPage": \ + "editorAutocompletionPage": [self.trUtf8("Autocompletion"), "preferences-autocompletion.png", "EditorAutocompletionPage", "0editorPage", None], - "editorAutocompletionQScintillaPage": \ + "editorAutocompletionQScintillaPage": [self.trUtf8("QScintilla"), "qscintilla.png", "EditorAutocompletionQScintillaPage", "editorAutocompletionPage", None], - "editorCalltipsPage": \ + "editorCalltipsPage": [self.trUtf8("Calltips"), "preferences-calltips.png", "EditorCalltipsPage", "0editorPage", None], - "editorCalltipsQScintillaPage": \ + "editorCalltipsQScintillaPage": [self.trUtf8("QScintilla"), "qscintilla.png", "EditorCalltipsQScintillaPage", "editorCalltipsPage", None], - "editorGeneralPage": \ + "editorGeneralPage": [self.trUtf8("General"), "preferences-general.png", "EditorGeneralPage", "0editorPage", None], - "editorFilePage": \ + "editorFilePage": [self.trUtf8("Filehandling"), "preferences-filehandling.png", "EditorFilePage", "0editorPage", None], - "editorSearchPage": \ + "editorSearchPage": [self.trUtf8("Searching"), "preferences-search.png", "EditorSearchPage", "0editorPage", None], - "editorSpellCheckingPage": \ + "editorSpellCheckingPage": [self.trUtf8("Spell checking"), "preferences-spellchecking.png", "EditorSpellCheckingPage", "0editorPage", None], - "editorStylesPage": \ + "editorStylesPage": [self.trUtf8("Style"), "preferences-styles.png", "EditorStylesPage", "0editorPage", None], - "editorSyntaxPage": \ + "editorSyntaxPage": [self.trUtf8("Code Checkers"), "preferences-debugger.png", "EditorSyntaxPage", "0editorPage", None], - "editorTypingPage": \ + "editorTypingPage": [self.trUtf8("Typing"), "preferences-typing.png", "EditorTypingPage", "0editorPage", None], - "editorExportersPage": \ + "editorExportersPage": [self.trUtf8("Exporters"), "preferences-exporters.png", "EditorExportersPage", "0editorPage", None], - "1editorLexerPage": \ + "1editorLexerPage": [self.trUtf8("Highlighters"), "preferences-highlighting-styles.png", None, "0editorPage", None], - "editorHighlightersPage": \ + "editorHighlightersPage": [self.trUtf8("Filetype Associations"), "preferences-highlighter-association.png", "EditorHighlightersPage", "1editorLexerPage", None], - "editorHighlightingStylesPage": \ + "editorHighlightingStylesPage": [self.trUtf8("Styles"), "preferences-highlighting-styles.png", "EditorHighlightingStylesPage", "1editorLexerPage", None], - "editorKeywordsPage": \ + "editorKeywordsPage": [self.trUtf8("Keywords"), "preferences-keywords.png", "EditorKeywordsPage", "1editorLexerPage", None], - "editorPropertiesPage": \ + "editorPropertiesPage": [self.trUtf8("Properties"), "preferences-properties.png", "EditorPropertiesPage", "1editorLexerPage", None], - "0helpPage": \ + "0helpPage": [self.trUtf8("Help"), "preferences-help.png", None, None, None], - "helpAppearancePage": \ + "helpAppearancePage": [self.trUtf8("Appearance"), "preferences-styles.png", "HelpAppearancePage", "0helpPage", None], - "helpDocumentationPage": \ + "helpDocumentationPage": [self.trUtf8("Help Documentation"), "preferences-helpdocumentation.png", "HelpDocumentationPage", "0helpPage", None], - "helpViewersPage": \ + "helpViewersPage": [self.trUtf8("Help Viewers"), "preferences-helpviewers.png", "HelpViewersPage", "0helpPage", None], - "helpVirusTotalPage": \ + "helpVirusTotalPage": [self.trUtf8("VirusTotal Interface"), "virustotal.png", "HelpVirusTotalPage", "0helpPage", None], - "helpWebBrowserPage": \ + "helpWebBrowserPage": [self.trUtf8("eric5 Web Browser"), "ericWeb.png", "HelpWebBrowserPage", "0helpPage", None], - "0projectPage": \ + "0projectPage": [self.trUtf8("Project"), "preferences-project.png", None, None, None], - "projectBrowserPage": \ + "projectBrowserPage": [self.trUtf8("Project Viewer"), "preferences-project.png", "ProjectBrowserPage", "0projectPage", None], - "projectPage": \ + "projectPage": [self.trUtf8("Project"), "preferences-project.png", "ProjectPage", "0projectPage", None], - "multiProjectPage": \ + "multiProjectPage": [self.trUtf8("Multiproject"), "preferences-multiproject.png", "MultiProjectPage", "0projectPage", None], - "0interfacePage": \ + "0interfacePage": [self.trUtf8("Interface"), "preferences-interface.png", None, None, None], - "interfacePage": \ + "interfacePage": [self.trUtf8("Interface"), "preferences-interface.png", "InterfacePage", "0interfacePage", None], - "viewmanagerPage": \ + "viewmanagerPage": [self.trUtf8("Viewmanager"), "preferences-viewmanager.png", "ViewmanagerPage", "0interfacePage", None], } @@ -318,33 +318,33 @@ # The dialog module must have the module function create to # create the configuration page. This must have the method # save to save the settings. - "interfacePage": \ + "interfacePage": [self.trUtf8("Interface"), "preferences-interface.png", "HelpInterfacePage", None, None], - "networkPage": \ + "networkPage": [self.trUtf8("Network"), "preferences-network.png", "NetworkPage", None, None], - "printerPage": \ + "printerPage": [self.trUtf8("Printer"), "preferences-printer.png", "PrinterPage", None, None], - "securityPage": \ + "securityPage": [self.trUtf8("Security"), "preferences-security.png", "SecurityPage", None, None], - "0helpPage": \ + "0helpPage": [self.trUtf8("Help"), "preferences-help.png", None, None, None], - "helpAppearancePage": \ + "helpAppearancePage": [self.trUtf8("Appearance"), "preferences-styles.png", "HelpAppearancePage", "0helpPage", None], - "helpDocumentationPage": \ + "helpDocumentationPage": [self.trUtf8("Help Documentation"), "preferences-helpdocumentation.png", "HelpDocumentationPage", "0helpPage", None], - "helpVirusTotalPage": \ + "helpVirusTotalPage": [self.trUtf8("VirusTotal Interface"), "virustotal.png", "HelpVirusTotalPage", "0helpPage", None], - "helpWebBrowserPage": \ + "helpWebBrowserPage": [self.trUtf8("eric5 Web Browser"), "ericWeb.png", "HelpWebBrowserPage", "0helpPage", None], } @@ -356,7 +356,7 @@ # The dialog module must have the module function create to # create the configuration page. This must have the method # save to save the settings. - "trayStarterPage": \ + "trayStarterPage": [self.trUtf8("Tray Starter"), "erict.png", "TrayStarterPage", None, None], } @@ -470,7 +470,7 @@ self.buttonBox = QDialogButtonBox(self) self.buttonBox.setOrientation(Qt.Horizontal) self.buttonBox.setStandardButtons( - QDialogButtonBox.Apply | QDialogButtonBox.Cancel | \ + QDialogButtonBox.Apply | QDialogButtonBox.Cancel | QDialogButtonBox.Ok | QDialogButtonBox.Reset) self.buttonBox.setObjectName("buttonBox") if not self.fromEric and \ @@ -625,11 +625,11 @@ ssize = self.scrollArea.size() if self.scrollArea.horizontalScrollBar(): ssize.setHeight( - ssize.height() - + ssize.height() - self.scrollArea.horizontalScrollBar().height() - 2) if self.scrollArea.verticalScrollBar(): ssize.setWidth( - ssize.width() - + ssize.width() - self.scrollArea.verticalScrollBar().width() - 2) psize = page.minimumSizeHint() self.configStack.resize(max(ssize.width(), psize.width()),
--- a/Preferences/ConfigurationPages/CooperationPage.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ConfigurationPages/CooperationPage.py Sat Oct 19 13:03:39 2013 +0200 @@ -91,7 +91,7 @@ @param txt text entered by the user (string) """ self.addBannedUserButton.setEnabled( - self.__bannedUserValidator.validate(txt, len(txt))[0] == \ + self.__bannedUserValidator.validate(txt, len(txt))[0] == QValidator.Acceptable) @pyqtSlot()
--- a/Preferences/ConfigurationPages/DebuggerGeneralPage.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ConfigurationPages/DebuggerGeneralPage.py Sat Oct 19 13:03:39 2013 +0200 @@ -252,7 +252,7 @@ self.trUtf8( """<p>The entered address <b>{0}</b> is not""" """ a valid IP v4 or IP v6 address.""" - """ Aborting...</p>""")\ + """ Aborting...</p>""") .format(allowedHost)) @pyqtSlot() @@ -285,7 +285,7 @@ self.trUtf8( """<p>The entered address <b>{0}</b> is not""" """ a valid IP v4 or IP v6 address.""" - """ Aborting...</p>""")\ + """ Aborting...</p>""") .format(allowedHost))
--- a/Preferences/ConfigurationPages/EditorFilePage.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorFilePage.py Sat Oct 19 13:03:39 2013 +0200 @@ -138,15 +138,15 @@ Preferences.setEditor( "PreviewHtmlFileNameExtensions", - [ext.strip() for ext in + [ext.strip() for ext in self.previewHtmlExtensionsEdit.text().split()]) Preferences.setEditor( "PreviewMarkdownFileNameExtensions", - [ext.strip() for ext in + [ext.strip() for ext in self.previewMarkdownExtensionsEdit.text().split()]) Preferences.setEditor( "PreviewRestFileNameExtensions", - [ext.strip() for ext in + [ext.strip() for ext in self.previewRestExtensionsEdit.text().split()]) def __setDefaultFiltersLists(self, keepSelection=False): @@ -203,7 +203,7 @@ self, self.trUtf8("Add File Filter"), self.trUtf8("""A Save File Filter must contain exactly one""" - """ wildcard pattern. Yours contains {0}.""")\ + """ wildcard pattern. Yours contains {0}.""") .format(filter.count("*"))) return False
--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Sat Oct 19 13:03:39 2013 +0200 @@ -403,7 +403,7 @@ self.trUtf8("Export Highlighting Styles"), self.trUtf8( """<p>The highlighting styles could not be exported""" - """ to file <b>{0}</b>.</p><p>Reason: {1}</p>""")\ + """ to file <b>{0}</b>.</p><p>Reason: {1}</p>""") .format(fn, f.errorString()) ) @@ -435,7 +435,7 @@ self.trUtf8("Import Highlighting Styles"), self.trUtf8( """<p>The highlighting styles could not be read""" - """ from file <b>{0}</b>.</p><p>Reason: {1}</p>""")\ + """ from file <b>{0}</b>.</p><p>Reason: {1}</p>""") .format(fn, f.errorString()) ) return
--- a/Preferences/ConfigurationPages/EmailPage.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ConfigurationPages/EmailPage.py Sat Oct 19 13:03:39 2013 +0200 @@ -80,9 +80,9 @@ Private slot to update the enabled state of the test button. """ self.testButton.setEnabled( - self.mailAuthenticationCheckBox.isChecked() and \ - self.mailUserEdit.text() != "" and \ - self.mailPasswordEdit.text() != "" and \ + self.mailAuthenticationCheckBox.isChecked() and + self.mailUserEdit.text() != "" and + self.mailPasswordEdit.text() != "" and self.mailServerEdit.text() != "" )
--- a/Preferences/ConfigurationPages/HelpAppearancePage.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ConfigurationPages/HelpAppearancePage.py Sat Oct 19 13:03:39 2013 +0200 @@ -38,13 +38,13 @@ # set initial values self.standardFont = Preferences.getHelp("StandardFont") self.standardFontSample.setFont(self.standardFont) - self.standardFontSample.setText("{0} {1}"\ + self.standardFontSample.setText("{0} {1}" .format(self.standardFont.family(), self.standardFont.pointSize())) self.fixedFont = Preferences.getHelp("FixedFont") self.fixedFontSample.setFont(self.fixedFont) - self.fixedFontSample.setText("{0} {1}"\ + self.fixedFontSample.setText("{0} {1}" .format(self.fixedFont.family(), self.fixedFont.pointSize()))
--- a/Preferences/ConfigurationPages/HelpVirusTotalPage.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ConfigurationPages/HelpVirusTotalPage.py Sat Oct 19 13:03:39 2013 +0200 @@ -100,7 +100,7 @@ ' not valid.</font>')) else: self.testResultLabel.setText(self.trUtf8( - '<font color="#FF0000"><b>Error:</b> {0}</font>')\ + '<font color="#FF0000"><b>Error:</b> {0}</font>') .format(msg))
--- a/Preferences/ConfigurationPages/IconsPage.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ConfigurationPages/IconsPage.py Sat Oct 19 13:03:39 2013 +0200 @@ -77,7 +77,7 @@ """ self.addIconDirectoryButton.setEnabled(txt != "") self.showIconsButton.setEnabled( - txt != "" or \ + txt != "" or self.iconDirectoryList.currentRow() != -1) @pyqtSlot()
--- a/Preferences/ConfigurationPages/MultiProjectPage.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ConfigurationPages/MultiProjectPage.py Sat Oct 19 13:03:39 2013 +0200 @@ -39,7 +39,7 @@ Preferences.getMultiProject("RecentNumber")) self.workspaceEdit.setText( Utilities.toNativeSeparators( - Preferences.getMultiProject("Workspace") or \ + Preferences.getMultiProject("Workspace") or Utilities.getHomeDir())) def save(self):
--- a/Preferences/ConfigurationPages/QtPage.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ConfigurationPages/QtPage.py Sat Oct 19 13:03:39 2013 +0200 @@ -65,7 +65,7 @@ """ Private slot to update the Qt4 tools sample label. """ - self.qt4SampleLabel.setText("Sample: {0}designer{1}"\ + self.qt4SampleLabel.setText("Sample: {0}designer{1}" .format(self.qt4PrefixEdit.text(), self.qt4PostfixEdit.text()))
--- a/Preferences/ProgramsDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ProgramsDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -294,7 +294,7 @@ exe = Utilities.getExecutablePath(exe) if exe: if versionCommand and \ - (versionStartsWith != "" or \ + (versionStartsWith != "" or (versionRe is not None and versionRe != "")) and \ versionPosition: proc = QProcess()
--- a/Preferences/ShortcutsDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ShortcutsDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -258,7 +258,7 @@ """ if not noCheck and \ (not self.__checkShortcut( - keysequence, objectType, self.__editTopItem) or \ + keysequence, objectType, self.__editTopItem) or not self.__checkShortcut( altKeysequence, objectType, self.__editTopItem)): return @@ -449,11 +449,11 @@ childHiddenCount = 0 for index in range(topItem.childCount()): itm = topItem.child(index) - if (self.actionButton.isChecked() and \ + if (self.actionButton.isChecked() and not QRegExp(txt, Qt.CaseInsensitive).indexIn(itm.text(0)) > -1) or \ - (self.shortcutButton.isChecked() and \ - not txt.lower() in itm.text(1).lower() and \ + (self.shortcutButton.isChecked() and + not txt.lower() in itm.text(1).lower() and not txt.lower() in itm.text(2).lower()): itm.setHidden(True) childHiddenCount += 1
--- a/Preferences/ToolConfigurationDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ToolConfigurationDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -129,7 +129,7 @@ E5MessageBox.critical( self, self.trUtf8("Add tool entry"), - self.trUtf8("An entry for the menu text {0} already exists.")\ + self.trUtf8("An entry for the menu text {0} already exists.") .format(menutext)) return
--- a/Preferences/ToolGroupConfigurationDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ToolGroupConfigurationDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -67,7 +67,7 @@ E5MessageBox.critical( self, self.trUtf8("Add tool group entry"), - self.trUtf8("An entry for the group name {0} already exists.")\ + self.trUtf8("An entry for the group name {0} already exists.") .format(groupName)) return @@ -97,7 +97,7 @@ E5MessageBox.critical( self, self.trUtf8("Add tool group entry"), - self.trUtf8("An entry for the group name {0} already exists.")\ + self.trUtf8("An entry for the group name {0} already exists.") .format(groupName)) return @@ -117,7 +117,7 @@ self, self.trUtf8("Delete tool group entry"), self.trUtf8("""<p>Do you really want to delete the tool group""" - """ <b>"{0}"</b>?</p>""")\ + """ <b>"{0}"</b>?</p>""") .format(self.groupsList.currentItem().text()), icon=E5MessageBox.Warning) if not res:
--- a/Preferences/__init__.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/__init__.py Sat Oct 19 13:03:39 2013 +0200 @@ -76,7 +76,7 @@ "DebugClient3": "", "PythonExtensions": ".py2 .pyw2 .ptl", # space separated list of # Python extensions - "Python3Extensions": ".py .pyw .py3 .pyw3", # space separated list of + "Python3Extensions": ".py .pyw .py3 .pyw3", # space separated list of # Python3 extensions "DebugEnvironmentReplace": False, "DebugEnvironment": "", @@ -236,7 +236,7 @@ "ProxyType/Ftp": E5FtpProxyType.NoProxy, "ProxyAccount/Ftp": "", - "PluginRepositoryUrl5": \ + "PluginRepositoryUrl5": "http://eric-ide.python-projects.org/plugins5/repository.xml", "VersionsUrls5": [ "http://die-offenbachs.homelinux.org:48888/eric/snapshots5/" @@ -631,58 +631,58 @@ # defaults for the project browser flags settings projectBrowserFlagsDefaults = { "Qt4": - SourcesBrowserFlag | \ - FormsBrowserFlag | \ - ResourcesBrowserFlag | \ - TranslationsBrowserFlag | \ - InterfacesBrowserFlag | \ + SourcesBrowserFlag | + FormsBrowserFlag | + ResourcesBrowserFlag | + TranslationsBrowserFlag | + InterfacesBrowserFlag | OthersBrowserFlag, "Qt4C": - SourcesBrowserFlag | \ - ResourcesBrowserFlag | \ - TranslationsBrowserFlag | \ - InterfacesBrowserFlag | \ + SourcesBrowserFlag | + ResourcesBrowserFlag | + TranslationsBrowserFlag | + InterfacesBrowserFlag | OthersBrowserFlag, "PyQt5": - SourcesBrowserFlag | \ - FormsBrowserFlag | \ - ResourcesBrowserFlag | \ - TranslationsBrowserFlag | \ - InterfacesBrowserFlag | \ + SourcesBrowserFlag | + FormsBrowserFlag | + ResourcesBrowserFlag | + TranslationsBrowserFlag | + InterfacesBrowserFlag | OthersBrowserFlag, "PyQt5C": - SourcesBrowserFlag | \ - ResourcesBrowserFlag | \ - TranslationsBrowserFlag | \ - InterfacesBrowserFlag | \ + SourcesBrowserFlag | + ResourcesBrowserFlag | + TranslationsBrowserFlag | + InterfacesBrowserFlag | OthersBrowserFlag, "E4Plugin": - SourcesBrowserFlag | \ - FormsBrowserFlag | \ - ResourcesBrowserFlag | \ - TranslationsBrowserFlag | \ - InterfacesBrowserFlag | \ + SourcesBrowserFlag | + FormsBrowserFlag | + ResourcesBrowserFlag | + TranslationsBrowserFlag | + InterfacesBrowserFlag | OthersBrowserFlag, "Console": - SourcesBrowserFlag | \ - InterfacesBrowserFlag | \ + SourcesBrowserFlag | + InterfacesBrowserFlag | OthersBrowserFlag, "Other": - SourcesBrowserFlag | \ - InterfacesBrowserFlag | \ + SourcesBrowserFlag | + InterfacesBrowserFlag | OthersBrowserFlag, "PySide": - SourcesBrowserFlag | \ - FormsBrowserFlag | \ - ResourcesBrowserFlag | \ - TranslationsBrowserFlag | \ - InterfacesBrowserFlag | \ + SourcesBrowserFlag | + FormsBrowserFlag | + ResourcesBrowserFlag | + TranslationsBrowserFlag | + InterfacesBrowserFlag | OthersBrowserFlag, "PySideC": - SourcesBrowserFlag | \ - ResourcesBrowserFlag | \ - TranslationsBrowserFlag | \ - InterfacesBrowserFlag | \ + SourcesBrowserFlag | + ResourcesBrowserFlag | + TranslationsBrowserFlag | + InterfacesBrowserFlag | OthersBrowserFlag, } @@ -1252,7 +1252,7 @@ """ Module function to store the variables filter settings. - @param filters variable filters to set + @param filters variable filters to set @param prefClass preferences class used as the storage area """ prefClass.settings.setValue("Variables/LocalsFilter", str(filters[0]))
--- a/Project/CreateDialogCodeDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Project/CreateDialogCodeDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -184,7 +184,7 @@ if meth.name.startswith("on_"): if meth.pyqtSignature is not None: sig = ", ".join( - [bytes(QMetaObject.normalizedType(t)).decode() + [bytes(QMetaObject.normalizedType(t)).decode() for t in meth.pyqtSignature.split(",")]) signatures.append("{0}({1})".format(meth.name, sig)) else: @@ -256,7 +256,7 @@ if qVersion() >= "5.0.0": method = "on_{0}_{1}".format( name, - bytes(metaMethod.methodSignature())\ + bytes(metaMethod.methodSignature()) .decode().split("(")[0]) else: method = "on_{0}_{1}".format( @@ -292,7 +292,7 @@ pythonSignature = \ "on_{0}_{1}(self, {2})".format( name, - bytes(metaMethod.methodSignature())\ + bytes(metaMethod.methodSignature()) .decode().split("(")[0], methNamesSig) else: @@ -305,7 +305,7 @@ if qVersion() >= "5.0.0": pythonSignature = "on_{0}_{1}(self)".format( name, - bytes(metaMethod.methodSignature())\ + bytes(metaMethod.methodSignature()) .decode().split("(")[0]) else: pythonSignature = "on_{0}_{1}(self)".format( @@ -315,8 +315,8 @@ itm2.setData(pythonSignature, pythonSignatureRole) itm2.setFlags(Qt.ItemFlags( - Qt.ItemIsUserCheckable | \ - Qt.ItemIsEnabled | \ + Qt.ItemIsUserCheckable | + Qt.ItemIsEnabled | Qt.ItemIsSelectable) ) itm2.setCheckState(Qt.Unchecked) @@ -397,7 +397,7 @@ self.trUtf8("Code Generation"), self.trUtf8( """<p>Could not open the code template file""" - """ "{0}".</p><p>Reason: {1}</p>""")\ + """ "{0}".</p><p>Reason: {1}</p>""") .format(tmplName, str(why))) return @@ -433,7 +433,7 @@ self.trUtf8("Code Generation"), self.trUtf8( """<p>Could not open the source file "{0}".</p>""" - """<p>Reason: {1}</p>""")\ + """<p>Reason: {1}</p>""") .format(self.srcFile, str(why))) return @@ -511,7 +511,7 @@ self, self.trUtf8("Code Generation"), self.trUtf8("""<p>Could not write the source file "{0}".</p>""" - """<p>Reason: {1}</p>""")\ + """<p>Reason: {1}</p>""") .format(self.filenameEdit.text(), str(why))) return @@ -524,7 +524,7 @@ @param index index of the activated item (integer) """ - if (self.classNameCombo.currentText() == + if (self.classNameCombo.currentText() == CreateDialogCodeDialog.Separator): self.okButton.setEnabled(False) self.filterEdit.clear()
--- a/Project/FiletypeAssociationDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Project/FiletypeAssociationDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -151,7 +151,7 @@ self.deleteAssociationButton.setEnabled(False) else: self.deleteAssociationButton.setEnabled( - self.filetypeAssociationList.selectedItems()[0].text(0) \ + self.filetypeAssociationList.selectedItems()[0].text(0) == txt) def transferData(self):
--- a/Project/NewDialogClassDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Project/NewDialogClassDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -61,8 +61,8 @@ Private slot to set the enable state of theok button. """ self.okButton.setEnabled( - self.classnameEdit.text() != "" and \ - self.filenameEdit.text() != "" and \ + self.classnameEdit.text() != "" and + self.filenameEdit.text() != "" and self.pathnameEdit.text() != "") def on_classnameEdit_textChanged(self, text): @@ -96,5 +96,5 @@ @return tuple giving the classname (string) and the file name (string) """ return self.classnameEdit.text(), \ - os.path.join(self.pathnameEdit.text(), \ + os.path.join(self.pathnameEdit.text(), self.filenameEdit.text())
--- a/Project/Project.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Project/Project.py Sat Oct 19 13:03:39 2013 +0200 @@ -315,7 +315,7 @@ self.trUtf8("Registering Project Type"), self.trUtf8( """<p>The Programming Language <b>{0}</b> is not""" - """ supported.</p>""")\ + """ supported.</p>""") .format(progLanguage) ) return @@ -327,7 +327,7 @@ self.trUtf8( """<p>The Project type <b>{0}</b> is already""" """ registered with Programming Language""" - """ <b>{1}</b>.</p>""")\ + """ <b>{1}</b>.</p>""") .format(type_, progLanguage) ) return @@ -671,7 +671,7 @@ self.ui, self.trUtf8("Read project file"), self.trUtf8( - "<p>The project file <b>{0}</b> could not be read.</p>")\ + "<p>The project file <b>{0}</b> could not be read.</p>") .format(fn)) return False @@ -973,7 +973,7 @@ self.ui, self.trUtf8("Read tasks"), self.trUtf8( - "<p>The tasks file <b>{0}</b> could not be read.</p>")\ + "<p>The tasks file <b>{0}</b> could not be read.</p>") .format(fn)) def writeTasks(self): @@ -2025,7 +2025,7 @@ self.pluginGrp.setEnabled( self.pdata["PROJECTTYPE"][0] == "E4Plugin") self.addLanguageAct.setEnabled( - len(self.pdata["TRANSLATIONPATTERN"]) > 0 and \ + len(self.pdata["TRANSLATIONPATTERN"]) > 0 and self.pdata["TRANSLATIONPATTERN"][0] != '') self.projectAboutToBeCreated.emit() @@ -2169,8 +2169,8 @@ """ command options?""")) if vcores: from VCS.CommandOptionsDialog import \ - vcsCommandOptionsDialog - codlg = vcsCommandOptionsDialog(self.vcs) + VcsCommandOptionsDialog + codlg = VcsCommandOptionsDialog(self.vcs) if codlg.exec_() == QDialog.Accepted: self.vcs.vcsSetOptions(codlg.getOptions()) # add project file to repository @@ -2233,7 +2233,7 @@ """Would you like to edit the VCS command""" """ options?""")) if vcores: - codlg = vcsCommandOptionsDialog(self.vcs) + codlg = VcsCommandOptionsDialog(self.vcs) if codlg.exec_() == QDialog.Accepted: self.vcs.vcsSetOptions(codlg.getOptions()) @@ -2398,11 +2398,11 @@ if dlg.exec_() == QDialog.Accepted: dlg.storeData() - if (self.pdata["VCS"] and \ + if (self.pdata["VCS"] and self.pdata["VCS"][0] != vcsSystem) or \ - (self.pudata["VCSOVERRIDE"] and \ + (self.pudata["VCSOVERRIDE"] and self.pudata["VCSOVERRIDE"][0] != vcsSystemOverride) or \ - (vcsSystemOverride is not None and \ + (vcsSystemOverride is not None and len(self.pudata["VCSOVERRIDE"]) == 0): # stop the VCS monitor thread and shutdown VCS if self.vcs is not None: @@ -2491,7 +2491,7 @@ fn = E5FileDialog.getOpenFileName( self.parent(), self.trUtf8("Open project"), - Preferences.getMultiProject("Workspace") or \ + Preferences.getMultiProject("Workspace") or Utilities.getHomeDir(), self.trUtf8("Project Files (*.e4p)")) @@ -2563,7 +2563,7 @@ self.vcs = self.initVCS() self.setDirty(True) if self.vcs is not None and \ - (self.vcs.vcsRegisteredState(self.ppath) != + (self.vcs.vcsRegisteredState(self.ppath) != self.vcs.canBeCommitted): self.pdata["VCS"] = ['None'] self.vcs = self.initVCS() @@ -2586,7 +2586,7 @@ self.pluginGrp.setEnabled( self.pdata["PROJECTTYPE"][0] == "E4Plugin") self.addLanguageAct.setEnabled( - len(self.pdata["TRANSLATIONPATTERN"]) > 0 and \ + len(self.pdata["TRANSLATIONPATTERN"]) > 0 and self.pdata["TRANSLATIONPATTERN"][0] != '') self.__model.projectOpened() @@ -2738,11 +2738,11 @@ """ Private method to close all project related windows. """ - self.codemetrics and self.codemetrics.close() - self.codecoverage and self.codecoverage.close() - self.profiledata and self.profiledata.close() + self.codemetrics and self.codemetrics.close() + self.codecoverage and self.codecoverage.close() + self.profiledata and self.profiledata.close() self.applicationDiagram and self.applicationDiagram.close() - self.loadedDiagram and self.loadedDiagram.close() + self.loadedDiagram and self.loadedDiagram.close() def closeProject(self, reopen=False, noSave=False): """ @@ -2921,7 +2921,7 @@ @return list of the projects scripts (list of string) """ if normalized: - return [os.path.join(self.ppath, fn) for fn in + return [os.path.join(self.ppath, fn) for fn in self.pdata["SOURCES"]] else: return self.pdata["SOURCES"] @@ -3969,13 +3969,13 @@ filetype = self.pdata["FILETYPES"][pattern] break - if (filetype == "SOURCES" and + if (filetype == "SOURCES" and fn not in self.pdata["SOURCES"]) or \ - (filetype == "FORMS" and + (filetype == "FORMS" and fn not in self.pdata["FORMS"]) or \ - (filetype == "INTERFACES" and + (filetype == "INTERFACES" and fn not in self.pdata["INTERFACES"]) or \ - (filetype == "RESOURCES" and + (filetype == "RESOURCES" and fn not in self.pdata["RESOURCES"]) or \ (filetype == "OTHERS" and fn not in self.pdata["OTHERS"]): if autoInclude and AI: @@ -4361,11 +4361,11 @@ basename = os.path.splitext(fn)[0] tbasename = os.path.splitext(tfn)[0] self.codeProfileAct.setEnabled( - os.path.isfile("{0}.profile".format(basename)) or \ + os.path.isfile("{0}.profile".format(basename)) or os.path.isfile("{0}.profile".format(tbasename))) self.codeCoverageAct.setEnabled( - self.isPy3Project() and \ - (os.path.isfile("{0}.coverage".format(basename)) or \ + self.isPy3Project() and + (os.path.isfile("{0}.coverage".format(basename)) or os.path.isfile("{0}.coverage".format(tbasename)))) else: self.codeProfileAct.setEnabled(False) @@ -4524,7 +4524,7 @@ for entry in lst_: if os.path.isdir(self.getAbsolutePath(entry)): lst.extend( - [self.getRelativePath(p) for p in + [self.getRelativePath(p) for p in Utilities.direntries(self.getAbsolutePath(entry), True)]) continue else: @@ -4632,7 +4632,7 @@ self.trUtf8( """<p>The file <b>{0}</b> could not be stored """ """in the archive. Ignoring it.</p>""" - """<p>Reason: {1}</p>""")\ + """<p>Reason: {1}</p>""") .format(os.path.join(self.ppath, name), str(why))) archiveFile.writestr("VERSION", version.encode("utf-8")) archiveFile.close() @@ -4646,7 +4646,7 @@ self.trUtf8("Create Plugin Archive"), self.trUtf8( """<p>The eric5 plugin archive file <b>{0}</b> was """ - """created successfully.</p>""")\ + """created successfully.</p>""") .format(os.path.basename(archive))) else: E5MessageBox.information(
--- a/Project/ProjectBaseBrowser.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Project/ProjectBaseBrowser.py Sat Oct 19 13:03:39 2013 +0200 @@ -366,7 +366,7 @@ index = self.model().index(0, 0) while index.isValid(): itm = self.model().item(index) - if (isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ + if (isinstance(itm, ProjectBrowserSimpleDirectoryItem) or isinstance(itm, ProjectBrowserDirectoryItem)) and \ not self.isExpanded(index): self.expand(index) @@ -393,7 +393,7 @@ index = vindex while index.isValid(): itm = self.model().item(index) - if (isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ + if (isinstance(itm, ProjectBrowserSimpleDirectoryItem) or isinstance(itm, ProjectBrowserDirectoryItem)) and \ self.isExpanded(index): self.collapse(index)
--- a/Project/ProjectBrowserModel.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Project/ProjectBrowserModel.py Sat Oct 19 13:03:39 2013 +0200 @@ -331,8 +331,8 @@ qdir = QDir(parentItem.dirName()) if Preferences.getUI("BrowsersListHiddenFiles"): - filter = QDir.Filters(QDir.AllEntries | - QDir.Hidden | + filter = QDir.Filters(QDir.AllEntries | + QDir.Hidden | QDir.NoDotAndDotDot) else: filter = QDir.Filters(QDir.AllEntries | QDir.NoDotAndDotDot) @@ -657,8 +657,8 @@ return if Preferences.getUI("BrowsersListHiddenFiles"): - filter = QDir.Filters(QDir.AllEntries | - QDir.Hidden | + filter = QDir.Filters(QDir.AllEntries | + QDir.Hidden | QDir.NoDotAndDotDot) else: filter = QDir.Filters(QDir.AllEntries | QDir.NoDotAndDotDot)
--- a/Project/ProjectFormsBrowser.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Project/ProjectFormsBrowser.py Sat Oct 19 13:03:39 2013 +0200 @@ -508,8 +508,8 @@ for itm in self.getSelectedItems(): fileNames.append(itm.fileName()) trfiles = sorted(self.project.pdata["TRANSLATIONS"][:]) - fileNames.extend([os.path.join(self.project.ppath, trfile) \ - for trfile in trfiles \ + fileNames.extend([os.path.join(self.project.ppath, trfile) + for trfile in trfiles if trfile.endswith('.qm')]) self.trpreview[list].emit(fileNames) @@ -881,7 +881,7 @@ Private method to compile selected forms to source files. """ items = self.getSelectedItems() - files = [self.project.getRelativePath(itm.fileName()) \ + files = [self.project.getRelativePath(itm.fileName()) for itm in items] if self.hooks["compileSelectedForms"] is not None:
--- a/Project/ProjectInterfacesBrowser.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Project/ProjectInterfacesBrowser.py Sat Oct 19 13:03:39 2013 +0200 @@ -601,7 +601,7 @@ if self.omniidl is not None: items = self.getSelectedItems() - files = [self.project.getRelativePath(itm.fileName()) \ + files = [self.project.getRelativePath(itm.fileName()) for itm in items] numIDLs = len(files) progress = QProgressDialog(
--- a/Project/ProjectResourcesBrowser.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Project/ProjectResourcesBrowser.py Sat Oct 19 13:03:39 2013 +0200 @@ -474,7 +474,7 @@ self.trUtf8("New Resource"), self.trUtf8( "<p>The new resource file <b>{0}</b> could not" - " be created.<br>Problem: {1}</p>")\ + " be created.<br>Problem: {1}</p>") .format(fname, str(e))) return @@ -740,7 +740,7 @@ Private method to compile selected resources to source files. """ items = self.getSelectedItems() - files = [self.project.getRelativePath(itm.fileName()) \ + files = [self.project.getRelativePath(itm.fileName()) for itm in items] if self.hooks["compileSelectedResources"] is not None:
--- a/Project/ProjectSourcesBrowser.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Project/ProjectSourcesBrowser.py Sat Oct 19 13:03:39 2013 +0200 @@ -80,14 +80,14 @@ """ Private method to close all project related windows. """ - self.codemetrics and self.codemetrics.close() - self.codecoverage and self.codecoverage.close() - self.profiledata and self.profiledata.close() - self.classDiagram and self.classDiagram.close() - self.importsDiagram and self.importsDiagram.close() - self.packageDiagram and self.packageDiagram.close() + self.codemetrics and self.codemetrics.close() + self.codecoverage and self.codecoverage.close() + self.profiledata and self.profiledata.close() + self.classDiagram and self.classDiagram.close() + self.importsDiagram and self.importsDiagram.close() + self.packageDiagram and self.packageDiagram.close() self.applicationDiagram and self.applicationDiagram.close() - self.loadedDiagram and self.loadedDiagram.close() + self.loadedDiagram and self.loadedDiagram.close() def _projectClosed(self): """ @@ -577,8 +577,8 @@ prEnable = prEnable or \ os.path.isfile("{0}.profile".format(basename)) or \ os.path.isfile("{0}.profile".format(tbasename)) - coEnable = (coEnable or \ - os.path.isfile("{0}.coverage".format(basename)) or \ + coEnable = (coEnable or + os.path.isfile("{0}.coverage".format(basename)) or os.path.isfile("{0}.coverage".format(tbasename))) and \ self.project.isPy3Project() @@ -589,7 +589,7 @@ basename = os.path.splitext(fn)[0] prEnable = prEnable or \ os.path.isfile("{0}.profile".format(basename)) - coEnable = (coEnable or \ + coEnable = (coEnable or os.path.isfile("{0}.coverage".format(basename))) and \ itm.isPython3File() @@ -667,7 +667,7 @@ self.trUtf8( """<p>The package directory <b>{0}</b> could""" """ not be created. Aborting...</p>""" - """<p>Reason: {1}</p>""")\ + """<p>Reason: {1}</p>""") .format(packagePath, str(err))) return packageFile = os.path.join(packagePath, "__init__.py") @@ -682,7 +682,7 @@ self.trUtf8( """<p>The package file <b>{0}</b> could""" """ not be created. Aborting...</p>""" - """<p>Reason: {1}</p>""")\ + """<p>Reason: {1}</p>""") .format(packageFile, str(err))) return self.project.appendFile(packageFile)
--- a/Project/ProjectTranslationsBrowser.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Project/ProjectTranslationsBrowser.py Sat Oct 19 13:03:39 2013 +0200 @@ -58,7 +58,7 @@ @param project reference to the project object @param parent parent widget of this browser (QWidget) """ - ProjectBaseBrowser.__init__(self, project, + ProjectBaseBrowser.__init__(self, project, ProjectBrowserTranslationType, parent) self.isTranslationsBrowser = True @@ -710,8 +710,8 @@ fileNames.append(os.path.join(self.project.ppath, fn)) else: trfiles = sorted(self.project.pdata["TRANSLATIONS"][:]) - fileNames.extend([os.path.join(self.project.ppath, trfile) \ - for trfile in trfiles \ + fileNames.extend([os.path.join(self.project.ppath, trfile) + for trfile in trfiles if trfile.endswith('.qm')]) self.trpreview[list, bool].emit(fileNames, True) @@ -741,7 +741,7 @@ pfile = '{0}_e4x.pro'.format(path) # only consider files satisfying the filter criteria - _sources = [s for s in self.project.pdata["SOURCES"] \ + _sources = [s for s in self.project.pdata["SOURCES"] if os.path.splitext(s)[1] in filter] sources = [] for s in _sources: @@ -765,13 +765,13 @@ forms.append(f) if langs: - langs = [self.project.getRelativePath(lang.fileName()) \ + langs = [self.project.getRelativePath(lang.fileName()) for lang in langs if lang.fileName().endswith('.ts')] else: try: pattern = self.project.pdata["TRANSLATIONPATTERN"][0]\ .replace("%language%", "*") - langs = [lang for lang in self.project.pdata["TRANSLATIONS"] \ + langs = [lang for lang in self.project.pdata["TRANSLATIONS"] if fnmatch.fnmatch(lang, pattern)] except IndexError: langs = [] @@ -1000,15 +1000,15 @@ else: if noobsolete: if self.hooks["generateSelected"] is not None: - l = [self.project.getRelativePath(lang.fileName()) \ - for lang in langs] - self.hooks["generateSelected"](l) + li = [self.project.getRelativePath(lang.fileName()) + for lang in langs] + self.hooks["generateSelected"](li) return else: if self.hooks["generateSelectedWithObsolete"] is not None: - l = [self.project.getRelativePath(lang.fileName()) \ - for lang in langs] - self.hooks["generateSelectedWithObsolete"](l) + li = [self.project.getRelativePath(lang.fileName()) + for lang in langs] + self.hooks["generateSelectedWithObsolete"](li) return # generate a minimal temporary projectfile suitable for pylupdate @@ -1183,9 +1183,9 @@ return else: if self.hooks["releaseSelected"] is not None: - l = [self.project.getRelativePath(lang.fileName()) \ - for lang in langs] - self.hooks["releaseSelected"](l) + li = [self.project.getRelativePath(lang.fileName()) + for lang in langs] + self.hooks["releaseSelected"](li) return # generate a minimal temporary projectfile suitable for lrelease
--- a/QScintilla/Editor.py Sat Oct 19 12:28:12 2013 +0200 +++ b/QScintilla/Editor.py Sat Oct 19 13:03:39 2013 +0200 @@ -317,7 +317,7 @@ self.trUtf8("Open File"), self.trUtf8("""<p>The size of the file <b>{0}</b>""" """ is <b>{1} KB</b>.""" - """ Do you really want to load it?</p>""")\ + """ Do you really want to load it?</p>""") .format( self.fileName, QFileInfo(self.fileName).size() // @@ -1173,7 +1173,7 @@ self.trUtf8("Export source"), self.trUtf8( """<p>No exporter available for the """ - """export format <b>{0}</b>. Aborting...</p>""")\ + """export format <b>{0}</b>. Aborting...</p>""") .format(exporterFormat)) else: E5MessageBox.critical( @@ -1733,7 +1733,7 @@ # 1) Determine by first line line0 = self.text(0) if line0.startswith("#!") and \ - ("python2" in line0 or \ + ("python2" in line0 or ("python" in line0 and not "python3" in line0)): self.filetype = "Python2" return True @@ -2741,7 +2741,7 @@ modified = False if (not Preferences.getEditor("TabForIndentation")) and \ Preferences.getEditor("ConvertTabsOnLoad") and \ - not (self.lexer_ and \ + not (self.lexer_ and self.lexer_.alwaysKeepTabs()): txtExpanded = txt.expandtabs(Preferences.getEditor("TabWidth")) if txtExpanded != txt: @@ -4653,8 +4653,8 @@ os.path.isfile("{0}.profile".format(basename)) or \ os.path.isfile("{0}.profile".format(tbasename)) coEnable = ( - coEnable or \ - os.path.isfile("{0}.coverage".format(basename)) or \ + coEnable or + os.path.isfile("{0}.coverage".format(basename)) or os.path.isfile("{0}.coverage".format(tbasename))) and \ self.project.isPy3Project() @@ -4668,8 +4668,8 @@ os.path.isfile("{0}.profile".format(basename)) or \ os.path.isfile("{0}.profile".format(tbasename)) coEnable = ( - coEnable or \ - os.path.isfile("{0}.coverage".format(basename)) or \ + coEnable or + os.path.isfile("{0}.coverage".format(basename)) or os.path.isfile("{0}.coverage".format(tbasename))) and \ self.isPy3File() @@ -6262,7 +6262,7 @@ relFile) if ok and alias: line, index = self.getCursorPosition() - self.insert(' <file alias="{1}">{0}</file>\n'\ + self.insert(' <file alias="{1}">{0}</file>\n' .format(relFile, alias)) self.setCursorPosition(line + 1, index) @@ -6416,7 +6416,7 @@ elif len(templateNames) > 1: self.showUserList( TemplateCompletionListID, - ["{0}?{1:d}".format(t, self.TemplateImageID) \ + ["{0}?{1:d}".format(t, self.TemplateImageID) for t in templateNames]) return
--- a/QScintilla/Exporters/ExporterHTML.py Sat Oct 19 12:28:12 2013 +0200 +++ b/QScintilla/Exporters/ExporterHTML.py Sat Oct 19 13:03:39 2013 +0200 @@ -123,7 +123,7 @@ if lex: istyle = 0 while istyle <= QsciScintilla.STYLE_MAX: - if (istyle <= QsciScintilla.STYLE_DEFAULT or \ + if (istyle <= QsciScintilla.STYLE_DEFAULT or istyle > QsciScintilla.STYLE_LASTPREDEFINED) and \ styleIsUsed[istyle]: if lex.description(istyle) or \ @@ -407,7 +407,7 @@ self.trUtf8("Export source"), self.trUtf8( """<p>The source could not be exported to""" - """ <b>{0}</b>.</p><p>Reason: {1}</p>""")\ + """ <b>{0}</b>.</p><p>Reason: {1}</p>""") .format(filename, str(err))) finally: QApplication.restoreOverrideCursor()
--- a/QScintilla/Exporters/ExporterPDF.py Sat Oct 19 12:28:12 2013 +0200 +++ b/QScintilla/Exporters/ExporterPDF.py Sat Oct 19 13:03:39 2013 +0200 @@ -479,7 +479,7 @@ if lex: istyle = 0 while istyle <= QsciScintilla.STYLE_MAX: - if (istyle <= QsciScintilla.STYLE_DEFAULT or \ + if (istyle <= QsciScintilla.STYLE_DEFAULT or istyle > QsciScintilla.STYLE_LASTPREDEFINED): if lex.description(istyle) or \ istyle == QsciScintilla.STYLE_DEFAULT: @@ -599,7 +599,7 @@ self.trUtf8("Export source"), self.trUtf8( """<p>The source could not be exported to""" - """ <b>{0}</b>.</p><p>Reason: {1}</p>""")\ + """ <b>{0}</b>.</p><p>Reason: {1}</p>""") .format(filename, str(err))) finally: QApplication.restoreOverrideCursor()
--- a/QScintilla/Exporters/ExporterRTF.py Sat Oct 19 12:28:12 2013 +0200 +++ b/QScintilla/Exporters/ExporterRTF.py Sat Oct 19 13:03:39 2013 +0200 @@ -170,7 +170,7 @@ if lex: istyle = 0 while istyle <= QsciScintilla.STYLE_MAX: - if (istyle < QsciScintilla.STYLE_DEFAULT or \ + if (istyle < QsciScintilla.STYLE_DEFAULT or istyle > QsciScintilla.STYLE_LASTPREDEFINED): if lex.description(istyle): font = lex.font(istyle) @@ -262,9 +262,9 @@ f.write(self.RTF_INFOOPEN + self.RTF_COMMENT) f.write(time.strftime(self.RTF_CREATED)) f.write(self.RTF_INFOCLOSE) - f.write(self.RTF_HEADERCLOSE + \ - self.RTF_BODYOPEN + self.RTF_SETFONTFACE + "0" + \ - self.RTF_SETFONTSIZE + "{0:d}".format(fontsize) + \ + f.write(self.RTF_HEADERCLOSE + + self.RTF_BODYOPEN + self.RTF_SETFONTFACE + "0" + + self.RTF_SETFONTSIZE + "{0:d}".format(fontsize) + self.RTF_SETCOLOR + "0 ") lastStyle = self.RTF_SETFONTFACE + "0" + \ self.RTF_SETFONTSIZE + "{0:d}".format(fontsize) + \ @@ -351,7 +351,7 @@ self.trUtf8("Export source"), self.trUtf8( """<p>The source could not be exported to""" - """ <b>{0}</b>.</p><p>Reason: {1}</p>""")\ + """ <b>{0}</b>.</p><p>Reason: {1}</p>""") .format(filename, str(err))) finally: QApplication.restoreOverrideCursor()
--- a/QScintilla/Exporters/ExporterTEX.py Sat Oct 19 12:28:12 2013 +0200 +++ b/QScintilla/Exporters/ExporterTEX.py Sat Oct 19 13:03:39 2013 +0200 @@ -171,7 +171,7 @@ if lex: istyle = 0 while istyle <= QsciScintilla.STYLE_MAX: - if (istyle <= QsciScintilla.STYLE_DEFAULT or \ + if (istyle <= QsciScintilla.STYLE_DEFAULT or istyle > QsciScintilla.STYLE_LASTPREDEFINED) and \ styleIsUsed[istyle]: if lex.description(istyle) or \ @@ -272,7 +272,7 @@ self.trUtf8("Export source"), self.trUtf8( """<p>The source could not be exported to""" - """ <b>{0}</b>.</p><p>Reason: {1}</p>""")\ + """ <b>{0}</b>.</p><p>Reason: {1}</p>""") .format(filename, str(err))) finally: QApplication.restoreOverrideCursor()
--- a/QScintilla/Lexers/Lexer.py Sat Oct 19 12:28:12 2013 +0200 +++ b/QScintilla/Lexers/Lexer.py Sat Oct 19 13:03:39 2013 +0200 @@ -53,7 +53,7 @@ def canBlockComment(self): """ - Public method to determine, whether the lexer language supports a + Public method to determine, whether the lexer language supports a block comment. @return flag (boolean)
--- a/QScintilla/MiniEditor.py Sat Oct 19 12:28:12 2013 +0200 +++ b/QScintilla/MiniEditor.py Sat Oct 19 13:03:39 2013 +0200 @@ -2222,7 +2222,7 @@ else: shownName = self.__strippedName(self.__curFile) - self.setWindowTitle(self.trUtf8("{0}[*] - {1}")\ + self.setWindowTitle(self.trUtf8("{0}[*] - {1}") .format(shownName, self.trUtf8("Mini Editor"))) self.__textEdit.setModified(False) @@ -2794,7 +2794,7 @@ if self.filetype == "": line0 = self.__textEdit.text(0) if line0.startswith("#!") and \ - ("python2" in line0 or \ + ("python2" in line0 or ("python" in line0 and not "python3" in line0)): return True
--- a/QScintilla/QsciScintillaCompat.py Sat Oct 19 12:28:12 2013 +0200 +++ b/QScintilla/QsciScintillaCompat.py Sat Oct 19 13:03:39 2013 +0200 @@ -10,7 +10,7 @@ from PyQt4.QtCore import pyqtSignal, Qt from PyQt4.QtGui import QPalette, QColor, QApplication from PyQt4.Qsci import QsciScintilla, \ - QSCINTILLA_VERSION as QsciQSCINTILLA_VERSION, QSCINTILLA_VERSION_STR, \ + QSCINTILLA_VERSION as QSCIQSCINTILLA_VERSION, QSCINTILLA_VERSION_STR, \ QsciScintillaBase ############################################################################### @@ -28,7 +28,7 @@ if '-snapshot-' in QSCINTILLA_VERSION_STR: return 0x99999 else: - return QsciQSCINTILLA_VERSION + return QSCIQSCINTILLA_VERSION ###############################################################################
--- a/QScintilla/SearchReplaceWidget.py Sat Oct 19 12:28:12 2013 +0200 +++ b/QScintilla/SearchReplaceWidget.py Sat Oct 19 13:03:39 2013 +0200 @@ -432,7 +432,7 @@ if not ok and len(self.__selections) > 1: # try again while not ok and \ - ((backwards and lineFrom >= boundary[0]) or \ + ((backwards and lineFrom >= boundary[0]) or (not backwards and lineFrom <= boundary[2])): for ind in range(len(self.__selections)): if lineFrom == self.__selections[ind][0]: @@ -500,11 +500,11 @@ break else: ok = False - elif (lineFrom == boundary[0] and \ + elif (lineFrom == boundary[0] and indexFrom >= boundary[1]) or \ - (lineFrom > boundary[0] and \ + (lineFrom > boundary[0] and lineFrom < boundary[2]) or \ - (lineFrom == boundary[2] \ + (lineFrom == boundary[2] and indexFrom <= boundary[3]): ok = True else:
--- a/QScintilla/Shell.py Sat Oct 19 12:28:12 2013 +0200 +++ b/QScintilla/Shell.py Sat Oct 19 13:03:39 2013 +0200 @@ -1326,7 +1326,7 @@ @param cmd history entry to be inserted (string) """ self.setCursorPosition(self.prline, self.prcol) - self.setSelection(self.prline, self.prcol,\ + self.setSelection(self.prline, self.prcol, self.prline, self.lineLength(self.prline)) self.removeSelectedText() self.__insertText(cmd) @@ -1616,12 +1616,12 @@ @param txt text to be inserted (string) """ - l = len(txt) + length = len(txt) line, col = self.getCursorPosition() self.insertAt(txt, line, col) if re.search(self.linesepRegExp, txt) is not None: line += 1 - self.setCursorPosition(line, col + l) + self.setCursorPosition(line, col + length) def __configure(self): """
--- a/QScintilla/ShellHistoryDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/QScintilla/ShellHistoryDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -44,7 +44,7 @@ Private slot to handle a change of the selection. """ selected = len(self.historyList.selectedItems()) > 0 - self.copyButton.setEnabled(selected and \ + self.copyButton.setEnabled(selected and self.vm.activeWindow() is not None) self.deleteButton.setEnabled(selected) self.executeButton.setEnabled(selected)
--- a/QScintilla/TypingCompleters/CompleterPython.py Sat Oct 19 12:28:12 2013 +0200 +++ b/QScintilla/TypingCompleters/CompleterPython.py Sat Oct 19 13:03:39 2013 +0200 @@ -236,7 +236,7 @@ edInd = self.editor.indentation(ifLine) if self.__elseRX.indexIn(txt) == 0 and edInd <= indentation: indentation = edInd - 1 - elif (self.__ifRX.indexIn(txt) == 0 or \ + elif (self.__ifRX.indexIn(txt) == 0 or self.__elifRX.indexIn(txt) == 0) and edInd <= indentation: self.editor.cancelList() self.editor.setIndentation(line, edInd) @@ -262,9 +262,9 @@ edInd == indentation and \ edInd == prevInd: indentation = edInd - 1 - elif (self.__ifRX.indexIn(txt) == 0 or \ - self.__whileRX.indexIn(txt) == 0 or \ - self.__forRX.indexIn(txt) == 0 or \ + elif (self.__ifRX.indexIn(txt) == 0 or + self.__whileRX.indexIn(txt) == 0 or + self.__forRX.indexIn(txt) == 0 or self.__tryRX.indexIn(txt) == 0) and \ edInd <= indentation: self.editor.cancelList() @@ -285,10 +285,10 @@ while tryLine >= 0: txt = self.editor.text(tryLine) edInd = self.editor.indentation(tryLine) - if (self.__exceptcRX.indexIn(txt) == 0 or \ + if (self.__exceptcRX.indexIn(txt) == 0 or self.__finallyRX.indexIn(txt) == 0) and edInd <= indentation: indentation = edInd - 1 - elif (self.__exceptRX.indexIn(txt) == 0 or \ + elif (self.__exceptRX.indexIn(txt) == 0 or self.__tryRX.indexIn(txt) == 0) and edInd <= indentation: self.editor.cancelList() self.editor.setIndentation(line, edInd) @@ -307,8 +307,8 @@ txt = self.editor.text(tryLine) edInd = self.editor.indentation(tryLine) if self.__py24StyleTry: - if (self.__exceptcRX.indexIn(txt) == 0 or \ - self.__exceptRX.indexIn(txt) == 0 or \ + if (self.__exceptcRX.indexIn(txt) == 0 or + self.__exceptRX.indexIn(txt) == 0 or self.__finallyRX.indexIn(txt) == 0) and \ edInd <= indentation: indentation = edInd - 1 @@ -319,8 +319,8 @@ else: if self.__finallyRX.indexIn(txt) == 0 and edInd <= indentation: indentation = edInd - 1 - elif (self.__tryRX.indexIn(txt) == 0 or \ - self.__exceptcRX.indexIn(txt) == 0 or \ + elif (self.__tryRX.indexIn(txt) == 0 or + self.__exceptcRX.indexIn(txt) == 0 or self.__exceptRX.indexIn(txt) == 0) and \ edInd <= indentation: self.editor.cancelList() @@ -362,7 +362,7 @@ curLine = line - 1 while curLine >= 0: txt = self.editor.text(curLine) - if (self.__defSelfRX.indexIn(txt) == 0 or \ + if (self.__defSelfRX.indexIn(txt) == 0 or self.__defClsRX.indexIn(txt) == 0) and \ self.editor.indentation(curLine) == indentation: return True
--- a/Snapshot/SnapWidget.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Snapshot/SnapWidget.py Sat Oct 19 13:03:39 2013 +0200 @@ -231,7 +231,7 @@ if not file.open(QFile.WriteOnly): E5MessageBox.warning( self, self.trUtf8("Save Snapshot"), - self.trUtf8("Cannot write file '{0}:\n{1}.")\ + self.trUtf8("Cannot write file '{0}:\n{1}.") .format(fileName, file.errorString())) return False @@ -241,7 +241,7 @@ if not ok: E5MessageBox.warning( self, self.trUtf8("Save Snapshot"), - self.trUtf8("Cannot write file '{0}:\n{1}.")\ + self.trUtf8("Cannot write file '{0}:\n{1}.") .format(fileName, file.errorString())) return ok @@ -254,7 +254,7 @@ name = os.path.basename(self.__filename) # If the name contains a number, then increment it. - numSearch = QRegExp("(^|[^\\d])(\\d+)") + numSearch = QRegExp("(^|[^\\d])(\\d+)") # We want to match as far left as possible, and when the number is # at the start of the name. @@ -485,8 +485,8 @@ self.trUtf8( """The application contains an unsaved snapshot."""), E5MessageBox.StandardButtons( - E5MessageBox.Abort | \ - E5MessageBox.Discard | \ + E5MessageBox.Abort | + E5MessageBox.Discard | E5MessageBox.Save)) if res == E5MessageBox.Abort: evt.ignore()
--- a/Snapshot/SnapshotFreehandGrabber.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Snapshot/SnapshotFreehandGrabber.py Sat Oct 19 13:03:39 2013 +0200 @@ -166,9 +166,9 @@ boundingRect = textRect.adjusted(-4, 0, 0, 0) polBoundingRect = pol.boundingRect() - if (textRect.width() < + if (textRect.width() < polBoundingRect.width() - 2 * self.__handleSize) and \ - (textRect.height() < + (textRect.height() < polBoundingRect.height() - 2 * self.__handleSize) and \ polBoundingRect.width() > 100 and \ polBoundingRect.height() > 100: @@ -188,7 +188,7 @@ QPoint(polBoundingRect.x() - 3, polBoundingRect.y())) textRect.moveTopRight( QPoint(polBoundingRect.x() - 5, polBoundingRect.y())) - elif (polBoundingRect.bottom() + 3 + textRect.height() < + elif (polBoundingRect.bottom() + 3 + textRect.height() < self.rect().bottom()) and \ polBoundingRect.right() > textRect.width(): # at bottom, right aligned @@ -210,7 +210,7 @@ drawPolygon(painter, boundingRect, textColor, textBackgroundColor) painter.drawText(textRect, Qt.AlignHCenter, txt) - if (polBoundingRect.height() > self.__handleSize * 2 and \ + if (polBoundingRect.height() > self.__handleSize * 2 and polBoundingRect.width() > self.__handleSize * 2) or \ not self.__mouseDown: painter.setBrush(Qt.transparent) @@ -325,8 +325,8 @@ pt.begin(pixmap2) if pt.paintEngine().hasFeature(QPaintEngine.PorterDuff): pt.setRenderHints( - QPainter.Antialiasing | \ - QPainter.HighQualityAntialiasing | \ + QPainter.Antialiasing | + QPainter.HighQualityAntialiasing | QPainter.SmoothPixmapTransform, True) pt.setBrush(Qt.black)
--- a/Snapshot/SnapshotRegionGrabber.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Snapshot/SnapshotRegionGrabber.py Sat Oct 19 13:03:39 2013 +0200 @@ -218,7 +218,7 @@ drawRect(painter, boundingRect, textColor, textBackgroundColor) painter.drawText(textRect, Qt.AlignHCenter, txt) - if (r.height() > self.__handleSize * 2 and \ + if (r.height() > self.__handleSize * 2 and r.width() > self.__handleSize * 2) or \ not self.__mouseDown: self.__updateHandles() @@ -297,7 +297,7 @@ s = self.__selectionBeforeDrag.normalized() p = s.topLeft() + evt.pos() - self.__dragStartPoint r.setBottomRight( - r.bottomRight() - QPoint(s.width(), s.height()) + + r.bottomRight() - QPoint(s.width(), s.height()) + QPoint(1, 1)) if not r.isNull() and r.isValid(): self.__selection.moveTo(self.__limitPointToRect(p, r)) @@ -460,18 +460,18 @@ @param sel selection to be normalized (QRect) @return normalized selection (QRect) """ - r = QRect(sel) - if r.width() <= 0: - l = r.left() - w = r.width() - r.setLeft(l + w - 1) - r.setRight(l) - if r.height() <= 0: - t = r.top() - h = r.height() - r.setTop(t + h - 1) - r.setBottom(t) - return r + rect = QRect(sel) + if rect.width() <= 0: + left = rect.left() + width = rect.width() + rect.setLeft(left + width - 1) + rect.setRight(left) + if rect.height() <= 0: + top = rect.top() + height = rect.height() + rect.setTop(top + height - 1) + rect.setBottom(top) + return rect def __grabRect(self): """ @@ -493,8 +493,8 @@ pt.begin(pixmap2) if pt.paintEngine().hasFeature(QPaintEngine.PorterDuff): pt.setRenderHints( - QPainter.Antialiasing | \ - QPainter.HighQualityAntialiasing | \ + QPainter.Antialiasing | + QPainter.HighQualityAntialiasing | QPainter.SmoothPixmapTransform, True) pt.setBrush(Qt.black)
--- a/Snapshot/SnapshotTimer.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Snapshot/SnapshotTimer.py Sat Oct 19 13:03:39 2013 +0200 @@ -114,7 +114,7 @@ screenGeom = QApplication.desktop().screenGeometry() if self.x() == screenGeom.left(): self.move( - screenGeom.x() + + screenGeom.x() + (screenGeom.width() // 2 - self.size().width() // 2), screenGeom.top()) else:
--- a/SqlBrowser/SqlBrowserWidget.py Sat Oct 19 12:28:12 2013 +0200 +++ b/SqlBrowser/SqlBrowserWidget.py Sat Oct 19 13:03:39 2013 +0200 @@ -302,7 +302,7 @@ self.statusMessage.emit(self.trUtf8("Query OK.")) else: self.statusMessage.emit( - self.trUtf8("Query OK, number of affected rows: {0}")\ + self.trUtf8("Query OK, number of affected rows: {0}") .format(model.query().numRowsAffected())) self.table.resizeColumnsToContents()
--- a/Tasks/TaskViewer.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Tasks/TaskViewer.py Sat Oct 19 13:03:39 2013 +0200 @@ -291,7 +291,7 @@ """ self.addTask(summary, filename=filename, lineno=lineno, isProjectTask=( - self.project and + self.project and self.project.isProjectSource(filename)), taskType=taskType, description=description) @@ -523,7 +523,7 @@ entry. """ markers = { - Task.TypeWarning: + Task.TypeWarning: Preferences.getTasks("TasksWarningMarkers").split(), Task.TypeNote: Preferences.getTasks("TasksNoteMarkers").split(), Task.TypeTodo: Preferences.getTasks("TasksTodoMarkers").split(),
--- a/Templates/TemplateMultipleVariablesDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Templates/TemplateMultipleVariablesDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -54,8 +54,8 @@ self.variablesEntries = {} row = 0 for var in variables: - l = QLabel("{0}:".format(var), self.top) - self.grid.addWidget(l, row, 0, Qt.Alignment(Qt.AlignTop)) + label = QLabel("{0}:".format(var), self.top) + self.grid.addWidget(label, row, 0, Qt.Alignment(Qt.AlignTop)) if var.find(":") >= 0: formatStr = var[1:-1].split(":")[1] if formatStr in ["ml", "rl"]:
--- a/Templates/TemplateViewer.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Templates/TemplateViewer.py Sat Oct 19 13:03:39 2013 +0200 @@ -524,7 +524,7 @@ res = E5MessageBox.yesNo( self, self.trUtf8("Remove Template"), - self.trUtf8("""<p>Do you really want to remove <b>{0}</b>?</p>""")\ + self.trUtf8("""<p>Do you really want to remove <b>{0}</b>?</p>""") .format(itm.getName())) if not res: return @@ -850,7 +850,7 @@ self, self.trUtf8("Edit Template Group"), self.trUtf8("""<p>A template group with the name""" - """ <b>{0}</b> already exists.</p>""")\ + """ <b>{0}</b> already exists.</p>""") .format(newname)) return
--- a/Toolbox/Startup.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Toolbox/Startup.py Sat Oct 19 13:03:39 2013 +0200 @@ -29,7 +29,7 @@ @param appinfo dictionary describing the application @param optlen length of the field for the commandline option (integer) """ - options = [\ + options = [ ("--version", "show the program's version number and exit"), ("-h, --help", "show this help message and exit") ]
--- a/Tools/TRPreviewer.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Tools/TRPreviewer.py Sat Oct 19 13:03:39 2013 +0200 @@ -509,7 +509,7 @@ self.parent(), self.trUtf8("Set Translator"), self.trUtf8( - """<p>The translator <b>{0}</b> is not known.</p>""")\ + """<p>The translator <b>{0}</b> is not known.</p>""") .format(name)) return @@ -726,7 +726,7 @@ self, self.trUtf8("Load UI File"), self.trUtf8( - """<p>The file <b>{0}</b> could not be loaded.</p>""")\ + """<p>The file <b>{0}</b> could not be loaded.</p>""") .format(self.__uiFileName)) self.__valid = False return @@ -782,7 +782,7 @@ self, self.trUtf8("Load UI File"), self.trUtf8( - """<p>The file <b>{0}</b> could not be loaded.</p>""")\ + """<p>The file <b>{0}</b> could not be loaded.</p>""") .format(uiFileName)) return
--- a/Tools/TrayStarter.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Tools/TrayStarter.py Sat Oct 19 13:03:39 2013 +0200 @@ -11,8 +11,8 @@ import os from PyQt4.QtCore import QProcess, QSettings, QFileInfo -from PyQt4.QtGui import QSystemTrayIcon, QMenu, qApp, QCursor, \ - QApplication, QDialog +from PyQt4.QtGui import QSystemTrayIcon, QMenu, qApp, QCursor, QDialog, \ + QApplication from E5Gui import E5MessageBox
--- a/Tools/UIPreviewer.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Tools/UIPreviewer.py Sat Oct 19 13:03:39 2013 +0200 @@ -360,7 +360,7 @@ self, self.trUtf8("Load UI File"), self.trUtf8( - """<p>The file <b>{0}</b> could not be loaded.</p>""")\ + """<p>The file <b>{0}</b> could not be loaded.</p>""") .format(fn)) self.__updateActions()
--- a/UI/Browser.py Sat Oct 19 12:28:12 2013 +0200 +++ b/UI/Browser.py Sat Oct 19 13:03:39 2013 +0200 @@ -314,7 +314,7 @@ if index.isValid(): self.setCurrentIndex(index) flags = QItemSelectionModel.SelectionFlags( - QItemSelectionModel.ClearAndSelect | + QItemSelectionModel.ClearAndSelect | QItemSelectionModel.Rows) self.selectionModel().select(index, flags)
--- a/UI/BrowserModel.py Sat Oct 19 12:28:12 2013 +0200 +++ b/UI/BrowserModel.py Sat Oct 19 13:03:39 2013 +0200 @@ -573,7 +573,7 @@ if "@@Coding@@" in keys: node = BrowserCodingItem( parentItem, - QApplication.translate("BrowserModel", "Coding: {0}")\ + QApplication.translate("BrowserModel", "Coding: {0}") .format(dict["@@Coding@@"].coding)) self._addItem(node, parentItem) if "@@Globals@@" in keys: @@ -1296,8 +1296,8 @@ else: self.icon = UI.PixmapCache.getIcon("class.png") if self._classObject and \ - (self._classObject.methods or \ - self._classObject.classes or \ + (self._classObject.methods or + self._classObject.classes or self._classObject.attributes): self._populated = False self._lazyPopulation = True
--- a/UI/BrowserSortFilterProxyModel.py Sat Oct 19 12:28:12 2013 +0200 +++ b/UI/BrowserSortFilterProxyModel.py Sat Oct 19 13:03:39 2013 +0200 @@ -49,11 +49,11 @@ @param right index of right item (QModelIndex) @return true, if left is less than right (boolean) """ - l = left.model() and left.model().item(left) or None - r = right.model() and right.model().item(right) or None + le = left.model() and left.model().item(left) or None + ri = right.model() and right.model().item(right) or None - if l and r: - return l.lessThan(r, self.__sortColumn, self.__sortOrder) + if le and ri: + return le.lessThan(ri, self.__sortColumn, self.__sortOrder) return False
--- a/UI/CompareDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/UI/CompareDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -274,9 +274,9 @@ self.diffButton.setEnabled(False) self.diffButton.hide() - if type(lines1) == type(""): + if isinstance(lines1, str): lines1 = lines1.splitlines(True) - if type(lines2) == type(""): + if isinstance(lines2, str): lines2 = lines2.splitlines(True) self.__compare(lines1, lines2) @@ -342,13 +342,13 @@ self.firstButton.setEnabled(False) self.upButton.setEnabled(False) self.downButton.setEnabled( - len(self.diffParas) > 0 and + len(self.diffParas) > 0 and (self.vsb1.isVisible() or self.vsb2.isVisible())) self.lastButton.setEnabled( - len(self.diffParas) > 0 and + len(self.diffParas) > 0 and (self.vsb1.isVisible() or self.vsb2.isVisible())) - self.totalLabel.setText(self.trUtf8('Total: {0}')\ + self.totalLabel.setText(self.trUtf8('Total: {0}') .format(added + deleted + changed)) self.changedLabel.setText(self.trUtf8('Changed: {0}').format(changed)) self.addedLabel.setText(self.trUtf8('Added: {0}').format(added))
--- a/UI/EmailDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/UI/EmailDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -389,7 +389,7 @@ @param txt changed text (string) """ self.sendButton.setEnabled( - self.subject.text() != "" and \ + self.subject.text() != "" and self.message.toPlainText() != "") def on_message_textChanged(self): @@ -397,5 +397,5 @@ Private slot to handle the textChanged signal of the message edit. """ self.sendButton.setEnabled( - self.subject.text() != "" and \ + self.subject.text() != "" and self.message.toPlainText() != "")
--- a/UI/FindFileDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/UI/FindFileDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -144,7 +144,7 @@ self.__lastFileItem.setExpanded(True) if self.__replaceMode: self.__lastFileItem.setFlags( - self.__lastFileItem.flags() | \ + self.__lastFileItem.flags() | Qt.ItemFlags(Qt.ItemIsUserCheckable | Qt.ItemIsTristate)) # Qt bug: # item is not user checkable if setFirstColumnSpanned @@ -248,10 +248,10 @@ Private slot called to enable the find button. """ if self.findtextCombo.currentText() == "" or \ - (self.__replaceMode and \ + (self.__replaceMode and self.replacetextCombo.currentText() == "") or \ - (self.dirButton.isChecked() and \ - (self.dirCombo.currentText() == "" or \ + (self.dirButton.isChecked() and + (self.dirCombo.currentText() == "" or not os.path.exists(os.path.abspath( self.dirCombo.currentText())))) or \ (self.filterCheckBox.isChecked() and self.filterEdit.text() == ""): @@ -300,14 +300,14 @@ if self.filterCheckBox.isChecked(): fileFilter = self.filterEdit.text() fileFilterList = \ - ["^{0}$".format(filter.replace(".", "\.").replace("*", ".*")) \ + ["^{0}$".format(filter.replace(".", "\.").replace("*", ".*")) for filter in fileFilter.split(";")] filterRe = re.compile("|".join(fileFilterList)) if self.projectButton.isChecked(): if self.filterCheckBox.isChecked(): - files = [self.project.getRelativePath(file) \ - for file in \ + files = [self.project.getRelativePath(file) + for file in self.__getFileList( self.project.getProjectPath(), filterRe)] else: @@ -555,8 +555,8 @@ path = os.path.abspath(path) files = [] for dirname, _, names in os.walk(path): - files.extend([os.path.join(dirname, f) \ - for f in names \ + files.extend([os.path.join(dirname, f) + for f in names if re.match(filterRe, f)] ) return files @@ -609,7 +609,7 @@ self.trUtf8("Replace in Files"), self.trUtf8( """<p>Could not read the file <b>{0}</b>.""" - """ Skipping it.</p><p>Reason: {1}</p>""")\ + """ Skipping it.</p><p>Reason: {1}</p>""") .format(fn, str(err)) ) progress += 1 @@ -625,7 +625,7 @@ self.trUtf8( """<p>The current and the original hash of the""" """ file <b>{0}</b> are different. Skipping it.""" - """</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p>""")\ + """</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p>""") .format(fn, origHash, hash) ) progress += 1 @@ -650,7 +650,7 @@ self.trUtf8("Replace in Files"), self.trUtf8( """<p>Could not save the file <b>{0}</b>.""" - """ Skipping it.</p><p>Reason: {1}</p>""")\ + """ Skipping it.</p><p>Reason: {1}</p>""") .format(fn, str(err)) )
--- a/UI/Previewer.py Sat Oct 19 12:28:12 2013 +0200 +++ b/UI/Previewer.py Sat Oct 19 13:03:39 2013 +0200 @@ -511,7 +511,7 @@ # version 2.0 supports only extension names, not instances if markdown.version_info[0] > 2 or \ - (markdown.version_info[0] == 2 and + (markdown.version_info[0] == 2 and markdown.version_info[1] > 0): class _StrikeThroughExtension(markdown.Extension): """
--- a/UI/UserInterface.py Sat Oct 19 12:28:12 2013 +0200 +++ b/UI/UserInterface.py Sat Oct 19 13:03:39 2013 +0200 @@ -1145,14 +1145,14 @@ self.setWindowTitle( self.trUtf8("{0} - Passive Mode").format(Program)) elif self.capProject and not self.capEditor: - self.setWindowTitle(self.trUtf8("{0} - {1} - Passive Mode")\ + self.setWindowTitle(self.trUtf8("{0} - {1} - Passive Mode") .format(self.capProject, Program)) elif not self.capProject and self.capEditor: - self.setWindowTitle(self.trUtf8("{0} - {1} - Passive Mode")\ + self.setWindowTitle(self.trUtf8("{0} - {1} - Passive Mode") .format(self.capEditor, Program)) else: self.setWindowTitle( - self.trUtf8("{0} - {1} - {2} - Passive Mode")\ + self.trUtf8("{0} - {1} - {2} - Passive Mode") .format(self.capProject, self.capEditor, Program)) else: if not self.capProject and not self.capEditor: @@ -4508,7 +4508,7 @@ self.trUtf8('Process Generation Error'), self.trUtf8( '<p>Could not start the tool entry <b>{0}</b>.<br>' - 'Ensure that it is available as <b>{1}</b>.</p>')\ + 'Ensure that it is available as <b>{1}</b>.</p>') .format(tool['menutext'], tool['executable'])) else: self.toolProcs.append((program, proc, procData)) @@ -4617,7 +4617,7 @@ self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" - """ "<b>{0}</b>" could not be found.</p>""")\ + """ "<b>{0}</b>" could not be found.</p>""") .format(home)) return @@ -4674,7 +4674,7 @@ self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" - """ "<b>{0}</b>" could not be found.</p>""")\ + """ "<b>{0}</b>" could not be found.</p>""") .format(home)) return @@ -4743,7 +4743,7 @@ self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" - """ "<b>{0}</b>" could not be found.</p>""")\ + """ "<b>{0}</b>" could not be found.</p>""") .format(home)) return @@ -4785,7 +4785,7 @@ if pyqt4DocDir.startswith("file://"): pyqt4DocDir = pyqt4DocDir[7:] if not os.path.splitext(pyqt4DocDir)[1]: - possibleHomes = [\ + possibleHomes = [ Utilities.normjoinpath(pyqt4DocDir, 'index.html'), Utilities.normjoinpath(pyqt4DocDir, 'classes.html'), ] @@ -4801,7 +4801,7 @@ self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" - """ "<b>{0}</b>" could not be found.</p>""")\ + """ "<b>{0}</b>" could not be found.</p>""") .format(home)) return @@ -4863,7 +4863,7 @@ self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" - """ "<b>{0}</b>" could not be found.</p>""")\ + """ "<b>{0}</b>" could not be found.</p>""") .format(home)) return @@ -4899,7 +4899,7 @@ self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" - """ "<b>{0}</b>" could not be found.</p>""")\ + """ "<b>{0}</b>" could not be found.</p>""") .format(home)) return @@ -4947,7 +4947,7 @@ self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" - """ "<b>{0}</b>" could not be found.</p>""")\ + """ "<b>{0}</b>" could not be found.</p>""") .format(home)) return @@ -5430,7 +5430,7 @@ self, self.trUtf8("Read session"), self.trUtf8( - "<p>The session file <b>{0}</b> could not be read.</p>")\ + "<p>The session file <b>{0}</b> could not be read.</p>") .format(fn)) return @@ -5445,7 +5445,7 @@ self, self.trUtf8("Read session"), self.trUtf8( - "<p>The session file <b>{0}</b> could not be read.</p>")\ + "<p>The session file <b>{0}</b> could not be read.</p>") .format(fn)) def showFindFileByNameDialog(self): @@ -5883,7 +5883,7 @@ self.trUtf8( """The update to <b>{0}</b> of eric5 is""" """ available at <b>{1}</b>. Would you like to""" - """ get it?""")\ + """ get it?""") .format(versions[2], versions[3]), yesDefault=True) url = res and versions[3] or '' @@ -5894,7 +5894,7 @@ self.trUtf8( """The update to <b>{0}</b> of eric5 is""" """ available at <b>{1}</b>. Would you like to""" - """ get it?""")\ + """ get it?""") .format(versions[0], versions[1]), yesDefault=True) url = res and versions[1] or '' @@ -5915,7 +5915,7 @@ self.trUtf8( """The update to <b>{0}</b> of eric5 is""" """ available at <b>{1}</b>. Would you like""" - """ to get it?""")\ + """ to get it?""") .format(versions[0], versions[1]), yesDefault=True) url = res and versions[1] or '' @@ -5962,7 +5962,7 @@ versionText += """<tr><td>{0}</td><td><a href="{1}">{2}</a>""" \ """</td></tr>""".format( versions[line], versions[line + 1], - 'sourceforge' in versions[line + 1] and \ + 'sourceforge' in versions[line + 1] and "SourceForge" or versions[line + 1]) line += 2 versionText += self.trUtf8("""</table>""")
--- a/Utilities/ClassBrowsers/pyclbr.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Utilities/ClassBrowsers/pyclbr.py Sat Oct 19 13:03:39 2013 +0200 @@ -201,7 +201,7 @@ self.name = '__all__' self.file = file self.lineno = lineno - self.identifiers = [e.replace('"', '').replace("'", "").strip() \ + self.identifiers = [e.replace('"', '').replace("'", "").strip() for e in idents.split(',')]
--- a/Utilities/ModuleParser.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Utilities/ModuleParser.py Sat Oct 19 13:03:39 2013 +0200 @@ -638,8 +638,8 @@ elif m.start("String") >= 0: if modulelevel and \ - (src[start - len('\r\n'):start] == '\r\n' or \ - src[start - len('\n'):start] == '\n' or \ + (src[start - len('\r\n'):start] == '\r\n' or + src[start - len('\n'):start] == '\n' or src[start - len('\r'):start] == '\r'): contents = m.group("StringContents3") if contents is not None: @@ -754,7 +754,7 @@ elif m.start("Import") >= 0: # import module - names = [n.strip() for n in + names = [n.strip() for n in "".join(m.group("ImportList").splitlines()) .replace("\\", "").split(',')] for name in names: @@ -764,7 +764,7 @@ elif m.start("ImportFrom") >= 0: # from module import stuff mod = m.group("ImportFromPath") - names = [n.strip() for n in + names = [n.strip() for n in "".join(m.group("ImportFromList").splitlines()) .replace("\\", "").split(',')] if mod not in self.from_imports:
--- a/Utilities/PasswordChecker.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Utilities/PasswordChecker.py Sat Oct 19 13:03:39 2013 +0200 @@ -325,7 +325,7 @@ lowercasedPassword = password.lower() if self.passwordLength["count"] >= self.sequentialLetters["length"]: - for index in range(len(self.sequentialLetters["data"]) - \ + for index in range(len(self.sequentialLetters["data"]) - self.sequentialLetters["length"] + 1): fwd = self.sequentialLetters["data"][ index:index + self.sequentialLetters["length"]] @@ -337,7 +337,7 @@ # Check for sequential numeric string patterns (forward and reverse) if self.passwordLength["count"] >= self.sequentialNumerics["length"]: - for index in range(len(self.sequentialNumerics["data"]) - \ + for index in range(len(self.sequentialNumerics["data"]) - self.sequentialNumerics["length"] + 1): fwd = self.sequentialNumerics["data"][ index:index + self.sequentialNumerics["length"]] @@ -353,7 +353,7 @@ for pattern in self.keyboardPatterns["data"]: for index in range( len(pattern) - self.keyboardPatterns["length"] + 1): - fwd = pattern[index:index + + fwd = pattern[index:index + self.keyboardPatterns["length"]] rev = self.__strReverse(fwd) if lowercasedPassword.find(fwd) != -1: @@ -367,7 +367,7 @@ # Try to find repeated sequences of characters. if self.passwordLength["count"] >= self.repeatedSequences["length"]: - for index in range(len(lowercasedPassword) - \ + for index in range(len(lowercasedPassword) - self.repeatedSequences["length"] + 1): fwd = lowercasedPassword[ index:index + self.repeatedSequences["length"]] @@ -377,7 +377,7 @@ # Try to find mirrored sequences of characters. if self.passwordLength["count"] >= self.mirroredSequences["length"]: - for index in range(len(lowercasedPassword) - \ + for index in range(len(lowercasedPassword) - self.mirroredSequences["length"] + 1): fwd = lowercasedPassword[ index:index + self.mirroredSequences["length"]] @@ -395,7 +395,7 @@ if self.passwordLength["count"] >= self.passwordLength["minimum"]: # credit additional characters over minimum self.passwordLength["rating"] = self.passwordLength["bonus"] + \ - (self.passwordLength["count"] - + (self.passwordLength["count"] - self.passwordLength["minimum"]) * \ self.passwordLength["factor"] else: @@ -409,7 +409,7 @@ self.recommendedPasswordLength["minimum"]: self.recommendedPasswordLength["rating"] = \ self.recommendedPasswordLength["bonus"] + \ - (self.passwordLength["count"] - \ + (self.passwordLength["count"] - self.recommendedPasswordLength["minimum"]) * \ self.recommendedPasswordLength["factor"] else: @@ -550,7 +550,7 @@ # judge the requirement status self.basicRequirements["status"] = self.__determineStatus( - self.basicRequirements["count"] - + self.basicRequirements["count"] - self.basicRequirements["minimum"]) if self.basicRequirements["status"] != self.Status_Failed: self.basicRequirements["rating"] = \ @@ -564,13 +564,13 @@ # beyond basic requirements self.recommendedPasswordLength["status"] = self.__determineStatus( - self.recommendedPasswordLength["count"] - \ + self.recommendedPasswordLength["count"] - self.recommendedPasswordLength["minimum"]) self.middleNumerics["status"] = self.__determineStatus( - self.middleNumerics["count"] - \ + self.middleNumerics["count"] - self.middleNumerics["minimum"]) self.middleSymbols["status"] = self.__determineStatus( - self.middleSymbols["count"] - \ + self.middleSymbols["count"] - self.middleSymbols["minimum"]) self.sequentialLetters["status"] = self.__determineBinaryStatus( self.sequentialLetters["count"])
--- a/Utilities/crypto/py3AES.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Utilities/crypto/py3AES.py Sat Oct 19 13:03:39 2013 +0200 @@ -662,7 +662,7 @@ for j in range(int(math.ceil(float(len(input)) / 16))): start = j * 16 end = j * 16 + 16 - if end > len(input): + if end > len(input): end = len(input) plaintext = self.__extractBytes(input, start, end, mode) # print 'PT@%s:%s' % (j, plaintext) @@ -751,7 +751,7 @@ bytesOut = bytearray() # char firstRound firstRound = True - if cipherIn != None: + if cipherIn is not None: for j in range(int(math.ceil(float(len(cipherIn)) / 16))): start = j * 16 end = j * 16 + 16
--- a/Utilities/crypto/py3PBKDF2.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Utilities/crypto/py3PBKDF2.py Sat Oct 19 13:03:39 2013 +0200 @@ -127,7 +127,7 @@ digestname, iterations, salt = hashParameters.split(Delimiter) except ValueError: raise ValueError( - "Expected hash parameters string in format "\ + "Expected hash parameters string in format " "'digestmod{0}iterations{0}salt".format(Delimiter)) if digestname not in Hashes.keys():
--- a/UtilitiesPython2/CodeStyleChecker.py Sat Oct 19 12:28:12 2013 +0200 +++ b/UtilitiesPython2/CodeStyleChecker.py Sat Oct 19 13:03:39 2013 +0200 @@ -137,7 +137,6 @@ maxLineLength=max_line_length, docType=docType) docStyleChecker.run() - errors = report.errors + docStyleChecker.errors if len(errors) > 0:
--- a/VCS/CommandOptionsDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/VCS/CommandOptionsDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -9,12 +9,12 @@ from PyQt4.QtGui import QDialog -from .Ui_CommandOptionsDialog import Ui_vcsCommandOptionsDialog +from .Ui_CommandOptionsDialog import Ui_VcsCommandOptionsDialog import Utilities -class vcsCommandOptionsDialog(QDialog, Ui_vcsCommandOptionsDialog): +class VcsCommandOptionsDialog(QDialog, Ui_VcsCommandOptionsDialog): """ Class implementing the VCS command options dialog. """
--- a/VCS/CommandOptionsDialog.ui Sat Oct 19 12:28:12 2013 +0200 +++ b/VCS/CommandOptionsDialog.ui Sat Oct 19 13:03:39 2013 +0200 @@ -1,7 +1,8 @@ -<ui version="4.0" > - <class>vcsCommandOptionsDialog</class> - <widget class="QDialog" name="vcsCommandOptionsDialog" > - <property name="geometry" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>VcsCommandOptionsDialog</class> + <widget class="QDialog" name="VcsCommandOptionsDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,286 +10,286 @@ <height>413</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>VCS Command Options</string> </property> - <property name="whatsThis" > - <string><b>VCS Command Options Dialog</b> -<p>Enter the options for the different VCS commands. The "Global Options" entry applies to all VCS commands.</p></string> + <property name="whatsThis"> + <string><b>VCS Command Options Dialog</b> +<p>Enter the options for the different VCS commands. The "Global Options" entry applies to all VCS commands.</p></string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <layout class="QGridLayout" > - <item row="8" column="0" > - <widget class="QLabel" name="historyLabel" > - <property name="text" > + <layout class="QGridLayout"> + <item row="8" column="0"> + <widget class="QLabel" name="historyLabel"> + <property name="text"> <string>&History Options:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>historyEdit</cstring> </property> </widget> </item> - <item row="4" column="0" > - <widget class="QLabel" name="addLabel" > - <property name="text" > + <item row="4" column="0"> + <widget class="QLabel" name="addLabel"> + <property name="text"> <string>&Add Options:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>addEdit</cstring> </property> </widget> </item> - <item row="5" column="0" > - <widget class="QLabel" name="removeLabel" > - <property name="text" > + <item row="5" column="0"> + <widget class="QLabel" name="removeLabel"> + <property name="text"> <string>&Remove Options:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>removeEdit</cstring> </property> </widget> </item> - <item row="10" column="0" > - <widget class="QLabel" name="tagLabel" > - <property name="text" > + <item row="10" column="0"> + <widget class="QLabel" name="tagLabel"> + <property name="text"> <string>&Tag Options:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>tagEdit</cstring> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QLineEdit" name="commitEdit" > - <property name="toolTip" > + <item row="1" column="1"> + <widget class="QLineEdit" name="commitEdit"> + <property name="toolTip"> <string>Enter the options for the commit command.</string> </property> - <property name="whatsThis" > - <string><b>Commit Options</b> -<p>Enter the options for the commit command.</p></string> + <property name="whatsThis"> + <string><b>Commit Options</b> +<p>Enter the options for the commit command.</p></string> </property> </widget> </item> - <item row="8" column="1" > - <widget class="QLineEdit" name="historyEdit" > - <property name="toolTip" > + <item row="8" column="1"> + <widget class="QLineEdit" name="historyEdit"> + <property name="toolTip"> <string>Enter the options for the history command.</string> </property> - <property name="whatsThis" > - <string><b>History Options</b> -<p>Enter the options for the history command.</p></string> + <property name="whatsThis"> + <string><b>History Options</b> +<p>Enter the options for the history command.</p></string> </property> </widget> </item> - <item row="6" column="1" > - <widget class="QLineEdit" name="diffEdit" > - <property name="toolTip" > + <item row="6" column="1"> + <widget class="QLineEdit" name="diffEdit"> + <property name="toolTip"> <string>Enter the options for the diff command.</string> </property> - <property name="whatsThis" > - <string><b>Diff Options</b> -<p>Enter the options for the diff command.</p></string> + <property name="whatsThis"> + <string><b>Diff Options</b> +<p>Enter the options for the diff command.</p></string> </property> </widget> </item> - <item row="3" column="1" > - <widget class="QLineEdit" name="updateEdit" > - <property name="toolTip" > + <item row="3" column="1"> + <widget class="QLineEdit" name="updateEdit"> + <property name="toolTip"> <string>Enter the options for the update command.</string> </property> - <property name="whatsThis" > - <string><b>Update Options</b> -<p>Enter the options for the update command.</p></string> + <property name="whatsThis"> + <string><b>Update Options</b> +<p>Enter the options for the update command.</p></string> </property> </widget> </item> - <item row="7" column="1" > - <widget class="QLineEdit" name="logEdit" > - <property name="toolTip" > + <item row="7" column="1"> + <widget class="QLineEdit" name="logEdit"> + <property name="toolTip"> <string>Enter the options for the log command.</string> </property> - <property name="whatsThis" > - <string><b>Log Options</b> -<p>Enter the options for the log command.</p></string> + <property name="whatsThis"> + <string><b>Log Options</b> +<p>Enter the options for the log command.</p></string> </property> </widget> </item> - <item row="10" column="1" > - <widget class="QLineEdit" name="tagEdit" > - <property name="toolTip" > + <item row="10" column="1"> + <widget class="QLineEdit" name="tagEdit"> + <property name="toolTip"> <string>Enter the options for the tag command.</string> </property> - <property name="whatsThis" > - <string><b>Tag Options</b> -<p>Enter the options for the tag command.</p></string> + <property name="whatsThis"> + <string><b>Tag Options</b> +<p>Enter the options for the tag command.</p></string> </property> </widget> </item> - <item row="9" column="1" > - <widget class="QLineEdit" name="statusEdit" > - <property name="toolTip" > + <item row="9" column="1"> + <widget class="QLineEdit" name="statusEdit"> + <property name="toolTip"> <string>Enter the options for the status command.</string> </property> - <property name="whatsThis" > - <string><b>Status Options</b> -<p>Enter the options for the status command.</p></string> + <property name="whatsThis"> + <string><b>Status Options</b> +<p>Enter the options for the status command.</p></string> </property> </widget> </item> - <item row="6" column="0" > - <widget class="QLabel" name="diffLabel" > - <property name="text" > + <item row="6" column="0"> + <widget class="QLabel" name="diffLabel"> + <property name="text"> <string>&Diff Options:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>diffEdit</cstring> </property> </widget> </item> - <item row="0" column="0" > - <widget class="QLabel" name="globalLabel" > - <property name="text" > + <item row="0" column="0"> + <widget class="QLabel" name="globalLabel"> + <property name="text"> <string>&Global Options:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>globalEdit</cstring> </property> </widget> </item> - <item row="11" column="1" > - <widget class="QLineEdit" name="exportEdit" > - <property name="toolTip" > + <item row="11" column="1"> + <widget class="QLineEdit" name="exportEdit"> + <property name="toolTip"> <string>Enter the options for the export command.</string> </property> - <property name="whatsThis" > - <string><b>Export Options</b> -<p>Enter the options for the export command.</p></string> + <property name="whatsThis"> + <string><b>Export Options</b> +<p>Enter the options for the export command.</p></string> </property> </widget> </item> - <item row="4" column="1" > - <widget class="QLineEdit" name="addEdit" > - <property name="toolTip" > + <item row="4" column="1"> + <widget class="QLineEdit" name="addEdit"> + <property name="toolTip"> <string>Enter the options for the add command.</string> </property> - <property name="whatsThis" > - <string><b>Add Options</b> -<p>Enter the options for the add command.</p></string> + <property name="whatsThis"> + <string><b>Add Options</b> +<p>Enter the options for the add command.</p></string> </property> </widget> </item> - <item row="7" column="0" > - <widget class="QLabel" name="logLabel" > - <property name="text" > + <item row="7" column="0"> + <widget class="QLabel" name="logLabel"> + <property name="text"> <string>&Log Options:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>logEdit</cstring> </property> </widget> </item> - <item row="9" column="0" > - <widget class="QLabel" name="statusLabel" > - <property name="text" > + <item row="9" column="0"> + <widget class="QLabel" name="statusLabel"> + <property name="text"> <string>&StatusOptions:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>statusEdit</cstring> </property> </widget> </item> - <item row="5" column="1" > - <widget class="QLineEdit" name="removeEdit" > - <property name="toolTip" > + <item row="5" column="1"> + <widget class="QLineEdit" name="removeEdit"> + <property name="toolTip"> <string>Enter the options for the remove command.</string> </property> - <property name="whatsThis" > - <string><b>Remove Options</b> -<p>Enter the options for the remove command.</p></string> + <property name="whatsThis"> + <string><b>Remove Options</b> +<p>Enter the options for the remove command.</p></string> </property> </widget> </item> - <item row="2" column="1" > - <widget class="QLineEdit" name="checkoutEdit" > - <property name="toolTip" > + <item row="2" column="1"> + <widget class="QLineEdit" name="checkoutEdit"> + <property name="toolTip"> <string>Enter the options for the checkout command.</string> </property> - <property name="whatsThis" > - <string><b>Checkout Options</b> -<p>Enter the options for the checkout command.</p></string> + <property name="whatsThis"> + <string><b>Checkout Options</b> +<p>Enter the options for the checkout command.</p></string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="commitLabel" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="commitLabel"> + <property name="text"> <string>Co&mmit Options:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>commitEdit</cstring> </property> </widget> </item> - <item row="11" column="0" > - <widget class="QLabel" name="exportLabel" > - <property name="text" > + <item row="11" column="0"> + <widget class="QLabel" name="exportLabel"> + <property name="text"> <string>&Export Options:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>exportEdit</cstring> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QLabel" name="checkoutLabel" > - <property name="text" > + <item row="2" column="0"> + <widget class="QLabel" name="checkoutLabel"> + <property name="text"> <string>Check&out Options:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>checkoutEdit</cstring> </property> </widget> </item> - <item row="3" column="0" > - <widget class="QLabel" name="updateLabel" > - <property name="text" > + <item row="3" column="0"> + <widget class="QLabel" name="updateLabel"> + <property name="text"> <string>&Update Options:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>updateEdit</cstring> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QLineEdit" name="globalEdit" > - <property name="toolTip" > + <item row="0" column="1"> + <widget class="QLineEdit" name="globalEdit"> + <property name="toolTip"> <string>Enter the global options.</string> </property> - <property name="whatsThis" > - <string><b>Global Options</b> -<p>Enter the global options.</p></string> + <property name="whatsThis"> + <string><b>Global Options</b> +<p>Enter the global options.</p></string> </property> </widget> </item> </layout> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="6" /> + <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>globalEdit</tabstop> @@ -309,14 +310,14 @@ <connection> <sender>buttonBox</sender> <signal>accepted()</signal> - <receiver>vcsCommandOptionsDialog</receiver> + <receiver>VcsCommandOptionsDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>120</x> <y>390</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>120</x> <y>411</y> </hint> @@ -325,14 +326,14 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>vcsCommandOptionsDialog</receiver> + <receiver>VcsCommandOptionsDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>191</x> <y>390</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>193</x> <y>410</y> </hint>
--- a/VCS/ProjectBrowserHelper.py Sat Oct 19 12:28:12 2013 +0200 +++ b/VCS/ProjectBrowserHelper.py Sat Oct 19 13:03:39 2013 +0200 @@ -75,7 +75,7 @@ VCS status and the file status. @param menu reference to the menu to be shown - @param standardItems array of standard items that need + @param standardItems array of standard items that need activation/deactivation depending on the overall VCS status @exception RuntimeError to indicate that this method must be implemented by a subclass @@ -283,7 +283,7 @@ names = [itm.dirName() for itm in items] else: names = [itm.fileName() for itm in items] - files = [self.browser.project.getRelativePath(name) \ + files = [self.browser.project.getRelativePath(name) for name in names] dlg = DeleteFilesConfirmationDialog(
--- a/VCS/ProjectHelper.py Sat Oct 19 12:28:12 2013 +0200 +++ b/VCS/ProjectHelper.py Sat Oct 19 13:03:39 2013 +0200 @@ -176,8 +176,8 @@ self.trUtf8( """Would you like to edit the VCS command options?""")) if vcores: - from .CommandOptionsDialog import vcsCommandOptionsDialog - codlg = vcsCommandOptionsDialog(self.project.vcs) + from .CommandOptionsDialog import VcsCommandOptionsDialog + codlg = VcsCommandOptionsDialog(self.project.vcs) if codlg.exec_() == QDialog.Accepted: self.project.vcs.vcsSetOptions(codlg.getOptions()) @@ -355,8 +355,8 @@ self.trUtf8( """Would you like to edit the VCS command options?""")) if vcores: - from .CommandOptionsDialog import vcsCommandOptionsDialog - codlg = vcsCommandOptionsDialog(self.project.vcs) + from .CommandOptionsDialog import VcsCommandOptionsDialog + codlg = VcsCommandOptionsDialog(self.project.vcs) if codlg.exec_() == QDialog.Accepted: self.project.vcs.vcsSetOptions(codlg.getOptions()) self.project.setDirty(True) @@ -426,8 +426,8 @@ """ Protected slot to edit the VCS command options. """ - from .CommandOptionsDialog import vcsCommandOptionsDialog - codlg = vcsCommandOptionsDialog(self.vcs) + from .CommandOptionsDialog import VcsCommandOptionsDialog + codlg = VcsCommandOptionsDialog(self.vcs) if codlg.exec_() == QDialog.Accepted: self.vcs.vcsSetOptions(codlg.getOptions()) self.project.setDirty(True)
--- a/ViewManager/BookmarkedFilesDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/ViewManager/BookmarkedFilesDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -51,7 +51,7 @@ """ self.addButton.setEnabled(txt != "") self.changeButton.setEnabled( - txt != "" and \ + txt != "" and self.filesList.currentRow() != -1) def on_filesList_currentRowChanged(self, row):
--- a/ViewManager/ViewManager.py Sat Oct 19 12:28:12 2013 +0200 +++ b/ViewManager/ViewManager.py Sat Oct 19 13:03:39 2013 +0200 @@ -243,7 +243,7 @@ Public method to transfer statusbar info from the user interface to viewmanager. - @param sbLine reference to the line number part of the statusbar + @param sbLine reference to the line number part of the statusbar (QLabel) @param sbPos reference to the character position part of the statusbar (QLabel) @@ -2873,7 +2873,7 @@ 0, self.searchActGrp, 'vm_quicksearch_extend') self.quickSearchExtendAct.setStatusTip(QApplication.translate( - 'ViewManager', \ + 'ViewManager', 'Extend the quicksearch to the end of the current word')) self.quickSearchExtendAct.setWhatsThis(QApplication.translate( 'ViewManager', @@ -2988,7 +2988,7 @@ self.searchActGrp.setEnabled(False) self.searchFilesAct = E5Action( - QApplication.translate( 'ViewManager', 'Search in Files'), + QApplication.translate('ViewManager', 'Search in Files'), UI.PixmapCache.getIcon("projectFind.png"), QApplication.translate('ViewManager', 'Search in &Files...'), QKeySequence(QApplication.translate(
--- a/eric5.e4p Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5.e4p Sat Oct 19 13:03:39 2013 +0200 @@ -1929,7 +1929,7 @@ <string>ExcludeMessages</string> </key> <value> - <string>E24, D, W293, N802, N803, N807, N808, N821</string> + <string>E24, D, W293, N802, N803, N807, N808, N821,E12</string> </value> <key> <string>FixCodes</string>
--- a/eric5.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5.py Sat Oct 19 13:03:39 2013 +0200 @@ -28,7 +28,7 @@ # generate list of arguments to be remembered for a restart restartArgsList = ["--nosplash", "--plugin", "--debug", "--config"] -restartArgs = [arg for arg in sys.argv[1:] +restartArgs = [arg for arg in sys.argv[1:] if arg.split("=", 1)[0] in restartArgsList] if "--debug" in sys.argv: @@ -162,7 +162,7 @@ sys.excepthook = excepthook - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ("--debug", "activate debugging output to the console"),
--- a/eric5_compare.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_compare.py Sat Oct 19 13:03:39 2013 +0200 @@ -48,7 +48,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ]
--- a/eric5_configure.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_configure.py Sat Oct 19 13:03:39 2013 +0200 @@ -48,7 +48,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ]
--- a/eric5_diff.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_diff.py Sat Oct 19 13:03:39 2013 +0200 @@ -42,7 +42,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ]
--- a/eric5_doc.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_doc.py Sat Oct 19 13:03:39 2013 +0200 @@ -250,8 +250,8 @@ usage() if qtHelpCreation and \ - (qtHelpNamespace == "" or \ - qtHelpFolder == "" or '/' in qtHelpFolder or \ + (qtHelpNamespace == "" or + qtHelpFolder == "" or '/' in qtHelpFolder or qtHelpTitle == ""): usage()
--- a/eric5_editor.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_editor.py Sat Oct 19 13:03:39 2013 +0200 @@ -50,7 +50,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ("", "name of file to edit")
--- a/eric5_iconeditor.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_iconeditor.py Sat Oct 19 13:03:39 2013 +0200 @@ -49,7 +49,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ("", "name of file to edit")
--- a/eric5_plugininstall.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_plugininstall.py Sat Oct 19 13:03:39 2013 +0200 @@ -41,7 +41,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ("", "names of plugins to install")
--- a/eric5_pluginrepository.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_pluginrepository.py Sat Oct 19 13:03:39 2013 +0200 @@ -41,7 +41,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ]
--- a/eric5_pluginuninstall.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_pluginuninstall.py Sat Oct 19 13:03:39 2013 +0200 @@ -41,7 +41,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ]
--- a/eric5_qregexp.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_qregexp.py Sat Oct 19 13:03:39 2013 +0200 @@ -43,7 +43,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ]
--- a/eric5_qregularexpression.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_qregularexpression.py Sat Oct 19 13:03:39 2013 +0200 @@ -43,7 +43,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ]
--- a/eric5_re.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_re.py Sat Oct 19 13:03:39 2013 +0200 @@ -43,7 +43,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ]
--- a/eric5_snap.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_snap.py Sat Oct 19 13:03:39 2013 +0200 @@ -41,7 +41,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ]
--- a/eric5_sqlbrowser.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_sqlbrowser.py Sat Oct 19 13:03:39 2013 +0200 @@ -48,7 +48,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ]
--- a/eric5_tray.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_tray.py Sat Oct 19 13:03:39 2013 +0200 @@ -42,7 +42,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ]
--- a/eric5_trpreviewer.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_trpreviewer.py Sat Oct 19 13:03:39 2013 +0200 @@ -52,7 +52,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ]
--- a/eric5_uipreviewer.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_uipreviewer.py Sat Oct 19 13:03:39 2013 +0200 @@ -49,7 +49,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ]
--- a/eric5_unittest.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_unittest.py Sat Oct 19 13:03:39 2013 +0200 @@ -46,7 +46,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ]
--- a/eric5_webbrowser.py Sat Oct 19 12:28:12 2013 +0200 +++ b/eric5_webbrowser.py Sat Oct 19 13:03:39 2013 +0200 @@ -63,7 +63,7 @@ """ Main entry point into the application. """ - options = [\ + options = [ ("--config=configDir", "use the given directory as the one containing the config files"), ("--search=word", "search for the given word")
--- a/install.py Sat Oct 19 12:28:12 2013 +0200 +++ b/install.py Sat Oct 19 13:03:39 2013 +0200 @@ -99,10 +99,10 @@ print(" {0} [-chxz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]" " [-m name] [-p python]".format(progName)) elif sys.platform.startswith("win"): - print(" {0} [-chxz] [-a dir] [-b dir] [-d dir] [-f file]"\ + print(" {0} [-chxz] [-a dir] [-b dir] [-d dir] [-f file]" .format(progName)) else: - print(" {0} [-chxz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]"\ + print(" {0} [-chxz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]" .format(progName)) print("where:") print(" -h display this help message") @@ -923,13 +923,13 @@ min = int(min) pat = int(pat) if maj < 4 or (maj == 4 and min < 8): - print('Sorry, you must have PyQt 4.8.0 or higher or' \ + print('Sorry, you must have PyQt 4.8.0 or higher or' ' a recent snapshot release.') exit(4) # check for blacklisted versions for vers in BlackLists["PyQt4"] + PlatformBlackLists["PyQt4"]: if vers == pyqtVersion: - print('Sorry, PyQt4 version {0} is not compatible with eric5.'\ + print('Sorry, PyQt4 version {0} is not compatible with eric5.' .format(vers)) print('Please install another version.') exit(4) @@ -947,7 +947,7 @@ min = int(min) pat = int(pat) if maj < 2 or (maj == 2 and min < 6): - print('Sorry, you must have QScintilla 2.6.0 or higher or' \ + print('Sorry, you must have QScintilla 2.6.0 or higher or' ' a recent snapshot release.') exit(5) # check for blacklisted versions
