Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric6.api	Wed Mar 21 22:13:31 2018 +0100
+++ b/APIs/Python3/eric6.api	Fri Mar 23 19:00:52 2018 +0100
@@ -315,7 +315,9 @@
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.unlockClient?4()
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.updateThreadList?4()
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension?1()
+eric6.DebugClients.Python.ThreadExtension.ThreadWrapper.timer?7
 eric6.DebugClients.Python.ThreadExtension.ThreadWrapper?1(*args, **kwargs)
+eric6.DebugClients.Python.ThreadExtension.TimerWrapper?1(interval, function, *args, **kwargs)
 eric6.DebugClients.Python.ThreadExtension._qtThreadNumber?8
 eric6.DebugClients.Python.eric6dbgstub.debugger?7
 eric6.DebugClients.Python.eric6dbgstub.ericpath?7

--- a/APIs/Python3/eric6.bas	Wed Mar 21 22:13:31 2018 +0100
+++ b/APIs/Python3/eric6.bas	Fri Mar 23 19:00:52 2018 +0100
@@ -911,6 +911,7 @@
 TemplatesWriter XMLStreamWriterBase
 TextVisitor ast.NodeVisitor
 ThreadWrapper module.Thread
+TimerWrapper ThreadWrapper timer
 Token str
 ToolConfigurationDialog QDialog Ui_ToolConfigurationDialog
 ToolGroupConfigurationDialog QDialog Ui_ToolGroupConfigurationDialog

--- a/DebugClients/Python/ThreadExtension.py	Wed Mar 21 22:13:31 2018 +0100
+++ b/DebugClients/Python/ThreadExtension.py	Fri Mar 23 19:00:52 2018 +0100
@@ -321,10 +321,13 @@
                     sys.settrace(None)
             
             class ThreadWrapper(module.Thread):
-                """ Wrapper class for threading.Thread. """
-                
+                """
+                Wrapper class for threading.Thread.
+                """
                 def __init__(self, *args, **kwargs):
-                    """ Constructor. """
+                    """
+                    Constructor
+                    """
                     # Overwrite the provided run method with our own, to
                     # intercept the thread creation by threading.Thread
                     self.run = lambda s=self, run=self.run: _bootstrap(s, run)
@@ -340,10 +343,13 @@
                 timer = module.Timer
                 
             class TimerWrapper(timer, ThreadWrapper):
-                """ Wrapper class for threading.(_)Timer. """
-                
+                """
+                Wrapper class for threading.(_)Timer.
+                """
                 def __init__(self, interval, function, *args, **kwargs):
-                    """ Constructor. """
+                    """
+                    Constructor
+                    """
                     super(TimerWrapper, self).__init__(
                         interval, function, *args, **kwargs)
             
@@ -395,9 +401,13 @@
                     sys.settrace(None)
         
             class QThreadWrapper(module.QThread):
-                """ Wrapper class for *.QThread. """
-                
+                """
+                Wrapper class for *.QThread.
+                """
                 def __init__(self, *args, **kwargs):
