test_arcs now passes for all Python versions

--HG--
branch : ast-branch

2 files changed, 11 insertions, 2 deletions

diff --git a/coverage/parser.py b/coverage/parser.py
index b2618921..33480924 100644
--- a/coverage/parser.py
+++ b/coverage/parser.py
@@ -388,7 +388,12 @@ class AstArcAnalyzer(object):
     def is_constant_expr(self, node):
         """Is this a compile-time constant?"""
         node_name = node.__class__.__name__
-        return node_name in ["NameConstant", "Num"]
+        if node_name in ["NameConstant", "Num"]:
+            return True
+        elif node_name == "Name":
+            if env.PY3 and node.id in ["True", "False", "None"]:
+                return True
+        return False
 
     # tests to write:
     # TODO: while EXPR:
diff --git a/tests/test_arcs.py b/tests/test_arcs.py
index a9533e78..ea79d495 100644
--- a/tests/test_arcs.py
+++ b/tests/test_arcs.py
@@ -342,7 +342,7 @@ class LoopArcTest(CoverageTest):
             """,
             arcz=arcz, arcz_missing="", arcz_unpredicted="")
 
-    def test_other_comprehensions(self):
+    def test_generator_expression(self):
         # Generator expression:
         self.check_coverage("""\
             o = ((1,2), (3,4))
@@ -354,6 +354,10 @@ class LoopArcTest(CoverageTest):
             arcz=".1 .2 2-2 12 23 34 45 53 3.",
             arcz_missing="", arcz_unpredicted=""
         )
+
+    def test_other_comprehensions(self):
+        if env.PYVERSION < (2, 7):
+            self.skip("Don't have set or dict comprehensions before 2.7")
         # Set comprehension:
         self.check_coverage("""\
             o = ((1,2), (3,4))