summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--coverage/collector.py2
-rw-r--r--requirements.pip1
-rw-r--r--tests/test_concurrency.py5
3 files changed, 3 insertions, 5 deletions
diff --git a/coverage/collector.py b/coverage/collector.py
index ea4d20e..42a97f1 100644
--- a/coverage/collector.py
+++ b/coverage/collector.py
@@ -91,7 +91,7 @@ class Collector(object):
try:
if concurrency == "greenlet":
- import greenlet # pylint: disable=import-error,useless-suppression
+ import greenlet
self.concur_id_func = greenlet.getcurrent
elif concurrency == "eventlet":
import eventlet.greenthread # pylint: disable=import-error,useless-suppression
diff --git a/requirements.pip b/requirements.pip
index ad413c1..2cd8ffd 100644
--- a/requirements.pip
+++ b/requirements.pip
@@ -8,6 +8,7 @@ nose==1.3.7
tox==2.1.1
# and for linting...
+greenlet==0.4.7
mock==1.3.0
PyContracts==1.7.6
pyenchant==1.6.6
diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py
index f6af0e8..6baffc8 100644
--- a/tests/test_concurrency.py
+++ b/tests/test_concurrency.py
@@ -24,10 +24,7 @@ try:
except ImportError:
gevent = None
-try:
- import greenlet
-except ImportError:
- greenlet = None
+import greenlet
def line_count(s):