summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | merge from 3.1Senthil Kumaran2011-04-153-5/+18
| |\ \ | | |/
| | * Issue #11467: Fix urlparse behavior when handling urls which contains scheme ↵Senthil Kumaran2011-04-153-5/+18
| | | | | | | | | | | | specific part only digits.
* | | #11848: Merge with 3.2.Ezio Melotti2011-04-151-1/+1
|\ \ \ | |/ /
| * | #11848: Merge with 3.1.Ezio Melotti2011-04-151-1/+1
| |\ \ | | |/
| | * #11848: replace dead link in random.betavariate comment.Ezio Melotti2011-04-151-1/+1
| | |
* | | #11845: Merge with 3.2.Ezio Melotti2011-04-153-1/+13
|\ \ \ | |/ /
| * | #11845: Fix typo in rangeobject.c that caused a crash in ↵Ezio Melotti2011-04-153-1/+13
| | | | | | | | | | | | compute_slice_indices. Patch by Daniel Urban.
* | | #4783: Merge with 3.2.Ezio Melotti2011-04-151-0/+5
|\ \ \ | |/ /
| * | #4783: Merge with 3.1.Ezio Melotti2011-04-151-0/+5
| |\ \ | | |/
| | * #4783: document that is not possible to use json.dump twice on the same stream.Ezio Melotti2011-04-151-0/+5
| | |
* | | merge from 3.2Eli Bendersky2011-04-151-6/+38
|\ \ \ | |/ /
| * | merge from 3.1Eli Bendersky2011-04-151-6/+38
| |\ \ | | |/
| | * Issue #11827: remove mention of list2cmdline in the doc of subprocessEli Bendersky2011-04-151-6/+37
| | |
* | | merge from 3.2.Senthil Kumaran2011-04-143-1/+25
|\ \ \ | |/ / | | | | | | Fix closes Issue1147.
| * | merge from 3.1Senthil Kumaran2011-04-143-1/+25
| |\ \ | | |/
| | * Fix Issue11474 - fix url2pathname() handling of '/C|/' on WindowsSenthil Kumaran2011-04-143-1/+25
| | |
* | | #11840: Merge with 3.2.Ezio Melotti2011-04-141-33/+31
|\ \ \ | |/ /
| * | #11840: Merge with 3.1.Ezio Melotti2011-04-141-33/+31
| |\ \ | | |/
| | * #11840: Improve c-api/unicode documentation. Patch by Sandro Tosi.Ezio Melotti2011-04-141-29/+27
| | |
* | | Dummy merge with 3.2.Ezio Melotti2011-04-140-0/+0
|\ \ \ | |/ /
| * | Dummy merge with 3.1.Ezio Melotti2011-04-140-0/+0
| |\ \ | | |/
| | * #9101: backport json reference in configparser doc.Ezio Melotti2011-04-141-0/+10
| | |
* | | Merge 3.2Brian Curtin2011-04-131-5/+0
|\ \ \ | |/ /
| * | Merge 3.1Brian Curtin2011-04-131-5/+0
| |\ \ | | |/
| | * Remove inexistent toolsBrian Curtin2011-04-131-12/+0
| | |
* | | #11684: Complete parser bytes interface by adding BytesHeaderParserR David Murray2011-04-135-8/+46
| | | | | | | | | | | | Patch by Steffen Daode Nurpmeso.
* | | 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 ↵R David Murray2011-04-131-2/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | names. Before reading the code to check, I wasn't sure if it operated on full domain names or just individual labels.
| * | Merge: Fix wording and clarify that the IDNA codec operates on full domain ↵R David Murray2011-04-131-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 Murray2011-04-131-2/+8
| | | | | | | | | | | | | | | Before reading the code to check, I wasn't sure if it operated on full domain names or just individual labels.
* | | Remove dead code in gzip.Nadeem Vawda2011-04-131-12/+0
| | | | | | | | | | | | | | | These functions appear to be holdovers from the 2.x code, intended to handle problems with CRC signedness.
* | | 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 ↵Ezio Melotti2011-04-132-0/+11
| | | | | | | | | | | | is not available.
| | * 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
| | | | | | | | | | | | | | | Forward ported changesets b4b1f557d563 and f4adc2926bf5 by Raymond Hettinger in branch '2.7'.
* | | 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
| |\ \ \ \ | | | |/ / | | |/| |