More refactoring of hacked Mako support

1 files changed, 27 insertions, 27 deletions

diff --git a/tests/test_parser.py b/tests/test_parser.py
index 6c7c8d99..5b90f342 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -2,23 +2,23 @@
 
 import textwrap
 from tests.coveragetest import CoverageTest
-from coverage.parser import CodeParser
+from coverage.parser import PythonParser
 
 
-class ParserTest(CoverageTest):
-    """Tests for Coverage.py's code parsing."""
+class PythonParserTest(CoverageTest):
+    """Tests for Coverage.py's Python code parsing."""
 
     run_in_temp_dir = False
 
     def parse_source(self, text):
-        """Parse `text` as source, and return the `CodeParser` used."""
+        """Parse `text` as source, and return the `PythonParser` used."""
         text = textwrap.dedent(text)
-        cp = CodeParser(None, text=text, exclude="nocover")
-        cp.parse_source()
-        return cp
+        parser = PythonParser(None, text=text, exclude="nocover")
+        parser.parse_source()
+        return parser
 
     def test_exit_counts(self):
-        cp = self.parse_source("""\
+        parser = self.parse_source("""\
             # check some basic branch counting
             class Foo:
                 def foo(self, a):
@@ -30,12 +30,12 @@ class ParserTest(CoverageTest):
             class Bar:
                 pass
             """)
-        self.assertEqual(cp.exit_counts(), {
+        self.assertEqual(parser.exit_counts(), {
             2:1, 3:1, 4:2, 5:1, 7:1, 9:1, 10:1
             })
 
     def test_try_except(self):
-        cp = self.parse_source("""\
+        parser = self.parse_source("""\
             try:
                 a = 2
             except ValueError:
@@ -46,12 +46,12 @@ class ParserTest(CoverageTest):
                 a = 8
             b = 9
             """)
-        self.assertEqual(cp.exit_counts(), {
+        self.assertEqual(parser.exit_counts(), {
             1: 1, 2:1, 3:1, 4:1, 5:1, 6:1, 7:1, 8:1, 9:1
             })
 
     def test_excluded_classes(self):
-        cp = self.parse_source("""\
+        parser = self.parse_source("""\
             class Foo:
                 def __init__(self):
                     pass
@@ -60,20 +60,20 @@ class ParserTest(CoverageTest):
                 class Bar:
                     pass
             """)
-        self.assertEqual(cp.exit_counts(), {
+        self.assertEqual(parser.exit_counts(), {
             1:0, 2:1, 3:1
             })
 
     def test_missing_branch_to_excluded_code(self):
-        cp = self.parse_source("""\
+        parser = self.parse_source("""\
             if fooey:
                 a = 2
             else:   # nocover
                 a = 4
             b = 5
             """)
-        self.assertEqual(cp.exit_counts(), { 1:1, 2:1, 5:1 })
-        cp = self.parse_source("""\
+        self.assertEqual(parser.exit_counts(), { 1:1, 2:1, 5:1 })
+        parser = self.parse_source("""\
             def foo():
                 if fooey:
                     a = 3
@@ -81,8 +81,8 @@ class ParserTest(CoverageTest):
                     a = 5
             b = 6
             """)
-        self.assertEqual(cp.exit_counts(), { 1:1, 2:2, 3:1, 5:1, 6:1 })
-        cp = self.parse_source("""\
+        self.assertEqual(parser.exit_counts(), { 1:1, 2:2, 3:1, 5:1, 6:1 })
+        parser = self.parse_source("""\
             def foo():
                 if fooey:
                     a = 3
@@ -90,17 +90,17 @@ class ParserTest(CoverageTest):
                     a = 5
             b = 6
             """)
-        self.assertEqual(cp.exit_counts(), { 1:1, 2:1, 3:1, 6:1 })
+        self.assertEqual(parser.exit_counts(), { 1:1, 2:1, 3:1, 6:1 })
 
 
 class ParserFileTest(CoverageTest):
     """Tests for Coverage.py's code parsing from files."""
 
     def parse_file(self, filename):
-        """Parse `text` as source, and return the `CodeParser` used."""
-        cp = CodeParser(None, filename=filename, exclude="nocover")
-        cp.parse_source()
-        return cp
+        """Parse `text` as source, and return the `PythonParser` used."""
+        parser = PythonParser(None, filename=filename, exclude="nocover")
+        parser.parse_source()
+        return parser
 
     def test_line_endings(self):
         text = """\
@@ -120,12 +120,12 @@ class ParserFileTest(CoverageTest):
         for fname, newline in name_endings:
             fname = fname + ".py"
             self.make_file(fname, text, newline=newline)
-            cp = self.parse_file(fname)
-            self.assertEqual(cp.exit_counts(), counts)
+            parser = self.parse_file(fname)
+            self.assertEqual(parser.exit_counts(), counts)
 
     def test_encoding(self):
         self.make_file("encoded.py", """\
             coverage = "\xe7\xf6v\xear\xe3g\xe9"
             """)
-        cp = self.parse_file("encoded.py")
-        cp.exit_counts()
+        parser = self.parse_file("encoded.py")
+        parser.exit_counts()        # TODO: This value should be tested!