summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-12-31 19:49:31 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-12-31 19:49:31 (GMT)
commit75d9016530369999e099a247f260f76f544dc20d (patch)
treec9b18aff49724985c523d3a3cf51beaa3947a921 /Lib
parent744c720b69bdd5b180321e69e2052473aeb6e456 (diff)
parentb47913f54f7b09189f0695144b26e85d87227d3d (diff)
downloadcpython-75d9016530369999e099a247f260f76f544dc20d.zip
cpython-75d9016530369999e099a247f260f76f544dc20d.tar.gz
cpython-75d9016530369999e099a247f260f76f544dc20d.tar.bz2
Issue #29123: Merge from 3.5
Diffstat (limited to 'Lib')
-rw-r--r--Lib/sqlite3/test/types.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/sqlite3/test/types.py b/Lib/sqlite3/test/types.py
index 0b5b3e7..6bc8d71 100644
--- a/Lib/sqlite3/test/types.py
+++ b/Lib/sqlite3/test/types.py
@@ -382,8 +382,7 @@ class DateTimeTests(unittest.TestCase):
@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]