diff options
| author | Guido van Rossum <guido@python.org> | 2007-05-03 17:49:24 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-05-03 17:49:24 (GMT) |
| commit | 8d30cc0144a6a94e06f3a115b07afa6314466cfd (patch) | |
| tree | 0c0b2f3d75cca4173ec3e8e2962682affbd2e886 /Objects/intobject.c | |
| parent | 938ef57e267838dcfbfb0d51d9bd40caece1c5db (diff) | |
| download | cpython-8d30cc0144a6a94e06f3a115b07afa6314466cfd.zip cpython-8d30cc0144a6a94e06f3a115b07afa6314466cfd.tar.gz cpython-8d30cc0144a6a94e06f3a115b07afa6314466cfd.tar.bz2 | |
Get rid of all #ifdef Py_USING_UNICODE (it is always present now).
(With the help of unifdef from freshmeat.)
Diffstat (limited to 'Objects/intobject.c')
| -rw-r--r-- | Objects/intobject.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Objects/intobject.c b/Objects/intobject.c index 932b616..0aae6ac 100644 --- a/Objects/intobject.c +++ b/Objects/intobject.c @@ -387,7 +387,6 @@ PyInt_FromString(char *s, char **pend, int base) return PyInt_FromLong(x); } -#ifdef Py_USING_UNICODE PyObject * PyInt_FromUnicode(Py_UNICODE *s, Py_ssize_t length, int base) { @@ -405,7 +404,6 @@ PyInt_FromUnicode(Py_UNICODE *s, Py_ssize_t length, int base) PyMem_FREE(buffer); return result; } -#endif /* Methods */ @@ -986,12 +984,10 @@ int_new(PyTypeObject *type, PyObject *args, PyObject *kwds) } return PyInt_FromString(string, NULL, base); } -#ifdef Py_USING_UNICODE if (PyUnicode_Check(x)) return PyInt_FromUnicode(PyUnicode_AS_UNICODE(x), PyUnicode_GET_SIZE(x), base); -#endif PyErr_SetString(PyExc_TypeError, "int() can't convert non-string with explicit base"); return NULL; |