Skip to content

Commit

Permalink
Only install monotonic on python2 (#583)
Browse files Browse the repository at this point in the history
Only install monotonic on python<3.5

Co-authored-by: Sergey Shepelev <temotor@gmail.com>
  • Loading branch information
yazug and temoto committed Oct 22, 2020
1 parent 7b1aa58 commit e918595
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
7 changes: 5 additions & 2 deletions eventlet/__init__.py
Expand Up @@ -21,8 +21,11 @@
# Helpful when CPython < 3.5 on Linux blocked in `os.waitpid(-1)` before first use of hub.
# Example: gunicorn
# https://github.com/eventlet/eventlet/issues/401#issuecomment-327500352
import monotonic
del monotonic
try:
import monotonic
del monotonic
except ImportError:
pass

connect = convenience.connect
listen = convenience.listen
Expand Down
8 changes: 6 additions & 2 deletions eventlet/hubs/hub.py
Expand Up @@ -22,7 +22,11 @@ def alarm_signal(seconds):
import eventlet.hubs
from eventlet.hubs import timer
from eventlet.support import greenlets as greenlet, clear_sys_exc_info
import monotonic
try:
from monotonic import monotonic
except ImportError:
from time import monotonic

import six

g_prevent_multiple_readers = True
Expand Down Expand Up @@ -120,7 +124,7 @@ def __init__(self, clock=None):
self.closed = []

if clock is None:
clock = monotonic.monotonic
clock = monotonic
self.clock = clock

self.greenlet = greenlet.greenlet(self.run)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -17,7 +17,7 @@
install_requires=(
'dnspython >= 1.15.0, < 2.0.0',
'greenlet >= 0.3',
'monotonic >= 1.4',
'monotonic >= 1.4;python_version<"3.5"',
'six >= 1.10.0',
),
zip_safe=False,
Expand Down

0 comments on commit e918595

Please sign in to comment.