Update crlf and lfcr scripts for 3.x bytes semantics (#12032).

Changes to crlf originally by Victor Stinner for 3.3, copied to lfcr by
me.  Manually tested.

diff --git a/Tools/scripts/crlf.py b/Tools/scripts/crlf.py
index 0622282f99979f322bdb3e58457628eb252d7f94..f231d292cebecdbda51f7e01b8c67beb15f0f4fa 100755 (executable)
--- a/Tools/scripts/crlf.py
+++ b/Tools/scripts/crlf.py
@@ -8,16 +8,16 @@ def main():
         if os.path.isdir(filename):
             print(filename, "Directory!")
             continue
-        data = open(filename, "rb").read()
-        if '\0' in data:
+        with open(filename, "rb") as f:
+            data = f.read()
+        if b'\0' in data:
             print(filename, "Binary!")
             continue
-        newdata = data.replace("\r\n", "\n")
+        newdata = data.replace(b"\r\n", b"\n")
         if newdata != data:
             print(filename)
-            f = open(filename, "wb")
-            f.write(newdata)
-            f.close()
+            with open(filename, "wb") as f:
+                f.write(newdata)
 
 if __name__ == '__main__':
     main()

diff --git a/Tools/scripts/lfcr.py b/Tools/scripts/lfcr.py
index d0940223c7da1e246867a264b895850834eb3da0..bf8fe1c245ef4c0dda7c52247a11a42554f5ad39 100755 (executable)
--- a/Tools/scripts/lfcr.py
+++ b/Tools/scripts/lfcr.py
@@ -9,16 +9,16 @@ def main():
         if os.path.isdir(filename):
             print(filename, "Directory!")
             continue
-        data = open(filename, "rb").read()
-        if '\0' in data:
+        with open(filename, "rb") as f:
+            data = f.read()
+        if b'\0' in data:
             print(filename, "Binary!")
             continue
-        newdata = re.sub("\r?\n", "\r\n", data)
+        newdata = re.sub(b"\r?\n", b"\r\n", data)
         if newdata != data:
             print(filename)
-            f = open(filename, "wb")
-            f.write(newdata)
-            f.close()
+            with open(filename, "wb") as f:
+                f.write(newdata)
 
 if __name__ == '__main__':
     main()