[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #29123: Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/0331420d6cba
changeset:   105915:0331420d6cba
branch:      3.6
parent:      105912:cd811b867393
parent:      105914:bb64ae455490
user:        Berker Peksag <berker.peksag at 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