From: Marc-André Lemburg Date: Wed, 16 May 2001 09:41:45 +0000 (+0000) Subject: Moved the encoding map building logic from the individual mapping X-Git-Tag: v2.2a3~1766 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=716cf918390f86c69fb1525e13273570521da759;p=thirdparty%2FPython%2Fcpython.git 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 b2eab1db3a49..bdc8d029da43 100644 --- 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 5868372b077b..3b641bb0e946 100644 --- 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 593fbb601ccf..0a3c3af32139 100644 --- 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 3796a75c093c..cce5af6a4a27 100644 --- 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 03a3e3177d85..39cbc3375d5b 100644 --- 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 e27a122c3829..4d4b6ee9b42c 100644 --- 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 5d7bdd63969b..647f907287a3 100644 --- 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 abc144cc04d0..bfb4723b5897 100644 --- 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 4a2ab3caf472..dc662ed243fe 100644 --- 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 c987b85f45e7..6f70654f614d 100644 --- 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 d72c5bcc9bbd..40ed577a8544 100644 --- 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 d17a90421709..baaf367b517b 100644 --- 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 597f12438c96..9a2827dc1836 100644 --- 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 bc10379808dc..4689996d665b 100644 --- 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 db1b88a56794..a55e4246d95d 100644 --- 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 1c8fb57e1746..bc1acde4728a 100644 --- 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 03665aea7d19..6174d851a1eb 100644 --- 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 b38ccb5fe3eb..ee56f01f5b0a 100644 --- 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 e26287b7f3b1..dd2318721e96 100644 --- 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 431d8448f7eb..38df00f6fcc9 100644 --- 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 c9e71687bdee..764fe1ac72b2 100644 --- 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 cc2e01f45af1..9d09c091614c 100644 --- 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 6f4df23a5689..5c84bb83188e 100644 --- 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 057d91870f3b..a721ea3d46da 100644 --- 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 8db3b40b243e..ccf26b70dc0d 100644 --- 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 1cac3e278a5f..8f6d111e7899 100644 --- 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 ecdc391f74f8..3596e645cc76 100644 --- 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 861fb00111e1..f510a269e8dd 100644 --- 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 4d9010df8fb5..cc4f719cb70f 100644 --- 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 6a8b0b075208..518eede0adb6 100644 --- 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 65d2b2e1d09d..2e3ad35c1c50 100644 --- 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 31f4d3d6d4c8..c43e20be0f11 100644 --- 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 3500446930a4..5e748734b5f1 100644 --- 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 f4c0bf750f26..cea22611ac3f 100644 --- 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 c43c65306a27..f29ebd237fe8 100644 --- 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 2ab52927ec38..e0c4ae475360 100644 --- 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 5533e9617a98..c84bb23e7f98 100644 --- 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 7bffff42b880..bf92acb2918d 100644 --- 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 481f9a0a6cbe..1c92a54274d4 100644 --- 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 c2820ad6addd..ac8c8d91c298 100644 --- 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 30d6ca6805d5..91db12613bce 100644 --- 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 2bdaa5003c03..96cb0734f2e7 100644 --- 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 585fa11e5d36..298c2d53fe04 100644 --- 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 48f1bd58dbc3..eea3abf2eb01 100644 --- 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 a19aa671cca4..45b2adac04e7 100644 --- 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 a27890507a32..ad0c19083d1a 100644 --- 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 c28004ef6ece..242d0c448afb 100644 --- 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 45528319b22e..6ae4a30e0ebb 100644 --- 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 b7040c4bc4fe..839cf613c68c 100644 --- 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 f20e1344fbab..284580cf9b3f 100644 --- 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 0fba502cd6bf..e9221781774d 100644 --- 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 6d048a3b6ea4..23dca89b415d 100644 --- 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 c81a8646695c..c71268b7ee3e 100644 --- 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 8c54811bb3cb..532ff646b751 100644 --- 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 bc70a32309e7..69b6ede6c287 100644 --- 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')