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".

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 1e4907ac4285f94ae303c25c9f243e97cb960ea0..07579aa38378bd4175a1ce2db104b531a319084f 100644 (file)
--- 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) {