diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2001-08-17 18:39:25 (GMT) |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2001-08-17 18:39:25 (GMT) |
commit | 339d0f720e86dc34837547c90d3003a4a68d7d46 (patch) | |
tree | 2059e5d02f490540e759800b127d50f3fcd8c2b5 /Objects/intobject.c | |
parent | f75976617bb36c892ee8a0f6a6fd3caddbd38cea (diff) | |
download | cpython-339d0f720e86dc34837547c90d3003a4a68d7d46.zip cpython-339d0f720e86dc34837547c90d3003a4a68d7d46.tar.gz cpython-339d0f720e86dc34837547c90d3003a4a68d7d46.tar.bz2 |
Patch #445762: Support --disable-unicode
- Do not compile unicodeobject, unicodectype, and unicodedata if Unicode is disabled
- check for Py_USING_UNICODE in all places that use Unicode functions
- disables unicode literals, and the builtin functions
- add the types.StringTypes list
- remove Unicode literals from most tests.
Diffstat (limited to 'Objects/intobject.c')
-rw-r--r-- | Objects/intobject.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Objects/intobject.c b/Objects/intobject.c index f69f81a..e7f618b 100644 --- a/Objects/intobject.c +++ b/Objects/intobject.c @@ -202,6 +202,7 @@ PyInt_FromString(char *s, char **pend, int base) return PyInt_FromLong(x); } +#ifdef Py_USING_UNICODE PyObject * PyInt_FromUnicode(Py_UNICODE *s, int length, int base) { @@ -216,6 +217,7 @@ PyInt_FromUnicode(Py_UNICODE *s, int length, int base) return NULL; return PyInt_FromString(buffer, NULL, base); } +#endif /* Methods */ @@ -765,10 +767,12 @@ int_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return PyNumber_Int(x); if (PyString_Check(x)) return PyInt_FromString(PyString_AS_STRING(x), 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; |