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

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/_sre.c
View file

@ -1715,7 +1715,7 @@ getstring(PyObject* string, Py_ssize_t* p_length, int* p_charsize)
size = PyObject_Length(string);
#endif
if (PyBytes_Check(string) || bytes == size)
if (PyString_Check(string) || bytes == size)
charsize = 1;
#if defined(HAVE_UNICODE)
else if (bytes == (Py_ssize_t) (size * sizeof(Py_UNICODE)))
@ -1949,7 +1949,7 @@ call(char* module, char* function, PyObject* args)
if (!args)
return NULL;
name = PyBytes_FromString(module);
name = PyString_FromString(module);
if (!name)
return NULL;
mod = PyImport_Import(name);
@ -3416,7 +3416,7 @@ PyMODINIT_FUNC init_sre(void)
Py_DECREF(x);
}
x = PyBytes_FromString(copyright);
x = PyString_FromString(copyright);
if (x) {
PyDict_SetItemString(d, "copyright", x);
Py_DECREF(x);