diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 +0000 |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 +0000 |
| commit | dd96db63f689e2f0d8ae5a1436b3b3395eec7de5 (patch) | |
| tree | b2299acac9ce44fc488fc7b2ae2a44548cd5fbb8 /Modules/bsddbmodule.c | |
| parent | e98839a1f48b2915f1cc747884e64f4d6e4c8e7a (diff) | |
| download | cpython-git-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.tar.gz | |
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.
Diffstat (limited to 'Modules/bsddbmodule.c')
| -rw-r--r-- | Modules/bsddbmodule.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |