Mercurial Repositories > eric / changeset

--- a/Cooperation/ChatWidget.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Cooperation/ChatWidget.py	Mon Oct 14 20:08:19 2013 +0200
@@ -186,6 +186,7 @@
                 UI.PixmapCache.getPixmap("cooperation48.png"),
                 self.trUtf8("New User"), self.trUtf8("{0} has joined.")
                     .format(nick))
+
     def __participantLeft(self, nick):
         """
         Private slot handling a participant leaving the session.
@@ -228,7 +229,7 @@
             return
         
         self.chatEdit.append(
-            QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) + \
+            QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
             " <" + from_ + ">:")
         self.chatEdit.append(message + "\n")
         bar = self.chatEdit.verticalScrollBar()
@@ -302,7 +303,7 @@
             self.__client.close()
             self.serverButton.setText(self.trUtf8("Start Server"))
             self.serverPortSpin.setEnabled(True)
-            if (self.serverPortSpin.value() != 
+            if (self.serverPortSpin.value() !=
                     Preferences.getCooperation("ServerPort")):
                 self.serverPortSpin.setValue(
                     Preferences.getCooperation("ServerPort"))
@@ -318,7 +319,7 @@
             else:
                 self.__showErrorMessage(
                     self.trUtf8("! Server Error: {0}\n").format(
-                    self.__client.errorString())
+                        self.__client.errorString())
                 )
     
     def __setConnected(self, connected):
@@ -586,7 +587,7 @@
                         self.trUtf8("""<p>The chat contents could not be"""
                                     """ written to <b>{0}</b></p>"""
                                     """<p>Reason: {1}</p>""") .format(
-                                    fname, str(err)))
+                        fname, str(err)))
     
     def __copyChat(self):
         """
@@ -690,7 +691,7 @@
             ":")
         self.chatEdit.append(
             self.trUtf8("* {0} has been banned and kicked.\n")
-                .format( itm.text().split("@")[0]))
+                .format(itm.text().split("@")[0]))
         self.chatEdit.setTextColor(color)
     
     def shutdown(self):

--- a/Cooperation/Connection.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Cooperation/Connection.py	Mon Oct 14 20:08:19 2013 +0200
@@ -200,7 +200,7 @@
             if bannedName in Preferences.getCooperation("BannedUsers"):
                 self.rejected.emit(self.trUtf8(
                     "* Connection attempted by banned user '{0}'.")
-                        .format(bannedName))
+                    .format(bannedName))
                 self.abort()
                 return
             

--- a/DataViews/CodeMetrics.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DataViews/CodeMetrics.py	Mon Oct 14 20:08:19 2013 +0200
@@ -173,8 +173,8 @@
         Public method used to format and print the collected statistics.
         """
         label_len = 79 - len(spacer) - 6 * 6
-        print(spacer + "FUNCTION / CLASS".ljust(label_len) + \
-            " START   END LINES  NLOC  COMM EMPTY")
+        print(spacer + "FUNCTION / CLASS".ljust(label_len) +
+              " START   END LINES  NLOC  COMM EMPTY")
         for id in self.identifiers + ['TOTAL ']:
             label = id
             counters = self.counters.get(id, {})

--- a/DataViews/CodeMetricsDialog.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DataViews/CodeMetricsDialog.py	Mon Oct 14 20:08:19 2013 +0200
@@ -184,7 +184,7 @@
         
         # now do the summary stuff
         docstrings = total['lines'] - total['comments'] - \
-                     total['empty lines'] - total['non-commentary lines']
+            total['empty lines'] - total['non-commentary lines']
         self.__createSummaryItem(self.trUtf8("files"),
                                  loc.toString(total['files']))
         self.__createSummaryItem(self.trUtf8("lines"),
@@ -266,7 +266,7 @@
         filterList = filterString.split(",")
         if filterList:
             for filter in filterList:
-                fileList = [f for f in fileList 
+                fileList = [f for f in fileList
                             if not fnmatch.fnmatch(f, filter.strip())]
         
         self.resultList.clear()

--- a/DataViews/PyCoverageDialog.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DataViews/PyCoverageDialog.py	Mon Oct 14 20:08:19 2013 +0200
@@ -51,14 +51,14 @@
         
         self.__menu = QMenu(self)
         self.__menu.addSeparator()
-        self.openAct = self.__menu.addAction(self.trUtf8("Open"),
-            self.__openFile)
+        self.openAct = self.__menu.addAction(
+            self.trUtf8("Open"), self.__openFile)
         self.__menu.addSeparator()
-        self.annotate = self.__menu.addAction(self.trUtf8('Annotate'),
-            self.__annotate)
+        self.annotate = self.__menu.addAction(
+            self.trUtf8('Annotate'), self.__annotate)
         self.__menu.addAction(self.trUtf8('Annotate all'), self.__annotateAll)
-        self.__menu.addAction(self.trUtf8('Delete annotated files'),
-            self.__deleteAnnotated)
+        self.__menu.addAction(
+            self.trUtf8('Delete annotated files'), self.__deleteAnnotated)
         self.__menu.addSeparator()
         self.__menu.addAction(self.trUtf8('Erase Coverage Info'), self.__erase)
         self.resultList.setContextMenuPolicy(Qt.CustomContextMenu)
@@ -342,7 +342,7 @@
         
         # now process them
         progress = QProgressDialog(self.trUtf8("Annotating files..."),
-            self.trUtf8("Abort"), 0, len(files), self)
+                                   self.trUtf8("Abort"), 0, len(files), self)
         progress.setMinimumDuration(0)
         count = 0
         

--- a/DataViews/PyProfileDialog.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DataViews/PyProfileDialog.py	Mon Oct 14 20:08:19 2013 +0200
@@ -83,10 +83,10 @@
             self.trUtf8('Exclude Python Library'),
             self.__filter)
         self.__menu.addSeparator()
-        self.__menu.addAction(self.trUtf8('Erase Profiling Info'),
-            self.__eraseProfile)
-        self.__menu.addAction(self.trUtf8('Erase Timing Info'),
-                              self.__eraseTiming)
+        self.__menu.addAction(
+            self.trUtf8('Erase Profiling Info'), self.__eraseProfile)
+        self.__menu.addAction(
+            self.trUtf8('Erase Timing Info'), self.__eraseTiming)
         self.__menu.addSeparator()
         self.__menu.addAction(self.trUtf8('Erase All Infos'), self.__eraseAll)
         self.resultList.setContextMenuPolicy(Qt.CustomContextMenu)
@@ -170,7 +170,7 @@
                 if self.cancelled:
                     return
                 
-                if not (self.ericpath and 
+                if not (self.ericpath and
                         func[0].startswith(self.ericpath)) and \
                    not func[0].startswith("DebugClients") and \
                    func[0] != "profile" and \
@@ -232,7 +232,7 @@
                 self.trUtf8("Profile Results"),
                 self.trUtf8("""<p>There is no profiling data"""
                             """ available for <b>{0}</b>.</p>""")
-                    .format(pfn))
+                .format(pfn))
             self.close()
             return
         try:
@@ -245,7 +245,7 @@
                 self.trUtf8("Loading Profiling Data"),
                 self.trUtf8("""<p>The profiling data could not be"""
                             """ read from file <b>{0}</b>.</p>""")
-                    .format(fname))
+                .format(fname))
             self.close()
             return
         

--- a/DebugClients/Python/AsyncFile.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DebugClients/Python/AsyncFile.py	Mon Oct 14 20:08:19 2013 +0200
@@ -276,7 +276,7 @@
         if not self.wpending:
             self.wpending = s
         elif type(self.wpending) != type(s) or \
-             len(self.wpending) + len(s) > self.maxbuffersize:
+            len(self.wpending) + len(s) > self.maxbuffersize:
             # flush wpending so that different string types are not
             # concatenated
             while self.wpending:

--- a/DebugClients/Python/DCTestResult.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DebugClients/Python/DCTestResult.py	Mon Oct 14 20:08:19 2013 +0200
@@ -40,8 +40,10 @@
         """
         TestResult.addFailure(self, test, err)
         tracebackLines = self._exc_info_to_string(err, test)
-        self.parent.write('%s%s\n' % (ResponseUTTestFailed,
-            unicode((unicode(test), tracebackLines, test.id()))))
+        self.parent.write(
+            '%s%s\n' % (
+                ResponseUTTestFailed,
+                unicode((unicode(test), tracebackLines, test.id()))))
         
     def addError(self, test, err):
         """
@@ -52,8 +54,10 @@
         """
         TestResult.addError(self, test, err)
         tracebackLines = self._exc_info_to_string(err, test)
