diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2015-08-30 10:51:30 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2015-08-30 10:51:30 -0400 |
| commit | 68a4d571547b409722e416e9254d8b9fb89f84a5 (patch) | |
| tree | 6bb777dd00c267be66b9d2a84fa8cd951c994bcb | |
| parent | 2f49934d1b525d0c99185b94ff58a699259a321c (diff) | |
| download | python-coveragepy-git-68a4d571547b409722e416e9254d8b9fb89f84a5.tar.gz | |
Greenlet is always availble, remove conditionalization.
| -rw-r--r-- | coverage/collector.py | 2 | ||||
| -rw-r--r-- | requirements.pip | 1 | ||||
| -rw-r--r-- | tests/test_concurrency.py | 5 |
3 files changed, 3 insertions, 5 deletions
diff --git a/coverage/collector.py b/coverage/collector.py index ea4d20ec..42a97f1a 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 ad413c1d..2cd8ffd1 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 f6af0e8a..6baffc8e 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): |