Fixed some code style issues and removed code no longer needed.

Sat, 05 Sep 2015 15:13:13 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 05 Sep 2015 15:13:13 +0200
changeset 4435
9f6555d3c3c0
parent 4434
8ba11cf46483
child 4436
52ec6b6b3432

Fixed some code style issues and removed code no longer needed.

APIs/Python3/eric6.api file | annotate | diff | comparison | revisions
DebugClients/Python/DebugClientBase.py file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Utilities.uic.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.compileUiFiles.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.install.html file | annotate | diff | comparison | revisions
Plugins/AboutPlugin/AboutDialog.py file | annotate | diff | comparison | revisions
QScintilla/SearchReplaceWidget.py file | annotate | diff | comparison | revisions
Utilities/ClassBrowsers/idlclbr.py file | annotate | diff | comparison | revisions
Utilities/ClassBrowsers/pyclbr.py file | annotate | diff | comparison | revisions
Utilities/ClassBrowsers/rbclbr.py file | annotate | diff | comparison | revisions
Utilities/ModuleParser.py file | annotate | diff | comparison | revisions
Utilities/uic.py file | annotate | diff | comparison | revisions
compileUiFiles.py file | annotate | diff | comparison | revisions
eric6.e4p file | annotate | diff | comparison | revisions
install.py file | annotate | diff | comparison | revisions
--- a/APIs/Python3/eric6.api	Sat Sep 05 13:49:08 2015 +0200
+++ b/APIs/Python3/eric6.api	Sat Sep 05 15:13:13 2015 +0200
@@ -9012,10 +9012,7 @@
 eric6.Utilities.supportedCodecs?7
 eric6.Utilities.toBool?4(dataStr)
 eric6.Utilities.toNativeSeparators?4(path)
-eric6.Utilities.uic.compileUiDir?4(dir, recurse=False, map=None, **compileUi_args)
 eric6.Utilities.uic.compileUiFiles?4(dir, recurse=False)
-eric6.Utilities.uic.compile_ui?4(ui_dir, ui_file)
-eric6.Utilities.uic.pyName?4(py_dir, py_file)
 eric6.Utilities.unescape_uentities?4(m)
 eric6.Utilities.win32_GetUserName?4()
 eric6.Utilities.win32_Kill?4(pid)
@@ -9295,11 +9292,8 @@
 eric6.ViewManager.factory?4(parent, ui, dbs, pluginManager)
 eric6.cleanupSource.cleanupSource?4(dirName)
 eric6.cleanupSource.main?4(argv)
-eric6.compileUiFiles.compileUiDir?4(dir, recurse=False, map=None, **compileUi_args)
 eric6.compileUiFiles.compileUiFiles?4()
-eric6.compileUiFiles.compile_ui?4(ui_dir, ui_file)
 eric6.compileUiFiles.main?4(argv)
-eric6.compileUiFiles.pyName?4(py_dir, py_file)
 eric6.eric6.args?7
 eric6.eric6.excepthook?4(excType, excValue, tracebackobj)
 eric6.eric6.handleSingleApplication?4(ddindex)
@@ -9372,9 +9366,7 @@
 eric6.install.cfg?7
 eric6.install.cleanUp?4()
 eric6.install.cleanupSource?4(dirName)
-eric6.install.compileUiDir?4(dir, recurse=False, map=None, **compileUi_args)
 eric6.install.compileUiFiles?4()
-eric6.install.compile_ui?4(ui_dir, ui_file)
 eric6.install.configLength?7
 eric6.install.configName?7
 eric6.install.copyDesktopFile?4(src, dst, marker)
@@ -9409,7 +9401,6 @@
 eric6.install.progLanguages?7
 eric6.install.progName?7
 eric6.install.pyModDir?7
-eric6.install.pyName?4(py_dir, py_file)
 eric6.install.pyqtOverride?7
 eric6.install.pyqtVariant?7
 eric6.install.shutilCopy?4(src, dst, perm=0o644)
--- a/DebugClients/Python/DebugClientBase.py	Sat Sep 05 13:49:08 2015 +0200
+++ b/DebugClients/Python/DebugClientBase.py	Sat Sep 05 15:13:13 2015 +0200
@@ -1502,7 +1502,7 @@
                         try:
                             exec 'mcdict = dict%s.__class__.__dict__' % access
                             ndict.update(mcdict)     # __IGNORE_WARNING__
-                            if mdict and not "sipThis" in mdict.keys():  # __IGNORE_WARNING__
+                            if mdict and "sipThis" not in mdict.keys():  # __IGNORE_WARNING__
                                 del rvar[0:2]
                                 access = ""
                         except:
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Sat Sep 05 13:49:08 2015 +0200
+++ b/Documentation/Help/source.qhp	Sat Sep 05 15:13:13 2015 +0200
@@ -13353,6 +13353,9 @@
       <keyword name="__initChannelModesDict" id="__initChannelModesDict" ref="eric6.Network.IRC.IrcUtilities.html#__initChannelModesDict" />
       <keyword name="__jsSyntaxCheck" id="__jsSyntaxCheck" ref="eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.html#__jsSyntaxCheck" />
       <keyword name="__messageBox" id="__messageBox" ref="eric6.E5Gui.E5MessageBox.html#__messageBox" />
