4cee810f5d
#16476 : merge with 3.2.
2012-11-29 02:26:15 +02:00
b32512ed9a
#16476 : Fix json.tool to avoid including trailing whitespace.
2012-11-29 02:25:03 +02:00
401cf295e5
#16549 : merge with 3.3.
2012-11-29 02:18:34 +02:00
1e86d01e1e
#16549 : merge with 3.2.
2012-11-29 02:16:58 +02:00
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
d7fed37059
Cleanup json decoder: float() has builtin support of nan, +inf, -inf since Python 2.6
2012-11-29 00:12:40 +01:00
9f94b6dc4b
#16333 : fix example in docstring.
2012-11-29 00:45:22 +02:00
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
d966c2156a
#16333 : null merge with 3.3.
2012-11-29 00:37:52 +02:00
57af3bf158
#16333 : merge with 3.2.
2012-11-29 00:36:42 +02:00
d654dedbbb
#16333 : document a way to get rid of trailing whitespace when indent is used.
2012-11-29 00:35:29 +02:00
2d6f0c1ef9
Revert duplicate changes in argparse docs.
2012-11-28 19:24:44 +02:00
eff1738e01
Revert duplicate changes in argparse docs.
2012-11-28 19:24:31 +02:00
74120996f5
Revert duplicate changes in argparse docs.
2012-11-28 19:23:52 +02:00
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
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
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
a6dfe542d7
Null merge from 3.3.
2012-11-28 02:47:45 -08:00
164f8f1336
Merge heads.
2012-11-28 02:46:25 -08:00
1fb47587a1
Merge heads.
2012-11-28 02:45:34 -08:00
1bfaa688ba
Merge from 3.3: improve argument/parameter documentation (issue #15990 ).
2012-11-28 02:42:26 -08:00
d97c71feda
Merge from 3.2: improve argument/parameter documentation (issue #15990 ).
2012-11-28 02:37:42 -08:00
122e9306ad
Merge issue #16323 : Fix wrong C API documentation for locale encoding.
...
Patch by Berker Peksag.
2012-11-28 12:34:27 +02:00
0fe030bb03
Issue #16323 : Fix wrong C API documentation for locale encoding.
...
Patch by Berker Peksag.
2012-11-28 12:33:58 +02:00
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
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
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
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
9a270d9741
null merge
2012-11-27 10:18:56 -08:00
21602183ce
null merge (3.3 is different)
2012-11-27 10:18:40 -08:00
14b04cd350
Plug a leak in timemodule. The module dictionary is saved during
...
initialization. If the interpreter is shut down and reinitialized (embedded
CPython), the old module dictionary was not dec-refed during the next import of
the time extension module.
Contributed by Torsten Marek of Google.
2012-11-27 10:16:55 -08:00
847d4add26
#16556 : merge with 3.3.
2012-11-27 19:19:01 +02:00
7768dd77c1
#16556 : merge with 3.2.
2012-11-27 19:18:47 +02:00
28c88f48f9
#16556 : Fix inconsistency between kwds and kwargs. Patch by Taavi Burns.
2012-11-27 19:17:57 +02:00
185e7e91ae
#16559 : merge with 3.3.
2012-11-26 19:27:58 +02:00
c483034048
#16559 : merge with 3.2.
2012-11-26 19:27:02 +02:00
8c52370403
#16559 : Add more tests for the json module. Patch by Serhiy Storchaka.
2012-11-26 19:24:20 +02:00
b48f4ea601
Merge from 3.3: add hyperlinks to some os.path function docs (issue #16552 ).
2012-11-25 20:42:00 -08:00
3b39d35eeb
Merge from 3.2: add hyperlinks to some os.path function docs (issue #16552 ).
2012-11-25 20:40:57 -08:00
0b502ff33b
Add hyperlinks to the docs of some os.path functions (issue #16552 ).
2012-11-25 20:38:01 -08:00
367923b840
Null merge for fix for #16521 .
2012-11-25 15:17:01 +00:00
d27e05d734
Closes #16521 : Improved error handling for basicConfig(), added tests for same.
2012-11-25 15:11:46 +00:00
073f067369
Issue #16546 : merge fix from 3.3
2012-11-25 14:37:43 +00:00
ded35aeb9d
Issue #16546 : make ast.YieldFrom argument mandatory.
2012-11-25 14:36:26 +00:00
ab56710989
Issue #12848 : The pure Python pickle implementation now treats object lengths as unsigned 32-bit integers, like the C implementation does.
...
Patch by Serhiy Storchaka.
2012-11-24 20:42:59 +01:00
9982c53c2f
Issue #12848 : The pure Python pickle implementation now treats object lengths as unsigned 32-bit integers, like the C implementation does.
...
Patch by Serhiy Storchaka.
2012-11-24 20:41:34 +01:00
bf6ecf92fa
Issue #12848 : The pure Python pickle implementation now treats object lengths as unsigned 32-bit integers, like the C implementation does.
...
Patch by Serhiy Storchaka.
2012-11-24 20:40:21 +01:00
7fde5b3ccf
Fix missing import (followup to #4473 ).
2012-11-24 18:14:12 +01:00
df204be922
Issue #16423 : urllib.request now has support for ``data:`` URLs.
...
Patch by Mathias Panzenböck.
2012-11-24 17:59:08 +01:00
a833e0d8ae
Merge debug print removal with 3.3.
2012-11-23 22:17:02 +02:00
Ezio Melotti
Victor Stinner
Andrew Svetlov
Chris Jerdonek
Gregory P. Smith
Vinay Sajip
Mark Dickinson
Antoine Pitrou