Mailman 3 December 2016 - Python-checkins

cpython (2.7): Issue #29123: Make CheckSqlTimestamp more robust
by berker.peksag Dec. 31, 2016

Dec. 31, 2016

https://hg.python.org/cpython/rev/1d5b4426fe87 changeset: 105917:1d5b4426fe87 branch: 2.7 parent: 105890:0d20da97a6a0 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sun Jan 01 02:51:46 2017 +0300 summary: Issue #29123: Make CheckSqlTimestamp more robust files: Lib/sqlite3/test/types.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Lib/sqlite3/test/types.py b/Lib/sqlite3/test/types.py --- a/Lib/sqlite3/test/types.py +++ b/Lib/sqlite3/test/types.py @@ -383,8 +383,7 @@ if sqlite.sqlite_version_info < (3, 1): return - # SQLite's current_timestamp uses UTC time, while datetime.datetime.now() uses local time. - now = datetime.datetime.now() + now = datetime.datetime.utcnow() self.cur.execute("insert into test(ts) values (current_timestamp)") self.cur.execute("select ts from test") ts = self.cur.fetchone()[0] -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> 3.6): Issue #29123: Merge from 3.5
by berker.peksag Dec. 31, 2016

Dec. 31, 2016

https://hg.python.org/cpython/rev/0331420d6cba changeset: 105915:0331420d6cba branch: 3.6 parent: 105912:cd811b867393 parent: 105914:bb64ae455490 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sat Dec 31 22:49:31 2016 +0300 summary: Issue #29123: Merge from 3.5 files: Lib/sqlite3/test/types.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Lib/sqlite3/test/types.py b/Lib/sqlite3/test/types.py --- a/Lib/sqlite3/test/types.py +++ b/Lib/sqlite3/test/types.py @@ -382,8 +382,7 @@ @unittest.skipIf(sqlite.sqlite_version_info < (3, 1), 'the date functions are available on 3.1 or later') def CheckSqlTimestamp(self): - # SQLite's current_timestamp uses UTC time, while datetime.datetime.now() uses local time. - now = datetime.datetime.now() + now = datetime.datetime.utcnow() self.cur.execute("insert into test(ts) values (current_timestamp)") self.cur.execute("select ts from test") ts = self.cur.fetchone()[0] -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): Issue #29123: Merge from 3.6
by berker.peksag Dec. 31, 2016

Dec. 31, 2016

https://hg.python.org/cpython/rev/ad06f9acff92 changeset: 105916:ad06f9acff92 parent: 105913:4172e0a4e07a parent: 105915:0331420d6cba user: Berker Peksag <berker.peksag(a)gmail.com> date: Sat Dec 31 22:49:56 2016 +0300 summary: Issue #29123: Merge from 3.6 files: Lib/sqlite3/test/types.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Lib/sqlite3/test/types.py b/Lib/sqlite3/test/types.py --- a/Lib/sqlite3/test/types.py +++ b/Lib/sqlite3/test/types.py @@ -382,8 +382,7 @@ @unittest.skipIf(sqlite.sqlite_version_info < (3, 1), 'the date functions are available on 3.1 or later') def CheckSqlTimestamp(self): - # SQLite's current_timestamp uses UTC time, while datetime.datetime.now() uses local time. - now = datetime.datetime.now() + now = datetime.datetime.utcnow() self.cur.execute("insert into test(ts) values (current_timestamp)") self.cur.execute("select ts from test") ts = self.cur.fetchone()[0] -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #29123: Make CheckSqlTimestamp more robust
by berker.peksag Dec. 31, 2016

Dec. 31, 2016

