From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 17 Jan 2018 16:58:16 +0000 (-0800)
Subject: pythoninfo: add time.time and datetime.datetime.now (GH-5214) (#5220)
X-Git-Tag: v2.7.15rc1~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=016f59a71620f5eadbc06ceb79d3d486d5da8ff3;p=python

pythoninfo: add time.time and datetime.datetime.now (GH-5214) (#5220)

(cherry picked from commit 7d91c0250408e202243c77c1dc9afdb321b6b32f)
---

diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
index 4ce06e00eb..f40ff8d0eb 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,