Mercurial > hg-stable
changeset 25142:24140873ca4c
check-code: lift the ban on 'next()'
'next' is supported by Python2.6 the new lowest version supported by Mercurial.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Sun, 17 May 2015 17:47:42 -0700 |
| parents | 3ea8d6b5e665 |
| children | 91c49621b2b8 |
| files | contrib/check-code.py tests/test-check-code.t |
| diffstat | 2 files changed, 2 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/check-code.py Sun May 17 17:45:47 2015 -0700 +++ b/contrib/check-code.py Sun May 17 17:47:42 2015 -0700 @@ -217,8 +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'(?<!def)(\s+|^|\()next\(.+\)', - 'no next(foo) in Python 2.4 and 2.5, use foo.next() instead'), (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'),
--- a/tests/test-check-code.t Sun May 17 17:45:47 2015 -0700 +++ b/tests/test-check-code.t Sun May 17 17:47:42 2015 -0700 @@ -22,13 +22,6 @@ > if any(): > x = all() > y = format(x) - > # next(generator) is new in 2.6 - > z = next(x) - > # but generator.next() is okay - > x.next() - > # and we can make our own next - > def next(stuff): - > pass > > # Do not complain about our own definition > def any(x): @@ -101,13 +94,10 @@ ./non-py24.py:4: > y = format(x) any/all/format not available in Python 2.4 - ./non-py24.py:6: - > z = next(x) - no next(foo) in Python 2.4 and 2.5, use foo.next() instead - ./non-py24.py:35: + ./non-py24.py:28: > try: no yield inside try/finally in Python 2.4 - ./non-py24.py:40: + ./non-py24.py:33: > try: no yield inside try/finally in Python 2.4 ./classstyle.py:4: