Mercurial Repositories > eric / changeset
changeset
Fixed PEP-8 related issues.
Wed, 25 May 2011 19:51:32 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 25 May 2011 19:51:32 +0200
- changeset 1061
- 3e21869872e3
- parent 1059
- 700df567f70b
- child 1062
- 941a53b019c3
Fixed PEP-8 related issues.
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py Wed May 25 08:35:20 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py Wed May 25 19:51:32 2011 +0200 @@ -207,7 +207,7 @@ def __hgBookmarksList(self): """ - Private slot used to list the bookmarks. + Private slot used to list the bookmarks. """ self.vcs.getExtensionObject("bookmarks")\ .hgListBookmarks(self.project.getProjectPath())
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py Wed May 25 08:35:20 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py Wed May 25 19:51:32 2011 +0200 @@ -104,7 +104,7 @@ if repodir == os.sep: return - dlg = HgBookmarkDialog(HgBookmarkDialog.DEFINE_MODE, + dlg = HgBookmarkDialog(HgBookmarkDialog.DEFINE_MODE, self.vcs.hgGetTagsList(repodir), self.vcs.hgGetBranchesList(repodir), self.hgGetBookmarksList(repodir)) @@ -194,7 +194,7 @@ if repodir == os.sep: return - dlg = HgBookmarkDialog(HgBookmarkDialog.MOVE_MODE, + dlg = HgBookmarkDialog(HgBookmarkDialog.MOVE_MODE, self.vcs.hgGetTagsList(repodir), self.vcs.hgGetBranchesList(repodir), self.hgGetBookmarksList(repodir))
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Wed May 25 08:35:20 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Wed May 25 19:51:32 2011 +0200 @@ -776,7 +776,7 @@ if len(log) > 1: self.__generateLogItem(log["author"], log["date"], log["message"], log["revision"], changedPaths, - log["parents"], log["branches"], log["tags"], + log["parents"], log["branches"], log["tags"], log["bookmarks"]) dt = QDate.fromString(log["date"], Qt.ISODate) if not self.__maxDate.isValid() and \
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Wed May 25 08:35:20 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Wed May 25 19:51:32 2011 +0200 @@ -42,8 +42,8 @@ # instantiate the extensions self.__extensions = { - "bookmarks" : BookmarksProjectHelper(), - "mq" : QueuesProjectHelper(), + "bookmarks": BookmarksProjectHelper(), + "mq": QueuesProjectHelper(), } def setObjects(self, vcsObject, projectObject):
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Wed May 25 08:35:20 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Wed May 25 19:51:32 2011 +0200 @@ -63,7 +63,6 @@ if repodir == os.sep: return - ioEncoding = Preferences.getSystem("IOEncoding") process = QProcess() args = []
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Wed May 25 08:35:20 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Wed May 25 19:51:32 2011 +0200 @@ -122,10 +122,10 @@ (boolean, boolean, string)) """ userData = (self.userGroup.isChecked(), - self.currentUserCheckBox.isChecked(), + self.currentUserCheckBox.isChecked(), self.userEdit.text()) - dateData = (self.dateGroup.isChecked(), - self.currentDateCheckBox.isChecked(), + dateData = (self.dateGroup.isChecked(), + self.currentDateCheckBox.isChecked(), self.dateTimeEdit.dateTime().toString("yyyy-MM-dd hh:mm")) - return (self.nameEdit.text(), self.messageEdit.toPlainText(), + return (self.nameEdit.text(), self.messageEdit.toPlainText(), userData, dateData)
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Wed May 25 08:35:20 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Wed May 25 19:51:32 2011 +0200 @@ -664,141 +664,141 @@ def __hgQueueNewPatch(self): """ - Private slot used to create a new named patch. + Private slot used to create a new named patch. """ self.vcs.getExtensionObject("mq")\ .hgQueueNewPatch(self.project.getProjectPath()) def __hgQueueRefreshPatch(self): """ - Private slot used to refresh the current patch. + Private slot used to refresh the current patch. """ self.vcs.getExtensionObject("mq")\ .hgQueueRefreshPatch(self.project.getProjectPath()) def __hgQueueRefreshPatchMessage(self): """ - Private slot used to refresh the current patch and it's commit message. + Private slot used to refresh the current patch and it's commit message. """ self.vcs.getExtensionObject("mq")\ .hgQueueRefreshPatch(self.project.getProjectPath(), editMessage=True) def __hgQueueShowPatch(self): """ - Private slot used to show the contents of the current patch. + Private slot used to show the contents of the current patch. """ self.vcs.getExtensionObject("mq")\ .hgQueueShowPatch(self.project.getProjectPath()) def __hgQueueShowHeader(self): """ - Private slot used to show the commit message of the current patch. + Private slot used to show the commit message of the current patch. """ self.vcs.getExtensionObject("mq")\ .hgQueueShowHeader(self.project.getProjectPath()) def __hgQueuePushPatch(self): """ - Private slot used to push the next patch onto the stack. + Private slot used to push the next patch onto the stack. """ self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(self.project.getProjectPath(), + .hgQueuePushPopPatches(self.project.getProjectPath(), operation=Queues.PUSH, all=False, named=False) def __hgQueuePushPatchForced(self): """ Private slot used to push the next patch onto the stack on top - of local changes. + of local changes. """ self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(self.project.getProjectPath(), + .hgQueuePushPopPatches(self.project.getProjectPath(), operation=Queues.PUSH, all=False, named=False, force=True) def __hgQueuePushAllPatches(self): """ - Private slot used to push all patches onto the stack. + Private slot used to push all patches onto the stack. """ self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(self.project.getProjectPath(), + .hgQueuePushPopPatches(self.project.getProjectPath(), operation=Queues.PUSH, all=True, named=False) def __hgQueuePushAllPatchesForced(self): """ Private slot used to push all patches onto the stack on top - of local changes. + of local changes. """ self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(self.project.getProjectPath(), + .hgQueuePushPopPatches(self.project.getProjectPath(), operation=Queues.PUSH, all=True, named=False, force=True) def __hgQueuePushPatches(self): """ Private slot used to push patches onto the stack until a named - one is at the top. + one is at the top. """ self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(self.project.getProjectPath(), + .hgQueuePushPopPatches(self.project.getProjectPath(), operation=Queues.PUSH, all=False, named=True) def __hgQueuePushPatchesForced(self): """ Private slot used to push patches onto the stack until a named - one is at the top on top of local changes. + one is at the top on top of local changes. """ self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(self.project.getProjectPath(), + .hgQueuePushPopPatches(self.project.getProjectPath(), operation=Queues.PUSH, all=False, named=True, force=True) def __hgQueuePopPatch(self): """ - Private slot used to pop the current patch off the stack. + Private slot used to pop the current patch off the stack. """ self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(self.project.getProjectPath(), + .hgQueuePushPopPatches(self.project.getProjectPath(), operation=Queues.POP, all=False, named=False) def __hgQueuePopPatchForced(self): """ Private slot used to pop the current patch off the stack forgetting - any local changes to patched files. + any local changes to patched files. """ self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(self.project.getProjectPath(), + .hgQueuePushPopPatches(self.project.getProjectPath(), operation=Queues.POP, all=False, named=False, force=True) def __hgQueuePopAllPatches(self): """ - Private slot used to pop all patches off the stack. + Private slot used to pop all patches off the stack. """ self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(self.project.getProjectPath(), + .hgQueuePushPopPatches(self.project.getProjectPath(), operation=Queues.POP, all=True, named=False) def __hgQueuePopAllPatchesForced(self): """ Private slot used to pop all patches off the stack forgetting - any local changes to patched files. + any local changes to patched files. """ self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(self.project.getProjectPath(), + .hgQueuePushPopPatches(self.project.getProjectPath(), operation=Queues.POP, all=True, named=False, force=True) def __hgQueuePopPatches(self): """ Private slot used to pop patches off the stack until a named - one is at the top. + one is at the top. """ self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(self.project.getProjectPath(), + .hgQueuePushPopPatches(self.project.getProjectPath(), operation=Queues.POP, all=False, named=True) def __hgQueuePopPatchesForced(self): """ Private slot used to pop patches off the stack until a named - one is at the top forgetting any local changes to patched files. + one is at the top forgetting any local changes to patched files. """ self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(self.project.getProjectPath(), + .hgQueuePushPopPatches(self.project.getProjectPath(), operation=Queues.POP, all=False, named=True, force=True) def __hgQueueGotoPatch(self): @@ -807,7 +807,7 @@ is at the top of the stack. """ self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(self.project.getProjectPath(), + .hgQueuePushPopPatches(self.project.getProjectPath(), operation=Queues.GOTO, all=False, named=True) def __hgQueueGotoPatchForced(self): @@ -816,7 +816,7 @@ is at the top of the stack overwriting local changes. """ self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(self.project.getProjectPath(), + .hgQueuePushPopPatches(self.project.getProjectPath(), operation=Queues.GOTO, all=False, named=True, force=True) def __hgQueueListPatches(self):
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Wed May 25 08:35:20 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Wed May 25 19:51:32 2011 +0200 @@ -723,7 +723,7 @@ title = self.trUtf8("Create New Queue") else: title = self.trUtf8("Rename Active Queue") - dlg = HgQueuesQueueManagementDialog(HgQueuesQueueManagementDialog.NAME_INPUT, + dlg = HgQueuesQueueManagementDialog(HgQueuesQueueManagementDialog.NAME_INPUT, title, False, repodir) if dlg.exec_() == QDialog.Accepted: queueName = dlg.getData() @@ -786,7 +786,7 @@ else: raise ValueError("illegal value for operation") - dlg = HgQueuesQueueManagementDialog(HgQueuesQueueManagementDialog.QUEUE_INPUT, + dlg = HgQueuesQueueManagementDialog(HgQueuesQueueManagementDialog.QUEUE_INPUT, title, True, repodir) if dlg.exec_() == QDialog.Accepted: queueName = dlg.getData() @@ -840,6 +840,6 @@ self.queuesListQueuesDialog = HgQueuesQueueManagementDialog( HgQueuesQueueManagementDialog.NO_INPUT, - self.trUtf8("Available Queues"), + self.trUtf8("Available Queues"), False, repodir) self.queuesListQueuesDialog.show()
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Wed May 25 08:35:20 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Wed May 25 19:51:32 2011 +0200 @@ -134,8 +134,8 @@ # instantiate the extensions self.__extensions = { - "bookmarks" : Bookmarks(self), - "mq" : Queues(self), + "bookmarks": Bookmarks(self), + "mq": Queues(self), } def getPlugin(self): @@ -830,7 +830,7 @@ else: bookmarksList = None dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir), - self.hgGetBranchesList(repodir), + self.hgGetBranchesList(repodir), bookmarksList) if dlg.exec_() == QDialog.Accepted: rev = dlg.getRevision() @@ -2259,7 +2259,7 @@ def getExtensionObject(self, extensionName): """ - Public method to get a reference to an extension object. + Public method to get a reference to an extension object. @param extensionName name of the extension (string) @return reference to the extension object (boolean)
--- a/Preferences/ConfigurationPages/EmailPage.py Wed May 25 08:35:20 2011 +0200 +++ b/Preferences/ConfigurationPages/EmailPage.py Wed May 25 19:51:32 2011 +0200 @@ -116,7 +116,7 @@ QApplication.processEvents() try: server = smtplib.SMTP(self.mailServerEdit.text(), - self.portSpin.value(), + self.portSpin.value(), "", 10) if self.useTlsCheckBox.isChecked(): server.starttls() @@ -157,6 +157,7 @@ self.trUtf8("""<p>The login test failed.<br>Reason: {0}</p>""") .format(errorStr)) + def create(dlg): """ Module function to create the configuration page.
