Rip out all codecs that can't work in a unicode/bytes world:

base64, uu, zlib, rot_13, hex, quopri, bz2, string_escape.

However codecs.escape_encode() and codecs.escape_decode()
still exist, as they are used for pickling str8 objects
(so those two functions can go, when the str8 type is removed).

1 files changed, 0 insertions, 74 deletions

diff --git a/Lib/encodings/quopri_codec.py b/Lib/encodings/quopri_codec.py
deleted file mode 100644
index b802ae62d2..0000000000
--- a/Lib/encodings/quopri_codec.py
+++ /dev/null
@@ -1,74 +0,0 @@
-"""Codec for quoted-printable encoding.
-
-Like base64 and rot13, this returns Python strings, not Unicode.
-"""
-
-import codecs, quopri
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
-
-def quopri_encode(input, errors='strict'):
-    """Encode the input, returning a tuple (output object, length consumed).
-
-    errors defines the error handling to apply. It defaults to
-    'strict' handling which is the only currently supported
-    error handling for this codec.
-
-    """
-    assert errors == 'strict'
-    f = StringIO(input)
-    g = StringIO()
-    quopri.encode(f, g, 1)
-    output = g.getvalue()
-    return (output, len(input))
-
-def quopri_decode(input, errors='strict'):
-    """Decode the input, returning a tuple (output object, length consumed).
-
-    errors defines the error handling to apply. It defaults to
-    'strict' handling which is the only currently supported
-    error handling for this codec.
-
-    """
-    assert errors == 'strict'
-    f = StringIO(input)
-    g = StringIO()
-    quopri.decode(f, g)
-    output = g.getvalue()
-    return (output, len(input))
-
-class Codec(codecs.Codec):
-
-    def encode(self, input,errors='strict'):
-        return quopri_encode(input,errors)
-    def decode(self, input,errors='strict'):
-        return quopri_decode(input,errors)
-
-class IncrementalEncoder(codecs.IncrementalEncoder):
-    def encode(self, input, final=False):
-        return quopri_encode(input, self.errors)[0]
-
-class IncrementalDecoder(codecs.IncrementalDecoder):
-    def decode(self, input, final=False):
-        return quopri_decode(input, self.errors)[0]
-
-class StreamWriter(Codec, codecs.StreamWriter):
-    pass
-
-class StreamReader(Codec,codecs.StreamReader):
-    pass
-
-# encodings module API
-
-def getregentry():
-    return codecs.CodecInfo(
-        name='quopri',
-        encode=quopri_encode,
-        decode=quopri_decode,
-        incrementalencoder=IncrementalEncoder,
-        incrementaldecoder=IncrementalDecoder,
-        streamwriter=StreamWriter,
-        streamreader=StreamReader,
-    )