Commits · 56f1e2d875109c9f9bef2d3c065a5218d1a9485b · Kirill Smelkov / cpython

14 Apr, 2011 6 commits
- merge from 3.1 · 56f1e2d8
  Senthil Kumaran authored Apr 14, 2011
  
  56f1e2d8
- Fix Issue11474 - fix url2pathname() handling of '/C|/' on Windows · 2d2ea1b4
  Senthil Kumaran authored Apr 14, 2011
  
  2d2ea1b4
- #11840: Merge with 3.1. · c1f0577b
  Ezio Melotti authored Apr 14, 2011
  
  c1f0577b
- #11840: Improve c-api/unicode documentation. Patch by Sandro Tosi. · 95cd91c1
  Ezio Melotti authored Apr 14, 2011
  
  95cd91c1
- Dummy merge with 3.1. · eb22db0f
  Ezio Melotti authored Apr 14, 2011
  
  eb22db0f
- #9101: backport json reference in configparser doc. · 832c8bbe
  Ezio Melotti authored Apr 14, 2011
  
  832c8bbe
13 Apr, 2011 23 commits
- Merge 3.1 · 8e4f4feb
  Brian Curtin authored Apr 13, 2011
  
  8e4f4feb
- Remove inexistent tools · b4fb909c
  Brian Curtin authored Apr 13, 2011
  
  b4fb909c
- Issue 3051: make pure python code pass the same tests as the C version. · 8a9c4d98
  Raymond Hettinger authored Apr 13, 2011
  
  8a9c4d98
- Merge: Fix wording and clarify that the IDNA codec operates on full domain names. · 5864c9f2
  R David Murray authored Apr 13, 2011
```
Before reading the code to check, I wasn't sure if it operated on
full domain names or just individual labels.
```
  5864c9f2
- Fix wording and clarify that the IDNA codec operates on full domain names. · e0fd2f88
  R David Murray authored Apr 13, 2011
```
Before reading the code to check, I wasn't sure if it operated on
full domain names or just individual labels.
```
  e0fd2f88
- Merge with 3.1. · a3d0be45
  Ezio Melotti authored Apr 13, 2011
  
  a3d0be45
- Fix typo in docstring. · ce073cda
  Ezio Melotti authored Apr 13, 2011
  
  ce073cda
- Merge with 3.1. · 04c6423f
  Ezio Melotti authored Apr 13, 2011
  
  04c6423f
- #9233: Fix json.loads({}) to return a dict (instead of a list), when _json is not available. · d210aa1a
  Ezio Melotti authored Apr 13, 2011
  
  d210aa1a
- Remove unnecessary imports and use assertIs instead of assertTrue. · 42368f9b
  Ezio Melotti authored Apr 13, 2011
  
  42368f9b
- #9233: Fix json to work properly even when _json is not available. · c7533051
  Ezio Melotti authored Apr 13, 2011
  
  c7533051
- #9233: skip _json-specific tests when _json is not available. · 4f95a52f
  Ezio Melotti authored Apr 13, 2011
  
  4f95a52f
- Issue #11830: Remove unnecessary introspection code in the decimal module. · 1a20c121
  Alexander Belopolsky authored Apr 12, 2011
```
Forward ported changesets b4b1f557d563 and f4adc2926bf5 by Raymond
Hettinger in branch '2.7'.
```
  1a20c121
- Fix nit. · 2df393cc
  Raymond Hettinger authored Apr 12, 2011
  
  2df393cc
- merge from push conflict. · c90d02c9
  Senthil Kumaran authored Apr 13, 2011
  
  c90d02c9
- Merge update. · 665b3980
  Senthil Kumaran authored Apr 13, 2011
  
  665b3980
- Merge updates · a8b0f9ad
  Senthil Kumaran authored Apr 13, 2011
  
  a8b0f9ad
- merge update · af87886d
  Senthil Kumaran authored Apr 13, 2011
  
  af87886d
- Issue 11718: Teach IDLE's open module dialog to find packages. · f6445e8f
  Raymond Hettinger authored Apr 12, 2011
  
  f6445e8f
- merge from 3.1 · 6dc60573
  Senthil Kumaran authored Apr 13, 2011
  
  6dc60573
- Update the News for the fix to Issue11703. · 60f02a65
  Senthil Kumaran authored Apr 13, 2011
  
  60f02a65
- Merge #10019: Fix regression relative to 2.6: add newlines if indent=0 · d5315482
  R David Murray authored Apr 12, 2011
```
Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
```
  d5315482
- #10019: Fix regression relative to 2.6: add newlines if indent=0 · 3dd02d62
  R David Murray authored Apr 12, 2011
```
Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
```
  3dd02d62
12 Apr, 2011 11 commits
- merge 3.1 · 62f8bcb0
  Benjamin Peterson authored Apr 12, 2011
  
  62f8bcb0
- merge heads · abdeeff3
  Benjamin Peterson authored Apr 12, 2011
  
  abdeeff3
- make assigning to a bytes literal a syntax error (closes #11506) · bd3e3620
  Benjamin Peterson authored Apr 12, 2011
  
  bd3e3620
- merge from 3.1 · b17abb1a
  Senthil Kumaran authored Apr 13, 2011
  
  b17abb1a
- Fix Issue11703 - urllib2.geturl() does not return correct url when the... · 26430419
  Senthil Kumaran authored Apr 13, 2011
```
Fix Issue11703 - urllib2.geturl() does not return correct url when the original url contains #fragment. Patch Contribution by Santoso Wijaya.
```
  26430419
- Merge · a3e449da
  Raymond Hettinger authored Apr 12, 2011
  
  a3e449da
- Issue 11747: Fix output format for context diffs. · f03d3028
  Raymond Hettinger authored Apr 12, 2011
  
  f03d3028
- Issue 11747: Fix output format for context diffs. · 37805420
  Raymond Hettinger authored Apr 12, 2011
  
  37805420
- Merge: Add maxlinelen to docstring, delete obsolete wording · 94f90dd4
  R David Murray authored Apr 12, 2011
  
  94f90dd4
- Add maxlinelen to docstring, delete obsolete wording · 308f14ae
  R David Murray authored Apr 12, 2011
  
  308f14ae
- Issue #11815: Remove dead code in concurrent.futures (since a blocking Queue · 27be5da8
  Antoine Pitrou authored Apr 12, 2011
```
cannot raise queue.Empty).
```
  27be5da8