Mercurial Repositories > eric / file diff

--- a/eric6.e4p	Thu Sep 15 21:49:13 2016 +0200
+++ b/eric6.e4p	Sun Sep 18 21:35:53 2016 +0200
@@ -26,57 +26,56 @@
     <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/BreakpointWatch.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/Python2/AsyncFile.py</Source>
+    <Source>DebugClients/Python2/BreakpointWatch.py</Source>
+    <Source>DebugClients/Python2/DCTestResult.py</Source>
+    <Source>DebugClients/Python2/DebugBase.py</Source>
+    <Source>DebugClients/Python2/DebugClient.py</Source>
+    <Source>DebugClients/Python2/DebugClientBase.py</Source>
+    <Source>DebugClients/Python2/DebugClientCapabilities.py</Source>
+    <Source>DebugClients/Python2/DebugClientThreads.py</Source>
+    <Source>DebugClients/Python2/DebugConfig.py</Source>
+    <Source>DebugClients/Python2/DebugThread.py</Source>
+    <Source>DebugClients/Python2/DebugUtilities.py</Source>
+    <Source>DebugClients/Python2/DebugVariables.py</Source>
+    <Source>DebugClients/Python2/FlexCompleter.py</Source>
+    <Source>DebugClients/Python2/PyProfile.py</Source>
+    <Source>DebugClients/Python2/__init__.py</Source>
+    <Source>DebugClients/Python2/coverage/__init__.py</Source>
+    <Source>DebugClients/Python2/coverage/__main__.py</Source>
+    <Source>DebugClients/Python2/coverage/annotate.py</Source>
+    <Source>DebugClients/Python2/coverage/backunittest.py</Source>
+    <Source>DebugClients/Python2/coverage/backward.py</Source>
+    <Source>DebugClients/Python2/coverage/bytecode.py</Source>
+    <Source>DebugClients/Python2/coverage/cmdline.py</Source>
+    <Source>DebugClients/Python2/coverage/collector.py</Source>
+    <Source>DebugClients/Python2/coverage/config.py</Source>
+    <Source>DebugClients/Python2/coverage/control.py</Source>
+    <Source>DebugClients/Python2/coverage/data.py</Source>
+    <Source>DebugClients/Python2/coverage/debug.py</Source>
+    <Source>DebugClients/Python2/coverage/env.py</Source>
+    <Source>DebugClients/Python2/coverage/execfile.py</Source>
+    <Source>DebugClients/Python2/coverage/files.py</Source>
+    <Source>DebugClients/Python2/coverage/html.py</Source>
+    <Source>DebugClients/Python2/coverage/misc.py</Source>
+    <Source>DebugClients/Python2/coverage/monkey.py</Source>
+    <Source>DebugClients/Python2/coverage/parser.py</Source>
+    <Source>DebugClients/Python2/coverage/phystokens.py</Source>
+    <Source>DebugClients/Python2/coverage/pickle2json.py</Source>
+    <Source>DebugClients/Python2/coverage/plugin.py</Source>
+    <Source>DebugClients/Python2/coverage/plugin_support.py</Source>
+    <Source>DebugClients/Python2/coverage/python.py</Source>
+    <Source>DebugClients/Python2/coverage/pytracer.py</Source>
+    <Source>DebugClients/Python2/coverage/report.py</Source>
+    <Source>DebugClients/Python2/coverage/results.py</Source>
+    <Source>DebugClients/Python2/coverage/summary.py</Source>
+    <Source>DebugClients/Python2/coverage/templite.py</Source>
+    <Source>DebugClients/Python2/coverage/test_helpers.py</Source>
+    <Source>DebugClients/Python2/coverage/version.py</Source>
+    <Source>DebugClients/Python2/coverage/xmlreport.py</Source>
+    <Source>DebugClients/Python2/eric6dbgstub.py</Source>
+    <Source>DebugClients/Python2/getpass.py</Source>
     <Source>DebugClients/Python3/AsyncFile.py</Source>
-    <Source>DebugClients/Python3/AsyncIO.py</Source>
     <Source>DebugClients/Python3/BreakpointWatch.py</Source>
     <Source>DebugClients/Python3/DCTestResult.py</Source>
     <Source>DebugClients/Python3/DebugBase.py</Source>
@@ -85,9 +84,9 @@
     <Source>DebugClients/Python3/DebugClientCapabilities.py</Source>
     <Source>DebugClients/Python3/DebugClientThreads.py</Source>
     <Source>DebugClients/Python3/DebugConfig.py</Source>
-    <Source>DebugClients/Python3/DebugProtocol.py</Source>
     <Source>DebugClients/Python3/DebugThread.py</Source>
     <Source>DebugClients/Python3/DebugUtilities.py</Source>
+    <Source>DebugClients/Python3/DebugVariables.py</Source>
     <Source>DebugClients/Python3/FlexCompleter.py</Source>
     <Source>DebugClients/Python3/PyProfile.py</Source>
     <Source>DebugClients/Python3/__init__.py</Source>
