]> git.ipfire.org Git - thirdparty/Python/cpython.git/log
thirdparty/Python/cpython.git
9 years agoMerge with 3.5
Terry Jan Reedy [Mon, 16 Nov 2015 12:33:01 +0000 (07:33 -0500)] 
Merge with 3.5

9 years agoMerge with 3.4
Terry Jan Reedy [Mon, 16 Nov 2015 12:32:46 +0000 (07:32 -0500)] 
Merge with 3.4

9 years agoIssue #24750: Improve appearance of IDLE editor window status bar.
Terry Jan Reedy [Mon, 16 Nov 2015 12:32:26 +0000 (07:32 -0500)] 
Issue #24750: Improve appearance of IDLE editor window status bar.
Patch by Mark Roseman.

9 years agoIssue #20220: Merge time zone workaround from 3.5
Martin Panter [Mon, 16 Nov 2015 09:43:05 +0000 (09:43 +0000)] 
Issue #20220: Merge time zone workaround from 3.5

9 years agoIssue #20220: Merge time zone workaround from 3.4 into 3.5
Martin Panter [Mon, 16 Nov 2015 09:42:41 +0000 (09:42 +0000)] 
Issue #20220: Merge time zone workaround from 3.4 into 3.5

9 years agoIssue #20220: Revert time zone test debugging, revision 139c18943d9b
Martin Panter [Mon, 16 Nov 2015 09:22:19 +0000 (09:22 +0000)] 
Issue #20220: Revert time zone test debugging, revision 139c18943d9b

9 years agoIssue #9051: Added tests for pickling and copying the timezone objects.
Serhiy Storchaka [Mon, 16 Nov 2015 09:20:17 +0000 (11:20 +0200)] 
Issue #9051: Added tests for pickling and copying the timezone objects.

9 years agoIssue #9051: Added tests for pickling and copying the timezone objects.
Serhiy Storchaka [Mon, 16 Nov 2015 09:19:31 +0000 (11:19 +0200)] 
Issue #9051: Added tests for pickling and copying the timezone objects.

9 years agoIssue #9051: Added tests for pickling and copying the timezone objects.
Serhiy Storchaka [Mon, 16 Nov 2015 09:12:58 +0000 (11:12 +0200)] 
Issue #9051: Added tests for pickling and copying the timezone objects.

9 years agoIssue #20220: Add DST rules to work around glibc quirk
Martin Panter [Mon, 16 Nov 2015 07:21:38 +0000 (07:21 +0000)] 
Issue #20220: Add DST rules to work around glibc quirk

This was triggering intermittent failures in unrelated tests.

