diff options
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/a/assert_on_tuple.py | 2 | ||||
| -rw-r--r-- | tests/functional/c/comparison_with_callable.py | 2 | ||||
| -rw-r--r-- | tests/functional/c/consider/consider_using_in.py | 2 | ||||
| -rw-r--r-- | tests/functional/e/excess_escapes.py | 2 | ||||
| -rw-r--r-- | tests/functional/m/misplaced_bare_raise.py | 1 | ||||
| -rw-r--r-- | tests/functional/m/misplaced_bare_raise.txt | 14 | ||||
| -rw-r--r-- | tests/functional/m/misplaced_comparison_constant.py | 13 | ||||
| -rw-r--r-- | tests/functional/m/misplaced_comparison_constant.rc | 3 | ||||
| -rw-r--r-- | tests/functional/n/nan_comparison_check.py | 2 | ||||
| -rw-r--r-- | tests/functional/s/singleton_comparison.py | 2 | ||||
| -rw-r--r-- | tests/functional/u/use/use_implicit_booleaness_not_len.py | 2 | ||||
| -rw-r--r-- | tests/functional/u/use/using_constant_test.py | 1 |
12 files changed, 30 insertions, 16 deletions
diff --git a/tests/functional/a/assert_on_tuple.py b/tests/functional/a/assert_on_tuple.py index e360737e6..57dbd0907 100644 --- a/tests/functional/a/assert_on_tuple.py +++ b/tests/functional/a/assert_on_tuple.py @@ -1,6 +1,6 @@ '''Assert check example''' -# pylint: disable=misplaced-comparison-constant, comparison-with-itself +# pylint: disable=comparison-with-itself assert (1 == 1, 2 == 2), "no error" assert (1 == 1, 2 == 2) # [assert-on-tuple] assert 1 == 1, "no error" diff --git a/tests/functional/c/comparison_with_callable.py b/tests/functional/c/comparison_with_callable.py index b676844ae..fb02729d8 100644 --- a/tests/functional/c/comparison_with_callable.py +++ b/tests/functional/c/comparison_with_callable.py @@ -1,4 +1,4 @@ -# pylint: disable = disallowed-name, missing-docstring, useless-return, misplaced-comparison-constant, invalid-name, no-self-use, line-too-long, useless-object-inheritance +# pylint: disable = disallowed-name, missing-docstring, useless-return, invalid-name, no-self-use, line-too-long, useless-object-inheritance def foo(): return None diff --git a/tests/functional/c/consider/consider_using_in.py b/tests/functional/c/consider/consider_using_in.py index 7ce5dd0b6..5bc06e438 100644 --- a/tests/functional/c/consider/consider_using_in.py +++ b/tests/functional/c/consider/consider_using_in.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring, invalid-name, pointless-statement, misplaced-comparison-constant, undefined-variable, literal-comparison, line-too-long, unneeded-not, too-few-public-methods, use-implicit-booleaness-not-comparison +# pylint: disable=missing-docstring, invalid-name, pointless-statement, undefined-variable, literal-comparison, line-too-long, unneeded-not, too-few-public-methods, use-implicit-booleaness-not-comparison value = value1 = 1 value2 = 2 diff --git a/tests/functional/e/excess_escapes.py b/tests/functional/e/excess_escapes.py index 19fd5cb4d..a81dc7b9a 100644 --- a/tests/functional/e/excess_escapes.py +++ b/tests/functional/e/excess_escapes.py @@ -1,4 +1,4 @@ -# pylint:disable=pointless-string-statement, fixme, misplaced-comparison-constant, comparison-with-itself +# pylint:disable=pointless-string-statement, fixme, comparison-with-itself """Stray backslash escapes may be missing a raw-string prefix.""" # pylint: disable=redundant-u-string-prefix diff --git a/tests/functional/m/misplaced_bare_raise.py b/tests/functional/m/misplaced_bare_raise.py index 6148733e2..c704f0122 100644 --- a/tests/functional/m/misplaced_bare_raise.py +++ b/tests/functional/m/misplaced_bare_raise.py @@ -11,7 +11,6 @@ try: except Exception:
raise
-# pylint: disable=misplaced-comparison-constant
try:
pass
except Exception:
diff --git a/tests/functional/m/misplaced_bare_raise.txt b/tests/functional/m/misplaced_bare_raise.txt index 38e04f988..d64ff43cb 100644 --- a/tests/functional/m/misplaced_bare_raise.txt +++ b/tests/functional/m/misplaced_bare_raise.txt @@ -1,7 +1,7 @@ -misplaced-bare-raise:5:4::The raise statement is not inside an except clause -misplaced-bare-raise:36:16:test1.best:The raise statement is not inside an except clause -misplaced-bare-raise:39:4:test1:The raise statement is not inside an except clause -misplaced-bare-raise:40:0::The raise statement is not inside an except clause -misplaced-bare-raise:49:4::The raise statement is not inside an except clause -misplaced-bare-raise:57:4:A:The raise statement is not inside an except clause -misplaced-bare-raise:68:4::The raise statement is not inside an except clause +misplaced-bare-raise:5:4::The raise statement is not inside an except clause:HIGH +misplaced-bare-raise:35:16:test1.best:The raise statement is not inside an except clause:HIGH +misplaced-bare-raise:38:4:test1:The raise statement is not inside an except clause:HIGH +misplaced-bare-raise:39:0::The raise statement is not inside an except clause:HIGH +misplaced-bare-raise:48:4::The raise statement is not inside an except clause:HIGH +misplaced-bare-raise:56:4:A:The raise statement is not inside an except clause:HIGH +misplaced-bare-raise:67:4::The raise statement is not inside an except clause:HIGH diff --git a/tests/functional/m/misplaced_comparison_constant.py b/tests/functional/m/misplaced_comparison_constant.py index 29f2b1ed8..0162187bf 100644 --- a/tests/functional/m/misplaced_comparison_constant.py +++ b/tests/functional/m/misplaced_comparison_constant.py @@ -34,3 +34,16 @@ def good_comparison(): for i in range(10): if i == 5: pass + +def double_comparison(): + """Check that we return early for non-binary comparison""" + for i in range(10): + if i == 1 == 2: + pass + if 2 <= i <= 8: + print("Between 2 and 8 inclusive") + +def const_comparison(): + """Check that we return early for comparison of two constants""" + if 1 == 2: + pass diff --git a/tests/functional/m/misplaced_comparison_constant.rc b/tests/functional/m/misplaced_comparison_constant.rc new file mode 100644 index 000000000..abe6b9f27 --- /dev/null +++ b/tests/functional/m/misplaced_comparison_constant.rc @@ -0,0 +1,3 @@ +[MASTER] +load-plugins= + pylint.extensions.comparison_placement, diff --git a/tests/functional/n/nan_comparison_check.py b/tests/functional/n/nan_comparison_check.py index b01cf2636..b9a720b9a 100644 --- a/tests/functional/n/nan_comparison_check.py +++ b/tests/functional/n/nan_comparison_check.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring, invalid-name, misplaced-comparison-constant +# pylint: disable=missing-docstring, invalid-name # pylint: disable=literal-comparison,comparison-with-itself, import-error """Test detection of NaN value comparison.""" import numpy diff --git a/tests/functional/s/singleton_comparison.py b/tests/functional/s/singleton_comparison.py index d7ebdaf24..771a1d3cb 100644 --- a/tests/functional/s/singleton_comparison.py +++ b/tests/functional/s/singleton_comparison.py @@ -1,4 +1,4 @@ -# pylint: disable=missing-docstring, invalid-name, misplaced-comparison-constant,literal-comparison, comparison-with-itself +# pylint: disable=missing-docstring, invalid-name, literal-comparison, comparison-with-itself x = 42 a = x is None b = x == None # [singleton-comparison] diff --git a/tests/functional/u/use/use_implicit_booleaness_not_len.py b/tests/functional/u/use/use_implicit_booleaness_not_len.py index b4107ac2d..fa410a81b 100644 --- a/tests/functional/u/use/use_implicit_booleaness_not_len.py +++ b/tests/functional/u/use/use_implicit_booleaness_not_len.py @@ -1,4 +1,4 @@ -# pylint: disable=too-few-public-methods,import-error, missing-docstring, misplaced-comparison-constant +# pylint: disable=too-few-public-methods,import-error, missing-docstring # pylint: disable=useless-super-delegation,wrong-import-position,invalid-name, wrong-import-order, condition-evals-to-constant if len('TEST'): # [use-implicit-booleaness-not-len] diff --git a/tests/functional/u/use/using_constant_test.py b/tests/functional/u/use/using_constant_test.py index 74b8a9c1a..ca1ce013c 100644 --- a/tests/functional/u/use/using_constant_test.py +++ b/tests/functional/u/use/using_constant_test.py @@ -114,7 +114,6 @@ if not 3: if instance.method(): pass -# pylint: disable=misplaced-comparison-constant if 2 < 3: pass |