Commit Graph

48658 Commits

Author SHA1 Message Date
Senthil Kumaran 9526c62185 merge. 2011-04-13 09:43:05 +08:00
Senthil Kumaran c90d02c917 merge from push conflict. 2011-04-13 09:39:35 +08:00
Senthil Kumaran ea6e064cbb merge from push conflict. 2011-04-13 09:38:51 +08:00
Senthil Kumaran 00a47b8588 merge from 3.2 2011-04-13 09:37:39 +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
Raymond Hettinger a2353aab47 merge 2011-04-12 18:35:16 -07:00
Senthil Kumaran af87886d8d merge update 2011-04-13 09:34:21 +08:00
Raymond Hettinger 820ae36b8d Issue 11718: Teach IDLE's open module dialog to find packages. 2011-04-12 18:30:58 -07: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 d16ee63df2 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:19:20 -04: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 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