[PATCH 00/13] Support Python 3

[Andy Grover]

This patchset modifies the C part of ethtool to compile cleanly and
work with Python 3.

It's also available via git, here:

https://github.com/agrover/python-ethtool/tree/python3

See also https://bugzilla.redhat.com/show_bug.cgi?id=1018525 .  which
has a v1 patch by asegurap(a)redhat.com that I unfortunately only
noticed just now :-(

I'd still suggest starting from this patchset, since it's already
broken up for review. Hopefully Antoni or someone can fixup the pure
Python parts and tests using 2to3 or from the v1 patch perhaps?

I have a pkg that depends on ethtool that I'd really like to convert
to Python 3, so please let me know how I can help speed the
transition.

Thanks -- Regards -- Andy

Andy Grover (13):
  python3: Use print function
  python3: getstatusoutput() moved to subprocess module
  python3: Use -fno-strict-aliasing
  python3: Use bytesobject.h and PyBytes_* instead of PyString_*
  python3: Use PyLong_* instead of PyInt_*
  python3: Use Py_TYPE() instead of self->ob_type
  python3: Use PyVarObject_HEAD_INIT instead of PyObject_HEAD_INIT
  python3: set PyEtherInfo.tp_flags to Py_TPFLAGS_DEFAULT
  python3: Handle differences in module initialization
  python3: Allow devname to be given as string or bytestring
  python3: use tp_getset instead of tp_{get,set}attro
  python3: Allow unicode strings as arg to get_interfaces_info
  python3: Python3 expects str() and repr() to return strings not
    bytestrings

 python-ethtool/etherinfo.c       |   9 +-
 python-ethtool/etherinfo_obj.c   | 224 ++++++++++++++++++++-------------------
 python-ethtool/ethtool.c         |  90 ++++++++++------
 python-ethtool/netlink-address.c |  51 +++++----
 setup.py                         |  16 ++-
 5 files changed, 219 insertions(+), 171 deletions(-)

-- 
1.9.3

[PATCH 01/13] python3: Use print function

[Andy Grover]

Maintaining py2 compatibility, use print() as a function.

Signed-off-by: Andy Grover <agrover(a)redhat.com&gt;
---
 setup.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 57a58e5..6caf670 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python2
 
+from __future__ import print_function
+
 from distutils.core import setup, Extension
 import commands
 import sys
@@ -16,22 +18,22 @@ def pkgconfig(pkg):
 
     (res, cflags) = commands.getstatusoutput('pkg-config --cflags-only-other %s'
% pkg)
     if res != 0:
-        print 'Failed to query pkg-config --cflags-only-other %s' % pkg
+        print('Failed to query pkg-config --cflags-only-other %s' % pkg)
         sys.exit(1)
 
     (res, includes) = commands.getstatusoutput('pkg-config --cflags-only-I %s' %
pkg)
     if res != 0:
-        print 'Failed to query pkg-config --cflags-only-I %s' % pkg
+        print('Failed to query pkg-config --cflags-only-I %s' % pkg)
         sys.exit(1)
 
     (res, libs) = commands.getstatusoutput('pkg-config --libs-only-l %s' % pkg)
     if res != 0:
-        print 'Failed to query pkg-config --libs-only-l %s' % pkg
+        print('Failed to query pkg-config --libs-only-l %s' % pkg)
         sys.exit(1)
 
     (res, libdirs) = commands.getstatusoutput('pkg-config --libs-only-L %s' %
pkg)
     if res != 0:
-        print 'Failed to query pkg-config --libs-only-L %s' % pkg
+        print('Failed to query pkg-config --libs-only-L %s' % pkg)
         sys.exit(1)
 
 
-- 
1.9.3

[PATCH 02/13] python3: getstatusoutput() moved to subprocess module

[Andy Grover]

py3 eliminates the commands module but supports getstatusoutput() via the
subprocess module. This change enables py3 but keeps py2 compatibility.

Signed-off-by: Andy Grover <agrover(a)redhat.com&gt;
---
 setup.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 6caf670..a77378c 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,10 @@
 from __future__ import print_function
 
 from distutils.core import setup, Extension
-import commands
+try:
+    import commands
+except ImportError:
+    import subprocess as commands
 import sys
 
 version = '0.10'
-- 
1.9.3

[PATCH 03/13] python3: Use -fno-strict-aliasing

[Andy Grover]

Building under Python 2 passes -fno-strict-aliasing to gcc. By default
under Python 3 it doesn't, so add it in setup.py.

Signed-off-by: Andy Grover <agrover(a)redhat.com&gt;
---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index a77378c..0c7321a 100644
--- a/setup.py
+++ b/setup.py
@@ -67,6 +67,7 @@ setup(name='ethtool',
                 'python-ethtool/etherinfo_obj.c',
                 'python-ethtool/netlink.c',
                 'python-ethtool/netlink-address.c'],
+            extra_compile_args=['-fno-strict-aliasing'],
             include_dirs = libnl['include'],
             library_dirs = libnl['libdirs'],
             libraries = libnl['libs'],
-- 
1.9.3

[PATCH 04/13] python3: Use bytesobject.h and PyBytes_* instead of PyString_*

[Andy Grover]

As described here:

https://docs.python.org/3/howto/cporting.html#str-unicode-unification

Signed-off-by: Andy Grover <agrover(a)redhat.com&gt;
---
 python-ethtool/etherinfo.c       |  9 ++++----
 python-ethtool/etherinfo_obj.c   | 45 ++++++++++++++++++++--------------------
 python-ethtool/ethtool.c         | 33 +++++++++++++++--------------
 python-ethtool/netlink-address.c | 43 +++++++++++++++++++-------------------
 4 files changed, 67 insertions(+), 63 deletions(-)

diff --git a/python-ethtool/etherinfo.c b/python-ethtool/etherinfo.c
index 14b4796..513f955 100644
--- a/python-ethtool/etherinfo.c
+++ b/python-ethtool/etherinfo.c
@@ -16,6 +16,7 @@
  */
 
 #include <Python.h>
+#include <bytesobject.h>
 #include <bits/sockaddr.h>
 #include <stdio.h>
 #include <string.h>
@@ -65,7 +66,7 @@ static void callback_nl_link(struct nl_object *obj, void *arg)
         if( ethi->hwaddress ) {
                 Py_XDECREF(ethi->hwaddress);
         }
-        ethi->hwaddress = PyString_FromFormat("%s", hwaddr);
+        ethi->hwaddress = PyBytes_FromFormat("%s", hwaddr);
 }
 
 
