Branch merge

This commit is contained in:
Éric Araujo 2011-08-12 19:52:43 +02:00
commit c2d2c720d4
2 changed files with 12 additions and 12 deletions

View File

@ -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()

View File

@ -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()