Mercurial Repositories > eric / changeset

--- a/DebugClients/Python/AsyncFile.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/DebugClients/Python/AsyncFile.py	Sun Nov 15 13:52:29 2015 +0100
@@ -22,7 +22,7 @@
     """
     try:
         pending = file.pendingWrite()
-    except:
+    except Exception:
         pending = 0
 
     return pending

--- a/DebugClients/Python/AsyncIO.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/DebugClients/Python/AsyncIO.py	Sun Nov 15 13:52:29 2015 +0100
@@ -47,7 +47,7 @@
         """
         try:
             got = self.readfd.readline_p()
-        except:
+        except Exception:
             return
 
         if len(got) == 0:

--- a/DebugClients/Python/DebugBase.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/DebugClients/Python/DebugBase.py	Sun Nov 15 13:52:29 2015 +0100
@@ -454,7 +454,7 @@
                         continue
                     else:
                         return (b, 1)
-            except:
+            except Exception:
                 if b.special:
                     try:
                         b.values[frame][0] = 0

--- a/DebugClients/Python/DebugClientBase.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/DebugClients/Python/DebugClientBase.py	Sun Nov 15 13:52:29 2015 +0100
@@ -376,7 +376,7 @@
         """
         try:
             self.set_quit()
-        except:
+        except Exception:
             pass
 
         # clean up asyncio.
@@ -772,7 +772,7 @@
                     value = eval(
                         arg, self.currentThread.getCurrentFrame().f_globals,
                         self.currentThread.getFrameLocals(0))
-                except:
+                except Exception:
                     # Report the exception and the traceback
                     try:
                         type, value, tb = sys.exc_info()
@@ -805,7 +805,7 @@
                 try:
                     code = compile(arg + '\n', '<stdin>', 'single')
                     exec code in _globals, _locals
-                except:
+                except Exception:
                     # Report the exception and the traceback
                     try:
                         type, value, tb = sys.exc_info()
@@ -877,7 +877,7 @@
                     except AttributeError:
                         self.test = unittest.defaultTestLoader\
                             .loadTestsFromModule(utModule)
-                except:
+                except Exception:
                     exc_type, exc_value, exc_tb = sys.exc_info()
                     self.write(
                         '%s%s\n' % (
@@ -996,7 +996,7 @@
                             exec code in _globals, _locals
                 except SystemExit, exc:
                     self.progTerminated(exc.code)
-                except:
+                except Exception:
                     # Report the exception and the traceback
                     try:
                         type, value, tb = sys.exc_info()
@@ -1495,7 +1495,7 @@
                                 qvar = obj
                                 qvtype = ("%s" % type(qvar))[1:-1]\
                                     .split()[1][1:-1]
-                        except:
+                        except Exception:
                             pass
                         try:
                             exec 'mcdict = dict%s.__class__.__dict__' % access
@@ -1503,7 +1503,7 @@
                             if mdict and "sipThis" not in mdict.keys():  # __IGNORE_WARNING__
                                 del rvar[0:2]
                                 access = ""
-                        except:
+                        except Exception:
                             pass
                         try:
                             cdict = {}
@@ -1511,7 +1511,7 @@
                             for v in slv:   # __IGNORE_WARNING__
                                 try:
                                     exec 'cdict[v] = dict%s.%s' % (access, v)
-                                except:
+                                except Exception:
                                     pass
                             ndict.update(cdict)
                             exec 'obj = dict%s' % access
@@ -1522,7 +1522,7 @@
                                 qvar = obj
                                 qvtype = ("%s" % type(qvar))[1:-1]\
                                     .split()[1][1:-1]
-                        except:
+                        except Exception:
                             pass
                     else:
                         try:
@@ -1536,7 +1536,7 @@
                                 qvar = obj
                                 qvtype = ("%s" % type(qvar))[1:-1]\
                                     .split()[1][1:-1]
-                        except:
+                        except Exception:
                             pass
                         try:
                             cdict = {}
@@ -1544,7 +1544,7 @@
                             for v in slv:
                                 try:
                                     exec 'cdict[v] = dict[var[i]].%s' % v
-                                except:
+                                except Exception:
                                     pass
                             ndict.update(cdict)
                             obj = dict[var[i]]
@@ -1554,7 +1554,7 @@
                                 qvar = obj
                                 qvtype = ("%s" % type(qvar))[1:-1]\
                                     .split()[1][1:-1]
-                        except:
+                        except Exception:
                             pass
                     odict = dict
                     dict = ndict
@@ -1618,7 +1618,7 @@
                         varlist.append(('...', 'list', "%d" % len(obj)))
                     elif unicode(repr(obj)).startswith('('):
                         varlist.append(('...', 'tuple', "%d" % len(obj)))
-                except:
+                except Exception:
                     pass
         
         self.write('%s%s\n' % (
@@ -1848,7 +1848,7 @@
                             rvalue = "%d" % len(value.keys())
                         else:
                             rvalue = "%d" % len(value)
-                except:
+                except Exception:
                     rvalue = ''
                 
             if formatSequences:
@@ -1899,14 +1899,14 @@
         
         try:
             comp = self.complete(text, state)
-        except:
+        except Exception:
             comp = None
         while comp is not None:
             completions.append(comp)
             state += 1
             try:
                 comp = self.complete(text, state)
-            except:
+            except Exception:
                 comp = None
             
         self.write("%s%s||%s\n" % (DebugProtocol.ResponseCompletion,
@@ -2147,7 +2147,7 @@
                     remoteAddress = ipOrHost
                 else:
                     remoteAddress = self.__resolveHost(ipOrHost)
-            except:
+            except Exception:
                 remoteAddress = None
             sys.argv = ['']
             if '' not in sys.path:

--- a/DebugClients/Python/DebugClientThreads.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/DebugClients/Python/DebugClientThreads.py	Sun Nov 15 13:52:29 2015 +0100
@@ -186,7 +186,7 @@
             try:
                 for key in self.threads.keys():
                     self.threads[key].set_quit()
-            except:
+            except Exception:
                 pass
         finally:
             if locked:

--- a/DebugClients/Python/FlexCompleter.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/DebugClients/Python/FlexCompleter.py	Sun Nov 15 13:52:29 2015 +0100
@@ -225,7 +225,7 @@
                     match = "%s.%s" % (expr, word)
                     if match not in matches:
                         matches.append(match)
-            except:
+            except Exception:
                 # some badly behaved objects pollute dir() with non-strings,
                 # which cause the completion to fail.  This way we skip the
                 # bad entries and can still continue processing the others.

--- a/DebugClients/Python/PyProfile.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/DebugClients/Python/PyProfile.py	Sun Nov 15 13:52:29 2015 +0100
@@ -57,7 +57,7 @@
             cache.close()
             if isinstance(timings, type.DictType):
                 self.timings = timings
-        except:
+        except Exception:
             pass
         
     def save(self):

--- a/DebugClients/Python3/AsyncFile.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/DebugClients/Python3/AsyncFile.py	Sun Nov 15 13:52:29 2015 +0100
@@ -22,7 +22,7 @@
     """
     try:
         pending = file.pendingWrite()