+      <keyword name="__pyName" id="__pyName" ref="eric6.Utilities.uic.html#__pyName" />
+      <keyword name="__pyName" id="__pyName" ref="eric6.compileUiFiles.html#__pyName" />
+      <keyword name="__pyName" id="__pyName" ref="eric6.install.html#__pyName" />
       <keyword name="__readShortcut" id="__readShortcut" ref="eric6.Preferences.Shortcuts.html#__readShortcut" />
       <keyword name="__render" id="__render" ref="eric6.Helpviewer.HelpSnap.html#__render" />
       <keyword name="__reorderFilter" id="__reorderFilter" ref="eric6.E5Gui.E5FileDialog.html#__reorderFilter" />
@@ -13398,16 +13401,10 @@
       <keyword name="comparison_to_singleton" id="comparison_to_singleton" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pep8.html#comparison_to_singleton" />
       <keyword name="comparison_type" id="comparison_type" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pep8.html#comparison_type" />
       <keyword name="compatibility_fixes (Module)" id="compatibility_fixes (Module)" ref="eric6.Globals.compatibility_fixes.html" />
-      <keyword name="compileUiDir" id="compileUiDir" ref="eric6.Utilities.uic.html#compileUiDir" />
-      <keyword name="compileUiDir" id="compileUiDir" ref="eric6.compileUiFiles.html#compileUiDir" />
-      <keyword name="compileUiDir" id="compileUiDir" ref="eric6.install.html#compileUiDir" />
       <keyword name="compileUiFiles" id="compileUiFiles" ref="eric6.Utilities.uic.html#compileUiFiles" />
       <keyword name="compileUiFiles" id="compileUiFiles" ref="eric6.compileUiFiles.html#compileUiFiles" />
       <keyword name="compileUiFiles" id="compileUiFiles" ref="eric6.install.html#compileUiFiles" />
       <keyword name="compileUiFiles (Module)" id="compileUiFiles (Module)" ref="eric6.compileUiFiles.html" />
-      <keyword name="compile_ui" id="compile_ui" ref="eric6.Utilities.uic.html#compile_ui" />
-      <keyword name="compile_ui" id="compile_ui" ref="eric6.compileUiFiles.html#compile_ui" />
-      <keyword name="compile_ui" id="compile_ui" ref="eric6.install.html#compile_ui" />
       <keyword name="compound_statements" id="compound_statements" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pep8.html#compound_statements" />
       <keyword name="contentSniff" id="contentSniff" ref="eric6.Helpviewer.HelpBrowserWV.html#contentSniff" />
       <keyword name="context" id="context" ref="eric6.DebugClients.Ruby.Debuggee.html#context" />
@@ -13867,9 +13864,6 @@
       <keyword name="pwReencrypt" id="pwReencrypt" ref="eric6.Utilities.crypto.__init__.html#pwReencrypt" />
       <keyword name="py3AES (Module)" id="py3AES (Module)" ref="eric6.Utilities.crypto.py3AES.html" />
       <keyword name="py3PBKDF2 (Module)" id="py3PBKDF2 (Module)" ref="eric6.Utilities.crypto.py3PBKDF2.html" />
-      <keyword name="pyName" id="pyName" ref="eric6.Utilities.uic.html#pyName" />
-      <keyword name="pyName" id="pyName" ref="eric6.compileUiFiles.html#pyName" />
-      <keyword name="pyName" id="pyName" ref="eric6.install.html#pyName" />
       <keyword name="pyclbr (Module)" id="pyclbr (Module)" ref="eric6.Utilities.ClassBrowsers.pyclbr.html" />
       <keyword name="python_3000_backticks" id="python_3000_backticks" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pep8.html#python_3000_backticks" />
       <keyword name="python_3000_has_key" id="python_3000_has_key" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pep8.html#python_3000_has_key" />
--- a/Documentation/Source/eric6.Utilities.uic.html	Sat Sep 05 13:49:08 2015 +0200
+++ b/Documentation/Source/eric6.Utilities.uic.html	Sat Sep 05 15:13:13 2015 +0200
@@ -35,51 +35,32 @@
 <h3>Functions</h3>
 <table>
 <tr>
-<td><a href="#compileUiDir">compileUiDir</a></td>
-<td>Creates Python modules from Qt Designer .ui files in a directory or directory tree.</td>
+<td><a href="#__pyName">__pyName</a></td>
+<td>Local function to create the Python source file name for the compiled .ui file.</td>
 </tr><tr>
 <td><a href="#compileUiFiles">compileUiFiles</a></td>
 <td>Module function to compile the .ui files of a directory tree to Python sources.</td>
-</tr><tr>
-<td><a href="#compile_ui">compile_ui</a></td>
-<td>Local function to compile a single .ui file.</td>
-</tr><tr>
-<td><a href="#pyName">pyName</a></td>
-<td>Local function to create the Python source file name for the compiled .ui file.</td>
 </tr>
 </table>
 <hr /><hr />