+                    """
+                    Constructor
+                    """
                     # Overwrite the provided run method with our own, to
                     # intercept the thread creation by Qt
                     self.run = lambda s=self, run=self.run: (

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Wed Mar 21 22:13:31 2018 +0100
+++ b/Documentation/Help/source.qhp	Fri Mar 23 19:00:52 2018 +0100
@@ -16151,6 +16151,8 @@
       <keyword name="ThreatList.__repr__" id="ThreatList.__repr__" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html#ThreatList.__repr__" />
       <keyword name="ThreatList.asTuple" id="ThreatList.asTuple" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html#ThreatList.asTuple" />
       <keyword name="ThreatList.fromApiEntry" id="ThreatList.fromApiEntry" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html#ThreatList.fromApiEntry" />
+      <keyword name="TimerWrapper" id="TimerWrapper" ref="eric6.DebugClients.Python.ThreadExtension.html#TimerWrapper" />
+      <keyword name="TimerWrapper (Constructor)" id="TimerWrapper (Constructor)" ref="eric6.DebugClients.Python.ThreadExtension.html#TimerWrapper.__init__" />
       <keyword name="Token" id="Token" ref="eric6.DataViews.CodeMetrics.html#Token" />
       <keyword name="Token" id="Token" ref="eric6.E5Network.E5RFC6266.html#Token" />
       <keyword name="Token (Constructor)" id="Token (Constructor)" ref="eric6.DataViews.CodeMetrics.html#Token.__init__" />

--- a/Documentation/Source/eric6.DebugClients.Python.ThreadExtension.html	Wed Mar 21 22:13:31 2018 +0100
+++ b/Documentation/Source/eric6.DebugClients.Python.ThreadExtension.html	Fri Mar 23 19:00:52 2018 +0100
@@ -38,6 +38,9 @@
 </tr><tr>
 <td><a href="#ThreadWrapper">ThreadWrapper</a></td>
 <td>Wrapper class for threading.Thread.</td>
+</tr><tr>
+<td><a href="#TimerWrapper">TimerWrapper</a></td>
+<td>Wrapper class for threading.(_)Timer.</td>
 </tr>
 </table>
 <h3>Functions</h3>
@@ -48,7 +51,7 @@
 <a NAME="QThreadWrapper" ID="QThreadWrapper"></a>
 <h2>QThreadWrapper</h2>
 <p>
- Wrapper class for *.QThread. 
+                Wrapper class for *.QThread.
 </p>
 <h3>Derived from</h3>
 module.QThread
@@ -64,7 +67,7 @@
 <table>
 <tr>
 <td><a href="#QThreadWrapper.__init__">QThreadWrapper</a></td>
-<td></td>
+<td>Constructor</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -74,7 +77,9 @@
 <a NAME="QThreadWrapper.__init__" ID="QThreadWrapper.__init__"></a>
 <h4>QThreadWrapper (Constructor)</h4>
 <b>QThreadWrapper</b>(<i>*args, **kwargs</i>)
-
+<p>
+                    Constructor
+</p>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
 <a NAME="ThreadExtension" ID="ThreadExtension"></a>
@@ -320,12 +325,46 @@
 <a NAME="ThreadWrapper" ID="ThreadWrapper"></a>
 <h2>ThreadWrapper</h2>
 <p>
- Wrapper class for threading.Thread. 
+                Wrapper class for threading.Thread.
 </p>
 <h3>Derived from</h3>
 module.Thread
 <h3>Class Attributes</h3>
 <table>
+<tr><td>timer</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#ThreadWrapper.__init__">ThreadWrapper</a></td>
+<td>Constructor</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="ThreadWrapper.__init__" ID="ThreadWrapper.__init__"></a>
+<h4>ThreadWrapper (Constructor)</h4>
+<b>ThreadWrapper</b>(<i>*args, **kwargs</i>)
+<p>
+                    Constructor
+</p>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="TimerWrapper" ID="TimerWrapper"></a>
+<h2>TimerWrapper</h2>
+<p>
+                Wrapper class for threading.(_)Timer.
+</p>
+<h3>Derived from</h3>
+timer, ThreadWrapper
+<h3>Class Attributes</h3>
+<table>
 <tr><td>None</td></tr>
 </table>
 <h3>Class Methods</h3>
@@ -335,18 +374,20 @@
 <h3>Methods</h3>
 <table>
 <tr>
-<td><a href="#ThreadWrapper.__init__">ThreadWrapper</a></td>
-<td></td>
+<td><a href="#TimerWrapper.__init__">TimerWrapper</a></td>
+<td>Constructor</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
 <table>
 <tr><td>None</td></tr>
 </table>
-<a NAME="ThreadWrapper.__init__" ID="ThreadWrapper.__init__"></a>
-<h4>ThreadWrapper (Constructor)</h4>
-<b>ThreadWrapper</b>(<i>*args, **kwargs</i>)
-
+<a NAME="TimerWrapper.__init__" ID="TimerWrapper.__init__"></a>
+<h4>TimerWrapper (Constructor)</h4>
+<b>TimerWrapper</b>(<i>interval, function, *args, **kwargs</i>)
+<p>
+                    Constructor
+</p>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
 </body></html>
\ No newline at end of file