Ezio Melotti
|
a3d0be456c
|
Merge with 3.1.
|
2011-04-13 16:44:18 +03:00 |
Ezio Melotti
|
ce073cdac7
|
Fix typo in docstring.
|
2011-04-13 16:43:21 +03:00 |
Ezio Melotti
|
04c6423fba
|
Merge with 3.1.
|
2011-04-13 07:18:24 +03:00 |
Ezio Melotti
|
d210aa1ad9
|
#9233: Fix json.loads({}) to return a dict (instead of a list), when _json is not available.
|
2011-04-13 07:10:13 +03:00 |
Ezio Melotti
|
42368f9b0c
|
Remove unnecessary imports and use assertIs instead of assertTrue.
|
2011-04-13 07:08:17 +03:00 |
Ezio Melotti
|
c753305180
|
#9233: Fix json to work properly even when _json is not available.
|
2011-04-13 07:04:18 +03:00 |
Ezio Melotti
|
4f95a52fe2
|
#9233: skip _json-specific tests when _json is not available.
|
2011-04-13 06:58:29 +03:00 |
Alexander Belopolsky
|
1a20c121ef
|
Issue #11830: Remove unnecessary introspection code in the decimal module.
Forward ported changesets b4b1f557d563 and f4adc2926bf5 by Raymond
Hettinger in branch '2.7'.
|
2011-04-12 23:03:39 -04:00 |
Raymond Hettinger
|
2df393cc51
|
Fix nit.
|
2011-04-12 18:57:55 -07:00 |
Senthil Kumaran
|
c90d02c917
|
merge from push conflict.
|
2011-04-13 09:39:35 +08:00 |
Senthil Kumaran
|
665b39803d
|
Merge update.
|
2011-04-13 09:36:31 +08:00 |
Senthil Kumaran
|
a8b0f9adfe
|
Merge updates
|
2011-04-13 09:35:37 +08:00 |
Senthil Kumaran
|
af87886d8d
|
merge update
|
2011-04-13 09:34:21 +08:00 |
Raymond Hettinger
|
f6445e8f41
|
Issue 11718: Teach IDLE's open module dialog to find packages.
|
2011-04-12 18:30:14 -07:00 |
Senthil Kumaran
|
6dc605735d
|
merge from 3.1
|
2011-04-13 09:21:42 +08:00 |
Senthil Kumaran
|
60f02a650e
|
Update the News for the fix to Issue11703.
|
2011-04-13 09:21:01 +08:00 |
R David Murray
|
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 |
R David Murray
|
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 |
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 |