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.

diff --git a/Lib/codecs.py b/Lib/codecs.py
index b2eab1db3a49af3ac4f75efd125fde198ddeecbb..bdc8d029da43f8622e3767297e542ccf601ed919 100644 (file)
--- a/Lib/codecs.py
+++ b/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__':

diff --git a/Lib/encodings/cp037.py b/Lib/encodings/cp037.py
index 5868372b077b0752d797f7035616e3abf0243683..3b641bb0e946529acf0fcc2e65a66f4a51cee73f 100644 (file)
--- a/Lib/encodings/cp037.py
+++ b/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)

diff --git a/Lib/encodings/cp1006.py b/Lib/encodings/cp1006.py
index 593fbb601ccffe7f9f8cf3e2a0f92f04fd35dff8..0a3c3af32139b45403e669ef0bffe88b13f5d10b 100644 (file)
--- a/Lib/encodings/cp1006.py
+++ b/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)

diff --git a/Lib/encodings/cp1026.py b/Lib/encodings/cp1026.py
index 3796a75c093c8476088f0439a2348f1e0ab91211..cce5af6a4a27539a5ec14fc2c7992a58b87821ea 100644 (file)
--- a/Lib/encodings/cp1026.py
+++ b/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)

diff --git a/Lib/encodings/cp1250.py b/Lib/encodings/cp1250.py
index 03a3e3177d85bd3883880a29f8d3d7f890589d47..39cbc3375d5b77a1fc0cdaa2a79d7f9a72ad4f0f 100644 (file)
--- a/Lib/encodings/cp1250.py
+++ b/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)

diff --git a/Lib/encodings/cp1251.py b/Lib/encodings/cp1251.py
index e27a122c3829126fbb860e9dfb9daba55e307d7e..4d4b6ee9b42c8fed4190b73f71be129c8238d8bf 100644 (file)
--- a/Lib/encodings/cp1251.py
+++ b/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)

diff --git a/Lib/encodings/cp1252.py b/Lib/encodings/cp1252.py
index 5d7bdd63969b46d90b448f4551a973c05cd05b50..647f907287a3f28a2ac20410c444b2a785a2c865 100644 (file)
--- a/Lib/encodings/cp1252.py
+++ b/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)

diff --git a/Lib/encodings/cp1253.py b/Lib/encodings/cp1253.py
index abc144cc04d0f0babad344c3bf7e77f52f2f82db..bfb4723b589703e60fe983ef3fcb61fea0dd77f3 100644 (file)
--- a/Lib/encodings/cp1253.py
+++ b/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)

diff --git a/Lib/encodings/cp1254.py b/Lib/encodings/cp1254.py
index 4a2ab3caf472b8fada2e769bee2efcd6110080fe..dc662ed243feefb315d22b258cd99da9c51fada5 100644 (file)
--- a/Lib/encodings/cp1254.py
+++ b/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)

diff --git a/Lib/encodings/cp1255.py b/Lib/encodings/cp1255.py
index c987b85f45e7e033c76537714412f03d8130c5a2..6f70654f614de7bf6fbb9782b5a78655f23d2861 100644 (file)
--- a/Lib/encodings/cp1255.py
+++ b/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)

diff --git a/Lib/encodings/cp1256.py b/Lib/encodings/cp1256.py
index d72c5bcc9bbd6b395d333d36f5ecfc1612eee309..40ed577a85441e8b259f2e89ba4c889f04aecc48 100644 (file)
--- a/Lib/encodings/cp1256.py
+++ b/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)

diff --git a/Lib/encodings/cp1257.py b/Lib/encodings/cp1257.py
index d17a90421709d19f238243d7d919172eca64900e..baaf367b517b302d605ad3176761bb36953b7368 100644 (file)
--- a/Lib/encodings/cp1257.py
+++ b/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)

diff --git a/Lib/encodings/cp1258.py b/Lib/encodings/cp1258.py
index 597f12438c96d96ec22615ee02fff631916f495d..9a2827dc1836e3b1381f5e0874e64a4e40b70b17 100644 (file)
--- a/Lib/encodings/cp1258.py
+++ b/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)

diff --git a/Lib/encodings/cp424.py b/Lib/encodings/cp424.py
index bc10379808dc980ee0a3d41bfaa21b4b0711ecbb..4689996d665bd1db5fa0c0d384fdc27929a720c5 100644 (file)
--- a/Lib/encodings/cp424.py
+++ b/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)

