Commits · 4089eec0988f4ca19f8bb67398966df33b6b92d1 · Kirill Smelkov / cpython

29 Nov, 2012 20 commits
- merge 3.3 (#16573) · 4089eec0
  Benjamin Peterson authored Nov 29, 2012
  
  4089eec0
- merge 3.2 · daf28293
  Benjamin Peterson authored Nov 29, 2012
  
  daf28293
- add changelog · 343d530d
  Benjamin Peterson authored Nov 29, 2012
  
  343d530d
- merge 3.2 (#16573) · 139891ba
  Benjamin Peterson authored Nov 29, 2012
  
  139891ba
- enumerate only requires an iterable (closes #16573) · 57af3870
  Benjamin Peterson authored Nov 29, 2012
```
Patch by Jonathan Kotta.
```
  57af3870
- Merge: remove redundant sentence from c-api docs (issue #16323) · 1d1210ec
  Andrew Svetlov authored Nov 29, 2012
  
  1d1210ec
- Remove redundant sentence from c-api docs (issue #16323) · f4c3a187
  Andrew Svetlov authored Nov 29, 2012
  
  f4c3a187
- Merge issue #16477: Close tarfile internal handlers in case of exception. · 7030dd85
  Andrew Svetlov authored Nov 29, 2012
```
Patch by Serhiy Storchaka.
```
  7030dd85
- Merge issue #16477: Close tarfile internal handlers in case of exception. · 7ecd13da
  Andrew Svetlov authored Nov 29, 2012
```
Patch by Serhiy Storchaka.
```
  7ecd13da
- Issue #16477: Close tarfile internal handlers in case of exception. · 718df1d6
  Andrew Svetlov authored Nov 29, 2012
```
Patch by Serhiy Storchaka.
```
  718df1d6
- #16549: merge with 3.3. · 63cd0aa5
  Ezio Melotti authored Nov 29, 2012
  
  63cd0aa5
- #16549: merge with 3.2. · 159f12e3
  Ezio Melotti authored Nov 29, 2012
  
  159f12e3
- #16549: fix test failures on Windows. · 4927633a
  Ezio Melotti authored Nov 29, 2012
  
  4927633a
- #16333: add Misc/NEWS entry for e63ac05ccfa8. · fc020145
  Ezio Melotti authored Nov 29, 2012
  
  fc020145
- #16476: null merge with 3.3. · ccfc970d
  Ezio Melotti authored Nov 29, 2012
  
  ccfc970d
- #16476: merge with 3.2. · 4cee810f
  Ezio Melotti authored Nov 29, 2012
  
  4cee810f
- #16476: Fix json.tool to avoid including trailing whitespace. · b32512ed
  Ezio Melotti authored Nov 29, 2012
  
  b32512ed
- #16549: merge with 3.3. · 401cf295
  Ezio Melotti authored Nov 29, 2012
  
  401cf295
- #16549: merge with 3.2. · 1e86d01e
  Ezio Melotti authored Nov 29, 2012
  
  1e86d01e
- #16549: Make json.tool work again on Python 3 and add tests. Initial patch by... · 057bcb4c
  Ezio Melotti authored Nov 29, 2012
```
#16549: Make json.tool work again on Python 3 and add tests.  Initial patch by Berker Peksag and Serhiy Storchaka.
```
  057bcb4c
28 Nov, 2012 20 commits
- Cleanup json decoder: float() has builtin support of nan, +inf, -inf since Python 2.6 · d7fed370
  Victor Stinner authored Nov 29, 2012
  
  d7fed370
- #16333: fix example in docstring. · 9f94b6dc
  Ezio Melotti authored Nov 29, 2012
  
  9f94b6dc
- #16333: use (",", ": ") as default separator when indent is specified to avoid... · 10031442
  Ezio Melotti authored Nov 29, 2012
```
#16333: use (",", ": ") as default separator when indent is specified to avoid trailing whitespace.  Patch by Serhiy Storchaka.
```
  10031442
- #16333: null merge with 3.3. · d966c215
  Ezio Melotti authored Nov 29, 2012
  
  d966c215
- #16333: merge with 3.2. · 57af3bf1
  Ezio Melotti authored Nov 29, 2012
  
  57af3bf1
- #16333: document a way to get rid of trailing whitespace when indent is used. · d654dedb
  Ezio Melotti authored Nov 29, 2012
  
  d654dedb
- Revert duplicate changes in argparse docs. · 2d6f0c1e
  Andrew Svetlov authored Nov 28, 2012
  
  2d6f0c1e
- Revert duplicate changes in argparse docs. · eff1738e
  Andrew Svetlov authored Nov 28, 2012
  
  eff1738e
- Revert duplicate changes in argparse docs. · 74120996
  Andrew Svetlov authored Nov 28, 2012
  
  74120996
- Merge issue #11076: document the way to convert argparse.Namespace to a dict. · adec76a2
  Andrew Svetlov authored Nov 28, 2012
```
Initial patch by Virgil Dupras.
```
  adec76a2
- Merge issue #11076: document the way to convert argparse.Namespace to a dict. · 51292fff
  Andrew Svetlov authored Nov 28, 2012
```
Initial patch by Virgil Dupras.
```
  51292fff
- Issue #11076: document the way to convert argparse.Namespace to a dict. · e15cb61d
  Andrew Svetlov authored Nov 28, 2012
```
Initial patch by Virgil Dupras.
```
  e15cb61d
- Null merge from 3.3. · a6dfe542
  Chris Jerdonek authored Nov 28, 2012
  
  a6dfe542
- Merge heads. · 164f8f13
  Chris Jerdonek authored Nov 28, 2012
  
  164f8f13
- Merge heads. · 1fb47587
  Chris Jerdonek authored Nov 28, 2012
  
  1fb47587
- Merge from 3.3: improve argument/parameter documentation (issue #15990). · 1bfaa688
  Chris Jerdonek authored Nov 28, 2012
  
  1bfaa688
- Merge from 3.2: improve argument/parameter documentation (issue #15990). · d97c71fe
  Chris Jerdonek authored Nov 28, 2012
  
  d97c71fe
- Merge issue #16323: Fix wrong C API documentation for locale encoding. · 122e9306
  Andrew Svetlov authored Nov 28, 2012
```
Patch by Berker Peksag.
```
  122e9306
- Issue #16323: Fix wrong C API documentation for locale encoding. · 0fe030bb
  Andrew Svetlov authored Nov 28, 2012
```
Patch by Berker Peksag.
```
  0fe030bb
- Improve argument/parameter documentation (issue #15990). · c2a7fd60
  Chris Jerdonek authored Nov 28, 2012
```
This commit adds "parameter" to the glossary, improves and consolidates the
"argument" glossary entry, and adds a question to the FAQ on the difference
between arguments and parameters.
```
  c2a7fd60