@@ -132,12 +131,11 @@
     <Source>Debugger/CallTraceViewer.py</Source>
     <Source>Debugger/Config.py</Source>
     <Source>Debugger/DebugClientCapabilities.py</Source>
-    <Source>Debugger/DebugProtocol.py</Source>
     <Source>Debugger/DebugServer.py</Source>
     <Source>Debugger/DebugUI.py</Source>
     <Source>Debugger/DebugViewer.py</Source>
     <Source>Debugger/DebuggerInterfaceNone.py</Source>
-    <Source>Debugger/DebuggerInterfacePython.py</Source>
+    <Source>Debugger/DebuggerInterfacePython2.py</Source>
     <Source>Debugger/DebuggerInterfacePython3.py</Source>
     <Source>Debugger/EditBreakpointDialog.py</Source>
     <Source>Debugger/EditWatchpointDialog.py</Source>
@@ -216,6 +214,7 @@
     <Source>E5Network/E5UrlInfo.py</Source>
     <Source>E5Network/E5XmlRpcClient.py</Source>
     <Source>E5Network/__init__.py</Source>
+    <Source>E5Network/data/__init__.py</Source>
     <Source>E5Network/data/tld_rc.py</Source>
     <Source>E5XML/Config.py</Source>
     <Source>E5XML/DebuggerPropertiesReader.py</Source>
@@ -523,7 +522,7 @@
     <Source>Plugins/CheckerPlugins/CodeStyleChecker/NamingStyleChecker.py</Source>
     <Source>Plugins/CheckerPlugins/CodeStyleChecker/__init__.py</Source>
     <Source>Plugins/CheckerPlugins/CodeStyleChecker/mccabe.py</Source>
-    <Source>Plugins/CheckerPlugins/CodeStyleChecker/pep8.py</Source>
+    <Source>Plugins/CheckerPlugins/CodeStyleChecker/pycodestyle.py</Source>
     <Source>Plugins/CheckerPlugins/CodeStyleChecker/translations.py</Source>
     <Source>Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py</Source>
     <Source>Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py</Source>
@@ -660,10 +659,6 @@
     <Source>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py</Source>
     <Source>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/__init__.py</Source>
     <Source>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py</Source>
-    <Source>Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py</Source>
-    <Source>Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py</Source>
-    <Source>Plugins/VcsPlugins/vcsMercurial/TransplantExtension/__init__.py</Source>
-    <Source>Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py</Source>
     <Source>Plugins/VcsPlugins/vcsMercurial/__init__.py</Source>
     <Source>Plugins/VcsPlugins/vcsMercurial/hg.py</Source>
     <Source>Plugins/VcsPlugins/vcsPySvn/Config.py</Source>
@@ -1216,6 +1211,7 @@
     <Source>UI/Browser.py</Source>
     <Source>UI/BrowserModel.py</Source>
     <Source>UI/BrowserSortFilterProxyModel.py</Source>
+    <Source>UI/ClearPrivateDataDialog.py</Source>
     <Source>UI/CompareDialog.py</Source>
     <Source>UI/Config.py</Source>
     <Source>UI/DeleteFilesConfirmationDialog.py</Source>
@@ -1309,10 +1305,8 @@
     <Source>WebBrowser/Bookmarks/XbelWriter.py</Source>
     <Source>WebBrowser/Bookmarks/__init__.py</Source>
     <Source>WebBrowser/ClosedTabsManager.py</Source>
-    <Source>WebBrowser/CookieJar/CookieDetailsDialog.py</Source>
     <Source>WebBrowser/CookieJar/CookieExceptionsModel.py</Source>
     <Source>WebBrowser/CookieJar/CookieJar.py</Source>
-    <Source>WebBrowser/CookieJar/CookieModel.py</Source>
     <Source>WebBrowser/CookieJar/CookiesConfigurationDialog.py</Source>
     <Source>WebBrowser/CookieJar/CookiesDialog.py</Source>
     <Source>WebBrowser/CookieJar/CookiesExceptionsDialog.py</Source>
@@ -1432,6 +1426,7 @@
     <Source>WebBrowser/TabManager/TabManagerWidget.py</Source>
     <Source>WebBrowser/TabManager/__init__.py</Source>
     <Source>WebBrowser/Tools/DelayedFileWatcher.py</Source>
+    <Source>WebBrowser/Tools/PrintToPdfDialog.py</Source>
     <Source>WebBrowser/Tools/Scripts.py</Source>
     <Source>WebBrowser/Tools/WebBrowserTools.py</Source>
     <Source>WebBrowser/Tools/WebHitTestResult.py</Source>
@@ -1474,6 +1469,7 @@
     <Source>WebBrowser/ZoomManager/ZoomValuesModel.py</Source>
     <Source>WebBrowser/ZoomManager/__init__.py</Source>
     <Source>WebBrowser/__init__.py</Source>