diff --git a/Lib/encodings/cp437.py b/Lib/encodings/cp437.py
index db1b88a56794b1ddc5abcfe2af7857573e704e51..a55e4246d95d22a14d9097fed33f9bcff3d3c4d9 100644 (file)
--- a/Lib/encodings/cp437.py
+++ b/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)

diff --git a/Lib/encodings/cp500.py b/Lib/encodings/cp500.py
index 1c8fb57e1746f02ae5bfd750c0e154de36add90f..bc1acde4728a18b357c9868703e44f9998b0b2ca 100644 (file)
--- a/Lib/encodings/cp500.py
+++ b/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)

diff --git a/Lib/encodings/cp737.py b/Lib/encodings/cp737.py
index 03665aea7d19519f48fd5b3d3b5146502b7f2047..6174d851a1eb2ea55b336bc2ef702a2c15f6f3ea 100644 (file)
--- a/Lib/encodings/cp737.py
+++ b/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)

diff --git a/Lib/encodings/cp775.py b/Lib/encodings/cp775.py
index b38ccb5fe3eb62697c10348540bc90184a32e99c..ee56f01f5b0afe2ab93d3c59ebabb2360cce04d0 100644 (file)
--- a/Lib/encodings/cp775.py
+++ b/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)

diff --git a/Lib/encodings/cp850.py b/Lib/encodings/cp850.py
index e26287b7f3b19de8b7b9dc16041d528818a76aff..dd2318721e968633f9e4ca6ea63f944206df9674 100644 (file)
--- a/Lib/encodings/cp850.py
+++ b/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)

diff --git a/Lib/encodings/cp852.py b/Lib/encodings/cp852.py
index 431d8448f7eb530e5fba0de0350c93e4876ef7f4..38df00f6fcc9b6c674c9aeb71f96c380e10b62a6 100644 (file)
--- a/Lib/encodings/cp852.py
+++ b/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)

diff --git a/Lib/encodings/cp855.py b/Lib/encodings/cp855.py
index c9e71687bdee9ba38f2a125481510ae22b60d6eb..764fe1ac72b243985dd7252ac6e0c73c5dcf65f3 100644 (file)
--- a/Lib/encodings/cp855.py
+++ b/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)

diff --git a/Lib/encodings/cp856.py b/Lib/encodings/cp856.py
index cc2e01f45af103ac3df023afb5c8c28cb0b20625..9d09c091614cffbd61b27e8ab55970cd762477aa 100644 (file)
--- a/Lib/encodings/cp856.py
+++ b/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)

diff --git a/Lib/encodings/cp857.py b/Lib/encodings/cp857.py
index 6f4df23a56891bef875d910ea942638cb6990df6..5c84bb83188e42e185f99c5e1f320398ced41bd7 100644 (file)
--- a/Lib/encodings/cp857.py
+++ b/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)

diff --git a/Lib/encodings/cp860.py b/Lib/encodings/cp860.py
index 057d91870f3b66d09396eabee3e73944c7da564a..a721ea3d46da7afbd1cb13d6eedf2f28e181c445 100644 (file)
--- a/Lib/encodings/cp860.py
+++ b/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)

diff --git a/Lib/encodings/cp861.py b/Lib/encodings/cp861.py
index 8db3b40b243e9feaa1aa32c6848cb69fcdba4c7b..ccf26b70dc0db1f5198bba32fb7b709313acb8bf 100644 (file)
--- a/Lib/encodings/cp861.py
+++ b/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)

diff --git a/Lib/encodings/cp862.py b/Lib/encodings/cp862.py
index 1cac3e278a5f326fbb3bd084e56bc34962ea67ea..8f6d111e7899ce36aaf0edd91aa4231a05f0975e 100644 (file)
--- a/Lib/encodings/cp862.py
+++ b/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)

diff --git a/Lib/encodings/cp863.py b/Lib/encodings/cp863.py
index ecdc391f74f830774afec75932b7a75f109f0f97..3596e645cc76035007e0ff779950711f2881ea34 100644 (file)
--- a/Lib/encodings/cp863.py
+++ b/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)

diff --git a/Lib/encodings/cp864.py b/Lib/encodings/cp864.py
index 861fb00111e1e32fac8ff3fd747fa386cde1cbfc..f510a269e8dded598f8793380e4892360d632451 100644 (file)
--- a/Lib/encodings/cp864.py
+++ b/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)

