fixes #61944 fixed backslash literal bytestring

saltstack · May 19, 2022 · 5e03515 · 5e03515
1 parent c4593b8
commit 5e03515
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/changelog/61944.fixed b/changelog/61944.fixed
@@ -0,0 +1 @@
+fixed error when using backslash literal in file.replace
diff --git a/salt/modules/file.py b/salt/modules/file.py
@@ -2563,7 +2563,7 @@ def replace(
             else:
                 result, nrepl = re.subn(
                     cpattern,
-                    repl.replace("\\", "\\\\") if backslash_literal else repl,
+                    repl.replace(b"\\", b"\\\\") if backslash_literal else repl,
                     r_data,
                     count,
                 )
@@ -2624,7 +2624,7 @@ def replace(
                         r_data = mmap.mmap(r_file.fileno(), 0, access=mmap.ACCESS_READ)
                         result, nrepl = re.subn(
                             cpattern,
-                            repl.replace("\\", "\\\\") if backslash_literal else repl,
+                            repl.replace(b"\\", b"\\\\") if backslash_literal else repl,
                             r_data,
                             count,
                         )

diff --git a/tests/pytests/functional/modules/file/test_replace.py b/tests/pytests/functional/modules/file/test_replace.py
@@ -205,3 +205,8 @@ def test_replace_no_modify_time_update_on_no_change(file, multiline_file):
     nmtime = os.stat(str(multiline_file)).st_mtime
 
     assert mtime == nmtime
+
+
+def test_backslash_literal(file, multiline_file):
+    file.replace(str(multiline_file), r"Etiam", "Emma", backslash_literal=True)
+    assert "Emma" in multiline_file.read_text()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fixed error when using backslash literal in file.replace