@@ -129,7 +130,7 @@ static int _set_device_index(PyEtherInfo *self)
                         return 0;
                 }
 
-                link = rtnl_link_get_by_name(link_cache,
PyString_AsString(self->device));
+                link = rtnl_link_get_by_name(link_cache,
PyBytes_AsString(self->device));
                 if( !link ) {
 			errno = ENODEV;
 			PyErr_SetFromErrno(PyExc_IOError);
@@ -179,7 +180,7 @@ int get_etherinfo_link(PyEtherInfo *self)
 	if( !open_netlink(self) ) {
 		PyErr_Format(PyExc_RuntimeError,
 			     "Could not open a NETLINK connection for %s",
-			     PyString_AsString(self->device));
+			     PyBytes_AsString(self->device));
 		return 0;
 	}
 
@@ -233,7 +234,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",
-			     PyString_AsString(self->device));
+			     PyBytes_AsString(self->device));
 		return NULL;
 	}
 
diff --git a/python-ethtool/etherinfo_obj.c b/python-ethtool/etherinfo_obj.c
index cd7f2e3..54cea0b 100644
--- a/python-ethtool/etherinfo_obj.c
+++ b/python-ethtool/etherinfo_obj.c
@@ -24,6 +24,7 @@
  */
 
 #include <Python.h>
+#include <bytesobject.h>
 #include "structmember.h"
 
 #include <netlink/route/rtnl.h>
@@ -86,7 +87,7 @@ static PyNetlinkIPaddress * get_last_ipv4_address(PyObject *addrlist)
  */
 PyObject *_ethtool_etherinfo_getter(PyEtherInfo *self, PyObject *attr_o)
 {
-	char *attr = PyString_AsString(attr_o);
+	char *attr = PyBytes_AsString(attr_o);
 	PyNetlinkIPaddress *py_addr;
         PyObject *addrlist = NULL;
 
@@ -177,14 +178,14 @@ PyObject *_ethtool_etherinfo_str(PyEtherInfo *self)
 
 	get_etherinfo_link(self);
 
-	ret = PyString_FromFormat("Device ");
-	PyString_Concat(&ret, self->device);
-	PyString_ConcatAndDel(&ret, PyString_FromString(":\n"));
+	ret = PyBytes_FromFormat("Device ");
+	PyBytes_Concat(&ret, self->device);
+	PyBytes_ConcatAndDel(&ret, PyBytes_FromString(":\n"));
 
 	if( self->hwaddress ) {
-		PyString_ConcatAndDel(&ret, PyString_FromString("\tMAC address: "));
-		PyString_Concat(&ret, self->hwaddress);
-		PyString_ConcatAndDel(&ret, PyString_FromString("\n"));
+		PyBytes_ConcatAndDel(&ret, PyBytes_FromString("\tMAC address: "));
+		PyBytes_Concat(&ret, self->hwaddress);
+		PyBytes_ConcatAndDel(&ret, PyBytes_FromString("\n"));
 	}
 
 	ipv4addrs = get_etherinfo_address(self, NLQRY_ADDR4);
@@ -192,16 +193,16 @@ PyObject *_ethtool_etherinfo_str(PyEtherInfo *self)
                Py_ssize_t i;
                for (i = 0; i < PyList_Size(ipv4addrs); i++) {
                        PyNetlinkIPaddress *py_addr = (PyNetlinkIPaddress
*)PyList_GetItem(ipv4addrs, i);
-                       PyObject *tmp = PyString_FromFormat("\tIPv4 address:
");
-                       PyString_Concat(&tmp, py_addr->local);
-                       PyString_ConcatAndDel(&tmp,
PyString_FromFormat("/%d", py_addr->prefixlen));
+                       PyObject *tmp = PyBytes_FromFormat("\tIPv4 address: ");
+                       PyBytes_Concat(&tmp, py_addr->local);
+                       PyBytes_ConcatAndDel(&tmp, PyBytes_FromFormat("/%d",
py_addr->prefixlen));
                        if (py_addr->ipv4_broadcast ) {
-                                PyString_ConcatAndDel(&tmp,
-                                                      PyString_FromString("	 
Broadcast: "));
-                                PyString_Concat(&tmp, py_addr->ipv4_broadcast);
+                                PyBytes_ConcatAndDel(&tmp,
+                                                      PyBytes_FromString("	 
Broadcast: "));
+                                PyBytes_Concat(&tmp, py_addr->ipv4_broadcast);
                        }
-                       PyString_ConcatAndDel(&tmp,
PyString_FromString("\n"));
-                       PyString_ConcatAndDel(&ret, tmp);
+                       PyBytes_ConcatAndDel(&tmp,
PyBytes_FromString("\n"));
+                       PyBytes_ConcatAndDel(&ret, tmp);
                }
 	}
 
@@ -210,13 +211,13 @@ PyObject *_ethtool_etherinfo_str(PyEtherInfo *self)
 	       Py_ssize_t i;
 	       for (i = 0; i < PyList_Size(ipv6addrs); i++) {
 		       PyNetlinkIPaddress *py_addr = (PyNetlinkIPaddress *)PyList_GetItem(ipv6addrs,
i);
-		       PyObject *tmp = PyString_FromFormat("\tIPv6 address: [");
-		       PyString_Concat(&tmp, py_addr->scope);
-		       PyString_ConcatAndDel(&tmp, PyString_FromString("] "));
-		       PyString_Concat(&tmp, py_addr->local);
-		       PyString_ConcatAndDel(&tmp, PyString_FromFormat("/%d",
py_addr->prefixlen));
-		       PyString_ConcatAndDel(&tmp, PyString_FromString("\n"));
-		       PyString_ConcatAndDel(&ret, tmp);
+		       PyObject *tmp = PyBytes_FromFormat("\tIPv6 address: [");
+		       PyBytes_Concat(&tmp, py_addr->scope);
+		       PyBytes_ConcatAndDel(&tmp, PyBytes_FromString("] "));
+		       PyBytes_Concat(&tmp, py_addr->local);
+		       PyBytes_ConcatAndDel(&tmp, PyBytes_FromFormat("/%d",
py_addr->prefixlen));
+		       PyBytes_ConcatAndDel(&tmp, PyBytes_FromString("\n"));
+		       PyBytes_ConcatAndDel(&ret, tmp);
 	       }
 	}
 
diff --git a/python-ethtool/ethtool.c b/python-ethtool/ethtool.c
index 0f9cdbb..46320f6 100644
--- a/python-ethtool/ethtool.c
+++ b/python-ethtool/ethtool.c
@@ -16,6 +16,7 @@
  * General Public License for more details.
  */
 #include <Python.h>
+#include <bytesobject.h>
 
 #include <errno.h>
 #include <stddef.h>
@@ -60,7 +61,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 = PyString_FromString(ifa->ifa_name);
+		PyObject *str = PyBytes_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);
@@ -104,7 +105,7 @@ static PyObject *get_devices(PyObject *self __unused, PyObject *args
__unused)
 		while (*name == ' ')
 			name++; /* skip over leading whitespace if any */
 
-		str = PyString_FromString(name);
+		str = PyBytes_FromString(name);
 		PyList_Append(list, str);
 		Py_DECREF(str);
 	}
@@ -151,7 +152,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 PyString_FromString(hwaddr);
+	return PyBytes_FromString(hwaddr);
 }
 
 static PyObject *get_ipaddress(PyObject *self __unused, PyObject *args)
@@ -191,7 +192,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 PyString_FromString(ipaddr);
+	return PyBytes_FromString(ipaddr);
 }
 
 