diff --git a/Lib/encodings/cp865.py b/Lib/encodings/cp865.py
index 4d9010df8fb5b9f72284c57d65fb6a9340c7722a..cc4f719cb70f0ae6d16afebd94787256b66a34a3 100644 (file)
--- a/Lib/encodings/cp865.py
+++ b/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)

diff --git a/Lib/encodings/cp866.py b/Lib/encodings/cp866.py
index 6a8b0b0752086335234e0d722c73621489828b72..518eede0adb67d4c85e94e435c85e8f824a51c7d 100644 (file)
--- a/Lib/encodings/cp866.py
+++ b/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)

diff --git a/Lib/encodings/cp869.py b/Lib/encodings/cp869.py
index 65d2b2e1d09dda131a30daf61c98be849a9b29c5..2e3ad35c1c500b19e96d7ccd333aa50d6942a7b0 100644 (file)
--- a/Lib/encodings/cp869.py
+++ b/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)

diff --git a/Lib/encodings/cp874.py b/Lib/encodings/cp874.py
index 31f4d3d6d4c85bde3691bc156acb68656176f694..c43e20be0f11e8d3fdfe358f486b0ac245dd815d 100644 (file)
--- a/Lib/encodings/cp874.py
+++ b/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)

diff --git a/Lib/encodings/cp875.py b/Lib/encodings/cp875.py
index 3500446930a45cae90c7dd6da4b08e57af5286b9..5e748734b5f1894acabd901946c8e2642b3928a1 100644 (file)
--- a/Lib/encodings/cp875.py
+++ b/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)

diff --git a/Lib/encodings/iso8859_1.py b/Lib/encodings/iso8859_1.py
index f4c0bf750f26744e12ff7c992d9f469b80868137..cea22611ac3f3b417fd09cb4a2a1492cf7a038cb 100644 (file)
--- a/Lib/encodings/iso8859_1.py
+++ b/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)

diff --git a/Lib/encodings/iso8859_10.py b/Lib/encodings/iso8859_10.py
index c43c65306a275357a5da16f9fffd4a0bf8f85def..f29ebd237fe85fa43954dfe67f9f23e04374e087 100644 (file)
--- a/Lib/encodings/iso8859_10.py
+++ b/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)

diff --git a/Lib/encodings/iso8859_13.py b/Lib/encodings/iso8859_13.py
index 2ab52927ec38a0342354a1b1af3a7099d2a812ad..e0c4ae475360274d1d426c4c5bca02d5d461cccf 100644 (file)
--- a/Lib/encodings/iso8859_13.py
+++ b/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)

diff --git a/Lib/encodings/iso8859_14.py b/Lib/encodings/iso8859_14.py
index 5533e9617a9885f02e4df72c2c2b877e1a5ea66b..c84bb23e7f9857b694a04cac4dd1e7afee9295d9 100644 (file)
--- a/Lib/encodings/iso8859_14.py
+++ b/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)

diff --git a/Lib/encodings/iso8859_15.py b/Lib/encodings/iso8859_15.py
index 7bffff42b880bfb1f64648549ceda5c6247fcc43..bf92acb2918dc8685da96594dc4bb9b7c3b9eb58 100644 (file)
--- a/Lib/encodings/iso8859_15.py
+++ b/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)

diff --git a/Lib/encodings/iso8859_2.py b/Lib/encodings/iso8859_2.py
index 481f9a0a6cbee089611c620e5b50bcbebb61d24e..1c92a54274d49451cffc0bcf727925645b0f4de3 100644 (file)
--- a/Lib/encodings/iso8859_2.py
+++ b/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)

diff --git a/Lib/encodings/iso8859_3.py b/Lib/encodings/iso8859_3.py
index c2820ad6addd2371d9bd798271b4d6275a618759..ac8c8d91c298f5770a0cfc18f10fb37868e23b32 100644 (file)
--- a/Lib/encodings/iso8859_3.py
+++ b/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)

diff --git a/Lib/encodings/iso8859_4.py b/Lib/encodings/iso8859_4.py
index 30d6ca6805d5276269b3ea4be5830315fc016061..91db12613bce1163967aa077c07cfbe2981fb058 100644 (file)
--- a/Lib/encodings/iso8859_4.py
+++ b/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)

diff --git a/Lib/encodings/iso8859_5.py b/Lib/encodings/iso8859_5.py
index 2bdaa5003c03e7d073a72a24c271a8aa450a0197..96cb0734f2e736d9f4e9e77b01d79e25fd1845ea 100644 (file)
--- a/Lib/encodings/iso8859_5.py
+++ b/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)

