From: Georg Brandl <georg@python.org>
Date: Mon, 3 Sep 2007 07:16:46 +0000 (+0000)
Subject: Fix #883466: don't allow Unicode as arguments to quopri and uu codecs.
X-Git-Tag: v2.6a1~1354
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cdceac76031a7b29f8b60dcffc57744b84f4db3;p=thirdparty%2FPython%2Fcpython.git

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 b802ae62d2a2..d8683fd56d32 100644
--- a/Lib/encodings/quopri_codec.py
+++ b/Lib/encodings/quopri_codec.py
@@ -18,7 +18,8 @@ def quopri_encode(input, errors='strict'):
 
     """
     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 @@ def quopri_decode(input, errors='strict'):
 
     """
     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 43fb93c1b7f4..fb03758171d1 100644
--- a/Lib/encodings/uu_codec.py
+++ b/Lib/encodings/uu_codec.py
@@ -25,7 +25,8 @@ def uu_encode(input,errors='strict',filename='<data>',mode=0666):
     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 @@ def uu_decode(input,errors='strict'):
     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