-        self.parent.write('%s%s\n' % (ResponseUTTestErrored,
-            unicode((unicode(test), tracebackLines, test.id()))))
+        self.parent.write(
+            '%s%s\n' % (
+                ResponseUTTestErrored,
+                unicode((unicode(test), tracebackLines, test.id()))))
         
     def addSkip(self, test, reason):
         """
@@ -63,8 +67,10 @@
         @param reason reason for skipping the test (string)
         """
         TestResult.addSkip(self, test, reason)
-        self.parent.write('%s%s\n' % (ResponseUTTestSkipped,
-            str((str(test), reason, test.id()))))
+        self.parent.write(
+            '%s%s\n' % (
+                ResponseUTTestSkipped,
+                str((str(test), reason, test.id()))))
         
     def addExpectedFailure(self, test, err):
         """
@@ -75,8 +81,10 @@
         """
         TestResult.addExpectedFailure(self, test, err)
         tracebackLines = self._exc_info_to_string(err, test)
-        self.parent.write('%s%s\n' % (ResponseUTTestFailedExpected,
-            str((str(test), tracebackLines, test.id()))))
+        self.parent.write(
+            '%s%s\n' % (
+                ResponseUTTestFailedExpected,
+                str((str(test), tracebackLines, test.id()))))
         
     def addUnexpectedSuccess(self, test):
         """
@@ -85,8 +93,10 @@
         @param test reference to the test object
         """
         TestResult.addUnexpectedSuccess(self, test)
-        self.parent.write('%s%s\n' % (ResponseUTTestSucceededUnexpected,
-            str((str(test), test.id()))))
+        self.parent.write(
+            '%s%s\n' % (
+                ResponseUTTestSucceededUnexpected,
+                str((str(test), test.id()))))
         
     def startTest(self, test):
         """
@@ -95,8 +105,10 @@
         @param test Reference to the test object
         """
         TestResult.startTest(self, test)
-        self.parent.write('%s%s\n' % (ResponseUTStartTest,
-            unicode((unicode(test), test.shortDescription()))))
+        self.parent.write(
+            '%s%s\n' % (
+                ResponseUTStartTest,
+                unicode((unicode(test), test.shortDescription()))))
 
     def stopTest(self, test):
         """

--- a/DebugClients/Python/DebugBase.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DebugClients/Python/DebugBase.py	Mon Oct 14 20:08:19 2013 +0200
@@ -161,7 +161,8 @@
             self.cFrame = frame
             self.__recursionDepth += 1
             if self.__recursionDepth > gRecursionLimit:
-                raise RuntimeError('maximum recursion depth exceeded\n'
+                raise RuntimeError(
+                    'maximum recursion depth exceeded\n'
                     '(offending frame is two down the stack)')
     
     def __sendCallTrace(self, event, fromFrame, toFrame):

--- a/DebugClients/Python/DebugClientBase.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DebugClients/Python/DebugClientBase.py	Mon Oct 14 20:08:19 2013 +0200
@@ -595,7 +595,8 @@
                 sys.excepthook = self.__unhandled_exception
                 
                 # generate a coverage object
-                self.cover = coverage(auto_data=True,
+                self.cover = coverage(
+                    auto_data=True,
                     data_file="%s.coverage" % os.path.splitext(sys.argv[0])[0])
                 self.cover.use_cache(True)
                 
@@ -671,9 +672,10 @@
                         try:
                             compile(cond, '<string>', 'eval')
                         except SyntaxError:
-                            self.write('%s%s,%d\n' % \
-                                (DebugProtocol.ResponseBPConditionError, fn,
-                                 line))
+                            self.write(
+                                '%s%s,%d\n' % \
+                                    (DebugProtocol.ResponseBPConditionError,
+                                     fn, line))
                             return
                     self.mainThread.set_break(fn, line, temporary, cond)
                 else:
@@ -811,9 +813,12 @@
                 return
             
             if cmd == DebugProtocol.RequestBanner:
-                self.write('%s%s\n' % (DebugProtocol.ResponseBanner,
-                    unicode(("Python %s" % sys.version, socket.gethostname(),
-                             self.variant))))
+                self.write(
+                    '%s%s\n' % (
+                        DebugProtocol.ResponseBanner,
+                        unicode(("Python %s" % sys.version,
+                                 socket.gethostname(),
+                                 self.variant))))
                 return
             
             if cmd == DebugProtocol.RequestCapabilities:
@@ -856,15 +861,18 @@
                                     .loadTestsFromModule(utModule)
                 except:
                     exc_type, exc_value, exc_tb = sys.exc_info()
-                    self.write('%s%s\n' % (DebugProtocol.ResponseUTPrepared,
-                        unicode((0, str(exc_type), str(exc_value)))))
+                    self.write(
+                        '%s%s\n' % (
+                            DebugProtocol.ResponseUTPrepared,
+                            unicode((0, str(exc_type), str(exc_value)))))
                     self.__exceptionRaised()
                     return
                 
                 # generate a coverage object
                 if int(cov):
                     from coverage import coverage
-                    self.cover = coverage(auto_data=True,
+                    self.cover = coverage(
+                        auto_data=True,
                         data_file="%s.coverage" % os.path.splitext(covname)[0])
                     self.cover.use_cache(True)
                     if int(erase):
@@ -872,8 +880,10 @@
                 else:
                     self.cover = None
                 
-                self.write('%s%s\n' % (DebugProtocol.ResponseUTPrepared,
-                    unicode((self.test.countTestCases(), "", ""))))
+                self.write(
+                    '%s%s\n' % (
+                        DebugProtocol.ResponseUTPrepared,
+                        unicode((self.test.countTestCases(), "", ""))))
                 return
             
             if cmd == DebugProtocol.RequestUTRun:
@@ -1632,8 +1642,9 @@
                 varlist.append(("column", "int", "%s" % value.column()))
                 varlist.append(
                     ("internalId", "int", "%s" % value.internalId()))
-                varlist.append(("internalPointer", "void *", "%s" % \
-                    value.internalPointer()))
+                varlist.append(
+                    ("internalPointer", "void *", "%s" % \
+                     value.internalPointer()))
         elif qttype == 'QRegExp':
             varlist.append(("pattern", "str", "%s" % value.pattern()))
         
@@ -1829,7 +1840,7 @@
                                    unicode(completions), text))
 
     def startDebugger(self, filename=None, host=None, port=None,
-            enableTrace=1, exceptions=1, tracePython=0, redirect=1):
+                      enableTrace=1, exceptions=1, tracePython=0, redirect=1):
         """
         Public method used to start the remote debugger.
         
@@ -1885,7 +1896,8 @@
             self.mainThread.set_trace()
         
     def startProgInDebugger(self, progargs, wd='', host=None,
-            port=None, exceptions=1, tracePython=0, redirect=1):
+                            port=None, exceptions=1, tracePython=0,
+                            redirect=1):
         """
         Public method used to start the remote debugger.
         

--- a/DebugClients/Python/DebugConfig.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DebugClients/Python/DebugConfig.py	Mon Oct 14 20:08:19 2013 +0200
@@ -7,14 +7,16 @@
 Module defining type strings for the different Python types.
 """
 
-ConfigVarTypeStrings = ['__', 'NoneType', 'type',\
-        'bool', 'int', 'long', 'float', 'complex',\
-        'str', 'unicode', 'tuple', 'list',\
-        'dict', 'dict-proxy', 'set', 'file', 'xrange',\
-        'slice', 'buffer', 'class', 'instance',\
-        'instance method', 'property', 'generator',\
-        'function', 'builtin_function_or_method', 'code', 'module',\
-        'ellipsis', 'traceback', 'frame', 'other']
+ConfigVarTypeStrings = [
+    '__', 'NoneType', 'type',\
+    'bool', 'int', 'long', 'float', 'complex',\
+    'str', 'unicode', 'tuple', 'list',\
+    'dict', 'dict-proxy', 'set', 'file', 'xrange',\
+    'slice', 'buffer', 'class', 'instance',\
+    'instance method', 'property', 'generator',\
+    'function', 'builtin_function_or_method', 'code', 'module',\
+    'ellipsis', 'traceback', 'frame', 'other'
+]
 
 #
 # eflag: FileType = Python2

--- a/DebugClients/Python/PyProfile.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DebugClients/Python/PyProfile.py	Mon Oct 14 20:08:19 2013 +0200
@@ -147,7 +147,7 @@
                                                         self.cur[-3])
         fcode = frame.f_code
         fn = (self.fix_frame_filename(frame),
-            fcode.co_firstlineno, fcode.co_name)
+              fcode.co_firstlineno, fcode.co_name)
         self.cur = (t, 0, 0, fn, frame, self.cur)
         timings = self.timings
         if fn in timings:

