From adc727490b521b1de27088b160382396d7b52a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Walter=20D=C3=B6rwald?= <walter@livinglogic.de>
Date: Wed, 8 Jan 2003 22:01:33 +0000
Subject: [PATCH] Fix charmapencode_lookup(), so that a None value in the
 mapping is treated as "character maps to <undefined>" and not as "character
 mapping must return integer, None or str".

---
 Objects/unicodeobject.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 1e4907ac428..07579aa3837 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -2736,6 +2736,8 @@ static PyObject *charmapencode_lookup(Py_UNICODE c, PyObject *mapping)
 	} else
 	    return NULL;
     }
+    else if (x == Py_None)
+	return x;
     else if (PyInt_Check(x)) {
 	long value = PyInt_AS_LONG(x);
 	if (value < 0 || value > 255) {