-<a NAME="compileUiDir" ID="compileUiDir"></a>
-<h2>compileUiDir</h2>
-<b>compileUiDir</b>(<i>dir, recurse=False, map=None, **compileUi_args</i>)
+<a NAME="__pyName" ID="__pyName"></a>
+<h2>__pyName</h2>
+<b>__pyName</b>(<i>py_dir, py_file</i>)
 <p>
-            Creates Python modules from Qt Designer .ui files in a directory or
-            directory tree.
-</p><p>
-            Note: This function is a modified version of the one found in
-            PyQt5.
+    Local function to create the Python source file name for the compiled
+    .ui file.
 </p><dl>
-<dt><i>dir</i></dt>
+<dt><i>py_dir</i></dt>
 <dd>
-Name of the directory to scan for files whose name ends
-                with '.ui'. By default the generated Python module is created
-                in the same directory ending with '.py'.
-</dd><dt><i>recurse</i></dt>
-<dd>
-flag indicating that any sub-directories should be
-                scanned.
-</dd><dt><i>map</i></dt>
+suggested name of the directory (string)
+</dd><dt><i>py_file</i></dt>
 <dd>
-an optional callable that is passed the name of the
-                directory containing the '.ui' file and the name of the Python
-                module that will be created. The callable should return a tuple
-                of the name of the directory in which the Python module will be
-                created and the (possibly modified) name of the module.
-</dd><dt><i>compileUi_args</i></dt>
+suggested name for the compile source file (string)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
 <dd>
-any additional keyword arguments that are
-                passed to the compileUi() function that is called to create
-                each Python module.
+tuple of directory name (string) and source file name (string)
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
@@ -100,43 +81,5 @@
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
-<a NAME="compile_ui" ID="compile_ui"></a>
-<h2>compile_ui</h2>
-<b>compile_ui</b>(<i>ui_dir, ui_file</i>)
-<p>
-                Local function to compile a single .ui file.
-</p><dl>
-<dt><i>ui_dir</i></dt>
-<dd>
-directory containing the .ui file (string)
-</dd><dt><i>ui_file</i></dt>
-<dd>
-file name of the .ui file (string)
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
-<a NAME="pyName" ID="pyName"></a>
-<h2>pyName</h2>
-<b>pyName</b>(<i>py_dir, py_file</i>)
-<p>
-        Local function to create the Python source file name for the compiled
-        .ui file.
-</p><dl>
-<dt><i>py_dir</i></dt>
-<dd>
-suggested name of the directory (string)
-</dd><dt><i>py_file</i></dt>
-<dd>
-suggested name for the compile source file (string)
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-tuple of directory name (string) and source file name (string)
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
 <hr />
 </body></html>
\ No newline at end of file
--- a/Documentation/Source/eric6.compileUiFiles.html	Sat Sep 05 13:49:08 2015 +0200
+++ b/Documentation/Source/eric6.compileUiFiles.html	Sat Sep 05 15:13:13 2015 +0200
@@ -34,101 +34,23 @@
 <h3>Functions</h3>
 <table>
 <tr>
-<td><a href="#compileUiDir">compileUiDir</a></td>
-<td>Creates Python modules from Qt Designer .ui files in a directory or directory tree.</td>
+<td><a href="#__pyName">__pyName</a></td>
+<td>Local function to create the Python source file name for the compiled .ui file.</td>
 </tr><tr>
 <td><a href="#compileUiFiles">compileUiFiles</a></td>
 <td>Compile the .ui files to Python sources.</td>
 </tr><tr>
-<td><a href="#compile_ui">compile_ui</a></td>
-<td>Local function to compile a single .ui file.</td>
-</tr><tr>
 <td><a href="#main">main</a></td>
 <td>The main function of the script.</td>
-</tr><tr>
-<td><a href="#pyName">pyName</a></td>
-<td>Local function to create the Python source file name for the compiled .ui file.</td>
 </tr>
 </table>
 <hr /><hr />
-<a NAME="compileUiDir" ID="compileUiDir"></a>
-<h2>compileUiDir</h2>
-<b>compileUiDir</b>(<i>dir, recurse=False, map=None, **compileUi_args</i>)
-<p>
-            Creates Python modules from Qt Designer .ui files in a directory or
-            directory tree.
-</p><p>
-            Note: This function is a modified version of the one found in
-            PyQt5.
-</p><dl>
-<dt><i>dir</i></dt>
-<dd>
-Name of the directory to scan for files whose name ends
-                with '.ui'. By default the generated Python module is created
-                in the same directory ending with '.py'.
-</dd><dt><i>recurse</i></dt>
-<dd>
-flag indicating that any sub-directories should be
-                scanned.
-</dd><dt><i>map</i></dt>
-<dd>
-an optional callable that is passed the name of the
-                directory containing the '.ui' file and the name of the Python
-                module that will be created. The callable should return a tuple
-                of the name of the directory in which the Python module will be
-                created and the (possibly modified) name of the module.
-</dd><dt><i>compileUi_args</i></dt>
-<dd>
-any additional keyword arguments that are
-                passed to the compileUi() function that is called to create
-                each Python module.
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
-<a NAME="compileUiFiles" ID="compileUiFiles"></a>
-<h2>compileUiFiles</h2>
-<b>compileUiFiles</b>(<i></i>)
+<a NAME="__pyName" ID="__pyName"></a>
+<h2>__pyName</h2>
+<b>__pyName</b>(<i>py_dir, py_file</i>)
 <p>
