Port with name test + fix other name tests.

src/RestrictedPython/tests/security_in_syntax26.py

@@ -3,10 +3,6 @@
 # Each function in this module is compiled using compile_restricted().
 
 
-def with_as_bad_name():
-    with x as _leading_underscore:
-        pass
-
 
 def relative_import_as_bad_name():
     from .x import y as _leading_underscore

src/RestrictedPython/transformer.py

@@ -1259,8 +1259,7 @@ def visit_ExceptHandler(self, node):
         return node
 
     def visit_With(self, node):
-        """Protects tuple unpacking on with statements. """
-
+        """Protect tuple unpacking on with statements. """
         node = self.node_contents_visit(node)
 
         if IS_PY2:

tests/test_transformer.py

@@ -70,7 +70,7 @@ def bad_name():
 
 @pytest.mark.parametrize(*compile)
 def test_transformer__RestrictingNodeTransformer__visit_Name__1(compile):
-    """It is an error if a variable name starts with `_`."""
+    """It is an error if a variable name starts with `__`."""
     result = compile(BAD_NAME_STARTING_WITH_UNDERSCORE)
     assert result.errors == (
         'Line 2: "__" is an invalid variable name because it starts with "_"',)
@@ -84,7 +84,7 @@ def overrideGuardWithName():
 
 @pytest.mark.parametrize(*compile)
 def test_transformer__RestrictingNodeTransformer__visit_Name__2(compile):
-    """It is an error if a variable name ends with `__roles__`."""
+    """It is an error if a variable name starts with `_`."""
     result = compile(BAD_NAME_OVERRIDE_GUARD_WITH_NAME)
     assert result.errors == (
         'Line 2: "_getattr" is an invalid variable name because '
@@ -100,7 +100,7 @@ def _getattr(o):
 
 @pytest.mark.parametrize(*compile)
 def test_transformer__RestrictingNodeTransformer__visit_Name__3(compile):
-    """It is an error if a variable name ends with `__roles__`."""
+    """It is an error if a function name starts with `_`."""
     result = compile(BAD_NAME_OVERRIDE_OVERRIDE_GUARD_WITH_FUNCTION)
     assert result.errors == (
         'Line 2: "_getattr" is an invalid variable name because it '
@@ -116,13 +116,29 @@ class _getattr:
 
 @pytest.mark.parametrize(*compile)
 def test_transformer__RestrictingNodeTransformer__visit_Name__4(compile):
-    """It is an error if a variable name ends with `__roles__`."""
+    """It is an error if a class name starts with `_`."""
     result = compile(BAD_NAME_OVERRIDE_GUARD_WITH_CLASS)
     assert result.errors == (
         'Line 2: "_getattr" is an invalid variable name because it '
         'starts with "_"',)
 
 
+BAD_NAME_IN_WITH = """\
+def with_as_bad_name():
+    with x as _leading_underscore:
+        pass
+"""
+
+
+@pytest.mark.parametrize(*compile)
+def test_transformer__RestrictingNodeTransformer__visit_Name__4_5(compile):
+    """It is an error if a variable in with starts with `_`."""
+    result = compile(BAD_NAME_IN_WITH)
+    assert result.errors == (
+        'Line 2: "_leading_underscore" is an invalid variable name because '
+        'it starts with "_"',)
+
+
 BAD_NAME_ENDING_WITH___ROLES__ = """\
 def bad_name():
     myvar__roles__ = 12