@@ -218,10 +219,10 @@ static PyObject *get_interfaces_info(PyObject *self __unused,
PyObject *args) {
 
 	/* Parse input arguments if we got them */
 	if( inargs != NULL ) {
-		if( PyString_Check(inargs) ) { /* Input argument is just a string */
+		if( PyBytes_Check(inargs) ) { /* Input argument is just a string */
 			fetch_devs_len = 1;
 			fetch_devs = calloc(1, sizeof(char *));
-			fetch_devs[0] = PyString_AsString(inargs);
+			fetch_devs[0] = PyBytes_AsString(inargs);
 		} else if( PyTuple_Check(inargs) ) { /* Input argument is a tuple list with devices */
 			int j = 0;
 
@@ -229,8 +230,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 = PyTuple_GetItem(inargs, i);
-				if( elmt && PyString_Check(elmt) ) {
-					fetch_devs[j++] = PyString_AsString(elmt);
+				if( elmt && PyBytes_Check(elmt) ) {
+					fetch_devs[j++] = PyBytes_AsString(elmt);
 				}
 			}
 			fetch_devs_len = j;
@@ -241,8 +242,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 && PyString_Check(elmt) ) {
-					fetch_devs[j++] = PyString_AsString(elmt);
+				if( elmt && PyBytes_Check(elmt) ) {
+					fetch_devs[j++] = PyBytes_AsString(elmt);
 				}
 			}
 			fetch_devs_len = j;
@@ -267,7 +268,7 @@ static PyObject *get_interfaces_info(PyObject *self __unused, PyObject
*args) {
 			free(fetch_devs);
 			return NULL;
                 }
-		dev->device = PyString_FromString(fetch_devs[i]);
+		dev->device = PyBytes_FromString(fetch_devs[i]);
 		dev->hwaddress = NULL;
 		dev->index = -1;
 
@@ -350,7 +351,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 PyString_FromString(netmask);
+	return PyBytes_FromString(netmask);
 }
 
 static PyObject *get_broadcast(PyObject *self __unused, PyObject *args)
@@ -390,7 +391,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 PyString_FromString(broadcast);
+	return PyBytes_FromString(broadcast);
 }
 
 static PyObject *get_module(PyObject *self __unused, PyObject *args)
@@ -455,12 +456,12 @@ static PyObject *get_module(PyObject *self __unused, PyObject
*args)
 			return NULL;
 		} else {
 			PyErr_Clear();
-			return PyString_FromString(driver);
+			return PyBytes_FromString(driver);
 		}
 	}
 
 	close(fd);
-	return PyString_FromString(((struct ethtool_drvinfo *)buf)->driver);
+	return PyBytes_FromString(((struct ethtool_drvinfo *)buf)->driver);
 }
 
 static PyObject *get_businfo(PyObject *self __unused, PyObject *args)
@@ -499,7 +500,7 @@ static PyObject *get_businfo(PyObject *self __unused, PyObject *args)
 	}
 
 	close(fd);
-	return PyString_FromString(((struct ethtool_drvinfo *)buf)->bus_info);
+	return PyBytes_FromString(((struct ethtool_drvinfo *)buf)->bus_info);
 }
 
 static int send_command(int cmd, const char *devname, void *value)
diff --git a/python-ethtool/netlink-address.c b/python-ethtool/netlink-address.c
index 50a96d7..2febc54 100644
--- a/python-ethtool/netlink-address.c
+++ b/python-ethtool/netlink-address.c
@@ -15,6 +15,7 @@
 
 /* Python object corresponding to a (struct rtnl_addr) */
 #include <Python.h>
