Mercurial Repositories > eric / changeset
changeset
Corrected some coding style issues.
Mon, 22 Dec 2014 18:31:23 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 22 Dec 2014 18:31:23 +0100
- branch
- 6_0_x
- changeset 3989
- 2d9778d49159
- parent 3988
- 947bd642b0de
- child 3993
- f70e86530494
Corrected some coding style issues.
--- a/Debugger/DebugViewer.py Mon Dec 22 18:12:00 2014 +0100 +++ b/Debugger/DebugViewer.py Mon Dec 22 18:31:23 2014 +0100 @@ -306,7 +306,7 @@ self.globalsViewer.handleResetUI() self.localsViewer.handleResetUI() self.__setGlobalsFilter() - self.__setLocalsFilter() + self.__setLocalsFilter() self.sourceButton.setEnabled(False) self.currentStack = None self.stackComboBox.clear()
--- a/Documentation/Source/eric6.E5Gui.E5ErrorMessage.html Mon Dec 22 18:12:00 2014 +0100 +++ b/Documentation/Source/eric6.E5Gui.E5ErrorMessage.html Mon Dec 22 18:31:23 2014 +0100 @@ -153,7 +153,7 @@ </dd><dt><i>args</i></dt> <dd> message handler arguments, for PyQt4 message to be shown - (bytes), for PyQt5 context information (QMessageLogContext) and + (bytes), for PyQt5 context information (QMessageLogContext) and message to be shown (bytes) </dd> </dl>
--- a/Documentation/Source/eric6.Toolbox.PyQt4ImportHook.html Mon Dec 22 18:12:00 2014 +0100 +++ b/Documentation/Source/eric6.Toolbox.PyQt4ImportHook.html Mon Dec 22 18:31:23 2014 +0100 @@ -20,7 +20,9 @@ </head> <body><a NAME="top" ID="top"></a> <h1>eric6.Toolbox.PyQt4ImportHook</h1> - +<p> +Module implementing an import hook converting PyQt5 imports to PyQt4 imports. +</p> <h3>Global Attributes</h3> <table> <tr><td>None</td></tr> @@ -29,7 +31,7 @@ <table> <tr> <td><a href="#PyQt4Importer">PyQt4Importer</a></td> -<td></td> +<td>Class implementing an importer converting PyQt5 imports to PyQt4 imports.</td> </tr> </table> <h3>Functions</h3> @@ -39,7 +41,10 @@ <hr /><hr /> <a NAME="PyQt4Importer" ID="PyQt4Importer"></a> <h2>PyQt4Importer</h2> - +<p> + Class implementing an importer converting PyQt5 imports to PyQt4 + imports. +</p> <h3>Derived from</h3> object <h3>Class Attributes</h3>
--- a/Documentation/Source/index-eric6.Toolbox.html Mon Dec 22 18:12:00 2014 +0100 +++ b/Documentation/Source/index-eric6.Toolbox.html Mon Dec 22 18:31:23 2014 +0100 @@ -29,7 +29,7 @@ <table> <tr> <td><a href="eric6.Toolbox.PyQt4ImportHook.html">PyQt4ImportHook</a></td> -<td></td> +<td>Module implementing an import hook converting PyQt5 imports to PyQt4 imports.</td> </tr><tr> <td><a href="eric6.Toolbox.SingleApplication.html">SingleApplication</a></td> <td>Module implementing the single application server and client.</td>
--- a/E5Gui/E5ErrorMessage.py Mon Dec 22 18:12:00 2014 +0100 +++ b/E5Gui/E5ErrorMessage.py Mon Dec 22 18:31:23 2014 +0100 @@ -93,7 +93,7 @@ @param msgType type of the message (integer, QtMsgType) @param args message handler arguments, for PyQt4 message to be shown - (bytes), for PyQt5 context information (QMessageLogContext) and + (bytes), for PyQt5 context information (QMessageLogContext) and message to be shown (bytes) """ if len(args) == 2:
--- a/Helpviewer/HelpBrowserWV.py Mon Dec 22 18:12:00 2014 +0100 +++ b/Helpviewer/HelpBrowserWV.py Mon Dec 22 18:31:23 2014 +0100 @@ -1593,7 +1593,7 @@ searchUrlQuery.addQueryItem( searchEngines[searchEngine], searchEngine) else: - searchUrl.addQueryItem( + searchUrl.addQueryItem( searchEngines[searchEngine], searchEngine) engineName = "" labels = formElement.findAll('label[for="{0}"]'.format(elementName))
--- a/Helpviewer/Network/EricAccessHandler.py Mon Dec 22 18:12:00 2014 +0100 +++ b/Helpviewer/Network/EricAccessHandler.py Mon Dec 22 18:31:23 2014 +0100 @@ -76,7 +76,8 @@ htmlFile.open(QFile.ReadOnly) html = bytes(htmlFile.readAll()).decode() - html = (html.replace("@FAVICON@", "qrc:icons/ericWeb16.png") + html = ( + html.replace("@FAVICON@", "qrc:icons/ericWeb16.png") .replace("@IMG_PLUS@", "qrc:icons/plus.png") .replace("@IMG_CLOSE@", "qrc:icons/close.png") .replace("@IMG_EDIT@", "qrc:icons/edit.png")
--- a/QScintilla/Shell.py Mon Dec 22 18:12:00 2014 +0100 +++ b/QScintilla/Shell.py Mon Dec 22 18:31:23 2014 +0100 @@ -12,7 +12,7 @@ import sys import re -from PyQt5.QtCore import pyqtSignal, QFileInfo, Qt, QEvent, qVersion +from PyQt5.QtCore import pyqtSignal, QFileInfo, Qt, QEvent, qVersion from PyQt5.QtGui import QClipboard, QPalette, QFont from PyQt5.QtWidgets import QDialog, QInputDialog, QApplication, QMenu, \ QWidget, QHBoxLayout, QVBoxLayout, QShortcut
--- a/Toolbox/PyQt4ImportHook.py Mon Dec 22 18:12:00 2014 +0100 +++ b/Toolbox/PyQt4ImportHook.py Mon Dec 22 18:31:23 2014 +0100 @@ -3,6 +3,10 @@ # Copyright (c) 2014 Detlev Offenbach <detlev@die-offenbachs.de> # +""" +Module implementing an import hook converting PyQt5 imports to PyQt4 imports. +""" + import sys try: if "--pyqt4" in sys.argv: @@ -14,6 +18,10 @@ import importlib class PyQt4Importer(object): + """ + Class implementing an importer converting PyQt5 imports to PyQt4 + imports. + """ def __init__(self): """ Constructor
--- a/eric6.py Mon Dec 22 18:12:00 2014 +0100 +++ b/eric6.py Mon Dec 22 18:31:23 2014 +0100 @@ -44,7 +44,7 @@ try: from PyQt5.QtCore import qWarning, QLibraryInfo, QTimer, QCoreApplication except ImportError: - try: # Py2 + try: # Py2 import tkMessageBox as messagebox except ImportError: try: # Py3 @@ -231,7 +231,7 @@ app = E5Application(sys.argv) - from Toolbox import Startup + from Toolbox import Startup ddindex = Startup.handleArgs(sys.argv, appinfo) logging.debug("Importing Preferences")
--- a/install.py Mon Dec 22 18:12:00 2014 +0100 +++ b/install.py Mon Dec 22 18:31:23 2014 +0100 @@ -492,7 +492,7 @@ marker = "" for name in ["/usr/share/applications/eric6" + marker + ".desktop", "/usr/share/appdata/eric6" + marker + ".appdata.xml", - "/usr/share/applications/eric6_webbrowser" + marker + + "/usr/share/applications/eric6_webbrowser" + marker + ".desktop"]: if os.path.exists(name): os.remove(name)
--- a/uninstall.py Mon Dec 22 18:12:00 2014 +0100 +++ b/uninstall.py Mon Dec 22 18:31:23 2014 +0100 @@ -106,7 +106,7 @@ marker = "" for name in ["/usr/share/applications/eric6" + marker + ".desktop", "/usr/share/appdata/eric6" + marker + ".appdata.xml", - "/usr/share/applications/eric6_webbrowser" + marker + + "/usr/share/applications/eric6_webbrowser" + marker + ".desktop", "/usr/share/pixmaps/eric" + marker + ".png", "/usr/share/pixmaps/ericWeb" + marker + ".png"]:
