Christian Heimes
550ab5136a
null merge
2012-12-02 08:26:02 +01:00
Christian Heimes
98cd0f262d
Issue #16593 : Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf
2012-12-02 08:23:05 +01:00
Christian Heimes
8ca1d5f762
- Issue #16593 : Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf
2012-12-02 08:14:50 +01:00
Christian Heimes
5f7e8dab11
Issue #16592 : stringlib_bytes_join doesn't raise MemoryError on allocation failure
2012-12-02 07:56:42 +01:00
Christian Heimes
17ad40e46e
Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf
2012-12-02 07:37:35 +01:00
Antoine Pitrou
cbb028466b
Issue #16590 : remove obsolete compatibility code from the _json module.
...
Patch by Serhiy Storchaka.
2012-12-01 19:34:16 +01:00
Benjamin Peterson
f02f280b87
Add Bruno Dupuis
2012-11-30 16:15:24 -05:00
Benjamin Peterson
4089eec098
merge 3.3 ( #16573 )
2012-11-29 10:58:43 -05:00
Benjamin Peterson
daf28293e1
merge 3.2
2012-11-29 10:57:11 -05:00
Benjamin Peterson
343d530d67
add changelog
2012-11-29 10:57:01 -05:00
Benjamin Peterson
139891ba82
merge 3.2 ( #16573 )
2012-11-29 10:56:11 -05:00
Benjamin Peterson
57af38700a
enumerate only requires an iterable ( closes #16573 )
...
Patch by Jonathan Kotta.
2012-11-29 10:55:22 -05:00
Andrew Svetlov
1d1210ec3b
Merge: remove redundant sentence from c-api docs (issue #16323 )
2012-11-29 15:23:46 +02:00
Andrew Svetlov
f4c3a187d5
Remove redundant sentence from c-api docs (issue #16323 )
2012-11-29 15:23:15 +02:00
Andrew Svetlov
7030dd8500
Merge issue #16477 : Close tarfile internal handlers in case of exception.
...
Patch by Serhiy Storchaka.
2012-11-29 14:21:39 +02:00
Andrew Svetlov
7ecd13da5f
Merge issue #16477 : Close tarfile internal handlers in case of exception.
...
Patch by Serhiy Storchaka.
2012-11-29 14:21:23 +02:00
Andrew Svetlov
718df1d638
Issue #16477 : Close tarfile internal handlers in case of exception.
...
Patch by Serhiy Storchaka.
2012-11-29 14:20:47 +02:00
Ezio Melotti
63cd0aa569
#16549 : merge with 3.3.
2012-11-29 05:10:45 +02:00
Ezio Melotti
159f12e335
#16549 : merge with 3.2.
2012-11-29 05:10:31 +02:00
Ezio Melotti
4927633ab6
#16549 : fix test failures on Windows.
2012-11-29 05:10:07 +02:00
Ezio Melotti
fc02014519
#16333 : add Misc/NEWS entry for e63ac05ccfa8.
2012-11-29 02:33:21 +02:00
Ezio Melotti
ccfc970d2e
#16476 : null merge with 3.3.
2012-11-29 02:27:26 +02:00
Ezio Melotti
4cee810f5d
#16476 : merge with 3.2.
2012-11-29 02:26:15 +02:00
Ezio Melotti
b32512ed9a
#16476 : Fix json.tool to avoid including trailing whitespace.
2012-11-29 02:25:03 +02:00
Ezio Melotti
401cf295e5
#16549 : merge with 3.3.
2012-11-29 02:18:34 +02:00
Ezio Melotti
1e86d01e1e
#16549 : merge with 3.2.
2012-11-29 02:16:58 +02:00
Ezio Melotti
057bcb4c6c
#16549 : Make json.tool work again on Python 3 and add tests. Initial patch by Berker Peksag and Serhiy Storchaka.
2012-11-29 02:15:18 +02:00
Victor Stinner
d7fed37059
Cleanup json decoder: float() has builtin support of nan, +inf, -inf since Python 2.6
2012-11-29 00:12:40 +01:00
Ezio Melotti
9f94b6dc4b
#16333 : fix example in docstring.
2012-11-29 00:45:22 +02:00
Ezio Melotti
100314427a
#16333 : use (",", ": ") as default separator when indent is specified to avoid trailing whitespace. Patch by Serhiy Storchaka.
2012-11-29 00:42:56 +02:00
Ezio Melotti
d966c2156a
#16333 : null merge with 3.3.
2012-11-29 00:37:52 +02:00
Ezio Melotti
57af3bf158
#16333 : merge with 3.2.
2012-11-29 00:36:42 +02:00
Ezio Melotti
d654dedbbb
#16333 : document a way to get rid of trailing whitespace when indent is used.
2012-11-29 00:35:29 +02:00
Andrew Svetlov
2d6f0c1ef9
Revert duplicate changes in argparse docs.
2012-11-28 19:24:44 +02:00
Andrew Svetlov
eff1738e01
Revert duplicate changes in argparse docs.
2012-11-28 19:24:31 +02:00
Andrew Svetlov
74120996f5
Revert duplicate changes in argparse docs.
2012-11-28 19:23:52 +02:00
Andrew Svetlov
adec76a28f
Merge issue #11076 : document the way to convert argparse.Namespace to a dict.
...
Initial patch by Virgil Dupras.
2012-11-28 19:18:25 +02:00
Andrew Svetlov
51292fff3f
Merge issue #11076 : document the way to convert argparse.Namespace to a dict.
...
Initial patch by Virgil Dupras.
2012-11-28 19:18:09 +02:00
Andrew Svetlov
e15cb61dde
Issue #11076 : document the way to convert argparse.Namespace to a dict.
...
Initial patch by Virgil Dupras.
2012-11-28 19:17:26 +02:00
Chris Jerdonek
a6dfe542d7
Null merge from 3.3.
2012-11-28 02:47:45 -08:00
Chris Jerdonek
164f8f1336
Merge heads.
2012-11-28 02:46:25 -08:00
Chris Jerdonek
1fb47587a1
Merge heads.
2012-11-28 02:45:34 -08:00
Chris Jerdonek
1bfaa688ba
Merge from 3.3: improve argument/parameter documentation (issue #15990 ).
2012-11-28 02:42:26 -08:00
Chris Jerdonek
d97c71feda
Merge from 3.2: improve argument/parameter documentation (issue #15990 ).
2012-11-28 02:37:42 -08:00
Andrew Svetlov
122e9306ad
Merge issue #16323 : Fix wrong C API documentation for locale encoding.
...
Patch by Berker Peksag.
2012-11-28 12:34:27 +02:00
Andrew Svetlov
0fe030bb03
Issue #16323 : Fix wrong C API documentation for locale encoding.
...
Patch by Berker Peksag.
2012-11-28 12:33:58 +02:00
Chris Jerdonek
c2a7fd60e1
Improve argument/parameter documentation (issue #15990 ).
...
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.
2012-11-28 02:29:33 -08:00
Chris Jerdonek
16459e8b16
Merge from 3.3: Add a str class entry to the string section (issue #16209 ).
...
This commit also moves the documentation for the str built-in function to
the new class entry. Links to :class:`str` now go to the class entry with
the string methods immediately afterwards.
2012-11-28 01:45:15 -08:00
Chris Jerdonek
bb4e941c6d
Add a str class entry to the "Text Sequence Type" section (issue #16209 ).
...
This commit also moves the documentation for the str built-in function to
the new class entry. Links to :class:`str` now go to the class entry with
the string methods immediately afterwards.
2012-11-28 01:38:40 -08:00
Andrew Svetlov
bff98fe536
Issue #16464 : reset Request's Content-Length header on .data change.
...
It will be recalculated on sending request to HTTP server.
Patch by Alexey Kachayev
2012-11-27 23:06:19 +02:00