From: Éric Araujo <merwok@netwok.org>
Date: Fri, 12 Aug 2011 17:40:05 +0000 (+0200)
Subject: Update crlf and lfcr scripts for 3.x bytes semantics (#12032).
X-Git-Tag: v3.2.2rc1~8^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1bf5b6a4544bc06c630510c9b099c49a4ab2a5ea;p=thirdparty%2FPython%2Fcpython.git

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 0622282f9997..f231d292cebe 100755
--- 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 d0940223c7da..bf8fe1c245ef 100755
--- 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()