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
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
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
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
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
Senthil Kumaran
3a441c1bed
Fix Issue2193 - Allow ":" character in Cookie NAME values
2012-04-22 09:19:04 +08: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
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
Brett Cannon
a2898c1d79
Try to debug a Windows failure on the buildbots.
2012-04-20 13:34:35 -04:00
Brett Cannon
c33f3f2339
Issue #14629 : Mention the filename in SyntaxError exceptions from
...
tokenizer.detect_encoding() (when available).
2012-04-20 13:23:54 -04:00
Brett Cannon
dd9a56953e
Issue #14633 : Simplify imp.find_modue() test after fixes from issue
...
#14629 changed the message.
2012-04-20 12:59:59 -04:00
Martin v. Löwis
63c39fe38e
merge 3.2: issue 14629
2012-04-20 14:37:17 +02:00
Martin v. Löwis
63674f4b52
Issue #14629 : Raise SyntaxError in tokenizer.detect_encoding
...
if the first two lines have non-UTF-8 characters without an encoding declaration.
2012-04-20 14:36:47 +02:00
Larry Hastings
6fe20b3aee
Issue #14127 : Add st_{cma}time_ns fields to os.stat() result object.
2012-04-19 15:07:49 -07:00
Antoine Pitrou
dd5aa36f17
Issue #14308 : Fix an exception when a dummy thread is in the threading module's active list after a fork().
2012-04-20 00:05:17 +02:00
Antoine Pitrou
8e6e0fdb7f
Issue #14308 : Fix an exception when a "dummy" thread is in the threading module's active list after a fork().
2012-04-19 23:55:01 +02:00
Martin v. Löwis
aa2efcb0bc
Issue #14098 : New functions PyErr_GetExcInfo and PyErr_SetExcInfo.
...
Patch by Stefan Behnel.
2012-04-19 14:33:43 +02:00
Nick Coghlan
e27b3608ef
Merge from 3.2
2012-04-19 22:22:37 +10:00
Nick Coghlan
10ac77d2d8
Close #14032 : fix incorrect variable reference in test_cmd_line_script
2012-04-19 22:19:36 +10:00
Ezio Melotti
dea6c21a9c
#14538 : merge with 3.2.
2012-04-18 19:36:03 -06:00
Ezio Melotti
0780b6bc58
#14538 : HTMLParser can now parse correctly start tags that contain a bare /.
2012-04-18 19:18:22 -06:00
Victor Stinner
b0b224233e
Issue #14385 : Support other types than dict for __builtins__
...
It is now possible to use a custom type for the __builtins__ namespace, instead
of a dict. It can be used for sandboxing for example. Raise also a NameError
instead of ImportError if __build_class__ name if not found in __builtins__.
2012-04-19 00:57:45 +02:00
Antoine Pitrou
23bba4ca39
Issue #11750 : The Windows API functions scattered in the _subprocess and
...
_multiprocessing.win32 modules now live in a single module "_winapi".
Patch by sbt.
2012-04-18 20:51:15 +02:00
Benjamin Peterson
6e3358a1d5
merge 3.2 ( #14612 )
2012-04-18 11:19:00 -04:00
Benjamin Peterson
e42fb307ed
SETUP_WITH acts like SETUP_FINALLY for the purposes of setting f_lineno ( closes #14612 )
2012-04-18 11:14:31 -04:00
Benjamin Peterson
2a1fdc4c76
merge 3.2 ( #14607 )
2012-04-17 19:54:35 -04:00
Benjamin Peterson
32c59b6fc1
mangle keyword-only argname when loading defaults ( closes #14607 )
2012-04-17 19:53:21 -04:00
Charles-François Natali
fba807ac44
Issue #5113 : Fix a test_posix failure on HP-UX, where non-root users can
...
chown() to root under certain circumstances.
2012-04-17 19:58:50 +02:00
Charles-François Natali
ab2d58eefa
Issue #5113 : Fix a test_posix failure on HP-UX, where non-root users can
...
chown() to root under certain circumstances.
2012-04-17 19:48:35 +02:00
Charles-François Natali
c8ce715a82
Issue #14087 : multiprocessing: add Condition.wait_for(). Patch by sbt.
2012-04-17 18:45:57 +02:00
Brett Cannon
4132368d0a
Issue #14599 : Fix an import caching race condition.
2012-04-16 20:50:33 -04:00
Brett Cannon
ceffda822f
Issue #14599 : Make test_reprlib robust against import cache race
...
conditions when regrtest is run with its -j option.
2012-04-16 20:48:50 -04:00