diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2013-01-11 20:18:17 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-01-11 20:18:17 (GMT) |
| commit | a3a01b6ac3990ddd662b4bcf7de29050bd15c651 (patch) | |
| tree | 5a9846c30d96dfa5c017cfe9d90bf82a3357ca27 /Tools/scripts | |
| parent | 5e12bb728fd82476c38d824f53834438f7358089 (diff) | |
| download | cpython-a3a01b6ac3990ddd662b4bcf7de29050bd15c651.zip cpython-a3a01b6ac3990ddd662b4bcf7de29050bd15c651.tar.gz cpython-a3a01b6ac3990ddd662b4bcf7de29050bd15c651.tar.bz2 | |
Issue #15539: Fix a backup file creation in pindent.py on Windows.
Diffstat (limited to 'Tools/scripts')
| -rwxr-xr-x | Tools/scripts/pindent.py | 32 |
1 files changed, 20 insertions, 12 deletions
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 @@ def reformat_string(source, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = 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 @@ def complete_file(filename, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = 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 @@ def delete_file(filename, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = E 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 @@ def reformat_file(filename, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = 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 |