changeset 25178:ebc41dae840a

check-code: drop the yield inside try/finally ban This is now possible with Python 2.6.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 18 May 2015 12:56:59 -0500
parents c3459555318e
children 6dbbb4fa1892
files contrib/check-code.py tests/test-check-code.t
diffstat 2 files changed, 0 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/check-code.py	Mon May 18 15:34:42 2015 -0400
+++ b/contrib/check-code.py	Mon May 18 12:56:59 2015 -0500
@@ -217,9 +217,6 @@
     (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"),
--- a/tests/test-check-code.t	Mon May 18 15:34:42 2015 -0400
+++ b/tests/test-check-code.t	Mon May 18 12:56:59 2015 -0500
@@ -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 <<EOF
   > 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)