Moved the encoding map building logic from the individual mapping

codec files to codecs.py and added logic so that multi mappings
in the decoding maps now result in mappings to None (undefined mapping)
in the encoding maps.

Lib/codecs.py

@@ -554,6 +554,27 @@ def make_identity_dict(rng):
         res[i]=i
     return res
 
+def make_encoding_map(decoding_map):
+
+    """ Creates an encoding map from a decoding map.
+
+        If a target mapping in the decoding map occurrs multiple
+        times, then that target is mapped to None (undefined mapping),
+        causing an exception when encountered by the charmap codec
+        during translation.
+
+        One example where this happens is cp875.py which decodes
+        multiple character to \u001a.
+
+    """
+    m = {}
+    for k,v in decoding_map.items():
+        if not m.has_key(v):
+            m[v] = k
+        else:
+            m[v] = None
+    return m
+    
 ### Tests
 
 if __name__ == '__main__':

Lib/encodings/cp037.py

@@ -277,6 +277,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp1006.py

@@ -135,6 +135,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp1026.py

@@ -277,6 +277,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp1250.py

@@ -120,6 +120,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp1251.py

@@ -154,6 +154,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp1252.py

@@ -73,6 +73,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp1253.py

@@ -148,6 +148,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp1254.py

@@ -79,6 +79,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp1255.py

@@ -140,6 +140,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp1256.py

@@ -126,6 +126,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp1257.py

@@ -128,6 +128,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp1258.py

@@ -87,6 +87,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp424.py

@@ -277,6 +277,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp437.py

@@ -169,6 +169,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp500.py

@@ -277,6 +277,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp737.py

@@ -169,6 +169,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp775.py

@@ -169,6 +169,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp850.py

@@ -169,6 +169,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp852.py

@@ -169,6 +169,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp855.py

@@ -169,6 +169,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp856.py

@@ -169,6 +169,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp857.py

@@ -168,6 +168,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp860.py

@@ -169,6 +169,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp861.py

@@ -169,6 +169,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp862.py

@@ -169,6 +169,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp863.py

@@ -169,6 +169,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp864.py

@@ -167,6 +167,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp865.py

@@ -169,6 +169,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp866.py

@@ -169,6 +169,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp869.py

@@ -169,6 +169,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp874.py

@@ -168,6 +168,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/cp875.py

@@ -278,6 +278,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/iso8859_1.py

@@ -41,6 +41,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/iso8859_10.py

@@ -87,6 +87,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/iso8859_13.py

@@ -97,6 +97,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/iso8859_14.py

@@ -72,6 +72,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/iso8859_15.py

@@ -49,6 +49,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/iso8859_2.py

@@ -98,6 +98,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/iso8859_3.py

@@ -76,6 +76,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/iso8859_4.py

@@ -91,6 +91,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/iso8859_5.py

@@ -135,6 +135,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/iso8859_6.py

@@ -134,6 +134,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/iso8859_7.py

@@ -121,6 +121,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/iso8859_8.py

@@ -109,6 +109,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/iso8859_9.py

@@ -47,6 +47,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/koi8_r.py

@@ -169,6 +169,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/mac_cyrillic.py

@@ -164,6 +164,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/mac_greek.py

@@ -167,6 +167,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/mac_iceland.py

@@ -163,6 +163,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/mac_latin2.py

@@ -167,6 +167,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/mac_roman.py

@@ -164,6 +164,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/mac_turkish.py

@@ -164,6 +164,4 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)

Lib/encodings/rot_13.py

@@ -93,9 +93,7 @@ decoding_map.update({
 
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)
 
 ### Filter API
 

Tools/scripts/gencodec.py

@@ -244,9 +244,7 @@ def getregentry():
     append('''
 ### Encoding Map
 
-encoding_map = {}
-for k,v in decoding_map.items():
-    encoding_map[v] = k
+encoding_map = codecs.make_encoding_map(decoding_map)
 ''')
     return string.join(l,'\n')