mirror of
https://github.com/python/cpython.git
synced 2025-12-04 00:30:19 +00:00
general cleaning up
This commit is contained in:
parent
fbf528f06c
commit
4177eff088
1 changed files with 3 additions and 11 deletions
|
|
@ -36,7 +36,6 @@ def status(message, modal=False, info=None):
|
||||||
def changed_files():
|
def changed_files():
|
||||||
"""Get the list of changed or added files from the VCS."""
|
"""Get the list of changed or added files from the VCS."""
|
||||||
if os.path.isdir('.hg'):
|
if os.path.isdir('.hg'):
|
||||||
vcs = 'hg'
|
|
||||||
cmd = 'hg status --added --modified --no-status'
|
cmd = 'hg status --added --modified --no-status'
|
||||||
else:
|
else:
|
||||||
sys.exit('need a checkout to get modified files')
|
sys.exit('need a checkout to get modified files')
|
||||||
|
|
@ -44,12 +43,7 @@ def changed_files():
|
||||||
st = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE)
|
st = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE)
|
||||||
try:
|
try:
|
||||||
st.wait()
|
st.wait()
|
||||||
if vcs == 'hg':
|
return [x.decode().rstrip() for x in st.stdout]
|
||||||
return [x.decode().rstrip() for x in st.stdout]
|
|
||||||
else:
|
|
||||||
output = (x.decode().rstrip().rsplit(None, 1)[-1]
|
|
||||||
for x in st.stdout if x[0] in b'AM')
|
|
||||||
return set(path for path in output if os.path.isfile(path))
|
|
||||||
finally:
|
finally:
|
||||||
st.stdout.close()
|
st.stdout.close()
|
||||||
|
|
||||||
|
|
@ -69,10 +63,8 @@ def report_modified_files(file_paths):
|
||||||
def normalize_whitespace(file_paths):
|
def normalize_whitespace(file_paths):
|
||||||
"""Make sure that the whitespace for .py files have been normalized."""
|
"""Make sure that the whitespace for .py files have been normalized."""
|
||||||
reindent.makebackup = False # No need to create backups.
|
reindent.makebackup = False # No need to create backups.
|
||||||
fixed = []
|
fixed = [path for path in file_paths if path.endswith('.py') and
|
||||||
for path in (x for x in file_paths if x.endswith('.py')):
|
reindent.check(path)]
|
||||||
if reindent.check(path):
|
|
||||||
fixed.append(path)
|
|
||||||
return fixed
|
return fixed
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue