Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric6.api	Mon Aug 17 12:16:43 2015 +0200
+++ b/APIs/Python3/eric6.api	Mon Aug 17 12:31:29 2015 +0200
@@ -200,7 +200,7 @@
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.handleLine?4(line)
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.input?4(prompt)
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.main?4()
-eric6.DebugClients.Python.DebugClientBase.DebugClientBase.progTerminated?4(status)
+eric6.DebugClients.Python.DebugClientBase.DebugClientBase.progTerminated?4(status, exit=False)
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.raw_input?4(prompt, echo)
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.run_call?4(scriptname, func, *args)
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.sessionClose?4(exit=1)
@@ -416,7 +416,7 @@
 eric6.DebugClients.Python3.DebugClientBase.DebugClientBase.handleLine?4(line)
 eric6.DebugClients.Python3.DebugClientBase.DebugClientBase.input?4(prompt, echo=True)
 eric6.DebugClients.Python3.DebugClientBase.DebugClientBase.main?4()
-eric6.DebugClients.Python3.DebugClientBase.DebugClientBase.progTerminated?4(status)
+eric6.DebugClients.Python3.DebugClientBase.DebugClientBase.progTerminated?4(status, exit=False)
 eric6.DebugClients.Python3.DebugClientBase.DebugClientBase.run_call?4(scriptname, func, *args)
 eric6.DebugClients.Python3.DebugClientBase.DebugClientBase.sessionClose?4(exit=True)
 eric6.DebugClients.Python3.DebugClientBase.DebugClientBase.shouldSkip?4(fn)
@@ -2697,7 +2697,6 @@
 eric6.Helpviewer.HelpWindow.HelpWindow.previewer?4()
 eric6.Helpviewer.HelpWindow.HelpWindow.privacyChanged?7
 eric6.Helpviewer.HelpWindow.HelpWindow.reloadUserStyleSheet?4()
-eric6.Helpviewer.HelpWindow.HelpWindow.requestVirusTotalScan?4(url)
 eric6.Helpviewer.HelpWindow.HelpWindow.search?4(word)
 eric6.Helpviewer.HelpWindow.HelpWindow.searchEnginesAction?4()
 eric6.Helpviewer.HelpWindow.HelpWindow.setBackwardAvailable?4(b)

--- a/DebugClients/Python/DebugClientBase.py	Mon Aug 17 12:16:43 2015 +0200
+++ b/DebugClients/Python/DebugClientBase.py	Mon Aug 17 12:31:29 2015 +0200
@@ -578,7 +578,7 @@
                     res = exc.code
                     atexit._run_exitfuncs()
                 self.writestream.flush()
-                self.progTerminated(res)
+                self.progTerminated(res, exit=True)
                 return
 
             if cmd == DebugProtocol.RequestCoverage:
@@ -619,7 +619,7 @@
                 self.cover.stop()
                 self.cover.save()
                 self.writestream.flush()
-                self.progTerminated(res)
+                self.progTerminated(res, exit=True)
                 return
             
             if cmd == DebugProtocol.RequestProfile:
@@ -656,7 +656,7 @@
                     atexit._run_exitfuncs()
                 self.prof.save()
                 self.writestream.flush()
-                self.progTerminated(res)
+                self.progTerminated(res, exit=True)
                 return
 
             if cmd == DebugProtocol.RequestShutdown:
@@ -1243,11 +1243,13 @@
         """
         return self.running
 
-    def progTerminated(self, status):
+    def progTerminated(self, status, exit=False):
         """
         Public method to tell the debugger that the program has terminated.
         
-        @param status the return status
+        @param status return status
+        @param exit flag indicating to perform a sys.exit()
+        @type bool
         """
         if status is None:
             status = 0
@@ -1261,6 +1263,8 @@
             self.set_quit()
             self.running = None
             self.write('%s%d\n' % (DebugProtocol.ResponseExit, status))
+            if exit:
+                sys.exit(status)
         
         # reset coding
         self.__coding = self.defaultCoding

--- a/DebugClients/Python3/DebugClientBase.py	Mon Aug 17 12:16:43 2015 +0200
+++ b/DebugClients/Python3/DebugClientBase.py	Mon Aug 17 12:31:29 2015 +0200
@@ -571,7 +571,7 @@
                         res = exc.code
                         atexit._run_exitfuncs()
                     self.writestream.flush()
-                    self.progTerminated(res)
+                    self.progTerminated(res, exit=True)
                 return
 
             if cmd == DebugProtocol.RequestProfile:
@@ -616,7 +616,7 @@
                         atexit._run_exitfuncs()
                     self.prof.save()
                     self.writestream.flush()
-                    self.progTerminated(res)
+                    self.progTerminated(res, exit=True)
                 return
 
             if cmd == DebugProtocol.RequestCoverage:
@@ -667,7 +667,7 @@
                     self.cover.stop()
                     self.cover.save()
                     self.writestream.flush()
-                    self.progTerminated(res)
+                    self.progTerminated(res, exit=True)
                 return
 
             if cmd == DebugProtocol.RequestShutdown:
@@ -1254,11 +1254,13 @@
         """
         return self.running
 
-    def progTerminated(self, status):
+    def progTerminated(self, status, exit=False):
         """
         Public method to tell the debugger that the program has terminated.
         
-        @param status the return status
+        @param status return status
+        @param exit flag indicating to perform a sys.exit()
+        @type bool
         """
         if status is None:
             status = 0
@@ -1272,6 +1274,8 @@
             self.set_quit()
             self.running = None
             self.write('{0}{1:d}\n'.format(DebugProtocol.ResponseExit, status))
+            if exit:
+                sys.exit(status)
         
         # reset coding
         self.__coding = self.defaultCoding

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Mon Aug 17 12:16:43 2015 +0200
+++ b/Documentation/Help/source.qhp	Mon Aug 17 12:31:29 2015 +0200
@@ -5182,7 +5182,6 @@
       <keyword name="HelpBrowser.__statusBarMessage" id="HelpBrowser.__statusBarMessage" ref="eric6.Helpviewer.HelpBrowserWV.html#HelpBrowser.__statusBarMessage" />
       <keyword name="HelpBrowser.__unsupportedContent" id="HelpBrowser.__unsupportedContent" ref="eric6.Helpviewer.HelpBrowserWV.html#HelpBrowser.__unsupportedContent" />
       <keyword name="HelpBrowser.__urlChanged" id="HelpBrowser.__urlChanged" ref="eric6.Helpviewer.HelpBrowserWV.html#HelpBrowser.__urlChanged" />
-      <keyword name="HelpBrowser.__virusTotal" id="HelpBrowser.__virusTotal" ref="eric6.Helpviewer.HelpBrowserWV.html#HelpBrowser.__virusTotal" />
       <keyword name="HelpBrowser.__webInspector" id="HelpBrowser.__webInspector" ref="eric6.Helpviewer.HelpBrowserWV.html#HelpBrowser.__webInspector" />
       <keyword name="HelpBrowser.__zoomInClickedFrame" id="HelpBrowser.__zoomInClickedFrame" ref="eric6.Helpviewer.HelpBrowserWV.html#HelpBrowser.__zoomInClickedFrame" />
       <keyword name="HelpBrowser.__zoomOutClickedFrame" id="HelpBrowser.__zoomOutClickedFrame" ref="eric6.Helpviewer.HelpBrowserWV.html#HelpBrowser.__zoomOutClickedFrame" />
@@ -5523,12 +5522,6 @@
       <keyword name="HelpWindow.__titleChanged" id="HelpWindow.__titleChanged" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.__titleChanged" />
       <keyword name="HelpWindow.__userStyleSheet" id="HelpWindow.__userStyleSheet" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.__userStyleSheet" />
       <keyword name="HelpWindow.__viewFullScreen" id="HelpWindow.__viewFullScreen" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.__viewFullScreen" />
-      <keyword name="HelpWindow.__virusTotalFileScanReport" id="HelpWindow.__virusTotalFileScanReport" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.__virusTotalFileScanReport" />
-      <keyword name="HelpWindow.__virusTotalScanCurrentSite" id="HelpWindow.__virusTotalScanCurrentSite" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.__virusTotalScanCurrentSite" />
-      <keyword name="HelpWindow.__virusTotalSearch" id="HelpWindow.__virusTotalSearch" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.__virusTotalSearch" />
-      <keyword name="HelpWindow.__virusTotalSearchChanged" id="HelpWindow.__virusTotalSearchChanged" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.__virusTotalSearchChanged" />
-      <keyword name="HelpWindow.__virusTotalSubmitUrlError" id="HelpWindow.__virusTotalSubmitUrlError" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.__virusTotalSubmitUrlError" />
-      <keyword name="HelpWindow.__virusTotalUrlScanReport" id="HelpWindow.__virusTotalUrlScanReport" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.__virusTotalUrlScanReport" />
       <keyword name="HelpWindow.__warning" id="HelpWindow.__warning" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.__warning" />
       <keyword name="HelpWindow.__whatsThis" id="HelpWindow.__whatsThis" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.__whatsThis" />
       <keyword name="HelpWindow.__zoomIn" id="HelpWindow.__zoomIn" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.__zoomIn" />
