From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Thu, 12 Jun 2008 01:13:54 +0000 (+0000)
Subject: Fixed test_tempfile.
X-Git-Tag: v3.0b1~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ade6f9007d72adaad0979721b2f39303c71618f;p=thirdparty%2FPython%2Fcpython.git

Fixed test_tempfile.
Added the encoding, errors, line_buffering attribute to io.StringIO
make more compatible with TextIOWrapper's API.
---

diff --git a/Lib/io.py b/Lib/io.py
index f543e2007e42..ef0ce1a70f0e 100644
--- a/Lib/io.py
+++ b/Lib/io.py
@@ -1839,6 +1839,22 @@ try:
             raise UnsupportedOperation("%s.buffer attribute is unsupported" %
                                        self.__class__.__name__)
 
+        # XXX Cruft to support the TextIOWrapper API. This would only
+        # be meaningful if StringIO supported the buffer attribute.
+        # Hopefully, a better solution, than adding these pseudo-attributes,
+        # will be found.
+        @property
+        def encoding(self):
+            return "utf-8"
+
+        @property
+        def errors(self):
+            return "strict"
+
+        @property
+        def line_buffering(self):
+            return False
+
         def _decode_newlines(self, input, final=False):
             # decode input (with the eventual \r from a previous pass)
             if self._pending:
diff --git a/Lib/tempfile.py b/Lib/tempfile.py
index 2caa56ad45f1..74e3cb2b568c 100644
--- a/Lib/tempfile.py
+++ b/Lib/tempfile.py
@@ -502,7 +502,7 @@ class SpooledTemporaryFile:
             # Setting newline="\n" avoids newline translation;
             # this is important because otherwise on Windows we'd
             # hget double newline translation upon rollover().
-            self._file = _io.StringIO(encoding=encoding, newline="\n")
+            self._file = _io.StringIO(newline="\n")
         self._max_size = max_size
         self._rolled = False
         self._TemporaryFileArgs = {'mode': mode, 'buffering': buffering,