diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 (GMT) |
| commit | dd96db63f689e2f0d8ae5a1436b3b3395eec7de5 (patch) | |
| tree | b2299acac9ce44fc488fc7b2ae2a44548cd5fbb8 /Modules/dlmodule.c | |
| parent | e98839a1f48b2915f1cc747884e64f4d6e4c8e7a (diff) | |
| download | cpython-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.zip cpython-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.tar.gz cpython-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.tar.bz2 | |
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/dlmodule.c')
| -rw-r--r-- | Modules/dlmodule.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/dlmodule.c b/Modules/dlmodule.c index e633fe9..ccf1cb1 100644 --- a/Modules/dlmodule.c +++ b/Modules/dlmodule.c @@ -58,8 +58,8 @@ dl_sym(dlobject *xp, PyObject *args) { char *name; PyUnivPtr *func; - if (PyBytes_Check(args)) { - name = PyBytes_AS_STRING(args); + if (PyString_Check(args)) { + name = PyString_AS_STRING(args); } else { PyErr_Format(PyExc_TypeError, "expected string, found %.200s", Py_TYPE(args)->tp_name); @@ -88,14 +88,14 @@ dl_call(dlobject *xp, PyObject *args) return NULL; } name = PyTuple_GetItem(args, 0); - if (!PyBytes_Check(name)) { + if (!PyString_Check(name)) { PyErr_SetString(PyExc_TypeError, "function name must be a string"); return NULL; } func = (long (*)(long, long, long, long, long, long, long, long, long, long)) - dlsym(xp->dl_handle, PyBytes_AsString(name)); + dlsym(xp->dl_handle, PyString_AsString(name)); if (func == NULL) { PyErr_SetString(PyExc_ValueError, dlerror()); return NULL; @@ -109,8 +109,8 @@ dl_call(dlobject *xp, PyObject *args) PyObject *v = PyTuple_GetItem(args, i); if (PyInt_Check(v)) alist[i-1] = PyInt_AsLong(v); - else if (PyBytes_Check(v)) - alist[i-1] = (long)PyBytes_AsString(v); + else if (PyString_Check(v)) + alist[i-1] = (long)PyString_AsString(v); else if (v == Py_None) alist[i-1] = (long) ((char *)NULL); else { |