Fix #883466: don't allow Unicode as arguments to quopri and uu codecs.
diff --git a/Lib/encodings/quopri_codec.py b/Lib/encodings/quopri_codec.py
index b802ae6..d8683fd 100644
--- a/Lib/encodings/quopri_codec.py
+++ b/Lib/encodings/quopri_codec.py
@@ -18,7 +18,8 @@
"""
assert errors == 'strict'
- f = StringIO(input)
+ # using str() because of cStringIO's Unicode undesired Unicode behavior.
+ f = StringIO(str(input))
g = StringIO()
quopri.encode(f, g, 1)
output = g.getvalue()
@@ -33,7 +34,7 @@
"""
assert errors == 'strict'
- f = StringIO(input)
+ f = StringIO(str(input))
g = StringIO()
quopri.decode(f, g)
output = g.getvalue()
diff --git a/Lib/encodings/uu_codec.py b/Lib/encodings/uu_codec.py
index 43fb93c..fb03758 100644
--- a/Lib/encodings/uu_codec.py
+++ b/Lib/encodings/uu_codec.py
@@ -25,7 +25,8 @@
assert errors == 'strict'
from cStringIO import StringIO
from binascii import b2a_uu
- infile = StringIO(input)
+ # using str() because of cStringIO's Unicode undesired Unicode behavior.
+ infile = StringIO(str(input))
outfile = StringIO()
read = infile.read
write = outfile.write
@@ -60,7 +61,7 @@
assert errors == 'strict'
from cStringIO import StringIO
from binascii import a2b_uu
- infile = StringIO(input)
+ infile = StringIO(str(input))
outfile = StringIO()
readline = infile.readline
write = outfile.write