Fixed a silly bug I found with the test script. Added gateway output to the test script.

2 files changed, 38 insertions, 15 deletions

diff --git a/netifaces.c b/netifaces.c
index 95b3003..3453f7e 100644
--- a/netifaces.c
+++ b/netifaces.c
@@ -1319,7 +1319,7 @@ gateways (PyObject *self)
 
 	tuple = PyTuple_Pack (3, gateway, ifname, isdefault);
 
-	if (PyBool_Check (isdefault))
+	if (PyObject_IsTrue (isdefault))
 	  deftuple = PyTuple_Pack (2, gateway, ifname);
 
 	Py_DECREF (gateway);
@@ -1420,7 +1420,7 @@ gateways (PyObject *self)
 
       tuple = PyTuple_Pack (3, gateway, ifname, isdefault);
 
-      if (PyBool_Check (isdefault))
+      if (PyObject_IsTrue (isdefault))
         deftuple = PyTuple_Pack (2, gateway, ifname);
 
       Py_DECREF (gateway);
@@ -1650,7 +1650,7 @@ gateways (PyObject *self)
 
           tuple = PyTuple_Pack (3, pyaddr, pyifname, isdefault);
 
-          if (PyBool_Check (isdefault))
+          if (PyObject_IsTrue (isdefault))
             deftuple = PyTuple_Pack (2, pyaddr, pyifname);
 
           Py_DECREF (pyaddr);
@@ -1798,7 +1798,7 @@ gateways (PyObject *self)
 #endif
           tuple = PyTuple_Pack (3, pyaddr, pyifname, isdefault);
 
-          if (PyBool_Check (isdefault))
+          if (PyObject_IsTrue (isdefault))
             deftuple = PyTuple_Pack (2, pyaddr, pyifname);
 
           Py_DECREF (pyaddr);
@@ -2026,7 +2026,7 @@ gateways (PyObject *self)
 
         tuple = PyTuple_Pack (3, pyaddr, pyifname, isdefault);
 
-        if (PyBool_Check (isdefault))
+        if (PyObject_IsTrue (isdefault))
           deftuple = PyTuple_Pack (2, pyaddr, pyifname);
 
         Py_DECREF (pyaddr);
@@ -2205,7 +2205,7 @@ gateways (PyObject *self)
 
         tuple = PyTuple_Pack (3, pyaddr, pyifname, isdefault);
 
-        if (PyBool_Check (isdefault))
+        if (PyObject_IsTrue (isdefault))
           deftuple = PyTuple_Pack (2, pyaddr, pyifname);
 
         Py_DECREF (pyaddr);
diff --git a/test.py b/test.py
index e394eaa..fb92675 100644
--- a/test.py
+++ b/test.py
@@ -1,26 +1,49 @@
 import netifaces
 
-print 'Found interfaces:'
+print('Found interfaces:')
 for iface in netifaces.interfaces():
-    print '  %s' % iface
+    print('  %s' % iface)
 
-print '\n'
+print('')
 
 for iface in netifaces.interfaces():
     allAddrs = netifaces.ifaddresses(iface)
 
-    print 'Interface %s:' % iface
+    print('Interface %s:' % iface)
 
     for family,addrs in allAddrs.iteritems():
         fam_name = netifaces.address_families[family]
-        print '  Address family: %s' % fam_name
+        print('  Address family: %s' % fam_name)
         for addr in addrs:
-            print     '    Address  : %s' % addr['addr']
+            print('    Address  : %s' % addr['addr'])
             nmask = addr.get('netmask', None)
             if nmask:
-                print '    Netmask  : %s' % nmask
+                print('    Netmask  : %s' % nmask)
             bcast = addr.get('broadcast', None)
             if bcast:
-                print '    Broadcast: %s' % bcast
+                print('    Broadcast: %s' % bcast)
 
-    print '\n'
+    print('')
+
+print('Found gateways:')
+gateway_info = netifaces.gateways()
+for family in gateway_info:
+    if family == 'default':
+        continue
+
+    fam_name = netifaces.address_families[family]
+    print('  Family: %s' % fam_name)
+    for gateway,interface,default in gateway_info[family]:
+        if default:
+            def_text = ', default'
+        else:
+            def_text = ''
+        print('    %s (via %s%s)' % (gateway, interface, def_text))
+    print('')
+    
+print('Default gateways:')
+default_gateways = gateway_info['default']
+for family in default_gateways:
+    fam_name = netifaces.address_families[family]
+    gateway, interface = default_gateways[family]
+    print('  %s: %s (via %s)' % (fam_name, gateway, interface))