github653224
diff --git a/‎its/ruling/src/test/resources/expected/python-S1764.json‎
Lines changed: 0 additions & 3 deletions b/‎its/ruling/src/test/resources/expected/python-S1764.json‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎python-checks/src/main/java/org/sonar/python/checks/IdenticalExpressionOnBinaryOperatorCheck.java‎
Lines changed: 7 additions & 4 deletions b/‎python-checks/src/main/java/org/sonar/python/checks/IdenticalExpressionOnBinaryOperatorCheck.java‎
Lines changed: 7 additions & 4 deletions
diff --git a/‎python-checks/src/test/resources/checks/identicalExpressionOnBinaryOperator.py‎
Lines changed: 6 additions & 0 deletions b/‎python-checks/src/test/resources/checks/identicalExpressionOnBinaryOperator.py‎
Lines changed: 6 additions & 0 deletions
@@ -46,9 +46,6 @@
 1140,
 1145,
 ],
-'project:numpy-1.16.4/numpy/lib/function_base.py':[
-2528,
-],
 'project:numpy-1.16.4/numpy/lib/nanfunctions.py':[
 75,
 ],
 
@@ -47,15 +47,18 @@ private static void checkBinaryExpression(SubscriptionContext ctx) {
     Expression leftOperand = binaryExpression.leftOperand();
     Expression rightOperand = binaryExpression.rightOperand();
     Token operator = binaryExpression.operator();
-    if (leftOperand.is(Tree.Kind.CALL_EXPR) || TreeUtils.hasDescendant(leftOperand, t -> t.is(Tree.Kind.CALL_EXPR))) {
-      return;
-    }
-    if (CheckUtils.areEquivalent(leftOperand, rightOperand) && !isLeftShiftBy1(leftOperand, operator)) {
+    if (CheckUtils.areEquivalent(leftOperand, rightOperand) && !isLeftShiftBy1(leftOperand, operator) && !isException(leftOperand)) {
       ctx.addIssue(rightOperand, "Correct one of the identical sub-expressions on both sides of operator \"" + operator.value() + "\".")
         .secondary(leftOperand, "");
     }
   }
 
+  private static boolean isException(Expression leftOperand) {
+    // Avoid raising issue if operands are function calls or within try/except blocks
+    return leftOperand.is(Tree.Kind.CALL_EXPR) || TreeUtils.hasDescendant(leftOperand, t -> t.is(Tree.Kind.CALL_EXPR))
+      || TreeUtils.firstAncestorOfKind(leftOperand, Tree.Kind.TRY_STMT) != null;
+  }
+
   private static boolean isLeftShiftBy1(Expression leftOperand, Token operator) {
     return "<<".equals(operator.value()) && leftOperand.is(Tree.Kind.NUMERIC_LITERAL) && ((NumericLiteral) leftOperand).valueAsLong() == 1;
   }
 
@@ -53,3 +53,9 @@ def no_issues_on_function_calls():
   if MyClass() == MyClass(): ...
   my_class = MyClass()
   if my_class.bar() == my_class.bar(): ...
+
+def no_issues_within_try_except():
+  try:
+    foo(c)
+  except ValueError:
+    return c / c