Get rid of all #ifdef Py_USING_UNICODE (it is always present now).

(With the help of unifdef from freshmeat.)

Author: gvanrossum

Include/longobject.h

@@ -51,9 +51,7 @@ PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLongMask(PyObject *);
 #endif /* HAVE_LONG_LONG */
 
 PyAPI_FUNC(PyObject *) PyLong_FromString(char *, char **, int);
-#ifdef Py_USING_UNICODE
 PyAPI_FUNC(PyObject *) PyLong_FromUnicode(Py_UNICODE*, Py_ssize_t, int);
-#endif
 
 /* _PyLong_Sign. Return 0 if v is 0, -1 if v < 0, +1 if v > 0.
  v must not be NULL, and must be a normalized long.

Include/object.h

@@ -374,9 +374,7 @@ PyAPI_FUNC(void) _PyObject_Dump(PyObject *);
 PyAPI_FUNC(PyObject *) PyObject_Repr(PyObject *);
 PyAPI_FUNC(PyObject *) _PyObject_Str(PyObject *);
 PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *);
-#ifdef Py_USING_UNICODE
 PyAPI_FUNC(PyObject *) PyObject_Unicode(PyObject *);
-#endif
 PyAPI_FUNC(int) PyObject_Compare(PyObject *, PyObject *);
 PyAPI_FUNC(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int);
 PyAPI_FUNC(int) PyObject_RichCompareBool(PyObject *, PyObject *, int);

Include/pyerrors.h

@@ -26,7 +26,6 @@ typedef struct {
  PyObject *print_file_and_line;
 } PySyntaxErrorObject;
 
-#ifdef Py_USING_UNICODE
 typedef struct {
  PyObject_HEAD
  PyObject *dict;
@@ -38,7 +37,6 @@ typedef struct {
  PyObject *end;
  PyObject *reason;
 } PyUnicodeErrorObject;
-#endif
 
 typedef struct {
  PyObject_HEAD
@@ -235,7 +233,6 @@ PyAPI_FUNC(void) PyErr_SetInterrupt(void);
 PyAPI_FUNC(void) PyErr_SyntaxLocation(const char *, int);
 PyAPI_FUNC(PyObject *) PyErr_ProgramText(const char *, int);
 
-#ifdef Py_USING_UNICODE
 /* The following functions are used to create and modify unicode
  exceptions from C */
 
@@ -297,7 +294,6 @@ PyAPI_FUNC(int) PyUnicodeDecodeError_SetReason(
 PyObject *, const char *);
 PyAPI_FUNC(int) PyUnicodeTranslateError_SetReason(
 PyObject *, const char *);
-#endif
 
 
 /* These APIs aren't really part of the error implementation, but

Include/unicodeobject.h

@@ -58,13 +58,6 @@ Copyright (c) Corporation for National Research Initiatives.
 
 /* --- Internal Unicode Format -------------------------------------------- */
 
-#ifndef Py_USING_UNICODE
-
-#define PyUnicode_Check(op) 0
-#define PyUnicode_CheckExact(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 */
@@ -1262,5 +1255,4 @@ PyAPI_FUNC(int) _PyUnicode_IsAlpha(
 #ifdef __cplusplus
 }
 #endif
-#endif /* Py_USING_UNICODE */
 #endif /* !Py_UNICODEOBJECT_H */

Modules/_codecsmodule.c

@@ -93,15 +93,8 @@ codec_encode(PyObject *self, PyObject *args)
  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 @@ codec_decode(PyObject *self, PyObject *args)
  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 @@ escape_encode(PyObject *self,
 return codec_tuple(str, PyString_Size(str));
 }
 
-#ifdef Py_USING_UNICODE
 /* --- Decoder ------------------------------------------------------------ */
 
 static PyObject *
@@ -833,7 +818,6 @@ mbcs_encode(PyObject *self,
 }
 
 #endif /* MS_WINDOWS */
-#endif /* Py_USING_UNICODE */
 
 /* --- Error handler registry --------------------------------------------- */
 
@@ -888,7 +872,6 @@ static PyMethodDef _codecs_functions[] = {
 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 @@ static PyMethodDef _codecs_functions[] = {
  {"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,

Modules/_elementtree.c

@@ -93,27 +93,6 @@ do { memory -= size; printf("%8d - %s\n", memory, comment); } while (0)
 #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 @@ checkpath(PyObject* tag)
 
 #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 @@ checkpath(PyObject* tag)
  }
  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 @@ static PyTypeObject XMLParser_Type;
 
 /* helpers */
 
-#if defined(Py_USING_UNICODE)
 LOCAL(int)
 checkstring(const char* string, int size)
 {
@@ -1873,18 +1849,15 @@ checkstring(const char* string, int size)
 
  return 0;
 }
-#endif
 
 LOCAL(PyObject*)
 makestring(const char* string, int size)
 {
  /* 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 @@ makeuniversal(XMLParserObject* self, const char* string)
  }
 
  /* 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 @@ makeuniversal(XMLParserObject* self, const char* string)
  return NULL;
  }
  } else
-#endif
  value = tag; /* use tag as is */
 
  /* add to names dictionary */
@@ -2163,7 +2134,6 @@ expat_pi_handler(XMLParserObject* self, const XML_Char* target_in,
  }
 }
 
-#if defined(Py_USING_UNICODE)
 static int
 expat_unknown_encoding_handler(XMLParserObject *self, const XML_Char *name,
  XML_Encoding *info)
@@ -2200,7 +2170,6 @@ expat_unknown_encoding_handler(XMLParserObject *self, const XML_Char *name,
 
  return XML_STATUS_OK;
 }
-#endif
 
 /* -------------------------------------------------------------------- */
 /* constructor and destructor */
@@ -2306,12 +2275,10 @@ xmlparser(PyObject* self_, PyObject* args, PyObject* kw)
  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");
 

Modules/_localemodule.c

@@ -270,7 +270,7 @@ PyDoc_STRVAR(strcoll__doc__,
 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))

Modules/_sre.c

@@ -58,12 +58,8 @@ static char copyright[] =
 /* 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 */

Modules/_testcapimodule.c

@@ -456,7 +456,6 @@ test_k_code(PyObject *self)
 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 @@ codec_incrementaldecoder(PyObject *self, PyObject *args)
 return PyCodec_IncrementalDecoder(encoding, errors);
 }
 
-#endif
 
 /* Simple test of _PyLong_NumBits and _PyLong_Sign. */
 static PyObject *
@@ -863,9 +861,7 @@ static PyMethodDef TestMethods[] = {
 {"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