c90d02c917
merge from push conflict.
2011-04-13 09:39:35 +08:00
665b39803d
Merge update.
2011-04-13 09:36:31 +08:00
a8b0f9adfe
Merge updates
2011-04-13 09:35:37 +08:00
af87886d8d
merge update
2011-04-13 09:34:21 +08:00
f6445e8f41
Issue 11718: Teach IDLE's open module dialog to find packages.
2011-04-12 18:30:14 -07:00
6dc605735d
merge from 3.1
2011-04-13 09:21:42 +08:00
60f02a650e
Update the News for the fix to Issue11703.
2011-04-13 09:21:01 +08:00
d5315482e9
Merge #10019 : Fix regression relative to 2.6: add newlines if indent=0
...
Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
2011-04-12 21:09:18 -04:00
3dd02d62c9
#10019 : Fix regression relative to 2.6: add newlines if indent=0
...
Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
2011-04-12 21:02:45 -04:00
62f8bcb0a4
merge 3.1
2011-04-12 18:34:30 -05:00
abdeeff3d1
merge heads
2011-04-12 18:34:06 -05:00
bd3e362089
make assigning to a bytes literal a syntax error ( closes #11506 )
2011-04-12 18:33:28 -05:00
b17abb1af9
merge from 3.1
2011-04-13 07:22:29 +08:00
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
a3e449da37
Merge
2011-04-12 15:24:39 -07:00
f03d3028e0
Issue 11747: Fix output format for context diffs.
2011-04-12 15:19:33 -07:00
3780542039
Issue 11747: Fix output format for context diffs.
2011-04-12 15:14:12 -07:00
94f90dd4a1
Merge: Add maxlinelen to docstring, delete obsolete wording
2011-04-12 15:01:28 -04:00
308f14aeae
Add maxlinelen to docstring, delete obsolete wording
2011-04-12 15:00:44 -04:00
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
35af9536ad
Dummy merge
2011-04-11 18:36:25 -05:00
84c209a1ef
Correct leading spaces in my NEWS entry.
2011-04-11 18:35:18 -05:00
f7eac1ffb4
Add NEWS item for #5162 .
2011-04-11 18:18:20 -05:00
628f980635
Add NEWS item for #5162 .
2011-04-11 18:09:24 -05:00
727b498102
Fix #5162 . Allow child spawning from Windows services (via pywin32).
2011-04-11 17:57:59 -05:00
e2f299845d
Fix #5162 . Allow child spawning from Windows services (via pywin32).
2011-04-11 17:56:23 -05:00
49353d0e8f
Issue #11747 : Fix range formatting in context and unified diffs.
2011-04-11 12:40:58 -07:00
fdb2df49bd
Remove unnecessary call to PyErr_Clear.
2011-04-11 03:48:57 +03:00
47e120e70c
Cleanup and modernize code prior to working on Issue 11747.
2011-04-10 17:14:56 -07:00
bed9a5b6b3
Issue #11814 : Fix likely typo in multiprocessing.Pool._terminate().
2011-04-11 00:20:23 +02:00
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
810b94a364
Issue #11818 : Fix tempfile examples for Python 3.
2011-04-10 09:30:04 +02:00
dbb677a894
Beautify and modernize the SequenceMatcher example
2011-04-09 19:41:00 -07:00
2604e33f30
Issue9670: Merge backout to 3.2.
2011-04-09 14:53:47 -07:00
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
15012a67d2
Issue #9670 : merge with 3.2
2011-04-09 12:37:55 -07:00
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
226580e6dc
Merge with 3.1
2011-04-09 20:05:04 +02:00
e620d10701
Issue #11719 : Fix message about unexpected test_msilib skip.
...
Patch by Nadeem Vawda.
2011-04-09 19:30:03 +02:00
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
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
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
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
b65df26830
Merge: Improve test coverage of _split_ascii method.
2011-04-07 20:40:01 -04:00
7da4db118e
Improve test coverage of _split_ascii method.
2011-04-07 20:37:17 -04:00
77f8d2962c
Normalised whitespace.
2011-04-08 01:34:20 +01:00
c46102c98a
Updated Formatter documentation.
2011-04-08 01:30:51 +01:00
2e3607c1e7
#7311 : fix html.parser to accept non-ASCII attribute values.
2011-04-07 22:03:31 +03:00
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
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
Senthil Kumaran
Raymond Hettinger
R David Murray
Benjamin Peterson
Antoine Pitrou
Brian Curtin
Ezio Melotti
Ross Lagerwall
Ned Deily
Victor Stinner
Vinay Sajip
Ezio Melotti
Barry Warsaw