mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

This reverts r63675 based on the discussion in this thread:

Browse source 
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.
This commit is contained in:
Gregory P. Smith 2008-06-09 04:58:54 +00:00
parent e98839a1f4
commit dd96db63f6
173 changed files with 2275 additions and 2280 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Modules/_testcapimodule.c
View file

@ -691,7 +691,7 @@ test_thread_state(PyObject *self, PyObject *args)
}
#endif
/* Some tests of PyBytes_FromFormat(). This needs more tests. */
/* Some tests of PyString_FromFormat(). This needs more tests. */
static PyObject *
test_string_from_format(PyObject *self, PyObject *args)
{
@ -699,10 +699,10 @@ test_string_from_format(PyObject *self, PyObject *args)
char *msg;
#define CHECK_1_FORMAT(FORMAT, TYPE) \
result = PyBytes_FromFormat(FORMAT, (TYPE)1); \
result = PyString_FromFormat(FORMAT, (TYPE)1); \
if (result == NULL) \
return NULL; \
if (strcmp(PyBytes_AsString(result), "1")) { \
if (strcmp(PyString_AsString(result), "1")) { \
msg = FORMAT " failed at 1"; \
goto Fail; \
} \