Fix exceptions handling

Author: frenzymadness

python-ethtool/etherinfo.c

@@ -238,9 +238,9 @@ PyObject * get_etherinfo_address(PyEtherInfo *self, nlQuery query)
 		return NULL;
 	}
 
-        if( _set_device_index(self) != 1) {
-                return NULL;
-        }
+    if(!_set_device_index(self)) {
+        return NULL;
+    }
 
 	/* Query the for requested info via NETLINK */
     /* Extract IP address information */

python-ethtool/etherinfo_obj.c

@@ -236,7 +236,12 @@ static PyObject *get_ipv4_addr(PyObject *obj, void *info)
 			return py_addr->local;
 		}
 	}
-	Py_RETURN_NONE;
+
+	if (PyErr_Occurred()) {
+		return NULL;
+	} else {
+		Py_RETURN_NONE;
+	}
 }
 
 static PyObject *get_ipv4_mask(PyObject *obj, void *info)
@@ -250,7 +255,12 @@ static PyObject *get_ipv4_mask(PyObject *obj, void *info)
 	if (py_addr) {
 		return PyInt_FromLong(py_addr->prefixlen);
 	}
-	return PyInt_FromLong(0);
+
+	if (PyErr_Occurred()) {
+		return NULL;
+	} else {
+		return PyInt_FromLong(0);
+	}
 }
 
 static PyObject *get_ipv4_bcast(PyObject *obj, void *info)
@@ -267,7 +277,12 @@ static PyObject *get_ipv4_bcast(PyObject *obj, void *info)
 			return py_addr->ipv4_broadcast;
 		}
 	}
-	Py_RETURN_NONE;
+
+	if (PyErr_Occurred()) {
+		return NULL;
+	} else {
+		Py_RETURN_NONE;
+	}
 }
 
 

tests/test_ethtool.py

@@ -206,9 +206,9 @@ def test_get_interface_info_invalid(self):
         self.assertEqual(len(eis), 1)
         ei = eis[0]
         self.assertEqual(ei.device, INVALID_DEVICE_NAME)
-        self.assertEqual(ei.ipv4_netmask, 0)
-        self.assertEqual(ei.ipv4_address, None)
-        self.assertEqual(ei.ipv4_broadcast, None)
+        self.assertRaisesIOError(getattr, (ei, 'ipv4_address'), '[Errno 19] No such device')
+        self.assertRaisesIOError(getattr, (ei, 'ipv4_netmask'), '[Errno 19] No such device')
+        self.assertRaisesIOError(getattr, (ei, 'ipv4_broadcast'), '[Errno 19] No such device')
         self.assertRaisesIOError(getattr, (ei, 'mac_address'), '[Errno 19] No such device')
 
     def test_get_interface_info_active(self):