mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-09 20:35:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge fixes for #9860, #11104/#8688 and #12331 from 3.2

Browse source
This commit is contained in:
Éric Araujo 2011-07-31 18:33:00 +02:00
commit ad548b8534
7 changed files with 111 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Tools/scripts/patchcheck.py
View file

@ -4,11 +4,15 @@ import sys
import shutil
import os.path
import subprocess
import sysconfig
import reindent
import untabify
SRCDIR = sysconfig.get_config_var('srcdir')
def n_files_str(count):
"""Return 'N file(s)' with the proper plurality on 'file'."""
return "{} file{}".format(count, "s" if count != 1 else "")
@ -36,7 +40,7 @@ def status(message, modal=False, info=None):
info=lambda x: n_files_str(len(x)))
def changed_files():
"""Get the list of changed or added files from the VCS."""
if os.path.isdir('.hg'):
if os.path.isdir(os.path.join(SRCDIR, '.hg')):
cmd = 'hg status --added --modified --no-status'
else:
sys.exit('need a checkout to get modified files')
@ -65,7 +69,7 @@ def normalize_whitespace(file_paths):
"""Make sure that the whitespace for .py files have been normalized."""
reindent.makebackup = False # No need to create backups.
fixed = [path for path in file_paths if path.endswith('.py') and
reindent.check(path)]
reindent.check(os.path.join(SRCDIR, path))]
return fixed
@ -74,10 +78,11 @@ def normalize_c_whitespace(file_paths):
"""Report if any C files """
fixed = []
for path in file_paths:
with open(path, 'r') as f:
abspath = os.path.join(SRCDIR, path)
with open(abspath, 'r') as f:
if '\t' not in f.read():
continue
untabify.process(path, 8, verbose=False)
untabify.process(abspath, 8, verbose=False)
fixed.append(path)
return fixed
@ -88,13 +93,14 @@ ws_re = re.compile(br'\s+(\r?\n)$')
def normalize_docs_whitespace(file_paths):
fixed = []
for path in file_paths:
abspath = os.path.join(SRCDIR, path)
try:
with open(path, 'rb') as f:
with open(abspath, 'rb') as f:
lines = f.readlines()
new_lines = [ws_re.sub(br'\1', line) for line in lines]
if new_lines != lines:
shutil.copyfile(path, path + '.bak')
with open(path, 'wb') as f:
shutil.copyfile(abspath, abspath + '.bak')
with open(abspath, 'wb') as f:
f.writelines(new_lines)
fixed.append(path)
except Exception as err: