Benjamin Peterson
2ae5cffb3a
merge 3.1
2011-03-06 18:04:10 -06:00
Benjamin Peterson
d86e4c8673
only do this sys.stderr replacing on CPython
2011-03-06 17:14:30 -06:00
Thomas Wouters
6b1034392c
Merge 3.1.
2011-03-06 11:51:24 -08:00
Thomas Wouters
81638f1351
Issue #11411: Fix typo in the Makefile that prevented 'make DESTDIR=' from
...
working correctly with a relative path.
2011-03-06 11:49:15 -08:00
Martin v. Löwis
bb3e937a18
Convert DOS files to CRLF. This doesn't touch the .hgeol settings, so that the files
...
will have the right line ending even if the extension is not active.
2011-03-06 12:23:39 +01:00
Martin v. Löwis
21967d0b4d
Convert DOS files to CRLF. This doesn't touch the .hgeol settings, so that the files
...
will have the right line ending even if the extension is not active.
2011-03-06 11:28:23 +01:00
Georg Brandl
891391bf68
Merge doc fixes.
2011-03-06 11:12:42 +01:00
Georg Brandl
1d0a0f5060
#11294: add missing ERA_T_FMT to locale docs.
2011-03-06 11:09:51 +01:00
Georg Brandl
931e5c1038
#11292: add missing A_REVERSE to curses attribute table.
2011-03-06 11:08:35 +01:00
Georg Brandl
a2388be2af
#11239: add } to list of metacharacters (it is only a metacharacter sometimes, ie. when closing a {n,m} group, but so is ].
2011-03-06 11:07:11 +01:00
Georg Brandl
45ec333c72
#11227: use Host header in asyncore example.
2011-03-06 11:05:03 +01:00
Georg Brandl
12a6153aee
#11373: fix spelling.
2011-03-06 10:57:52 +01:00
Georg Brandl
3640e18d90
#11405: do not reference the string module again for its deprecated functions, only for Template class.
2011-03-06 10:56:18 +01:00
Georg Brandl
da2271939a
#11392: you can trust the computer, but you have to know what it does.
2011-03-06 10:53:55 +01:00
Georg Brandl
e32acd0d79
#11337: remove unreferenced footnote.
2011-03-06 10:51:18 +01:00
Georg Brandl
310337f828
#11400: remove reference to pre-1.5 assignment behavior.
2011-03-06 10:48:43 +01:00
Georg Brandl
13039c87f1
Merge build identification to 3.2 branch.
2011-03-06 10:13:00 +01:00
Antoine Pitrou
80d3610bc3
Merge fix for issue #11391
2011-03-06 01:50:56 +01:00
Antoine Pitrou
7b50c2c6ae
Fix buildbot failure following 97a5590b9291
2011-03-06 01:47:18 +01:00
Antoine Pitrou
16a0a0b0a0
Issue #11391: Writing to a mmap object created with
...
`mmap.PROT_READ|mmap.PROT_EXEC` would segfault instead of raising a
TypeError. Patch by Charles-François Natali.
2011-03-06 01:11:03 +01:00
Antoine Pitrou
d1b1991fd4
Lib/email/test/data/msg_26.txt had its line endings wrong in the SVN repository.
...
(they were probably converted right in working copies through an SVN property)
2011-03-05 21:49:50 +01:00
Georg Brandl
8256242b30
Adapt platform and test_platform to the build identification changes.
2011-03-05 21:09:22 +01:00
Georg Brandl
1ca2e7965c
Commit the hg build identification patch from the pymigr repo.
2011-03-05 20:51:24 +01:00
Georg Brandl
776e2d4d22
Merge tags from 3.1.
2011-03-05 20:30:52 +01:00
Georg Brandl
3c2ccf2936
More tag fixups.
2011-03-05 20:29:01 +01:00
Georg Brandl
766f1645ee
Dummy-merge 3.1 branch into 3.2 branch.
2011-03-05 15:15:55 +01:00
Georg Brandl
49857f8a93
Add updated .hgeol file and fix newlines in the 3.2 branch.
2011-03-05 15:11:35 +01:00
Georg Brandl
b2a39da238
Fix tag references in 3.2 branch.
2011-03-05 15:11:23 +01:00
Georg Brandl
5537d298ea
Add updated .hgeol file and fix newlines in the 3.1 branch.
2011-03-05 15:10:38 +01:00
Georg Brandl
6e63a41801
Fix tag references in 3.1 branch.
2011-03-05 15:10:23 +01:00
Eli Bendersky
e0c8635d89
Merged revisions 88735 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88735 | eli.bendersky | 2011-03-04 06:55:25 +0200 (Fri, 04 Mar 2011) | 2 lines
Issue #11386: Fixed the exception thrown by bytearray.pop() for empty bytearrays
........
2011-03-04 05:10:57 +00:00
R. David Murray
752b950e6b
Merged revisions 88730 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88730 | r.david.murray | 2011-03-03 13:03:36 -0500 (Thu, 03 Mar 2011) | 2 lines
#11306: Treat EROFS like EACCES when making a 'file is read-only' decision
........
2011-03-03 18:12:34 +00:00
Giampaolo Rodolà
00a4286591
Merged revisions 88726 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88726 | giampaolo.rodola | 2011-03-03 15:10:58 +0100 (gio, 03 mar 2011) | 1 line
fix attribute error
........
2011-03-03 14:11:46 +00:00
Giampaolo Rodolà
2f95dc0225
Merged revisions 88722 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88722 | giampaolo.rodola | 2011-03-03 14:57:47 +0100 (gio, 03 mar 2011) | 1 line
Fix issue 11265: asyncore now correctly handles EPIPE, EBADF and EAGAIN errors on accept(), recv() and send().
........
2011-03-03 14:09:45 +00:00
Giampaolo Rodolà
9c9105dc81
Merged revisions 88722 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88722 | giampaolo.rodola | 2011-03-03 14:57:47 +0100 (gio, 03 mar 2011) | 1 line
Fix issue 11265: asyncore now correctly handles EPIPE, EBADF and EAGAIN errors on accept(), recv() and send().
........
2011-03-03 13:59:28 +00:00
Fred Drake
c7eb7894d3
Merged revisions 88717 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88717 | fred.drake | 2011-03-03 00:27:17 -0500 (Thu, 03 Mar 2011) | 2 lines
issue 11372: use range instead of xrange
........
2011-03-03 05:29:59 +00:00
Victor Stinner
f0e293cbcd
Merged revisions 88700 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88700 | victor.stinner | 2011-03-02 00:08:36 +0100 (mer., 02 mars 2011) | 3 lines
Issue #10911: Add tests on CGI with non-ASCII characters
Patch written by Pierre Quentel
........
2011-03-01 23:09:57 +00:00
Victor Stinner
2b574a2332
Merged revisions 88697 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88697 | victor.stinner | 2011-03-01 23:46:52 +0100 (mar., 01 mars 2011) | 4 lines
Issue #11246: Fix PyUnicode_FromFormat("%V")
Decode the byte string from UTF-8 (with replace error handler) instead of
ISO-8859-1 (in strict mode). Patch written by Ray Allen.
........
2011-03-01 22:48:49 +00:00
Antoine Pitrou
d84dfee7c1
Merged revisions 88691 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88691 | antoine.pitrou | 2011-03-01 01:41:10 +0100 (mar., 01 mars 2011) | 3 lines
Endly, fix UnboundLocalError in telnetlib
........
2011-03-01 00:45:22 +00:00
Antoine Pitrou
88f416e425
Apparently, skipUnless() doesn't prevent the execution of
...
setUp() under 3.1.
2011-03-01 00:29:11 +00:00
Antoine Pitrou
9e719b6eba
Merged revisions 88460,88464,88466,88486,88511,88652 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88460 | antoine.pitrou | 2011-02-21 19:03:13 +0100 (lun., 21 févr. 2011) | 4 lines
Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers
larger than 4GB. Patch by Nadeem Vawda.
........
r88464 | antoine.pitrou | 2011-02-21 20:05:08 +0100 (lun., 21 févr. 2011) | 3 lines
Fix issues on 32-bit systems introduced by r88460
........
r88466 | antoine.pitrou | 2011-02-21 20:28:40 +0100 (lun., 21 févr. 2011) | 3 lines
Fix compile error under MSVC introduced by r88460.
........
r88486 | antoine.pitrou | 2011-02-22 00:41:12 +0100 (mar., 22 févr. 2011) | 5 lines
Issue #4681: Allow mmap() to work on file sizes and offsets larger than
4GB, even on 32-bit builds. Initial patch by Ross Lagerwall, adapted for
32-bit Windows.
........
r88511 | antoine.pitrou | 2011-02-22 22:42:56 +0100 (mar., 22 févr. 2011) | 4 lines
Issue #11277: finally fix Snow Leopard crash following r88460.
(probably an OS-related issue with mmap)
........
r88652 | antoine.pitrou | 2011-02-26 16:58:05 +0100 (sam., 26 févr. 2011) | 4 lines
Issue #9931: Fix hangs in GUI tests under Windows in certain conditions.
Patch by Hirokazu Yamamoto.
........
2011-02-28 23:48:16 +00:00
Antoine Pitrou
6120d87d32
Merged revisions 88686 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88686 | antoine.pitrou | 2011-02-28 23:38:07 +0100 (lun., 28 févr. 2011) | 4 lines
Recommend inspecting the errno attribute of socket.error objects,
and improve wording.
........
2011-02-28 23:03:28 +00:00
Antoine Pitrou
d1c9845b54
Merged revisions 88671 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88671 | antoine.pitrou | 2011-02-27 16:44:12 +0100 (dim., 27 févr. 2011) | 3 lines
Follow up to r88664: non-blocking connect-ex() can return EWOULDBLOCK under Windows
........
2011-02-27 15:45:16 +00:00
Benjamin Peterson
f3352e7c1f
Merged revisions 88668 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88668 | benjamin.peterson | 2011-02-27 09:06:44 -0600 (Sun, 27 Feb 2011) | 1 line
make this a link #11345
........
2011-02-27 15:15:06 +00:00
Antoine Pitrou
86cbfec50a
Merged revisions 88664 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88664 | antoine.pitrou | 2011-02-27 00:24:06 +0100 (dim., 27 févr. 2011) | 4 lines
Issue #11326: Add the missing connect_ex() implementation for SSL sockets,
and make it work for non-blocking connects.
........
2011-02-26 23:25:34 +00:00
Benjamin Peterson
849272bf02
Merged revisions 88658 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88658 | benjamin.peterson | 2011-02-26 15:32:16 -0600 (Sat, 26 Feb 2011) | 1 line
this isn't true anymore
........
2011-02-26 21:34:51 +00:00
Antoine Pitrou
4914f9e4e2
Merged revisions 88652 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88652 | antoine.pitrou | 2011-02-26 16:58:05 +0100 (sam., 26 févr. 2011) | 4 lines
Issue #9931: Fix hangs in GUI tests under Windows in certain conditions.
Patch by Hirokazu Yamamoto.
........
2011-02-26 16:49:08 +00:00
Vinay Sajip
89807a5277
Issue #11330: Updated tests for correct asctime handling.
2011-02-26 16:06:02 +00:00
Vinay Sajip
ed0473cfaf
Issue #9941: Fixed TimedRotatingHandler test issues.
2011-02-26 15:35:38 +00:00
Éric Araujo
6c04569ada
Typos
2011-02-26 14:48:42 +00:00