9 years agomerge 3.5 (#25630)
Benjamin Peterson [Mon, 16 Nov 2015 05:57:50 +0000 (21:57 -0800)] 
merge 3.5 (#25630)

9 years agomake the PyUnicode_FSConverter cleanup set the decrefed argument to NULL (closes...
Benjamin Peterson [Mon, 16 Nov 2015 05:57:39 +0000 (21:57 -0800)] 
make the PyUnicode_FSConverter cleanup set the decrefed argument to NULL (closes #25630)

10 years agoFixes #23564: Fix a partially broken sanity check in the _posixsubprocess
Gregory P. Smith [Mon, 16 Nov 2015 05:29:43 +0000 (21:29 -0800)] 
Fixes #23564: Fix a partially broken sanity check in the _posixsubprocess
internals regarding how fds_to_pass were passed to the child.  The bug
had no actual impact as subprocess.py already avoided it.

10 years agoFixes #23564: Fix a partially broken sanity check in the _posixsubprocess
Gregory P. Smith [Mon, 16 Nov 2015 05:15:26 +0000 (21:15 -0800)] 
Fixes #23564: Fix a partially broken sanity check in the _posixsubprocess
internals regarding how fds_to_pass were passed to the child.  The bug
had no actual impact as subprocess.py already avoided it.

10 years agoFix issue #6973: When we know a subprocess.Popen process has died, do
Gregory P. Smith [Mon, 16 Nov 2015 02:31:34 +0000 (18:31 -0800)] 
Fix issue #6973: When we know a subprocess.Popen process has died, do
not allow the send_signal(), terminate(), or kill() methods to do
anything as they could potentially signal a different process.

10 years agoFix issue #6973: When we know a subprocess.Popen process has died, do
Gregory P. Smith [Mon, 16 Nov 2015 02:26:11 +0000 (18:26 -0800)] 
Fix issue #6973: When we know a subprocess.Popen process has died, do
not allow the send_signal(), terminate(), or kill() methods to do
anything as they could potentially signal a different process.

10 years agoFix issue #6973: When we know a subprocess.Popen process has died, do
Gregory P. Smith [Mon, 16 Nov 2015 02:19:10 +0000 (18:19 -0800)] 
Fix issue #6973: When we know a subprocess.Popen process has died, do
not allow the send_signal(), terminate(), or kill() methods to do
anything as they could potentially signal a different process.

10 years agomerge 3.5 (#25578)
Benjamin Peterson [Sat, 14 Nov 2015 23:14:58 +0000 (15:14 -0800)] 
merge 3.5 (#25578)

10 years agomerge 3.4 (#25578)
Benjamin Peterson [Sat, 14 Nov 2015 23:14:42 +0000 (15:14 -0800)] 
merge 3.4 (#25578)

10 years agorm trailing ws
Benjamin Peterson [Sat, 14 Nov 2015 23:12:38 +0000 (15:12 -0800)] 
rm trailing ws

10 years agofix possible memory lea k in _get_aia_uri (closes #25578)
Benjamin Peterson [Sat, 14 Nov 2015 23:12:18 +0000 (15:12 -0800)] 
fix possible memory lea k in _get_aia_uri (closes #25578)

10 years agoIssue #24821: Refactor STRINGLIB(fastsearch_memchr_1char) and split it on
Serhiy Storchaka [Sat, 14 Nov 2015 13:42:17 +0000 (15:42 +0200)] 
Issue #24821: Refactor STRINGLIB(fastsearch_memchr_1char) and split it on
STRINGLIB(find_char) and STRINGLIB(rfind_char) that can be used independedly
without special preconditions.

10 years agoIssue #25388: Fixed tokenizer crash when processing undecodable source code
Serhiy Storchaka [Sat, 14 Nov 2015 13:12:04 +0000 (15:12 +0200)] 
Issue #25388: Fixed tokenizer crash when processing undecodable source code
with a null byte.

10 years agoIssue #25388: Fixed tokenizer crash when processing undecodable source code
Serhiy Storchaka [Sat, 14 Nov 2015 13:11:17 +0000 (15:11 +0200)] 
Issue #25388: Fixed tokenizer crash when processing undecodable source code
with a null byte.

10 years agoIssue #25388: Fixed tokenizer crash when processing undecodable source code
Serhiy Storchaka [Sat, 14 Nov 2015 13:10:35 +0000 (15:10 +0200)] 
Issue #25388: Fixed tokenizer crash when processing undecodable source code
with a null byte.

10 years agoIssue #23883: Add news listing modules with new exported APIs
Martin Panter [Sat, 14 Nov 2015 12:52:08 +0000 (12:52 +0000)] 
Issue #23883: Add news listing modules with new exported APIs

10 years agoIssue #23883: Add missing APIs to __all__; patch by Jacek Kołodziej
Martin Panter [Sat, 14 Nov 2015 12:46:42 +0000 (12:46 +0000)] 
Issue #23883: Add missing APIs to __all__; patch by Jacek Kołodziej

10 years agoIssue #23883: Add test.support.check__all__() and test gettext.__all__
Martin Panter [Sat, 14 Nov 2015 11:47:00 +0000 (11:47 +0000)] 
Issue #23883: Add test.support.check__all__() and test gettext.__all__

Patches by Jacek Kołodziej.

10 years agoIssue #25168: Temporary timezone and cache debugging
Martin Panter [Sat, 14 Nov 2015 08:54:30 +0000 (08:54 +0000)] 
Issue #25168: Temporary timezone and cache debugging

10 years agomerge 3.5 (#25569)
Benjamin Peterson [Sat, 14 Nov 2015 08:11:19 +0000 (00:11 -0800)] 
merge 3.5 (#25569)

10 years agomerge 3.4 (#25569)
Benjamin Peterson [Sat, 14 Nov 2015 08:11:09 +0000 (00:11 -0800)] 
merge 3.4 (#25569)

10 years agofix build with older openssl (#25569)
Benjamin Peterson [Sat, 14 Nov 2015 08:09:22 +0000 (00:09 -0800)] 
fix build with older openssl (#25569)

10 years agoAdjust grammar and punctuation in whatsnew/3.6.rst
Martin Panter [Sat, 14 Nov 2015 01:29:17 +0000 (01:29 +0000)] 
Adjust grammar and punctuation in whatsnew/3.6.rst

10 years agoMerge typo and grammar fixes from 3.5
Martin Panter [Sat, 14 Nov 2015 01:29:13 +0000 (01:29 +0000)] 
Merge typo and grammar fixes from 3.5

10 years agoFix grammar in whatsnew/3.5.rst and elsewhere
Martin Panter [Sat, 14 Nov 2015 01:14:54 +0000 (01:14 +0000)] 
Fix grammar in whatsnew/3.5.rst and elsewhere

Mainly missing grammatical articles (the, a).

10 years agoMerge typo and grammar fixes from 3.4 into 3.5
Martin Panter [Sat, 14 Nov 2015 01:14:25 +0000 (01:14 +0000)] 
Merge typo and grammar fixes from 3.4 into 3.5

10 years agoFix a few grammar problems in the documentation and comments
Martin Panter [Sat, 14 Nov 2015 01:07:43 +0000 (01:07 +0000)] 
Fix a few grammar problems in the documentation and comments

10 years agoCorrect Content-Type syntax in documentation
Martin Panter [Sat, 14 Nov 2015 00:58:32 +0000 (00:58 +0000)] 
Correct Content-Type syntax in documentation

10 years agoIssue #25590: Complete attribute names even if they are not yet created
Martin Panter [Fri, 13 Nov 2015 23:54:02 +0000 (23:54 +0000)] 
Issue #25590: Complete attribute names even if they are not yet created

10 years agoIssue #25590: Merge rlcompleter getattr change from 3.5
Martin Panter [Fri, 13 Nov 2015 23:48:17 +0000 (23:48 +0000)] 
Issue #25590: Merge rlcompleter getattr change from 3.5

10 years agoIssue #25590: Merge rlcompleter change from 3.4 into 3.5
Martin Panter [Fri, 13 Nov 2015 23:10:39 +0000 (23:10 +0000)] 
Issue #25590: Merge rlcompleter change from 3.4 into 3.5

10 years agoIssue #25590: Make rlcompleter only call getattr() once per attribute
Martin Panter [Fri, 13 Nov 2015 22:47:00 +0000 (22:47 +0000)] 
Issue #25590: Make rlcompleter only call getattr() once per attribute

Previously it was called another time via hasattr(), and both calls were
made once for dir(f) and again for dir(f.__class__).  This includes a
backport of changing from a list to a set from revision 4dbb315fe667.

10 years agoIssue #25498: Add NEWS entry for 3.6
Martin Panter [Fri, 13 Nov 2015 22:17:08 +0000 (22:17 +0000)] 
Issue #25498: Add NEWS entry for 3.6

10 years agoIssue #25498: Merge ctypes crash fix from 3.5
Martin Panter [Fri, 13 Nov 2015 22:14:53 +0000 (22:14 +0000)] 
Issue #25498: Merge ctypes crash fix from 3.5

10 years agoIssue #25498: Update error message for 3.5
Martin Panter [Fri, 13 Nov 2015 22:12:58 +0000 (22:12 +0000)] 
Issue #25498: Update error message for 3.5

10 years agoIssue #25498: Merge ctypes crash fix from 3.4 into 3.5
Martin Panter [Fri, 13 Nov 2015 22:12:12 +0000 (22:12 +0000)] 
Issue #25498: Merge ctypes crash fix from 3.4 into 3.5

10 years agoIssue #25498: Fix GC crash due to ctypes objects wrapping a memoryview
Martin Panter [Fri, 13 Nov 2015 21:43:39 +0000 (21:43 +0000)] 
Issue #25498: Fix GC crash due to ctypes objects wrapping a memoryview

This was a regression caused by revision 1da9630e9b7f.  Based on patch by
Eryksun.

10 years agoMerge 3.5
Yury Selivanov [Fri, 13 Nov 2015 17:29:14 +0000 (12:29 -0500)] 
Merge 3.5

10 years agoMerge 3.4
Yury Selivanov [Fri, 13 Nov 2015 17:29:03 +0000 (12:29 -0500)] 
Merge 3.4

10 years agoasyncio: Fix sporadic failing unittests in debug mode
Yury Selivanov [Fri, 13 Nov 2015 17:28:48 +0000 (12:28 -0500)] 
asyncio: Fix sporadic failing unittests in debug mode

10 years agoIssue #25462: The hash of the key now is calculated only once in most
Serhiy Storchaka [Fri, 13 Nov 2015 13:18:26 +0000 (15:18 +0200)] 
Issue #25462: The hash of the key now is calculated only once in most
operations in C implementation of OrderedDict.

10 years agoIssue #25462: The hash of the key now is calculated only once in most
Serhiy Storchaka [Fri, 13 Nov 2015 12:48:36 +0000 (14:48 +0200)] 
Issue #25462: The hash of the key now is calculated only once in most
operations in C implementation of OrderedDict.

10 years agoMerge 3.5 (issue #25605)
Victor Stinner [Fri, 13 Nov 2015 08:14:26 +0000 (09:14 +0100)] 
Merge 3.5 (issue #25605)

10 years agoMerge 3.4 (issue #25605)
Victor Stinner [Fri, 13 Nov 2015 08:14:05 +0000 (09:14 +0100)] 
Merge 3.4 (issue #25605)

10 years agoIssue #25605: Document exceptions raised by fcntl.ioctl() and fcntl.flock()
Victor Stinner [Fri, 13 Nov 2015 08:13:48 +0000 (09:13 +0100)] 
Issue #25605: Document exceptions raised by fcntl.ioctl() and fcntl.flock()

10 years agoMerge with 3.5
Terry Jan Reedy [Thu, 12 Nov 2015 20:25:07 +0000 (15:25 -0500)] 
Merge with 3.5

10 years agoMerge with 3.4
Terry Jan Reedy [Thu, 12 Nov 2015 20:24:50 +0000 (15:24 -0500)] 
Merge with 3.4

10 years agoIndent
Terry Jan Reedy [Thu, 12 Nov 2015 20:24:33 +0000 (15:24 -0500)] 
Indent

10 years agoMerge with 3.5
Terry Jan Reedy [Thu, 12 Nov 2015 20:06:34 +0000 (15:06 -0500)] 
Merge with 3.5

10 years agoMerge with 3.4
Terry Jan Reedy [Thu, 12 Nov 2015 20:06:20 +0000 (15:06 -0500)] 
Merge with 3.4

10 years agoWhitespace
Terry Jan Reedy [Thu, 12 Nov 2015 20:06:07 +0000 (15:06 -0500)] 
Whitespace

10 years agoMerge with 3.5
Terry Jan Reedy [Thu, 12 Nov 2015 20:03:30 +0000 (15:03 -0500)] 
Merge with 3.5

10 years agoMerge with 3.4
Terry Jan Reedy [Thu, 12 Nov 2015 20:03:17 +0000 (15:03 -0500)] 
Merge with 3.4

10 years agoIssue #25313: Change the handling of new built-in text color themes to better
Terry Jan Reedy [Thu, 12 Nov 2015 20:02:57 +0000 (15:02 -0500)] 
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.

10 years agoIssue #25607: Restore old distutils logging threshold after running tests that
Serhiy Storchaka [Thu, 12 Nov 2015 17:47:38 +0000 (19:47 +0200)] 
Issue #25607: Restore old distutils logging threshold after running tests that
parse command line arguments.

10 years agoIssue #25607: Restore old distutils logging threshold after running tests that
Serhiy Storchaka [Thu, 12 Nov 2015 17:47:14 +0000 (19:47 +0200)] 
Issue #25607: Restore old distutils logging threshold after running tests that
parse command line arguments.

10 years agoIssue #25607: Restore old distutils logging threshold after running tests that
Serhiy Storchaka [Thu, 12 Nov 2015 17:46:23 +0000 (19:46 +0200)] 
Issue #25607: Restore old distutils logging threshold after running tests that
parse command line arguments.

10 years agoRestore old distutils logging threshold after running test_log.
Serhiy Storchaka [Thu, 12 Nov 2015 11:28:07 +0000 (13:28 +0200)] 
Restore old distutils logging threshold after running test_log.

10 years agoRestore old distutils logging threshold after running test_log.
Serhiy Storchaka [Thu, 12 Nov 2015 11:15:56 +0000 (13:15 +0200)] 
Restore old distutils logging threshold after running test_log.

10 years agoRestore old distutils logging threshold after running test_log.
Serhiy Storchaka [Thu, 12 Nov 2015 11:15:41 +0000 (13:15 +0200)] 
Restore old distutils logging threshold after running test_log.

10 years agoIssue #22995: Default implementation of __reduce__ and __reduce_ex__ now
Serhiy Storchaka [Thu, 12 Nov 2015 09:34:39 +0000 (11:34 +0200)] 
Issue #22995: Default implementation of __reduce__ and __reduce_ex__ now
rejects builtin types with not defined __new__.
Added tests for non-pickleable types.

10 years agoIssue #22995: Default implementation of __reduce__ and __reduce_ex__ now
Serhiy Storchaka [Thu, 12 Nov 2015 09:31:51 +0000 (11:31 +0200)] 
Issue #22995: Default implementation of __reduce__ and __reduce_ex__ now
rejects builtin types with not defined __new__.
Added tests for non-pickleable types.

10 years agoIssue #22995: Default implementation of __reduce__ and __reduce_ex__ now
Serhiy Storchaka [Thu, 12 Nov 2015 09:23:04 +0000 (11:23 +0200)] 
Issue #22995: Default implementation of __reduce__ and __reduce_ex__ now
rejects builtin types with not defined __new__.
Added tests for non-pickleable types.

10 years agomerge 3.5 (#25530)
Benjamin Peterson [Thu, 12 Nov 2015 06:45:36 +0000 (22:45 -0800)] 
merge 3.5 (#25530)

10 years agomerge 3.4 (#25530)
Benjamin Peterson [Thu, 12 Nov 2015 06:45:22 +0000 (22:45 -0800)] 
merge 3.4 (#25530)

10 years agoalways set OP_NO_SSLv3 by default (closes #25530)
Benjamin Peterson [Thu, 12 Nov 2015 06:38:41 +0000 (22:38 -0800)] 
always set OP_NO_SSLv3 by default (closes #25530)

10 years agomerge 3.5 (#25569)
Benjamin Peterson [Thu, 12 Nov 2015 06:14:31 +0000 (22:14 -0800)] 
merge 3.5 (#25569)

10 years agomerge 3.5 (#25569)
Benjamin Peterson [Thu, 12 Nov 2015 06:14:08 +0000 (22:14 -0800)] 
merge 3.5 (#25569)

10 years agofix memory leak in _get_crl_dp (closes #25569)
Benjamin Peterson [Thu, 12 Nov 2015 06:07:38 +0000 (22:07 -0800)] 
fix memory leak in _get_crl_dp (closes #25569)

Patch started by Stéphane Wirtel.

10 years agoMerge with 3.5
Zachary Ware [Thu, 12 Nov 2015 05:34:00 +0000 (23:34 -0600)] 
Merge with 3.5

10 years agoMerge with 3.4
Zachary Ware [Thu, 12 Nov 2015 05:33:50 +0000 (23:33 -0600)] 
Merge with 3.4

10 years agoRewrite re.VERBOSE section.
Zachary Ware [Thu, 12 Nov 2015 05:32:14 +0000 (23:32 -0600)] 
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@.

10 years agoCloses #25603: Merge with 3.5
Zachary Ware [Thu, 12 Nov 2015 05:00:01 +0000 (23:00 -0600)] 
Closes #25603: Merge with 3.5

10 years agoIssue #25603: Add missing parenthesis.
Zachary Ware [Thu, 12 Nov 2015 04:59:44 +0000 (22:59 -0600)] 
Issue #25603: Add missing parenthesis.

10 years agoMerge with 3.5
Zachary Ware [Thu, 12 Nov 2015 04:54:28 +0000 (22:54 -0600)] 
Merge with 3.5

10 years agoFix awkward grammar in whatsnew.
Zachary Ware [Thu, 12 Nov 2015 04:53:47 +0000 (22:53 -0600)] 
Fix awkward grammar in whatsnew.

Reported on docs@ by Keith Briggs.

10 years agoFix typos in whatsnew.
Zachary Ware [Thu, 12 Nov 2015 04:41:43 +0000 (22:41 -0600)] 
Fix typos in whatsnew.

Reported on docs@ by Igor Zhun.

10 years agoIssue #25595: Fixed test_deleted_cwd in test_importlib on AIX.
Serhiy Storchaka [Wed, 11 Nov 2015 06:27:13 +0000 (08:27 +0200)] 
Issue #25595: Fixed test_deleted_cwd in test_importlib on AIX.

10 years agoIssue #25595: Fixed test_deleted_cwd in test_importlib on AIX.
Serhiy Storchaka [Wed, 11 Nov 2015 06:26:59 +0000 (08:26 +0200)] 
Issue #25595: Fixed test_deleted_cwd in test_importlib on AIX.

10 years agoIssue #6598: Avoid clock wrapping around in test_make_msgid_collisions.
Serhiy Storchaka [Tue, 10 Nov 2015 17:52:20 +0000 (19:52 +0200)] 
Issue #6598: Avoid clock wrapping around in test_make_msgid_collisions.
Use time.monotonic instead of time.clock.

10 years agoIssue #6598: Avoid clock wrapping around in test_make_msgid_collisions.
Serhiy Storchaka [Tue, 10 Nov 2015 17:51:56 +0000 (19:51 +0200)] 
Issue #6598: Avoid clock wrapping around in test_make_msgid_collisions.
Use time.monotonic instead of time.clock.

10 years agoIssue #6598: Avoid clock wrapping around in test_make_msgid_collisions.
Serhiy Storchaka [Tue, 10 Nov 2015 17:50:14 +0000 (19:50 +0200)] 
Issue #6598: Avoid clock wrapping around in test_make_msgid_collisions.
Use time.monotonic or time.time instead of time.clock.

10 years agoMerge 3.5.
Stefan Krah [Tue, 10 Nov 2015 17:35:47 +0000 (18:35 +0100)] 
Merge 3.5.

10 years agoFix Visual Studio warning.
Stefan Krah [Tue, 10 Nov 2015 17:35:19 +0000 (18:35 +0100)] 
Fix Visual Studio warning.

10 years agoMerge 3.5.
Stefan Krah [Tue, 10 Nov 2015 17:18:07 +0000 (18:18 +0100)] 
Merge 3.5.

10 years agoIaaue #25598: Fix memory_hex from #9951 for non-contiguous buffers.
Stefan Krah [Tue, 10 Nov 2015 17:17:22 +0000 (18:17 +0100)] 
Iaaue #25598: Fix memory_hex from #9951 for non-contiguous buffers.

10 years agoIssue #25263: Fixed the tkinter.test.test_tkinter.test_font.FontTest test
Serhiy Storchaka [Tue, 10 Nov 2015 13:31:52 +0000 (15:31 +0200)] 
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.

10 years agoIssue #25263: Fixed the tkinter.test.test_tkinter.test_font.FontTest test
Serhiy Storchaka [Tue, 10 Nov 2015 13:31:38 +0000 (15:31 +0200)] 
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.

10 years agoIssue #25263: Fixed the tkinter.test.test_tkinter.test_font.FontTest test
Serhiy Storchaka [Tue, 10 Nov 2015 13:30:35 +0000 (15:30 +0200)] 
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.

10 years agoMerge 3.5 (pytime)
Victor Stinner [Tue, 10 Nov 2015 11:11:52 +0000 (12:11 +0100)] 
Merge 3.5 (pytime)