Commit Graph

92084 Commits

Author SHA1 Message Date
Victor Stinner b129007f1c Merge 3.5 (issue #25605) 2015-11-13 09:14:26 +01:00
Victor Stinner 33be3e3d5b Merge 3.4 (issue #25605) 2015-11-13 09:14:05 +01:00
Victor Stinner 9cccfcecc8 Issue #25605: Document exceptions raised by fcntl.ioctl() and fcntl.flock() 2015-11-13 09:13:48 +01:00
Terry Jan Reedy fbc741c729 Merge with 3.5 2015-11-12 15:25:07 -05:00
Terry Jan Reedy 30c328f611 Merge with 3.4 2015-11-12 15:24:50 -05:00
Terry Jan Reedy 5496ba2ddb Indent 2015-11-12 15:24:33 -05:00
Terry Jan Reedy 9fc4091802 Merge with 3.5 2015-11-12 15:06:34 -05:00
Terry Jan Reedy 8f1a98058f Merge with 3.4 2015-11-12 15:06:20 -05:00
Terry Jan Reedy c15a7c615e Whitespace 2015-11-12 15:06:07 -05:00
Terry Jan Reedy 4df5c7aa30 Merge with 3.5 2015-11-12 15:03:30 -05:00
Terry Jan Reedy e19f3ec072 Merge with 3.4 2015-11-12 15:03:17 -05:00
Terry Jan Reedy d0c0f0041c Issue #25313: Change the handling of new built-in text color themes to better
address the compatibility problem introduced by the addition of IDLE Dark.
Consistently use the revised idleConf.CurrentTheme everywhere in idlelib.
2015-11-12 15:02:57 -05:00
Serhiy Storchaka d5c075143b Issue #25607: Restore old distutils logging threshold after running tests that
parse command line arguments.
2015-11-12 19:47:38 +02:00
Serhiy Storchaka 2f85555531 Issue #25607: Restore old distutils logging threshold after running tests that
parse command line arguments.
2015-11-12 19:47:14 +02:00
Serhiy Storchaka 84023247b4 Issue #25607: Restore old distutils logging threshold after running tests that
parse command line arguments.
2015-11-12 19:46:23 +02:00
Serhiy Storchaka 30c49cb17f Restore old distutils logging threshold after running test_log. 2015-11-12 13:28:07 +02:00
Serhiy Storchaka ef2462ea3f Restore old distutils logging threshold after running test_log. 2015-11-12 13:15:56 +02:00
Serhiy Storchaka fda7fe0148 Restore old distutils logging threshold after running test_log. 2015-11-12 13:15:41 +02:00
Serhiy Storchaka 12ab296f82 Issue #22995: Default implementation of __reduce__ and __reduce_ex__ now
rejects builtin types with not defined __new__.
Added tests for non-pickleable types.
2015-11-12 11:34:39 +02:00
Serhiy Storchaka 609a2e17ad Issue #22995: Default implementation of __reduce__ and __reduce_ex__ now
rejects builtin types with not defined __new__.
Added tests for non-pickleable types.
2015-11-12 11:31:51 +02:00
Serhiy Storchaka d7a4415599 Issue #22995: Default implementation of __reduce__ and __reduce_ex__ now
rejects builtin types with not defined __new__.
Added tests for non-pickleable types.
2015-11-12 11:23:04 +02:00
Benjamin Peterson d5d6e331fb merge 3.5 (#25530) 2015-11-11 22:45:36 -08:00
Benjamin Peterson 45bde5d2ee merge 3.4 (#25530) 2015-11-11 22:45:22 -08:00
Benjamin Peterson a9dcdabccb always set OP_NO_SSLv3 by default (closes #25530) 2015-11-11 22:38:41 -08:00
Benjamin Peterson ea54d319d6 merge 3.5 (#25569) 2015-11-11 22:14:31 -08:00
Benjamin Peterson 86429bd174 merge 3.5 (#25569) 2015-11-11 22:14:08 -08:00
Benjamin Peterson eda06c8f5e fix memory leak in _get_crl_dp (closes #25569)
Patch started by Stéphane Wirtel.
2015-11-11 22:07:38 -08:00
Zachary Ware fe6d54bf5d Merge with 3.5 2015-11-11 23:34:00 -06:00
Zachary Ware a99ab63d06 Merge with 3.4 2015-11-11 23:33:50 -06:00
Zachary Ware 71a0b43854 Rewrite re.VERBOSE section.
It now has slightly better rationale and a less awkward wording in the
explanation.

Inspired by a report of a neither/or conflict by 'animalize' on docs@.
2015-11-11 23:32:14 -06:00
Zachary Ware 6e6ee30aad Closes #25603: Merge with 3.5 2015-11-11 23:00:01 -06:00
Zachary Ware c730931fa1 Issue #25603: Add missing parenthesis. 2015-11-11 22:59:44 -06:00
Zachary Ware d545f7f4cb Merge with 3.5 2015-11-11 22:54:28 -06:00
Zachary Ware ccbc8dedec Fix awkward grammar in whatsnew.
Reported on docs@ by Keith Briggs.
2015-11-11 22:53:47 -06:00
Zachary Ware c826ab06c8 Fix typos in whatsnew.
Reported on docs@ by Igor Zhun.
2015-11-11 22:41:43 -06:00
Serhiy Storchaka 3dc56a6cec Issue #25595: Fixed test_deleted_cwd in test_importlib on AIX. 2015-11-11 08:27:13 +02:00
Serhiy Storchaka 35abe19c24 Issue #25595: Fixed test_deleted_cwd in test_importlib on AIX. 2015-11-11 08:26:59 +02:00
Serhiy Storchaka a15a98638a Issue #6598: Avoid clock wrapping around in test_make_msgid_collisions.
Use time.monotonic instead of time.clock.
2015-11-10 19:52:20 +02:00
Serhiy Storchaka c6ce13d910 Issue #6598: Avoid clock wrapping around in test_make_msgid_collisions.
Use time.monotonic instead of time.clock.
2015-11-10 19:51:56 +02:00
Serhiy Storchaka e1dc3d47e0 Issue #6598: Avoid clock wrapping around in test_make_msgid_collisions.
Use time.monotonic or time.time instead of time.clock.
2015-11-10 19:50:14 +02:00
Stefan Krah e2cf984384 Merge 3.5. 2015-11-10 18:35:47 +01:00
Stefan Krah 7c3f3859a5 Fix Visual Studio warning. 2015-11-10 18:35:19 +01:00
Stefan Krah 3407cc26cb Merge 3.5. 2015-11-10 18:18:07 +01:00
Stefan Krah 0ce5b6e268 Iaaue #25598: Fix memory_hex from #9951 for non-contiguous buffers. 2015-11-10 18:17:22 +01:00
Serhiy Storchaka fa02131adb Issue #25263: Fixed the tkinter.test.test_tkinter.test_font.FontTest test
failure when the test is ran the second time.

The root attribute was set in parent class in setUpClass and then
overridded in child class in tearDownClass.
2015-11-10 15:31:52 +02:00
Serhiy Storchaka e46e09d0f5 Issue #25263: Fixed the tkinter.test.test_tkinter.test_font.FontTest test
failure when the test is ran the second time.

The root attribute was set in parent class in setUpClass and then
overridded in child class in tearDownClass.
2015-11-10 15:31:38 +02:00
Serhiy Storchaka 40fe35a95e Issue #25263: Fixed the tkinter.test.test_tkinter.test_font.FontTest test
failure when the test is ran the second time.

The root attribute was set in parent class in setUpClass and then
overridded in child class in tearDownClass.
2015-11-10 15:30:35 +02:00
Victor Stinner e0a0afdf70 Merge 3.5 (pytime) 2015-11-10 12:11:52 +01:00
Victor Stinner c379ade1bb pytime.c: rename pygettimeofday_new() to pygettimeofday()
I forgot to rename it in my previous refactoring of pytime.c.
2015-11-10 12:11:39 +01:00
Raymond Hettinger 349718a20a merge 2015-11-10 00:09:49 -08:00