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 /Objects/intobject.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 'Objects/intobject.c')
| -rw-r--r-- | Objects/intobject.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Objects/intobject.c b/Objects/intobject.c index 3b68640..f98aee0 100644 --- a/Objects/intobject.c +++ b/Objects/intobject.c @@ -367,7 +367,7 @@ PyInt_FromString(char *s, char **pend, int base) if (*end != '\0') { bad: slen = strlen(s) < 200 ? strlen(s) : 200; - sobj = PyBytes_FromStringAndSize(s, slen); + sobj = PyString_FromStringAndSize(s, slen); if (sobj == NULL) return NULL; srepr = PyObject_Repr(sobj); @@ -376,7 +376,7 @@ PyInt_FromString(char *s, char **pend, int base) return NULL; PyErr_Format(PyExc_ValueError, "invalid literal for int() with base %d: %s", - base, PyBytes_AS_STRING(srepr)); + base, PyString_AS_STRING(srepr)); Py_DECREF(srepr); return NULL; } @@ -964,11 +964,11 @@ int_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return PyInt_FromLong(0L); if (base == -909) return PyNumber_Int(x); - if (PyBytes_Check(x)) { + if (PyString_Check(x)) { /* Since PyInt_FromString doesn't have a length parameter, * check here for possible NULs in the string. */ - char *string = PyBytes_AS_STRING(x); - if (strlen(string) != PyBytes_Size(x)) { + char *string = PyString_AS_STRING(x); + if (strlen(string) != PyString_Size(x)) { /* create a repr() of the input string, * just like PyInt_FromString does */ PyObject *srepr; @@ -977,7 +977,7 @@ int_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return NULL; PyErr_Format(PyExc_ValueError, "invalid literal for int() with base %d: %s", - base, PyBytes_AS_STRING(srepr)); + base, PyString_AS_STRING(srepr)); Py_DECREF(srepr); return NULL; } @@ -1105,7 +1105,7 @@ _PyInt_Format(PyIntObject *v, int base, int newstyle) if (negative) *--p = '-'; - return PyBytes_FromStringAndSize(p, &buf[sizeof(buf)] - p); + return PyString_FromStringAndSize(p, &buf[sizeof(buf)] - p); } static PyObject * |