https://hg.python.org/cpython/rev/bb64ae455490 changeset: 105914:bb64ae455490 branch: 3.5 parent: 105909:19376765d7c3 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sat Dec 31 22:48:55 2016 +0300 summary: Issue #29123: Make CheckSqlTimestamp more robust files: Lib/sqlite3/test/types.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Lib/sqlite3/test/types.py b/Lib/sqlite3/test/types.py --- a/Lib/sqlite3/test/types.py +++ b/Lib/sqlite3/test/types.py @@ -382,8 +382,7 @@ @unittest.skipIf(sqlite.sqlite_version_info < (3, 1), 'the date functions are available on 3.1 or later') def CheckSqlTimestamp(self): - # SQLite's current_timestamp uses UTC time, while datetime.datetime.now() uses local time. - now = datetime.datetime.now() + now = datetime.datetime.utcnow() self.cur.execute("insert into test(ts) values (current_timestamp)") self.cur.execute("select ts from test") ts = self.cur.fetchone()[0] -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.6): Issue #29119: Merge in ACK from 3.5 branch
by raymond.hettinger Dec. 31, 2016

Dec. 31, 2016

https://hg.python.org/cpython/rev/cd811b867393 changeset: 105912:cd811b867393 branch: 3.6 parent: 105910:1b4b00b370f7 user: Raymond Hettinger <python(a)rcn.com> date: Sat Dec 31 12:08:00 2016 -0700 summary: Issue #29119: Merge in ACK from 3.5 branch files: Misc/ACKS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -157,6 +157,7 @@ Paul Boddie Matthew Boedicker Robin Boerdijk +Andra Bogildea Nikolay Bogoychev David Bolen Wouter Bolsterlee -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): merge
by raymond.hettinger Dec. 31, 2016

Dec. 31, 2016

https://hg.python.org/cpython/rev/4172e0a4e07a changeset: 105913:4172e0a4e07a parent: 105911:c3a6e5fdfdc6 parent: 105912:cd811b867393 user: Raymond Hettinger <python(a)rcn.com> date: Sat Dec 31 12:08:19 2016 -0700 summary: merge files: Misc/ACKS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -157,6 +157,7 @@ Paul Boddie Matthew Boedicker Robin Boerdijk +Andra Bogildea Nikolay Bogoychev David Bolen Wouter Bolsterlee -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): merge
by raymond.hettinger Dec. 31, 2016

Dec. 31, 2016

https://hg.python.org/cpython/rev/c3a6e5fdfdc6 changeset: 105911:c3a6e5fdfdc6 parent: 105908:8b19c2a1b197 parent: 105910:1b4b00b370f7 user: Raymond Hettinger <python(a)rcn.com> date: Sat Dec 31 12:03:16 2016 -0700 summary: merge files: Lib/collections/__init__.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -189,6 +189,7 @@ link = self.__map[key] link_prev = link.prev link_next = link.next + soft_link = link_next.prev link_prev.next = link_next link_next.prev = link_prev root = self.__root @@ -196,12 +197,14 @@ last = root.prev link.prev = last link.next = root - last.next = root.prev = link + root.prev = soft_link + last.next = link else: first = root.next link.prev = root link.next = first - root.next = first.prev = link + first.prev = soft_link + root.next = link def __sizeof__(self): sizeof = _sys.getsizeof -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #29119: Fix weakref in OrderedDict.move_to_end(). Work by Andra Bogildea.
by raymond.hettinger Dec. 31, 2016

Dec. 31, 2016

