Get rid of all #ifdef Py_USING_UNICODE (it is always present now).
(With the help of unifdef from freshmeat.)
diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c
index 4dbceb7..b165f97 100644
--- a/Modules/_codecsmodule.c
+++ b/Modules/_codecsmodule.c
@@ -93,15 +93,8 @@
if (!PyArg_ParseTuple(args, "O|ss:encode", &v, &encoding, &errors))
return NULL;
-#ifdef Py_USING_UNICODE
if (encoding == NULL)
encoding = PyUnicode_GetDefaultEncoding();
-#else
- if (encoding == NULL) {
- PyErr_SetString(PyExc_ValueError, "no encoding specified");
- return NULL;
- }
-#endif
/* Encode via the codec registry */
return PyCodec_Encode(v, encoding, errors);
@@ -127,15 +120,8 @@
if (!PyArg_ParseTuple(args, "O|ss:decode", &v, &encoding, &errors))
return NULL;
-#ifdef Py_USING_UNICODE
if (encoding == NULL)
encoding = PyUnicode_GetDefaultEncoding();
-#else
- if (encoding == NULL) {
- PyErr_SetString(PyExc_ValueError, "no encoding specified");
- return NULL;
- }
-#endif
/* Decode via the codec registry */
return PyCodec_Decode(v, encoding, errors);
@@ -198,7 +184,6 @@
return codec_tuple(str, PyString_Size(str));
}
-#ifdef Py_USING_UNICODE
/* --- Decoder ------------------------------------------------------------ */
static PyObject *
@@ -833,7 +818,6 @@
}
#endif /* MS_WINDOWS */
-#endif /* Py_USING_UNICODE */
/* --- Error handler registry --------------------------------------------- */
@@ -888,7 +872,6 @@
decode__doc__},
{"escape_encode", escape_encode, METH_VARARGS},
{"escape_decode", escape_decode, METH_VARARGS},
-#ifdef Py_USING_UNICODE
{"utf_8_encode", utf_8_encode, METH_VARARGS},
{"utf_8_decode", utf_8_decode, METH_VARARGS},
{"utf_7_encode", utf_7_encode, METH_VARARGS},
@@ -919,7 +902,6 @@
{"mbcs_encode", mbcs_encode, METH_VARARGS},
{"mbcs_decode", mbcs_decode, METH_VARARGS},
#endif
-#endif /* Py_USING_UNICODE */
{"register_error", register_error, METH_VARARGS,
register_error__doc__},
{"lookup_error", lookup_error, METH_VARARGS,
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 2766b41..b2bbbcf 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -93,27 +93,6 @@
#define LOCAL(type) static type
#endif
-/* compatibility macros */
-#if (PY_VERSION_HEX < 0x02050000)
-typedef int Py_ssize_t;
-#define lenfunc inquiry
-#endif
-
-#if (PY_VERSION_HEX < 0x02040000)
-#define PyDict_CheckExact PyDict_Check
-#if (PY_VERSION_HEX < 0x02020000)
-#define PyList_CheckExact PyList_Check
-#define PyString_CheckExact PyString_Check
-#if (PY_VERSION_HEX >= 0x01060000)
-#define Py_USING_UNICODE /* always enabled for 2.0 and 2.1 */
-#endif
-#endif
-#endif
-
-#if !defined(Py_RETURN_NONE)
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
/* macros used to store 'join' flags in string object pointers. note
that all use of text and tail as object pointers must be wrapped in
JOIN_OBJ. see comments in the ElementObject definition for more
@@ -724,7 +703,6 @@
#define PATHCHAR(ch) (ch == '/' || ch == '*' || ch == '[' || ch == '@')
-#if defined(Py_USING_UNICODE)
if (PyUnicode_Check(tag)) {
Py_UNICODE *p = PyUnicode_AS_UNICODE(tag);
for (i = 0; i < PyUnicode_GET_SIZE(tag); i++) {
@@ -737,7 +715,6 @@
}
return 0;
}
-#endif
if (PyString_Check(tag)) {
char *p = PyString_AS_STRING(tag);
for (i = 0; i < PyString_GET_SIZE(tag); i++) {
@@ -1860,7 +1837,6 @@
/* helpers */
-#if defined(Py_USING_UNICODE)
LOCAL(int)
checkstring(const char* string, int size)
{
@@ -1873,7 +1849,6 @@
return 0;
}
-#endif
LOCAL(PyObject*)
makestring(const char* string, int size)
@@ -1881,10 +1856,8 @@
/* convert a UTF-8 string to either a 7-bit ascii string or a
Unicode string */
-#if defined(Py_USING_UNICODE)
if (checkstring(string, size))
return PyUnicode_DecodeUTF8(string, size, "strict");
-#endif
return PyString_FromStringAndSize(string, size);
}
@@ -1934,7 +1907,6 @@
}
/* decode universal name */
-#if defined(Py_USING_UNICODE)
/* inline makestring, to avoid duplicating the source string if
it's not an utf-8 string */
p = PyString_AS_STRING(tag);
@@ -1946,7 +1918,6 @@
return NULL;
}
} else
-#endif
value = tag; /* use tag as is */
/* add to names dictionary */
@@ -2163,7 +2134,6 @@
}
}
-#if defined(Py_USING_UNICODE)
static int
expat_unknown_encoding_handler(XMLParserObject *self, const XML_Char *name,
XML_Encoding *info)
@@ -2200,7 +2170,6 @@
return XML_STATUS_OK;
}
-#endif
/* -------------------------------------------------------------------- */
/* constructor and destructor */
@@ -2306,12 +2275,10 @@
self->parser,
(XML_ProcessingInstructionHandler) expat_pi_handler
);
-#if defined(Py_USING_UNICODE)
EXPAT(SetUnknownEncodingHandler)(
self->parser,
(XML_UnknownEncodingHandler) expat_unknown_encoding_handler, NULL
);
-#endif
ALLOC(sizeof(XMLParserObject), "create expatparser");
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
index 02e9e53..b448be1 100644
--- a/Modules/_localemodule.c
+++ b/Modules/_localemodule.c
@@ -270,7 +270,7 @@
static PyObject*
PyLocale_strcoll(PyObject* self, PyObject* args)
{
-#if !defined(HAVE_WCSCOLL) || !defined(Py_USING_UNICODE)
+#if !defined(HAVE_WCSCOLL)
char *s1,*s2;
if (!PyArg_ParseTuple(args, "ss:strcoll", &s1, &s2))
diff --git a/Modules/_sre.c b/Modules/_sre.c
index d402965..d7f608a 100644
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -58,12 +58,8 @@
/* defining this one enables tracing */
#undef VERBOSE
-#if PY_VERSION_HEX >= 0x01060000
-#if PY_VERSION_HEX < 0x02020000 || defined(Py_USING_UNICODE)
/* defining this enables unicode support (default under 1.6a1 and later) */
#define HAVE_UNICODE
-#endif
-#endif
/* -------------------------------------------------------------------- */
/* optional features */
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 09bb4ff..71e42c1 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -456,7 +456,6 @@
return Py_None;
}
-#ifdef Py_USING_UNICODE
/* Test the u and u# codes for PyArg_ParseTuple. May leak memory in case
of an error.
@@ -518,7 +517,6 @@
return PyCodec_IncrementalDecoder(encoding, errors);
}
-#endif
/* Simple test of _PyLong_NumBits and _PyLong_Sign. */
static PyObject *
@@ -863,9 +861,7 @@
{"codec_incrementaldecoder",
(PyCFunction)codec_incrementaldecoder, METH_VARARGS},
#endif
-#ifdef Py_USING_UNICODE
{"test_u_code", (PyCFunction)test_u_code, METH_NOARGS},
-#endif
#ifdef WITH_THREAD
{"_test_thread_state", test_thread_state, METH_VARARGS},
#endif
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 7be7002..f879a05 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -337,7 +337,6 @@
{
if (PyString_Check(value))
return PyString_AsString(value);
-#ifdef Py_USING_UNICODE
else if (PyUnicode_Check(value)) {
PyObject *v = PyUnicode_AsUTF8String(value);
if (v == NULL)
@@ -349,7 +348,6 @@
Py_DECREF(v);
return PyString_AsString(v);
}
-#endif
else {
PyObject *v = PyObject_Str(value);
if (v == NULL)
@@ -775,7 +773,6 @@
for (i = 0; i < len; i++)
if (s[i] & 0x80)
break;
-#ifdef Py_USING_UNICODE
if (i == len)
/* It is an ASCII string. */
self->string = PyString_FromStringAndSize(s, len);
@@ -786,9 +783,6 @@
self->string = PyString_FromStringAndSize(s, len);
}
}
-#else
- self->string = PyString_FromStringAndSize(s, len);
-#endif
if (!self->string)
return NULL;
}
@@ -796,7 +790,6 @@
return self->string;
}
-#ifdef Py_USING_UNICODE
PyDoc_STRVAR(PyTclObject_unicode__doc__, "convert argument to unicode");
static PyObject *
@@ -812,7 +805,6 @@
s = Tcl_GetStringFromObj(self->value, &len);
return PyUnicode_DecodeUTF8(s, len, "strict");
}
-#endif
static PyObject *
PyTclObject_repr(PyTclObject *self)
@@ -851,10 +843,8 @@
};
static PyMethodDef PyTclObject_methods[] = {
-#ifdef Py_USING_UNICODE
{"__unicode__", (PyCFunction)PyTclObject_unicode, METH_NOARGS,
PyTclObject_unicode__doc__},
-#endif
{0}
};
@@ -929,7 +919,6 @@
ckfree(FREECAST argv);
return result;
}
-#ifdef Py_USING_UNICODE
else if (PyUnicode_Check(value)) {
Py_UNICODE *inbuf = PyUnicode_AS_UNICODE(value);
Py_ssize_t size = PyUnicode_GET_SIZE(value);
@@ -962,7 +951,6 @@
#endif
}
-#endif
else if(PyTclObject_Check(value)) {
Tcl_Obj *v = ((PyTclObject*)value)->value;
Tcl_IncrRefCount(v);
@@ -987,7 +975,6 @@
if (value->typePtr == NULL) {
/* If the result contains any bytes with the top bit set,
it's UTF-8 and we should decode it to Unicode */
-#ifdef Py_USING_UNICODE
int i;
char *s = value->bytes;
int len = value->length;
@@ -1006,9 +993,6 @@
result = PyString_FromStringAndSize(s, len);
}
}
-#else
- result = PyString_FromStringAndSize(value->bytes, value->length);
-#endif
return result;
}
@@ -1066,7 +1050,6 @@
}
if (value->typePtr == app->StringType) {
-#ifdef Py_USING_UNICODE
#if defined(Py_UNICODE_WIDE) && TCL_UTF_MAX==3
PyObject *result;
int size;
@@ -1086,12 +1069,6 @@
return PyUnicode_FromUnicode(Tcl_GetUnicode(value),
Tcl_GetCharLength(value));
#endif
-#else
- int size;
- char *c;
- c = Tcl_GetStringFromObj(value, &size);
- return PyString_FromStringAndSize(c, size);
-#endif
}
return newPyTclObject(value);
@@ -1194,7 +1171,6 @@
/* If the result contains any bytes with the top bit set,
it's UTF-8 and we should decode it to Unicode */
-#ifdef Py_USING_UNICODE
while (*p != '\0') {
if (*p & 0x80)
break;
@@ -1212,10 +1188,6 @@
res = PyString_FromStringAndSize(s, (int)(p-s));
}
}
-#else
- p = strchr(p, '\0');
- res = PyString_FromStringAndSize(s, (int)(p-s));
-#endif
}
return res;
}
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 626bdfc..c6de243 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -170,7 +170,6 @@
return 0;
}
-#ifdef Py_USING_UNICODE
static PyObject *
u_getitem(arrayobject *ap, Py_ssize_t i)
{
@@ -194,7 +193,6 @@
((Py_UNICODE *)ap->ob_item)[i] = p[0];
return 0;
}
-#endif
static PyObject *
h_getitem(arrayobject *ap, Py_ssize_t i)
@@ -394,9 +392,7 @@
{'c', sizeof(char), c_getitem, c_setitem},
{'b', sizeof(char), b_getitem, b_setitem},
{'B', sizeof(char), BB_getitem, BB_setitem},
-#ifdef Py_USING_UNICODE
{'u', sizeof(Py_UNICODE), u_getitem, u_setitem},
-#endif
{'h', sizeof(short), h_getitem, h_setitem},
{'H', sizeof(short), HH_getitem, HH_setitem},
{'i', sizeof(int), i_getitem, i_setitem},
@@ -1430,7 +1426,6 @@
-#ifdef Py_USING_UNICODE
static PyObject *
array_fromunicode(arrayobject *self, PyObject *args)
{
@@ -1491,7 +1486,6 @@
array.tostring().decode() to obtain a unicode string from\n\
an array of some other type.");
-#endif /* Py_USING_UNICODE */
static PyObject *
@@ -1536,10 +1530,8 @@
fromlist_doc},
{"fromstring", (PyCFunction)array_fromstring, METH_VARARGS,
fromstring_doc},
-#ifdef Py_USING_UNICODE
{"fromunicode", (PyCFunction)array_fromunicode, METH_VARARGS,
fromunicode_doc},
-#endif
{"index", (PyCFunction)array_index, METH_O,
index_doc},
{"insert", (PyCFunction)array_insert, METH_VARARGS,
@@ -1562,10 +1554,8 @@
tolist_doc},
{"tostring", (PyCFunction)array_tostring, METH_NOARGS,
tostring_doc},
-#ifdef Py_USING_UNICODE
{"tounicode", (PyCFunction)array_tounicode, METH_NOARGS,
tounicode_doc},
-#endif
{"write", (PyCFunction)array_tofile, METH_O,
tofile_doc},
{NULL, NULL} /* sentinel */
@@ -1587,10 +1577,8 @@
if (typecode == 'c')
v = array_tostring(a, NULL);
-#ifdef Py_USING_UNICODE
else if (typecode == 'u')
v = array_tounicode(a, NULL);
-#endif
else
v = array_tolist(a, NULL);
t = PyObject_Repr(v);
@@ -1899,7 +1887,6 @@
return NULL;
}
Py_DECREF(v);
-#ifdef Py_USING_UNICODE
} else if (initial != NULL && PyUnicode_Check(initial)) {
Py_ssize_t n = PyUnicode_GET_DATA_SIZE(initial);
if (n > 0) {
@@ -1916,7 +1903,6 @@
memcpy(item, PyUnicode_AS_DATA(initial), n);
self->allocated = self->ob_size;
}
-#endif
}
if (it != NULL) {
if (array_iter_extend((arrayobject *)a, it) == -1) {
diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index 7b8ed66..9ce3f65 100644
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -1256,7 +1256,6 @@
}
-#ifdef Py_USING_UNICODE
/* A copy of PyUnicode_EncodeRawUnicodeEscape() that also translates
backslash and newline characters to \uXXXX escapes. */
static PyObject *
@@ -1373,7 +1372,6 @@
Py_XDECREF(repr);
return -1;
}
-#endif
/* A helper for save_tuple. Push the len elements in tuple t on the stack. */
static int
@@ -2225,13 +2223,11 @@
goto finally;
}
-#ifdef Py_USING_UNICODE
case 'u':
if ((type == &PyUnicode_Type) && (PyString_GET_SIZE(args) < 2)) {
res = save_unicode(self, args, 0);
goto finally;
}
-#endif
}
if (args->ob_refcnt > 1) {
@@ -2255,14 +2251,12 @@
}
break;
-#ifdef Py_USING_UNICODE
case 'u':
if (type == &PyUnicode_Type) {
res = save_unicode(self, args, 1);
goto finally;
}
break;
-#endif
case 't':
if (type == &PyTuple_Type) {
@@ -3326,7 +3320,6 @@
}
-#ifdef Py_USING_UNICODE
static int
load_unicode(Unpicklerobject *self)
{
@@ -3346,10 +3339,8 @@
finally:
return res;
}
-#endif
-#ifdef Py_USING_UNICODE
static int
load_binunicode(Unpicklerobject *self)
{
@@ -3370,7 +3361,6 @@
PDATA_PUSH(self->stack, unicode, -1);
return 0;
}
-#endif
static int
@@ -4347,7 +4337,6 @@
break;
continue;
-#ifdef Py_USING_UNICODE
case UNICODE:
if (load_unicode(self) < 0)
break;
@@ -4357,7 +4346,6 @@
if (load_binunicode(self) < 0)
break;
continue;
-#endif
case EMPTY_TUPLE:
if (load_counted_tuple(self, 0) < 0)
@@ -4737,7 +4725,6 @@
break;
continue;
-#ifdef Py_USING_UNICODE
case UNICODE:
if (load_unicode(self) < 0)
break;
@@ -4747,7 +4734,6 @@
if (load_binunicode(self) < 0)
break;
continue;
-#endif
case EMPTY_TUPLE:
if (load_counted_tuple(self, 0) < 0)
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 3922a50..f5106e1 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -44,10 +44,6 @@
disguised Unix interface). Refer to the library manual and\n\
corresponding Unix manual entries for more information on calls.");
-#ifndef Py_USING_UNICODE
-/* This is used in signatures of functions. */
-#define Py_UNICODE void
-#endif
#if defined(PYOS_OS2)
#define INCL_DOS
@@ -1895,7 +1891,6 @@
return PyString_FromString(buf);
}
-#ifdef Py_USING_UNICODE
PyDoc_STRVAR(posix_getcwdu__doc__,
"getcwdu() -> path\n\n\
Return a unicode string representing the current working directory.");
@@ -1949,7 +1944,6 @@
return PyUnicode_Decode(buf, strlen(buf), Py_FileSystemDefaultEncoding,"strict");
}
#endif
-#endif
#ifdef HAVE_LINK
@@ -2242,7 +2236,6 @@
d = NULL;
break;
}
-#ifdef Py_USING_UNICODE
if (arg_is_unicode) {
PyObject *w;
@@ -2259,7 +2252,6 @@
PyErr_Clear();
}
}
-#endif
if (PyList_Append(d, v) != 0) {
Py_DECREF(v);
Py_DECREF(d);
@@ -5764,14 +5756,11 @@
char buf[MAXPATHLEN];
char *path;
int n;
-#ifdef Py_USING_UNICODE
int arg_is_unicode = 0;
-#endif
if (!PyArg_ParseTuple(args, "et:readlink",
Py_FileSystemDefaultEncoding, &path))
return NULL;
-#ifdef Py_USING_UNICODE
v = PySequence_GetItem(args, 0);
if (v == NULL) return NULL;
@@ -5779,7 +5768,6 @@
arg_is_unicode = 1;
}
Py_DECREF(v);
-#endif
Py_BEGIN_ALLOW_THREADS
n = readlink(path, buf, (int) sizeof buf);
@@ -5788,7 +5776,6 @@
return posix_error_with_filename(path);
v = PyString_FromStringAndSize(buf, n);
-#ifdef Py_USING_UNICODE
if (arg_is_unicode) {
PyObject *w;
@@ -5805,7 +5792,6 @@
PyErr_Clear();
}
}
-#endif
return v;
}
#endif /* HAVE_READLINK */
@@ -8184,10 +8170,8 @@
#endif
#ifdef HAVE_GETCWD
{"getcwd", posix_getcwd, METH_NOARGS, posix_getcwd__doc__},
-#ifdef Py_USING_UNICODE
{"getcwdu", posix_getcwdu, METH_NOARGS, posix_getcwdu__doc__},
#endif
-#endif
#ifdef HAVE_LINK
{"link", posix_link, METH_VARARGS, posix_link__doc__},
#endif /* HAVE_LINK */
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index 87a16ef..aebae1c 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -22,12 +22,7 @@
#define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str)
#endif
-#if (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 2)
-/* In Python 2.0 and 2.1, disabling Unicode was not possible. */
-#define Py_USING_UNICODE
-#else
#define FIX_TRACE
-#endif
enum HandlerTypes {
StartElement,
@@ -161,7 +156,6 @@
}
-#ifdef Py_USING_UNICODE
/* Convert a string of XML_Chars into a Unicode string.
Returns None if str is a null pointer. */
@@ -190,7 +184,6 @@
}
return PyUnicode_DecodeUTF8((const char *)str, len, "strict");
}
-#endif
/* Convert a string of XML_Chars into an 8-bit Python string.
Returns None if str is a null pointer. */
@@ -418,13 +411,9 @@
return res;
}
-#ifndef Py_USING_UNICODE
-#define STRING_CONV_FUNC conv_string_to_utf8
-#else
/* Python 2.0 and later versions, when built with Unicode support */
#define STRING_CONV_FUNC (self->returns_unicode \
? conv_string_to_unicode : conv_string_to_utf8)
-#endif
static PyObject*
string_intern(xmlparseobject *self, const char* str)
@@ -460,13 +449,9 @@
args = PyTuple_New(1);
if (args == NULL)
return -1;
-#ifdef Py_USING_UNICODE
temp = (self->returns_unicode
? conv_string_len_to_unicode(buffer, len)
: conv_string_len_to_utf8(buffer, len));
-#else
- temp = conv_string_len_to_utf8(buffer, len);
-#endif
if (temp == NULL) {
Py_DECREF(args);
flag_error(self);
@@ -674,24 +659,6 @@
string_intern(self, systemId), string_intern(self, publicId),
string_intern(self, notationName)))
-#ifndef Py_USING_UNICODE
-VOID_HANDLER(EntityDecl,
- (void *userData,
- const XML_Char *entityName,
- int is_parameter_entity,
- const XML_Char *value,
- int value_length,
- const XML_Char *base,
- const XML_Char *systemId,
- const XML_Char *publicId,
- const XML_Char *notationName),
- ("NiNNNNN",
- string_intern(self, entityName), is_parameter_entity,
- conv_string_len_to_utf8(value, value_length),
- string_intern(self, base), string_intern(self, systemId),
- string_intern(self, publicId),
- string_intern(self, notationName)))
-#else
VOID_HANDLER(EntityDecl,
(void *userData,
const XML_Char *entityName,
@@ -710,7 +677,6 @@
string_intern(self, base), string_intern(self, systemId),
string_intern(self, publicId),
string_intern(self, notationName)))
-#endif
VOID_HANDLER(XmlDecl,
(void *userData,
@@ -761,14 +727,10 @@
if (flush_character_buffer(self) < 0)
goto finally;
-#ifdef Py_USING_UNICODE
modelobj = conv_content_model(model,
(self->returns_unicode
? conv_string_to_unicode
: conv_string_to_utf8));
-#else
- modelobj = conv_content_model(model, conv_string_to_utf8);
-#endif
if (modelobj == NULL) {
flag_error(self);
goto finally;
@@ -856,15 +818,6 @@
(void *userData),
("()"))
-#ifndef Py_USING_UNICODE
-VOID_HANDLER(Default,
- (void *userData, const XML_Char *s, int len),
- ("(N)", conv_string_len_to_utf8(s,len)))
-
-VOID_HANDLER(DefaultHandlerExpand,
- (void *userData, const XML_Char *s, int len),
- ("(N)", conv_string_len_to_utf8(s,len)))
-#else
VOID_HANDLER(Default,
(void *userData, const XML_Char *s, int len),
("(N)", (self->returns_unicode
@@ -876,7 +829,6 @@
("(N)", (self->returns_unicode
? conv_string_len_to_unicode(s,len)
: conv_string_len_to_utf8(s,len))))
-#endif
INT_HANDLER(NotStandalone,
(void *userData),
@@ -1268,7 +1220,6 @@
/* ---------- */
-#ifdef Py_USING_UNICODE
/* pyexpat international encoding support.
Make it as simple as possible.
@@ -1319,7 +1270,6 @@
return result;
}
-#endif
static PyObject *
newxmlparseobject(char *encoding, char *namespace_separator, PyObject *intern)
@@ -1336,11 +1286,7 @@
if (self == NULL)
return NULL;
-#ifdef Py_USING_UNICODE
self->returns_unicode = 1;
-#else
- self->returns_unicode = 0;
-#endif
self->buffer = NULL;
self->buffer_size = CHARACTER_DATA_BUFFER_SIZE;
@@ -1370,10 +1316,8 @@
return NULL;
}
XML_SetUserData(self->itself, (void *)self);
-#ifdef Py_USING_UNICODE
XML_SetUnknownEncodingHandler(self->itself,
(XML_UnknownEncodingHandler) PyUnknownEncodingHandler, NULL);
-#endif
for (i = 0; handler_info[i].name != NULL; i++)
/* do nothing */;
@@ -1631,13 +1575,7 @@
}
if (strcmp(name, "returns_unicode") == 0) {
if (PyObject_IsTrue(v)) {
-#ifndef Py_USING_UNICODE
- PyErr_SetString(PyExc_ValueError,
- "Unicode support not available");
- return -1;
-#else
self->returns_unicode = 1;
-#endif
}
else
self->returns_unicode = 0;
@@ -1886,9 +1824,7 @@
Py_BuildValue("(iii)", info.major,
info.minor, info.micro));
}
-#ifdef Py_USING_UNICODE
init_template_buffer();
-#endif
/* XXX When Expat supports some way of figuring out how it was
compiled, this should check and set native_encoding
appropriately.