From 5ec61312c563df13c29e67dc5cb3e003f8f492f6 Mon Sep 17 00:00:00 2001 From: Claudiu Popa Date: Mon, 26 Oct 2015 16:39:53 +0000 Subject: Use the representation of the context when building the message for misplaced-comparison-constant. --- pylint/checkers/base.py | 3 +-- pylint/test/functional/misplaced_comparison_constant.py | 2 ++ pylint/test/functional/misplaced_comparison_constant.txt | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pylint/checkers/base.py b/pylint/checkers/base.py index fd3f285..cd4a81e 100644 --- a/pylint/checkers/base.py +++ b/pylint/checkers/base.py @@ -1494,7 +1494,7 @@ class ComparisonChecker(_BasicChecker): if isinstance(right, astroid.Const): return operator = REVERSED_COMPS.get(operator, operator) - suggestion = '%s %s %s' % (right.as_string(), operator, left.value) + suggestion = '%s %s %r' % (right.as_string(), operator, left.value) self.add_message('misplaced-comparison-constant', node=node, args=(suggestion,)) @@ -1504,7 +1504,6 @@ class ComparisonChecker(_BasicChecker): # but not 'x == y == 42' if len(node.ops) != 1: return - left = node.left operator, right = node.ops[0] if operator == '==': diff --git a/pylint/test/functional/misplaced_comparison_constant.py b/pylint/test/functional/misplaced_comparison_constant.py index 50416a5..45a03d1 100644 --- a/pylint/test/functional/misplaced_comparison_constant.py +++ b/pylint/test/functional/misplaced_comparison_constant.py @@ -26,6 +26,8 @@ def bad_comparisons(): pass if 1 == instance.attr: # [misplaced-comparison-constant] pass + if "aaa" == instance.attr: # [misplaced-comparison-constant] + pass def good_comparison(): """this is ok""" diff --git a/pylint/test/functional/misplaced_comparison_constant.txt b/pylint/test/functional/misplaced_comparison_constant.txt index 8933f74..a7f0d95 100644 --- a/pylint/test/functional/misplaced_comparison_constant.txt +++ b/pylint/test/functional/misplaced_comparison_constant.txt @@ -3,3 +3,4 @@ misplaced-comparison-constant:21:bad_comparisons:Comparison should be i == 1 misplaced-comparison-constant:23:bad_comparisons:Comparison should be dummy_return() > 3 misplaced-comparison-constant:25:bad_comparisons:Comparison should be instance.dummy_return() != 4 misplaced-comparison-constant:27:bad_comparisons:Comparison should be instance.attr == 1 +misplaced-comparison-constant:29:bad_comparisons:Comparison should be instance.attr == 'aaa' -- cgit v1.2.1