diff --git a/Lib/encodings/iso8859_6.py b/Lib/encodings/iso8859_6.py
index 585fa11e5d3629df5bec99cd0d2160497a785460..298c2d53fe04d0145d3d3803a49a6d232e9c29cd 100644 (file)
--- a/Lib/encodings/iso8859_6.py
+++ b/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)

diff --git a/Lib/encodings/iso8859_7.py b/Lib/encodings/iso8859_7.py
index 48f1bd58dbc35495414a8f80516044c1bdac7719..eea3abf2eb0150b58a15a8132311466e2e87f60d 100644 (file)
--- a/Lib/encodings/iso8859_7.py
+++ b/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)

diff --git a/Lib/encodings/iso8859_8.py b/Lib/encodings/iso8859_8.py
index a19aa671cca45ffe1864f220953e6c8a156c83d6..45b2adac04e71ff429ab8c9952b4f7e7cd2f7541 100644 (file)
--- a/Lib/encodings/iso8859_8.py
+++ b/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)

diff --git a/Lib/encodings/iso8859_9.py b/Lib/encodings/iso8859_9.py
index a27890507a326701f6bd0500147c6be352fe7d05..ad0c19083d1a7ef958ee9b3079910b1910ecc98e 100644 (file)
--- a/Lib/encodings/iso8859_9.py
+++ b/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)

diff --git a/Lib/encodings/koi8_r.py b/Lib/encodings/koi8_r.py
index c28004ef6ecee37f36dc9101775860bd6de793a3..242d0c448afb1326a6ac9ed0daedac483cdf90b2 100644 (file)
--- a/Lib/encodings/koi8_r.py
+++ b/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)

diff --git a/Lib/encodings/mac_cyrillic.py b/Lib/encodings/mac_cyrillic.py
index 45528319b22e6deaf0aa77fa17194693f1d65b4b..6ae4a30e0ebb7a7610437ff95a7763ca42f01e03 100644 (file)
--- a/Lib/encodings/mac_cyrillic.py
+++ b/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)

diff --git a/Lib/encodings/mac_greek.py b/Lib/encodings/mac_greek.py
index b7040c4bc4fe69842d96ce218540f934138ae217..839cf613c68c3cdff8ddc8318e83794593d4992a 100644 (file)
--- a/Lib/encodings/mac_greek.py
+++ b/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)

diff --git a/Lib/encodings/mac_iceland.py b/Lib/encodings/mac_iceland.py
index f20e1344fbabe1477122746143335dfc48bee8a8..284580cf9b3fe4bad64d507aa6227e564627b2bb 100644 (file)
--- a/Lib/encodings/mac_iceland.py
+++ b/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)

diff --git a/Lib/encodings/mac_latin2.py b/Lib/encodings/mac_latin2.py
index 0fba502cd6bfb75273a5b8f8a7e777b965e350a2..e9221781774d3aa47ac6bc4cec8fb23f98065c82 100644 (file)
--- a/Lib/encodings/mac_latin2.py
+++ b/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)

diff --git a/Lib/encodings/mac_roman.py b/Lib/encodings/mac_roman.py
index 6d048a3b6ea436b34718d561ebab3108abea3ed9..23dca89b415da63037b593226437164147349819 100644 (file)
--- a/Lib/encodings/mac_roman.py
+++ b/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)

diff --git a/Lib/encodings/mac_turkish.py b/Lib/encodings/mac_turkish.py
index c81a8646695cf4c59af13dd9b681143f2924ac72..c71268b7ee3e80c9b093c5bbcd8f1262367a4d5c 100644 (file)
--- a/Lib/encodings/mac_turkish.py
+++ b/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)

diff --git a/Lib/encodings/rot_13.py b/Lib/encodings/rot_13.py
index 8c54811bb3cb85e388d5ec3db63b72579e01f345..532ff646b75114ce2a2bd523ff67bb989c284aad 100644 (file)
--- a/Lib/encodings/rot_13.py
+++ b/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
 

diff --git a/Tools/scripts/gencodec.py b/Tools/scripts/gencodec.py
index bc70a32309e7e76717e369034cb6bb329195d801..69b6ede6c287824f7012737700e08d3ab4bc2c59 100644 (file)
--- a/Tools/scripts/gencodec.py
+++ b/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')