diff options
author | Matti Picus <matti.picus@gmail.com> | 2020-08-27 14:34:34 +0300 |
---|---|---|
committer | Matti Picus <matti.picus@gmail.com> | 2020-08-27 14:34:34 +0300 |
commit | 2076fb6c433f42aa17bd0e89c2e2c7dfdceb6eff (patch) | |
tree | 1c1a4eb5f28b7114c350239733900411bb754ea2 | |
parent | merge py3.6 into py3.7 (diff) | |
parent | merge default into py3.6, fix merge (diff) | |
download | pypy-2076fb6c433f42aa17bd0e89c2e2c7dfdceb6eff.tar.gz pypy-2076fb6c433f42aa17bd0e89c2e2c7dfdceb6eff.tar.bz2 pypy-2076fb6c433f42aa17bd0e89c2e2c7dfdceb6eff.zip |
merge py3.6 into py3.7
-rw-r--r-- | pypy/module/time/interp_time.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pypy/module/time/interp_time.py b/pypy/module/time/interp_time.py index 029d5e29c3..ebb259d809 100644 --- a/pypy/module/time/interp_time.py +++ b/pypy/module/time/interp_time.py @@ -16,9 +16,10 @@ from rpython.rlib.rtime import (GETTIMEOFDAY_NO_TZ, TIMEVAL, HAVE_GETTIMEOFDAY, HAVE_FTIME) from rpython.rlib import rposix, rtime from rpython.translator.tool.cbuild import ExternalCompilationInfo -from rpython.rlib.objectmodel import we_are_translated -import math + +import errno import os +import math import sys import time as pytime |