[Python-checkins] cpython (merge 3.2 -> 3.2): Merge

Mon Mar 21 00:29:25 CET 2011

http://hg.python.org/cpython/rev/c60271bb1fb1
changeset: 68778:c60271bb1fb1
branch: 3.2
parent: 68776:fa20590d4694
parent: 68772:8939a21bdb94
user: Antoine Pitrou <solipsis at pitrou.net>
date: Mon Mar 21 00:28:52 2011 +0100
summary:
 Merge
files:

diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -1282,7 +1282,7 @@
 you try to fetch a file whose read permissions make it inaccessible; the FTP
 code will try to read it, fail with a 550 error, and then perform a directory
 listing for the unreadable file. If fine-grained control is needed, consider
- using the :mod:`ftplib` module, subclassing :class:`FancyURLOpener`, or changing
+ using the :mod:`ftplib` module, subclassing :class:`FancyURLopener`, or changing
 *_urlopener* to meet your needs.
 
 
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -90,6 +90,25 @@
 self.assertEqual(fobj.read().splitlines(),
 [b"bacon", b"eggs", b"spam"])
 
+ def write_windows_console(self, *args):
+ retcode = subprocess.call(args,
+ # use a new console to not flood the test output
+ creationflags=subprocess.CREATE_NEW_CONSOLE,
+ # use a shell to hide the console window (SW_HIDE)
+ shell=True)
+ self.assertEqual(retcode, 0)
+
+ @unittest.skipUnless(sys.platform == 'win32',
+ 'test specific to the Windows console')
+ def test_write_windows_console(self):
+ # Issue #11395: the Windows console returns an error (12: not enough
+ # space error) on writing into stdout if stdout mode is binary and the
+ # length is greater than 66,000 bytes (or less, depending on heap
+ # usage).
+ code = "print('x' * 100000)"
+ self.write_windows_console(sys.executable, "-c", code)
+ self.write_windows_console(sys.executable, "-u", "-c", code)
+
 
 class TemporaryFileTests(unittest.TestCase):
 def setUp(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,12 @@
 Core and Builtins
 -----------------
 
+- Issue #11395: io.FileIO().write() clamps the data length to 32,767 bytes on
+ Windows if the file is a TTY to workaround a Windows bug. The Windows console
+ returns an error (12: not enough space error) on writing into stdout if
+ stdout mode is binary and the length is greater than 66,000 bytes (or less,
+ depending on heap usage).
+
 - Issue #11320: fix bogus memory management in Modules/getpath.c, leading to
 a possible crash when calling Py_SetPath().
 
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -712,7 +712,14 @@
 errno = 0;
 len = pbuf.len;
 #if defined(MS_WIN64) || defined(MS_WINDOWS)
- if (len > INT_MAX)
+ if (len > 32767 && isatty(self->fd)) {
+ /* Issue #11395: the Windows console returns an error (12: not
+ enough space error) on writing into stdout if stdout mode is
+ binary and the length is greater than 66,000 bytes (or less,
+ depending on heap usage). */
+ len = 32767;
+ }
+ else if (len > INT_MAX)
 len = INT_MAX;
 n = write(self->fd, pbuf.buf, (int)len);
 #else
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -147,7 +147,7 @@
 goto error;
 
 name_utf8 = _PyUnicode_AsString(name);
- if (name == NULL)
+ if (name_utf8 == NULL)
 goto error;
 name_str = strdup(name_utf8);
 Py_DECREF(name);
-- 
Repository URL: http://hg.python.org/cpython
