python3: Python3 expects str() and repr() to return strings not bytestrings

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

Signed-off-by: Andy Grover <agrover@redhat.com>

Author: Andy Grover

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;
 }
 

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;
 }