Mercurial Repositories > eric / changeset
changeset
Fixed a bunch of indentation issues.
Sat, 19 Oct 2013 16:51:12 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 19 Oct 2013 16:51:12 +0200
- changeset 3038
- 7fe9a53280bd
- parent 3037
- a417a0670a36
- child 3039
- 8dd0165d805d
Fixed a bunch of indentation issues.
--- a/Preferences/ConfigurationDialog.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ConfigurationDialog.py Sat Oct 19 16:51:12 2013 +0200 @@ -119,193 +119,192 @@ # create the configuration page. This must have the method # save to save the settings. "applicationPage": - [self.trUtf8("Application"), "preferences-application.png", - "ApplicationPage", None, None], + [self.trUtf8("Application"), "preferences-application.png", + "ApplicationPage", None, None], "cooperationPage": - [self.trUtf8("Cooperation"), "preferences-cooperation.png", - "CooperationPage", None, None], + [self.trUtf8("Cooperation"), "preferences-cooperation.png", + "CooperationPage", None, None], "corbaPage": - [self.trUtf8("CORBA"), "preferences-orbit.png", - "CorbaPage", None, None], + [self.trUtf8("CORBA"), "preferences-orbit.png", + "CorbaPage", None, None], "emailPage": - [self.trUtf8("Email"), "preferences-mail_generic.png", - "EmailPage", None, None], + [self.trUtf8("Email"), "preferences-mail_generic.png", + "EmailPage", None, None], "graphicsPage": - [self.trUtf8("Graphics"), "preferences-graphics.png", - "GraphicsPage", None, None], + [self.trUtf8("Graphics"), "preferences-graphics.png", + "GraphicsPage", None, None], "iconsPage": - [self.trUtf8("Icons"), "preferences-icons.png", - "IconsPage", None, None], + [self.trUtf8("Icons"), "preferences-icons.png", + "IconsPage", None, None], "ircPage": - [self.trUtf8("IRC"), "irc.png", - "IrcPage", None, None], + [self.trUtf8("IRC"), "irc.png", + "IrcPage", None, None], "networkPage": - [self.trUtf8("Network"), "preferences-network.png", - "NetworkPage", None, None], + [self.trUtf8("Network"), "preferences-network.png", + "NetworkPage", None, None], "notificationsPage": - [self.trUtf8("Notifications"), - "preferences-notifications.png", - "NotificationsPage", None, None], + [self.trUtf8("Notifications"), + "preferences-notifications.png", + "NotificationsPage", None, None], "pluginManagerPage": - [self.trUtf8("Plugin Manager"), - "preferences-pluginmanager.png", - "PluginManagerPage", None, None], + [self.trUtf8("Plugin Manager"), + "preferences-pluginmanager.png", + "PluginManagerPage", None, None], "printerPage": - [self.trUtf8("Printer"), "preferences-printer.png", - "PrinterPage", None, None], + [self.trUtf8("Printer"), "preferences-printer.png", + "PrinterPage", None, None], "pythonPage": - [self.trUtf8("Python"), "preferences-python.png", - "PythonPage", None, None], + [self.trUtf8("Python"), "preferences-python.png", + "PythonPage", None, None], "qtPage": - [self.trUtf8("Qt"), "preferences-qtlogo.png", - "QtPage", None, None], + [self.trUtf8("Qt"), "preferences-qtlogo.png", + "QtPage", None, None], "securityPage": - [self.trUtf8("Security"), "preferences-security.png", - "SecurityPage", None, None], + [self.trUtf8("Security"), "preferences-security.png", + "SecurityPage", None, None], "shellPage": - [self.trUtf8("Shell"), "preferences-shell.png", - "ShellPage", None, None], + [self.trUtf8("Shell"), "preferences-shell.png", + "ShellPage", None, None], "tasksPage": - [self.trUtf8("Tasks"), "task.png", - "TasksPage", None, None], + [self.trUtf8("Tasks"), "task.png", + "TasksPage", None, None], "templatesPage": - [self.trUtf8("Templates"), "preferences-template.png", - "TemplatesPage", None, None], + [self.trUtf8("Templates"), "preferences-template.png", + "TemplatesPage", None, None], "trayStarterPage": - [self.trUtf8("Tray Starter"), "erict.png", - "TrayStarterPage", None, None], + [self.trUtf8("Tray Starter"), "erict.png", + "TrayStarterPage", None, None], "vcsPage": - [self.trUtf8("Version Control Systems"), - "preferences-vcs.png", - "VcsPage", None, None], + [self.trUtf8("Version Control Systems"), + "preferences-vcs.png", + "VcsPage", None, None], "0debuggerPage": - [self.trUtf8("Debugger"), "preferences-debugger.png", - None, None, None], + [self.trUtf8("Debugger"), "preferences-debugger.png", + None, None, None], "debuggerGeneralPage": - [self.trUtf8("General"), "preferences-debugger.png", - "DebuggerGeneralPage", "0debuggerPage", None], + [self.trUtf8("General"), "preferences-debugger.png", + "DebuggerGeneralPage", "0debuggerPage", None], "debuggerPythonPage": - [self.trUtf8("Python"), "preferences-pyDebugger.png", - "DebuggerPythonPage", "0debuggerPage", None], + [self.trUtf8("Python"), "preferences-pyDebugger.png", + "DebuggerPythonPage", "0debuggerPage", None], "debuggerPython3Page": - [self.trUtf8("Python3"), "preferences-pyDebugger.png", - "DebuggerPython3Page", "0debuggerPage", None], + [self.trUtf8("Python3"), "preferences-pyDebugger.png", + "DebuggerPython3Page", "0debuggerPage", None], "debuggerRubyPage": - [self.trUtf8("Ruby"), "preferences-rbDebugger.png", - "DebuggerRubyPage", "0debuggerPage", None], + [self.trUtf8("Ruby"), "preferences-rbDebugger.png", + "DebuggerRubyPage", "0debuggerPage", None], "0editorPage": - [self.trUtf8("Editor"), "preferences-editor.png", - None, None, None], + [self.trUtf8("Editor"), "preferences-editor.png", + None, None, None], "editorAPIsPage": - [self.trUtf8("APIs"), "preferences-api.png", - "EditorAPIsPage", "0editorPage", None], + [self.trUtf8("APIs"), "preferences-api.png", + "EditorAPIsPage", "0editorPage", None], "editorAutocompletionPage": - [self.trUtf8("Autocompletion"), - "preferences-autocompletion.png", - "EditorAutocompletionPage", "0editorPage", None], + [self.trUtf8("Autocompletion"), + "preferences-autocompletion.png", + "EditorAutocompletionPage", "0editorPage", None], "editorAutocompletionQScintillaPage": - [self.trUtf8("QScintilla"), "qscintilla.png", - "EditorAutocompletionQScintillaPage", - "editorAutocompletionPage", None], + [self.trUtf8("QScintilla"), "qscintilla.png", + "EditorAutocompletionQScintillaPage", + "editorAutocompletionPage", None], "editorCalltipsPage": - [self.trUtf8("Calltips"), "preferences-calltips.png", - "EditorCalltipsPage", "0editorPage", None], + [self.trUtf8("Calltips"), "preferences-calltips.png", + "EditorCalltipsPage", "0editorPage", None], "editorCalltipsQScintillaPage": - [self.trUtf8("QScintilla"), "qscintilla.png", - "EditorCalltipsQScintillaPage", "editorCalltipsPage", - None], + [self.trUtf8("QScintilla"), "qscintilla.png", + "EditorCalltipsQScintillaPage", "editorCalltipsPage", None], "editorGeneralPage": - [self.trUtf8("General"), "preferences-general.png", - "EditorGeneralPage", "0editorPage", None], + [self.trUtf8("General"), "preferences-general.png", + "EditorGeneralPage", "0editorPage", None], "editorFilePage": - [self.trUtf8("Filehandling"), - "preferences-filehandling.png", - "EditorFilePage", "0editorPage", None], + [self.trUtf8("Filehandling"), + "preferences-filehandling.png", + "EditorFilePage", "0editorPage", None], "editorSearchPage": - [self.trUtf8("Searching"), "preferences-search.png", - "EditorSearchPage", "0editorPage", None], + [self.trUtf8("Searching"), "preferences-search.png", + "EditorSearchPage", "0editorPage", None], "editorSpellCheckingPage": - [self.trUtf8("Spell checking"), - "preferences-spellchecking.png", - "EditorSpellCheckingPage", "0editorPage", None], + [self.trUtf8("Spell checking"), + "preferences-spellchecking.png", + "EditorSpellCheckingPage", "0editorPage", None], "editorStylesPage": - [self.trUtf8("Style"), "preferences-styles.png", - "EditorStylesPage", "0editorPage", None], + [self.trUtf8("Style"), "preferences-styles.png", + "EditorStylesPage", "0editorPage", None], "editorSyntaxPage": - [self.trUtf8("Code Checkers"), "preferences-debugger.png", - "EditorSyntaxPage", "0editorPage", None], + [self.trUtf8("Code Checkers"), "preferences-debugger.png", + "EditorSyntaxPage", "0editorPage", None], "editorTypingPage": - [self.trUtf8("Typing"), "preferences-typing.png", - "EditorTypingPage", "0editorPage", None], + [self.trUtf8("Typing"), "preferences-typing.png", + "EditorTypingPage", "0editorPage", None], "editorExportersPage": - [self.trUtf8("Exporters"), "preferences-exporters.png", - "EditorExportersPage", "0editorPage", None], + [self.trUtf8("Exporters"), "preferences-exporters.png", + "EditorExportersPage", "0editorPage", None], "1editorLexerPage": - [self.trUtf8("Highlighters"), - "preferences-highlighting-styles.png", - None, "0editorPage", None], + [self.trUtf8("Highlighters"), + "preferences-highlighting-styles.png", + None, "0editorPage", None], "editorHighlightersPage": - [self.trUtf8("Filetype Associations"), - "preferences-highlighter-association.png", - "EditorHighlightersPage", "1editorLexerPage", None], + [self.trUtf8("Filetype Associations"), + "preferences-highlighter-association.png", + "EditorHighlightersPage", "1editorLexerPage", None], "editorHighlightingStylesPage": - [self.trUtf8("Styles"), - "preferences-highlighting-styles.png", - "EditorHighlightingStylesPage", "1editorLexerPage", None], + [self.trUtf8("Styles"), + "preferences-highlighting-styles.png", + "EditorHighlightingStylesPage", "1editorLexerPage", None], "editorKeywordsPage": - [self.trUtf8("Keywords"), "preferences-keywords.png", - "EditorKeywordsPage", "1editorLexerPage", None], + [self.trUtf8("Keywords"), "preferences-keywords.png", + "EditorKeywordsPage", "1editorLexerPage", None], "editorPropertiesPage": - [self.trUtf8("Properties"), "preferences-properties.png", - "EditorPropertiesPage", "1editorLexerPage", None], + [self.trUtf8("Properties"), "preferences-properties.png", + "EditorPropertiesPage", "1editorLexerPage", None], "0helpPage": - [self.trUtf8("Help"), "preferences-help.png", - None, None, None], + [self.trUtf8("Help"), "preferences-help.png", + None, None, None], "helpAppearancePage": - [self.trUtf8("Appearance"), "preferences-styles.png", - "HelpAppearancePage", "0helpPage", None], + [self.trUtf8("Appearance"), "preferences-styles.png", + "HelpAppearancePage", "0helpPage", None], "helpDocumentationPage": - [self.trUtf8("Help Documentation"), - "preferences-helpdocumentation.png", - "HelpDocumentationPage", "0helpPage", None], + [self.trUtf8("Help Documentation"), + "preferences-helpdocumentation.png", + "HelpDocumentationPage", "0helpPage", None], "helpViewersPage": - [self.trUtf8("Help Viewers"), - "preferences-helpviewers.png", - "HelpViewersPage", "0helpPage", None], + [self.trUtf8("Help Viewers"), + "preferences-helpviewers.png", + "HelpViewersPage", "0helpPage", None], "helpVirusTotalPage": - [self.trUtf8("VirusTotal Interface"), "virustotal.png", - "HelpVirusTotalPage", "0helpPage", None], + [self.trUtf8("VirusTotal Interface"), "virustotal.png", + "HelpVirusTotalPage", "0helpPage", None], "helpWebBrowserPage": - [self.trUtf8("eric5 Web Browser"), "ericWeb.png", - "HelpWebBrowserPage", "0helpPage", None], + [self.trUtf8("eric5 Web Browser"), "ericWeb.png", + "HelpWebBrowserPage", "0helpPage", None], "0projectPage": - [self.trUtf8("Project"), "preferences-project.png", - None, None, None], + [self.trUtf8("Project"), "preferences-project.png", + None, None, None], "projectBrowserPage": - [self.trUtf8("Project Viewer"), "preferences-project.png", - "ProjectBrowserPage", "0projectPage", None], + [self.trUtf8("Project Viewer"), "preferences-project.png", + "ProjectBrowserPage", "0projectPage", None], "projectPage": - [self.trUtf8("Project"), "preferences-project.png", - "ProjectPage", "0projectPage", None], + [self.trUtf8("Project"), "preferences-project.png", + "ProjectPage", "0projectPage", None], "multiProjectPage": - [self.trUtf8("Multiproject"), - "preferences-multiproject.png", - "MultiProjectPage", "0projectPage", None], + [self.trUtf8("Multiproject"), + "preferences-multiproject.png", + "MultiProjectPage", "0projectPage", None], "0interfacePage": - [self.trUtf8("Interface"), "preferences-interface.png", - None, None, None], + [self.trUtf8("Interface"), "preferences-interface.png", + None, None, None], "interfacePage": - [self.trUtf8("Interface"), "preferences-interface.png", - "InterfacePage", "0interfacePage", None], + [self.trUtf8("Interface"), "preferences-interface.png", + "InterfacePage", "0interfacePage", None], "viewmanagerPage": - [self.trUtf8("Viewmanager"), "preferences-viewmanager.png", - "ViewmanagerPage", "0interfacePage", None], + [self.trUtf8("Viewmanager"), "preferences-viewmanager.png", + "ViewmanagerPage", "0interfacePage", None], } self.configItems.update( @@ -319,34 +318,34 @@ # create the configuration page. This must have the method # save to save the settings. "interfacePage": - [self.trUtf8("Interface"), "preferences-interface.png", - "HelpInterfacePage", None, None], + [self.trUtf8("Interface"), "preferences-interface.png", + "HelpInterfacePage", None, None], "networkPage": - [self.trUtf8("Network"), "preferences-network.png", - "NetworkPage", None, None], + [self.trUtf8("Network"), "preferences-network.png", + "NetworkPage", None, None], "printerPage": - [self.trUtf8("Printer"), "preferences-printer.png", - "PrinterPage", None, None], + [self.trUtf8("Printer"), "preferences-printer.png", + "PrinterPage", None, None], "securityPage": - [self.trUtf8("Security"), "preferences-security.png", - "SecurityPage", None, None], + [self.trUtf8("Security"), "preferences-security.png", + "SecurityPage", None, None], "0helpPage": - [self.trUtf8("Help"), "preferences-help.png", - None, None, None], + [self.trUtf8("Help"), "preferences-help.png", + None, None, None], "helpAppearancePage": - [self.trUtf8("Appearance"), "preferences-styles.png", - "HelpAppearancePage", "0helpPage", None], + [self.trUtf8("Appearance"), "preferences-styles.png", + "HelpAppearancePage", "0helpPage", None], "helpDocumentationPage": - [self.trUtf8("Help Documentation"), - "preferences-helpdocumentation.png", - "HelpDocumentationPage", "0helpPage", None], + [self.trUtf8("Help Documentation"), + "preferences-helpdocumentation.png", + "HelpDocumentationPage", "0helpPage", None], "helpVirusTotalPage": - [self.trUtf8("VirusTotal Interface"), "virustotal.png", - "HelpVirusTotalPage", "0helpPage", None], + [self.trUtf8("VirusTotal Interface"), "virustotal.png", + "HelpVirusTotalPage", "0helpPage", None], "helpWebBrowserPage": - [self.trUtf8("eric5 Web Browser"), "ericWeb.png", - "HelpWebBrowserPage", "0helpPage", None], + [self.trUtf8("eric5 Web Browser"), "ericWeb.png", + "HelpWebBrowserPage", "0helpPage", None], } elif displayMode == ConfigurationWidget.TrayStarterMode: self.configItems = { @@ -357,8 +356,8 @@ # create the configuration page. This must have the method # save to save the settings. "trayStarterPage": - [self.trUtf8("Tray Starter"), "erict.png", - "TrayStarterPage", None, None], + [self.trUtf8("Tray Starter"), "erict.png", + "TrayStarterPage", None, None], } else: raise RuntimeError("Illegal mode value: {0}".format(displayMode))
--- a/Preferences/ConfigurationPages/CooperationPage.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ConfigurationPages/CooperationPage.py Sat Oct 19 16:51:12 2013 +0200 @@ -92,7 +92,7 @@ """ self.addBannedUserButton.setEnabled( self.__bannedUserValidator.validate(txt, len(txt))[0] == - QValidator.Acceptable) + QValidator.Acceptable) @pyqtSlot() def on_deleteBannedUsersButton_clicked(self):
--- a/Preferences/ConfigurationPages/DebuggerGeneralPage.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ConfigurationPages/DebuggerGeneralPage.py Sat Oct 19 16:51:12 2013 +0200 @@ -253,7 +253,7 @@ """<p>The entered address <b>{0}</b> is not""" """ a valid IP v4 or IP v6 address.""" """ Aborting...</p>""") - .format(allowedHost)) + .format(allowedHost)) @pyqtSlot() def on_deleteAllowedHostButton_clicked(self): @@ -286,7 +286,7 @@ """<p>The entered address <b>{0}</b> is not""" """ a valid IP v4 or IP v6 address.""" """ Aborting...</p>""") - .format(allowedHost)) + .format(allowedHost)) def create(dlg):
--- a/Preferences/ConfigurationPages/EditorAPIsPage.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorAPIsPage.py Sat Oct 19 16:51:12 2013 +0200 @@ -110,7 +110,7 @@ self.addPluginApiFileButton.setEnabled( len(self.pluginManager.getPluginApiFiles(self.currentApiLanguage)) - > 0) + > 0) def __editorGetApisFromApiList(self): """ @@ -179,7 +179,7 @@ if ok: self.apiList.addItem(Utilities.toNativeSeparators( QFileInfo(QDir(installedAPIFilesPath), file) - .absoluteFilePath())) + .absoluteFilePath())) else: E5MessageBox.warning( self,
--- a/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py Sat Oct 19 16:51:12 2013 +0200 @@ -17,7 +17,7 @@ class EditorAutocompletionQScintillaPage( - ConfigurationPageBase, Ui_EditorAutocompletionQScintillaPage): + ConfigurationPageBase, Ui_EditorAutocompletionQScintillaPage): """ Class implementing the QScintilla Autocompletion configuration page. """
--- a/Preferences/ConfigurationPages/EditorFilePage.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorFilePage.py Sat Oct 19 16:51:12 2013 +0200 @@ -204,7 +204,7 @@ self.trUtf8("Add File Filter"), self.trUtf8("""A Save File Filter must contain exactly one""" """ wildcard pattern. Yours contains {0}.""") - .format(filter.count("*"))) + .format(filter.count("*"))) return False if filter.count("*") == 0:
--- a/Preferences/ConfigurationPages/EditorHighlightersPage.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorHighlightersPage.py Sat Oct 19 16:51:12 2013 +0200 @@ -67,7 +67,7 @@ """ lexerAssocs = {} for index in range( - self.editorLexerList.topLevelItemCount()): + self.editorLexerList.topLevelItemCount()): itm = self.editorLexerList.topLevelItem(index) lexerAssocs[itm.text(0)] = itm.text(1) Preferences.setEditorLexerAssocs(lexerAssocs)
--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Sat Oct 19 16:51:12 2013 +0200 @@ -9,7 +9,7 @@ from PyQt4.QtCore import pyqtSlot, QFileInfo, QFile, QIODevice from PyQt4.QtGui import QPalette, QColorDialog, QFontDialog, \ - QInputDialog, QFont, QMenu + QInputDialog, QFont, QMenu from .ConfigurationPageBase import ConfigurationPageBase from .Ui_EditorHighlightingStylesPage import Ui_EditorHighlightingStylesPage @@ -404,7 +404,7 @@ self.trUtf8( """<p>The highlighting styles could not be exported""" """ to file <b>{0}</b>.</p><p>Reason: {1}</p>""") - .format(fn, f.errorString()) + .format(fn, f.errorString()) ) def __importStyles(self, lexers): @@ -436,7 +436,7 @@ self.trUtf8( """<p>The highlighting styles could not be read""" """ from file <b>{0}</b>.</p><p>Reason: {1}</p>""") - .format(fn, f.errorString()) + .format(fn, f.errorString()) ) return
--- a/Preferences/ConfigurationPages/EmailPage.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ConfigurationPages/EmailPage.py Sat Oct 19 16:51:12 2013 +0200 @@ -153,7 +153,7 @@ self.trUtf8("Login Test"), self.trUtf8( """<p>The login test failed.<br>Reason: {0}</p>""") - .format(errorStr)) + .format(errorStr)) server.quit() except (smtplib.SMTPException, socket.error) as e: QApplication.restoreOverrideCursor() @@ -172,7 +172,7 @@ self, self.trUtf8("Login Test"), self.trUtf8("""<p>The login test failed.<br>Reason: {0}</p>""") - .format(errorStr)) + .format(errorStr)) def create(dlg):
--- a/Preferences/ConfigurationPages/HelpAppearancePage.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ConfigurationPages/HelpAppearancePage.py Sat Oct 19 16:51:12 2013 +0200 @@ -49,7 +49,7 @@ self.fixedFont.pointSize())) self.initColour("SaveUrlColor", self.secureURLsColourButton, - Preferences.getHelp) + Preferences.getHelp) self.autoLoadImagesCheckBox.setChecked( Preferences.getHelp("AutoLoadImages"))
--- a/Preferences/ConfigurationPages/IrcPage.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ConfigurationPages/IrcPage.py Sat Oct 19 16:51:12 2013 +0200 @@ -44,27 +44,27 @@ # colours self.initColour("NetworkMessageColour", self.networkButton, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("ServerMessageColour", self.serverButton, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("ErrorMessageColour", self.errorButton, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("TimestampColour", self.timestampButton, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("HyperlinkColour", self.hyperlinkButton, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("ChannelMessageColour", self.channelButton, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("OwnNickColour", self.ownNickButton, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("NickColour", self.nickButton, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("JoinChannelColour", self.joinButton, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("LeaveChannelColour", self.leaveButton, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("ChannelInfoColour", self.infoButton, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) # notifications self.notificationsGroup.setChecked( @@ -75,37 +75,37 @@ # IRC text colors self.initColour("IrcColor0", self.ircColor0Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("IrcColor1", self.ircColor1Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("IrcColor2", self.ircColor2Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("IrcColor3", self.ircColor3Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("IrcColor4", self.ircColor4Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("IrcColor5", self.ircColor5Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("IrcColor6", self.ircColor6Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("IrcColor7", self.ircColor7Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("IrcColor8", self.ircColor8Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("IrcColor9", self.ircColor9Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("IrcColor10", self.ircColor10Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("IrcColor11", self.ircColor11Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("IrcColor12", self.ircColor12Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("IrcColor13", self.ircColor13Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("IrcColor14", self.ircColor14Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) self.initColour("IrcColor15", self.ircColor15Button, - Preferences.getIrc, byName=True) + Preferences.getIrc, byName=True) # Automatic User Information Lookup self.whoGroup.setChecked(Preferences.getIrc("AutoUserInfoLookup")) @@ -117,11 +117,11 @@ self.markWhenHiddenCheckBox.setChecked( Preferences.getIrc("MarkPositionWhenHidden")) self.initColour("MarkerLineForegroundColour", - self.markerForegroundButton, - Preferences.getIrc, byName=True) + self.markerForegroundButton, + Preferences.getIrc, byName=True) self.initColour("MarkerLineBackgroundColour", - self.markerBackgroundButton, - Preferences.getIrc, byName=True) + self.markerBackgroundButton, + Preferences.getIrc, byName=True) # Shutdown self.confirmShutdownCheckBox.setChecked(
--- a/Preferences/ConfigurationPages/SecurityPage.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ConfigurationPages/SecurityPage.py Sat Oct 19 16:51:12 2013 +0200 @@ -43,7 +43,7 @@ Preferences.getUser("UseMasterPassword")) if hasattr(QWebSettings, "DnsPrefetchEnabled"): self.dnsPrefetchCheckBox.setChecked( - Preferences.getHelp("DnsPrefetchEnabled")) + Preferences.getHelp("DnsPrefetchEnabled")) else: self.dnsPrefetchCheckBox.setEnabled(False)
--- a/Preferences/ProgramsDialog.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ProgramsDialog.py Sat Oct 19 16:51:12 2013 +0200 @@ -39,7 +39,7 @@ self.__hasSearched = False self.programsList.headerItem().setText( - self.programsList.columnCount(), "") + self.programsList.columnCount(), "") self.searchButton = self.buttonBox.addButton( self.trUtf8("Search"), QDialogButtonBox.ActionRole) @@ -302,10 +302,9 @@ proc.start(exe, [versionCommand]) finished = proc.waitForFinished(10000) if finished: - output = \ - str(proc.readAllStandardOutput(), - Preferences.getSystem("IOEncoding"), - 'replace') + output = str(proc.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), + 'replace') if versionRe is None: versionRe = "^{0}".format( re.escape(versionStartsWith))
--- a/Preferences/ShortcutDialog.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ShortcutDialog.py Sat Oct 19 16:51:12 2013 +0200 @@ -81,9 +81,9 @@ """ self.hide() self.shortcutChanged.emit( - QKeySequence(self.keyEdit.text()), - QKeySequence(self.alternateKeyEdit.text()), - self.noCheck, self.objectType) + QKeySequence(self.keyEdit.text()), + QKeySequence(self.alternateKeyEdit.text()), + self.noCheck, self.objectType) def __clear(self): """
--- a/Preferences/Shortcuts.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/Shortcuts.py Sat Oct 19 16:51:12 2013 +0200 @@ -205,7 +205,7 @@ "Shortcuts", "<p>The keyboard shortcuts could not be written to file" " <b>{0}</b>.</p>") - .format(fn)) + .format(fn)) def importShortcuts(fn): @@ -237,7 +237,7 @@ "Shortcuts", "<p>The keyboard shortcuts could not be read from file" " <b>{0}</b>.</p>") - .format(fn)) + .format(fn)) return
--- a/Preferences/ShortcutsDialog.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ShortcutsDialog.py Sat Oct 19 16:51:12 2013 +0200 @@ -260,7 +260,7 @@ (not self.__checkShortcut( keysequence, objectType, self.__editTopItem) or not self.__checkShortcut( - altKeysequence, objectType, self.__editTopItem)): + altKeysequence, objectType, self.__editTopItem)): return self.shortcutsList.currentItem().setText(1, keysequence.toString()) @@ -315,7 +315,7 @@ """<p><b>{0}</b> has already been""" """ allocated to the <b>{1}</b> action. """ """Remove this binding?</p>""") - .format(keystr, itm.text(0)), + .format(keystr, itm.text(0)), icon=E5MessageBox.Warning) if res: itm.setText(col, "") @@ -334,7 +334,7 @@ self.trUtf8( """<p><b>{0}</b> hides the <b>{1}</b>""" """ action. Remove this binding?</p>""") - .format(keystr, itm.text(0)), + .format(keystr, itm.text(0)), icon=E5MessageBox.Warning) if res: itm.setText(col, "") @@ -352,7 +352,7 @@ """<p><b>{0}</b> is hidden by the """ """<b>{1}</b> action. """ """Remove this binding?</p>""") - .format(keystr, itm.text(0)), + .format(keystr, itm.text(0)), icon=E5MessageBox.Warning) if res: itm.setText(col, "") @@ -454,7 +454,7 @@ -1) or \ (self.shortcutButton.isChecked() and not txt.lower() in itm.text(1).lower() and - not txt.lower() in itm.text(2).lower()): + not txt.lower() in itm.text(2).lower()): itm.setHidden(True) childHiddenCount += 1 else:
--- a/Preferences/ToolConfigurationDialog.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ToolConfigurationDialog.py Sat Oct 19 16:51:12 2013 +0200 @@ -130,7 +130,7 @@ self, self.trUtf8("Add tool entry"), self.trUtf8("An entry for the menu text {0} already exists.") - .format(menutext)) + .format(menutext)) return self.toolsList.addItem(menutext)
--- a/Preferences/ToolGroupConfigurationDialog.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/ToolGroupConfigurationDialog.py Sat Oct 19 16:51:12 2013 +0200 @@ -68,7 +68,7 @@ self, self.trUtf8("Add tool group entry"), self.trUtf8("An entry for the group name {0} already exists.") - .format(groupName)) + .format(groupName)) return self.groupsList.addItem(groupName) @@ -98,7 +98,7 @@ self, self.trUtf8("Add tool group entry"), self.trUtf8("An entry for the group name {0} already exists.") - .format(groupName)) + .format(groupName)) return self.toolGroups[row][0] = groupName @@ -118,7 +118,7 @@ self.trUtf8("Delete tool group entry"), self.trUtf8("""<p>Do you really want to delete the tool group""" """ <b>"{0}"</b>?</p>""") - .format(self.groupsList.currentItem().text()), + .format(self.groupsList.currentItem().text()), icon=E5MessageBox.Warning) if not res: return
--- a/Preferences/__init__.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Preferences/__init__.py Sat Oct 19 16:51:12 2013 +0200 @@ -68,16 +68,16 @@ "Python3Interpreter": "", "CustomPython3Interpreter": False, "RubyInterpreter": "/usr/bin/ruby", - "DebugClientType": "standard", # supported "standard", "threaded", - # "custom" + "DebugClientType": "standard", + # supported "standard", "threaded", "custom" "DebugClient": "", - "DebugClientType3": "standard", # supported "standard", "threaded", - # "custom" + "DebugClientType3": "standard", + # supported "standard", "threaded", "custom" "DebugClient3": "", - "PythonExtensions": ".py2 .pyw2 .ptl", # space separated list of - # Python extensions - "Python3Extensions": ".py .pyw .py3 .pyw3", # space separated list of - # Python3 extensions + "PythonExtensions": ".py2 .pyw2 .ptl", + # space separated list of Python extensions + "Python3Extensions": ".py .pyw .py3 .pyw3", + # space separated list of Python3 extensions "DebugEnvironmentReplace": False, "DebugEnvironment": "", "PythonRedirect": True, @@ -134,90 +134,91 @@ # Numbers "ViewProfiles": { "edit": [ - # visibility (0) OBSOLETE - [True, False, False, True, True, True, True, True, - True, True, True, True], - # saved state main window with dock windows (1) OBSOLETE - b"", - # saved states floating windows (2) OBSOLETE - [b"", b"", b"", b"", b"", b"", b"", b"", b"", b"", b"", - b""], - # saved state main window with floating windows (3) - # OBSOLETE - b"", - # saved state main window with toolbox windows (4) - b"", - # visibility of the toolboxes/sidebars (5) - # left, bottom, right - [True, True, True], - # saved states of the splitters and sidebars of the - # sidebars layout (6) - # left splitter, vertical splitter, left sidebar, - # bottom sidebar, right splitter, right sidebar - [b"", b"", b"", b"", b"", b""], - ], + # visibility (0) OBSOLETE + [True, False, False, True, True, True, True, True, + True, True, True, True], + # saved state main window with dock windows (1) OBSOLETE + b"", + # saved states floating windows (2) OBSOLETE + [b"", b"", b"", b"", b"", b"", b"", b"", b"", b"", b"", + b""], + # saved state main window with floating windows (3) + # OBSOLETE + b"", + # saved state main window with toolbox windows (4) + b"", + # visibility of the toolboxes/sidebars (5) + # left, bottom, right + [True, True, True], + # saved states of the splitters and sidebars of the + # sidebars layout (6) + # left splitter, vertical splitter, left sidebar, + # bottom sidebar, right splitter, right sidebar + [b"", b"", b"", b"", b"", b""], + ], "debug": [ - # visibility (0) OBSOLETE - [False, False, True, True, True, True, False, False, - True, False, False, False], - # saved state main window with dock windows (1) OBSOLETE - b"", - # saved states floating windows (2) OBSOLETE - [b"", b"", b"", b"", b"", b"", b"", b"", b"", b"", b"", - b""], - # saved state main window with floating windows (3) - # OBSOLETE - b"", - # saved state main window with toolbox windows (4) - b"", - # visibility of the toolboxes/sidebars (5) - # left, bottom, right - [False, True, True], - # saved states of the splitters and sidebars of the - # sidebars layout (6) - # left splitter, vertical splitter, left sidebar, - # bottom sidebar, right splitter, right sidebar - [b"", b"", b"", b"", b"", b""], - ], + # visibility (0) OBSOLETE + [False, False, True, True, True, True, False, False, + True, False, False, False], + # saved state main window with dock windows (1) OBSOLETE + b"", + # saved states floating windows (2) OBSOLETE + [b"", b"", b"", b"", b"", b"", b"", b"", b"", b"", b"", + b""], + # saved state main window with floating windows (3) + # OBSOLETE + b"", + # saved state main window with toolbox windows (4) + b"", + # visibility of the toolboxes/sidebars (5) + # left, bottom, right + [False, True, True], + # saved states of the splitters and sidebars of the + # sidebars layout (6) + # left splitter, vertical splitter, left sidebar, + # bottom sidebar, right splitter, right sidebar + [b"", b"", b"", b"", b"", b""], + ], }, "ViewProfiles2": { "edit": [ - # saved state main window with toolbox windows (0) - QByteArray(), - # visibility of the toolboxes/sidebars (1) - # left, bottom, right - [True, True, True], - # saved states of the splitters and sidebars of the - # sidebars layout (2) - # left splitter, vertical splitter, left sidebar, - # bottom sidebar, right splitter, right sidebar - [QByteArray(), QByteArray(), QByteArray(), - QByteArray(), QByteArray(), QByteArray()], - ], + # saved state main window with toolbox windows (0) + QByteArray(), + # visibility of the toolboxes/sidebars (1) + # left, bottom, right + [True, True, True], + # saved states of the splitters and sidebars of the + # sidebars layout (2) + # left splitter, vertical splitter, left sidebar, + # bottom sidebar, right splitter, right sidebar + [QByteArray(), QByteArray(), QByteArray(), + QByteArray(), QByteArray(), QByteArray()], + ], "debug": [ - # saved state main window with toolbox windows (0) - QByteArray(), - # visibility of the toolboxes/sidebars (1) - # left, bottom, right - [False, True, True], - # saved states of the splitters and sidebars of the - # sidebars layout (2) - # left splitter, vertical splitter, left sidebar, - # bottom sidebar, right splitter, right sidebar - [QByteArray(), QByteArray(), QByteArray(), - QByteArray(), QByteArray(), QByteArray()], - ], + # saved state main window with toolbox windows (0) + QByteArray(), + # visibility of the toolboxes/sidebars (1) + # left, bottom, right + [False, True, True], + # saved states of the splitters and sidebars of the + # sidebars layout (2) + # left splitter, vertical splitter, left sidebar, + # bottom sidebar, right splitter, right sidebar + [QByteArray(), QByteArray(), QByteArray(), + QByteArray(), QByteArray(), QByteArray()], + ], }, "ToolbarManagerState": QByteArray(), "PreviewSplitterState": QByteArray(), "ShowSplash": True, "SingleCloseButton": False, - "PerformVersionCheck": 4, # 0 = off - # 1 = at startup - # 2 = daily - # 3 = weekly - # 4 = monthly + "PerformVersionCheck": 4, + # 0 = off + # 1 = at startup + # 2 = daily + # 3 = weekly + # 4 = monthly "UseProxy": False, "UseSystemProxy": True, "UseHttpProxyForAll": False, @@ -237,7 +238,7 @@ "ProxyAccount/Ftp": "", "PluginRepositoryUrl5": - "http://eric-ide.python-projects.org/plugins5/repository.xml", + "http://eric-ide.python-projects.org/plugins5/repository.xml", "VersionsUrls5": [ "http://die-offenbachs.homelinux.org:48888/eric/snapshots5/" "versions", @@ -630,60 +631,60 @@ # defaults for the project browser flags settings projectBrowserFlagsDefaults = { - "Qt4": + "Qt4": ( SourcesBrowserFlag | FormsBrowserFlag | ResourcesBrowserFlag | TranslationsBrowserFlag | InterfacesBrowserFlag | - OthersBrowserFlag, - "Qt4C": + OthersBrowserFlag), + "Qt4C": ( SourcesBrowserFlag | ResourcesBrowserFlag | TranslationsBrowserFlag | InterfacesBrowserFlag | - OthersBrowserFlag, - "PyQt5": + OthersBrowserFlag), + "PyQt5": ( SourcesBrowserFlag | FormsBrowserFlag | ResourcesBrowserFlag | TranslationsBrowserFlag | InterfacesBrowserFlag | - OthersBrowserFlag, - "PyQt5C": + OthersBrowserFlag), + "PyQt5C": ( SourcesBrowserFlag | ResourcesBrowserFlag | TranslationsBrowserFlag | InterfacesBrowserFlag | - OthersBrowserFlag, - "E4Plugin": + OthersBrowserFlag), + "E4Plugin": ( SourcesBrowserFlag | FormsBrowserFlag | ResourcesBrowserFlag | TranslationsBrowserFlag | InterfacesBrowserFlag | - OthersBrowserFlag, - "Console": + OthersBrowserFlag), + "Console": ( SourcesBrowserFlag | InterfacesBrowserFlag | - OthersBrowserFlag, - "Other": + OthersBrowserFlag), + "Other": ( SourcesBrowserFlag | InterfacesBrowserFlag | - OthersBrowserFlag, - "PySide": + OthersBrowserFlag), + "PySide": ( SourcesBrowserFlag | FormsBrowserFlag | ResourcesBrowserFlag | TranslationsBrowserFlag | InterfacesBrowserFlag | - OthersBrowserFlag, - "PySideC": + OthersBrowserFlag), + "PySideC": ( SourcesBrowserFlag | ResourcesBrowserFlag | TranslationsBrowserFlag | InterfacesBrowserFlag | - OthersBrowserFlag, + OthersBrowserFlag), } # defaults for the project browser colour settings @@ -804,29 +805,29 @@ cls.helpDefaults["FixedFont"] = QFont(fontFamily, fontSize).toString() cls.helpDefaults.update({ "AutoLoadImages": - websettings.testAttribute(QWebSettings.AutoLoadImages), + websettings.testAttribute(QWebSettings.AutoLoadImages), "UserStyleSheet": "", "SaveUrlColor": QColor(248, 248, 210), "JavaEnabled": - websettings.testAttribute(QWebSettings.JavaEnabled), + websettings.testAttribute(QWebSettings.JavaEnabled), "JavaScriptEnabled": - websettings.testAttribute(QWebSettings.JavascriptEnabled), + websettings.testAttribute(QWebSettings.JavascriptEnabled), "JavaScriptCanOpenWindows": - websettings.testAttribute( - QWebSettings.JavascriptCanOpenWindows), + websettings.testAttribute( + QWebSettings.JavascriptCanOpenWindows), "JavaScriptCanAccessClipboard": - websettings.testAttribute( - QWebSettings.JavascriptCanAccessClipboard), + websettings.testAttribute( + QWebSettings.JavascriptCanAccessClipboard), "PluginsEnabled": - websettings.testAttribute(QWebSettings.PluginsEnabled), + websettings.testAttribute(QWebSettings.PluginsEnabled), "OfflineStorageDatabaseEnabled": - websettings.testAttribute( - QWebSettings.OfflineStorageDatabaseEnabled), + websettings.testAttribute( + QWebSettings.OfflineStorageDatabaseEnabled), }) if hasattr(QWebSettings, "OfflineWebApplicationCacheEnabled"): cls.helpDefaults.update({ "OfflineWebApplicationCacheEnabled": - websettings.testAttribute( + websettings.testAttribute( QWebSettings.OfflineWebApplicationCacheEnabled), "OfflineWebApplicationCacheQuota": 50, # 50 MB }) @@ -1268,16 +1269,16 @@ @return the requested debugger setting """ if key in ["RemoteDbgEnabled", "PassiveDbgEnabled", - "CustomPython3Interpreter", - "AutomaticReset", "DebugEnvironmentReplace", - "PythonRedirect", "PythonNoEncoding", - "Python3Redirect", "Python3NoEncoding", - "RubyRedirect", - "ConsoleDbgEnabled", "PathTranslation", - "Autosave", "ThreeStateBreakPoints", - "SuppressClientExit", "BreakAlways", - "AutoViewSourceCode", - ]: + "CustomPython3Interpreter", + "AutomaticReset", "DebugEnvironmentReplace", + "PythonRedirect", "PythonNoEncoding", + "Python3Redirect", "Python3NoEncoding", + "RubyRedirect", + "ConsoleDbgEnabled", "PathTranslation", + "Autosave", "ThreeStateBreakPoints", + "SuppressClientExit", "BreakAlways", + "AutoViewSourceCode", + ]: return toBool(prefClass.settings.value( "Debugger/" + key, prefClass.debuggerDefaults[key])) elif key in ["PassiveDbgPort"]: @@ -1404,7 +1405,7 @@ prefClass.uiDefaults["LayoutShellEmbedded"])), int(prefClass.settings.value("UI/LayoutFileBrowserEmbedded", prefClass.uiDefaults["LayoutFileBrowserEmbedded"])), - ) + ) return layout @@ -1493,7 +1494,7 @@ if vpLength < prefClass.viewProfilesLength: viewProfiles[name][0].extend( prefClass.uiDefaults["ViewProfiles"][name][0] - [vpLength:]) + [vpLength:]) # adjust profile vpLength = len(viewProfiles[name]) @@ -1507,13 +1508,13 @@ prefClass.uiDefaults["ViewProfiles"][name][5]): viewProfiles[name][5].extend( prefClass.uiDefaults["ViewProfiles"][name][5] - [vpLength:]) + [vpLength:]) vpLength = len(viewProfiles[name][6]) if vpLength < len( prefClass.uiDefaults["ViewProfiles"][name][6]): viewProfiles[name][6].extend( prefClass.uiDefaults["ViewProfiles"][name][6] - [vpLength:]) + [vpLength:]) else: viewProfiles = prefClass.uiDefaults["ViewProfiles"] return viewProfiles @@ -2296,7 +2297,7 @@ "SyncSpeedDial", "SyncEncryptData", "SyncEncryptPasswordsOnly", "WarnOnMultipleClose", "ClickToFlashEnabled" - ]: + ]: return toBool(prefClass.settings.value( "Help/" + key, prefClass.helpDefaults[key])) elif key in ["AdBlockSubscriptions", "AdBlockExceptions", @@ -2909,8 +2910,7 @@ "UI/" + key, pwRecode( prefClass.settings.value("UI/" + key, - prefClass.uiDefaults[key] - ), + prefClass.uiDefaults[key]), oldPassword, newPassword ) @@ -2920,8 +2920,7 @@ "User/" + key, pwRecode( prefClass.settings.value("User/" + key, - prefClass.userDefaults[key] - ), + prefClass.userDefaults[key]), oldPassword, newPassword ) @@ -2931,8 +2930,7 @@ "Help/" + key, pwRecode( prefClass.settings.value("Help/" + key, - prefClass.helpDefaults[key] - ), + prefClass.helpDefaults[key]), oldPassword, newPassword )
--- a/Project/AddFileDialog.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Project/AddFileDialog.py Sat Oct 19 16:51:12 2013 +0200 @@ -96,7 +96,8 @@ "Resource Files ({2});;" "Interface Files ({3});;" "Translation Files ({4});;" - "All Files (*)").format( + "All Files (*)")\ + .format( " ".join(patterns["SOURCES"]), " ".join(patterns["FORMS"]), " ".join(patterns["RESOURCES"]),
--- a/Project/CreateDialogCodeDialog.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Project/CreateDialogCodeDialog.py Sat Oct 19 16:51:12 2013 +0200 @@ -257,7 +257,7 @@ method = "on_{0}_{1}".format( name, bytes(metaMethod.methodSignature()) - .decode().split("(")[0]) + .decode().split("(")[0]) else: method = "on_{0}_{1}".format( name, metaMethod.signature().split("(")[0]) @@ -293,11 +293,11 @@ "on_{0}_{1}(self, {2})".format( name, bytes(metaMethod.methodSignature()) - .decode().split("(")[0], + .decode().split("(")[0], methNamesSig) else: pythonSignature = \ - "on_{0}_{1}(self, {2})".format( + "on_{0}_{1}(self, {2})".format( name, metaMethod.signature().split("(")[0], methNamesSig) @@ -306,7 +306,7 @@ pythonSignature = "on_{0}_{1}(self)".format( name, bytes(metaMethod.methodSignature()) - .decode().split("(")[0]) + .decode().split("(")[0]) else: pythonSignature = "on_{0}_{1}(self)".format( name, @@ -398,7 +398,7 @@ self.trUtf8( """<p>Could not open the code template file""" """ "{0}".</p><p>Reason: {1}</p>""") - .format(tmplName, str(why))) + .format(tmplName, str(why))) return objName = self.__objectName() @@ -434,7 +434,7 @@ self.trUtf8( """<p>Could not open the source file "{0}".</p>""" """<p>Reason: {1}</p>""") - .format(self.srcFile, str(why))) + .format(self.srcFile, str(why))) return cls = self.__module.classes[self.classNameCombo.currentText()] @@ -512,7 +512,7 @@ self.trUtf8("Code Generation"), self.trUtf8("""<p>Could not write the source file "{0}".</p>""" """<p>Reason: {1}</p>""") - .format(self.filenameEdit.text(), str(why))) + .format(self.filenameEdit.text(), str(why))) return self.project.appendFile(self.filenameEdit.text())
--- a/Project/Project.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Project/Project.py Sat Oct 19 16:51:12 2013 +0200 @@ -183,11 +183,11 @@ self.dbgFilters = { "Python2": self.trUtf8( - "Python2 Files (*.py2);;" - "Python2 GUI Files (*.pyw2);;"), + "Python2 Files (*.py2);;" + "Python2 GUI Files (*.pyw2);;"), "Python3": self.trUtf8( - "Python3 Files (*.py *.py3);;" - "Python3 GUI Files (*.pyw *.pyw3);;"), + "Python3 Files (*.py *.py3);;" + "Python3 GUI Files (*.pyw *.pyw3);;"), "Ruby": self.trUtf8("Ruby Files (*.rb);;"), } @@ -316,7 +316,7 @@ self.trUtf8( """<p>The Programming Language <b>{0}</b> is not""" """ supported.</p>""") - .format(progLanguage) + .format(progLanguage) ) return @@ -328,7 +328,7 @@ """<p>The Project type <b>{0}</b> is already""" """ registered with Programming Language""" """ <b>{1}</b>.</p>""") - .format(type_, progLanguage) + .format(type_, progLanguage) ) return @@ -672,7 +672,7 @@ self.trUtf8("Read project file"), self.trUtf8( "<p>The project file <b>{0}</b> could not be read.</p>") - .format(fn)) + .format(fn)) return False self.pfile = os.path.abspath(fn) @@ -708,10 +708,10 @@ # get the names of subdirectories the files are stored in for fn in self.pdata["SOURCES"] + \ - self.pdata["FORMS"] + \ - self.pdata["INTERFACES"] + \ - self.pdata["RESOURCES"] + \ - self.pdata["TRANSLATIONS"]: + self.pdata["FORMS"] + \ + self.pdata["INTERFACES"] + \ + self.pdata["RESOURCES"] + \ + self.pdata["TRANSLATIONS"]: dn = os.path.dirname(fn) if dn not in self.subdirs: self.subdirs.append(dn) @@ -974,7 +974,7 @@ self.trUtf8("Read tasks"), self.trUtf8( "<p>The tasks file <b>{0}</b> could not be read.</p>") - .format(fn)) + .format(fn)) def writeTasks(self): """ @@ -994,7 +994,7 @@ self.trUtf8("Save tasks"), self.trUtf8( "<p>The tasks file <b>{0}</b> could not be written.</p>") - .format(fn)) + .format(fn)) return from E5XML.TasksWriter import TasksWriter @@ -1110,7 +1110,7 @@ self.trUtf8( "<p>The project debugger properties file" " <b>{0}</b> could not be deleted.</p>") - .format(fn)) + .format(fn)) def __initDebugProperties(self): """ @@ -1244,7 +1244,7 @@ Public slot to check the language files after a release process. """ tbPath = self.pdata["TRANSLATIONSBINPATH"] and \ - self.pdata["TRANSLATIONSBINPATH"][0] or "" + self.pdata["TRANSLATIONSBINPATH"][0] or "" for langFile in self.pdata["TRANSLATIONS"][:]: qmFile = self.__binaryTranslationFile(langFile) if qmFile: @@ -1447,7 +1447,7 @@ self.trUtf8( "<p>The file <b>{0}</b> already" " exists.</p><p>Overwrite it?</p>") - .format(targetfile), + .format(targetfile), icon=E5MessageBox.Warning) if not res: return # don't overwrite @@ -1461,7 +1461,7 @@ "<p>The selected file <b>{0}</b> could" " not be added to <b>{1}</b>.</p>" "<p>Reason: {2}</p>") - .format(fn, target, str(why))) + .format(fn, target, str(why))) continue self.appendFile(targetfile, isSource or filter == 'source') @@ -1516,7 +1516,7 @@ self.trUtf8( "<p>The target directory <b>{0}</b> could not be" " created.</p><p>Reason: {1}</p>") - .format(target, str(why))) + .format(target, str(why))) return for file in files: @@ -1534,7 +1534,7 @@ self.trUtf8( "<p>The file <b>{0}</b> already exists.</p>" "<p>Overwrite it?</p>") - .format(targetfile), + .format(targetfile), icon=E5MessageBox.Warning) if not res: continue # don't overwrite, carry on @@ -2047,7 +2047,7 @@ self.trUtf8( "<p>The project directory <b>{0}</b> could not" " be created.</p>") - .format(self.ppath)) + .format(self.ppath)) self.vcs = self.initVCS() return # create an empty __init__.py file to make it a Python package @@ -2105,7 +2105,7 @@ self.trUtf8( "<p>The mainscript <b>{0}</b> could not" " be created.<br/>Reason: {1}</p>") - .format(self.ppath, str(err))) + .format(self.ppath, str(err))) self.appendFile(ms) except IndexError: ms = "" @@ -2290,12 +2290,12 @@ if '_' in os.path.basename(tslist[0]): # the first entry determines the mainscript name mainscriptname = os.path.splitext(mainscript)[0] or \ - os.path.basename(tslist[0]).split('_')[0] + os.path.basename(tslist[0]).split('_')[0] self.pdata["TRANSLATIONPATTERN"] = \ [os.path.join(os.path.dirname(tslist[0]), "{0}_%language%{1}".format( - os.path.basename(tslist[0]).split('_')[0], - os.path.splitext(tslist[0])[1]))] + os.path.basename(tslist[0]).split('_')[0], + os.path.splitext(tslist[0])[1]))] else: pattern, ok = QInputDialog.getText( None, @@ -2403,7 +2403,7 @@ (self.pudata["VCSOVERRIDE"] and self.pudata["VCSOVERRIDE"][0] != vcsSystemOverride) or \ (vcsSystemOverride is not None and - len(self.pudata["VCSOVERRIDE"]) == 0): + len(self.pudata["VCSOVERRIDE"]) == 0): # stop the VCS monitor thread and shutdown VCS if self.vcs is not None: self.vcs.stopStatusMonitor() @@ -2492,7 +2492,7 @@ self.parent(), self.trUtf8("Open project"), Preferences.getMultiProject("Workspace") or - Utilities.getHomeDir(), + Utilities.getHomeDir(), self.trUtf8("Project Files (*.e4p)")) QApplication.processEvents() @@ -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() @@ -2669,7 +2669,7 @@ defaultPath = self.ppath else: defaultPath = Preferences.getMultiProject("Workspace") or \ - Utilities.getHomeDir() + Utilities.getHomeDir() fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( self.parent(), self.trUtf8("Save project as"), @@ -4139,7 +4139,7 @@ self.trUtf8( "<p>The selected VCS <b>{0}</b> could not be" " found. <br/>Reverting override.</p><p>{1}</p>") - .format(vcsSystem, msg)) + .format(vcsSystem, msg)) self.pudata["VCSOVERRIDE"] = [] return self.initVCS(nooverride=True) @@ -4633,7 +4633,7 @@ """<p>The file <b>{0}</b> could not be stored """ """in the archive. Ignoring it.</p>""" """<p>Reason: {1}</p>""") - .format(os.path.join(self.ppath, name), str(why))) + .format(os.path.join(self.ppath, name), str(why))) archiveFile.writestr("VERSION", version.encode("utf-8")) archiveFile.close() @@ -4647,7 +4647,7 @@ self.trUtf8( """<p>The eric5 plugin archive file <b>{0}</b> was """ """created successfully.</p>""") - .format(os.path.basename(archive))) + .format(os.path.basename(archive))) else: E5MessageBox.information( self.ui, @@ -4700,7 +4700,7 @@ self.trUtf8("""<p>The plugin file <b>{0}</b> could """ """not be read.</p>""" """<p>Reason: {1}</p>""") - .format(filename, str(why))) + .format(filename, str(why))) return b"", "" lineno = 0 @@ -4712,7 +4712,7 @@ .replace(sourcelines[lineno].rstrip(), "") sversion = "{0}-snapshot-{1}".format( sourcelines[lineno].replace("version = ", "") - .strip()[1:-1], + .strip()[1:-1], datestr) sourcelines[lineno] = '{0} + "-snapshot-{1}"{2}'.format( sourcelines[lineno].rstrip(), datestr, lineend) @@ -4741,13 +4741,13 @@ self.trUtf8( """<p>The plugin file <b>{0}</b> could """ """not be read.</p> <p>Reason: {1}</p>""") - .format(filename, str(why))) + .format(filename, str(why))) return "" for sourceline in sourcelines: if sourceline.startswith("version = "): version = sourceline.replace("version = ", "").strip()\ - .replace('"', "").replace("'", "") + .replace('"', "").replace("'", "") break return version
--- a/Project/ProjectBrowserFlags.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Project/ProjectBrowserFlags.py Sat Oct 19 16:51:12 2013 +0200 @@ -14,8 +14,8 @@ InterfacesBrowserFlag = 16 OthersBrowserFlag = 32 AllBrowsersFlag = SourcesBrowserFlag | \ - FormsBrowserFlag | \ - ResourcesBrowserFlag | \ - TranslationsBrowserFlag | \ - InterfacesBrowserFlag | \ - OthersBrowserFlag + FormsBrowserFlag | \ + ResourcesBrowserFlag | \ + TranslationsBrowserFlag | \ + InterfacesBrowserFlag | \ + OthersBrowserFlag
--- a/Project/ProjectBrowserModel.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Project/ProjectBrowserModel.py Sat Oct 19 16:51:12 2013 +0200 @@ -341,7 +341,7 @@ if len(entryInfoList) > 0: if repopulate: self.beginInsertRows(self.createIndex( - parentItem.row(), 0, parentItem), + parentItem.row(), 0, parentItem), 0, len(entryInfoList) - 1) states = {} if self.project.vcs is not None:
--- a/Project/ProjectFormsBrowser.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Project/ProjectFormsBrowser.py Sat Oct 19 16:51:12 2013 +0200 @@ -437,7 +437,7 @@ if isinstance(itm, ProjectBrowserFileItem): dn = os.path.dirname(itm.fileName()) elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ - isinstance(itm, ProjectBrowserDirectoryItem): + isinstance(itm, ProjectBrowserDirectoryItem): dn = itm.dirName() else: dn = None @@ -451,7 +451,7 @@ if isinstance(itm, ProjectBrowserFileItem): dn = os.path.dirname(itm.fileName()) elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ - isinstance(itm, ProjectBrowserDirectoryItem): + isinstance(itm, ProjectBrowserDirectoryItem): dn = itm.dirName() else: dn = None @@ -658,7 +658,7 @@ while self.compileProc and self.compileProc.canReadLine(): s = self.uicompiler + ': ' error = str(self.compileProc.readLine(), - ioEncoding, 'replace') + ioEncoding, 'replace') s += error self.appendStderr.emit(s)
--- a/Project/ProjectInterfacesBrowser.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Project/ProjectInterfacesBrowser.py Sat Oct 19 16:51:12 2013 +0200 @@ -279,7 +279,7 @@ bfcnt = categories[str(ProjectBrowserFileItem)] cmcnt = categories[str(BrowserClassItem)] + \ - categories[str(BrowserMethodItem)] + categories[str(BrowserMethodItem)] sdcnt = categories[str(ProjectBrowserSimpleDirectoryItem)] if cnt > 1 and cnt == bfcnt: self.multiMenu.popup(self.mapToGlobal(coord)) @@ -377,7 +377,7 @@ isinstance(itm, BrowserMethodItem): dn = os.path.dirname(itm.fileName()) elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ - isinstance(itm, ProjectBrowserDirectoryItem): + isinstance(itm, ProjectBrowserDirectoryItem): dn = itm.dirName() else: dn = None @@ -393,7 +393,7 @@ isinstance(itm, BrowserMethodItem): dn = os.path.dirname(itm.fileName()) elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ - isinstance(itm, ProjectBrowserDirectoryItem): + isinstance(itm, ProjectBrowserDirectoryItem): dn = itm.dirName() else: dn = None
--- a/Project/ProjectResourcesBrowser.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Project/ProjectResourcesBrowser.py Sat Oct 19 16:51:12 2013 +0200 @@ -374,7 +374,7 @@ if isinstance(itm, ProjectBrowserFileItem): dn = os.path.dirname(itm.fileName()) elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ - isinstance(itm, ProjectBrowserDirectoryItem): + isinstance(itm, ProjectBrowserDirectoryItem): dn = itm.dirName() else: dn = None @@ -388,7 +388,7 @@ if isinstance(itm, ProjectBrowserFileItem): dn = os.path.dirname(itm.fileName()) elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ - isinstance(itm, ProjectBrowserDirectoryItem): + isinstance(itm, ProjectBrowserDirectoryItem): dn = itm.dirName() else: dn = None @@ -475,7 +475,7 @@ self.trUtf8( "<p>The new resource file <b>{0}</b> could not" " be created.<br>Problem: {1}</p>") - .format(fname, str(e))) + .format(fname, str(e))) return self.project.appendFile(fname) @@ -542,7 +542,7 @@ while self.compileProc and self.compileProc.canReadLine(): s = self.rccCompiler + ': ' error = str(self.compileProc.readLine(), - ioEncoding, 'replace') + ioEncoding, 'replace') s += error self.appendStderr.emit(s)
--- a/Project/ProjectSourcesBrowser.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Project/ProjectSourcesBrowser.py Sat Oct 19 16:51:12 2013 +0200 @@ -104,7 +104,7 @@ self.sourceMenuActions = {} if self.project.pdata["PROGLANGUAGE"][0] in \ - ["Python", "Python2", "Python3"]: + ["Python", "Python2", "Python3"]: self.__createPythonPopupMenus() elif self.project.pdata["PROGLANGUAGE"][0] == "Ruby": self.__createRubyPopupMenus() @@ -460,8 +460,8 @@ bfcnt = categories[str(ProjectBrowserFileItem)] cmcnt = categories[str(BrowserClassItem)] + \ - categories[str(BrowserMethodItem)] + \ - categories[str(BrowserClassAttributeItem)] + categories[str(BrowserMethodItem)] + \ + categories[str(BrowserClassAttributeItem)] sdcnt = categories[str(ProjectBrowserSimpleDirectoryItem)] if cnt > 1 and cnt == bfcnt: self.multiMenu.popup(self.mapToGlobal(coord)) @@ -640,7 +640,7 @@ isinstance(itm, BrowserMethodItem): dn = os.path.dirname(itm.fileName()) elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ - isinstance(itm, ProjectBrowserDirectoryItem): + isinstance(itm, ProjectBrowserDirectoryItem): dn = itm.dirName() else: dn = "" @@ -668,7 +668,7 @@ """<p>The package directory <b>{0}</b> could""" """ not be created. Aborting...</p>""" """<p>Reason: {1}</p>""") - .format(packagePath, str(err))) + .format(packagePath, str(err))) return packageFile = os.path.join(packagePath, "__init__.py") if not os.path.exists(packageFile): @@ -683,7 +683,7 @@ """<p>The package file <b>{0}</b> could""" """ not be created. Aborting...</p>""" """<p>Reason: {1}</p>""") - .format(packageFile, str(err))) + .format(packageFile, str(err))) return self.project.appendFile(packageFile) if packageFile: @@ -699,7 +699,7 @@ isinstance(itm, BrowserMethodItem): dn = os.path.dirname(itm.fileName()) elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ - isinstance(itm, ProjectBrowserDirectoryItem): + isinstance(itm, ProjectBrowserDirectoryItem): dn = itm.dirName() else: dn = None @@ -715,7 +715,7 @@ isinstance(itm, BrowserMethodItem): dn = os.path.dirname(itm.fileName()) elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ - isinstance(itm, ProjectBrowserDirectoryItem): + isinstance(itm, ProjectBrowserDirectoryItem): dn = itm.dirName() else: dn = None
--- a/Project/ProjectTranslationsBrowser.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Project/ProjectTranslationsBrowser.py Sat Oct 19 16:51:12 2013 +0200 @@ -620,7 +620,7 @@ if isinstance(itm, ProjectBrowserFileItem): dn = os.path.dirname(itm.fileName()) elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ - isinstance(itm, ProjectBrowserDirectoryItem): + isinstance(itm, ProjectBrowserDirectoryItem): dn = itm.dirName() else: dn = None @@ -770,7 +770,7 @@ else: try: pattern = self.project.pdata["TRANSLATIONPATTERN"][0]\ - .replace("%language%", "*") + .replace("%language%", "*") langs = [lang for lang in self.project.pdata["TRANSLATIONS"] if fnmatch.fnmatch(lang, pattern)] except IndexError: @@ -1202,8 +1202,8 @@ ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "PySide", "PySideC"]: lrelease = os.path.join( - Utilities.getQtBinariesPath(), - Utilities.generateQtToolName("lrelease")) + Utilities.getQtBinariesPath(), + Utilities.generateQtToolName("lrelease")) else: return if Utilities.isWindowsPlatform():
--- a/Project/UserPropertiesDialog.py Sat Oct 19 16:14:07 2013 +0200 +++ b/Project/UserPropertiesDialog.py Sat Oct 19 16:51:12 2013 +0200 @@ -47,7 +47,7 @@ found = False for indicator, vcsData in \ e5App().getObject("PluginManager")\ - .getVcsSystemIndicators().items(): + .getVcsSystemIndicators().items(): for vcsSystem, vcsSystemDisplay in vcsData: if vcsSystem == self.project.pdata["VCS"][0]: found = True
--- a/PyUnit/UnittestDialog.py Sat Oct 19 16:14:07 2013 +0200 +++ b/PyUnit/UnittestDialog.py Sat Oct 19 16:51:12 2013 +0200 @@ -219,7 +219,7 @@ flags = Utilities.extractFlagsFromFile(txt) if txt.endswith(exts) or \ ("FileType" in flags and - flags["FileType"] in ["Python", "Python2"]): + flags["FileType"] in ["Python", "Python2"]): self.coverageCheckBox.setChecked(False) self.coverageCheckBox.setEnabled(False) self.localCheckBox.setChecked(False) @@ -286,7 +286,7 @@ if mainScript.endswith( tuple(Preferences.getPython("PythonExtensions"))) or \ ("FileType" in flags and - flags["FileType"] in ["Python", "Python2"]): + flags["FileType"] in ["Python", "Python2"]): clientType = "Python2" else: clientType = "" @@ -335,8 +335,8 @@ self.trUtf8( "<p>Unable to run test <b>{0}</b>.<br>" "{1}<br>{2}</p>") - .format(self.testName, str(exc_type), - str(exc_value))) + .format(self.testName, str(exc_type), + str(exc_value))) return # now set up the coverage stuff @@ -356,7 +356,7 @@ from DebugClients.Python3.coverage import coverage cover = coverage( data_file="{0}.coverage".format( - os.path.splitext(mainScript)[0])) + os.path.splitext(mainScript)[0])) cover.use_cache(True) if self.coverageEraseCheckBox.isChecked(): cover.erase() @@ -393,7 +393,7 @@ self.trUtf8("Unittest"), self.trUtf8( "<p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p>") - .format(self.testName, exc_type, exc_value)) + .format(self.testName, exc_type, exc_value)) return self.totalTests = nrTests
