Tidy up the config code.

2 files changed, 13 insertions, 10 deletions

diff --git a/coverage/config.py b/coverage/config.py
index e90fc15c..3248177e 100644
--- a/coverage/config.py
+++ b/coverage/config.py
@@ -14,14 +14,16 @@ class CoverageConfig(object):
 
     def __init__(self):
         """Initialize the configuration attributes to their defaults."""
-        # Defaults.
+        # Defaults for [run]
+        self.branch = False
         self.cover_pylib = False
+        self.data_file = ".coverage"
         self.timid = False
-        self.branch = False
+
+        # Defaults for [report]
         self.exclude_list = ['(?i)# *pragma[: ]*no *cover']
-        self.data_file = ".coverage"
-        self.omit_prefixes = None
         self.ignore_errors = False
+        self.omit_prefixes = None
 
     def from_environment(self, env_var):
         """Read configuration from the `env_var` environment variable."""
@@ -48,14 +50,14 @@ class CoverageConfig(object):
         cp.read(files)
 
         # [run]
-        if cp.has_option('run', 'timid'):
-            self.timid = cp.getboolean('run', 'timid')
-        if cp.has_option('run', 'cover_pylib'):
-            self.cover_pylib = cp.getboolean('run', 'cover_pylib')
         if cp.has_option('run', 'branch'):
             self.branch = cp.getboolean('run', 'branch')
+        if cp.has_option('run', 'cover_pylib'):
+            self.cover_pylib = cp.getboolean('run', 'cover_pylib')
         if cp.has_option('run', 'data_file'):
             self.data_file = cp.get('run', 'data_file')
+        if cp.has_option('run', 'timid'):
+            self.timid = cp.getboolean('run', 'timid')
 
         # [report]
         if cp.has_option('report', 'exclude_lines'):
diff --git a/lab/cmd-opts.txt b/lab/cmd-opts.txt
index e6401ef4..3397d641 100644
--- a/lab/cmd-opts.txt
+++ b/lab/cmd-opts.txt
@@ -1,20 +1,21 @@
 coverage -e -x foo.py
 coverage run foo.py
 coverage run --timid foo.py
-coverage foo.py
+coverage foo.py *
 
 
 global args:
 
         -h  --help
         --rcfile                    string
+        --version
 
 
 commands:
 
     annotate -a
         -d --output-directory       string
-        -i --ignore-errors          bool
+        -i --ignore-errors          bool                [report].ignore_errors
         --omit                      list of string      [report].omit
 
     combine -c