Merged in alex_gaynor/coveragepy/alex_gaynor/improve-performance-of-coverage-under-py-1411425050845 (pull request #40)

Improve performance of coverage under PyPy.

1 files changed, 2 insertions, 11 deletions

diff --git a/coverage/config.py b/coverage/config.py
index c671ef7..ece68ba 100644
--- a/coverage/config.py
+++ b/coverage/config.py
@@ -140,7 +140,7 @@ class CoverageConfig(object):
 
         # Defaults for [run]
         self.branch = False
-        self.coroutine = None
+        self.concurrency = None
         self.cover_pylib = False
         self.data_file = ".coverage"
         self.parallel = False
@@ -173,15 +173,6 @@ class CoverageConfig(object):
         # Options for plugins
         self.plugin_options = {}
 
-    def from_environment(self, env_var):
-        """Read configuration from the `env_var` environment variable."""
-        # Timidity: for nose users, read an environment variable.  This is a
-        # cheap hack, since the rest of the command line arguments aren't
-        # recognized, but it solves some users' problems.
-        env = os.environ.get(env_var, '')
-        if env:
-            self.timid = ('--timid' in env)
-
     MUST_BE_LIST = ["omit", "include", "debug", "plugins"]
 
     def from_args(self, **kwargs):
@@ -235,7 +226,7 @@ class CoverageConfig(object):
 
         # [run]
         ('branch', 'run:branch', 'boolean'),
-        ('coroutine', 'run:coroutine'),
+        ('concurrency', 'run:concurrency'),
         ('cover_pylib', 'run:cover_pylib', 'boolean'),
         ('data_file', 'run:data_file'),
         ('debug', 'run:debug', 'list'),