Mercurial > cpython-lru_cache-weakref
diff Objects/stringlib/string_format.h @ 47527:52294af4b663 legacy-trunk
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.
| author | Gregory P. Smith <greg@mad-scientist.com> |
|---|---|
| date | Mon, 09 Jun 2008 04:58:54 +0000 |
| parents | 4fe192d48960 |
| children | 4b4564beb6da |
line wrap: on
line diff
--- a/Objects/stringlib/string_format.h Mon Jun 09 01:28:30 2008 +0000 +++ b/Objects/stringlib/string_format.h Mon Jun 09 04:58:54 2008 +0000 @@ -496,7 +496,7 @@ #if PY_VERSION_HEX >= 0x03000000 assert(PyUnicode_Check(result)); #else - assert(PyBytes_Check(result) || PyUnicode_Check(result)); + assert(PyString_Check(result) || PyUnicode_Check(result)); /* Convert result to our type. We could be str, and result could be unicode */