-    Compile the .ui files to Python sources.
-</p>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
-<a NAME="compile_ui" ID="compile_ui"></a>
-<h2>compile_ui</h2>
-<b>compile_ui</b>(<i>ui_dir, ui_file</i>)
-<p>
-                Local function to compile a single .ui file.
-</p><dl>
-<dt><i>ui_dir</i></dt>
-<dd>
-directory containing the .ui file (string)
-</dd><dt><i>ui_file</i></dt>
-<dd>
-file name of the .ui file (string)
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
-<a NAME="main" ID="main"></a>
-<h2>main</h2>
-<b>main</b>(<i>argv</i>)
-<p>
-    The main function of the script.
-</p><dl>
-<dt><i>argv</i></dt>
-<dd>
-the list of command line arguments.
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
-<a NAME="pyName" ID="pyName"></a>
-<h2>pyName</h2>
-<b>pyName</b>(<i>py_dir, py_file</i>)
-<p>
-        Local function to create the Python source file name for the compiled
-        .ui file.
+    Local function to create the Python source file name for the compiled
+    .ui file.
 </p><dl>
 <dt><i>py_dir</i></dt>
 <dd>
@@ -144,5 +66,26 @@
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="compileUiFiles" ID="compileUiFiles"></a>
+<h2>compileUiFiles</h2>
+<b>compileUiFiles</b>(<i></i>)
+<p>
+    Compile the .ui files to Python sources.
+</p>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="main" ID="main"></a>
+<h2>main</h2>
+<b>main</b>(<i>argv</i>)
+<p>
+    The main function of the script.
+</p><dl>
+<dt><i>argv</i></dt>
+<dd>
+the list of command line arguments.
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
 <hr />
 </body></html>
\ No newline at end of file
--- a/Documentation/Source/eric6.install.html	Sat Sep 05 13:49:08 2015 +0200
+++ b/Documentation/Source/eric6.install.html	Sat Sep 05 15:13:13 2015 +0200
@@ -34,21 +34,18 @@
 <h3>Functions</h3>
 <table>
 <tr>
+<td><a href="#__pyName">__pyName</a></td>
+<td>Local function to create the Python source file name for the compiled .ui file.</td>
+</tr><tr>
 <td><a href="#cleanUp">cleanUp</a></td>
 <td>Uninstall the old eric files.</td>
 </tr><tr>
 <td><a href="#cleanupSource">cleanupSource</a></td>
 <td>Cleanup the sources directory to get rid of leftover files and directories.</td>
 </tr><tr>
-<td><a href="#compileUiDir">compileUiDir</a></td>
-<td>Creates Python modules from Qt Designer .ui files in a directory or directory tree.</td>
-</tr><tr>
 <td><a href="#compileUiFiles">compileUiFiles</a></td>
 <td>Compile the .ui files to Python sources.</td>
 </tr><tr>
-<td><a href="#compile_ui">compile_ui</a></td>
-<td>Local function to compile a single .ui file.</td>
-</tr><tr>
 <td><a href="#copyDesktopFile">copyDesktopFile</a></td>
 <td>Modify a desktop file and write it to its destination.</td>
 </tr><tr>
@@ -94,9 +91,6 @@
 <td><a href="#prepareInfoFile">prepareInfoFile</a></td>
 <td>Function to prepare an Info.py file when installing from source.</td>
 </tr><tr>
-<td><a href="#pyName">pyName</a></td>
-<td>Local function to create the Python source file name for the compiled .ui file.</td>
-</tr><tr>
 <td><a href="#shutilCopy">shutilCopy</a></td>
 <td>Wrapper function around shutil.copy() to ensure the permissions.</td>
 </tr><tr>
@@ -108,6 +102,28 @@
 </tr>
 </table>
 <hr /><hr />
+<a NAME="__pyName" ID="__pyName"></a>
+<h2>__pyName</h2>
+<b>__pyName</b>(<i>py_dir, py_file</i>)
+<p>
+    Local function to create the Python source file name for the compiled
+    .ui file.
+</p><dl>
+<dt><i>py_dir</i></dt>
+<dd>
+suggested name of the directory (string)
+</dd><dt><i>py_file</i></dt>
+<dd>
+suggested name for the compile source file (string)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+tuple of directory name (string) and source file name (string)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
 <a NAME="cleanUp" ID="cleanUp"></a>
 <h2>cleanUp</h2>
 <b>cleanUp</b>(<i></i>)