@@ -5572,7 +5565,6 @@
       <keyword name="HelpWindow.preferencesChanged" id="HelpWindow.preferencesChanged" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.preferencesChanged" />
       <keyword name="HelpWindow.previewer" id="HelpWindow.previewer" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.previewer" />
       <keyword name="HelpWindow.reloadUserStyleSheet" id="HelpWindow.reloadUserStyleSheet" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.reloadUserStyleSheet" />
-      <keyword name="HelpWindow.requestVirusTotalScan" id="HelpWindow.requestVirusTotalScan" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.requestVirusTotalScan" />
       <keyword name="HelpWindow.search" id="HelpWindow.search" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.search" />
       <keyword name="HelpWindow.searchEnginesAction" id="HelpWindow.searchEnginesAction" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.searchEnginesAction" />
       <keyword name="HelpWindow.setBackwardAvailable" id="HelpWindow.setBackwardAvailable" ref="eric6.Helpviewer.HelpWindow.html#HelpWindow.setBackwardAvailable" />

--- a/Documentation/Source/eric6.DebugClients.Python.DebugClientBase.html	Mon Aug 17 12:16:43 2015 +0200
+++ b/Documentation/Source/eric6.DebugClients.Python.DebugClientBase.html	Mon Aug 17 12:31:29 2015 +0200
@@ -589,13 +589,16 @@
         Public method implementing the main method.
 </p><a NAME="DebugClientBase.progTerminated" ID="DebugClientBase.progTerminated"></a>
 <h4>DebugClientBase.progTerminated</h4>
-<b>progTerminated</b>(<i>status</i>)
+<b>progTerminated</b>(<i>status, exit=False</i>)
 <p>
         Public method to tell the debugger that the program has terminated.
 </p><dl>
 <dt><i>status</i></dt>
 <dd>
-the return status
+return status
+</dd><dt><i>exit</i> (bool)</dt>
+<dd>
+flag indicating to perform a sys.exit()
 </dd>
 </dl><a NAME="DebugClientBase.raw_input" ID="DebugClientBase.raw_input"></a>
 <h4>DebugClientBase.raw_input</h4>

--- a/Documentation/Source/eric6.DebugClients.Python3.DebugClientBase.html	Mon Aug 17 12:16:43 2015 +0200
+++ b/Documentation/Source/eric6.DebugClients.Python3.DebugClientBase.html	Mon Aug 17 12:31:29 2015 +0200
@@ -604,13 +604,16 @@
         Public method implementing the main method.
 </p><a NAME="DebugClientBase.progTerminated" ID="DebugClientBase.progTerminated"></a>
 <h4>DebugClientBase.progTerminated</h4>
-<b>progTerminated</b>(<i>status</i>)
+<b>progTerminated</b>(<i>status, exit=False</i>)
 <p>
         Public method to tell the debugger that the program has terminated.
 </p><dl>
 <dt><i>status</i></dt>
 <dd>
-the return status
+return status
+</dd><dt><i>exit</i> (bool)</dt>
+<dd>
+flag indicating to perform a sys.exit()
 </dd>
 </dl><a NAME="DebugClientBase.run_call" ID="DebugClientBase.run_call"></a>
 <h4>DebugClientBase.run_call</h4>

--- a/Documentation/Source/eric6.Helpviewer.GreaseMonkey.GreaseMonkeyConfiguration.GreaseMonkeyConfigurationDialog.html	Mon Aug 17 12:16:43 2015 +0200
+++ b/Documentation/Source/eric6.Helpviewer.GreaseMonkey.GreaseMonkeyConfiguration.GreaseMonkeyConfigurationDialog.html	Mon Aug 17 12:31:29 2015 +0200
@@ -73,7 +73,7 @@
 <td>Private slot to remove a script item.</td>
 </tr><tr>
 <td><a href="#GreaseMonkeyConfigurationDialog.on_downloadLabel_linkActivated">on_downloadLabel_linkActivated</a></td>
