4b31818042
merge 3.2
2011-03-16 17:28:51 -04:00
04055f0cf9
Merged with hg.python.org.
2011-03-16 17:09:41 -04:00
da9ac728a8
Bump up the subprocess timeouts even more. :(
2011-03-16 17:08:21 -04:00
2b228f0d9b
Include the timeout value in TimeoutExpired.
...
This was the original intention, but it wasn't threaded all the way through due
to 'endtime'. Also added a trivial assertion to get coverage of __str__.
2011-03-16 16:57:54 -04:00
bb35299fcd
Merge #9298 fix.
2011-03-16 16:14:43 -04:00
3271daa00d
Dummy merge
2011-03-16 20:42:27 +01:00
252183e4b6
Record backport of string.py patch and add credit to NEWS
2011-03-16 14:37:06 -04:00
bffbd17a0e
Dummy merge
2011-03-16 14:20:30 -04:00
35ec8a4806
Merge NEWS entries from 3.2
2011-03-16 14:18:29 -04:00
e047f66644
Merge fix for #11560 from 3.2
2011-03-16 14:06:31 -04:00
1d7a8879c6
Merge from remote
2011-03-16 13:55:58 -04:00
7bfa67f380
Merge fix for #11548 from 3.2
2011-03-16 13:55:03 -04:00
ba102ec10d
Issue #5870 : Add subprocess.DEVNULL constant.
2011-03-16 18:40:25 +02:00
09bb8f46aa
merge 3.2
2011-03-16 10:29:37 -05:00
c1577902c6
Fix typo in subprocess documentation.
2011-03-16 10:03:10 -04:00
4d5fe33a70
Merge with 3.2
2011-03-16 09:44:26 -04:00
e371ad65f3
Merge with 3.2.
2011-03-16 12:52:57 +02:00
b88ed1549e
#11565 : Merge with 3.2.
2011-03-16 11:38:59 +02:00
c8a03349d1
Dummy merge
2011-03-16 02:35:37 +01:00
f7156af5a9
Merge
2011-03-15 18:21:00 -07:00
a2e7814b2d
Forward port doc update.
2011-03-15 18:19:52 -07:00
607476bf1d
Merge: Close issue #8600 : test_gdb failures because innocuous warnings
2011-03-16 01:34:29 +01:00
ed1fce2ee5
merge 3.2
2011-03-15 19:22:19 -04:00
55afb1a263
Undo an accidental commit.
2011-03-15 18:48:52 -04:00
f47e3ac7b7
merge
2011-03-15 18:45:59 -04:00
b8daeda523
merge
2011-03-15 18:45:38 -04:00
e73b2bb415
Be more thorough in blanking out methods grabbed off of an fp.
2011-03-15 18:45:13 -04:00
72d4693336
merge
2011-03-15 18:38:41 -04:00
b2874b7a4c
Changes to Wing IDE project file. Merge of peepholer changesets that were applied separately.
2011-03-15 18:38:09 -04:00
5bd75b8726
whitespace fix
2011-03-15 15:07:38 -07:00
f932f747e6
whitespace fix
2011-03-15 15:06:09 -07:00
0661e91fed
Issue 11510: Fix BUILD_SET optimizer bug.
2011-03-15 15:03:36 -07:00
31f218bc6b
Merge #11216 : document all possible set_charset execution paths.
2011-03-15 17:43:21 -04:00
b637680f7e
Properly close a file in test_os.
2011-03-15 17:38:22 -04:00
ee877a08e9
Don't leave around a test symlink file.
2011-03-15 17:32:14 -04:00
f434ba9e4e
merge
2011-03-15 17:23:21 -04:00
f30645d552
Close a stream properly in test.test_pulldom.
...
Closes issue #11550 . Thanks to Ben Hayden for some inspiration on the
solution.
2011-03-15 17:22:52 -04:00
765dcdede8
Merge
2011-03-15 22:06:42 +01:00
47afc2af79
PyErr_Print can leave sys.last_traceback hanging around; kill it
2011-03-15 15:54:50 -05:00
8af4919b37
merge heads
2011-03-15 15:21:03 -05:00
c217a4b71a
should use 'is' here
2011-03-15 15:18:47 -05:00
8213cafd62
Merge
2011-03-15 21:10:33 +01:00
0de5fc51ff
merge 3.2
2011-03-15 15:10:29 -05:00
0e63f59492
Merge fix for issue #11501
2011-03-15 21:08:50 +01:00
ffd1f48306
merge heads
2011-03-15 15:08:05 -05:00
485119eb1e
kill PY_PATCHLEVEL_REVISION
2011-03-15 15:07:20 -05:00
bb375d66b8
merge 3.2
2011-03-15 15:05:22 -05:00
d3967d4cca
merge head
2011-03-15 16:04:54 -04:00
31a248bded
Misc/NEWS entry for issue 11432
2011-03-15 16:04:15 -04:00
71f1363c34
merge
2011-03-15 16:03:32 -04:00
Michael Foord
Reid Kleckner
R David Murray
Jesus Cea
Nick Coghlan
Ross Lagerwall
Benjamin Peterson
Ronald Oussoren
Ezio Melotti
Raymond Hettinger
Brett Cannon
Antoine Pitrou
Gregory P. Smith