Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 07:22:09 +00:00
Code Issues Projects Releases Packages Wiki Activity
54589 commits 6 branches 641 tags 4 GiB
Commit graph

20722 commits

Author SHA1 Message Date
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
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
Victor Stinner
ece58deb9f Close #14648: Compute correctly maxchar in str.format() for substrin 2012-04-23 23:36:38 +02: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
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
aa872d1690 3.2 - Fix for Issue13684 - httplib tunnel infinite loop 2012-04-23 23:53:51 +08:00
Senthil Kumaran
b12771ab30 3.2 - Fix for Issue13684 - httplib tunnel infinite loop 2012-04-23 23:50:07 +08: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
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
Brett Cannon
a846236855 Continue the good fight to get Windows to like importlib by fixing a 
variable name.
 2012-04-21 21:46:32 -04:00
Brett Cannon
27f29d8483 merge 2012-04-21 21:21:54 -04:00
Brett Cannon
0d05a7698b Have importlib look for pre-existing path separators when joining 
paths.
 2012-04-21 21:21:27 -04:00
Senthil Kumaran
f75822879b merge heads 2012-04-22 09:19:49 +08:00
Senthil Kumaran
3a441c1bed Fix Issue2193 - Allow ":" character in Cookie NAME values 2012-04-22 09:19:04 +08:00
Brett Cannon
cb165db3a3 Fix whitespace. 2012-04-21 21:15:28 -04:00
Brett Cannon
e69f0df45b Issue #13959: Re-implement imp.find_module() in Lib/imp.py. 
Thanks to Eric Snow for taking an initial stab at the implementation.
 2012-04-21 21:09:46 -04:00
Brett Cannon
b8c0206bd4 Issue #14637: Fix the UNC import test under Windows to actually use 
the UNC path. Also clean up sys.path and invalidate finder caches.

Thanks to Vinay Sajip for spotting the use of the wrong path.
 2012-04-21 19:11:58 -04:00
Brett Cannon
2f92389d5c Don't worry about moving imp.get_tag() over to Lib/imp.py. 2012-04-21 18:55:51 -04:00
Brett Cannon
b582c923ba merge 2012-04-21 18:53:14 -04:00
Brett Cannon
a64faf0771 Issue #13959: Re-implement imp.source_from_cache() in Lib/imp.py. 2012-04-21 18:52:52 -04:00
Michael Foord
9cf5c9d85e Remove incorrect comment 2012-04-21 18:32:56 +01:00
Michael Foord
3af125a4aa Closes issue 14634. unittest.mock.create_autospec now supports keyword only arguments. 2012-04-21 18:22:28 +01:00
Michael Foord
2cd48738ba Closes issue 14636. mock objects raise exceptions from an iterable side_effect 2012-04-21 15:52:11 +01:00
Brett Cannon
ea59dbff16 Issue #13959: Re-implement imp.cache_from_source() in Lib/imp.py. 2012-04-20 21:44:46 -04:00
Brett Cannon
ed672d6872 Make path manipulation more robust for platforms with alternative path 
separators.
 2012-04-20 21:19:53 -04:00
Brett Cannon
24117a748b Issue #13959: Keep imp.get_magic() in C code, but cache in importlib 
for performance. While get_magic() could move to Lib/imp.py, having to
support PyImport_GetMagicNumber() would lead to equal, if not more, C
code than sticking with the status quo.
 2012-04-20 18:04:03 -04:00
Brett Cannon
9e924ed1ac Fix a cleanup. 2012-04-20 17:34:59 -04:00
Brett Cannon
5d5296d36e Merge 2012-04-20 17:19:14 -04:00
Mark Dickinson
9a359bd97f Issue #14630: Merge fix from 3.2. 2012-04-20 21:44:09 +01:00
Mark Dickinson
bcc17eefd2 Issue #14630: Fix an incorrect access of ob_digit[0] for a zero instance of an int subclass. 2012-04-20 21:42:49 +01:00
Brett Cannon
bbdc9cd3d2 Use a skipUnless decorator instead of conditional renaming. 2012-04-20 16:29:39 -04:00
Brett Cannon
1032af95ff Issue #14585: test_import now runs all tests under 
importlib.test.import_ using builtins.__import__() instead of just the
relative import tests.
 2012-04-20 15:52:17 -04:00
Brett Cannon
f0434e647a Issue #14599: Generalize a test for ImportError.path and add support 
in Python/dynload_shlibs.c.

This should fix the remaining importlib test failure on Windows.
Support in AIX and HP-UX will be in a separate checkin.
 2012-04-20 15:22:50 -04:00