--- a/DebugClients/Python/eric5dbgstub.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DebugClients/Python/eric5dbgstub.py	Mon Oct 14 20:08:19 2013 +0200
@@ -88,7 +88,7 @@
     global debugger
     if debugger:
         debugger.startDebugger(enableTrace=enableTrace, exceptions=exceptions,
-            tracePython=tracePython, redirect=redirect)
+                               tracePython=tracePython, redirect=redirect)
 
 #
 # eflag: FileType = Python2

--- a/DebugClients/Python3/DCTestResult.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DebugClients/Python3/DCTestResult.py	Mon Oct 14 20:08:19 2013 +0200
@@ -40,7 +40,8 @@
         """
         TestResult.addFailure(self, test, err)
         tracebackLines = self._exc_info_to_string(err, test)
-        self.parent.write('{0}{1}\n'.format(ResponseUTTestFailed,
+        self.parent.write('{0}{1}\n'.format(
+            ResponseUTTestFailed,
             str((str(test), tracebackLines, test.id()))))
         
     def addError(self, test, err):
@@ -52,7 +53,8 @@
         """
         TestResult.addError(self, test, err)
         tracebackLines = self._exc_info_to_string(err, test)
-        self.parent.write('{0}{1}\n'.format(ResponseUTTestErrored,
+        self.parent.write('{0}{1}\n'.format(
+            ResponseUTTestErrored,
             str((str(test), tracebackLines, test.id()))))
         
     def addSkip(self, test, reason):
@@ -63,7 +65,8 @@
         @param reason reason for skipping the test (string)
         """
         TestResult.addSkip(self, test, reason)
-        self.parent.write('{0}{1}\n'.format(ResponseUTTestSkipped,
+        self.parent.write('{0}{1}\n'.format(
+            ResponseUTTestSkipped,
             str((str(test), reason, test.id()))))
         
     def addExpectedFailure(self, test, err):
@@ -75,7 +78,8 @@
         """
         TestResult.addExpectedFailure(self, test, err)
         tracebackLines = self._exc_info_to_string(err, test)
-        self.parent.write('{0}{1}\n'.format(ResponseUTTestFailedExpected,
+        self.parent.write('{0}{1}\n'.format(
+            ResponseUTTestFailedExpected,
             str((str(test), tracebackLines, test.id()))))
         
     def addUnexpectedSuccess(self, test):
@@ -85,7 +89,8 @@
         @param test reference to the test object
         """
         TestResult.addUnexpectedSuccess(self, test)
-        self.parent.write('{0}{1}\n'.format(ResponseUTTestSucceededUnexpected,
+        self.parent.write('{0}{1}\n'.format(
+            ResponseUTTestSucceededUnexpected,
             str((str(test), test.id()))))
         
     def startTest(self, test):
@@ -95,7 +100,8 @@
         @param test Reference to the test object
         """
         TestResult.startTest(self, test)
-        self.parent.write('{0}{1}\n'.format(ResponseUTStartTest,
+        self.parent.write('{0}{1}\n'.format(
+            ResponseUTStartTest,
             str((str(test), test.shortDescription()))))
 
     def stopTest(self, test):

--- a/DebugClients/Python3/DebugBase.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DebugClients/Python3/DebugBase.py	Mon Oct 14 20:08:19 2013 +0200
@@ -160,7 +160,8 @@
             self.cFrame = frame
             self.__recursionDepth += 1
             if self.__recursionDepth > gRecursionLimit:
-                raise RuntimeError('maximum recursion depth exceeded\n'
+                raise RuntimeError(
+                    'maximum recursion depth exceeded\n'
                     '(offending frame is two down the stack)')
     
     def __sendCallTrace(self, event, fromFrame, toFrame):

--- a/DebugClients/Python3/DebugClientBase.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DebugClients/Python3/DebugClientBase.py	Mon Oct 14 20:08:19 2013 +0200
@@ -630,7 +630,8 @@
                 sys.excepthook = self.__unhandled_exception
                 
                 # generate a coverage object
-                self.cover = coverage(auto_data=True,
+                self.cover = coverage(
+                    auto_data=True,
                     data_file="{0}.coverage".format(
                         os.path.splitext(sys.argv[0])[0]))
                 self.cover.use_cache(True)
@@ -823,8 +824,8 @@
             
             if cmd == DebugProtocol.RequestBanner:
                 self.write('{0}{1}\n'.format(DebugProtocol.ResponseBanner,
-                    str(("Python {0}".format(sys.version),
-                         socket.gethostname(), self.variant))))
+                           str(("Python {0}".format(sys.version),
+                                socket.gethostname(), self.variant))))
                 return
             
             if cmd == DebugProtocol.RequestCapabilities:
@@ -876,7 +877,8 @@
                 # generate a coverage object
                 if int(cov):
                     from coverage import coverage
-                    self.cover = coverage(auto_data=True,
+                    self.cover = coverage(
+                        auto_data=True,
                         data_file="{0}.coverage".format(
                             os.path.splitext(covname)[0]))
                     self.cover.use_cache(True)
@@ -885,7 +887,8 @@
                 else:
                     self.cover = None
                 
-                self.write('{0}{1}\n'.format(DebugProtocol.ResponseUTPrepared,
+                self.write('{0}{1}\n'.format(
+                    DebugProtocol.ResponseUTPrepared,
                     str((self.test.countTestCases(), "", ""))))
                 return
             
@@ -1893,8 +1896,8 @@
                                           str(completions), text))
 
     def startDebugger(self, filename=None, host=None, port=None,
-            enableTrace=True, exceptions=True, tracePython=False,
-            redirect=True):
+                      enableTrace=True, exceptions=True, tracePython=False,
+                      redirect=True):
         """
         Public method used to start the remote debugger.
         
@@ -1950,7 +1953,8 @@
             self.mainThread.set_trace()
     
     def startProgInDebugger(self, progargs, wd='', host=None,
-            port=None, exceptions=True, tracePython=False, redirect=True):
+                            port=None, exceptions=True, tracePython=False,
+                            redirect=True):
         """
         Public method used to start the remote debugger.
         

--- a/DebugClients/Python3/DebugConfig.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DebugClients/Python3/DebugConfig.py	Mon Oct 14 20:08:19 2013 +0200
@@ -7,11 +7,13 @@
 Module defining type strings for the different Python types.
 """
 
-ConfigVarTypeStrings = ['__', 'NoneType', 'type',\
-        'bool', 'int', 'long', 'float', 'complex',\
-        'str', 'unicode', 'tuple', 'list',\
-        'dict', 'dict-proxy', 'set', 'file', 'xrange',\
-        'slice', 'buffer', 'class', 'instance',\
-        'instance method', 'property', 'generator',\
-        'function', 'builtin_function_or_method', 'code', 'module',\
-        'ellipsis', 'traceback', 'frame', 'other']
+ConfigVarTypeStrings = [
+    '__', 'NoneType', 'type',\
+    'bool', 'int', 'long', 'float', 'complex',\
+    'str', 'unicode', 'tuple', 'list',\
+    'dict', 'dict-proxy', 'set', 'file', 'xrange',\
+    'slice', 'buffer', 'class', 'instance',\
+    'instance method', 'property', 'generator',\
+    'function', 'builtin_function_or_method', 'code', 'module',\
+    'ellipsis', 'traceback', 'frame', 'other'
+]

--- a/DebugClients/Python3/PyProfile.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DebugClients/Python3/PyProfile.py	Mon Oct 14 20:08:19 2013 +0200
@@ -153,7 +153,7 @@
                                                         self.cur[-3])
         fcode = frame.f_code
         fn = (self.fix_frame_filename(frame),
-            fcode.co_firstlineno, fcode.co_name)
+              fcode.co_firstlineno, fcode.co_name)
         self.cur = (t, 0, 0, fn, frame, self.cur)
         timings = self.timings
         if fn in timings:

--- a/DebugClients/Python3/eric5dbgstub.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DebugClients/Python3/eric5dbgstub.py	Mon Oct 14 20:08:19 2013 +0200
@@ -87,4 +87,4 @@
     global debugger
     if debugger:
         debugger.startDebugger(enableTrace=enableTrace, exceptions=exceptions,
-            tracePython=tracePython, redirect=redirect)
+                               tracePython=tracePython, redirect=redirect)

--- a/Debugger/BreakPointModel.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Debugger/BreakPointModel.py	Mon Oct 14 20:08:19 2013 +0200
@@ -210,8 +210,8 @@
         if index.isValid():
             row = index.row()
             index1 = self.createIndex(row, 0, self.breakpoints[row])
-            index2 = self.createIndex(row, len(self.breakpoints[row]),
-                     self.breakpoints[row])
+            index2 = self.createIndex(
+                row, len(self.breakpoints[row]), self.breakpoints[row])
             self.dataAboutToBeChanged.emit(index1, index2)
             self.breakpoints[row] = [fn, line] + list(properties)
             self.dataChanged.emit(index1, index2)

--- a/Debugger/BreakPointViewer.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Debugger/BreakPointViewer.py	Mon Oct 14 20:08:19 2013 +0200
@@ -179,7 +179,7 @@
         self.multiMenu.addAction(self.trUtf8("Add"), self.__addBreak)
         self.multiMenu.addSeparator()
         self.multiMenu.addAction(self.trUtf8("Enable selected"),
-            self.__enableSelectedBreaks)
+                                 self.__enableSelectedBreaks)
         self.multiMenu.addAction(self.trUtf8("Enable all"),
                                  self.__enableAllBreaks)
         self.multiMenu.addSeparator()
@@ -229,8 +229,8 @@
         from .EditBreakpointDialog import EditBreakpointDialog
         
         dlg = EditBreakpointDialog((self.fnHistory[0], None), None,
-            self.condHistory, self, modal=1, addMode=1,
-            filenameHistory=self.fnHistory)
+                                   self.condHistory, self, modal=1,
+                                   addMode=1, filenameHistory=self.fnHistory)
         if dlg.exec_() == QDialog.Accepted:
             fn, line, cond, temp, enabled, count = dlg.getAddData()
             if fn is not None:
@@ -289,8 +289,8 @@
                         self.condHistory.remove(cond)
                     self.condHistory.insert(0, cond)
                 
-                self.__model.setBreakPointByIndex(sindex,
-                    fn, line, (cond, temp, enabled, count))
+                self.__model.setBreakPointByIndex(
+                    sindex, fn, line, (cond, temp, enabled, count))
                 self.__resizeColumns()
                 self.__resort()
 

--- a/Debugger/CallStackViewer.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Debugger/CallStackViewer.py	Mon Oct 14 20:08:19 2013 +0200
@@ -113,12 +113,13 @@
                 dfname = fname
             if ffunc and not ffunc.startswith("<"):
                 # use normal format
-                itm = QTreeWidgetItem(self,
+                itm = QTreeWidgetItem(
+                    self,
                     [self.__entryFormat.format(dfname, fline, ffunc, fargs)])
             else:
                 # use short format
-                itm = QTreeWidgetItem(self,
-                    [self.__entryFormatShort.format(dfname, fline)])
+                itm = QTreeWidgetItem(
+                    self, [self.__entryFormatShort.format(dfname, fline)])
             itm.setData(0, self.FilenameRole, fname)
             itm.setData(0, self.LinenoRole, fline)
         

--- a/Debugger/CallTraceViewer.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Debugger/CallTraceViewer.py	Mon Oct 14 20:08:19 2013 +0200
@@ -151,7 +151,8 @@
                             call = "->"
                         else:
                             call = "<-"
-                        f.write("{0} {1} || {2}\n".format(call,
+                        f.write("{0} {1} || {2}\n".format(
+                            call,
                             itm.text(1), itm.text(2)))
                         itm = self.callTrace.itemBelow(itm)
                     f.close()
@@ -229,9 +230,11 @@
             fromFile = self.__project.getRelativePath(fromFile)
             toFile = self.__project.getRelativePath(toFile)
         
-        itm = QTreeWidgetItem(parentItem, ["",
-            self.__entryFormat.format(fromFile, fromLine, fromFunction),
-            self.__entryFormat.format(toFile, toLine, toFunction)])
+        itm = QTreeWidgetItem(
+            parentItem,
+            ["",
+             self.__entryFormat.format(fromFile, fromLine, fromFunction),
+             self.__entryFormat.format(toFile, toLine, toFunction)])
         itm.setIcon(0, icon)
         itm.setData(0, Qt.UserRole, isCall)
         itm.setExpanded(True)

--- a/Debugger/DebugServer.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Debugger/DebugServer.py	Mon Oct 14 20:08:19 2013 +0200
@@ -351,8 +351,8 @@
         """
         if clType is not None and clType in self.getSupportedLanguages():
             self.clientType = clType
-            Preferences.Prefs.settings.setValue('DebugClient/Type',
-                self.clientType)
+            Preferences.Prefs.settings.setValue(
+                'DebugClient/Type', self.clientType)
         
     def startClient(self, unplanned=True, clType=None, forProject=False,
                     runInConsole=False):
@@ -1323,7 +1323,8 @@
         @param toLine line number in the target file (string)
         @param toFunction name of the target function (string)
         """
-        self.callTraceInfo.emit(isCall, fromFile, fromLine, fromFunction,
+        self.callTraceInfo.emit(
+            isCall, fromFile, fromLine, fromFunction,
             toFile, toLine, toFunction)
         
     def clientUtPrepared(self, result, exceptionType, exceptionValue):

--- a/Debugger/DebugUI.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Debugger/DebugUI.py	Mon Oct 14 20:08:19 2013 +0200
@@ -107,9 +107,10 @@
         self.lastStartAction = 0    # 0=None, 1=Script, 2=Project
         self.clientType = ""
         self.lastAction = -1
-        self.debugActions = [self.__continue, self.__step,\
-                        self.__stepOver, self.__stepOut,\
-                        self.__stepQuit, self.__runToCursor]
+        self.debugActions = [
+            self.__continue, self.__step, self.__stepOver, self.__stepOut,
+            self.__stepQuit, self.__runToCursor
+        ]
         self.localsVarFilter, self.globalsVarFilter = \
             Preferences.getVarFilters()
         self.debugViewer.setVariablesFilter(
@@ -167,10 +168,11 @@
         """
         self.actions = []
         
-        self.runAct = E5Action(self.trUtf8('Run Script'),
-                UI.PixmapCache.getIcon("runScript.png"),
-                self.trUtf8('&Run Script...'),
-                Qt.Key_F2, 0, self, 'dbg_run_script')
+        self.runAct = E5Action(
+            self.trUtf8('Run Script'),
+            UI.PixmapCache.getIcon("runScript.png"),
+            self.trUtf8('&Run Script...'),
+            Qt.Key_F2, 0, self, 'dbg_run_script')
         self.runAct.setStatusTip(self.trUtf8('Run the current Script'))
         self.runAct.setWhatsThis(self.trUtf8(
             """<b>Run Script</b>"""
@@ -181,10 +183,11 @@
         self.runAct.triggered[()].connect(self.__runScript)
         self.actions.append(self.runAct)
 
-        self.runProjectAct = E5Action(self.trUtf8('Run Project'),
-                UI.PixmapCache.getIcon("runProject.png"),
-                self.trUtf8('Run &Project...'), Qt.SHIFT + Qt.Key_F2, 0, self,
-                'dbg_run_project')
+        self.runProjectAct = E5Action(
+            self.trUtf8('Run Project'),
+            UI.PixmapCache.getIcon("runProject.png"),
+            self.trUtf8('Run &Project...'), Qt.SHIFT + Qt.Key_F2, 0, self,
+            'dbg_run_project')
         self.runProjectAct.setStatusTip(self.trUtf8('Run the current Project'))
         self.runProjectAct.setWhatsThis(self.trUtf8(
             """<b>Run Project</b>"""
@@ -196,10 +199,11 @@
         self.runProjectAct.triggered[()].connect(self.__runProject)
         self.actions.append(self.runProjectAct)
 
-        self.coverageAct = E5Action(self.trUtf8('Coverage run of Script'),
-                UI.PixmapCache.getIcon("coverageScript.png"),
-                self.trUtf8('Coverage run of Script...'), 0, 0, self,
-                'dbg_coverage_script')
+        self.coverageAct = E5Action(
+            self.trUtf8('Coverage run of Script'),
+            UI.PixmapCache.getIcon("coverageScript.png"),
+            self.trUtf8('Coverage run of Script...'), 0, 0, self,
+            'dbg_coverage_script')
         self.coverageAct.setStatusTip(
             self.trUtf8('Perform a coverage run of the current Script'))
         self.coverageAct.setWhatsThis(self.trUtf8(
@@ -228,7 +232,8 @@
         self.coverageProjectAct.triggered[()].connect(self.__coverageProject)
         self.actions.append(self.coverageProjectAct)
 
-        self.profileAct = E5Action(self.trUtf8('Profile Script'),
+        self.profileAct = E5Action(
+            self.trUtf8('Profile Script'),
             UI.PixmapCache.getIcon("profileScript.png"),
             self.trUtf8('Profile Script...'), 0, 0, self, 'dbg_profile_script')
         self.profileAct.setStatusTip(self.trUtf8('Profile the current Script'))
@@ -240,7 +245,8 @@
         self.profileAct.triggered[()].connect(self.__profileScript)
         self.actions.append(self.profileAct)
 
-        self.profileProjectAct = E5Action(self.trUtf8('Profile Project'),
+        self.profileProjectAct = E5Action(
+            self.trUtf8('Profile Project'),
             UI.PixmapCache.getIcon("profileProject.png"),
             self.trUtf8('Profile Project...'), 0, 0, self,
             'dbg_profile_project')
@@ -255,7 +261,8 @@
         self.profileProjectAct.triggered[()].connect(self.__profileProject)
         self.actions.append(self.profileProjectAct)
 
-        self.debugAct = E5Action(self.trUtf8('Debug Script'),
+        self.debugAct = E5Action(
+            self.trUtf8('Debug Script'),
             UI.PixmapCache.getIcon("debugScript.png"),
             self.trUtf8('&Debug Script...'), Qt.Key_F5, 0, self,
             'dbg_debug_script')
@@ -270,7 +277,8 @@
         self.debugAct.triggered[()].connect(self.__debugScript)
         self.actions.append(self.debugAct)
 
-        self.debugProjectAct = E5Action(self.trUtf8('Debug Project'),
+        self.debugProjectAct = E5Action(
+            self.trUtf8('Debug Project'),
             UI.PixmapCache.getIcon("debugProject.png"),
             self.trUtf8('Debug &Project...'), Qt.SHIFT + Qt.Key_F5, 0, self,
             'dbg_debug_project')
@@ -286,7 +294,8 @@
         self.debugProjectAct.triggered[()].connect(self.__debugProject)
         self.actions.append(self.debugProjectAct)
 
-        self.restartAct = E5Action(self.trUtf8('Restart'),
+        self.restartAct = E5Action(
+            self.trUtf8('Restart'),
             UI.PixmapCache.getIcon("restart.png"),
             self.trUtf8('Restart'), Qt.Key_F4, 0, self, 'dbg_restart_script')
         self.restartAct.setStatusTip(self.trUtf8(
@@ -301,7 +310,8 @@
         self.restartAct.triggered[()].connect(self.__doRestart)
         self.actions.append(self.restartAct)
 
-        self.stopAct = E5Action(self.trUtf8('Stop'),
+        self.stopAct = E5Action(
+            self.trUtf8('Stop'),
             UI.PixmapCache.getIcon("stopScript.png"),
             self.trUtf8('Stop'), Qt.SHIFT + Qt.Key_F10, 0,
             self, 'dbg_stop_script')
@@ -315,7 +325,8 @@
 
         self.debugActGrp = createActionGroup(self)
 
-        act = E5Action(self.trUtf8('Continue'),
+        act = E5Action(
+            self.trUtf8('Continue'),
             UI.PixmapCache.getIcon("continue.png"),
             self.trUtf8('&Continue'), Qt.Key_F6, 0,
             self.debugActGrp, 'dbg_continue')
@@ -330,7 +341,8 @@
         act.triggered[()].connect(self.__continue)
         self.actions.append(act)
 
-        act = E5Action(self.trUtf8('Continue to Cursor'),
+        act = E5Action(
+            self.trUtf8('Continue to Cursor'),
             UI.PixmapCache.getIcon("continueToCursor.png"),
             self.trUtf8('Continue &To Cursor'), Qt.SHIFT + Qt.Key_F6, 0,
             self.debugActGrp, 'dbg_continue_to_cursor')
@@ -345,7 +357,8 @@
         act.triggered[()].connect(self.__runToCursor)
         self.actions.append(act)
 
-        act = E5Action(self.trUtf8('Single Step'),
+        act = E5Action(
+            self.trUtf8('Single Step'),
             UI.PixmapCache.getIcon("step.png"),
             self.trUtf8('Sin&gle Step'), Qt.Key_F7, 0,
             self.debugActGrp, 'dbg_single_step')
@@ -360,7 +373,8 @@
         act.triggered[()].connect(self.__step)
         self.actions.append(act)
 
-        act = E5Action(self.trUtf8('Step Over'),
+        act = E5Action(
+            self.trUtf8('Step Over'),
             UI.PixmapCache.getIcon("stepOver.png"),
             self.trUtf8('Step &Over'), Qt.Key_F8, 0,
             self.debugActGrp, 'dbg_step_over')
@@ -378,7 +392,8 @@
         act.triggered[()].connect(self.__stepOver)
         self.actions.append(act)
 
-        act = E5Action(self.trUtf8('Step Out'),
+        act = E5Action(
+            self.trUtf8('Step Out'),
             UI.PixmapCache.getIcon("stepOut.png"),
             self.trUtf8('Step Ou&t'), Qt.Key_F9, 0,
             self.debugActGrp, 'dbg_step_out')
@@ -396,7 +411,8 @@
         act.triggered[()].connect(self.__stepOut)
         self.actions.append(act)
 
-        act = E5Action(self.trUtf8('Stop'),
+        act = E5Action(
+            self.trUtf8('Stop'),
             UI.PixmapCache.getIcon("stepQuit.png"),
             self.trUtf8('&Stop'), Qt.Key_F10, 0,
             self.debugActGrp, 'dbg_stop')
@@ -410,7 +426,8 @@
         
         self.debugActGrp2 = createActionGroup(self)
 
-        act = E5Action(self.trUtf8('Evaluate'),
+        act = E5Action(
+            self.trUtf8('Evaluate'),
             self.trUtf8('E&valuate...'),
             0, 0, self.debugActGrp2, 'dbg_evaluate')
         act.setStatusTip(self.trUtf8('Evaluate in current context'))
@@ -423,9 +440,10 @@
         act.triggered[()].connect(self.__eval)
         self.actions.append(act)
         
-        act = E5Action(self.trUtf8('Execute'),
-                self.trUtf8('E&xecute...'),
-                0, 0, self.debugActGrp2, 'dbg_execute')
+        act = E5Action(
+            self.trUtf8('Execute'),
+            self.trUtf8('E&xecute...'),
+            0, 0, self.debugActGrp2, 'dbg_execute')
         act.setStatusTip(
             self.trUtf8('Execute a one line statement in the current context'))
         act.setWhatsThis(self.trUtf8(
@@ -436,7 +454,8 @@
         act.triggered[()].connect(self.__exec)
         self.actions.append(act)
         
-        self.dbgFilterAct = E5Action(self.trUtf8('Variables Type Filter'),
+        self.dbgFilterAct = E5Action(
+            self.trUtf8('Variables Type Filter'),
             self.trUtf8('Varia&bles Type Filter...'), 0, 0, self,
             'dbg_variables_filter')
         self.dbgFilterAct.setStatusTip(self.trUtf8(
@@ -451,7 +470,8 @@
             self.__configureVariablesFilters)
         self.actions.append(self.dbgFilterAct)
 
-        self.excFilterAct = E5Action(self.trUtf8('Exceptions Filter'),
+        self.excFilterAct = E5Action(
+            self.trUtf8('Exceptions Filter'),
             self.trUtf8('&Exceptions Filter...'), 0, 0, self,
             'dbg_exceptions_filter')
         self.excFilterAct.setStatusTip(self.trUtf8(
@@ -467,9 +487,10 @@
             self.__configureExceptionsFilter)
         self.actions.append(self.excFilterAct)
         
-        self.excIgnoreFilterAct = E5Action(self.trUtf8('Ignored Exceptions'),
-                self.trUtf8('&Ignored Exceptions...'), 0, 0,
-                self, 'dbg_ignored_exceptions')
+        self.excIgnoreFilterAct = E5Action(
+            self.trUtf8('Ignored Exceptions'),
+            self.trUtf8('&Ignored Exceptions...'), 0, 0,
+            self, 'dbg_ignored_exceptions')
         self.excIgnoreFilterAct.setStatusTip(self.trUtf8(
             'Configure ignored exceptions'))
         self.excIgnoreFilterAct.setWhatsThis(self.trUtf8(
@@ -485,7 +506,8 @@
 
         self.dbgSetBpActGrp = createActionGroup(self)
 
-        self.dbgToggleBpAct = E5Action(self.trUtf8('Toggle Breakpoint'),
+        self.dbgToggleBpAct = E5Action(
+            self.trUtf8('Toggle Breakpoint'),
             UI.PixmapCache.getIcon("breakpointToggle.png"),
             self.trUtf8('Toggle Breakpoint'),
             QKeySequence(self.trUtf8("Shift+F11", "Debug|Toggle Breakpoint")),
@@ -499,7 +521,8 @@
         self.dbgToggleBpAct.triggered[()].connect(self.__toggleBreakpoint)
         self.actions.append(self.dbgToggleBpAct)
         
-        self.dbgEditBpAct = E5Action(self.trUtf8('Edit Breakpoint'),
+        self.dbgEditBpAct = E5Action(
+            self.trUtf8('Edit Breakpoint'),
             UI.PixmapCache.getIcon("cBreakpointToggle.png"),
             self.trUtf8('Edit Breakpoint...'),
             QKeySequence(self.trUtf8("Shift+F12", "Debug|Edit Breakpoint")), 0,
@@ -513,7 +536,8 @@
         self.dbgEditBpAct.triggered[()].connect(self.__editBreakpoint)
         self.actions.append(self.dbgEditBpAct)
 
-        self.dbgNextBpAct = E5Action(self.trUtf8('Next Breakpoint'),
+        self.dbgNextBpAct = E5Action(
+            self.trUtf8('Next Breakpoint'),
             UI.PixmapCache.getIcon("breakpointNext.png"),
             self.trUtf8('Next Breakpoint'),
             QKeySequence(
@@ -527,7 +551,8 @@
         self.dbgNextBpAct.triggered[()].connect(self.__nextBreakpoint)
         self.actions.append(self.dbgNextBpAct)
 
-        self.dbgPrevBpAct = E5Action(self.trUtf8('Previous Breakpoint'),
+        self.dbgPrevBpAct = E5Action(
+            self.trUtf8('Previous Breakpoint'),
             UI.PixmapCache.getIcon("breakpointPrevious.png"),
             self.trUtf8('Previous Breakpoint'),
             QKeySequence(
@@ -541,7 +566,8 @@
         self.dbgPrevBpAct.triggered[()].connect(self.__previousBreakpoint)
         self.actions.append(self.dbgPrevBpAct)
 
-        act = E5Action(self.trUtf8('Clear Breakpoints'),
+        act = E5Action(
+            self.trUtf8('Clear Breakpoints'),
             self.trUtf8('Clear Breakpoints'),
             QKeySequence(
                 self.trUtf8("Ctrl+Shift+C", "Debug|Clear Breakpoints")), 0,
@@ -893,28 +919,28 @@
         del self.wdHistory[10:]
         del self.envHistory[10:]
         
-        Preferences.Prefs.settings.setValue('DebugInfo/ArgumentsHistory',
-            self.argvHistory)
+        Preferences.Prefs.settings.setValue(
+            'DebugInfo/ArgumentsHistory', self.argvHistory)
         Preferences.Prefs.settings.setValue(
             'DebugInfo/WorkingDirectoryHistory', self.wdHistory)
-        Preferences.Prefs.settings.setValue('DebugInfo/EnvironmentHistory',
-            self.envHistory)
-        Preferences.Prefs.settings.setValue('DebugInfo/Exceptions',
-            self.excList)
-        Preferences.Prefs.settings.setValue('DebugInfo/IgnoredExceptions',
-            self.excIgnoreList)
-        Preferences.Prefs.settings.setValue('DebugInfo/ReportExceptions',
-            self.exceptions)
-        Preferences.Prefs.settings.setValue('DebugInfo/AutoClearShell',
-            self.autoClearShell)
-        Preferences.Prefs.settings.setValue('DebugInfo/TracePython',
-            self.tracePython)
-        Preferences.Prefs.settings.setValue('DebugInfo/AutoContinue',
-            self.autoContinue)
-        Preferences.Prefs.settings.setValue('DebugInfo/ForkAutomatically',
-            self.forkAutomatically)
-        Preferences.Prefs.settings.setValue('DebugInfo/ForkIntoChild',
-            self.forkIntoChild)
+        Preferences.Prefs.settings.setValue(
+            'DebugInfo/EnvironmentHistory', self.envHistory)
+        Preferences.Prefs.settings.setValue(
+            'DebugInfo/Exceptions', self.excList)
+        Preferences.Prefs.settings.setValue(
+            'DebugInfo/IgnoredExceptions', self.excIgnoreList)
+        Preferences.Prefs.settings.setValue(
+            'DebugInfo/ReportExceptions', self.exceptions)
+        Preferences.Prefs.settings.setValue(
+            'DebugInfo/AutoClearShell', self.autoClearShell)
+        Preferences.Prefs.settings.setValue(
+            'DebugInfo/TracePython', self.tracePython)
+        Preferences.Prefs.settings.setValue(
+            'DebugInfo/AutoContinue', self.autoContinue)
+        Preferences.Prefs.settings.setValue(
+            'DebugInfo/ForkAutomatically', self.forkAutomatically)
+        Preferences.Prefs.settings.setValue(
+            'DebugInfo/ForkIntoChild', self.forkIntoChild)
         
     def shutdownServer(self):
         """
@@ -1080,7 +1106,7 @@
         if (self.exceptions and \
             exceptionType not in self.excIgnoreList and \
             (not len(self.excList) or \
-            (len(self.excList) and exceptionType in self.excList)))\
+             (len(self.excList) and exceptionType in self.excList)))\
            or exceptionType.startswith('unhandled'):
             res = None
             if stackTrace:
@@ -1256,7 +1282,8 @@
         fn, line, cond, temp, enabled, count = bp[:6]
         
         from .EditBreakpointDialog import EditBreakpointDialog
-        dlg = EditBreakpointDialog((fn, line), (cond, temp, enabled, count),
+        dlg = EditBreakpointDialog(
+            (fn, line), (cond, temp, enabled, count),
             [], self.ui, modal=True)
         if dlg.exec_() == QDialog.Accepted:
             cond, temp, enabled, count = dlg.getData()
@@ -1305,11 +1332,12 @@
                                       """ already exists.</p>""")\
                             .format(Utilities.html_encode(cond))
                 else:
-                    msg = self.trUtf8("""<p>A watch expression '<b>{0}</b>'"""
-                                """ for the variable <b>{1}</b> already"""
-                                """ exists.</p>""")\
-                            .format(special,
-                                    Utilities.html_encode(cond))
+                    msg = self.trUtf8(
+                        """<p>A watch expression '<b>{0}</b>'"""
+                        """ for the variable <b>{1}</b> already"""
+                        """ exists.</p>""")\
+                        .format(special,
+                                Utilities.html_encode(cond))
                 E5MessageBox.warning(
                     self.ui,
                     self.trUtf8("Watch expression already exists"),
@@ -1462,7 +1490,8 @@
             cap = self.trUtf8("Coverage of Project")
         else:
             cap = self.trUtf8("Coverage of Script")
-        dlg = StartDialog(cap, self.argvHistory, self.wdHistory,
+        dlg = StartDialog(
+            cap, self.argvHistory, self.wdHistory,
             self.envHistory, self.exceptions, self.ui, 2,
             autoClearShell=self.autoClearShell)
         if dlg.exec_() == QDialog.Accepted:
@@ -1476,7 +1505,8 @@
                     E5MessageBox.critical(
                         self.ui,
                         self.trUtf8("Coverage of Project"),
-                        self.trUtf8("There is no main script defined for the"
+                        self.trUtf8(
+                            "There is no main script defined for the"
                             " current project. Aborting"))
                     return
                     
@@ -1538,7 +1568,8 @@
                 self.debugViewer.initCallStackViewer(runProject)
                 
                 # Ask the client to open the new program.
-                self.debugServer.remoteCoverage(fn, argv, wd, env,
+                self.debugServer.remoteCoverage(
+                    fn, argv, wd, env,
                     autoClearShell=self.autoClearShell, erase=eraseCoverage,
                     forProject=runProject, runInConsole=console,
                     clientType=self.clientType)
@@ -1591,7 +1622,8 @@
                     E5MessageBox.critical(
                         self.ui,
                         self.trUtf8("Profile of Project"),
-                        self.trUtf8("There is no main script defined for the"
+                        self.trUtf8(
+                            "There is no main script defined for the"
                             " current project. Aborting"))
                     return
                     
@@ -1653,7 +1685,8 @@
                 self.debugViewer.initCallStackViewer(runProject)
                 
                 # Ask the client to open the new program.
-                self.debugServer.remoteProfile(fn, argv, wd, env,
+                self.debugServer.remoteProfile(
+                    fn, argv, wd, env,
                     autoClearShell=self.autoClearShell, erase=eraseTimings,
                     forProject=runProject, runInConsole=console,
                     clientType=self.clientType)
@@ -1708,7 +1741,8 @@
                     E5MessageBox.critical(
                         self.ui,
                         self.trUtf8("Run Project"),
-                        self.trUtf8("There is no main script defined for the"
+                        self.trUtf8(
+                            "There is no main script defined for the"
                             " current project. Aborting"))
                     return
                     
@@ -1771,7 +1805,8 @@
                 self.debugViewer.initCallStackViewer(runProject)
                 
                 # Ask the client to open the new program.
-                self.debugServer.remoteRun(fn, argv, wd, env,
+                self.debugServer.remoteRun(
+                    fn, argv, wd, env,
                     autoClearShell=self.autoClearShell, forProject=runProject,
                     runInConsole=console, autoFork=forkAutomatically,
                     forkChild=forkIntoChild, clientType=self.clientType)
@@ -1826,7 +1861,8 @@
                     E5MessageBox.critical(
                         self.ui,
                         self.trUtf8("Debug Project"),
-                        self.trUtf8("There is no main script defined for the"
+                        self.trUtf8(
+                            "There is no main script defined for the"
                             " current project. No debugging possible."))
                     return
                     
@@ -1903,7 +1939,8 @@
                 self.debugViewer.setCallTraceToProjectMode(debugProject)
                 
                 # Ask the client to open the new program.
-                self.debugServer.remoteLoad(fn, argv, wd, env,
+                self.debugServer.remoteLoad(
+                    fn, argv, wd, env,
                     autoClearShell=self.autoClearShell,
                     tracePython=tracePython,
                     autoContinue=autoContinue, forProject=debugProject,
@@ -1928,8 +1965,8 @@
         if self.lastStartAction in [1, 3, 5, 7, 9]:
             editor = self.viewmanager.getOpenEditor(self.lastDebuggedFile)
             if editor and \
-               not self.viewmanager.checkDirty(editor,
-               Preferences.getDebugger("Autosave")):
+               not self.viewmanager.checkDirty(
+                    editor, Preferences.getDebugger("Autosave")):
                 return
             forProject = False
         elif self.lastStartAction in [2, 4, 6, 8, 10]:
@@ -2097,8 +2134,8 @@
         aw = self.viewmanager.activeWindow()
         line = aw.getCursorPosition()[0] + 1
         self.__enterRemote()
-        self.debugServer.remoteBreakpoint(aw.getFileName(),
-            line, 1, None, 1)
+        self.debugServer.remoteBreakpoint(
+            aw.getFileName(), line, 1, None, 1)
         self.debugServer.remoteContinue()
     
     def __eval(self):

--- a/Debugger/DebugViewer.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Debugger/DebugViewer.py	Mon Oct 14 20:08:19 2013 +0200
@@ -83,7 +83,8 @@
             # add the interpreter shell
             self.shellAssembly = ShellAssembly(debugServer, vm, False)
             self.shell = self.shellAssembly.shell()
-            index = self.__tabWidget.addTab(self.shellAssembly,
+            index = self.__tabWidget.addTab(
+                self.shellAssembly,
                 UI.PixmapCache.getIcon("shell.png"), '')
             self.__tabWidget.setTabToolTip(index, self.shell.windowTitle())
         
@@ -92,7 +93,8 @@
             from UI.Browser import Browser
             # add the browser
             self.browser = Browser()
-            index = self.__tabWidget.addTab(self.browser,
+            index = self.__tabWidget.addTab(
+                self.browser,
                 UI.PixmapCache.getIcon("browser.png"), '')
             self.__tabWidget.setTabToolTip(index, self.browser.windowTitle())
         
@@ -128,7 +130,8 @@
         self.glvWidgetHLayout.addWidget(self.setGlobalsFilterButton)
         self.glvWidgetVLayout.addLayout(self.glvWidgetHLayout)
         
-        index = self.__tabWidget.addTab(self.glvWidget,
+        index = self.__tabWidget.addTab(
+            self.glvWidget,
             UI.PixmapCache.getIcon("globalVariables.png"), '')
         self.__tabWidget.setTabToolTip(index, self.globalsViewer.windowTitle())
         
@@ -181,7 +184,8 @@
         self.lvWidgetHLayout2.addWidget(self.setLocalsFilterButton)
         self.lvWidgetVLayout.addLayout(self.lvWidgetHLayout2)
         
-        index = self.__tabWidget.addTab(self.lvWidget,
+        index = self.__tabWidget.addTab(
+            self.lvWidget,
             UI.PixmapCache.getIcon("localVariables.png"), '')
         self.__tabWidget.setTabToolTip(index, self.localsViewer.windowTitle())
         
@@ -194,7 +198,8 @@
         from .CallStackViewer import CallStackViewer
         # add the call stack viewer
         self.callStackViewer = CallStackViewer(self.debugServer)
-        index = self.__tabWidget.addTab(self.callStackViewer,
+        index = self.__tabWidget.addTab(
+            self.callStackViewer,
             UI.PixmapCache.getIcon("step.png"), "")
         self.__tabWidget.setTabToolTip(
             index, self.callStackViewer.windowTitle())
@@ -205,7 +210,8 @@
         from .CallTraceViewer import CallTraceViewer
         # add the call trace viewer
         self.callTraceViewer = CallTraceViewer(self.debugServer)
-        index = self.__tabWidget.addTab(self.callTraceViewer,
+        index = self.__tabWidget.addTab(
+            self.callTraceViewer,
             UI.PixmapCache.getIcon("callTrace.png"), "")
         self.__tabWidget.setTabToolTip(
             index, self.callTraceViewer.windowTitle())
@@ -215,7 +221,8 @@
         # add the breakpoint viewer
         self.breakpointViewer = BreakPointViewer()
         self.breakpointViewer.setModel(self.debugServer.getBreakPointModel())
-        index = self.__tabWidget.addTab(self.breakpointViewer,
+        index = self.__tabWidget.addTab(
+            self.breakpointViewer,
             UI.PixmapCache.getIcon("breakpoints.png"), '')
         self.__tabWidget.setTabToolTip(
             index, self.breakpointViewer.windowTitle())
@@ -225,7 +232,8 @@
         # add the watch expression viewer
         self.watchpointViewer = WatchPointViewer()
         self.watchpointViewer.setModel(self.debugServer.getWatchPointModel())
-        index = self.__tabWidget.addTab(self.watchpointViewer,
+        index = self.__tabWidget.addTab(
+            self.watchpointViewer,
             UI.PixmapCache.getIcon("watchpoints.png"), '')
         self.__tabWidget.setTabToolTip(
             index, self.watchpointViewer.windowTitle())
@@ -233,7 +241,8 @@
         from .ExceptionLogger import ExceptionLogger
         # add the exception logger
         self.exceptionLogger = ExceptionLogger()
-        index = self.__tabWidget.addTab(self.exceptionLogger,
+        index = self.__tabWidget.addTab(
+            self.exceptionLogger,
             UI.PixmapCache.getIcon("exceptions.png"), '')
         self.__tabWidget.setTabToolTip(
             index, self.exceptionLogger.windowTitle())

--- a/Debugger/DebuggerInterfacePython.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Debugger/DebuggerInterfacePython.py	Mon Oct 14 20:08:19 2013 +0200
@@ -250,7 +250,8 @@
                             """ started.</p>"""))
                 return process, self.__isNetworked
         
-        process = self.__startProcess(interpreter,
+        process = self.__startProcess(
+            interpreter,
             [debugClient, noencoding, str(port), redirect, ipaddr],
             clientEnv)
         if process is None:
@@ -351,7 +352,8 @@
                             """ started.</p>"""))
                 return process, self.__isNetworked
         
-        process = self.__startProcess(interpreter,
+        process = self.__startProcess(
+            interpreter,
             [debugClient, noencoding, str(port), redirect, ipaddr],
             clientEnv)
         if process is None:
@@ -864,9 +866,11 @@
                     isCall = event.lower() == "c"
                     fromFile, fromLineno, fromFunc = fromStr.rsplit(":", 2)
                     toFile, toLineno, toFunc = toStr.rsplit(":", 2)
-                    self.debugServer.signalClientCallTrace(isCall,
-                        fromFile, fromLineno, fromFunc,
-                        toFile, toLineno, toFunc)
+                    self.debugServer.signalClientCallTrace(isCall, fromFile,
+                                                           fromLineno,
+                                                           fromFunc,
+                                                           toFile, toLineno,
+                                                           toFunc)
                     continue
                 
                 if resp == DebugProtocol.ResponseThreadList:

--- a/Debugger/DebuggerInterfacePython3.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Debugger/DebuggerInterfacePython3.py	Mon Oct 14 20:08:19 2013 +0200
@@ -245,7 +245,8 @@
                             """ started.</p>"""))
                 return process, self.__isNetworked
         
-        process = self.__startProcess(interpreter,
+        process = self.__startProcess(
+            interpreter,
             [debugClient, noencoding, str(port), redirect, ipaddr],
             clientEnv)
         if process is None:
@@ -346,7 +347,8 @@
                             """ started.</p>"""))
                 return process, self.__isNetworked
         
-        process = self.__startProcess(interpreter,
+        process = self.__startProcess(
+            interpreter,
             [debugClient, noencoding, str(port), redirect, ipaddr],
             clientEnv)
         if process is None:
@@ -858,7 +860,8 @@
                     isCall = event.lower() == "c"
                     fromFile, fromLineno, fromFunc = fromStr.rsplit(":", 2)
                     toFile, toLineno, toFunc = toStr.rsplit(":", 2)
-                    self.debugServer.signalClientCallTrace(isCall,
+                    self.debugServer.signalClientCallTrace(
+                        isCall,
                         fromFile, fromLineno, fromFunc,
                         toFile, toLineno, toFunc)
                     continue

--- a/Debugger/DebuggerInterfaceRuby.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Debugger/DebuggerInterfaceRuby.py	Mon Oct 14 20:08:19 2013 +0200
@@ -144,8 +144,8 @@
         interpreter = Preferences.getDebugger("RubyInterpreter")
         if interpreter == "":
             interpreter = "/usr/bin/ruby"
-        debugClient = os.path.join(getConfig('ericDir'),
-            "DebugClients", "Ruby", "DebugClient.rb")
+        debugClient = os.path.join(
+            getConfig('ericDir'), "DebugClients", "Ruby", "DebugClient.rb")
         
         redirect = str(Preferences.getDebugger("RubyRedirect"))
         
@@ -217,7 +217,8 @@
                             """ started.</p>"""))
                 return process, self.__isNetworked
         
-        process = self.__startProcess(interpreter,
+        process = self.__startProcess(
+            interpreter,
             [debugClient, str(port), redirect, ipaddr],
             clientEnv)
         if process is None:
@@ -316,7 +317,8 @@
                             """ started.</p>"""))
                 return process, self.__isNetworked
         
-        process = self.__startProcess(interpreter,
+        process = self.__startProcess(
+            interpreter,
             [debugClient, str(port), redirect, ipaddr],
             clientEnv)
         if process is None:

--- a/Debugger/ExceptionLogger.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Debugger/ExceptionLogger.py	Mon Oct 14 20:08:19 2013 +0200
@@ -96,9 +96,9 @@
         """
         itm = QTreeWidgetItem(self)
         if exceptionType is None:
-            itm.setText(0,
-                self.trUtf8('An unhandled exception occured.'
-                            ' See the shell window for details.'))
+            itm.setText(
+                0, self.trUtf8('An unhandled exception occured.'
+                               ' See the shell window for details.'))
             return
         
         if exceptionMessage == '':

--- a/Debugger/StartDialog.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Debugger/StartDialog.py	Mon Oct 14 20:08:19 2013 +0200
@@ -27,9 +27,9 @@
     whether exception reporting should be disabled.
     """
     def __init__(self, caption, argvList, wdList, envList, exceptions,
-        parent=None, type=0, modfuncList=None, tracePython=False,
-        autoClearShell=True, autoContinue=True, autoFork=False,
-        forkChild=False):
+                 parent=None, type=0, modfuncList=None, tracePython=False,
+                 autoClearShell=True, autoContinue=True, autoFork=False,
+                 forkChild=False):
         """
         Constructor
         

--- a/Debugger/WatchPointModel.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Debugger/WatchPointModel.py	Mon Oct 14 20:08:19 2013 +0200
@@ -188,8 +188,8 @@
         if index.isValid():
             row = index.row()
             index1 = self.createIndex(row, 0, self.watchpoints[row])
-            index2 = self.createIndex(row, len(self.watchpoints[row]),
-                     self.watchpoints[row])
+            index2 = self.createIndex(
+                row, len(self.watchpoints[row]), self.watchpoints[row])
             self.dataAboutToBeChanged.emit(index1, index2)
             i = 0
             for value in [cond, special] + list(properties):

--- a/Debugger/WatchPointViewer.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/Debugger/WatchPointViewer.py	Mon Oct 14 20:08:19 2013 +0200
@@ -301,8 +301,8 @@
             if dlg.exec_() == QDialog.Accepted:
                 cond, temp, enabled, count, special = dlg.getData()
                 if not self.__findDuplicates(cond, special, True, sindex):
-                    self.__model.setWatchPointByIndex(sindex,
-                        cond, special, (temp, enabled, count))
+                    self.__model.setWatchPointByIndex(
+                        sindex, cond, special, (temp, enabled, count))
                     self.__resizeColumns()
                     self.__resort()
 

--- a/DocumentationTools/ModuleDocumentor.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/DocumentationTools/ModuleDocumentor.py	Mon Oct 14 20:08:19 2013 +0200
@@ -17,7 +17,8 @@
 from Utilities import html_uencode
 from Utilities.ModuleParser import RB_SOURCE, Function
 
-_signal = re.compile(r"""
+_signal = re.compile(
+r"""
     ^@signal [ \t]+
     (?P<SignalName1>
         [a-zA-Z_] \w* [ \t]* \( [^)]* \)
@@ -31,7 +32,8 @@
     [ \t]+ (?P<SignalDescription2> .*)
 """, re.VERBOSE | re.DOTALL | re.MULTILINE).search
 
-_event = re.compile(r"""
+_event = re.compile(
+r"""
     ^@event [ \t]+
     (?P<EventName1>
         [a-zA-Z_] \w* [ \t]* \( [^)]* \)
@@ -545,8 +547,9 @@
                 methBody = ""
             methBodies.append(methBody)
             
-        methList = self.__genMethodsListSection(methods, obj.methods,
-            className, obj.name, includeInit=filter == Function.General)
+        methList = self.__genMethodsListSection(
+            methods, obj.methods, className, obj.name,
+            includeInit=filter == Function.General)
         
         if not methList:
             methList = self.listEntryNoneTemplate
@@ -1048,8 +1051,8 @@
         
         if paramList:
             parameterSect = self.parametersListTemplate.format(**{ \
-                'Parameters': self.__genParamDescriptionListSection(paramList,
-                               self.parametersListEntryTemplate)
+                'Parameters': self.__genParamDescriptionListSection(
+                    paramList, self.parametersListEntryTemplate)
             })
         else:
             parameterSect = ""
@@ -1062,24 +1065,24 @@
         
         if exceptionDict:
             exceptionSect = self.exceptionsListTemplate.format(**{ \
-                'Exceptions': self.__genDescriptionListSection(exceptionDict,
-                               self.exceptionsListEntryTemplate)
+                'Exceptions': self.__genDescriptionListSection(
+                    exceptionDict, self.exceptionsListEntryTemplate)
             })
         else:
             exceptionSect = ""
         
         if signalDict:
             signalSect = self.signalsListTemplate.format(**{ \
-                'Signals': self.__genDescriptionListSection(signalDict,
-                               self.signalsListEntryTemplate)
+                'Signals': self.__genDescriptionListSection(
+                    signalDict, self.signalsListEntryTemplate)
             })
         else:
             signalSect = ""
         
         if eventDict:
             eventSect = self.eventsListTemplate.format(**{ \
-                'Events': self.__genDescriptionListSection(eventDict,
-                               self.eventsListEntryTemplate)
+                'Events': self.__genDescriptionListSection(
+                    eventDict, self.eventsListEntryTemplate)
             })
         else:
             eventSect = ""

--- a/compileUiFiles.py	Mon Oct 14 19:30:36 2013 +0200
+++ b/compileUiFiles.py	Mon Oct 14 20:08:19 2013 +0200
@@ -122,5 +122,5 @@
         print("""
 An internal error occured.  Please report all the output of the program,
 including the following traceback, to eric5-bugs@eric-ide.python-projects.org.
-""")
+        """)
         raise

--- a/eric5.e4p	Mon Oct 14 19:30:36 2013 +0200
+++ b/eric5.e4p	Mon Oct 14 20:08:19 2013 +0200
@@ -1929,7 +1929,7 @@
               <string>ExcludeMessages</string>
             </key>
             <value>
-              <string>E24, D, W293, N802, N803, N807, N808, N821</string>
+              <string>E24, D, W293, N802, N803, N807, N808, N821,E,W</string>
             </value>
             <key>
               <string>FixCodes</string>
@@ -1953,7 +1953,7 @@
               <string>IncludeMessages</string>
             </key>
             <value>
-              <string></string>
+              <string>E128</string>
             </value>
             <key>
               <string>MaxLineLength</string>