Small change to the IPv6 code. 5_1_x

Mon, 18 Jul 2011 19:50:45 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 18 Jul 2011 19:50:45 +0200
branch
5_1_x
changeset 1187
0a1dc25d1881
parent 1186
df2ec39bb002
child 1189
946daca989b5

Small change to the IPv6 code.
(transplanted from a9ce179c7c9411a04383f4ab2a5dc0443f7666e6)

Debugger/DebugServer.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/DebuggerGeneralPage.py file | annotate | diff | comparison | revisions
--- a/Debugger/DebugServer.py	Mon Jul 18 19:54:53 2011 +0200
+++ b/Debugger/DebugServer.py	Mon Jul 18 19:50:45 2011 +0200
@@ -216,7 +216,8 @@
                 if len(addressEntries) > 0:
                     for addressEntry in addressEntries:
                         if addressEntry.ip().toString().lower() == address.lower():
-                            return networkInterface.name(), networkInterface.index()
+                            return networkInterface.humanReadableName(), \
+                                    networkInterface.index()
         
         return "", 0
         
--- a/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Mon Jul 18 19:54:53 2011 +0200
+++ b/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Mon Jul 18 19:50:45 2011 +0200
@@ -65,7 +65,7 @@
                     if ":" in addressEntry.ip().toString() and not socket.has_ipv6:
                         continue    # IPv6 not supported by Python
                     interfaces.append("{0} ({1})"\
-                                      .format(networkInterface.name(), 
+                                      .format(networkInterface.humanReadableName(), 
                                               addressEntry.ip().toString()))
         self.interfacesCombo.addItems(interfaces)
         interface = Preferences.getDebugger("NetworkInterface")
@@ -261,4 +261,4 @@
     @param dlg reference to the configuration dialog
     """
     page = DebuggerGeneralPage()
-    return page
\ No newline at end of file
+    return page

eric ide

mercurial