Commit Graph

49145 Commits

Author SHA1 Message Date
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 59c90c6cb2 merge 3.2 2011-04-12 18:35:21 -05: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 5809403e6d merge the change update. 2011-04-13 07:25:48 +08:00
Senthil Kumaran 1cea9a0227 merge from 3.2 2011-04-13 07:24:32 +08:00
Senthil Kumaran b17abb1af9 merge from 3.1 2011-04-13 07:22:29 +08:00
Victor Stinner 9bf133ca31 Fix #11825: disable regrtest timeout if Python doesn't support threads 2011-04-13 01:06:27 +02: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 1f817f7eb7 Merge 2011-04-12 15:25:44 -07:00
Raymond Hettinger 9180deb59c Issue 11747: Fix output format for context diffs. 2011-04-12 15:25:30 -07: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
Victor Stinner 4d65224f68 Issue #11186: pydoc ignores a module if its name contains a surrogate character
in the index of modules.
2011-04-12 23:41:50 +02:00
Nadeem Vawda ea4b46f9a9 Fix 64-bit safety issue in BZ2Compressor and BZ2Decompressor. 2011-04-12 23:02:42 +02:00
R David Murray b30f1b4106 Merge: Add maxlinelen to docstring, delete obsolete wording 2011-04-12 15:02:07 -04: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 b7877f203d Issue #11815: Use a light-weight SimpleQueue for the result queue in concurrent.futures.ProcessPoolExecutor. 2011-04-12 17:58:11 +02:00
Antoine Pitrou 3fdd9b681d Issue #11815: Remove dead code in concurrent.futures (since a blocking Queue
cannot raise queue.Empty).
2011-04-12 17:50:20 +02: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
Raymond Hettinger 4bbde72440 Fix markup. 2011-04-11 17:57:21 -07:00
Brian Curtin d4b02e91ab Dummy merge 2011-04-11 18:36:59 -05: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 90e31a7cf8 Add NEWS item for #5162. 2011-04-11 18:19:38 -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 80e478362b Fix #5162. Allow child spawning from Windows services (via pywin32). 2011-04-11 17:59:01 -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 2498c9f06e Issue #11747: Fix range formatting in context and unified diffs. 2011-04-11 12:42:59 -07:00
Raymond Hettinger 49353d0e8f Issue #11747: Fix range formatting in context and unified diffs. 2011-04-11 12:40:58 -07:00
Vinay Sajip a3359eec7d Whitespace normalized. 2011-04-11 08:43:52 +01:00
Vinay Sajip 4a0a31df5c Added 'handlers' argument to logging.basicConfig. 2011-04-11 08:42:07 +01:00
Reid Kleckner 98707c2ced Add Misc/NEWS "What's New" entry for subprocess timeouts. 2011-04-10 22:23:08 -04:00
Ezio Melotti d60b74cb66 Merge with 3.2. 2011-04-11 03:51:14 +03:00
Ezio Melotti fdb2df49bd Remove unnecessary call to PyErr_Clear. 2011-04-11 03:48:57 +03:00
Raymond Hettinger 8362eb1657 Merge 2011-04-10 17:24:14 -07:00
Raymond Hettinger e2b63e232e Cleanup and modernize code prior to working on Issue 11747. 2011-04-10 17:23:32 -07:00
Raymond Hettinger 47e120e70c Cleanup and modernize code prior to working on Issue 11747. 2011-04-10 17:14:56 -07:00
Antoine Pitrou 753009a657 Merge from 3.2 (issue #11814, issue #8428) 2011-04-11 00:22:08 +02: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
R David Murray eb9e074dca Use stock assertEqual instead of custom ndiffAssertEqual.
Eventually I'll actually replace the calls in the tests themselves.
2011-04-10 15:28:29 -04:00
Ezio Melotti 88fdeb45ef #2650: re.escape() no longer escapes the "_". 2011-04-10 12:59:16 +03:00
Ross Lagerwall 344d26c7a0 Merge with 3.2 2011-04-10 09:34:35 +02:00
Ross Lagerwall 810b94a364 Issue #11818: Fix tempfile examples for Python 3. 2011-04-10 09:30:04 +02:00