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.
This commit is contained in:
parent
fbc5ff6235
commit
1bf5b6a454
|
@ -8,16 +8,16 @@ def main():
|
||||||
if os.path.isdir(filename):
|
if os.path.isdir(filename):
|
||||||
print(filename, "Directory!")
|
print(filename, "Directory!")
|
||||||
continue
|
continue
|
||||||
data = open(filename, "rb").read()
|
with open(filename, "rb") as f:
|
||||||
if '\0' in data:
|
data = f.read()
|
||||||
|
if b'\0' in data:
|
||||||
print(filename, "Binary!")
|
print(filename, "Binary!")
|
||||||
continue
|
continue
|
||||||
newdata = data.replace("\r\n", "\n")
|
newdata = data.replace(b"\r\n", b"\n")
|
||||||
if newdata != data:
|
if newdata != data:
|
||||||
print(filename)
|
print(filename)
|
||||||
f = open(filename, "wb")
|
with open(filename, "wb") as f:
|
||||||
f.write(newdata)
|
f.write(newdata)
|
||||||
f.close()
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
|
|
|
@ -9,16 +9,16 @@ def main():
|
||||||
if os.path.isdir(filename):
|
if os.path.isdir(filename):
|
||||||
print(filename, "Directory!")
|
print(filename, "Directory!")
|
||||||
continue
|
continue
|
||||||
data = open(filename, "rb").read()
|
with open(filename, "rb") as f:
|
||||||
if '\0' in data:
|
data = f.read()
|
||||||
|
if b'\0' in data:
|
||||||
print(filename, "Binary!")
|
print(filename, "Binary!")
|
||||||
continue
|
continue
|
||||||
newdata = re.sub("\r?\n", "\r\n", data)
|
newdata = re.sub(b"\r?\n", b"\r\n", data)
|
||||||
if newdata != data:
|
if newdata != data:
|
||||||
print(filename)
|
print(filename)
|
||||||
f = open(filename, "wb")
|
with open(filename, "wb") as f:
|
||||||
f.write(newdata)
|
f.write(newdata)
|
||||||
f.close()
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
|
|
Loading…
Reference in New Issue