diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
| commit | 4b0aa73b8c69bd5b7521337809f7bc4714209a5a (patch) | |
| tree | 75f4c36771caf222280249cd1ed611d5ade8bd48 /tests/test-check-code.t | |
| parent | 59a96880b5d035db83067acda8345497c75d7716 (diff) | |
| parent | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff) | |
| download | mercurial-tarball-4b0aa73b8c69bd5b7521337809f7bc4714209a5a.tar.gz | |
Merge remote-tracking branch 'origin/master' into baserock/morphbaserock/morph
This changes us to 1.9.3 which might stand a better chance of being
usable by Lorry.
We also undo the setup.py change because python now supports bz2
Diffstat (limited to 'tests/test-check-code.t')
| -rw-r--r-- | tests/test-check-code.t | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/tests/test-check-code.t b/tests/test-check-code.t index ee061d8..193020e 100644 --- a/tests/test-check-code.t +++ b/tests/test-check-code.t @@ -26,23 +26,6 @@ > # Do not complain about our own definition > def any(x): > pass - > - > # try/except/finally block does not exist in Python 2.4 - > try: - > pass - > except StandardError, inst: - > pass - > finally: - > pass - > - > # nested try/finally+try/except is allowed - > try: - > try: - > pass - > except StandardError, inst: - > pass - > finally: - > pass > EOF $ cat > classstyle.py <<EOF > class newstyle_class(object): @@ -67,8 +50,8 @@ Python keyword is not a function ./wrong.py:3: > return ( 5+6, 9) - gratuitous whitespace in () or [] missing whitespace in expression + gratuitous whitespace in () or [] ./quote.py:5: > '"""', 42+1, """and missing whitespace in expression @@ -81,9 +64,6 @@ ./non-py24.py:4: > y = format(x) any/all/format not available in Python 2.4 - ./non-py24.py:11: - > try: - no try/except/finally in Py2.4 ./classstyle.py:4: > class oldstyle_class: old-style class, use class foo(object) @@ -132,11 +112,3 @@ object comparison with literal [1] - $ cat > warning.py <<EOF - > except: - > EOF - $ "$check_code" warning.py --warning --nolineno - warning.py:0: - > except: - warning: naked except clause - [1] |