From bf73db835a3e0302d38a86125dad55a60323f8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Walter=20D=C3=B6rwald?= <walter@livinglogic.de>
Date: Thu, 21 Nov 2002 20:08:33 +0000
Subject: Fix PEP 293 related problems with --disable-unicode builds reported
 by Michael Hudson in
 http://mail.python.org/pipermail/python-dev/2002-November/030299.html

---
 Python/exceptions.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Python/exceptions.c')

diff --git a/Python/exceptions.c b/Python/exceptions.c
index e4a68803ee..015d45a758 100644
--- 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__},
-- 
cgit v1.2.1