https://hg.python.org/cpython/rev/19376765d7c3 changeset: 105909:19376765d7c3 branch: 3.5 parent: 105906:1a25c639f81e user: Raymond Hettinger <python(a)rcn.com> date: Sat Dec 31 12:01:59 2016 -0700 summary: Issue #29119: Fix weakref in OrderedDict.move_to_end(). Work by Andra Bogildea. files: Lib/collections/__init__.py | 7 +++++-- Misc/ACKS | 1 + Misc/NEWS | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -189,6 +189,7 @@ link = self.__map[key] link_prev = link.prev link_next = link.next + soft_link = link_next.prev link_prev.next = link_next link_next.prev = link_prev root = self.__root @@ -196,12 +197,14 @@ last = root.prev link.prev = last link.next = root - last.next = root.prev = link + root.prev = soft_link + last.next = link else: first = root.next link.prev = root link.next = first - root.next = first.prev = link + first.prev = soft_link + root.next = link def __sizeof__(self): sizeof = _sys.getsizeof diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -156,6 +156,7 @@ Paul Boddie Matthew Boedicker Robin Boerdijk +Andra Bogildea David Bolen Wouter Bolsterlee Gawain Bolton diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -143,6 +143,10 @@ - Issue #13051: Fixed recursion errors in large or resized curses.textpad.Textbox. Based on patch by Tycho Andersen. +- Issue #29119: Fix weakrefs in the pure python version of + collections.OrderedDict move_to_end() method. + Contributed by Andra Bogildea. + - Issue #9770: curses.ascii predicates now work correctly with negative integers. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> 3.6): merge
by raymond.hettinger Dec. 31, 2016

Dec. 31, 2016

https://hg.python.org/cpython/rev/1b4b00b370f7 changeset: 105910:1b4b00b370f7 branch: 3.6 parent: 105907:c9e944cc6301 parent: 105909:19376765d7c3 user: Raymond Hettinger <python(a)rcn.com> date: Sat Dec 31 12:02:42 2016 -0700 summary: merge files: Lib/collections/__init__.py | 7 +++++-- Misc/NEWS | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -189,6 +189,7 @@ link = self.__map[key] link_prev = link.prev link_next = link.next + soft_link = link_next.prev link_prev.next = link_next link_next.prev = link_prev root = self.__root @@ -196,12 +197,14 @@ last = root.prev link.prev = last link.next = root - last.next = root.prev = link + root.prev = soft_link + last.next = link else: first = root.next link.prev = root link.next = first - root.next = first.prev = link + first.prev = soft_link + root.next = link def __sizeof__(self): sizeof = _sys.getsizeof diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -51,6 +51,10 @@ - Issue #13051: Fixed recursion errors in large or resized curses.textpad.Textbox. Based on patch by Tycho Andersen. +- Issue #29119: Fix weakrefs in the pure python version of + collections.OrderedDict move_to_end() method. + Contributed by Andra Bogildea. + - Issue #9770: curses.ascii predicates now work correctly with negative integers. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): Issue #26267: Merge from 3.6
by berker.peksag Dec. 31, 2016

Dec. 31, 2016

https://hg.python.org/cpython/rev/8b19c2a1b197 changeset: 105908:8b19c2a1b197 parent: 105905:459500606560 parent: 105907:c9e944cc6301 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sat Dec 31 20:09:14 2016 +0300 summary: Issue #26267: Merge from 3.6 files: Doc/library/uuid.rst | 7 +++++++ Lib/test/test_uuid.py | 4 ++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/Doc/library/uuid.rst b/Doc/library/uuid.rst --- a/Doc/library/uuid.rst +++ b/Doc/library/uuid.rst @@ -45,6 +45,13 @@ variant and version number set according to RFC 4122, overriding bits in the given *hex*, *bytes*, *bytes_le*, *fields*, or *int*. + Comparison of UUID objects are made by way of comparing their + :attr:`UUID.int` attributes. Comparison with a non-UUID object + raises a :exc:`TypeError`. + + ``str(uuid)`` returns a string in the form + ``12345678-1234-5678-1234-567812345678`` where the 32 hexadecimal digits + represent the UUID. :class:`UUID` instances have these read-only attributes: diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -292,6 +292,10 @@ badtype(lambda: setattr(u, 'clock_seq_low', 0)) badtype(lambda: setattr(u, 'node', 0)) + # Comparison with a non-UUID object + badtype(lambda: u < object()) + badtype(lambda: u > object()) + def test_getnode(self): node1 = uuid.getnode() self.assertTrue(0 < node1 < (1 << 48), '%012x' % node1) -- Repository URL: https://hg.python.org/cpython

1 0