summaryrefslogtreecommitdiff
path: root/coverage
diff options
context:
space:
mode:
Diffstat (limited to 'coverage')
-rw-r--r--coverage/cmdline.py5
-rw-r--r--coverage/collector.py4
-rw-r--r--coverage/control.py4
3 files changed, 9 insertions, 4 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index 51aa5fe5..58f4817f 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -19,9 +19,12 @@ class Opts(object):
'', '--branch', action='store_true',
help="Measure branch coverage in addition to statement coverage."
)
+ CONCURRENCY_CHOICES = ["thread", "gevent", "greenlet", "eventlet"]
concurrency = optparse.make_option(
'', '--concurrency', action='store', metavar="LIB",
- help="Properly measure code using a concurrency library."
+ choices=CONCURRENCY_CHOICES,
+ help="Properly measure code using a concurrency library. "
+ "Valid values are: %s." % ", ".join(CONCURRENCY_CHOICES)
)
debug = optparse.make_option(
'', '--debug', action='store', metavar="OPTS",
diff --git a/coverage/collector.py b/coverage/collector.py
index 07318240..9c6288cd 100644
--- a/coverage/collector.py
+++ b/coverage/collector.py
@@ -68,7 +68,9 @@ class Collector(object):
`warn` is a warning function, taking a single string message argument,
to be used if a warning needs to be issued.
- TODO: `concurrency`
+ `concurrency` is a string indicating the concurrency library in use.
+ Valid values are "greenlet", "eventlet", "gevent", or "thread" (the
+ default).
"""
self.should_trace = should_trace
diff --git a/coverage/control.py b/coverage/control.py
index 510ced7b..cc1ad36c 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -86,8 +86,8 @@ class Coverage(object):
`concurrency` is a string indicating the concurrency library being used
in the measured code. Without this, coverage.py will get incorrect
- results. Valid strings are "greenlet", "eventlet", or "gevent", which
- are all equivalent. TODO: really?
+ results. Valid strings are "greenlet", "eventlet", "gevent", or
+ "thread" (the default).
`plugins` TODO.