Benjamin Peterson
591c921411
merge 3.2
2012-10-31 14:22:25 -04:00
Benjamin Peterson
9892f52145
avoid a function call with redundant checks for dict size
2012-10-31 14:22:12 -04:00
Benjamin Peterson
67f7a5ad79
merge 3.2
2012-10-31 14:16:17 -04:00
Benjamin Peterson
37d2c99b22
fix spelling
2012-10-31 14:16:09 -04:00
Benjamin Peterson
d97eb0d338
merge 3.2 ( #16345 )
2012-10-31 14:09:11 -04:00
Benjamin Peterson
275c848736
merge heads
2012-10-31 14:06:07 -04:00
Benjamin Peterson
d1f2cb37a2
only fast-path fromkeys() when the constructor returns a empty dict ( closes #16345 )
2012-10-31 14:05:55 -04:00
Andrew Svetlov
616f8035a8
Issue #16197 : Fix several small errors in winreg documentation.
...
Initial patch by Zachary Ware.
2012-10-31 19:29:33 +02:00
Jesus Cea
08d8434526
MERGE: Closes #16369 : Global PyTypeObjects not initialized with PyType_Ready(...). DOCUMENT IT!
2012-10-31 17:02:03 +01:00
Jesus Cea
64085e3064
Closes #16369 : Global PyTypeObjects not initialized with PyType_Ready(...). DOCUMENT IT!
2012-10-31 17:00:59 +01:00
R David Murray
3e11d6583a
merge #16371 : fix up the English a bit more.
2012-10-31 10:51:35 -04:00
R David Murray
a2959cea3f
#16371 : fix up the English a bit more.
2012-10-31 10:50:27 -04:00
Andrew Svetlov
0451d251f9
Merge issue #16371 : fix typo in ctypes documentation.
...
Thanks to George Yoshida.
2012-10-31 16:21:16 +02:00
Andrew Svetlov
ec42255039
Issue #16371 : fix typo in ctypes documentation.
...
Thanks to George Yoshida.
2012-10-31 16:20:54 +02:00
Andrew Svetlov
694f9ce343
Merge issue #16370 : Mention Py_SetProgramName in example for very high level embedding.
2012-10-31 16:03:44 +02:00
Andrew Svetlov
e1fa22a8ae
Issue #16370 : Mention Py_SetProgramName in example for very high level embedding.
2012-10-31 16:03:14 +02:00
Andrew Svetlov
f9c7c3641b
Merge: Remove already dropped function PySys_GetFile from documentation.
...
Thanks to Daniel Müllner from docs@
2012-10-31 12:03:18 +02:00
Andrew Svetlov
4deb16dd75
Remove already dropped function PySys_GetFile from documentation.
...
Thanks to Daniel Müllner from docs@
2012-10-31 12:02:56 +02:00
Andrew Svetlov
796c443f3d
Merge: fix docstring for deque ctor to mark iterable parameter optional
2012-10-31 11:51:13 +02:00
Andrew Svetlov
6a5c7c341a
Fix docstring for deque ctor to mark iterable parameter optional
2012-10-31 11:50:40 +02:00
Andrew Svetlov
7ea6f706ac
Fix typo in mock docs.
2012-10-31 11:29:52 +02:00
Benjamin Peterson
2c05a2e01b
do safety checks on __qualname__ assignment
2012-10-31 00:01:15 -04:00
Benjamin Peterson
8afa7fa510
don't shadow the __qualname__ descriptor with __qualname__ in the class's __dict__ ( closes #16271 )
2012-10-30 23:51:03 -04:00
Benjamin Peterson
e8ea97fffb
merge 3.2 ( #16369 )
2012-10-30 23:27:52 -04:00
Benjamin Peterson
c43112823b
initialize more global type objects ( closes #16369 )
2012-10-30 23:21:10 -04:00
R David Murray
cc4bacf207
#12890 : fix test on windows
...
Patch by Stephen Tonkin.
2012-10-30 20:20:09 -04:00
Brian Curtin
6b879fa402
Merge 3.2
2012-10-29 18:18:43 -05:00
Brian Curtin
e9aeca7c24
Fix #16197 . Update docstrings and documentation to match winreg code.
...
Patch by Zachary Ware.
2012-10-29 18:16:39 -05:00
Petri Lehtinen
4648b4779a
#14897 : Enhance error messages of struct.pack and struct.pack_into
...
Patch by Matti Mäki.
2012-10-29 21:25:01 +02:00
Petri Lehtinen
92c28cace4
#14897 : Enhance error messages of struct.pack and struct.pack_into
...
Patch by Matti Mäki.
2012-10-29 21:24:07 +02:00
Ross Lagerwall
646eb1e856
Merge with 3.2 for issue #16262
2012-10-29 17:35:57 +00:00
Ross Lagerwall
1b863ebfc8
Fix regression from issue #16262
2012-10-29 17:31:54 +00:00
Chris Jerdonek
d285029ee8
Merge from 3.2: remove unneeded "Release" and "Date" markers from index pages.
2012-10-28 11:10:24 -07:00
Chris Jerdonek
8b7f9f581d
Remove unneeded "Release" and "Date" markers from doc index pages.
2012-10-28 11:08:26 -07:00
Brett Cannon
6c1da829ba
merge
2012-10-28 11:49:00 -04:00
Brett Cannon
f873d7c20e
Issue #16342 : Lib/_sysconfigdata.py is no longer put into Lib, so
...
don't ignore it if it's still there.
2012-10-28 11:46:51 -04:00
Nadeem Vawda
6294305c2f
Merge: Add test for BZ2Decompressor.decompress("") after end of stream.
2012-10-28 15:21:37 +01:00
Nadeem Vawda
a1952d4120
Add test for BZ2Decompressor.decompress("") after end of stream.
2012-10-28 15:20:48 +01:00
Vinay Sajip
484adb509e
Merged upstream changes.
2012-10-28 12:41:44 +00:00
Vinay Sajip
bdd13fd098
Closes #16340 : Handle exception while copying script to venv.
2012-10-28 12:39:39 +00:00
Georg Brandl
ff65a10418
Remove confusing "Release" and "Date" markers from whatsnews. Merge with 3.2.
2012-10-28 13:37:18 +01:00
Georg Brandl
6a935d9230
merge heads
2012-10-28 13:37:05 +01:00
Georg Brandl
75f0020d29
Remove confusing "Release" and "Date" markers from whatsnews.
2012-10-28 13:35:56 +01:00
Andrew Svetlov
21b102481b
merge heads
2012-10-28 14:12:50 +02:00
Andrew Svetlov
6d50a5447a
Merge issue #14570 : Document json sort_keys parameter properly.
...
Patch by Chris Rebert.
2012-10-28 14:11:00 +02:00
Andrew Svetlov
2ec53be2e2
Issue #14570 : Document json sort_keys parameter properly.
...
Patch by Chris Rebert.
2012-10-28 14:10:30 +02:00
Mark Dickinson
2a83f16e5e
Issue #14700 : merge tests from 3.2.
2012-10-28 10:22:22 +00:00
Mark Dickinson
fb90c0934c
Issue #14700 : Fix buggy overflow checks for large precision and width in new-style and old-style formatting.
2012-10-28 10:18:03 +00:00
Georg Brandl
5b9561d1f1
merge with 3.2
2012-10-28 10:51:46 +01:00
Georg Brandl
579d5cd643
changeset: 80007:49e4541f2aef
...
parent: 80003:be83cbf4a789
parent: 80006:32df036e6b75
user: Georg Brandl <georg@python.org>
date: Sun Oct 28 10:50:11 2012 +0100
summary: merge with 3.3
2012-10-28 10:51:35 +01:00