Merge pull request #3435 from semgrep/merge-develop-to-release

Merge Develop into Release

python/lang/correctness/baseclass-attribute-override.yaml

@@ -9,17 +9,19 @@ rules:
       - pattern-inside: |
           class $A(...):
             ...
-            def $F(...):
+            def $F1(...):
               ...
             ...
           ...
       - pattern-inside: |
           class $B(...):
             ...
-            def $F(...):
+            def $F2(...):
               ...
             ...
           ...
+      - metavariable-comparison:
+          comparison: str($F1) == str($F2)
       - pattern: |
           class $C(..., $A, ..., $B, ...):
             ...