Test the config file support.

3 files changed, 11 insertions, 3 deletions

diff --git a/coverage/backward.py b/coverage/backward.py
index 66cfbb9..624daa2 100644
--- a/coverage/backward.py
+++ b/coverage/backward.py
@@ -70,3 +70,10 @@ def exec_function(source, filename, global_map):
 """,
     "<exec_function>", "exec"
     ))
+
+# ConfigParser was renamed to the more-standard configparser
+
+try:
+    import configparser
+except ImportError:
+    import ConfigParser as configparser
diff --git a/coverage/config.py b/coverage/config.py
index 0596cc0..e95b74e 100644
--- a/coverage/config.py
+++ b/coverage/config.py
@@ -1,6 +1,7 @@
 """Config file for coverage.py"""
 
-import ConfigParser, os
+import os
+from coverage.backward import configparser          # pylint: disable-msg=W0622
 
 
 class CoverageConfig(object):
@@ -25,7 +26,7 @@ class CoverageConfig(object):
                 setattr(self, k, v)
 
     def from_file(self, *files):
-        cp = ConfigParser.RawConfigParser()
+        cp = configparser.RawConfigParser()
         cp.read(files)
         
         if cp.has_option('run', 'timid'):
diff --git a/coverage/control.py b/coverage/control.py
index f947816..121f52b 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -3,7 +3,7 @@
 import os, socket
 
 from coverage.annotate import AnnotateReporter
-from coverage.backward import string_class          # pylint: disable-msg=W0622
+from coverage.backward import string_class          
 from coverage.codeunit import code_unit_factory, CodeUnit
 from coverage.collector import Collector
 from coverage.config import CoverageConfig