+    <Source>WebBrowser/data/__init__.py</Source>
     <Source>WebBrowser/data/html_rc.py</Source>
     <Source>WebBrowser/data/icons_rc.py</Source>
     <Source>WebBrowser/data/javascript_rc.py</Source>
@@ -1525,9 +1521,11 @@
     <Source>eric6_webbrowser.py</Source>
     <Source>eric6_webbrowser.pyw</Source>
     <Source>eric6config.py</Source>
+    <Source>install-debugclients.py</Source>
     <Source>install-i18n.py</Source>
     <Source>install.py</Source>
     <Source>patch_modpython.py</Source>
+    <Source>uninstall-debugclients.py</Source>
     <Source>uninstall.py</Source>
   </Sources>
   <Forms>
@@ -1697,7 +1695,6 @@
     <Form>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui</Form>
-    <Form>Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.ui</Form>
     <Form>Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.ui</Form>
@@ -1862,6 +1859,7 @@
     <Form>Templates/TemplatePropertiesDialog.ui</Form>
     <Form>Templates/TemplateSingleVariableDialog.ui</Form>
     <Form>UI/AuthenticationDialog.ui</Form>
+    <Form>UI/ClearPrivateDataDialog.ui</Form>
     <Form>UI/CompareDialog.ui</Form>
     <Form>UI/DeleteFilesConfirmationDialog.ui</Form>
     <Form>UI/DiffDialog.ui</Form>
@@ -1918,6 +1916,7 @@
     <Form>WebBrowser/Sync/SyncEncryptionPage.ui</Form>
     <Form>WebBrowser/Sync/SyncFtpSettingsPage.ui</Form>
     <Form>WebBrowser/Sync/SyncHostTypePage.ui</Form>
+    <Form>WebBrowser/Tools/PrintToPdfDialog.ui</Form>
     <Form>WebBrowser/Tools/WebIconDialog.ui</Form>
     <Form>WebBrowser/UrlBar/BookmarkActionSelectionDialog.ui</Form>
     <Form>WebBrowser/UrlBar/BookmarkInfoDialog.ui</Form>
@@ -1970,14 +1969,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>
@@ -1986,7 +1985,7 @@
     <Other>CSSs</Other>
     <Other>CodeTemplates</Other>
     <Other>DTDs</Other>
-    <Other>DebugClients/Python/coverage/doc</Other>
+    <Other>DebugClients/Python2/coverage/doc</Other>
     <Other>DebugClients/Python3/coverage/doc</Other>
     <Other>DesignerTemplates</Other>
     <Other>Dictionaries</Other>
@@ -2044,10 +2043,6 @@
     <Other>Plugins/VcsPlugins/vcsMercurial/icons/preferences-mercurial.png</Other>
     <Other>Plugins/VcsPlugins/vcsMercurial/icons/startServer.png</Other>
     <Other>Plugins/VcsPlugins/vcsMercurial/icons/stopServer.png</Other>
-    <Other>Plugins/VcsPlugins/vcsMercurial/styles/logBrowserBookmark.style</Other>
-    <Other>Plugins/VcsPlugins/vcsMercurial/styles/logBrowserBookmarkPhase.style</Other>
-    <Other>Plugins/VcsPlugins/vcsMercurial/styles/logDialogBookmark.style</Other>
-    <Other>Plugins/VcsPlugins/vcsMercurial/styles/logDialogBookmarkPhase.style</Other>
     <Other>Plugins/VcsPlugins/vcsMercurial/templates/logBrowserBookmarkPhase.tmpl</Other>
     <Other>Plugins/VcsPlugins/vcsMercurial/templates/logDialogBookmarkPhase.tmpl</Other>
     <Other>Plugins/VcsPlugins/vcsPySvn/icons/preferences-subversion.png</Other>
@@ -2225,9 +2220,6 @@
         </value>
       </dict>
     </VcsOptions>
-    <VcsOtherData>
-      <dict/>
-    </VcsOtherData>
   </Vcs>
   <FiletypeAssociations>
     <FiletypeAssociation pattern="*.idl" type="INTERFACES"/>
@@ -2505,13 +2497,13 @@
               <string>ExcludeFiles</string>
             </key>
             <value>
-              <string>*/ThirdParty/*, */coverage/*, */Ui_*.py, */Examples/*, */*_rc.py,*/pep8.py,*/pyflakes/checker.py,*/mccabe.py</string>
+              <string>*/ThirdParty/*, */coverage/*, */Ui_*.py, */Examples/*, */*_rc.py,*/pycodestyle.py,*/pyflakes/checker.py,*/mccabe.py</string>
             </value>
             <key>
               <string>ExcludeMessages</string>
             </key>
             <value>
-              <string>C101, E265, E266, M811, N802, N803, N807, N808, N821, W293, E402</string>
+              <string>C101, E265, E266, E402, M811, N802, N803, N807, N808, N821, W293, E305</string>
             </value>
             <key>
               <string>FixCodes</string>