Mercurial Repositories > eric / changeset

--- a/DebugClients/Python/DebugClientBase.py	Sun Jul 17 11:22:05 2011 +0200
+++ b/DebugClients/Python/DebugClientBase.py	Sun Jul 17 18:27:48 2011 +0200
@@ -1067,8 +1067,6 @@
             else:
                 index = 0
             if ":" in remoteAddress:                              # IPv6
-                printerr(type(remoteAddress))
-                printerr(type(port))
                 sockaddr = socket.getaddrinfo(
                     remoteAddress, port, 0, 0, socket.SOL_TCP)[0][-1]
                 sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sun Jul 17 11:22:05 2011 +0200
+++ b/Documentation/Help/source.qhp	Sun Jul 17 18:27:48 2011 +0200
@@ -2064,6 +2064,7 @@
       <keyword name="DebugServer.__createDebuggerInterface" id="DebugServer.__createDebuggerInterface" ref="eric5.Debugger.DebugServer.html#DebugServer.__createDebuggerInterface" />
       <keyword name="DebugServer.__deleteBreakPoints" id="DebugServer.__deleteBreakPoints" ref="eric5.Debugger.DebugServer.html#DebugServer.__deleteBreakPoints" />
       <keyword name="DebugServer.__deleteWatchPoints" id="DebugServer.__deleteWatchPoints" ref="eric5.Debugger.DebugServer.html#DebugServer.__deleteWatchPoints" />
+      <keyword name="DebugServer.__getNetworkInterfaceAndIndex" id="DebugServer.__getNetworkInterfaceAndIndex" ref="eric5.Debugger.DebugServer.html#DebugServer.__getNetworkInterfaceAndIndex" />
       <keyword name="DebugServer.__makeWatchCondition" id="DebugServer.__makeWatchCondition" ref="eric5.Debugger.DebugServer.html#DebugServer.__makeWatchCondition" />
       <keyword name="DebugServer.__newConnection" id="DebugServer.__newConnection" ref="eric5.Debugger.DebugServer.html#DebugServer.__newConnection" />
       <keyword name="DebugServer.__passiveShutDown" id="DebugServer.__passiveShutDown" ref="eric5.Debugger.DebugServer.html#DebugServer.__passiveShutDown" />

--- a/Documentation/Source/eric5.Debugger.DebugServer.html	Sun Jul 17 11:22:05 2011 +0200
+++ b/Documentation/Source/eric5.Debugger.DebugServer.html	Sun Jul 17 18:27:48 2011 +0200
@@ -222,6 +222,9 @@
 <td><a href="#DebugServer.__deleteWatchPoints">__deleteWatchPoints</a></td>
 <td>Private slot to delete watch expressions.</td>
 </tr><tr>
+<td><a href="#DebugServer.__getNetworkInterfaceAndIndex">__getNetworkInterfaceAndIndex</a></td>
+<td>Private method to determine the network interface and the interface index.</td>
+</tr><tr>
 <td><a href="#DebugServer.__makeWatchCondition">__makeWatchCondition</a></td>
 <td>Private method to construct the condition string.</td>
 </tr><tr>
@@ -608,6 +611,21 @@
 <dd>
 end row (integer)
 </dd>
+</dl><a NAME="DebugServer.__getNetworkInterfaceAndIndex" ID="DebugServer.__getNetworkInterfaceAndIndex"></a>
+<h4>DebugServer.__getNetworkInterfaceAndIndex</h4>
+<b>__getNetworkInterfaceAndIndex</b>(<i>address</i>)
+<p>
+        Private method to determine the network interface and the interface index.
+</p><dl>
+<dt><i>address</i></dt>
+<dd>
+address to determine the info for (string)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+tuple of network interface name (string) and index (integer)
+</dd>
 </dl><a NAME="DebugServer.__makeWatchCondition" ID="DebugServer.__makeWatchCondition"></a>
 <h4>DebugServer.__makeWatchCondition</h4>
 <b>__makeWatchCondition</b>(<i>cond, special</i>)

--- a/Documentation/Source/eric5.Debugger.DebuggerInterfaceNone.html	Sun Jul 17 11:22:05 2011 +0200
+++ b/Documentation/Source/eric5.Debugger.DebuggerInterfaceNone.html	Sun Jul 17 18:27:48 2011 +0200
@@ -219,9 +219,9 @@
 <p>
         Public slot to handle a new connection.
 </p><dl>
-<dt><i>sockreference</i></dt>
+<dt><i>sock</i></dt>
 <dd>
-to the socket object (QTcpSocket)
+reference to the socket object (QTcpSocket)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>

--- a/Documentation/Source/eric5.Debugger.DebuggerInterfacePython.html	Sun Jul 17 11:22:05 2011 +0200
+++ b/Documentation/Source/eric5.Debugger.DebuggerInterfacePython.html	Sun Jul 17 18:27:48 2011 +0200
@@ -316,9 +316,9 @@
 <p>
         Public slot to handle a new connection.
 </p><dl>
-<dt><i>sockreference</i></dt>
+<dt><i>sock</i></dt>
 <dd>
-to the socket object (QTcpSocket)
+reference to the socket object (QTcpSocket)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>

--- a/Documentation/Source/eric5.Debugger.DebuggerInterfaceRuby.html	Sun Jul 17 11:22:05 2011 +0200
+++ b/Documentation/Source/eric5.Debugger.DebuggerInterfaceRuby.html	Sun Jul 17 18:27:48 2011 +0200
@@ -308,9 +308,9 @@
 <p>
         Public slot to handle a new connection.
 </p><dl>
-<dt><i>sockreference</i></dt>
+<dt><i>sock</i></dt>
 <dd>
-to the socket object (QTcpSocket)
+reference to the socket object (QTcpSocket)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>