diff options
author | Éric Araujo <merwok@netwok.org> | 2011-08-12 17:40:05 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-08-12 17:40:05 (GMT) |
commit | 1bf5b6a4544bc06c630510c9b099c49a4ab2a5ea (patch) | |
tree | f8944a184d4ea90bfaa37dc0ef6754b871655a05 | |
parent | fbc5ff6235e5fb53900d17f2bb69caec03240ba4 (diff) | |
download | cpython-1bf5b6a4544bc06c630510c9b099c49a4ab2a5ea.zip cpython-1bf5b6a4544bc06c630510c9b099c49a4ab2a5ea.tar.gz cpython-1bf5b6a4544bc06c630510c9b099c49a4ab2a5ea.tar.bz2 |
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.
-rwxr-xr-x | Tools/scripts/crlf.py | 12 | ||||
-rwxr-xr-x | Tools/scripts/lfcr.py | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Tools/scripts/crlf.py b/Tools/scripts/crlf.py index 0622282..f231d29 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 d094022..bf8fe1c 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() |