summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mergeRaymond Hettinger2011-04-132-16/+9
|\
| * Issue 3051: make pure python code pass the same tests as the C version.Raymond Hettinger2011-04-132-16/+9
* | Merge: Fix wording and clarify that the IDNA codec operates on full domain na...R David Murray2011-04-131-2/+8
|\ \ | |/
| * Merge: Fix wording and clarify that the IDNA codec operates on full domain na...R David Murray2011-04-131-2/+8
| |\
| | * Fix wording and clarify that the IDNA codec operates on full domain names.R David Murray2011-04-131-2/+8
* | | Remove dead code in gzip.Nadeem Vawda2011-04-131-12/+0
* | | Merge with 3.2.Ezio Melotti2011-04-131-1/+1
|\ \ \ | |/ /
| * | Merge with 3.1.Ezio Melotti2011-04-131-1/+1
| |\ \ | | |/
| | * Fix typo in docstring.Ezio Melotti2011-04-131-1/+1
* | | Add Misc/NEWS entry for changeset 0010cc5f22d4.Nadeem Vawda2011-04-131-0/+2
* | | Merge with 3.2.Ezio Melotti2011-04-135-9/+34
|\ \ \ | |/ /
| * | Merge with 3.1.Ezio Melotti2011-04-135-9/+34
| |\ \ | | |/
| | * #9233: Fix json.loads({}) to return a dict (instead of a list), when _json is...Ezio Melotti2011-04-132-0/+11
| | * Remove unnecessary imports and use assertIs instead of assertTrue.Ezio Melotti2011-04-132-5/+3
| | * #9233: Fix json to work properly even when _json is not available.Ezio Melotti2011-04-133-3/+6
| | * #9233: skip _json-specific tests when _json is not available.Ezio Melotti2011-04-132-2/+14
* | | MergeAlexander Belopolsky2011-04-132-17/+16
|\ \ \ | |/ /
| * | Issue #11830: Remove unnecessary introspection code in the decimal module.Alexander Belopolsky2011-04-132-17/+16
* | | MergeRaymond Hettinger2011-04-131-1/+1
|\ \ \ | |/ /
| * | Fix nit.Raymond Hettinger2011-04-131-1/+1
* | | merge.Senthil Kumaran2011-04-131-1/+8
|\ \ \ | |/ /
| * | merge from push conflict.Senthil Kumaran2011-04-132-0/+17
| |\ \
* | \ \ merge from push conflict.Senthil Kumaran2011-04-131-0/+11
|\ \ \ \
| * \ \ \ mergeRaymond Hettinger2011-04-130-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Issue 11718: Teach IDLE's open module dialog to find packages.Raymond Hettinger2011-04-132-0/+17
| * | | | Issue 11718: Teach IDLE's open module dialog to find packages.Raymond Hettinger2011-04-131-0/+11
* | | | | merge from 3.2Senthil Kumaran2011-04-131-0/+3
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge update.Senthil Kumaran2011-04-130-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Merge updatesSenthil Kumaran2011-04-134-4/+23
| | |\ \
| * | \ \ merge updateSenthil Kumaran2011-04-134-5/+24
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | merge from 3.1Senthil Kumaran2011-04-131-0/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Update the News for the fix to Issue11703.Senthil Kumaran2011-04-131-0/+3
* | | | | Merge #10019: Fix regression relative to 2.6: add newlines if indent=0R David Murray2011-04-134-5/+24
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge #10019: Fix regression relative to 2.6: add newlines if indent=0R David Murray2011-04-134-5/+24
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | #10019: Fix regression relative to 2.6: add newlines if indent=0R David Murray2011-04-134-4/+23
| | |/
* | | merge 3.2Benjamin Peterson2011-04-123-0/+8
|\ \ \ | |/ /
| * | merge 3.1Benjamin Peterson2011-04-123-0/+8
| |\ \ | | |/
| | * merge headsBenjamin Peterson2011-04-124-5/+31
| | |\
| | * | make assigning to a bytes literal a syntax error (closes #11506)Benjamin Peterson2011-04-123-0/+8
* | | | merge the change update.Senthil Kumaran2011-04-121-1/+9
|\ \ \ \
| * | | | Fix #11825: disable regrtest timeout if Python doesn't support threadsVictor Stinner2011-04-121-1/+9
* | | | | merge from 3.2Senthil Kumaran2011-04-124-5/+31
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | merge from 3.1Senthil Kumaran2011-04-124-5/+31
| |\ \ \ | | | |/ | | |/|
| | * | Fix Issue11703 - urllib2.geturl() does not return correct url when the origin...Senthil Kumaran2011-04-124-5/+31
| | |/
* | | MergeRaymond Hettinger2011-04-120-0/+0
|\ \ \ | |/ /
| * | MergeRaymond Hettinger2011-04-120-0/+0
| |\ \ | | |/
| | * Issue 11747: Fix output format for context diffs.Raymond Hettinger2011-04-122-37/+136
| * | Issue 11747: Fix output format for context diffs.Raymond Hettinger2011-04-122-7/+52
* | | Issue 11747: Fix output format for context diffs.Raymond Hettinger2011-04-122-7/+52
* | | Issue #11186: pydoc ignores a module if its name contains a surrogate characterVictor Stinner2011-04-122-0/+6