Replace PyString usage with PyBytes everywhere

- In Python 2.6 PyBytes is just an alias for PyString, Python 3.0
  removed PyString entirely
- Add compatibility defines for Python < 2.6
- Based on David Malcolm's Python 3.x efforts

1 files changed, 5 insertions, 5 deletions

diff --git a/python/header-py.c b/python/header-py.c
index 36543f4f1..1ea5acf87 100644
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -172,7 +172,7 @@ static PyObject * hdrUnload(hdrObject * s, PyObject * args, PyObject *keywords)
 	return NULL;
     }
 
-    rc = PyString_FromStringAndSize(buf, len);
+    rc = PyBytes_FromStringAndSize(buf, len);
     buf = _free(buf);
 
     return rc;
@@ -372,8 +372,8 @@ static PyObject *hdr_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
 	h = headerNew();
     } else if (hdrObject_Check(obj)) {
 	h = headerCopy(((hdrObject*) obj)->h);
-    } else if (PyString_Check(obj)) {
-	h = headerCopyLoad(PyString_AsString(obj));
+    } else if (PyBytes_Check(obj)) {
+	h = headerCopyLoad(PyBytes_AsString(obj));
     } else if (rpmfdFromPyObject(obj, &fdo)) {
 	Py_BEGIN_ALLOW_THREADS;
 	h = headerRead(rpmfdGetFd(fdo), HEADER_MAGIC_YES);
@@ -422,8 +422,8 @@ int tagNumFromPyObject (PyObject *item, rpmTag *tagp)
     if (PyInt_Check(item)) {
 	/* XXX we should probably validate tag numbers too */
 	tag = PyInt_AsLong(item);
-    } else if (PyString_Check(item)) {
-	tag = rpmTagGetValue(PyString_AsString(item));
+    } else if (PyBytes_Check(item)) {
+	tag = rpmTagGetValue(PyBytes_AsString(item));
     } else {
 	PyErr_SetString(PyExc_TypeError, "expected a string or integer");
 	return 0;