Commit graph

94786 commits

Author SHA1 Message Date
Martin Panter
0d559cf72a Issue #25764: Remove test debugging 2015-12-05 10:18:25 +00:00
Martin Panter
1a173de212 Issue #25764: Merge OS X test skipping from 3.5 2015-12-05 12:41:41 +00:00
Martin Panter
f7fdbdab5b Issue #25764: Skip the test on OS X
The OS X buildbots were failing at the second setrlimit() call with EPERM, as
if they were trying to raise the hard limit. The call should be keeping the
hard limit the same and raising the soft limit back to its original value, so
I don't understand the failure.
2015-12-05 09:51:52 +00:00
Benjamin Peterson
4be79aab2d merge 3.5 2015-12-05 00:27:40 -08:00
Benjamin Peterson
8fc7d296a2 merge 3.4 2015-12-05 00:27:33 -08:00
Benjamin Peterson
e2825e9522 merge 3.3 2015-12-05 00:27:23 -08:00
Benjamin Peterson
14b2c82855 fix reordering 2015-12-05 00:27:11 -08:00
Benjamin Peterson
608916af24 merge 3.5 2015-12-05 00:24:10 -08:00
Benjamin Peterson
c98bbd5289 merge 3.4 2015-12-05 00:24:01 -08:00
Benjamin Peterson
68524e1984 merge 3.3 2015-12-05 00:23:11 -08:00
Benjamin Peterson
2deaea3119 merge 3.2 2015-12-05 00:21:12 -08:00
Benjamin Peterson
5e621176c4 add CVE and issue number 2015-12-05 00:17:57 -08:00
Zachary Ware
6dece97768 Closes #25800: Merge with 3.5 2015-12-05 00:19:08 -06:00
Zachary Ware
2356069d94 Issue #25800: Merge with 3.4 2015-12-05 00:18:29 -06:00
Zachary Ware
6d8a260845 Issue #25800: Fix running test_capi directly 2015-12-05 00:16:55 -06:00
Martin Panter
aa0780801c Issue #25764: OS X now failing on the second setrlimit() call 2015-12-05 05:42:18 +00:00
Zachary Ware
2d2af91da0 Closes #25795: Merge with 3.5 2015-12-04 23:33:59 -06:00
Zachary Ware
ac28b796d8 Issue #25795: Fix several tests to run independently.
These were broken in 3aec776fc796 when they were converted
away from using support.run_unittest().  Oops :)

Initial patch by Felippe da Motta Raposo.
2015-12-04 23:32:23 -06:00
Martin Panter
da0f2a1f52 Issue #25764: Attempt to debug and skip OS X setrlimit() failure 2015-12-05 04:16:45 +00:00
R David Murray
154228fb61 Merge: #24903: Remove misleading error message to fix regression. 2015-12-04 23:05:20 -05:00
R David Murray
939614c48c Merge: #24903: Remove misleading error message to fix regression. 2015-12-04 23:04:37 -05:00
R David Murray
ced699b4c7 #24903: Remove misleading error message to fix regression.
Before the argparse conversion, compileall would (sometimes) accept multiple
paths when -d was specified.  Afterward, it does not.  The corresponding check
in the original code claimed to prevent multiple *directories* from being
specified...but it didn't really work even to do that.  So this patch fixes
the regression by invoking the consenting adults rule: if you specify a
combination of arguments to compileall that produces files with inconsistent
destdirs (which you could do before), it is on you.

Patch by Jake Garver.
2015-12-04 22:54:38 -05:00
Martin Panter
07efcd5007 Issue #25764: Merge subprocess fix from 3.5 2015-12-05 02:27:58 +00:00
Martin Panter
6a77c2d978 Issue #25764: Merge subprocess fix from 3.4 into 3.5 2015-12-05 02:03:42 +00:00
Brett Cannon
aa3e69e57f Merge for issue #23936 2015-12-04 15:46:43 -08:00
Brett Cannon
ccddbb186b Issue #23936: Clarify what finders are.
Thanks to Raúl Cumplido for the bug report and Thomas Kluyver for the
patch.
2015-12-04 15:46:21 -08:00
Brett Cannon
65ca88e4e0 Issue #25771: Tweak ValueError message when package isn't specified
for importlib.util.resolve_name() but is needed.

