[Python-3000-checkins] r57593 - in python/branches/py3k/Lib: cgi.py test/test_cgi.py
guido.van.rossum
python-3000-checkins at python.org
Tue Aug 28 05:11:34 CEST 2007
Author: guido.van.rossum
Date: Tue Aug 28 05:11:34 2007
New Revision: 57593
Modified:
python/branches/py3k/Lib/cgi.py
python/branches/py3k/Lib/test/test_cgi.py
Log:
Make test_cgi pass. I changed the internal file created by make_file()
to be a text file. (XXX It should use UTF-8 as the encoding.)
I also removed the unised 'binary' argument from the make_file() signature.
XXX I am under no illusion that this is now working; I're pretty sure
it would be more principled if it always read binary data. But that's
for someone who actually cares about this module.
Modified: python/branches/py3k/Lib/cgi.py
==============================================================================
--- python/branches/py3k/Lib/cgi.py (original)
+++ python/branches/py3k/Lib/cgi.py Tue Aug 28 05:11:34 2007
@@ -662,7 +662,7 @@
def read_binary(self):
"""Internal: read binary data."""
- self.file = self.make_file('b')
+ self.file = self.make_file()
todo = self.length
if todo >= 0:
while todo > 0:
@@ -684,8 +684,9 @@
def __write(self, line):
if self.__file is not None:
if self.__file.tell() + len(line) > 1000:
- self.file = self.make_file('')
- self.file.write(self.__file.getvalue())
+ self.file = self.make_file()
+ data = self.__file.getvalue()
+ self.file.write(data)
self.__file = None
self.file.write(line)
@@ -751,7 +752,7 @@
break
last_line_lfend = line.endswith('\n')
- def make_file(self, binary=None):
+ def make_file(self):
"""Overridable: return a readable & writable file.
The file will be used as follows:
@@ -759,8 +760,7 @@
- seek(0)
- data is read from it
- The 'binary' argument is unused -- the file is always opened
- in binary mode.
+ The file is always opened in text mode.
This version opens a temporary file for reading and writing,
and immediately deletes (unlinks) it. The trick (on Unix!) is
@@ -776,7 +776,7 @@
"""
import tempfile
- return tempfile.TemporaryFile("w+b")
+ return tempfile.TemporaryFile("w+")
@@ -946,8 +946,7 @@
def print_environ(environ=os.environ):
"""Dump the shell environment as HTML."""
- keys = environ.keys()
- keys.sort()
+ keys = sorted(environ.keys())
print()
print("<H3>Shell Environment:</H3>")
print("<DL>")
@@ -958,8 +957,7 @@
def print_form(form):
"""Dump the contents of a form as HTML."""
- keys = form.keys()
- keys.sort()
+ keys = sorted(form.keys())
print()
print("<H3>Form Contents:</H3>")
if not keys:
Modified: python/branches/py3k/Lib/test/test_cgi.py
==============================================================================
--- python/branches/py3k/Lib/test/test_cgi.py (original)
+++ python/branches/py3k/Lib/test/test_cgi.py Tue Aug 28 05:11:34 2007
@@ -231,8 +231,8 @@
setattr(self, name, a)
return a
- f = TestReadlineFile(tempfile.TemporaryFile())
- f.write(b'x' * 256 * 1024)
+ f = TestReadlineFile(tempfile.TemporaryFile("w+"))
+ f.write('x' * 256 * 1024)
f.seek(0)
env = {'REQUEST_METHOD':'PUT'}
fs = cgi.FieldStorage(fp=f, environ=env)
More information about the Python-3000-checkins
mailing list