Change some parts from bytes to str

Author: frenzymadness

python-ethtool/etherinfo.c

@@ -67,7 +67,7 @@ static void callback_nl_link(struct nl_object *obj, void *arg)
         if( ethi->hwaddress ) {
                 Py_XDECREF(ethi->hwaddress);
         }
-        ethi->hwaddress = PyBytes_FromFormat("%s", hwaddr);
+        ethi->hwaddress = PyStr_FromFormat("%s", hwaddr);
 }
 
 

python-ethtool/ethtool.c

@@ -223,25 +223,20 @@ static PyObject *get_interfaces_info(PyObject *self __unused, PyObject *args) {
 
 	/* Parse input arguments if we got them */
 	if( inargs != NULL ) {
-		if( PyBytes_Check(inargs) ) { /* Input argument is just a string */
+		if( PyStr_Check(inargs) ) { /* Input argument is just a string */
 			fetch_devs_len = 1;
 			fetch_devs = calloc(1, sizeof(char *));
-			fetch_devs[0] = PyBytes_AsString(inargs);
-#if PY_MAJOR_VERSION >= 3
-		} else if( PyUnicode_Check(inargs) ) { /* Input argument is just a ustring */
-			fetch_devs_len = 1;
-			fetch_devs = calloc(1, sizeof(char *));
-			fetch_devs[0] = PyUnicode_AsUTF8(inargs);
-#endif
+			fetch_devs[0] = PyStr_AsString(inargs);
+
 		} else if( PyTuple_Check(inargs) ) { /* Input argument is a tuple list with devices */
 			int j = 0;
 
 			fetch_devs_len = PyTuple_Size(inargs);
 			fetch_devs = calloc(fetch_devs_len+1, sizeof(char *));
 			for( i = 0; i < fetch_devs_len; i++ ) {
 				PyObject *elmt = PyTuple_GetItem(inargs, i);
-				if( elmt && PyBytes_Check(elmt) ) {
-					fetch_devs[j++] = PyBytes_AsString(elmt);
+				if( elmt && PyStr_Check(elmt) ) {
+					fetch_devs[j++] = PyStr_AsString(elmt);
 				}
 			}
 			fetch_devs_len = j;
@@ -252,8 +247,8 @@ static PyObject *get_interfaces_info(PyObject *self __unused, PyObject *args) {
 			fetch_devs = calloc(fetch_devs_len+1, sizeof(char *));
 			for( i = 0; i < fetch_devs_len; i++ ) {
 				PyObject *elmt = PyList_GetItem(inargs, i);
-				if( elmt && PyBytes_Check(elmt) ) {
-					fetch_devs[j++] = PyBytes_AsString(elmt);
+				if( elmt && PyStr_Check(elmt) ) {
+					fetch_devs[j++] = PyStr_AsString(elmt);
 				}
 			}
 			fetch_devs_len = j;

python-ethtool/netlink-address.c

@@ -15,6 +15,7 @@
 
 /* Python object corresponding to a (struct rtnl_addr) */
 #include <Python.h>
+#include "include/py3c/compat.h"
 #include <bytesobject.h>
 #include "structmember.h"
 
@@ -55,7 +56,7 @@ PyNetlinkIPaddress_from_rtnl_addr(struct rtnl_addr *addr)
 		PyErr_SetFromErrno(PyExc_RuntimeError);
 		goto error;
 	}
-	py_obj->local = PyBytes_FromString(buf);
+	py_obj->local = PyStr_FromString(buf);
 	if (!py_obj->local) {
 		goto error;
 	}
@@ -85,7 +86,7 @@ PyNetlinkIPaddress_from_rtnl_addr(struct rtnl_addr *addr)
 			PyErr_SetFromErrno(PyExc_RuntimeError);
 			goto error;
 		}
-		py_obj->ipv4_broadcast = PyBytes_FromString(buf);
+		py_obj->ipv4_broadcast = PyStr_FromString(buf);
 		if (!py_obj->ipv4_broadcast) {
 			goto error;
 		}
@@ -94,7 +95,7 @@ PyNetlinkIPaddress_from_rtnl_addr(struct rtnl_addr *addr)
 	/* Set IP address scope: */
 	memset(&buf, 0, sizeof(buf));
 	rtnl_scope2str(rtnl_addr_get_scope(addr), buf, sizeof(buf));
-	py_obj->scope = PyBytes_FromString(buf);
+	py_obj->scope = PyStr_FromString(buf);
 
 	return (PyObject*)py_obj;