-    except:
+    except Exception:
         pending = 0
 
     return pending

--- a/DebugClients/Python3/DebugBase.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/DebugClients/Python3/DebugBase.py	Sun Nov 15 13:52:29 2015 +0100
@@ -479,7 +479,7 @@
                         continue
                     else:
                         return (b, True)
-            except:
+            except Exception:
                 if b.special:
                     try:
                         b.values[frame][0] = 0

--- a/DebugClients/Python3/DebugClientBase.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/DebugClients/Python3/DebugClientBase.py	Sun Nov 15 13:52:29 2015 +0100
@@ -336,7 +336,7 @@
         """
         try:
             self.set_quit()
-        except:
+        except Exception:
             pass
 
         # clean up asyncio.
@@ -776,7 +776,7 @@
                         arg,
                         self.currentThread.getCurrentFrame().f_globals,
                         self.currentThread.getFrameLocals(0))
-                except:
+                except Exception:
                     # Report the exception and the traceback
                     try:
                         type, value, tb = sys.exc_info()
@@ -810,7 +810,7 @@
                 try:
                     code = compile(arg + '\n', '<stdin>', 'single')
                     exec(code, _globals, _locals)
-                except:
+                except Exception:
                     # Report the exception and the traceback
                     try:
                         type, value, tb = sys.exc_info()
@@ -879,7 +879,7 @@
                     except AttributeError:
                         self.test = unittest.defaultTestLoader\
                             .loadTestsFromModule(utModule)
-                except:
+                except Exception:
                     exc_type, exc_value, exc_tb = sys.exc_info()
                     self.write('{0}{1}\n'.format(
                         DebugProtocol.ResponseUTPrepared,
@@ -998,7 +998,7 @@
                             exec(code, _globals, _locals)
                 except SystemExit as exc:
                     self.progTerminated(exc.code)
-                except:
+                except Exception:
                     # Report the exception and the traceback
                     try:
                         exc_type, exc_value, exc_tb = sys.exc_info()
@@ -1506,7 +1506,7 @@
                                 qvar = obj
                                 qvtype = str(type(qvar))[1:-1].split()[1][1:-1]
                             ndict.update(mdict)
-                        except:
+                        except Exception:
                             pass
                         try:
                             loc = {"dict": dict}
@@ -1516,7 +1516,7 @@
                             if mdict and "sipThis" not in mdict.keys():
                                 del rvar[0:2]
                                 access = ""
-                        except:
+                        except Exception:
                             pass
                         try:
                             loc = {"cdict": {}, "dict": dict}
@@ -1527,7 +1527,7 @@
                                     loc["v"] = v
                                     exec('cdict[v] = dict{0!s}.{1!s}'.format(
                                         access, v), globals, loc)
-                                except:
+                                except Exception:
                                     pass
                             ndict.update(loc["cdict"])
                             exec('obj = dict{0!s}'.format(access),
@@ -1539,7 +1539,7 @@
                                 qtVariable = True
                                 qvar = obj
                                 qvtype = str(type(qvar))[1:-1].split()[1][1:-1]
-                        except:
+                        except Exception:
                             pass
                     else:
                         try:
@@ -1552,7 +1552,7 @@
                                 qtVariable = True
                                 qvar = obj
                                 qvtype = str(type(qvar))[1:-1].split()[1][1:-1]
-                        except:
+                        except Exception:
                             pass
                         try:
                             slv = dict[var[i]].__slots__
@@ -1564,7 +1564,7 @@
                                     exec('cdict[v] = dict[var[i]].{0!s}'
                                          .format(v),
                                          globals(), loc)
-                                except:
+                                except Exception:
                                     pass
                             ndict.update(loc["cdict"])
                             obj = dict[var[i]]
@@ -1573,7 +1573,7 @@
                                 qtVariable = True
                                 qvar = obj
                                 qvtype = str(type(qvar))[1:-1].split()[1][1:-1]
-                        except:
+                        except Exception:
                             pass
                     odict = dict
                     dict = ndict
@@ -1655,7 +1655,7 @@
                     elif repr(obj).startswith('('):
                         varlist.append(
                             ('...', 'tuple', "{0:d}".format(len(obj))))
-                except:
+                except Exception:
                     pass
         
         self.write('{0}{1}\n'.format(
@@ -1898,7 +1898,7 @@
                             rvalue = "{0:d}".format(len(value.keys()))
                         else:
                             rvalue = "{0:d}".format(len(value))
-                except:
+                except Exception:
                     rvalue = ''
             
             if formatSequences:
@@ -1949,14 +1949,14 @@
         
         try:
             comp = self.complete(text, state)
-        except:
+        except Exception:
             comp = None
         while comp is not None:
             completions.append(comp)
             state += 1
             try:
                 comp = self.complete(text, state)
-            except:
+            except Exception:
                 comp = None
         
         self.write("{0}{1}||{2}\n".format(DebugProtocol.ResponseCompletion,
@@ -2199,7 +2199,7 @@
                     remoteAddress = ipOrHost
                 else:
                     remoteAddress = self.__resolveHost(ipOrHost)
-            except:
+            except Exception:
                 remoteAddress = None
             sys.argv = ['']
             if '' not in sys.path:

--- a/DebugClients/Python3/DebugClientThreads.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/DebugClients/Python3/DebugClientThreads.py	Sun Nov 15 13:52:29 2015 +0100
@@ -186,7 +186,7 @@
             try:
                 for key in self.threads:
                     self.threads[key].set_quit()
-            except:
+            except Exception:
                 pass
         finally:
             if locked:

--- a/DebugClients/Python3/FlexCompleter.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/DebugClients/Python3/FlexCompleter.py	Sun Nov 15 13:52:29 2015 +0100
@@ -190,7 +190,7 @@
                     word = self._callable_postfix(
                         val, "{0}.{1}".format(expr, word))
                     matches.append(word)
-            except:
+            except Exception:
                 # some badly behaved objects pollute dir() with non-strings,
                 # which cause the completion to fail.  This way we skip the
                 # bad entries and can still continue processing the others.

--- a/DebugClients/Python3/PyProfile.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/DebugClients/Python3/PyProfile.py	Sun Nov 15 13:52:29 2015 +0100
@@ -53,7 +53,7 @@
             timings = marshal.load(cache)
             if isinstance(timings, dict):
                 self.timings = timings
-        except:
+        except Exception:
             pass
         finally:
             cache.close()
@@ -66,7 +66,7 @@
         try:
             cache = open(self.timingCache, 'wb')
             marshal.dump(self.timings, cache)
-        except:
+        except Exception:
             pass
         finally:
             cache.close()

--- a/Debugger/VariablesViewer.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/Debugger/VariablesViewer.py	Sun Nov 15 13:52:29 2015 +0100
@@ -585,7 +585,7 @@
             else:
                 try:
                     sval = eval(value)
-                except:
+                except Exception:
                     sval = value
             itm = self.__generateItem(parent, dvar, str(sval), dvtype)
         

--- a/PluginManager/PluginInstallDialog.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/PluginManager/PluginInstallDialog.py	Sun Nov 15 13:52:29 2015 +0100
@@ -460,7 +460,7 @@
                 self.tr(
                     "Error installing plugin. Reason: {0}").format(str(why)), \
                 False
-        except:
+        except Exception:
             sys.stderr.write("Unspecific exception installing plugin.\n")
             self.__rollback()
             return False, \

--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sun Nov 15 13:52:29 2015 +0100
@@ -28,8 +28,8 @@
 from . import pep8
 
 try:
-    basestring
-except:
+    basestring          # __IGNORE_WARNING__
+except Exception:
     basestring = str    # define for Python3
 
 

--- a/Plugins/CheckerPlugins/CodeStyleChecker/translations.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/translations.py	Sun Nov 15 13:52:29 2015 +0100
@@ -392,7 +392,7 @@
         "copyright notice contains invalid author"),
     "M121": QCoreApplication.translate(
         "MiscellaneousChecker",
-        "blind except: statement"),
+        "blind except: statement"),         # __IGNORE_WARNING__
     "M601": QCoreApplication.translate(
         "MiscellaneousChecker",
         "found {0} formatter"),

--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py	Sun Nov 15 13:52:29 2015 +0100
@@ -262,7 +262,7 @@
             line = detail.lineno
             error = detail.msg
             return [{'error': (fn, line, 0, "", error)}]
-        except:         # this catchall is intentional
+        except:         # __IGNORE_WARNING__
             pass
     
     # pyflakes

--- a/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Sun Nov 15 13:52:29 2015 +0100
@@ -69,7 +69,7 @@
                     exec('from PyQt5.QtCore import Qt;'
                          ' QColorDialog.getColor({0}, None, "{1}")'.format(
                              coStr, self.eTitle.text()))
-                except:
+                except Exception:
                     E5MessageBox.critical(
                         self,
                         self.tr("QColorDialog Wizard Error"),

--- a/Project/ProjectFormsBrowser.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/Project/ProjectFormsBrowser.py	Sun Nov 15 13:52:29 2015 +0100
@@ -394,7 +394,7 @@
                         self.backMenu.popup(self.mapToGlobal(coord))
                 else:
                     self.backMenu.popup(self.mapToGlobal(coord))
-        except:
+        except Exception:
             pass
         
     def __showContextMenu(self):
@@ -478,7 +478,7 @@
                         self.hooks["open"](itm.fileName())
                     else:
                         self.designerFile.emit(itm.fileName())
-            except:
+            except Exception:
                 pass
         
     def __openFileInEditor(self):

--- a/Project/ProjectInterfacesBrowser.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/Project/ProjectInterfacesBrowser.py	Sun Nov 15 13:52:29 2015 +0100
@@ -310,7 +310,7 @@
                         self.backMenu.popup(self.mapToGlobal(coord))
                 else:
                     self.backMenu.popup(self.mapToGlobal(coord))
-        except:
+        except Exception:
             pass
         
     def __showContextMenu(self):

--- a/Project/ProjectOthersBrowser.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/Project/ProjectOthersBrowser.py	Sun Nov 15 13:52:29 2015 +0100
@@ -175,7 +175,7 @@
                         self.backMenu.popup(self.mapToGlobal(coord))
                 else:
                     self.backMenu.popup(self.mapToGlobal(coord))
-        except:
+        except Exception:
             pass
         
     def __showContextMenu(self):

--- a/Project/ProjectResourcesBrowser.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/Project/ProjectResourcesBrowser.py	Sun Nov 15 13:52:29 2015 +0100
@@ -336,7 +336,7 @@
                         self.backMenu.popup(self.mapToGlobal(coord))
                 else:
                     self.backMenu.popup(self.mapToGlobal(coord))
-        except:
+        except Exception:
             pass
         
     def __showContextMenu(self):

--- a/Project/ProjectSourcesBrowser.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/Project/ProjectSourcesBrowser.py	Sun Nov 15 13:52:29 2015 +0100
@@ -673,7 +673,7 @@
                         self.backMenu.popup(self.mapToGlobal(coord))
                 else:
                     self.backMenu.popup(self.mapToGlobal(coord))
-        except:
+        except Exception:
             pass
         
     def __showContextMenu(self):

--- a/Project/ProjectTranslationsBrowser.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/Project/ProjectTranslationsBrowser.py	Sun Nov 15 13:52:29 2015 +0100
@@ -495,7 +495,7 @@
                         self.backMenu.popup(self.mapToGlobal(coord))
                 else:
                     self.backMenu.popup(self.mapToGlobal(coord))
-        except:
+        except Exception:
             pass
         
     def __showContextMenu(self):

--- a/PyUnit/UnittestDialog.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/PyUnit/UnittestDialog.py	Sun Nov 15 13:52:29 2015 +0100
@@ -332,7 +332,7 @@
                 except AttributeError:
                     test = unittest.defaultTestLoader.loadTestsFromModule(
                         module)
-            except:
+            except Exception:
                 exc_type, exc_value, exc_tb = sys.exc_info()
                 E5MessageBox.critical(
                     self,

--- a/QScintilla/SpellChecker.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/QScintilla/SpellChecker.py	Sun Nov 15 13:52:29 2015 +0100
@@ -151,7 +151,7 @@
         
         try:
             d = enchant.DictWithPWL(lang, pwl, pel)
-        except:
+        except Exception:
             # Catch all exceptions, because if pyenchant isn't available, you
             # can't catch the enchant.DictNotFound error.
             d = None

--- a/QScintilla/TypingCompleters/CompleterPython.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/QScintilla/TypingCompleters/CompleterPython.py	Sun Nov 15 13:52:29 2015 +0100
@@ -53,7 +53,7 @@
         self.__tryRX = QRegExp(r"""^[ \t]*try:""")
         self.__finallyRX = QRegExp(r"""^[ \t]*finally:""")
         self.__exceptRX = QRegExp(r"""^[ \t]*except """)
-        self.__exceptcRX = QRegExp(r"""^[ \t]*except:""")
+        self.__exceptcRX = QRegExp(r"""^[ \t]*except:""")   # __IGNORE_WARNING__
         
         self.__whileRX = QRegExp(r"""^[ \t]*while """)
         self.__forRX = QRegExp(r"""^[ \t]*for """)

--- a/Tools/TRPreviewer.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/Tools/TRPreviewer.py	Sun Nov 15 13:52:29 2015 +0100
@@ -721,7 +721,7 @@
         
         try:
             self.__widget = uic.loadUi(self.__uiFileName)
-        except:
+        except Exception:
             pass
         
         if not self.__widget:

--- a/Tools/UIPreviewer.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/Tools/UIPreviewer.py	Sun Nov 15 13:52:29 2015 +0100
@@ -344,7 +344,7 @@
         # load the file
         try:
             self.mainWidget = uic.loadUi(fn)
-        except:
+        except Exception:
             pass
         
         if self.mainWidget:

--- a/Utilities/BackgroundClient.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/Utilities/BackgroundClient.py	Sun Nov 15 13:52:29 2015 +0100
@@ -167,7 +167,7 @@
                         ret = 'Unknown service.'
                 
                 self.__send(fx, fn, ret)
-        except:
+        except Exception:
             exctype, excval, exctb = sys.exc_info()
             tbinfofile = io.StringIO()
             traceback.print_tb(exctb, None, tbinfofile)

--- a/cleanupSource.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/cleanupSource.py	Sun Nov 15 13:52:29 2015 +0100
@@ -66,7 +66,7 @@
         main(sys.argv)
     except SystemExit:
         raise
-    except:
+    except Exception:
         print(
             "\nAn internal error occured.  Please report all the output of the"
             " program, \nincluding the following traceback, to"

--- a/compileUiFiles.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/compileUiFiles.py	Sun Nov 15 13:52:29 2015 +0100
@@ -63,7 +63,7 @@
         main(sys.argv)
     except SystemExit:
         raise
-    except:
+    except Exception:
         print(
             "\nAn internal error occured.  Please report all the output of the"
             " program, \nincluding the following traceback, to"

--- a/eric6.e4p	Sun Nov 15 13:31:39 2015 +0100
+++ b/eric6.e4p	Sun Nov 15 13:52:29 2015 +0100
@@ -26,6 +26,54 @@
     <Source>DataViews/PyCoverageDialog.py</Source>
     <Source>DataViews/PyProfileDialog.py</Source>
     <Source>DataViews/__init__.py</Source>
+    <Source>DebugClients/Python/AsyncFile.py</Source>
+    <Source>DebugClients/Python/AsyncIO.py</Source>
+    <Source>DebugClients/Python/DCTestResult.py</Source>
+    <Source>DebugClients/Python/DebugBase.py</Source>
+    <Source>DebugClients/Python/DebugClient.py</Source>
+    <Source>DebugClients/Python/DebugClientBase.py</Source>
+    <Source>DebugClients/Python/DebugClientCapabilities.py</Source>
+    <Source>DebugClients/Python/DebugClientThreads.py</Source>
+    <Source>DebugClients/Python/DebugConfig.py</Source>
+    <Source>DebugClients/Python/DebugProtocol.py</Source>
+    <Source>DebugClients/Python/DebugThread.py</Source>
+    <Source>DebugClients/Python/FlexCompleter.py</Source>
+    <Source>DebugClients/Python/PyProfile.py</Source>
+    <Source>DebugClients/Python/__init__.py</Source>
+    <Source>DebugClients/Python/coverage/__init__.py</Source>
+    <Source>DebugClients/Python/coverage/__main__.py</Source>
+    <Source>DebugClients/Python/coverage/annotate.py</Source>
+    <Source>DebugClients/Python/coverage/backunittest.py</Source>
+    <Source>DebugClients/Python/coverage/backward.py</Source>
+    <Source>DebugClients/Python/coverage/bytecode.py</Source>
+    <Source>DebugClients/Python/coverage/cmdline.py</Source>
+    <Source>DebugClients/Python/coverage/collector.py</Source>
+    <Source>DebugClients/Python/coverage/config.py</Source>
+    <Source>DebugClients/Python/coverage/control.py</Source>
+    <Source>DebugClients/Python/coverage/data.py</Source>
+    <Source>DebugClients/Python/coverage/debug.py</Source>
+    <Source>DebugClients/Python/coverage/env.py</Source>
+    <Source>DebugClients/Python/coverage/execfile.py</Source>
+    <Source>DebugClients/Python/coverage/files.py</Source>
+    <Source>DebugClients/Python/coverage/html.py</Source>
+    <Source>DebugClients/Python/coverage/misc.py</Source>
+    <Source>DebugClients/Python/coverage/monkey.py</Source>
+    <Source>DebugClients/Python/coverage/parser.py</Source>
+    <Source>DebugClients/Python/coverage/phystokens.py</Source>
+    <Source>DebugClients/Python/coverage/pickle2json.py</Source>
+    <Source>DebugClients/Python/coverage/plugin.py</Source>
+    <Source>DebugClients/Python/coverage/plugin_support.py</Source>
+    <Source>DebugClients/Python/coverage/python.py</Source>
+    <Source>DebugClients/Python/coverage/pytracer.py</Source>
+    <Source>DebugClients/Python/coverage/report.py</Source>
+    <Source>DebugClients/Python/coverage/results.py</Source>
+    <Source>DebugClients/Python/coverage/summary.py</Source>
+    <Source>DebugClients/Python/coverage/templite.py</Source>
+    <Source>DebugClients/Python/coverage/test_helpers.py</Source>
+    <Source>DebugClients/Python/coverage/version.py</Source>
+    <Source>DebugClients/Python/coverage/xmlreport.py</Source>
+    <Source>DebugClients/Python/eric6dbgstub.py</Source>
+    <Source>DebugClients/Python/getpass.py</Source>
     <Source>DebugClients/Python3/AsyncFile.py</Source>
     <Source>DebugClients/Python3/AsyncIO.py</Source>
     <Source>DebugClients/Python3/DCTestResult.py</Source>
@@ -75,54 +123,6 @@
     <Source>DebugClients/Python3/coverage/xmlreport.py</Source>
     <Source>DebugClients/Python3/eric6dbgstub.py</Source>
     <Source>DebugClients/Python3/getpass.py</Source>
-    <Source>DebugClients/Python/AsyncFile.py</Source>
-    <Source>DebugClients/Python/AsyncIO.py</Source>
-    <Source>DebugClients/Python/DCTestResult.py</Source>
-    <Source>DebugClients/Python/DebugBase.py</Source>
-    <Source>DebugClients/Python/DebugClient.py</Source>
-    <Source>DebugClients/Python/DebugClientBase.py</Source>
-    <Source>DebugClients/Python/DebugClientCapabilities.py</Source>
-    <Source>DebugClients/Python/DebugClientThreads.py</Source>
-    <Source>DebugClients/Python/DebugConfig.py</Source>
-    <Source>DebugClients/Python/DebugProtocol.py</Source>
-    <Source>DebugClients/Python/DebugThread.py</Source>
-    <Source>DebugClients/Python/FlexCompleter.py</Source>
-    <Source>DebugClients/Python/PyProfile.py</Source>
-    <Source>DebugClients/Python/__init__.py</Source>
-    <Source>DebugClients/Python/coverage/__init__.py</Source>
-    <Source>DebugClients/Python/coverage/__main__.py</Source>
-    <Source>DebugClients/Python/coverage/annotate.py</Source>
-    <Source>DebugClients/Python/coverage/backunittest.py</Source>
-    <Source>DebugClients/Python/coverage/backward.py</Source>
-    <Source>DebugClients/Python/coverage/bytecode.py</Source>
-    <Source>DebugClients/Python/coverage/cmdline.py</Source>
-    <Source>DebugClients/Python/coverage/collector.py</Source>
-    <Source>DebugClients/Python/coverage/config.py</Source>
-    <Source>DebugClients/Python/coverage/control.py</Source>
-    <Source>DebugClients/Python/coverage/data.py</Source>
-    <Source>DebugClients/Python/coverage/debug.py</Source>
-    <Source>DebugClients/Python/coverage/env.py</Source>
-    <Source>DebugClients/Python/coverage/execfile.py</Source>
-    <Source>DebugClients/Python/coverage/files.py</Source>
-    <Source>DebugClients/Python/coverage/html.py</Source>
-    <Source>DebugClients/Python/coverage/misc.py</Source>
-    <Source>DebugClients/Python/coverage/monkey.py</Source>
-    <Source>DebugClients/Python/coverage/parser.py</Source>
-    <Source>DebugClients/Python/coverage/phystokens.py</Source>
-    <Source>DebugClients/Python/coverage/pickle2json.py</Source>
-    <Source>DebugClients/Python/coverage/plugin.py</Source>
-    <Source>DebugClients/Python/coverage/plugin_support.py</Source>
-    <Source>DebugClients/Python/coverage/python.py</Source>
-    <Source>DebugClients/Python/coverage/pytracer.py</Source>
-    <Source>DebugClients/Python/coverage/report.py</Source>
-    <Source>DebugClients/Python/coverage/results.py</Source>
-    <Source>DebugClients/Python/coverage/summary.py</Source>
-    <Source>DebugClients/Python/coverage/templite.py</Source>
-    <Source>DebugClients/Python/coverage/test_helpers.py</Source>
-    <Source>DebugClients/Python/coverage/version.py</Source>
-    <Source>DebugClients/Python/coverage/xmlreport.py</Source>
-    <Source>DebugClients/Python/eric6dbgstub.py</Source>
-    <Source>DebugClients/Python/getpass.py</Source>
     <Source>DebugClients/__init__.py</Source>
     <Source>Debugger/BreakPointModel.py</Source>
     <Source>Debugger/BreakPointViewer.py</Source>
@@ -1652,14 +1652,14 @@
   <Interfaces/>
   <Others>
     <Other>.hgignore</Other>
+    <Other>APIs/Python/zope-2.10.7.api</Other>
+    <Other>APIs/Python/zope-2.11.2.api</Other>
+    <Other>APIs/Python/zope-3.3.1.api</Other>
     <Other>APIs/Python3/PyQt4.bas</Other>
     <Other>APIs/Python3/PyQt5.bas</Other>
     <Other>APIs/Python3/QScintilla2.bas</Other>
     <Other>APIs/Python3/eric6.api</Other>
     <Other>APIs/Python3/eric6.bas</Other>
-    <Other>APIs/Python/zope-2.10.7.api</Other>
-    <Other>APIs/Python/zope-2.11.2.api</Other>
-    <Other>APIs/Python/zope-3.3.1.api</Other>
     <Other>APIs/QSS/qss.api</Other>
     <Other>APIs/Ruby/Ruby-1.8.7.api</Other>
     <Other>APIs/Ruby/Ruby-1.8.7.bas</Other>
@@ -1668,8 +1668,8 @@
     <Other>CSSs</Other>
     <Other>CodeTemplates</Other>
     <Other>DTDs</Other>
+    <Other>DebugClients/Python/coverage/doc</Other>
     <Other>DebugClients/Python3/coverage/doc</Other>
-    <Other>DebugClients/Python/coverage/doc</Other>
     <Other>DesignerTemplates</Other>
     <Other>Dictionaries</Other>
     <Other>Documentation/Help</Other>
@@ -2160,7 +2160,7 @@
               <string>ExcludeMessages</string>
             </key>
             <value>
-              <string>C101, E265, M121, M801, N802, N803, N807, N808, N821, W293, M811</string>
+              <string>C101, E265, M801, M811, N802, N803, N807, N808, N821, W293</string>
             </value>
             <key>
               <string>FixCodes</string>

--- a/install-i18n.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/install-i18n.py	Sun Nov 15 13:52:29 2015 +0100
@@ -120,7 +120,7 @@
         main(sys.argv)
     except SystemExit:
         raise
-    except:
+    except Exception:
         print("""An internal error occured.  Please report all the output of"""
               """ the program,\nincluding the following traceback, to"""
               """ eric-bugs@eric-ide.python-projects.org.\n""")

--- a/install.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/install.py	Sun Nov 15 13:52:29 2015 +0100
@@ -1372,7 +1372,7 @@
                     print("The configuration dictionary in '{0}' is incorrect."
                           " Aborting".format(arg))
                     exit(6)
-            except:
+            except Exception:
                 cfg = {}
         elif opt == "-m":
             macAppBundleName = arg
@@ -1503,7 +1503,7 @@
         main(sys.argv)
     except SystemExit:
         raise
-    except:
+    except Exception:
         print("""An internal error occured.  Please report all the output"""
               """ of the program,\nincluding the following traceback, to"""
               """ eric-bugs@eric-ide.python-projects.org.\n""")

--- a/patch_modpython.py	Sun Nov 15 13:31:39 2015 +0100
+++ b/patch_modpython.py	Sun Nov 15 13:52:29 2015 +0100
@@ -158,7 +158,7 @@
         main(sys.argv)
     except SystemExit:
         raise
-    except:
+    except Exception:
         print("""An internal error occured.  Please report all the output of"""
               """ the program,\nincluding the following traceback, to"""
               """ eric-bugs@die-offenbachs.de.\n""")