@@ -130,41 +146,6 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
-<a NAME="compileUiDir" ID="compileUiDir"></a>
-<h2>compileUiDir</h2>
-<b>compileUiDir</b>(<i>dir, recurse=False, map=None, **compileUi_args</i>)
-<p>
-            Creates Python modules from Qt Designer .ui files in a directory or
-            directory tree.
-</p><p>
-            Note: This function is a modified version of the one found in
-            PyQt5.
-</p><dl>
-<dt><i>dir</i></dt>
-<dd>
-Name of the directory to scan for files whose name ends
-                with '.ui'. By default the generated Python module is created
-                in the same directory ending with '.py'.
-</dd><dt><i>recurse</i></dt>
-<dd>
-flag indicating that any sub-directories should be
-                scanned.
-</dd><dt><i>map</i></dt>
-<dd>
-an optional callable that is passed the name of the
-                directory containing the '.ui' file and the name of the Python
-                module that will be created. The callable should return a
-                tuple of the name of the directory in which the Python module
-                will be created and the (possibly modified) name of the module.
-</dd><dt><i>compileUi_args</i></dt>
-<dd>
-any additional keyword arguments that are
-                passed to the compileUi() function that is called to create
-                each Python module.
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
 <a NAME="compileUiFiles" ID="compileUiFiles"></a>
 <h2>compileUiFiles</h2>
 <b>compileUiFiles</b>(<i></i>)
@@ -173,22 +154,6 @@
 </p>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
-<a NAME="compile_ui" ID="compile_ui"></a>
-<h2>compile_ui</h2>
-<b>compile_ui</b>(<i>ui_dir, ui_file</i>)
-<p>
-                Local function to compile a single .ui file.
-</p><dl>
-<dt><i>ui_dir</i></dt>
-<dd>
-directory containing the .ui file (string)
-</dd><dt><i>ui_file</i></dt>
-<dd>
-file name of the .ui file (string)
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
 <a NAME="copyDesktopFile" ID="copyDesktopFile"></a>
 <h2>copyDesktopFile</h2>
 <b>copyDesktopFile</b>(<i>src, dst, marker</i>)
@@ -392,28 +357,6 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
-<a NAME="pyName" ID="pyName"></a>
-<h2>pyName</h2>
-<b>pyName</b>(<i>py_dir, py_file</i>)
-<p>
-        Local function to create the Python source file name for the compiled
-        .ui file.
-</p><dl>
-<dt><i>py_dir</i></dt>
-<dd>
-suggested name of the directory (string)
-</dd><dt><i>py_file</i></dt>
-<dd>
-suggested name for the compile source file (string)
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-tuple of directory name (string) and source file name (string)
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
 <a NAME="shutilCopy" ID="shutilCopy"></a>
 <h2>shutilCopy</h2>
 <b>shutilCopy</b>(<i>src, dst, perm=0o644</i>)
--- a/Plugins/AboutPlugin/AboutDialog.py	Sat Sep 05 13:49:08 2015 +0200
+++ b/Plugins/AboutPlugin/AboutDialog.py	Sat Sep 05 15:13:13 2015 +0200
@@ -98,7 +98,7 @@
 
 And all the people who reported bugs and made suggestions."""
 
-licenseText = \
+licenseText = (
 """Eric is {0}
 
 You may use, distribute and copy Eric under the terms of the GNU
@@ -728,8 +728,8 @@
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
-                     END OF TERMS AND CONDITIONS""" \
-.format(UI.Info.Copyright)                  # __IGNORE_WARNING__
+                     END OF TERMS AND CONDITIONS
+""").format(UI.Info.Copyright)
 
 
 class AboutDialog(QDialog, Ui_AboutDialog):
--- a/QScintilla/SearchReplaceWidget.py	Sat Sep 05 13:49:08 2015 +0200
+++ b/QScintilla/SearchReplaceWidget.py	Sat Sep 05 15:13:13 2015 +0200
@@ -118,7 +118,8 @@
 <td>This matches 1 or more times. For example, <code>Sa+m</code> matches
 <code>Sam</code>, <code>Saam</code>, <code>Saaam</code> and so on.</td></tr>
 </table>
-""")                                                # __IGNORE_WARNING__
+"""
+        )
         self.setWhatsThis(whatsThis)
         
         self.ui.closeButton.setIcon(UI.PixmapCache.getIcon("close.png"))
--- a/Utilities/ClassBrowsers/idlclbr.py	Sat Sep 05 13:49:08 2015 +0200
+++ b/Utilities/ClassBrowsers/idlclbr.py	Sat Sep 05 15:13:13 2015 +0200
@@ -84,8 +84,8 @@
 
 |   (?P<End>
         [ \t]* } [ \t]* ;
-    )
-""", re.VERBOSE | re.DOTALL | re.MULTILINE).search      # __IGNORE_WARNING__
+    )""",
+    re.VERBOSE | re.DOTALL | re.MULTILINE).search
 
 # function to replace comments
 _commentsub = re.compile(r"""//[^\n]*\n|//[^\n]*$""").sub
--- a/Utilities/ClassBrowsers/pyclbr.py	Sat Sep 05 13:49:08 2015 +0200
+++ b/Utilities/ClassBrowsers/pyclbr.py	Sat Sep 05 15:13:13 2015 +0200
@@ -128,8 +128,8 @@
 
 |   (?P<CodingLine>
         ^ \# \s* [*_-]* \s* coding[:=] \s* (?P<Coding> [-\w_.]+ ) \s* [*_-]* $
-    )
-""", re.VERBOSE | re.DOTALL | re.MULTILINE).search      # __IGNORE_WARNING__
+    )""",
+    re.VERBOSE | re.DOTALL | re.MULTILINE).search
 
 _commentsub = re.compile(r"""#[^\n]*\n|#[^\n]*$""").sub
 
