From dd96db63f689e2f0d8ae5a1436b3b3395eec7de5 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Mon, 9 Jun 2008 04:58:54 +0000 Subject: This reverts r63675 based on the discussion in this thread: http://mail.python.org/pipermail/python-dev/2008-June/079988.html Python 2.6 should stick with PyString_* in its codebase. The PyBytes_* names in the spirit of 3.0 are available via a #define only. See the email thread. --- Modules/bsddbmodule.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Modules/bsddbmodule.c') diff --git a/Modules/bsddbmodule.c b/Modules/bsddbmodule.c index aca591e266..09728821e3 100644 --- a/Modules/bsddbmodule.c +++ b/Modules/bsddbmodule.c @@ -312,7 +312,7 @@ bsddb_subscript(bsddbobject *dp, PyObject *key) return NULL; } - result = PyBytes_FromStringAndSize(data, (int)drec.size); + result = PyString_FromStringAndSize(data, (int)drec.size); if (data != buf) free(data); return result; } @@ -424,7 +424,7 @@ bsddb_keys(bsddbobject *dp) if (dp->di_type == DB_RECNO) item = PyInt_FromLong(*((int*)data)); else - item = PyBytes_FromStringAndSize(data, + item = PyString_FromStringAndSize(data, (int)krec.size); if (data != buf) free(data); if (item == NULL) { -- cgit v1.2.1