Benjamin Peterson
62f8bcb0a4
merge 3.1
2011-04-12 18:34:30 -05:00
Benjamin Peterson
abdeeff3d1
merge heads
2011-04-12 18:34:06 -05:00
Benjamin Peterson
bd3e362089
make assigning to a bytes literal a syntax error ( closes #11506 )
2011-04-12 18:33:28 -05:00
Senthil Kumaran
b17abb1af9
merge from 3.1
2011-04-13 07:22:29 +08:00
Senthil Kumaran
2643041970
Fix Issue11703 - urllib2.geturl() does not return correct url when the original url contains #fragment. Patch Contribution by Santoso Wijaya.
2011-04-13 07:01:19 +08:00
Raymond Hettinger
a3e449da37
Merge
2011-04-12 15:24:39 -07:00
Raymond Hettinger
f03d3028e0
Issue 11747: Fix output format for context diffs.
2011-04-12 15:19:33 -07:00
Raymond Hettinger
3780542039
Issue 11747: Fix output format for context diffs.
2011-04-12 15:14:12 -07:00
R David Murray
94f90dd4a1
Merge: Add maxlinelen to docstring, delete obsolete wording
2011-04-12 15:01:28 -04:00
R David Murray
308f14aeae
Add maxlinelen to docstring, delete obsolete wording
2011-04-12 15:00:44 -04:00
Antoine Pitrou
27be5da831
Issue #11815 : Remove dead code in concurrent.futures (since a blocking Queue
...
cannot raise queue.Empty).
2011-04-12 17:48:46 +02:00
Brian Curtin
35af9536ad
Dummy merge
2011-04-11 18:36:25 -05:00
Brian Curtin
84c209a1ef
Correct leading spaces in my NEWS entry.
2011-04-11 18:35:18 -05:00
brian.curtin
f7eac1ffb4
Add NEWS item for #5162 .
2011-04-11 18:18:20 -05:00
brian.curtin
628f980635
Add NEWS item for #5162 .
2011-04-11 18:09:24 -05:00
brian.curtin
727b498102
Fix #5162 . Allow child spawning from Windows services (via pywin32).
2011-04-11 17:57:59 -05:00
brian.curtin
e2f299845d
Fix #5162 . Allow child spawning from Windows services (via pywin32).
2011-04-11 17:56:23 -05:00
Raymond Hettinger
49353d0e8f
Issue #11747 : Fix range formatting in context and unified diffs.
2011-04-11 12:40:58 -07:00
Ezio Melotti
fdb2df49bd
Remove unnecessary call to PyErr_Clear.
2011-04-11 03:48:57 +03:00
Raymond Hettinger
47e120e70c
Cleanup and modernize code prior to working on Issue 11747.
2011-04-10 17:14:56 -07:00
Antoine Pitrou
bed9a5b6b3
Issue #11814 : Fix likely typo in multiprocessing.Pool._terminate().
2011-04-11 00:20:23 +02:00
Antoine Pitrou
81dee6b4d4
Issue #8428 : Fix a race condition in multiprocessing.Pool when terminating
...
worker processes: new processes would be spawned while the pool is being
shut down. Patch by Charles-François Natali.
2011-04-11 00:18:59 +02:00
Ross Lagerwall
810b94a364
Issue #11818 : Fix tempfile examples for Python 3.
2011-04-10 09:30:04 +02:00
Raymond Hettinger
dbb677a894
Beautify and modernize the SequenceMatcher example
2011-04-09 19:41:00 -07:00
Ned Deily
2604e33f30
Issue9670: Merge backout to 3.2.
2011-04-09 14:53:47 -07:00
Ned Deily
45e47e58ed
Issue9670: Back out changeset 378b40d71175; test fails on other platforms
...
and on OS X with pydebug.
2011-04-09 14:50:59 -07:00
Ned Deily
15012a67d2
Issue #9670 : merge with 3.2
2011-04-09 12:37:55 -07:00
Ned Deily
517ac72b00
Issue #9670 : Increase the default stack size for secondary threads on
...
Mac OS X and FreeBSD to reduce the chances of a crash instead of a
"maximum recursion depth" RuntimeError exception.
(Patch by Ronald Oussoren)
2011-04-09 12:32:12 -07:00
Ross Lagerwall
226580e6dc
Merge with 3.1
2011-04-09 20:05:04 +02:00
Ross Lagerwall
e620d10701
Issue #11719 : Fix message about unexpected test_msilib skip.
...
Patch by Nadeem Vawda.
2011-04-09 19:30:03 +02:00
Victor Stinner
a870e35a7d
(Merge 3.1) Issue #11650 : PyOS_StdioReadline() retries fgets() if it was
...
interrupted (EINTR), for example if the program is stopped with CTRL+z on Mac
OS X. Patch written by Charles-Francois Natali.
2011-04-09 15:59:25 +02:00
Victor Stinner
52c950f229
Issue #11650 : PyOS_StdioReadline() retries fgets() if it was interrupted
...
(EINTR), for example if the program is stopped with CTRL+z on Mac OS X. Patch
written by Charles-Francois Natali.
2011-04-09 15:55:44 +02:00
R David Murray
80221ed0c0
Merge #11492 : fix header truncation on folding when there are runs of split chars.
...
Not a complete fix for this issue.
2011-04-07 20:56:31 -04:00
R David Murray
e1292a25d8
#11492 : fix header truncation on folding when there are runs of split chars.
...
Not a complete fix for this issue.
2011-04-07 20:54:03 -04:00
R David Murray
b65df26830
Merge: Improve test coverage of _split_ascii method.
2011-04-07 20:40:01 -04:00
R David Murray
7da4db118e
Improve test coverage of _split_ascii method.
2011-04-07 20:37:17 -04:00
Vinay Sajip
77f8d2962c
Normalised whitespace.
2011-04-08 01:34:20 +01:00
Vinay Sajip
c46102c98a
Updated Formatter documentation.
2011-04-08 01:30:51 +01:00
Ezio Melotti
2e3607c1e7
#7311 : fix html.parser to accept non-ASCII attribute values.
2011-04-07 22:03:31 +03:00
Barry Warsaw
9b5ac3efa6
Refinement by Stefan Krah (see issue 11715, msg133194) to exit early if the
...
dpkg-architecture command is not found on $PATH. This should fix the failures
on FreeBSD and Solaris, which do not create the target file via I/O
redirection if the command isn't found (unlike Linux and OS X which do).
2011-04-07 10:45:07 -04:00
Barry Warsaw
88e194513e
Refinement by Stefan Krah (see issue 11715, msg133194) to exit early if the
...
dpkg-architecture command is not found on $PATH. This should fix the failures
on FreeBSD and Solaris, which do not create the target file via I/O
redirection if the command isn't found (unlike Linux and OS X which do).
2011-04-07 10:40:36 -04:00
Alexander Belopolsky
12338ab10b
Removed 'or long integer' from bin, oct, and hex docstrings.
2011-04-07 00:15:33 -04:00
Antoine Pitrou
540ab064e2
Issue #11766 : increase countdown waiting for a pool of processes to start
...
up. Hopefully fixes transient buildbot failures.
2011-04-06 22:51:17 +02:00
Barry Warsaw
3178b7dee1
Issue 11715: Merge multiarch fix from 3.1 branch.
2011-04-06 15:19:05 -04:00
Barry Warsaw
5ca305a599
Issue 11715: Build extension modules on multiarch Debian and Ubuntu by
...
extending search paths to include multiarch directories.
2011-04-06 15:18:12 -04:00
R David Murray
c5c1472895
#11605 : don't use set/get_payload in feedparser; they do conversions.
...
Really the whole API needs to be gone over to restore the
separation of concerns; but that's what email6 is about.
2011-04-06 08:13:02 -04:00
Senthil Kumaran
ae664fb528
Merge from 3.1
2011-04-06 14:11:09 +08:00
Senthil Kumaran
8f377a3bbe
Issue #10762 : Guard against invalid/non-supported format string '%f' on Windows. Patch Santoso Wijaya.
2011-04-06 12:54:06 +08:00
Alexander Belopolsky
b6f5ec7370
Issue #11576 : Fixed timedelta subtraction glitch on big timedelta values
2011-04-05 20:07:38 -04:00
Antoine Pitrou
04026cf56c
Try to fix sporadic test_multiprocessing failure
2011-04-05 18:12:15 +02:00