Merge pull request #4380 from takluyver/test-load-ips

Test and fixes for localinterfaces

IPython/utils/tests/test_localinterfaces.py

@@ -0,0 +1,15 b''
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2013  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-----------------------------------------------------------------------------
+
+from .. import localinterfaces
+
+def test_load_ips():
+    # Override the machinery that skips it if it was called before
+    localinterfaces._load_ips.called = False
+
+    # Just check this doesn't error
+    localinterfaces._load_ips(suppress_exceptions=False)
  No newline at end of file

IPython/utils/localinterfaces.py

@@ -27,7 +27,6 b' import socket'
 
 from .data import uniq_stable
 from .process import get_output_error_code
-from .py3compat import bytes_to_str
 from .warn import warn
 
 #-----------------------------------------------------------------------------
@@ -42,10 +41,10 b" LOCALHOST = ''"
 def _only_once(f):
     """decorator to only run a function once"""
     f.called = False
-    def wrapped():
+    def wrapped(**kwargs):
         if f.called:
             return
-        ret = f()
+        ret = f(**kwargs)
         f.called = True
         return ret
     return wrapped
@@ -96,11 +95,11 b' def _load_ips_ifconfig():'
     if rc:
         raise IOError("no ifconfig: %s" % err)
     
-    lines = bytes_to_str(out).splitlines()
+    lines = out.splitlines()
     addrs = []
     for line in lines:
         blocks = line.lower().split()
-        if blocks[0] == 'inet':
+        if (len(blocks) >= 2) and (blocks[0] == 'inet'):
             addrs.append(blocks[1])
     _populate_from_list(addrs)
 
@@ -111,11 +110,11 b' def _load_ips_ip():'
     if rc:
         raise IOError("no ip: %s" % err)
     
-    lines = bytes_to_str(out).splitlines()
+    lines = out.splitlines()
     addrs = []
     for line in lines:
         blocks = line.lower().split()
-        if blocks[0] == 'inet':
+        if (len(blocks) >= 2) and (blocks[0] == 'inet'):
             addrs.append(blocks[1].split('/')[0])
     _populate_from_list(addrs)
 
@@ -126,7 +125,7 b' def _load_ips_ipconfig():'
     if rc:
         raise IOError("no ipconfig: %s" % err)
     
-    lines = bytes_to_str(out).splitlines()
+    lines = out.splitlines()
     addrs = ['127.0.0.1']
     for line in lines:
         line = line.lower().split()
@@ -203,7 +202,7 b' def _load_ips_dumb():'
     PUBLIC_IPS[:] = []
 
 @_only_once
-def _load_ips():
+def _load_ips(suppress_exceptions=True):
     """load the IPs that point to this machine
     
     This function will only ever be called once.
@@ -241,6 +240,8 b' def _load_ips():'
         
         return _load_ips_gethostbyname()
     except Exception as e:
+        if not suppress_exceptions:
+            raise
         # unexpected error shouldn't crash, load dumb default values instead.
         warn("Unexpected error discovering local network interfaces: %s" % e)
     _load_ips_dumb()