diff options
| author | Kevin Watters <kevinwatters@gmail.com> | 2014-02-28 10:16:54 -0800 |
|---|---|---|
| committer | Kevin Watters <kevinwatters@gmail.com> | 2014-02-28 10:16:54 -0800 |
| commit | e23218f530f6d3cffa7310d244f483fefa3a44eb (patch) | |
| tree | b1657b90343208b7497fdfcbc91e80b92ad5cf7c | |
| parent | 6c4d6b55fde8c84a0b441dc1b941c12aee8ceb90 (diff) | |
| parent | b24d50b88e26990118ef17d67ce6714c5e2ea31f (diff) | |
| download | pyflakes-e23218f530f6d3cffa7310d244f483fefa3a44eb.tar.gz | |
Merge pull request #26 from attilaolah/master
Check only if `sys.version_info < (3, 3)`
| -rw-r--r-- | pyflakes/checker.py | 3 | ||||
| -rw-r--r-- | pyflakes/test/test_return_with_arguments_inside_generator.py | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pyflakes/checker.py b/pyflakes/checker.py index f45bb86..c695354 100644 --- a/pyflakes/checker.py +++ b/pyflakes/checker.py @@ -14,6 +14,7 @@ if sys.version_info < (3, 0): else: PY2 = False builtin_vars = dir(__import__('builtins')) +PY32 = sys.version_info < (3, 3) # Python 2.5 to 3.2 PY33 = sys.version_info < (3, 4) # Python 2.5 to 3.3 try: @@ -805,7 +806,7 @@ class Checker(object): self.report(messages.UnusedVariable, binding.source, name) self.deferAssignment(checkUnusedAssignments) - if PY2: + if PY32: def checkReturnWithArgumentInsideGenerator(): """ Check to see if there are any return statements with diff --git a/pyflakes/test/test_return_with_arguments_inside_generator.py b/pyflakes/test/test_return_with_arguments_inside_generator.py index 8ec8234..fc1272a 100644 --- a/pyflakes/test/test_return_with_arguments_inside_generator.py +++ b/pyflakes/test/test_return_with_arguments_inside_generator.py @@ -6,7 +6,7 @@ from pyflakes.test.harness import TestCase, skipIf class Test(TestCase): - @skipIf(version_info >= (3,), 'new in Python 3') + @skipIf(version_info >= (3, 3), 'new in Python 3.3') def test_return(self): self.flakes(''' class a: @@ -17,7 +17,7 @@ class Test(TestCase): return a ''', m.ReturnWithArgsInsideGenerator) - @skipIf(version_info >= (3,), 'new in Python 3') + @skipIf(version_info >= (3, 3), 'new in Python 3.3') def test_returnNone(self): self.flakes(''' def a(): @@ -25,7 +25,7 @@ class Test(TestCase): return None ''', m.ReturnWithArgsInsideGenerator) - @skipIf(version_info >= (3,), 'new in Python 3') + @skipIf(version_info >= (3, 3), 'new in Python 3.3') def test_returnYieldExpression(self): self.flakes(''' def a(): |