-<td>Private slot to open the userscript.org web site.</td>
+<td>Private slot to open the greasyfork.org web site.</td>
 </tr><tr>
 <td><a href="#GreaseMonkeyConfigurationDialog.on_openDirectoryButton_clicked">on_openDirectoryButton_clicked</a></td>
 <td>Private slot to open the GreaseMonkey scripts directory.</td>
@@ -143,7 +143,7 @@
 <h4>GreaseMonkeyConfigurationDialog.on_downloadLabel_linkActivated</h4>
 <b>on_downloadLabel_linkActivated</b>(<i>link</i>)
 <p>
-        Private slot to open the userscript.org web site.
+        Private slot to open the greasyfork.org web site.
 </p><dl>
 <dt><i>link</i></dt>
 <dd>

--- a/Documentation/Source/eric6.Helpviewer.HelpBrowserWV.html	Mon Aug 17 12:16:43 2015 +0200
+++ b/Documentation/Source/eric6.Helpviewer.HelpBrowserWV.html	Mon Aug 17 12:31:29 2015 +0200
@@ -222,9 +222,6 @@
 <td><a href="#HelpBrowser.__urlChanged">__urlChanged</a></td>
 <td>Private slot to handle the urlChanged signal.</td>
 </tr><tr>
-<td><a href="#HelpBrowser.__virusTotal">__virusTotal</a></td>
-<td>Private slot to scan the selected URL with VirusTotal.</td>
-</tr><tr>
 <td><a href="#HelpBrowser.__webInspector">__webInspector</a></td>
 <td>Private slot to show the web inspector window.</td>
 </tr><tr>
@@ -716,12 +713,7 @@
 <dd>
 the new url (QUrl)
 </dd>
-</dl><a NAME="HelpBrowser.__virusTotal" ID="HelpBrowser.__virusTotal"></a>
-<h4>HelpBrowser.__virusTotal</h4>
-<b>__virusTotal</b>(<i></i>)
-<p>
-        Private slot to scan the selected URL with VirusTotal.
-</p><a NAME="HelpBrowser.__webInspector" ID="HelpBrowser.__webInspector"></a>
+</dl><a NAME="HelpBrowser.__webInspector" ID="HelpBrowser.__webInspector"></a>
 <h4>HelpBrowser.__webInspector</h4>
 <b>__webInspector</b>(<i></i>)
 <p>

--- a/Documentation/Source/eric6.Helpviewer.HelpWindow.html	Mon Aug 17 12:16:43 2015 +0200
+++ b/Documentation/Source/eric6.Helpviewer.HelpWindow.html	Mon Aug 17 12:31:29 2015 +0200
@@ -385,24 +385,6 @@
 <td><a href="#HelpWindow.__viewFullScreen">__viewFullScreen</a></td>
 <td>Private slot called to toggle fullscreen mode.</td>
 </tr><tr>
-<td><a href="#HelpWindow.__virusTotalFileScanReport">__virusTotalFileScanReport</a></td>
-<td>Private slot to initiate the display of the file scan report page.</td>
-</tr><tr>
-<td><a href="#HelpWindow.__virusTotalScanCurrentSite">__virusTotalScanCurrentSite</a></td>
-<td>Private slot to ask VirusTotal for a scan of the URL of the current browser.</td>
-</tr><tr>
-<td><a href="#HelpWindow.__virusTotalSearch">__virusTotalSearch</a></td>
-<td>Private slot to search VirusTotal for a given entry.</td>
-</tr><tr>
-<td><a href="#HelpWindow.__virusTotalSearchChanged">__virusTotalSearchChanged</a></td>
-<td>Private slot to react upon changes of the VirusTotal search text.</td>
-</tr><tr>
-<td><a href="#HelpWindow.__virusTotalSubmitUrlError">__virusTotalSubmitUrlError</a></td>
-<td>Private slot to handle an URL scan submission error.</td>
-</tr><tr>
-<td><a href="#HelpWindow.__virusTotalUrlScanReport">__virusTotalUrlScanReport</a></td>
-<td>Private slot to initiate the display of the URL scan report page.</td>
-</tr><tr>
 <td><a href="#HelpWindow.__warning">__warning</a></td>
 <td>Private slot handling warnings from the help engine.</td>
 </tr><tr>
@@ -487,9 +469,6 @@
 <td><a href="#HelpWindow.reloadUserStyleSheet">reloadUserStyleSheet</a></td>
 <td>Public method to reload the user style sheet.</td>
 </tr><tr>
