Mercurial Repositories > eric / changeset
changeset
Fixed a few PEP-8 related issues.
Sat, 22 Dec 2012 15:09:28 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 22 Dec 2012 15:09:28 +0100
- changeset 2280
- 8e85ca3fabe7
- parent 2279
- cbf90feec16f
- child 2281
- 0f04ae738a11
Fixed a few PEP-8 related issues.
--- a/Network/IRC/IrcChannelWidget.py Sat Dec 22 13:13:56 2012 +0100 +++ b/Network/IRC/IrcChannelWidget.py Sat Dec 22 15:09:28 2012 +0100 @@ -251,7 +251,7 @@ # :zelazny.freenode.net 332 foo_ #eric-ide :eric support channel (re.compile(r":.*\s332\s.*\s([^ ]+)\s:(.*)"), self.__setTopic), # :zelazny.freenode.net foo_ 333 #eric-ide foo 1353089020 - (re.compile(r":.*\s333\s.*\s([^ ]+)\s([^ ]+)\s(\d+)"), self.__topicCreated), + (re.compile(r":.*\s333\s.*\s([^ ]+)\s([^ ]+)\s(\d+)"), self.__topicCreated), # :cameron.freenode.net 352 detlev_ #eric-ide ~foo foohost.bar.net cameron.freenode.net foo_ H :0 Foo Bar (re.compile(r":.*\s352\s[^ ]+\s([^ ]+)\s([^ ]+)\s([^ ]+)\s[^ ]+\s([^ ]+)" r"\s([^ ]+)\s:\d+\s(.*)"), self.__whoEntry),
--- a/Network/IRC/IrcIdentitiesEditDialog.py Sat Dec 22 13:13:56 2012 +0100 +++ b/Network/IRC/IrcIdentitiesEditDialog.py Sat Dec 22 15:09:28 2012 +0100 @@ -302,7 +302,7 @@ inUse = False for networkName in self.__manager.getNetworkNames(): inUse = ( - self.__manager.getNetwork(networkName).getIdentityName() == + self.__manager.getNetwork(networkName).getIdentityName() == currentIdentity) if inUse: break @@ -317,7 +317,7 @@ res = E5MessageBox.yesNo(self, self.trUtf8("Delete Identity"), msg, - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if res: del self.__identities[currentIdentity] self.identitiesCombo.removeItem(
--- a/Network/IRC/IrcNetworkManager.py Sat Dec 22 13:13:56 2012 +0100 +++ b/Network/IRC/IrcNetworkManager.py Sat Dec 22 15:09:28 2012 +0100 @@ -440,7 +440,7 @@ """ Public method to check the auto join status. - @return flag indicating if the channel should be + @return flag indicating if the channel should be joined automatically (boolean) """ return self.__autoJoin @@ -449,7 +449,7 @@ """ Public method to set the auto join status of the channel. - @param enable flag indicating if the channel should be + @param enable flag indicating if the channel should be joined automatically (boolean) """ self.__autoJoin = enable @@ -914,7 +914,7 @@ @param newName new name of the identity (string) """ if oldName in self.__identities: - self.__identities[newName] = self.__identities[oldName] + self.__identities[newName] = self.__identities[oldName] del self.__identities[oldName] for network in self.__networks:
--- a/Network/IRC/IrcUtilities.py Sat Dec 22 13:13:56 2012 +0100 +++ b/Network/IRC/IrcUtilities.py Sat Dec 22 15:09:28 2012 +0100 @@ -23,6 +23,7 @@ r"""((?:\x03(?:0[0-9]|1[0-5]|[0-9])?(?:,(?:0[0-9]|1[0-5]|[0-9]))?)""" r"""|\x02|\x03|\x13|\x15|\x16|\x17|\x1d|\x1f)""") + def ircTimestamp(): """ Module method to generate a time stamp string. @@ -45,6 +46,7 @@ else: return "" + def ircFilter(msg): """ Module method to make the message HTML compliant and detect URLs. @@ -62,30 +64,30 @@ for part in parts: if part == "\x02": # bold if openTags and openTags[-1] == "b": - msgParts.append("</" + openTags.pop(-1) +">") + msgParts.append("</" + openTags.pop(-1) + ">") else: msgParts.append("<b>") openTags.append("b") elif part in ["\x03", "\x17"]: if Preferences.getIrc("EnableIrcColours"): if openTags and openTags[-1] == "span": - msgParts.append("</" + openTags.pop(-1) +">") + msgParts.append("</" + openTags.pop(-1) + ">") else: continue else: continue elif part == "\x0f": # reset while openTags: - msgParts.append("</" + openTags.pop(-1) +">") + msgParts.append("</" + openTags.pop(-1) + ">") elif part == "\x13": # strikethru if openTags and openTags[-1] == "s": - msgParts.append("</" + openTags.pop(-1) +">") + msgParts.append("</" + openTags.pop(-1) + ">") else: msgParts.append("<s>") openTags.append("s") elif part in ["\x15", "\x1f"]: # underline if openTags and openTags[-1] == "u": - msgParts.append("</" + openTags.pop(-1) +">") + msgParts.append("</" + openTags.pop(-1) + ">") else: msgParts.append("<u>") openTags.append("u") @@ -94,7 +96,7 @@ continue elif part == "\x1d": # italic if openTags and openTags[-1] == "i": - msgParts.append("</" + openTags.pop(-1) +">") + msgParts.append("</" + openTags.pop(-1) + ">") else: msgParts.append("<i>") openTags.append("i")
--- a/Network/IRC/IrcWidget.py Sat Dec 22 13:13:56 2012 +0100 +++ b/Network/IRC/IrcWidget.py Sat Dec 22 15:09:28 2012 +0100 @@ -344,7 +344,7 @@ """ Private slot handling the closing of a channel. - @param name name of the closed channel (string) + @param name name of the closed channel (string) """ for channel in self.__channelList: if channel.name() == name:
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Dec 22 13:13:56 2012 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Dec 22 15:09:28 2012 +0100 @@ -449,7 +449,7 @@ elif os.path.isfile(nam): editor = e5App().getObject("ViewManager").getOpenEditor(nam) if editor: - ok &= editor.checkDirty() + ok &= editor.checkDirty() if not ok: break @@ -458,7 +458,7 @@ self.trUtf8("Commit Changes"), self.trUtf8("""The commit affects files, that have unsaved""" """ changes. Shall the commit be continued?"""), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Sat Dec 22 13:13:56 2012 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Sat Dec 22 15:09:28 2012 +0100 @@ -513,7 +513,7 @@ elif os.path.isfile(nam): editor = e5App().getObject("ViewManager").getOpenEditor(nam) if editor: - ok &= editor.checkDirty() + ok &= editor.checkDirty() if not ok: break @@ -522,7 +522,7 @@ self.trUtf8("Commit Changes"), self.trUtf8("""The commit affects files, that have unsaved""" """ changes. Shall the commit be continued?"""), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Sat Dec 22 13:13:56 2012 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Sat Dec 22 15:09:28 2012 +0100 @@ -483,7 +483,7 @@ elif os.path.isfile(nam): editor = e5App().getObject("ViewManager").getOpenEditor(nam) if editor: - ok &= editor.checkDirty() + ok &= editor.checkDirty() if not ok: break @@ -492,7 +492,7 @@ self.trUtf8("Commit Changes"), self.trUtf8("""The commit affects files, that have unsaved""" """ changes. Shall the commit be continued?"""), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return
--- a/Preferences/ConfigurationPages/NotificationsPage.py Sat Dec 22 13:13:56 2012 +0100 +++ b/Preferences/ConfigurationPages/NotificationsPage.py Sat Dec 22 15:09:28 2012 +0100 @@ -34,7 +34,7 @@ self.setObjectName("NotificationsPage") minX, maxX = self.xSpinBox.maximum(), self.xSpinBox.minimum() - minY, maxY = self.ySpinBox.maximum(), self.ySpinBox.minimum() + minY, maxY = self.ySpinBox.maximum(), self.ySpinBox.minimum() desk = QApplication.desktop() for screen in range(desk.screenCount()): geom = desk.availableGeometry(screen)
--- a/QScintilla/SpellChecker.py Sat Dec 22 13:13:56 2012 +0100 +++ b/QScintilla/SpellChecker.py Sat Dec 22 15:09:28 2012 +0100 @@ -88,7 +88,7 @@ """ Class method to get the default path names of the user dictionaries. - @param isException flag indicating to return the name of the default + @param isException flag indicating to return the name of the default exception dictionary (boolean) @return file name of the default user dictionary or the default user exception dictionary (string)
--- a/ViewManager/ViewManager.py Sat Dec 22 13:13:56 2012 +0100 +++ b/ViewManager/ViewManager.py Sat Dec 22 15:09:28 2012 +0100 @@ -5428,7 +5428,7 @@ fileInfo = dictionaryFile if len(dictionaryFile) < 40 \ else "...{0}".format(dictionaryFile[-40:]) dlg = SpellingDictionaryEditDialog(data, - QApplication.translate('ViewManager', "Editing {0}").format(fileInfo), + QApplication.translate('ViewManager', "Editing {0}").format(fileInfo), self.ui) if dlg.exec_() == QDialog.Accepted: data = dlg.getData()
