Merge pull request #143 from edx/bom-2341

BOM-2341 : Don't put amnesty on line continuation
openedx · Mar 16, 2021 · 0b621e2 · 0b621e2
2 parents c79c938 + 901fd1c
commit 0b621e2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -13,6 +13,12 @@ Change Log
 Unreleased
 ~~~~~~~~~~
 
+[4.1.1] - 2021-03-16
+~~~~~~~~~~~~~~~~~~~~
+
+* Fixed lint amnesty breakage on line continuation
+
+
 [4.1.0] - 2021-02-24
 ~~~~~~~~~~~~~~~~~~~~
 

diff --git a/edx_lint/__init__.py b/edx_lint/__init__.py
@@ -2,4 +2,4 @@
 edx_lint standardizes lint configuration and additional plugins for use in
 Open edX code.
 """
-VERSION = "4.1.0"
+VERSION = "4.1.1"
diff --git a/edx_lint/cmd/amnesty.py b/edx_lint/cmd/amnesty.py
@@ -117,6 +117,11 @@ def pylint_amnesty(pylint_output):
             with opened_file as input_file:
                 output_lines = []
                 for line_num, line in enumerate(input_file, start=1):
+                    # If the line ends with backslash, take the amnesty to next line because line of code has not ended
+                    if line.endswith('\\\n'):
+                        errors[file_with_errors][line_num + 1] = errors[file_with_errors][line_num]
+                        errors[file_with_errors][line_num] = set()
+
                     output_lines.extend(fix_pylint(line, errors[file_with_errors][line_num]))
 
             with open(file_with_errors, "w") as output_file: