summaryrefslogtreecommitdiffstats
path: root/Lib/test/pythoninfo.py
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-01-17 16:58:16 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2018-01-17 16:58:16 (GMT)
commit016f59a71620f5eadbc06ceb79d3d486d5da8ff3 (patch)
tree6a8f068c01cf4e67e28b012c7f73ad8c2fd3acab /Lib/test/pythoninfo.py
parent27f32e938ff51fd5d90a29abbbabc6b81d156f33 (diff)
downloadcpython-016f59a71620f5eadbc06ceb79d3d486d5da8ff3.zip
cpython-016f59a71620f5eadbc06ceb79d3d486d5da8ff3.tar.gz
cpython-016f59a71620f5eadbc06ceb79d3d486d5da8ff3.tar.bz2
pythoninfo: add time.time and datetime.datetime.now (GH-5214) (#5220)
(cherry picked from commit 7d91c0250408e202243c77c1dc9afdb321b6b32f)
Diffstat (limited to 'Lib/test/pythoninfo.py')
-rw-r--r--Lib/test/pythoninfo.py14
1 files changed, 13 insertions, 1 deletions
diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
index 4ce06e0..f40ff8d 100644
--- a/Lib/test/pythoninfo.py
+++ b/Lib/test/pythoninfo.py
@@ -315,6 +315,8 @@ def collect_tkinter(info_add):
def collect_time(info_add):
import time
+ info_add('time.time', time.time())
+
attributes = (
'altzone',
'daylight',
@@ -326,7 +328,16 @@ def collect_time(info_add):
if hasattr(time, 'get_clock_info'):
for clock in ('time', 'perf_counter'):
tinfo = time.get_clock_info(clock)
- info_add('time.%s' % clock, tinfo)
+ info_add('time.get_clock_info(%s)' % clock, tinfo)
+
+
+def collect_datetime(info_add):
+ try:
+ import datetime
+ except ImportError:
+ return
+
+ info_add('datetime.datetime.now', datetime.datetime.now())
def collect_sysconfig(info_add):
@@ -497,6 +508,7 @@ def collect_info(info):
collect_sys,
collect_sysconfig,
collect_time,
+ collect_datetime,
collect_tkinter,
collect_zlib,
collect_expat,