Skip to content

Commit

Permalink
PEP8 PEP257 compliance.
Browse files Browse the repository at this point in the history
  • Loading branch information
stephan-hof authored and Michael Howitz committed Nov 9, 2016
1 parent 8e4c468 commit eba32f6
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 16 deletions.
6 changes: 2 additions & 4 deletions src/RestrictedPython/transformer.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,6 @@ def copy_locations(new_node, old_node):
ast.fix_missing_locations(new_node)




class RestrictingNodeTransformer(ast.NodeTransformer):

def __init__(self, errors=[], warnings=[], used_names=[]):
Expand All @@ -214,7 +212,7 @@ def gen_tmp_name(self):
# 'check_name' ensures that no variable is prefixed with '_'.
# => Its safe to use '_tmp..' as a temporary variable.
name = '_tmp%i' % self._tmp_idx
self._tmp_idx +=1
self._tmp_idx += 1
return name

def error(self, node, info):
Expand Down Expand Up @@ -1328,7 +1326,7 @@ def visit_Nonlocal(self, node):
return self.generic_visit(node)

def visit_ClassDef(self, node):
"""Checks the name of classes."""
"""Check the name of a class definition."""

self.check_name(node, node.name)
return self.generic_visit(node)
Expand Down
24 changes: 12 additions & 12 deletions tests/test_transformer.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,6 @@ def test_transformer__RestrictingNodeTransformer__guard_iter2(compile, mocker):
_getiter_.assert_has_calls(call_ref)
_getiter_.reset_mock()


ret = glb['set_comp'](it)
assert ret == {3, 7, 11}
_getiter_.assert_has_calls(call_ref)
Expand Down Expand Up @@ -573,7 +572,7 @@ def test_transformer__RestrictingNodeTransformer__visit_FunctionDef_1(compile):
assert errors[0] == err_msg


NESTED_SEQ_UNPACK = """
NESTED_SEQ_UNPACK = """
def nested((a, b, (c, (d, e)))):
return a, b, c, d, e
Expand Down Expand Up @@ -794,10 +793,11 @@ def try_except_else_finally(m):
m('finally')
"""


@pytest.mark.parametrize(*compile)
def test_transformer__RestrictingNodeTransformer__error_handling(compile, mocker):
code, errors = compile(TRY_EXCEPT_FINALLY)[:2]
assert code != None
assert code is not None

glb = {}
six.exec_(code, glb)
Expand Down Expand Up @@ -857,7 +857,7 @@ def tuple_unpack(err):
@pytest.mark.parametrize(*compile)
def test_transformer__RestrictingNodeTransformer__visit_ExceptHandler(compile, mocker):
code, errors = compile(EXCEPT_WITH_TUPLE_UNPACK)[:2]
assert code != None
assert code is not None

_getiter_ = mocker.stub()
_getiter_.side_effect = lambda it: it
Expand All @@ -884,35 +884,35 @@ def test_transformer__RestrictingNodeTransformer__visit_Import(compile):
'because it starts with "_"'

code, errors = compile('import a')[:2]
assert code != None
assert code is not None
assert errors == ()

code, errors = compile('import _a')[:2]
assert code == None
assert code is None
assert errors[0] == (errmsg % '_a')

code, errors = compile('import _a as m')[:2]
assert code == None
assert code is None
assert errors[0] == (errmsg % '_a')

code, errors = compile('import a as _m')[:2]
assert code == None
assert code is None
assert errors[0] == (errmsg % '_m')

code, errors = compile('from a import m')[:2]
assert code != None
assert code is not None
assert errors == ()

code, errors = compile('from _a import m')[:2]
assert code != None
assert code is not None
assert errors == ()

code, errors = compile('from a import m as _n')[:2]
assert code == None
assert code is None
assert errors[0] == (errmsg % '_n')

code, errors = compile('from a import _m as n')[:2]
assert code == None
assert code is None
assert errors[0] == (errmsg % '_m')


Expand Down

0 comments on commit eba32f6

Please sign in to comment.