--- a/Utilities/ClassBrowsers/rbclbr.py	Sat Sep 05 13:49:08 2015 +0200
+++ b/Utilities/ClassBrowsers/rbclbr.py	Sat Sep 05 15:13:13 2015 +0200
@@ -157,8 +157,8 @@
         |
             end \b [^_]
         )
-    )
-""", re.VERBOSE | re.DOTALL | re.MULTILINE).search      # __IGNORE_WARNING__
+    )""",
+    re.VERBOSE | re.DOTALL | re.MULTILINE).search
 
 _commentsub = re.compile(r"""#[^\n]*\n|#[^\n]*$""").sub
 
--- a/Utilities/ModuleParser.py	Sat Sep 05 13:49:08 2015 +0200
+++ b/Utilities/ModuleParser.py	Sat Sep 05 15:13:13 2015 +0200
@@ -194,8 +194,8 @@
         ^
         (?P<ConditionalDefineIndent> [ \t]* )
         (?: (?: if | elif ) [ \t]+ [^:]* | else [ \t]* ) : (?= \s* def)
-    )
-""", re.VERBOSE | re.DOTALL | re.MULTILINE).search      # __IGNORE_WARNING__
+    )""",
+    re.VERBOSE | re.DOTALL | re.MULTILINE).search
 
 _rb_getnext = re.compile(
 r"""
@@ -331,8 +331,8 @@
         |
             end \b [^_]
         )
-    )
-""", re.VERBOSE | re.DOTALL | re.MULTILINE).search      # __IGNORE_WARNING__
+    )""",
+    re.VERBOSE | re.DOTALL | re.MULTILINE).search
 
 _hashsub = re.compile(r"""^([ \t]*)#[ \t]?""", re.MULTILINE).sub
 
--- a/Utilities/uic.py	Sat Sep 05 13:49:08 2015 +0200
+++ b/Utilities/uic.py	Sat Sep 05 15:13:13 2015 +0200
@@ -10,7 +10,19 @@
 
 from __future__ import unicode_literals
 
-import os
+from PyQt5.uic import compileUiDir
+
+
+def __pyName(py_dir, py_file):
+    """
+    Local function to create the Python source file name for the compiled
+    .ui file.
+    
+    @param py_dir suggested name of the directory (string)
+    @param py_file suggested name for the compile source file (string)
+    @return tuple of directory name (string) and source file name (string)
+    """
+    return py_dir, "Ui_{0}".format(py_file)
 
 
 def compileUiFiles(dir, recurse=False):
@@ -20,88 +32,5 @@
     
     @param dir name of a directory to scan for .ui files (string)
     @param recurse flag indicating to recurse into subdirectories (boolean)
-    """                                                 # __IGNORE_WARNING__
-    try:
-        from PyQt5.uic import compileUiDir
-    except ImportError:
-        from PyQt5.uic import compileUi
-        
-        def compileUiDir(dir, recurse=False,            # __IGNORE_WARNING__
-                         map=None, **compileUi_args):
-            """
-            Creates Python modules from Qt Designer .ui files in a directory or
-            directory tree.
-            
-            Note: This function is a modified version of the one found in
-            PyQt5.
-
-            @param dir Name of the directory to scan for files whose name ends
-                with '.ui'. By default the generated Python module is created
-                in the same directory ending with '.py'.
-            @param recurse flag indicating that any sub-directories should be
-                scanned.
-            @param map an optional callable that is passed the name of the
-                directory containing the '.ui' file and the name of the Python
-                module that will be created. The callable should return a tuple
-                of the name of the directory in which the Python module will be
-                created and the (possibly modified) name of the module.
-            @param compileUi_args any additional keyword arguments that are
-                passed to the compileUi() function that is called to create
-                each Python module.
-            """
-            def compile_ui(ui_dir, ui_file):
-                """
-                Local function to compile a single .ui file.
-                
-                @param ui_dir directory containing the .ui file (string)
-                @param ui_file file name of the .ui file (string)
-                """
-                # Ignore if it doesn't seem to be a .ui file.
-                if ui_file.endswith('.ui'):
-                    py_dir = ui_dir
-                    py_file = ui_file[:-3] + '.py'
-
-                    # Allow the caller to change the name of the .py file or
-                    # generate it in a different directory.
-                    if map is not None:
-                        py_dir, py_file = list(map(py_dir, py_file))
-
-                    # Make sure the destination directory exists.
-                    try:
-                        os.makedirs(py_dir)
-                    except:
-                        pass
-
-                    ui_path = os.path.join(ui_dir, ui_file)
-                    py_path = os.path.join(py_dir, py_file)
-
-                    ui_file = open(ui_path, 'r')
-                    py_file = open(py_path, 'w')
-
-                    try:
-                        compileUi(ui_file, py_file, **compileUi_args)
-                    finally:
-                        ui_file.close()
-                        py_file.close()
-
-            if recurse:
-                for root, _, files in os.walk(dir):
-                    for ui in files:
-                        compile_ui(root, ui)
-            else:
-                for ui in os.listdir(dir):
-                    if os.path.isfile(os.path.join(dir, ui)):
-                        compile_ui(dir, ui)
-
-    def pyName(py_dir, py_file):
-        """
-        Local function to create the Python source file name for the compiled
-        .ui file.
-        
-        @param py_dir suggested name of the directory (string)
-        @param py_file suggested name for the compile source file (string)
-        @return tuple of directory name (string) and source file name (string)
-        """
-        return py_dir, "Ui_{0}".format(py_file)
-    
-    compileUiDir(dir, recurse, pyName)
+    """
+    compileUiDir(dir, recurse, __pyName)
--- a/compileUiFiles.py	Sat Sep 05 13:49:08 2015 +0200
+++ b/compileUiFiles.py	Sat Sep 05 15:13:13 2015 +0200
@@ -12,112 +12,39 @@
 from __future__ import print_function
 
 import sys
