Commit graph

92765 commits

Author SHA1 Message Date
Raymond Hettinger
848f2b595d Backport early-out 91259f061cfb to reduce the cost of bb1a2944bcb6 2015-10-06 23:06:17 -04:00
Benjamin Peterson
cdae2cb88a merge 3.5 (closes #24806) 2015-10-06 19:42:46 -07:00
Benjamin Peterson
59dc696821 merge 3.4 (#24806) 2015-10-06 19:42:02 -07:00
Benjamin Peterson
bd6c41a185 prevent unacceptable bases from becoming bases through multiple inheritance (#24806) 2015-10-06 19:36:54 -07:00
Zachary Ware
4d17a6acee Issue #25097: Merge with 3.5 2015-10-06 15:29:09 -05:00
Zachary Ware
479ac6654c Issue #25097: Merge with 3.4 2015-10-06 15:28:56 -05:00
Zachary Ware
106ddf07b3 Issue #25097: Re-raise any other pywin32 error 2015-10-06 15:28:43 -05:00
Zachary Ware
c456861f99 Issue #25097: Merge with 3.5 2015-10-06 15:23:16 -05:00
Zachary Ware
af34b248d1 Issue #25097: Merge with 3.4 2015-10-06 15:22:41 -05:00
Zachary Ware
22226c5595 Issue #25097: fix Windows error number access 2015-10-06 15:22:13 -05:00
Alexander Belopolsky
68713e41a5 Closes issue #12006: Add ISO 8601 year, week, and day directives to strptime.
This commit adds %G, %V, and %u directives to strptime.  Thanks Ashley Anderson
for the implementation.
2015-10-06 13:29:56 -04:00
Serhiy Storchaka
fc632e3912 Merge with 3.5. 2015-10-06 18:52:52 +03:00
Serhiy Storchaka
a3a19953e0 Null merge 2015-10-06 18:47:26 +03:00
Serhiy Storchaka
d7e60b1519 Merge heads 2015-10-06 18:40:09 +03:00
Serhiy Storchaka
85a0e5f498 Merge heads 2015-10-06 18:39:58 +03:00
Serhiy Storchaka
a6d04cf4e6 Merge heads 2015-10-06 18:38:25 +03:00
Guido van Rossum
8ae2f0205c Issue #23972: Fix tests for Windows and Debian. (Merge 3.5->3.6) 2015-10-06 08:25:21 -07:00
Serhiy Storchaka
4ff2faf2d6 Issue #25317: Converted doctests in test_tokenize to unittests.
Made test_tokenize discoverable.
2015-10-06 18:24:46 +03:00
Guido van Rossum
609081186d Issue #23972: Fix tests for Windows and Debian. (Merge 3.4->3.5) 2015-10-06 08:24:44 -07:00
Guido van Rossum
36bbd0f239 Issue #23972: Fix tests for Windows and Debian. 2015-10-06 08:24:10 -07:00
Serhiy Storchaka
6f5175de15 Issue #25317: Converted doctests in test_tokenize to unittests.
Made test_tokenize discoverable.
2015-10-06 18:23:12 +03:00
Serhiy Storchaka
5f6fa82617 Issue #25317: Converted doctests in test_tokenize to unittests.
Made test_tokenize discoverable.
2015-10-06 18:16:28 +03:00
Benjamin Peterson
1ba1ca0456 merge 3.5 (#25319) 2015-10-05 22:01:29 -07:00
Benjamin Peterson
72181b2f53 merge 3.4 (#25319) 2015-10-05 22:00:33 -07:00
Benjamin Peterson
15982aad2b reinitialize an Event's Condition with a regular lock (closes #25319) 2015-10-05 21:56:22 -07:00
Raymond Hettinger
0443ac2860 Eliminate unnecessary test 2015-10-05 22:52:37 -04:00
Guido van Rossum
8ab4169f5a Docs and one small improvement for issue #25304, by Vincent Michel. (Merge 3.5->3.6.) 2015-10-05 16:26:00 -07:00
Guido van Rossum
5db034acfa Docs and one small improvement for issue #25304, by Vincent Michel. (Merge 3.4->3.5.) 2015-10-05 16:23:13 -07:00
Guido van Rossum
601953b679 Docs and one small improvement for issue #25304, by Vincent Michel. 2015-10-05 16:20:00 -07:00
Steve Dower
f536386ca9 Issue #25316: distutils raises OSError instead of DistutilsPlatformError when MSVC is not installed. 2015-10-05 10:35:19 -07:00
Steve Dower
f0ccf02e56 Issue #25316: distutils raises OSError instead of DistutilsPlatformError when MSVC is not installed. 2015-10-05 10:35:00 -07:00
Guido van Rossum
3074c134a9 Issue #23972: updates to asyncio datagram API. By Chris Laws. (Merge 3.5->3.6.) 2015-10-05 09:29:32 -07:00
Guido van Rossum
eda1955d82 Issue #23972: updates to asyncio datagram API. By Chris Laws. (Merge 3.4->3.5.) 2015-10-05 09:19:11 -07:00
Guido van Rossum
b9bf913ab3 Issue #23972: updates to asyncio datagram API. By Chris Laws. 2015-10-05 09:15:28 -07:00
Victor Stinner
74e8fac3c8 Issue #25301: Fix compatibility with ISO C90 2015-10-05 13:49:26 +02:00
Victor Stinner
1d65d9192d Issue #25301: The UTF-8 decoder is now up to 15 times as fast for error
handlers: ``ignore``, ``replace`` and ``surrogateescape``.
2015-10-05 13:43:50 +02:00
Terry Jan Reedy
7dbe6dd963 merge 3.5 2015-10-04 01:19:36 -04:00
Terry Jan Reedy
e25511a566 Issue #24820: Update IDLE NEWS items. 2015-10-04 01:17:13 -04:00
Terry Jan Reedy
d17e9785de Issue #24820: Update IDLE NEWS items. 2015-10-04 01:14:51 -04:00
Terry Jan Reedy
04cbe08be4 Merge with 3.5 2015-10-04 00:31:36 -04:00
Terry Jan Reedy
cd49a7de4a Merge with 3.4 2015-10-04 00:31:23 -04:00
Terry Jan Reedy
be5b7a2437 Issue #24820: Add 'IDLE Dark' text color theme, warning, and solution. 2015-10-04 00:31:05 -04:00
Terry Jan Reedy
f8c32da0ad Issue #9232: Escape rst markup char in NEWS entry to avoid Sphinx warning. 2015-10-03 23:03:15 -04:00
Terry Jan Reedy
67618272ae Issue #24791: Escape rst markup char in NEWS entry to avoid Sphinx warning. 2015-10-03 23:01:46 -04:00
Victor Stinner
20d2118248 Issue #25306: Try to fix test_huntrleaks_fd_leak() on Windows
Issue #25306: Disable popup and logs to stderr on assertion failures in MSCRT.
2015-10-03 21:40:21 +02:00
Victor Stinner
33c30131db Issue #25306: Skip test_huntrleaks_fd_leak() of test_regrtest until the bug is
fixed.
2015-10-03 21:20:41 +02:00
Guido van Rossum
5dad1ff8f8 Issue #25304: Add asyncio.run_coroutine_threadsafe(). By Vincent Michel. (Merge 3.5->3.6.) 2015-10-03 08:35:28 -07:00
Guido van Rossum
0d9bef927b Issue #25304: Add asyncio.run_coroutine_threadsafe(). By Vincent Michel. (Merge 3.4->3.5.) 2015-10-03 08:34:34 -07:00
Guido van Rossum
841d9ee41a Issue #25304: Add asyncio.run_coroutine_threadsafe(). By Vincent Michel. 2015-10-03 08:31:42 -07:00
Martin Panter
9846187bec Issue #16701: Merge sequence docs from 3.5 2015-10-03 07:54:08 +00:00