-<td><a href="#HelpWindow.requestVirusTotalScan">requestVirusTotalScan</a></td>
-<td>Public method to submit a request to scan an URL by VirusTotal.</td>
-</tr><tr>
 <td><a href="#HelpWindow.search">search</a></td>
 <td>Public method to search for a word.</td>
 </tr><tr>
@@ -1293,58 +1272,7 @@
 <b>__viewFullScreen</b>(<i></i>)
 <p>
         Private slot called to toggle fullscreen mode.
-</p><a NAME="HelpWindow.__virusTotalFileScanReport" ID="HelpWindow.__virusTotalFileScanReport"></a>
-<h4>HelpWindow.__virusTotalFileScanReport</h4>
-<b>__virusTotalFileScanReport</b>(<i>url</i>)
-<p>
-        Private slot to initiate the display of the file scan report page.
-</p><dl>
-<dt><i>url</i></dt>
-<dd>
-URL of the file scan report page (string)
-</dd>
-</dl><a NAME="HelpWindow.__virusTotalScanCurrentSite" ID="HelpWindow.__virusTotalScanCurrentSite"></a>
-<h4>HelpWindow.__virusTotalScanCurrentSite</h4>
-<b>__virusTotalScanCurrentSite</b>(<i></i>)
-<p>
-        Private slot to ask VirusTotal for a scan of the URL of the current
-        browser.
-</p><a NAME="HelpWindow.__virusTotalSearch" ID="HelpWindow.__virusTotalSearch"></a>
-<h4>HelpWindow.__virusTotalSearch</h4>
-<b>__virusTotalSearch</b>(<i></i>)
-<p>
-        Private slot to search VirusTotal for a given entry.
-</p><a NAME="HelpWindow.__virusTotalSearchChanged" ID="HelpWindow.__virusTotalSearchChanged"></a>
-<h4>HelpWindow.__virusTotalSearchChanged</h4>
-<b>__virusTotalSearchChanged</b>(<i>txt</i>)
-<p>
-        Private slot to react upon changes of the VirusTotal search text.
-</p><dl>
-<dt><i>txt</i></dt>
-<dd>
-contents of the search (string)
-</dd>
-</dl><a NAME="HelpWindow.__virusTotalSubmitUrlError" ID="HelpWindow.__virusTotalSubmitUrlError"></a>
-<h4>HelpWindow.__virusTotalSubmitUrlError</h4>
-<b>__virusTotalSubmitUrlError</b>(<i>msg</i>)
-<p>
-        Private slot to handle an URL scan submission error.
-</p><dl>
-<dt><i>msg</i></dt>
-<dd>
-error message (str)
-</dd>
-</dl><a NAME="HelpWindow.__virusTotalUrlScanReport" ID="HelpWindow.__virusTotalUrlScanReport"></a>
-<h4>HelpWindow.__virusTotalUrlScanReport</h4>
-<b>__virusTotalUrlScanReport</b>(<i>url</i>)
-<p>
-        Private slot to initiate the display of the URL scan report page.
-</p><dl>
-<dt><i>url</i></dt>
-<dd>
-URL of the URL scan report page (string)
-</dd>
-</dl><a NAME="HelpWindow.__warning" ID="HelpWindow.__warning"></a>
+</p><a NAME="HelpWindow.__warning" ID="HelpWindow.__warning"></a>
 <h4>HelpWindow.__warning</h4>
 <b>__warning</b>(<i>msg</i>)
 <p>
@@ -1616,17 +1544,7 @@
 <b>reloadUserStyleSheet</b>(<i></i>)
 <p>
         Public method to reload the user style sheet.
-</p><a NAME="HelpWindow.requestVirusTotalScan" ID="HelpWindow.requestVirusTotalScan"></a>
-<h4>HelpWindow.requestVirusTotalScan</h4>
-<b>requestVirusTotalScan</b>(<i>url</i>)
-<p>
-        Public method to submit a request to scan an URL by VirusTotal.
-</p><dl>
-<dt><i>url</i></dt>
-<dd>
-URL to be scanned (QUrl)
-</dd>
-</dl><a NAME="HelpWindow.search" ID="HelpWindow.search"></a>
+</p><a NAME="HelpWindow.search" ID="HelpWindow.search"></a>
 <h4>HelpWindow.search</h4>
 <b>search</b>(<i>word</i>)
 <p>