-import os
+
+# step 1: determine PyQt variant, preferring PyQt5
+try:
+    import PyQt5        # __IGNORE_WARNING__
+    pyqtVariant = "PyQt5"
+except ImportError:
+    import PyQt4    # __IGNORE_WARNING__
+    pyqtVariant = "PyQt4"
+
+# step 2: compile the UI files
+if pyqtVariant == "PyQt4":
+    from PyQt4.uic import compileUiDir
+else:
+    from PyQt5.uic import compileUiDir
+
+
+def __pyName(py_dir, py_file):
+    """
+    Local function to create the Python source file name for the compiled
+    .ui file.
+    
+    @param py_dir suggested name of the directory (string)
+    @param py_file suggested name for the compile source file (string)
+    @return tuple of directory name (string) and source file name (string)
+    """
+    return py_dir, "Ui_{0}".format(py_file)
 
 
 def compileUiFiles():
     """
     Compile the .ui files to Python sources.
-    """                                                 # __IGNORE_WARNING__
-    # step 1: determine PyQt variant, preferring PyQt5
-    try:
-        import PyQt5        # __IGNORE_WARNING__
-        pyqtVariant = "PyQt5"
-    except ImportError:
-        import PyQt4    # __IGNORE_WARNING__
-        pyqtVariant = "PyQt4"
-    
-    # step 2: compile the UI files
-    try:
-        if pyqtVariant == "PyQt4":
-            from PyQt4.uic import compileUiDir
-        else:
-            from PyQt5.uic import compileUiDir
-    except ImportError:
-        if pyqtVariant == "PyQt4":
-            from PyQt4.uic import compileUi
-        else:
-            from PyQt5.uic import compileUi
-        
-        def compileUiDir(dir, recurse=False,            # __IGNORE_WARNING__
-                         map=None, **compileUi_args):
-            """
-            Creates Python modules from Qt Designer .ui files in a directory or
-            directory tree.
-            
-            Note: This function is a modified version of the one found in
-            PyQt5.
-
-            @param dir Name of the directory to scan for files whose name ends
-                with '.ui'. By default the generated Python module is created
-                in the same directory ending with '.py'.
-            @param recurse flag indicating that any sub-directories should be
-                scanned.
-            @param map an optional callable that is passed the name of the
-                directory containing the '.ui' file and the name of the Python
-                module that will be created. The callable should return a tuple
-                of the name of the directory in which the Python module will be
-                created and the (possibly modified) name of the module.
-            @param compileUi_args any additional keyword arguments that are
-                passed to the compileUi() function that is called to create
-                each Python module.
-            """
-            def compile_ui(ui_dir, ui_file):
-                """
-                Local function to compile a single .ui file.
-                
-                @param ui_dir directory containing the .ui file (string)
-                @param ui_file file name of the .ui file (string)
-                """
-                # Ignore if it doesn't seem to be a .ui file.
-                if ui_file.endswith('.ui'):
-                    py_dir = ui_dir
-                    py_file = ui_file[:-3] + '.py'
-
-                    # Allow the caller to change the name of the .py file or
-                    # generate it in a different directory.
-                    if map is not None:
-                        py_dir, py_file = list(map(py_dir, py_file))
-
-                    # Make sure the destination directory exists.
-                    try:
-                        os.makedirs(py_dir)
-                    except:
-                        pass
-
-                    ui_path = os.path.join(ui_dir, ui_file)
-                    py_path = os.path.join(py_dir, py_file)
-
-                    ui_file = open(ui_path, 'r')
-                    py_file = open(py_path, 'w')
-
-                    try:
-                        compileUi(ui_file, py_file, **compileUi_args)
-                    finally:
-                        ui_file.close()
-                        py_file.close()
-
-            if recurse:
-                for root, _, files in os.walk(dir):
-                    for ui in files:
-                        compile_ui(root, ui)
-            else:
-                for ui in os.listdir(dir):
-                    if os.path.isfile(os.path.join(dir, ui)):
-                        compile_ui(dir, ui)
-    
-    def pyName(py_dir, py_file):
-        """
-        Local function to create the Python source file name for the compiled
-        .ui file.
-        
-        @param py_dir suggested name of the directory (string)
-        @param py_file suggested name for the compile source file (string)
-        @return tuple of directory name (string) and source file name (string)
-        """
-        return py_dir, "Ui_{0}".format(py_file)
-    
-    compileUiDir(".", True, pyName)
+    """
+    compileUiDir(".", True, __pyName)
 
 
 def main(argv):
--- a/eric6.e4p	Sat Sep 05 13:49:08 2015 +0200
+++ b/eric6.e4p	Sat Sep 05 15:13:13 2015 +0200
@@ -2145,7 +2145,7 @@
               <string>ExcludeMessages</string>
             </key>
             <value>
-              <string>N802, N803, N807, N808, N821, W293, E265</string>
+              <string>E265, N802, N803, N807, N808, N821, W293, C101</string>
             </value>
             <key>
               <string>FixCodes</string>
@@ -2172,6 +2172,12 @@
               <string></string>
             </value>
             <key>
+              <string>MaxCodeComplexity</string>
+            </key>
+            <value>
+              <int>10</int>
+            </value>
+            <key>
               <string>MaxLineLength</string>
             </key>
             <value>
@@ -2193,7 +2199,7 @@
               <string>ShowIgnored</string>
             </key>
             <value>
-              <bool>False</bool>
+              <bool>True</bool>
             </value>
           </dict>
         </value>
--- a/install.py	Sat Sep 05 13:49:08 2015 +0200
+++ b/install.py	Sat Sep 05 15:13:13 2015 +0200
@@ -1234,101 +1234,28 @@
     print()
 
 
+def __pyName(py_dir, py_file):
+    """
+    Local function to create the Python source file name for the compiled
+    .ui file.
+    
+    @param py_dir suggested name of the directory (string)
+    @param py_file suggested name for the compile source file (string)
+    @return tuple of directory name (string) and source file name (string)
+    """
+    return py_dir, "Ui_{0}".format(py_file)
+
+
 def compileUiFiles():
     """
     Compile the .ui files to Python sources.
