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/gcmodule.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/gcmodule.c')
| -rw-r--r-- | Modules/gcmodule.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index c3ee96f..4f8c85f 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -639,8 +639,8 @@ debug_instance(char *msg, PyInstanceObject *inst) char *cname; /* simple version of instance_repr */ PyObject *classname = inst->in_class->cl_name; - if (classname != NULL && PyBytes_Check(classname)) - cname = PyBytes_AsString(classname); + if (classname != NULL && PyString_Check(classname)) + cname = PyString_AsString(classname); else cname = "?"; PySys_WriteStderr("gc: %.100s <%.100s instance at %p>\n", @@ -754,7 +754,7 @@ collect(int generation) double t1 = 0.0; if (delstr == NULL) { - delstr = PyBytes_InternFromString("__del__"); + delstr = PyString_InternFromString("__del__"); if (delstr == NULL) Py_FatalError("gc couldn't allocate \"__del__\""); } @@ -898,7 +898,7 @@ collect(int generation) if (PyErr_Occurred()) { if (gc_str == NULL) - gc_str = PyBytes_FromString("garbage collection"); + gc_str = PyString_FromString("garbage collection"); PyErr_WriteUnraisable(gc_str); Py_FatalError("unexpected exception during garbage collection"); } |