Georg Brandl
f4095837a7
Fix location of versionaddeds and empty lines.
2012-04-24 19:16:24 +02:00
Martin v. Loewis
4f2f3b6217
Account for shared keys in type's __sizeof__ ( #13903 ).
2012-04-24 19:13:57 +02:00
Sandro Tosi
f0c10f0840
Issue #14554 : merge with 3.2
2012-04-24 18:39:53 +02:00
Sandro Tosi
3e29d93007
Issue #14554 : correct example for captured_stdout(); patch by Tshepang Lekhonkhobe
2012-04-24 18:39:24 +02:00
Sandro Tosi
d57c73bbdd
Issue #13478 : merge with 3.2
2012-04-24 18:12:13 +02:00
Sandro Tosi
e6c3462607
Issue #13478 : document timeit.default_timer()
2012-04-24 18:11:46 +02:00
Sandro Tosi
011c9aa822
Issue #13587 : merge with 3.2
2012-04-24 17:37:02 +02:00
Sandro Tosi
08ccbf4be9
Issue #13587 : use the right RFC2617 name for WWW-Authenticate; patch by Aaron Maenpaa
2012-04-24 17:36:41 +02:00
Benjamin Peterson
42f58818d6
merge 3.2 ( #14658 )
2012-04-24 11:09:20 -04:00
Benjamin Peterson
7b1668735a
don't use a slot wrapper from a different special method ( closes #14658 )
...
This also alters the fix to #11603 . Specifically, setting __repr__ to
object.__str__ now raises a recursion RuntimeError when str() or repr() is
called instead of silently bypassing the recursion. I believe this behavior is
more correct.
2012-04-24 11:06:25 -04:00
Benjamin Peterson
7ce67e45f8
fix dict gc tracking ( #13903 )
2012-04-24 10:32:57 -04:00
Antoine Pitrou
01296da8df
Skip long repr tests when the cached pyc file's path length would exceed the maximum Win32 path length.
...
This should fix a failure on one of the XP buildbots.
2012-04-24 13:55:35 +02:00
Benjamin Peterson
b9f4c9daad
make pointer arith c89
2012-04-23 21:45:40 -04:00
Benjamin Peterson
f3b7d86e25
use correct base ptr
2012-04-23 18:07:01 -04:00
Benjamin Peterson
2844a7a6d3
simplify and reformat
2012-04-23 18:00:25 -04:00
Victor Stinner
ece58deb9f
Close #14648 : Compute correctly maxchar in str.format() for substrin
2012-04-23 23:36:38 +02:00
R David Murray
0b7d7c9544
Merge #14640 : Fix typos/syntax in pyporting.rst.
...
Patch by Dionysios Kalofonos.
2012-04-23 14:45:45 -04:00
R David Murray
790e005669
#14640 : Fix typos/syntax in pyporting.rst.
...
Patch by Dionysios Kalofonos.
2012-04-23 14:44:00 -04:00
Sandro Tosi
f8ae4faf93
Issue #14650 : fix typo in shutil.disk_usage() docstring; patch by Hobson Lane
2012-04-23 20:07:15 +02:00
Benjamin Peterson
9bc3653083
merge heads
2012-04-23 13:50:05 -04:00
Sandro Tosi
8c52ab597f
Issue #14641 : merge with 3.2
2012-04-23 19:45:45 +02:00
Sandro Tosi
cfdba61c3c
Issue #14641 : minor fixes to sockets Howto; patch by Dionysios Kalofonos
2012-04-23 19:45:07 +02:00
Benjamin Peterson
db780d0d13
fix instance dicts with str subclasses ( #13903 )
2012-04-23 13:44:32 -04:00
R David Murray
a82c960c17
merge #14638 : pydoc now treats non-str __name__ as None instead of raising
...
Original patch by Peter Otten.
2012-04-23 13:26:44 -04:00
R David Murray
c43125a05c
#14638 : pydoc now treats non-str __name__ as None instead of raising
...
Original patch by Peter Otten.
2012-04-23 13:23:57 -04:00
Senthil Kumaran
d4404d659c
merge heads
2012-04-23 23:56:36 +08:00
Senthil Kumaran
976db921b8
news for issue13684
2012-04-23 23:55:50 +08:00
Senthil Kumaran
aa872d1690
3.2 - Fix for Issue13684 - httplib tunnel infinite loop
2012-04-23 23:53:51 +08:00
Senthil Kumaran
88ec6209cf
news for issue13684
2012-04-23 23:53:16 +08:00
Benjamin Peterson
53b977127f
don't make shared keys with dict subclasses
2012-04-23 11:50:47 -04:00
Senthil Kumaran
b12771ab30
3.2 - Fix for Issue13684 - httplib tunnel infinite loop
2012-04-23 23:50:07 +08:00
Benjamin Peterson
99e6f87586
merge 3.2
2012-04-23 11:25:49 -04:00
Benjamin Peterson
2cc52efa7c
add Mark Shannon
2012-04-23 11:25:32 -04:00
Benjamin Peterson
7d95e40721
Implement PEP 412: Key-sharing dictionaries ( closes #13903 )
...
Patch from Mark Shannon.
2012-04-23 11:24:50 -04:00
Benjamin Peterson
80d07f8251
inherit maxchar of field value where needed ( closes #14648 )
2012-04-23 10:55:29 -04:00
Benjamin Peterson
1cf5aa9106
merge 3.2
2012-04-23 10:08:20 -04:00
Benjamin Peterson
7a436c5a53
sleep here
2012-04-23 10:08:14 -04:00
Brett Cannon
938d44d59c
Issue #14605 : Expose importlib.abc.FileLoader and
...
importlib.machinery.(FileFinder, SourceFileLoader,
_SourcelessFileLoader, ExtensionFileLoader).
This exposes all of importlib's mechanisms that will become public on
the sys module.
2012-04-22 19:58:33 -04:00
Brett Cannon
8c5e920ae3
merge
2012-04-22 13:30:07 -04:00
Brett Cannon
410e88d5fc
Change tests for imp.cache_from_source() to follow os.path.join/split
...
semantics.
2012-04-22 13:29:47 -04:00
Vinay Sajip
4c3f47896e
Issue #14644 : Increased default timeout for SMTPHandler. Note: last commit message referred to the wrong issue number.
2012-04-22 18:19:50 +01:00
Vinay Sajip
26308da174
Issue #14622 : Increased default timeout for SMTPHandler.
2012-04-22 18:16:14 +01:00
Brett Cannon
6240bd11ca
merge
2012-04-22 13:02:31 -04:00
Brett Cannon
5c903e6ee1
Issue #13959 : Continue to try to accomodate altsep in importlib by not
...
ignoring altsep if it already exists on a path when doing a join.
2012-04-22 11:45:07 -04:00
Charles-François Natali
84c0ca06d2
Use os.path.samestat() instead of reinventing the wheel.
2012-04-22 15:55:43 +02:00
Nick Coghlan
243994dc21
Resolve #14026 (Merge from 3.2)
2012-04-22 17:16:39 +10:00
Nick Coghlan
37fc401188
Close issue #14026 by better testing sys.argv handling in test_cmd_line_script (patch by Jason Yeo)
2012-04-22 17:11:33 +10:00
Brett Cannon
ce9bb9eaa0
Mention the backwards-incompatible change to imp.cache_from_source()/source_from_cache().
2012-04-22 02:08:59 -04:00
Brett Cannon
5e65f66eb1
merge
2012-04-22 02:06:48 -04:00
Brett Cannon
cf649958f7
Revert to os.path.join() semantics for path manipulation in importlib
...
which is different than what imp.cache_from_source() operates on.
2012-04-22 02:06:23 -04:00