Issue #15539: Fix a backup file creation in pindent.py on Windows.
diff --git a/Lib/test/test_tools.py b/Lib/test/test_tools.py
index 4b33733..9403da7 100644
--- a/Lib/test/test_tools.py
+++ b/Lib/test/test_tools.py
@@ -58,6 +58,7 @@
return '\n'.join(line.lstrip() for line in data.splitlines()) + '\n'
def test_selftest(self):
+ self.maxDiff = None
with temp_dir() as directory:
data_path = os.path.join(directory, '_test.py')
with open(self.script) as f:
diff --git a/Tools/scripts/pindent.py b/Tools/scripts/pindent.py
index fd04c92..2872dc0 100755
--- a/Tools/scripts/pindent.py
+++ b/Tools/scripts/pindent.py
@@ -370,6 +370,23 @@
return output.getvalue()
# end def reformat_string
+def make_backup(filename):
+ import os, os.path
+ backup = filename + '~'
+ if os.path.lexists(backup):
+ try:
+ os.remove(backup)
+ except os.error:
+ print("Can't remove backup %r" % (backup,), file=sys.stderr)
+ # end try
+ # end if
+ try:
+ os.rename(filename, backup)
+ except os.error:
+ print("Can't rename %r to %r" % (filename, backup), file=sys.stderr)
+ # end try
+# end def make_backup
+
def complete_file(filename, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = EXPANDTABS):
with open(filename, 'r') as f:
source = f.read()
@@ -377,10 +394,7 @@
result = complete_string(source, stepsize, tabsize, expandtabs)
if source == result: return 0
# end if
- import os
- try: os.rename(filename, filename + '~')
- except os.error: pass
- # end try
+ make_backup(filename)
with open(filename, 'w') as f:
f.write(result)
# end with
@@ -394,10 +408,7 @@
result = delete_string(source, stepsize, tabsize, expandtabs)
if source == result: return 0
# end if
- import os
- try: os.rename(filename, filename + '~')
- except os.error: pass
- # end try
+ make_backup(filename)
with open(filename, 'w') as f:
f.write(result)
# end with
@@ -411,10 +422,7 @@
result = reformat_string(source, stepsize, tabsize, expandtabs)
if source == result: return 0
# end if
- import os
- try: os.rename(filename, filename + '~')
- except os.error: pass
- # end try
+ make_backup(filename)
with open(filename, 'w') as f:
f.write(result)
# end with