Thanks to Martin Panter for the bug report.
2015-12-04 15:19:42 -08:00
Brett Cannon
3ad18dc7a7 Merge for issue #25500 2015-12-04 14:52:07 -08:00
Brett Cannon
f4f25fe576 Issue #25500: Fix the language reference to not claim that import
statements search for __import__ in the global scope.

Thanks to Sergei Lebedev for finding the documentation bug.
2015-12-04 14:51:26 -08:00
Guido van Rossum
ce2650fda4 Add Awaitable, AsyncIterable, AsyncIterator to typing.py. (Merge 3.5->3.6) 2015-12-03 17:32:05 -08:00
Guido van Rossum
f17c20076c Add Awaitable, AsyncIterable, AsyncIterator to typing.py. 2015-12-03 17:31:24 -08:00
Serhiy Storchaka
3ab6c981e7 Issue #6478: _strptime's regexp cache now is reset after changing timezone
with time.tzset().
2015-12-03 22:27:31 +02:00
Serhiy Storchaka
b1f64e7d29 Issue #6478: _strptime's regexp cache now is reset after changing timezone
with time.tzset().
2015-12-03 22:26:36 +02:00
Serhiy Storchaka
c7217d7c22 Issue #6478: _strptime's regexp cache now is reset after changing timezone
with time.tzset().
2015-12-03 22:21:07 +02:00
Martin Panter
85134706af Issue #14285: Merge runpy exception fix from 3.5 2015-12-03 01:36:03 +00:00
Martin Panter
657257edb6 Issue #14285: Do not catch __init__.py exceptions in runpy
Initialize package before calling find_spec() for __main__, so that we do not
incorrectly handle exceptions from __init__.py. When runpy is used from the
Python CLI, use an internal exception rather than ImportError, to avoid
catching unexpected exceptions.

Also remove exception message rewriting in _run_module_as_main(), because it
seems to be redundant with the _get_main_module_details() function.
2015-12-03 01:23:10 +00:00
Serhiy Storchaka
7c088a9b5c Issue #25709: Fixed problem with in-place string concatenation and utf-8 cache. 2015-12-03 01:05:52 +02:00
Serhiy Storchaka
6648bf5661 Issue #25709: Fixed problem with in-place string concatenation and utf-8 cache. 2015-12-03 01:04:37 +02:00
Serhiy Storchaka
31b9410654 Issue #25709: Fixed problem with in-place string concatenation and utf-8 cache. 2015-12-03 01:02:03 +02:00
Serhiy Storchaka
e800941d66 Issue #25709: Fixed problem with in-place string concatenation and utf-8 cache. 2015-12-03 01:02:03 +02:00
Larry Hastings
a8f4405044 Merge. 2015-12-05 16:49:19 -08:00
Serhiy Storchaka
7aa690860e Issue #25709: Fixed problem with in-place string concatenation and utf-8 cache. 2015-12-03 01:02:03 +02:00
Serhiy Storchaka
7bc168faf5 Null merge 2015-12-03 00:58:13 +02:00
Serhiy Storchaka
38982e543a Null merge 2015-12-03 00:57:41 +02:00
Steve Dower
7b28eb1457 Merge from 3.5 (including all NEWS entries) 2015-12-02 09:19:07 -08:00
Steve Dower
10f997d986 Issue #25715: Python 3.5.1 installer shows wrong upgrade path and incorrect logic for launcher detection. 2015-12-02 08:28:51 -08:00
Victor Stinner
31618c9d48 (Merge 3.5) Fix test_doctest in verbose mode 2015-12-02 14:37:35 +01:00
Victor Stinner
09a08de363 Fix test_doctest in verbose mode 2015-12-02 14:37:17 +01:00
Victor Stinner
bd0ce2805c Null merge 3.5, patch was already applied to default (isuse #25177) 2015-12-02 14:36:15 +01:00
Steven D'Aprano
f02de4938e Merge heads. 2015-12-02 01:10:09 +11:00