Issue #15539: Fix a backup file creation in pindent.py on Windows. · python-emscripten/cpython@1829bb4 · GitHub

1. python-emscripten
2. cpython

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 1829bb4

Browse filesBrowse the repository at this point in the historyBrowse files

serhiy-storchaka

committed

Issue python#15539: Fix a backup file creation in pindent.py on Windows.

2 parents cba18fe + b4fb2e2 commit 1829bb4
Copy full SHA for 1829bb4

2 files changed

+21-12Lines changed: 21 additions & 12 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Lib/test
  • test_tools.py
• Tools/scripts
  • pindent.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Lib/test/test_tools.py‎

Copy file name to clipboardExpand all lines: Lib/test/test_tools.py

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -59,6 +59,7 @@ def lstriplines(self, data):
59	59	return '\n'.join(line.lstrip() for line in data.splitlines()) + '\n'
60	60
61	61	def test_selftest(self):
	62	+ self.maxDiff = None
62	63	with temp_dir() as directory:
63	64	data_path = os.path.join(directory, '_test.py')
64	65	with open(self.script) as f:

Collapse file

‎Tools/scripts/pindent.py‎

Copy file name to clipboardExpand all lines: Tools/scripts/pindent.py

+20-12Lines changed: 20 additions & 12 deletions

Original file line number	Diff line number	Diff line change
@@ -370,17 +370,31 @@ def reformat_string(source, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs =
370	370	return output.getvalue()
371	371	# end def reformat_string
372	372
	373	+ def make_backup(filename):
	374	+ import os, os.path
	375	+ backup = filename + '~'
	376	+ if os.path.lexists(backup):
	377	+ try:
	378	+ os.remove(backup)
	379	+ except OSError:
	380	+ print("Can't remove backup %r" % (backup,), file=sys.stderr)
	381	+ # end try
	382	+ # end if
	383	+ try:
	384	+ os.rename(filename, backup)
	385	+ except OSError:
	386	+ print("Can't rename %r to %r" % (filename, backup), file=sys.stderr)
	387	+ # end try
	388	+ # end def make_backup
	389	+
373	390	def complete_file(filename, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = EXPANDTABS):
374	391	with open(filename, 'r') as f:
375	392	source = f.read()
376	393	# end with
377	394	result = complete_string(source, stepsize, tabsize, expandtabs)
378	395	if source == result: return 0
379	396	# end if
380		- import os
381		- try: os.rename(filename, filename + '~')
382		- except OSError: pass
383		- # end try
	397	+ make_backup(filename)
384	398	with open(filename, 'w') as f:
385	399	f.write(result)
386	400	# end with
@@ -394,10 +408,7 @@ def delete_file(filename, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = E
394	408	result = delete_string(source, stepsize, tabsize, expandtabs)
395	409	if source == result: return 0
396	410	# end if
397		- import os
398		- try: os.rename(filename, filename + '~')
399		- except OSError: pass
400		- # end try
	411	+ make_backup(filename)
401	412	with open(filename, 'w') as f:
402	413	f.write(result)
403	414	# end with
@@ -411,10 +422,7 @@ def reformat_file(filename, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs =
411	422	result = reformat_string(source, stepsize, tabsize, expandtabs)
412	423	if source == result: return 0
413	424	# end if
414		- import os
415		- try: os.rename(filename, filename + '~')
416		- except OSError: pass
417		- # end try
	425	+ make_backup(filename)
418	426	with open(filename, 'w') as f:
419	427	f.write(result)
420	428	# end with

0 commit comments

Comments

0 (0)