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 /Include | |
| 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 'Include')
| -rw-r--r-- | Include/intobject.h | 2 | ||||
| -rw-r--r-- | Include/longobject.h | 2 | ||||
| -rw-r--r-- | Include/object.h | 2 | ||||
| -rw-r--r-- | Include/unicodeobject.h | 7 |
4 files changed, 13 insertions, 0 deletions
diff --git a/Include/intobject.h b/Include/intobject.h index a22d38a..128d0d3 100644 --- a/Include/intobject.h +++ b/Include/intobject.h @@ -30,7 +30,9 @@ extern DL_IMPORT(PyTypeObject) PyInt_Type; #define PyInt_Check(op) ((op)->ob_type == &PyInt_Type) extern DL_IMPORT(PyObject *) PyInt_FromString(char*, char**, int); +#ifdef Py_USING_UNICODE extern DL_IMPORT(PyObject *) PyInt_FromUnicode(Py_UNICODE*, int, int); +#endif extern DL_IMPORT(PyObject *) PyInt_FromLong(long); extern DL_IMPORT(long) PyInt_AsLong(PyObject *); extern DL_IMPORT(long) PyInt_GetMax(void); diff --git a/Include/longobject.h b/Include/longobject.h index 3c6fde0..8efa35f 100644 --- a/Include/longobject.h +++ b/Include/longobject.h @@ -42,7 +42,9 @@ extern DL_IMPORT(unsigned LONG_LONG) PyLong_AsUnsignedLongLong(PyObject *); #endif /* HAVE_LONG_LONG */ DL_IMPORT(PyObject *) PyLong_FromString(char *, char **, int); +#ifdef Py_USING_UNICODE DL_IMPORT(PyObject *) PyLong_FromUnicode(Py_UNICODE*, int, int); +#endif /* _PyLong_FromByteArray: View the n unsigned bytes as a binary integer in base 256, and return a Python long with the same numeric value. diff --git a/Include/object.h b/Include/object.h index 8da524b..f832717 100644 --- a/Include/object.h +++ b/Include/object.h @@ -320,7 +320,9 @@ extern DL_IMPORT(int) PyObject_Print(PyObject *, FILE *, int); extern DL_IMPORT(void) _PyObject_Dump(PyObject *); extern DL_IMPORT(PyObject *) PyObject_Repr(PyObject *); extern DL_IMPORT(PyObject *) PyObject_Str(PyObject *); +#ifdef Py_USING_UNICODE extern DL_IMPORT(PyObject *) PyObject_Unicode(PyObject *); +#endif extern DL_IMPORT(int) PyObject_Compare(PyObject *, PyObject *); extern DL_IMPORT(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int); extern DL_IMPORT(int) PyObject_RichCompareBool(PyObject *, PyObject *, int); diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index a7e50c3..025c8b7 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -58,6 +58,12 @@ Copyright (c) Corporation for National Research Initiatives. /* --- Internal Unicode Format -------------------------------------------- */ +#ifndef Py_USING_UNICODE + +#define PyUnicode_Check(op) 0 + +#else + /* FIXME: MvL's new implementation assumes that Py_UNICODE_SIZE is properly set, but the default rules below doesn't set it. I'll sort this out some other day -- fredrik@pythonware.com */ @@ -1087,4 +1093,5 @@ extern DL_IMPORT(int) _PyUnicode_IsAlpha( #ifdef __cplusplus } #endif +#endif /* Py_USING_UNICODE */ #endif /* !Py_UNICODEOBJECT_H */ |