Move some test modules to keep them out of pylint's hair.

--HG--
rename : test/othermods/__init__.py => test/moremodules/othermods/__init__.py
rename : test/othermods/othera.py => test/moremodules/othermods/othera.py
rename : test/othermods/otherb.py => test/moremodules/othermods/otherb.py
rename : test/othermods/sub/__init__.py => test/moremodules/othermods/sub/__init__.py
rename : test/othermods/sub/osa.py => test/moremodules/othermods/sub/osa.py
rename : test/othermods/sub/osb.py => test/moremodules/othermods/sub/osb.py

9 files changed, 8 insertions, 4 deletions

diff --git a/coverage/config.py b/coverage/config.py
index f842964d..6b441ddc 100644
--- a/coverage/config.py
+++ b/coverage/config.py
@@ -99,7 +99,8 @@ class CoverageConfig(object):
 
         # [report]
         if cp.has_option('report', 'exclude_lines'):
-            self.exclude_list = self.get_line_list(cp, 'report', 'exclude_lines')
+            self.exclude_list = \
+                self.get_line_list(cp, 'report', 'exclude_lines')
         if cp.has_option('report', 'ignore_errors'):
             self.ignore_errors = cp.getboolean('report', 'ignore_errors')
         if cp.has_option('report', 'include'):
@@ -107,9 +108,11 @@ class CoverageConfig(object):
         if cp.has_option('report', 'omit'):
             self.omit = self.get_list(cp, 'report', 'omit')
         if cp.has_option('report', 'partial_branches'):
-            self.partial_list = self.get_line_list(cp, 'report', 'partial_branches')
+            self.partial_list = \
+                self.get_line_list(cp, 'report', 'partial_branches')
         if cp.has_option('report', 'partial_branches_always'):
-            self.partial_always_list = self.get_line_list(cp, 'report', 'partial_branches_always')
+            self.partial_always_list = \
+                self.get_line_list(cp, 'report', 'partial_branches_always')
         if cp.has_option('report', 'precision'):
             self.precision = cp.getint('report', 'precision')
 
diff --git a/test/othermods/__init__.py b/test/moremodules/othermods/__init__.py
index e69de29b..e69de29b 100644
--- a/test/othermods/__init__.py
+++ b/test/moremodules/othermods/__init__.py
diff --git a/test/othermods/othera.py b/test/moremodules/othermods/othera.py
index 78896928..78896928 100644
--- a/test/othermods/othera.py
+++ b/test/moremodules/othermods/othera.py
diff --git a/test/othermods/otherb.py b/test/moremodules/othermods/otherb.py
index 2bd8a441..2bd8a441 100644
--- a/test/othermods/otherb.py
+++ b/test/moremodules/othermods/otherb.py
diff --git a/test/othermods/sub/__init__.py b/test/moremodules/othermods/sub/__init__.py
index e69de29b..e69de29b 100644
--- a/test/othermods/sub/__init__.py
+++ b/test/moremodules/othermods/sub/__init__.py
diff --git a/test/othermods/sub/osa.py b/test/moremodules/othermods/sub/osa.py
index 0139d28b..0139d28b 100644
--- a/test/othermods/sub/osa.py
+++ b/test/moremodules/othermods/sub/osa.py
diff --git a/test/othermods/sub/osb.py b/test/moremodules/othermods/sub/osb.py
index b024b148..b024b148 100644
--- a/test/othermods/sub/osb.py
+++ b/test/moremodules/othermods/sub/osb.py
diff --git a/test/test_api.py b/test/test_api.py
index ae31404d..1805c39c 100644
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -337,10 +337,10 @@ class SourceOmitIncludeTest(CoverageTest):
     def setUp(self):
         super(SourceOmitIncludeTest, self).setUp()
         # Parent class saves and restores sys.path, we can just modify it.
-        #sys.path.append(self.nice_file(os.path.dirname(__file__), 'modules'))
         self.old_dir = os.getcwd()
         os.chdir(self.nice_file(os.path.dirname(__file__), 'modules'))
         sys.path.append(".")
+        sys.path.append("../moremodules")
 
     def tearDown(self):
         os.chdir(self.old_dir)
diff --git a/test/test_summary.py b/test/test_summary.py
index b4b99380..306ce883 100644
--- a/test/test_summary.py
+++ b/test/test_summary.py
@@ -139,6 +139,7 @@ class SummaryTest2(CoverageTest):
         super(SummaryTest2, self).setUp()
         # Parent class saves and restores sys.path, we can just modify it.
         sys.path.append(self.nice_file(os.path.dirname(__file__), 'modules'))
+        sys.path.append(self.nice_file(os.path.dirname(__file__), 'moremodules'))
 
     def test_empty_files(self):
         # Shows that empty files like __init__.py are listed as having zero