+#include <bytesobject.h>
 #include "structmember.h"
 
 #include <arpa/inet.h>
@@ -54,7 +55,7 @@ PyNetlinkIPaddress_from_rtnl_addr(struct rtnl_addr *addr)
 		PyErr_SetFromErrno(PyExc_RuntimeError);
 		goto error;
 	}
-	py_obj->local = PyString_FromString(buf);
+	py_obj->local = PyBytes_FromString(buf);
 	if (!py_obj->local) {
 		goto error;
 	}
@@ -63,7 +64,7 @@ PyNetlinkIPaddress_from_rtnl_addr(struct rtnl_addr *addr)
 	memset(&buf, 0, sizeof(buf));
 	if ((peer_addr = rtnl_addr_get_peer(addr))) {
 		nl_addr2str(peer_addr, buf, sizeof(buf));
-		py_obj->peer = PyString_FromString(buf);
+		py_obj->peer = PyBytes_FromString(buf);
 		if (!py_obj->local) {
 			goto error;
 		}
@@ -84,7 +85,7 @@ PyNetlinkIPaddress_from_rtnl_addr(struct rtnl_addr *addr)
 			PyErr_SetFromErrno(PyExc_RuntimeError);
 			goto error;
 		}
-		py_obj->ipv4_broadcast = PyString_FromString(buf);
+		py_obj->ipv4_broadcast = PyBytes_FromString(buf);
 		if (!py_obj->ipv4_broadcast) {
 			goto error;
 		}
@@ -93,7 +94,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 = PyString_FromString(buf);
+	py_obj->scope = PyBytes_FromString(buf);
 
 	return (PyObject*)py_obj;
 
