Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge 3.1 | Brian Curtin | 2011-04-13 | 1 | -5/+0 | |
|\ \ | |/ | ||||||
| * | Remove inexistent tools | Brian Curtin | 2011-04-13 | 1 | -12/+0 | |
| | | ||||||
* | | Issue 3051: make pure python code pass the same tests as the C version. | Raymond Hettinger | 2011-04-13 | 2 | -16/+9 | |
| | | ||||||
* | | Merge: Fix wording and clarify that the IDNA codec operates on full domain ↵ | R David Murray | 2011-04-13 | 1 | -2/+8 | |
|\ \ | |/ | | | | | | | | | | | names. Before reading the code to check, I wasn't sure if it operated on full domain names or just individual labels. | |||||
| * | Fix wording and clarify that the IDNA codec operates on full domain names. | R David Murray | 2011-04-13 | 1 | -2/+8 | |
| | | | | | | | | | | Before reading the code to check, I wasn't sure if it operated on full domain names or just individual labels. | |||||
* | | Merge with 3.1. | Ezio Melotti | 2011-04-13 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | Fix typo in docstring. | Ezio Melotti | 2011-04-13 | 1 | -1/+1 | |
| | | ||||||
* | | Merge with 3.1. | Ezio Melotti | 2011-04-13 | 5 | -9/+34 | |
|\ \ | |/ | ||||||
| * | #9233: Fix json.loads({}) to return a dict (instead of a list), when _json ↵ | Ezio Melotti | 2011-04-13 | 2 | -0/+11 | |
| | | | | | | | | is not available. | |||||
| * | Remove unnecessary imports and use assertIs instead of assertTrue. | Ezio Melotti | 2011-04-13 | 2 | -5/+3 | |
| | | ||||||
| * | #9233: Fix json to work properly even when _json is not available. | Ezio Melotti | 2011-04-13 | 3 | -3/+6 | |
| | | ||||||
| * | #9233: skip _json-specific tests when _json is not available. | Ezio Melotti | 2011-04-13 | 2 | -2/+14 | |
| | | ||||||
* | | Issue #11830: Remove unnecessary introspection code in the decimal module. | Alexander Belopolsky | 2011-04-13 | 2 | -17/+16 | |
| | | | | | | | | | | Forward ported changesets b4b1f557d563 and f4adc2926bf5 by Raymond Hettinger in branch '2.7'. | |||||
* | | Fix nit. | Raymond Hettinger | 2011-04-13 | 1 | -1/+1 | |
| | | ||||||
* | | merge from push conflict. | Senthil Kumaran | 2011-04-13 | 2 | -0/+17 | |
|\ \ | ||||||
| * | | Issue 11718: Teach IDLE's open module dialog to find packages. | Raymond Hettinger | 2011-04-13 | 2 | -0/+17 | |
| | | | ||||||
* | | | Merge update. | Senthil Kumaran | 2011-04-13 | 0 | -0/+0 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge updates | Senthil Kumaran | 2011-04-13 | 4 | -4/+23 | |
| |\ \ | ||||||
* | \ \ | merge update | Senthil Kumaran | 2011-04-13 | 4 | -5/+24 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Merge #10019: Fix regression relative to 2.6: add newlines if indent=0 | R David Murray | 2011-04-13 | 4 | -5/+24 | |
| |\ \ \ | | | |/ | | |/| | | | | | Patch by Amaury Forgeot d'Arc, updated by Sando Tosi. | |||||
| | * | | #10019: Fix regression relative to 2.6: add newlines if indent=0 | R David Murray | 2011-04-13 | 4 | -4/+23 | |
| | | | | | | | | | | | | | | | | Patch by Amaury Forgeot d'Arc, updated by Sando Tosi. | |||||
* | | | | merge from 3.1 | Senthil Kumaran | 2011-04-13 | 1 | -0/+3 | |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | ||||||
| * | | Update the News for the fix to Issue11703. | Senthil Kumaran | 2011-04-13 | 1 | -0/+3 | |
| |/ | ||||||
* | | merge 3.1 | Benjamin Peterson | 2011-04-12 | 3 | -0/+8 | |
|\ \ | |/ | ||||||
| * | merge heads | Benjamin Peterson | 2011-04-12 | 4 | -5/+31 | |
| |\ | ||||||
| * | | make assigning to a bytes literal a syntax error (closes #11506) | Benjamin Peterson | 2011-04-12 | 3 | -0/+8 | |
| | | | ||||||
* | | | merge from 3.1 | Senthil Kumaran | 2011-04-12 | 4 | -5/+31 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Fix Issue11703 - urllib2.geturl() does not return correct url when the ↵ | Senthil Kumaran | 2011-04-12 | 4 | -5/+31 | |
| |/ | | | | | | | original url contains #fragment. Patch Contribution by Santoso Wijaya. | |||||
* | | Merge | Raymond Hettinger | 2011-04-12 | 0 | -0/+0 | |
|\ \ | |/ | ||||||
| * | Issue 11747: Fix output format for context diffs. | Raymond Hettinger | 2011-04-12 | 2 | -37/+136 | |
| | | ||||||
* | | Issue 11747: Fix output format for context diffs. | Raymond Hettinger | 2011-04-12 | 2 | -7/+52 | |
| | | ||||||
* | | Merge: Add maxlinelen to docstring, delete obsolete wording | R David Murray | 2011-04-12 | 1 | -6/+6 | |
|\ \ | |/ | ||||||
| * | Add maxlinelen to docstring, delete obsolete wording | R David Murray | 2011-04-12 | 1 | -6/+6 | |
| | | ||||||
* | | Issue #11815: Remove dead code in concurrent.futures (since a blocking Queue | Antoine Pitrou | 2011-04-12 | 2 | -52/+29 | |
| | | | | | | | | cannot raise queue.Empty). | |||||
* | | Dummy merge | Brian Curtin | 2011-04-11 | 0 | -0/+0 | |
|\ \ | |/ | ||||||
| * | Correct leading spaces in my NEWS entry. | Brian Curtin | 2011-04-11 | 1 | -2/+2 | |
| | | ||||||
* | | Add NEWS item for #5162. | brian.curtin | 2011-04-11 | 1 | -0/+3 | |
|\ \ | |/ | ||||||
| * | Add NEWS item for #5162. | brian.curtin | 2011-04-11 | 1 | -0/+3 | |
| | | ||||||
* | | Fix #5162. Allow child spawning from Windows services (via pywin32). | brian.curtin | 2011-04-11 | 1 | -2/+3 | |
|\ \ | |/ | ||||||
| * | Fix #5162. Allow child spawning from Windows services (via pywin32). | brian.curtin | 2011-04-11 | 1 | -2/+3 | |
| | | ||||||
* | | Issue #11747: Fix range formatting in context and unified diffs. | Raymond Hettinger | 2011-04-11 | 3 | -11/+42 | |
| | | ||||||
* | | Remove unnecessary call to PyErr_Clear. | Ezio Melotti | 2011-04-11 | 1 | -1/+0 | |
| | | ||||||
* | | Cleanup and modernize code prior to working on Issue 11747. | Raymond Hettinger | 2011-04-11 | 1 | -26/+27 | |
| | | ||||||
* | | Issue #11814: Fix likely typo in multiprocessing.Pool._terminate(). | Antoine Pitrou | 2011-04-10 | 2 | -1/+3 | |
| | | ||||||
* | | Issue #8428: Fix a race condition in multiprocessing.Pool when terminating | Antoine Pitrou | 2011-04-10 | 2 | -2/+11 | |
| | | | | | | | | | | worker processes: new processes would be spawned while the pool is being shut down. Patch by Charles-François Natali. | |||||
* | | Issue #11818: Fix tempfile examples for Python 3. | Ross Lagerwall | 2011-04-10 | 2 | -5/+10 | |
| | | ||||||
* | | Beautify and modernize the SequenceMatcher example | Raymond Hettinger | 2011-04-10 | 1 | -7/+9 | |
| | | ||||||
* | | Issue9670: Merge backout to 3.2. | Ned Deily | 2011-04-09 | 3 | -47/+0 | |
|\ \ | |/ | ||||||
| * | Issue9670: Back out changeset 378b40d71175; test fails on other platforms | Ned Deily | 2011-04-09 | 3 | -47/+0 | |
| | | | | | | | | and on OS X with pydebug. | |||||
* | | Issue #9670: merge with 3.2 | Ned Deily | 2011-04-09 | 3 | -0/+47 | |
|\ \ | |/ |