diff --git a/contrib/check-code.py b/contrib/check-code.py --- a/contrib/check-code.py +++ b/contrib/check-code.py @@ -217,9 +217,6 @@ pypats = [ (r'(\w|\)),\w', "missing whitespace after ,"), (r'(\w|\))[+/*\-<>]\w', "missing whitespace in expression"), (r'^\s+(\w|\.)+=\w[^,()\n]*$', "missing whitespace in assignment"), - (r'(\s+)try:\n((?:\n|\1\s.*\n)*?)\1\s*yield\b.*?' - r'((?:\n|\1\s.*\n)+?)\1finally:', - 'no yield inside try/finally in Python 2.4'), (r'.{81}', "line too long"), (r' x+[xo][\'"]\n\s+[\'"]x', 'string join across lines with no space'), (r'[^\n]\Z', "no trailing newline"), diff --git a/tests/test-check-code.t b/tests/test-check-code.t --- a/tests/test-check-code.t +++ b/tests/test-check-code.t @@ -39,18 +39,6 @@ > finally: > pass > - > # yield inside a try/finally block is not allowed in Python 2.4 - > try: - > pass - > yield 1 - > finally: - > pass - > try: - > yield - > pass - > finally: - > pass - > > EOF $ cat > classstyle.py < class newstyle_class(object): @@ -83,12 +71,6 @@ ./non-py24.py:3: > y = format(x) format not available in Python 2.4 - ./non-py24.py:23: - > try: - no yield inside try/finally in Python 2.4 - ./non-py24.py:28: - > try: - no yield inside try/finally in Python 2.4 ./classstyle.py:4: > class oldstyle_class: old-style class, use class foo(object)