Fix PEP 293 related problems with --disable-unicode builds

doerwalter · doerwalter · commit 0bedb0ec4368 · 2002-11-21T20:08:33.000Z
reported by Michael Hudson in http://mail.python.org/pipermail/python-dev/2002-November/030299.html git-svn-id: http://svn.python.org/projects/python/trunk@29795 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
@@ -138,8 +138,10 @@ PyAPI_FUNC(void) PyErr_SetInterrupt(void);
 PyAPI_FUNC(void) PyErr_SyntaxLocation(char *, int);
 PyAPI_FUNC(PyObject *) PyErr_ProgramText(char *, int);
 
+#ifdef Py_USING_UNICODE
 /* The following functions are used to create and modify unicode
    exceptions from C */
+
 /* create a UnicodeDecodeError object */
 PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_Create(
 	const char *, const char *, int, int, int, const char *);
@@ -198,6 +200,7 @@ 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
diff --git a/Python/codecs.c b/Python/codecs.c
@@ -486,6 +486,7 @@ PyObject *PyCodec_StrictErrors(PyObject *exc)
 }
 
 
+#ifdef Py_USING_UNICODE
 PyObject *PyCodec_IgnoreErrors(PyObject *exc)
 {
     int end;
@@ -728,13 +729,15 @@ PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc)
 	return NULL;
     }
 }
+#endif
 
 static PyObject *strict_errors(PyObject *self, PyObject *exc)
 {
     return PyCodec_StrictErrors(exc);
 }
 
 
+#ifdef Py_USING_UNICODE
 static PyObject *ignore_errors(PyObject *self, PyObject *exc)
 {
     return PyCodec_IgnoreErrors(exc);
@@ -757,6 +760,7 @@ static PyObject *backslashreplace_errors(PyObject *self, PyObject *exc)
 {
     return PyCodec_BackslashReplaceErrors(exc);
 }
+#endif
 
 
 void _PyCodecRegistry_Init(void)
@@ -774,6 +778,7 @@ void _PyCodecRegistry_Init(void)
 		METH_O
 	    }
 	},
+#ifdef Py_USING_UNICODE
 	{
 	    "ignore",
 	    {
@@ -806,6 +811,7 @@ void _PyCodecRegistry_Init(void)
 		METH_O
 	    }
 	}
+#endif
     };
     if (_PyCodec_SearchPath == NULL)
 	_PyCodec_SearchPath = PyList_New(0);
diff --git a/Python/exceptions.c b/Python/exceptions.c
@@ -892,6 +892,7 @@ static PyMethodDef KeyError_methods[] = {
 };
 
 
+#ifdef Py_USING_UNICODE
 static
 int get_int(PyObject *exc, const char *name, int *value)
 {
@@ -1469,6 +1470,7 @@ PyObject * PyUnicodeTranslateError_Create(
     return PyObject_CallFunction(PyExc_UnicodeTranslateError, "u#iis",
 	object, length, start, end, reason);
 }
+#endif
 
 
 
@@ -1496,11 +1498,13 @@ PyDoc_STRVAR(ValueError__doc__,
 
 PyDoc_STRVAR(UnicodeError__doc__, "Unicode related error.");
 
+#ifdef Py_USING_UNICODE
 PyDoc_STRVAR(UnicodeEncodeError__doc__, "Unicode encoding error.");
 
 PyDoc_STRVAR(UnicodeDecodeError__doc__, "Unicode decoding error.");
 
 PyDoc_STRVAR(UnicodeTranslateError__doc__, "Unicode translation error.");
+#endif
 
 PyDoc_STRVAR(SystemError__doc__,
 "Internal error in the Python interpreter.\n\
@@ -1675,12 +1679,14 @@ static struct {
   FloatingPointError__doc__},
  {"ValueError",   &PyExc_ValueError,  0, ValueError__doc__},
  {"UnicodeError", &PyExc_UnicodeError, &PyExc_ValueError, UnicodeError__doc__},
+#ifdef Py_USING_UNICODE
  {"UnicodeEncodeError", &PyExc_UnicodeEncodeError, &PyExc_UnicodeError,
   UnicodeEncodeError__doc__, UnicodeEncodeError_methods},
  {"UnicodeDecodeError", &PyExc_UnicodeDecodeError, &PyExc_UnicodeError,
   UnicodeDecodeError__doc__, UnicodeDecodeError_methods},
  {"UnicodeTranslateError", &PyExc_UnicodeTranslateError, &PyExc_UnicodeError,
   UnicodeTranslateError__doc__, UnicodeTranslateError_methods},
+#endif
  {"ReferenceError",  &PyExc_ReferenceError, 0, ReferenceError__doc__},
  {"SystemError",  &PyExc_SystemError, 0, SystemError__doc__},
  {"MemoryError",  &PyExc_MemoryError, 0, MemoryError__doc__},

Original file line number	Diff line number	Diff line change
`@@ -486,6 +486,7 @@ PyObject PyCodec_StrictErrors(PyObject exc)`
`486`	`486`	`}`
`487`	`487`
`488`	`488`
	`489`	`+#ifdef Py_USING_UNICODE`
`489`	`490`	`PyObject PyCodec_IgnoreErrors(PyObject exc)`
`490`	`491`	`{`
`491`	`492`	`int end;`
`@@ -728,13 +729,15 @@ PyObject PyCodec_BackslashReplaceErrors(PyObject exc)`
`728`	`729`	`return NULL;`
`729`	`730`	`}`
`730`	`731`	`}`
	`732`	`+#endif`
`731`	`733`
`732`	`734`	`static PyObject strict_errors(PyObject self, PyObject *exc)`
`733`	`735`	`{`
`734`	`736`	`return PyCodec_StrictErrors(exc);`
`735`	`737`	`}`
`736`	`738`
`737`	`739`
	`740`	`+#ifdef Py_USING_UNICODE`
`738`	`741`	`static PyObject ignore_errors(PyObject self, PyObject *exc)`
`739`	`742`	`{`
`740`	`743`	`return PyCodec_IgnoreErrors(exc);`
`@@ -757,6 +760,7 @@ static PyObject backslashreplace_errors(PyObject self, PyObject *exc)`
`757`	`760`	`{`
`758`	`761`	`return PyCodec_BackslashReplaceErrors(exc);`
`759`	`762`	`}`
	`763`	`+#endif`
`760`	`764`
`761`	`765`
`762`	`766`	`void _PyCodecRegistry_Init(void)`
`@@ -774,6 +778,7 @@ void _PyCodecRegistry_Init(void)`
`774`	`778`	`METH_O`
`775`	`779`	`}`
`776`	`780`	`},`
	`781`	`+#ifdef Py_USING_UNICODE`
`777`	`782`	`{`
`778`	`783`	`"ignore",`
`779`	`784`	`{`
`@@ -806,6 +811,7 @@ void _PyCodecRegistry_Init(void)`
`806`	`811`	`METH_O`
`807`	`812`	`}`
`808`	`813`	`}`
	`814`	`+#endif`
`809`	`815`	`};`
`810`	`816`	`if (_PyCodec_SearchPath == NULL)`
`811`	`817`	`_PyCodec_SearchPath = PyList_New(0);`