First part of move from bytes to str

Author: frenzymadness

python-ethtool/etherinfo.c

@@ -16,6 +16,7 @@
  */
 
 #include <Python.h>
+#include "include/py3c/compat.h"
 #include <bytesobject.h>
 #include <bits/sockaddr.h>
 #include <stdio.h>
@@ -180,7 +181,7 @@ int get_etherinfo_link(PyEtherInfo *self)
 	if( !open_netlink(self) ) {
 		PyErr_Format(PyExc_RuntimeError,
 			     "Could not open a NETLINK connection for %s",
-			     PyBytes_AsString(self->device));
+			     PyStr_AsString(self->device));
 		return 0;
 	}
 
@@ -234,7 +235,7 @@ PyObject * get_etherinfo_address(PyEtherInfo *self, nlQuery query)
 	if( !open_netlink(self) ) {
 		PyErr_Format(PyExc_RuntimeError,
 			     "Could not open a NETLINK connection for %s",
-			     PyBytes_AsString(self->device));
+			     PyStr_AsString(self->device));
 		return NULL;
 	}
 

python-ethtool/ethtool.c

@@ -65,7 +65,7 @@ static PyObject *get_active_devices(PyObject *self __unused, PyObject *args __un
 
 	list = PyList_New(0);
 	for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-		PyObject *str = PyBytes_FromString(ifa->ifa_name);
+		PyObject *str = PyStr_FromString(ifa->ifa_name);
 		/* names are not unique (listed for both ipv4 and ipv6) */
 		if (!PySequence_Contains(list, str) && (ifa->ifa_flags & (IFF_UP))) {
 			PyList_Append(list, str);
@@ -109,7 +109,7 @@ static PyObject *get_devices(PyObject *self __unused, PyObject *args __unused)
 		while (*name == ' ')
 			name++; /* skip over leading whitespace if any */
 
-		str = PyBytes_FromString(name);
+		str = PyStr_FromString(name);
 		PyList_Append(list, str);
 		Py_DECREF(str);
 	}
@@ -156,7 +156,7 @@ static PyObject *get_hwaddress(PyObject *self __unused, PyObject *args)
 		(unsigned int)ifr.ifr_hwaddr.sa_data[4] % 256,
 		(unsigned int)ifr.ifr_hwaddr.sa_data[5] % 256);
 
-	return PyBytes_FromString(hwaddr);
+	return PyStr_FromString(hwaddr);
 }
 
 static PyObject *get_ipaddress(PyObject *self __unused, PyObject *args)
@@ -196,7 +196,7 @@ static PyObject *get_ipaddress(PyObject *self __unused, PyObject *args)
 		(unsigned int)ifr.ifr_addr.sa_data[4] % 256,
 		(unsigned int)ifr.ifr_addr.sa_data[5] % 256);
 
-	return PyBytes_FromString(ipaddr);
+	return PyStr_FromString(ipaddr);
 }
 
 
@@ -278,7 +278,7 @@ static PyObject *get_interfaces_info(PyObject *self __unused, PyObject *args) {
 			free(fetch_devs);
 			return NULL;
                 }
-		dev->device = PyBytes_FromString(fetch_devs[i]);
+		dev->device = PyStr_FromString(fetch_devs[i]);
 		dev->hwaddress = NULL;
 		dev->index = -1;
 
@@ -360,7 +360,7 @@ static PyObject *get_netmask (PyObject *self __unused, PyObject *args)
 		(unsigned int)ifr.ifr_netmask.sa_data[4] % 256,
 		(unsigned int)ifr.ifr_netmask.sa_data[5] % 256);
 
-	return PyBytes_FromString(netmask);
+	return PyStr_FromString(netmask);
 }
 
 static PyObject *get_broadcast(PyObject *self __unused, PyObject *args)
@@ -400,7 +400,7 @@ static PyObject *get_broadcast(PyObject *self __unused, PyObject *args)
 		(unsigned int)ifr.ifr_broadaddr.sa_data[4] % 256,
 		(unsigned int)ifr.ifr_broadaddr.sa_data[5] % 256);
 
-	return PyBytes_FromString(broadcast);
+	return PyStr_FromString(broadcast);
 }
 
 static PyObject *get_module(PyObject *self __unused, PyObject *args)
@@ -465,12 +465,12 @@ static PyObject *get_module(PyObject *self __unused, PyObject *args)
 			return NULL;
 		} else {
 			PyErr_Clear();
-			return PyBytes_FromString(driver);
+			return PyStr_FromString(driver);
 		}
 	}
 
 	close(fd);
-	return PyBytes_FromString(((struct ethtool_drvinfo *)buf)->driver);
+	return PyStr_FromString(((struct ethtool_drvinfo *)buf)->driver);
 }
 
 static PyObject *get_businfo(PyObject *self __unused, PyObject *args)
@@ -509,7 +509,7 @@ static PyObject *get_businfo(PyObject *self __unused, PyObject *args)
 	}
 
 	close(fd);
-	return PyBytes_FromString(((struct ethtool_drvinfo *)buf)->bus_info);
+	return PyStr_FromString(((struct ethtool_drvinfo *)buf)->bus_info);
 }
 
 static int send_command(int cmd, const char *devname, void *value)