@@ -119,41 +120,41 @@ netlink_ip_address_dealloc(PyNetlinkIPaddress *obj)
 static PyObject*
 netlink_ip_address_repr(PyNetlinkIPaddress *obj)
 {
-	PyObject *result = PyString_FromString("ethtool.NetlinkIPaddress(family=");
+	PyObject *result = PyBytes_FromString("ethtool.NetlinkIPaddress(family=");
 	char buf[256];
 
 	memset(&buf, 0, sizeof(buf));
 	nl_af2str(obj->family, buf, sizeof(buf));
-	PyString_ConcatAndDel(&result,
-			      PyString_FromFormat("%s, address='", buf));
-	PyString_Concat(&result, obj->local);
+	PyBytes_ConcatAndDel(&result,
+			      PyBytes_FromFormat("%s, address='", buf));
+	PyBytes_Concat(&result, obj->local);
 
 	if (obj->family == AF_INET) {
-		PyString_ConcatAndDel(&result,
-				      PyString_FromFormat("', netmask=%d",
+		PyBytes_ConcatAndDel(&result,
+				      PyBytes_FromFormat("', netmask=%d",
 							  obj->prefixlen));
 	} else if (obj->family == AF_INET6) {
-		PyString_ConcatAndDel(&result,
-				      PyString_FromFormat("/%d'",
+		PyBytes_ConcatAndDel(&result,
+				      PyBytes_FromFormat("/%d'",
 							  obj->prefixlen));
 	}
 
 	if (obj->peer) {
-		PyString_ConcatAndDel(&result, PyString_FromString(",
peer_address='"));
-		PyString_Concat(&result, obj->peer);
-		PyString_ConcatAndDel(&result, PyString_FromString("'"));
+		PyBytes_ConcatAndDel(&result, PyBytes_FromString(",
peer_address='"));
+		PyBytes_Concat(&result, obj->peer);
+		PyBytes_ConcatAndDel(&result, PyBytes_FromString("'"));
 	}
 
 	if (obj->family == AF_INET && obj->ipv4_broadcast) {
-		PyString_ConcatAndDel(&result, PyString_FromString(",
broadcast='"));
-		PyString_Concat(&result, obj->ipv4_broadcast);
-		PyString_ConcatAndDel(&result, PyString_FromString("'"));
+		PyBytes_ConcatAndDel(&result, PyBytes_FromString(", broadcast='"));
+		PyBytes_Concat(&result, obj->ipv4_broadcast);
+		PyBytes_ConcatAndDel(&result, PyBytes_FromString("'"));
 	}
 
-	PyString_ConcatAndDel(&result, PyString_FromString(", scope="));
-	PyString_Concat(&result, obj->scope);
+	PyBytes_ConcatAndDel(&result, PyBytes_FromString(", scope="));
+	PyBytes_Concat(&result, obj->scope);
 
-	PyString_ConcatAndDel(&result, PyString_FromString(")"));
+	PyBytes_ConcatAndDel(&result, PyBytes_FromString(")"));
 
 	return result;
 }
-- 
1.9.3

[PATCH 05/13] python3: Use PyLong_* instead of PyInt_*

[Andy Grover]

These are unified in Python 3, as described here:

https://docs.python.org/3/howto/cporting.html#long-int-unification

It should always be safe to use PyLongs in place of PyInts on Python 2.

Signed-off-by: Andy Grover <agrover(a)redhat.com&gt;
---
 python-ethtool/etherinfo_obj.c | 4 ++--
 python-ethtool/ethtool.c       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/python-ethtool/etherinfo_obj.c b/python-ethtool/etherinfo_obj.c
index 54cea0b..8773b5c 100644
--- a/python-ethtool/etherinfo_obj.c
+++ b/python-ethtool/etherinfo_obj.c
@@ -124,9 +124,9 @@ PyObject *_ethtool_etherinfo_getter(PyEtherInfo *self, PyObject
*attr_o)
 		addrlist = get_etherinfo_address(self, NLQRY_ADDR4);
 		py_addr = get_last_ipv4_address(addrlist);
 		if (py_addr) {
-		  return PyInt_FromLong(py_addr->prefixlen);
+		  return PyLong_FromLong(py_addr->prefixlen);
 		}
-		return PyInt_FromLong(0);
+		return PyLong_FromLong(0);
 	} else if( strcmp(attr, "ipv4_broadcast") == 0 ) {
 		addrlist = get_etherinfo_address(self, NLQRY_ADDR4);
 		py_addr = get_last_ipv4_address(addrlist);
diff --git a/python-ethtool/ethtool.c b/python-ethtool/ethtool.c
index 46320f6..f2a5094 100644
--- a/python-ethtool/ethtool.c
+++ b/python-ethtool/ethtool.c
@@ -667,7 +667,7 @@ static PyObject *__struct_desc_create_dict(struct struct_desc *table,
 
 		switch (d->size) {
 		case sizeof(uint32_t):
-			objval = PyInt_FromLong(*(uint32_t *)val);
+			objval = PyLong_FromLong(*(uint32_t *)val);
 			break;
 		}
 
@@ -712,7 +712,7 @@ static int __struct_desc_from_dict(struct struct_desc *table,
 				PyErr_SetString(PyExc_IOError, buf);
 				return -1;
 			}
-			*(uint32_t *)val = PyInt_AsLong(obj);
+			*(uint32_t *)val = PyLong_AsLong(obj);
 			break;
 		default:
 			snprintf(buf, sizeof(buf),
-- 
1.9.3

[PATCH 06/13] python3: Use Py_TYPE() instead of self->ob_type

[Andy Grover]

As described here:

http://python3porting.com/cextensions.html#object-initialization

Signed-off-by: Andy Grover <agrover(a)redhat.com&gt;
---
 python-ethtool/etherinfo_obj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-ethtool/etherinfo_obj.c b/python-ethtool/etherinfo_obj.c
index 8773b5c..d8cec32 100644
--- a/python-ethtool/etherinfo_obj.c
+++ b/python-ethtool/etherinfo_obj.c
@@ -42,7 +42,7 @@ static void _ethtool_etherinfo_dealloc(PyEtherInfo *self)
 	close_netlink(self);
         Py_XDECREF(self->device);    self->device = NULL;
         Py_XDECREF(self->hwaddress); self->hwaddress = NULL;
-	self->ob_type->tp_free((PyObject*)self);
+	Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
 
-- 
1.9.3

[PATCH 07/13] python3: Use PyVarObject_HEAD_INIT instead of PyObject_HEAD_INIT

[Andy Grover]

as described here:

http://python3porting.com/cextensions.html#object-initialization

Signed-off-by: Andy Grover <agrover(a)redhat.com&gt;
---
 python-ethtool/etherinfo_obj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-ethtool/etherinfo_obj.c b/python-ethtool/etherinfo_obj.c
index d8cec32..2b9bc5d 100644
--- a/python-ethtool/etherinfo_obj.c
+++ b/python-ethtool/etherinfo_obj.c
@@ -277,7 +277,7 @@ static PyMethodDef _ethtool_etherinfo_methods[] = {
  *
  */
 PyTypeObject PyEtherInfo_Type = {
-    PyObject_HEAD_INIT(NULL)
+    PyVarObject_HEAD_INIT(NULL, 0)
     .tp_name = "ethtool.etherinfo",
     .tp_basicsize = sizeof(PyEtherInfo),
     .tp_flags = Py_TPFLAGS_HAVE_CLASS,
-- 
1.9.3

[PATCH 08/13] python3: set PyEtherInfo.tp_flags to Py_TPFLAGS_DEFAULT

[Andy Grover]

The tp_flags field is basically feature flags. The Py2 features are assumed
for Py3 and thus are no longer defined. Just use Py_TPFLAGS_DEFAULT.
Furthermore, Py_TPFLAGS_DEFAULT should also work when building against
Python 2 -- TPFLAGS_DEFAULT includes TPFLAGS_HAVE_CLASS.

Signed-off-by: Andy Grover <agrover(a)redhat.com&gt;
---
 python-ethtool/etherinfo_obj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-ethtool/etherinfo_obj.c b/python-ethtool/etherinfo_obj.c
index 2b9bc5d..fd0d9b3 100644
--- a/python-ethtool/etherinfo_obj.c
+++ b/python-ethtool/etherinfo_obj.c
@@ -280,7 +280,7 @@ PyTypeObject PyEtherInfo_Type = {
     PyVarObject_HEAD_INIT(NULL, 0)
     .tp_name = "ethtool.etherinfo",
     .tp_basicsize = sizeof(PyEtherInfo),
-    .tp_flags = Py_TPFLAGS_HAVE_CLASS,
+    .tp_flags = Py_TPFLAGS_DEFAULT,
     .tp_dealloc = (destructor)_ethtool_etherinfo_dealloc,
     .tp_str = (reprfunc)_ethtool_etherinfo_str,
     .tp_getattro = (getattrofunc)_ethtool_etherinfo_getter,
-- 
1.9.3

[PATCH 09/13] python3: Handle differences in module initialization

[Andy Grover]

As described here:

http://python3porting.com/cextensions.html#module-initialization

Use macros to mask the differences in the return value type of the
module init function, and invocation of either Py_InitModule3 or
PyModule_Create.

Signed-off-by: Andy Grover <agrover(a)redhat.com&gt;
---
 python-ethtool/ethtool.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/python-ethtool/ethtool.c b/python-ethtool/ethtool.c
index f2a5094..69e406b 100644
--- a/python-ethtool/ethtool.c
+++ b/python-ethtool/ethtool.c
@@ -899,19 +899,34 @@ static struct PyMethodDef PyEthModuleMethods[] = {
 	{	.ml_name = NULL, },
 };
 
+#if PY_MAJOR_VERSION >= 3
+  #define MOD_ERROR_VAL NULL
+  #define MOD_SUCCESS_VAL(val) val
+  #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
+  #define MOD_DEF(ob, name, doc, methods) \
+          static struct PyModuleDef moduledef = { \
+            PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \
+          ob = PyModule_Create(&moduledef);
+#else
+  #define MOD_ERROR_VAL
+  #define MOD_SUCCESS_VAL(val)
+  #define MOD_INIT(name) void init##name(void)
+  #define MOD_DEF(ob, name, doc, methods) \
+          ob = Py_InitModule3(name, methods, doc);
+#endif
 
-PyMODINIT_FUNC initethtool(void)
+MOD_INIT(ethtool)
 {
 	PyObject *m;
-	m = Py_InitModule3("ethtool", PyEthModuleMethods, "Python ethtool
module");
+	MOD_DEF(m, "ethtool", "Python ethtool module", PyEthModuleMethods);
 
 	// Prepare the ethtool.etherinfo class
 	if (PyType_Ready(&PyEtherInfo_Type) < 0)
-		return;
+		return MOD_ERROR_VAL;
 
 	// Prepare the ethtool IPv6 and IPv4 address types
 	if (PyType_Ready(&ethtool_netlink_ip_address_Type))
-		return;
+		return MOD_ERROR_VAL;
 
 	// Setup constants
 	PyModule_AddIntConstant(m, "IFF_UP", IFF_UP);			/* Interface is up. */
@@ -933,6 +948,8 @@ PyMODINIT_FUNC initethtool(void)
 	PyModule_AddIntConstant(m, "AF_INET", AF_INET);                 /* IPv4
interface */
 	PyModule_AddIntConstant(m, "AF_INET6", AF_INET6);               /* IPv6
interface */
 	PyModule_AddStringConstant(m, "version", "python-ethtool v"
VERSION);
+
+	return MOD_SUCCESS_VAL(m);
 }
 
 
-- 
1.9.3

[PATCH 10/13] python3: Allow devname to be given as string or bytestring

[Andy Grover]

"s" on Python 3 only converts Unicode strings, which is a little
inconvenient. "s*" converts from either.

Signed-off-by: Andy Grover <agrover(a)redhat.com&gt;
---
 python-ethtool/ethtool.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/python-ethtool/ethtool.c b/python-ethtool/ethtool.c
index 69e406b..28a2aec 100644
--- a/python-ethtool/ethtool.c
+++ b/python-ethtool/ethtool.c
@@ -120,7 +120,7 @@ static PyObject *get_hwaddress(PyObject *self __unused, PyObject
*args)
 	const char *devname;
 	char hwaddr[20];
 
-	if (!PyArg_ParseTuple(args, "s", &devname))
+	if (!PyArg_ParseTuple(args, "s*", &devname))
 		return NULL;
 
 	/* Setup our request structure. */
@@ -162,7 +162,7 @@ static PyObject *get_ipaddress(PyObject *self __unused, PyObject
*args)
 	const char *devname;
 	char ipaddr[20];
 
-	if (!PyArg_ParseTuple(args, "s", &devname))
+	if (!PyArg_ParseTuple(args, "s*", &devname))
 		return NULL;
 
 	/* Setup our request structure. */
@@ -288,7 +288,7 @@ static PyObject *get_flags (PyObject *self __unused, PyObject *args)
 	const char *devname;
 	int fd, err;
 
-	if (!PyArg_ParseTuple(args, "s", &devname))
+	if (!PyArg_ParseTuple(args, "s*", &devname))
 		return NULL;
 
 	/* Setup our request structure. */
@@ -321,7 +321,7 @@ static PyObject *get_netmask (PyObject *self __unused, PyObject
*args)
 	const char *devname;
 	char netmask[20];
 
-	if (!PyArg_ParseTuple(args, "s", &devname))
+	if (!PyArg_ParseTuple(args, "s*", &devname))
 		return NULL;
 
 	/* Setup our request structure. */
@@ -361,7 +361,7 @@ static PyObject *get_broadcast(PyObject *self __unused, PyObject
*args)
 	const char *devname;
 	char broadcast[20];
 
-	if (!PyArg_ParseTuple(args, "s", &devname))
+	if (!PyArg_ParseTuple(args, "s*", &devname))
 		return NULL;
 
 	/* Setup our request structure. */
@@ -402,7 +402,7 @@ static PyObject *get_module(PyObject *self __unused, PyObject *args)
 	char buf[2048];
 	const char *devname;
 
-	if (!PyArg_ParseTuple(args, "s", &devname))
+	if (!PyArg_ParseTuple(args, "s*", &devname))
 		return NULL;
 
 	/* Setup our control structures. */
@@ -472,7 +472,7 @@ static PyObject *get_businfo(PyObject *self __unused, PyObject *args)
 	char buf[1024];
 	const char *devname;
 
-	if (!PyArg_ParseTuple(args, "s", &devname))
+	if (!PyArg_ParseTuple(args, "s*", &devname))
 		return NULL;
 
 	/* Setup our control structures. */
@@ -538,7 +538,7 @@ static int get_dev_value(int cmd, PyObject *args, void *value)
 	const char *devname;
 	int err = -1;
 
-	if (PyArg_ParseTuple(args, "s", &devname))
+	if (PyArg_ParseTuple(args, "s*", &devname))
 		err = send_command(cmd, devname, value);
 
 	return err;
@@ -560,7 +560,7 @@ static int dev_set_int_value(int cmd, PyObject *args)
 	struct ethtool_value eval;
 	const char *devname;
 
-	if (!PyArg_ParseTuple(args, "si", &devname, &eval.data))
+	if (!PyArg_ParseTuple(args, "s*i", &devname, &eval.data))
 		return -1;
 
 	return send_command(cmd, devname, &eval);
@@ -745,7 +745,7 @@ static PyObject *set_coalesce(PyObject *self __unused, PyObject
*args)
 	const char *devname;
 	PyObject *dict;
 
-	if (!PyArg_ParseTuple(args, "sO", &devname, &dict))
+	if (!PyArg_ParseTuple(args, "s*O", &devname, &dict))
 		return NULL;
 
 	if (struct_desc_from_dict(ethtool_coalesce_desc, &coal, dict) != 0)
@@ -785,7 +785,7 @@ static PyObject *set_ringparam(PyObject *self __unused, PyObject
*args)
 	const char *devname;
 	PyObject *dict;
 
-	if (!PyArg_ParseTuple(args, "sO", &devname, &dict))
+	if (!PyArg_ParseTuple(args, "s*O", &devname, &dict))
 		return NULL;
 
 	if (struct_desc_from_dict(ethtool_ringparam_desc, &ring, dict) != 0)
-- 
1.9.3

[PATCH 11/13] python3: use tp_getset instead of tp_{get,set}attro

[Andy Grover]

In testing, I was experiencing segfaults when _ethtool_etherinfo_getter()
was being called with a NULL attr_o param. In trying to get it working I
converted to tp_getset, and everything's working now.

Signed-off-by: Andy Grover <agrover(a)redhat.com&gt;
---
 python-ethtool/etherinfo_obj.c | 167 ++++++++++++++++++++---------------------
 1 file changed, 83 insertions(+), 84 deletions(-)

diff --git a/python-ethtool/etherinfo_obj.c b/python-ethtool/etherinfo_obj.c
index fd0d9b3..7aefaa8 100644
--- a/python-ethtool/etherinfo_obj.c
+++ b/python-ethtool/etherinfo_obj.c
@@ -78,88 +78,6 @@ static PyNetlinkIPaddress * get_last_ipv4_address(PyObject *addrlist)
 }
 
 /**
- * ethtool.etherinfo function for retrieving data from a Python object.
- *
- * @param self    Pointer to the current PyEtherInfo device object
- * @param attr_o  contains the object member request (which element to return)
- *
- * @return Returns a PyObject with the value requested on success, otherwise NULL
- */
-PyObject *_ethtool_etherinfo_getter(PyEtherInfo *self, PyObject *attr_o)
-{
-	char *attr = PyBytes_AsString(attr_o);
-	PyNetlinkIPaddress *py_addr;
-        PyObject *addrlist = NULL;
-
-	if( !self ) {
-		PyErr_SetString(PyExc_AttributeError, "No data available");
-		return NULL;
-	}
-
-	if( strcmp(attr, "device") == 0 ) {
-                if( self->device ) {
-                        Py_INCREF(self->device);
-                        return self->device;
-                } else {
-                        return Py_INCREF(Py_None), Py_None;
-                }
-	} else if( strcmp(attr, "mac_address") == 0 ) {
-		get_etherinfo_link(self);
-		if( self->hwaddress ) {
-			Py_INCREF(self->hwaddress);
-		}
-		return self->hwaddress;
-	} else if( strcmp(attr, "ipv4_address") == 0 ) {
-		addrlist = get_etherinfo_address(self, NLQRY_ADDR4);
-		/* For compatiblity with old approach, return last IPv4 address: */
-		py_addr = get_last_ipv4_address(addrlist);
-		if (py_addr) {
-		  if (py_addr->local) {
-		      Py_INCREF(py_addr->local);
-		      return py_addr->local;
-		  }
-		}
-		Py_RETURN_NONE;
-	} else if( strcmp(attr, "ipv4_netmask") == 0 ) {
-		addrlist = get_etherinfo_address(self, NLQRY_ADDR4);
-		py_addr = get_last_ipv4_address(addrlist);
-		if (py_addr) {
-		  return PyLong_FromLong(py_addr->prefixlen);
-		}
-		return PyLong_FromLong(0);
-	} else if( strcmp(attr, "ipv4_broadcast") == 0 ) {
-		addrlist = get_etherinfo_address(self, NLQRY_ADDR4);
-		py_addr = get_last_ipv4_address(addrlist);
-		if (py_addr) {
-		  if (py_addr->ipv4_broadcast) {
-		      Py_INCREF(py_addr->ipv4_broadcast);
-		      return py_addr->ipv4_broadcast;
-		  }
-		}
-		Py_RETURN_NONE;
-	} else {
-		return PyObject_GenericGetAttr((PyObject *)self, attr_o);
-	}
-}
-
-/**
- * ethtool.etherinfo function for setting a value to a object member.  This feature is
- * disabled by always returning -1, as the values are read-only by the user.
- *
- * @param self
- * @param attr_o
- * @param val_o
- *
- * @return Returns always -1 (failure).
- */
-int _ethtool_etherinfo_setter(PyEtherInfo *self, PyObject *attr_o, PyObject *val_o)
-{
-	PyErr_SetString(PyExc_AttributeError, "etherinfo member values are
read-only.");
-	return -1;
-}
-
-
-/**
  * Creates a human readable format of the information when object is being treated as a
string
  *
  * @param self  Pointer to the current PyEtherInfo device object
@@ -272,6 +190,88 @@ static PyMethodDef _ethtool_etherinfo_methods[] = {
 	{NULL}  /**< No methods defined */
 };
 
+static PyObject *get_device(PyObject *obj, void *info)
+{
+	PyEtherInfo *self = (PyEtherInfo *) obj;
+
+	if( self->device ) {
+		Py_INCREF(self->device);
+		return self->device;
+	}
+	Py_RETURN_NONE;
+}
+
+static PyObject *get_mac_addr(PyObject *obj, void *info)
+{
+	PyEtherInfo *self = (PyEtherInfo *) obj;
+
+	get_etherinfo_link(self);
+	if( self->hwaddress ) {
+		Py_INCREF(self->hwaddress);
+	}
+	return self->hwaddress;
+}
+
+static PyObject *get_ipv4_addr(PyObject *obj, void *info)
+{
+	PyEtherInfo *self = (PyEtherInfo *) obj;
+	PyObject *addrlist;
+	PyNetlinkIPaddress *py_addr;
+
+	addrlist = get_etherinfo_address(self, NLQRY_ADDR4);
+	/* For compatiblity with old approach, return last IPv4 address: */
+	py_addr = get_last_ipv4_address(addrlist);
+	if (py_addr) {
+		if (py_addr->local) {
+			Py_INCREF(py_addr->local);
+			return py_addr->local;
+		}
+	}
+	Py_RETURN_NONE;
+}
+
+static PyObject *get_ipv4_mask(PyObject *obj, void *info)
+{
+	PyEtherInfo *self = (PyEtherInfo *) obj;
+	PyObject *addrlist;
+	PyNetlinkIPaddress *py_addr;
+
+	addrlist = get_etherinfo_address(self, NLQRY_ADDR4);
+	py_addr = get_last_ipv4_address(addrlist);
+	if (py_addr) {
+		return PyLong_FromLong(py_addr->prefixlen);
+	}
+	return PyLong_FromLong(0);
+}
+
+static PyObject *get_ipv4_bcast(PyObject *obj, void *info)
+{
+	PyEtherInfo *self = (PyEtherInfo *) obj;
+	PyObject *addrlist;
+	PyNetlinkIPaddress *py_addr;
+
+	addrlist = get_etherinfo_address(self, NLQRY_ADDR4);
+	py_addr = get_last_ipv4_address(addrlist);
+	if (py_addr) {
+		if (py_addr->ipv4_broadcast) {
+			Py_INCREF(py_addr->ipv4_broadcast);
+			return py_addr->ipv4_broadcast;
+		}
+	}
+	Py_RETURN_NONE;
+}
+
+
+static PyGetSetDef _ethtool_etherinfo_attributes[] = {
+	{"device", get_device, NULL, "device", NULL},
+	{"mac_address", get_mac_addr, NULL, "MAC address", NULL},
+	{"ipv4_address", get_ipv4_addr, NULL, "IPv4 address", NULL},
+	{"ipv4_netmask", get_ipv4_mask, NULL, "IPv4 netmask", NULL},
+	{"ipv4_broadcast", get_ipv4_bcast, NULL, "IPv4 broadcast", NULL},
+	{NULL},
+};
+
+
 /**
  * Definition of the functions a Python class/object requires.
  *
@@ -283,8 +283,7 @@ PyTypeObject PyEtherInfo_Type = {
     .tp_flags = Py_TPFLAGS_DEFAULT,
     .tp_dealloc = (destructor)_ethtool_etherinfo_dealloc,
     .tp_str = (reprfunc)_ethtool_etherinfo_str,
-    .tp_getattro = (getattrofunc)_ethtool_etherinfo_getter,
-    .tp_setattro = (setattrofunc)_ethtool_etherinfo_setter,
+    .tp_getset = _ethtool_etherinfo_attributes,
     .tp_methods = _ethtool_etherinfo_methods,
     .tp_doc = "Contains information about a specific ethernet device"
 };
-- 
1.9.3

[PATCH 12/13] python3: Allow unicode strings as arg to get_interfaces_info

[Andy Grover]

Going along with the previous "s*" change, allow the function to take
either a bytestring or a string. Otherwise .get_interfaces_info(b"eth1")
works on python3 but .get_interfaces_info("eth1") doesn't.

Signed-off-by: Andy Grover <agrover(a)redhat.com&gt;
---
 python-ethtool/ethtool.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/python-ethtool/ethtool.c b/python-ethtool/ethtool.c
index 28a2aec..c5583ef 100644
--- a/python-ethtool/ethtool.c
+++ b/python-ethtool/ethtool.c
@@ -223,6 +223,12 @@ static PyObject *get_interfaces_info(PyObject *self __unused,
PyObject *args) {
 			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
 		} else if( PyTuple_Check(inargs) ) { /* Input argument is a tuple list with devices */
 			int j = 0;
 
-- 
1.9.3

[PATCH 13/13] python3: Python3 expects str() and repr() to return strings not bytestrings

[Andy Grover]

Obviously this is not true for Python 2, so handle via the preprocessor.

Signed-off-by: Andy Grover <agrover(a)redhat.com&gt;
---
 python-ethtool/etherinfo_obj.c   | 8 ++++++++
 python-ethtool/netlink-address.c | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/python-ethtool/etherinfo_obj.c b/python-ethtool/etherinfo_obj.c
index 7aefaa8..bf55e12 100644
--- a/python-ethtool/etherinfo_obj.c
+++ b/python-ethtool/etherinfo_obj.c
@@ -139,6 +139,14 @@ PyObject *_ethtool_etherinfo_str(PyEtherInfo *self)
 	       }
 	}
 
+#if PY_MAJOR_VERSION >= 3
+	{
+		PyObject *bytestr = ret;
+		ret = PyUnicode_FromString(PyBytes_AsString(bytestr));
+		Py_DECREF(bytestr);
+	}
+#endif
+
 	return ret;
 }
 
diff --git a/python-ethtool/netlink-address.c b/python-ethtool/netlink-address.c
index 2febc54..a2f37d1 100644
--- a/python-ethtool/netlink-address.c
+++ b/python-ethtool/netlink-address.c
@@ -156,6 +156,14 @@ netlink_ip_address_repr(PyNetlinkIPaddress *obj)
 
 	PyBytes_ConcatAndDel(&result, PyBytes_FromString(")"));
 
+#if PY_MAJOR_VERSION >= 3
+	{
+		PyObject *bytestr = result;
+		result = PyUnicode_FromString(PyBytes_AsString(result));
+		Py_DECREF(bytestr);
+	}
+#endif
+
 	return result;
 }
 
-- 
1.9.3