summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-01-02 19:50:36 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-01-02 19:50:36 (GMT)
commitb6f424043d267eac9c870d9991a6453a821ff81d (patch)
treefdd0ffec85c52515725efc3a31aaf7cc1ee92df9
parentc224458ef699e0306162a351ca7454b4d486c635 (diff)
downloadcpython-b6f424043d267eac9c870d9991a6453a821ff81d.zip
cpython-b6f424043d267eac9c870d9991a6453a821ff81d.tar.gz
cpython-b6f424043d267eac9c870d9991a6453a821ff81d.tar.bz2
Issue #10807: Remove base64, bz2, hex, quopri, rot13, uu and zlib codecs from
the codec aliases. They are still accessible via codecs.lookup().
-rw-r--r--Lib/encodings/aliases.py36
-rw-r--r--Misc/NEWS3
2 files changed, 21 insertions, 18 deletions
diff --git a/Lib/encodings/aliases.py b/Lib/encodings/aliases.py
index 331095b..235deb5 100644
--- a/Lib/encodings/aliases.py
+++ b/Lib/encodings/aliases.py
@@ -33,9 +33,9 @@ aliases = {
'us' : 'ascii',
'us_ascii' : 'ascii',
- # base64_codec codec
- 'base64' : 'base64_codec',
- 'base_64' : 'base64_codec',
+ ## base64_codec codec
+ #'base64' : 'base64_codec',
+ #'base_64' : 'base64_codec',
# big5 codec
'big5_tw' : 'big5',
@@ -45,8 +45,8 @@ aliases = {
'big5_hkscs' : 'big5hkscs',
'hkscs' : 'big5hkscs',
- # bz2_codec codec
- 'bz2' : 'bz2_codec',
+ ## bz2_codec codec
+ #'bz2' : 'bz2_codec',
# cp037 codec
'037' : 'cp037',
@@ -248,8 +248,8 @@ aliases = {
'cp936' : 'gbk',
'ms936' : 'gbk',
- # hex_codec codec
- 'hex' : 'hex_codec',
+ ## hex_codec codec
+ #'hex' : 'hex_codec',
# hp_roman8 codec
'roman8' : 'hp_roman8',
@@ -450,13 +450,13 @@ aliases = {
'cp154' : 'ptcp154',
'cyrillic_asian' : 'ptcp154',
- # quopri_codec codec
- 'quopri' : 'quopri_codec',
- 'quoted_printable' : 'quopri_codec',
- 'quotedprintable' : 'quopri_codec',
+ ## quopri_codec codec
+ #'quopri' : 'quopri_codec',
+ #'quoted_printable' : 'quopri_codec',
+ #'quotedprintable' : 'quopri_codec',
- # rot_13 codec
- 'rot13' : 'rot_13',
+ ## rot_13 codec
+ #'rot13' : 'rot_13',
# shift_jis codec
'csshiftjis' : 'shift_jis',
@@ -518,12 +518,12 @@ aliases = {
'utf8_ucs2' : 'utf_8',
'utf8_ucs4' : 'utf_8',
- # uu_codec codec
- 'uu' : 'uu_codec',
+ ## uu_codec codec
+ #'uu' : 'uu_codec',
- # zlib_codec codec
- 'zip' : 'zlib_codec',
- 'zlib' : 'zlib_codec',
+ ## zlib_codec codec
+ #'zip' : 'zlib_codec',
+ #'zlib' : 'zlib_codec',
# temporary mac CJK aliases, will be replaced by proper codecs in 3.1
'x_mac_japanese' : 'shift_jis',
diff --git a/Misc/NEWS b/Misc/NEWS
index 50da49c..2029f1b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -20,6 +20,9 @@ Core and Builtins
Library
-------
+- Issue #10807: Remove base64, bz2, hex, quopri, rot13, uu and zlib codecs from
+ the codec aliases. They are still accessible via codecs.lookup().
+
- Issue #10801: In zipfile, support different encodings for the header and
the filenames.