[Python-checkins] cpython: Close #12032: Fix scripts/crlf.py for Python 3

victor.stinner python-checkins at python.org
Mon May 9 01:29:31 CEST 2011


http://hg.python.org/cpython/rev/f94d74c85dcb
changeset:   69947:f94d74c85dcb
user:        Victor Stinner <victor.stinner at haypocalc.com>
date:        Mon May 09 01:29:30 2011 +0200
summary:
  Close #12032: Fix scripts/crlf.py for Python 3

files:
  Tools/scripts/crlf.py |  12 ++++++------
  1 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/Tools/scripts/crlf.py b/Tools/scripts/crlf.py
--- a/Tools/scripts/crlf.py
+++ b/Tools/scripts/crlf.py
@@ -8,16 +8,16 @@
         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()

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list