summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-08-11 18:37:05 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-08-11 18:37:05 (GMT)
commit1e50a9f7cc68aefdf94ad02bc3e62fee2f447208 (patch)
tree32b95ad67a4f2b5f4aa659cf18e617b95a8240aa
parent9264ecd799eac87c160dcac47d782b092f09d747 (diff)
downloadcpython-1e50a9f7cc68aefdf94ad02bc3e62fee2f447208.zip
cpython-1e50a9f7cc68aefdf94ad02bc3e62fee2f447208.tar.gz
cpython-1e50a9f7cc68aefdf94ad02bc3e62fee2f447208.tar.bz2
Fix test_wsgiref that used StringIO and a BufferedReader rather than
real files. This code assumed that fileno() would succeed which wasn't the case.
-rw-r--r--Lib/io.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/io.py b/Lib/io.py
index b24a21c..2f2d3c5 100644
--- a/Lib/io.py
+++ b/Lib/io.py
@@ -34,6 +34,7 @@ import os
import sys
import codecs
import _fileio
+import io
import warnings
# XXX Shouldn't we use st_blksize whenever we can?
@@ -973,7 +974,7 @@ class TextIOWrapper(TextIOBase):
if encoding is None:
try:
encoding = os.device_encoding(buffer.fileno())
- except AttributeError:
+ except (AttributeError, io.UnsupportedOperation):
pass
if encoding is None:
try: