diff options
| author | Thomas Heller <theller@ctypes.org> | 2007-11-15 20:48:54 (GMT) |
|---|---|---|
| committer | Thomas Heller <theller@ctypes.org> | 2007-11-15 20:48:54 (GMT) |
| commit | 519a042c7c248e3ae23cf2a3c1152f91a5bd2791 (patch) | |
| tree | 3eaef917fda4776da67d0426754f810e59d9f183 /Objects/stringlib | |
| parent | 6e8ea0fd9c46978cf3101bd3ea94022751464ad9 (diff) | |
| download | cpython-519a042c7c248e3ae23cf2a3c1152f91a5bd2791.zip cpython-519a042c7c248e3ae23cf2a3c1152f91a5bd2791.tar.gz cpython-519a042c7c248e3ae23cf2a3c1152f91a5bd2791.tar.bz2 | |
Replace PyObject_Unicode with PyObject_Str everywhere, and remove the
#define for PyObject_Unicode in object.h.
Diffstat (limited to 'Objects/stringlib')
| -rw-r--r-- | Objects/stringlib/string_format.h | 2 | ||||
| -rw-r--r-- | Objects/stringlib/unicodedefs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Objects/stringlib/string_format.h b/Objects/stringlib/string_format.h index 6c3c1e6..b771149 100644 --- a/Objects/stringlib/string_format.h +++ b/Objects/stringlib/string_format.h @@ -770,7 +770,7 @@ do_conversion(PyObject *obj, STRINGLIB_CHAR conversion) case 'r': return PyObject_Repr(obj); case 's': - return PyObject_Unicode(obj); + return PyObject_Str(obj); default: PyErr_Format(PyExc_ValueError, "Unknown converion specifier %c", diff --git a/Objects/stringlib/unicodedefs.h b/Objects/stringlib/unicodedefs.h index fa6140f..64777be 100644 --- a/Objects/stringlib/unicodedefs.h +++ b/Objects/stringlib/unicodedefs.h @@ -20,7 +20,7 @@ #define STRINGLIB_NEW PyUnicode_FromUnicode #define STRINGLIB_RESIZE PyUnicode_Resize #define STRINGLIB_CHECK PyUnicode_Check -#define STRINGLIB_TOSTR PyObject_Unicode +#define STRINGLIB_TOSTR PyObject_Str #define STRINGLIB_WANT_CONTAINS_OBJ 1 |