-    """                                                 # __IGNORE_WARNING__
+    """
     global sourceDir
-    try:
-        if pyqtVariant == "PyQt4":
-            from PyQt4.uic import compileUiDir
-        else:
-            from PyQt5.uic import compileUiDir
-    except ImportError:
-        if pyqtVariant == "PyQt4":
-            from PyQt4.uic import compileUi
-        else:
-            from PyQt5.uic import compileUi
-        
-        def compileUiDir(dir, recurse=False,            # __IGNORE_WARNING__
-                         map=None, **compileUi_args):
-            """
-            Creates Python modules from Qt Designer .ui files in a directory or
-            directory tree.
-            
-            Note: This function is a modified version of the one found in
-            PyQt5.
-
-            @param dir Name of the directory to scan for files whose name ends
-                with '.ui'. By default the generated Python module is created
-                in the same directory ending with '.py'.
-            @param recurse flag indicating that any sub-directories should be
-                scanned.
-            @param map an optional callable that is passed the name of the
-                directory containing the '.ui' file and the name of the Python
-                module that will be created. The callable should return a
-                tuple of the name of the directory in which the Python module
-                will be created and the (possibly modified) name of the module.
-            @param compileUi_args any additional keyword arguments that are
-                passed to the compileUi() function that is called to create
-                each Python module.
-            """
-            def compile_ui(ui_dir, ui_file):
-                """
-                Local function to compile a single .ui file.
-                
-                @param ui_dir directory containing the .ui file (string)
-                @param ui_file file name of the .ui file (string)
-                """
-                # Ignore if it doesn't seem to be a .ui file.
-                if ui_file.endswith('.ui'):
-                    py_dir = ui_dir
-                    py_file = ui_file[:-3] + '.py'
-
-                    # Allow the caller to change the name of the .py file or
-                    # generate it in a different directory.
-                    if map is not None:
-                        py_dir, py_file = list(map(py_dir, py_file))
-
-                    # Make sure the destination directory exists.
-                    try:
-                        os.makedirs(py_dir)
-                    except:
-                        pass
-
-                    ui_path = os.path.join(ui_dir, ui_file)
-                    py_path = os.path.join(py_dir, py_file)
-
-                    ui_file = open(ui_path, 'r')
-                    py_file = open(py_path, 'w')
-
-                    try:
-                        compileUi(ui_file, py_file, **compileUi_args)
-                    finally:
-                        ui_file.close()
-                        py_file.close()
-
-            if recurse:
-                for root, _, files in os.walk(dir):
-                    for ui in files:
-                        compile_ui(root, ui)
-            else:
-                for ui in os.listdir(dir):
-                    if os.path.isfile(os.path.join(dir, ui)):
-                        compile_ui(dir, ui)
-    
-    def pyName(py_dir, py_file):
-        """
-        Local function to create the Python source file name for the compiled
-        .ui file.
-        
-        @param py_dir suggested name of the directory (string)
-        @param py_file suggested name for the compile source file (string)
-        @return tuple of directory name (string) and source file name (string)
-        """
-        return py_dir, "Ui_{0}".format(py_file)
-    
-    compileUiDir(sourceDir, True, pyName)
+    if pyqtVariant == "PyQt4":
+        from PyQt4.uic import compileUiDir
+    else:
+        from PyQt5.uic import compileUiDir
+    compileUiDir(sourceDir, True, __pyName)
 
 
 def prepareInfoFile(fileName):

eric ide

mercurial