Mercurial > cpython-lru_cache-weakref

annotate Tools/scripts/patchcheck.py @ 80661:94de77bd0b4b 2.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue #16194: document imp.load_dynamic problems when read several extension modules from the same binary object file.
author Andrew Svetlov <andrew.svetlov@gmail.com>
date Thu, 29 Nov 2012 19:51:28 +0200
parents 179bc7557484
children 1cfe0f50fd0c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
71588
7fb0abf928e0 Fix missing or shebangs and executable bits for scripts (#10318)
Éric Araujo <merwok@netwok.org>
parents: 66460
diff changeset
1 #!/usr/bin/env python
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
2 import re
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
3 import sys
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
4 import shutil
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
5 import os.path
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
6 import subprocess
71672
bea11ce24bb0 Let “make patchcheck” work for out-of-dir builds (#9860)
Éric Araujo <merwok@netwok.org>
parents: 71588
diff changeset
7 import sysconfig
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
8
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
9 import reindent
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
10 import untabify
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
11
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
12
71672
bea11ce24bb0 Let “make patchcheck” work for out-of-dir builds (#9860)
Éric Araujo <merwok@netwok.org>
parents: 71588
diff changeset
13 SRCDIR = sysconfig.get_config_var('srcdir')
bea11ce24bb0 Let “make patchcheck” work for out-of-dir builds (#9860)
Éric Araujo <merwok@netwok.org>
parents: 71588
diff changeset
14
bea11ce24bb0 Let “make patchcheck” work for out-of-dir builds (#9860)
Éric Araujo <merwok@netwok.org>
parents: 71588
diff changeset
15
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
16 def n_files_str(count):
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
17 """Return 'N file(s)' with the proper plurality on 'file'."""
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
18 return "{} file{}".format(count, "s" if count != 1 else "")
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
19
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
20
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
21 def status(message, modal=False, info=None):
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
22 """Decorator to output status info to stdout."""
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
23 def decorated_fxn(fxn):
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
24 def call_fxn(*args, **kwargs):
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
25 sys.stdout.write(message + ' ... ')
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
26 sys.stdout.flush()
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
27 result = fxn(*args, **kwargs)
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
28 if not modal and not info:
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
29 print "done"
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
30 elif info:
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
31 print info(result)
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
32 else:
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
33 print "yes" if result else "NO"
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
34 return result
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
35 return call_fxn
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
36 return decorated_fxn
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
37
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
38
75167
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
39 def mq_patches_applied():
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
40 """Check if there are any applied MQ patches."""
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
41 cmd = 'hg qapplied'
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
42 st = subprocess.Popen(cmd.split(),
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
43 stdout=subprocess.PIPE,
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
44 stderr=subprocess.PIPE)
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
45 try:
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
46 bstdout, _ = st.communicate()
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
47 return st.returncode == 0 and bstdout
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
48 finally:
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
49 st.stdout.close()
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
50 st.stderr.close()
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
51
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
52
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
53 @status("Getting the list of files that have been added/changed",
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
54 info=lambda x: n_files_str(len(x)))
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
55 def changed_files():
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
56 """Get the list of changed or added files from the VCS."""
71672
bea11ce24bb0 Let “make patchcheck” work for out-of-dir builds (#9860)
Éric Araujo <merwok@netwok.org>
parents: 71588
diff changeset
57 if os.path.isdir(os.path.join(SRCDIR, '.hg')):
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
58 vcs = 'hg'
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
59 cmd = 'hg status --added --modified --no-status'
75167
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
60 if mq_patches_applied():
179bc7557484 Issue #14053: Fix "make patchcheck" to work with MQ.
Nadeem Vawda <nadeem.vawda@gmail.com>
parents: 71960
diff changeset
61 cmd += ' --rev qparent'
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
62 elif os.path.isdir('.svn'):
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
63 vcs = 'svn'
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
64 cmd = 'svn status --quiet --non-interactive --ignore-externals'
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
65 else:
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
66 sys.exit('need a checkout to get modified files')
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
67
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
68 st = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE)
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
69 try:
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
70 st.wait()
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
71 if vcs == 'hg':
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
72 return [x.decode().rstrip() for x in st.stdout]
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
73 else:
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
74 output = (x.decode().rstrip().rsplit(None, 1)[-1]
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
75 for x in st.stdout if x[0] in 'AM')
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
76 return set(path for path in output if os.path.isfile(path))
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
77 finally:
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
78 st.stdout.close()
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
79
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
80
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
81 def report_modified_files(file_paths):
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
82 count = len(file_paths)
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
83 if count == 0:
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
84 return n_files_str(count)
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
85 else:
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
86 lines = ["{}:".format(n_files_str(count))]
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
87 for path in file_paths:
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
88 lines.append(" {}".format(path))
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
89 return "\n".join(lines)
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
90
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
91
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
92 @status("Fixing whitespace", info=report_modified_files)
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
93 def normalize_whitespace(file_paths):
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
94 """Make sure that the whitespace for .py files have been normalized."""
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
95 reindent.makebackup = False # No need to create backups.
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
96 fixed = []
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
97 for path in (x for x in file_paths if x.endswith('.py')):
71672
bea11ce24bb0 Let “make patchcheck” work for out-of-dir builds (#9860)
Éric Araujo <merwok@netwok.org>
parents: 71588
diff changeset
98 if reindent.check(os.path.join(SRCDIR, path)):
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
99 fixed.append(path)
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
100 return fixed
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
101
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
102
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
103 @status("Fixing C file whitespace", info=report_modified_files)
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
104 def normalize_c_whitespace(file_paths):
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
105 """Report if any C files """
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
106 fixed = []
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
107 for path in file_paths:
71672
bea11ce24bb0 Let “make patchcheck” work for out-of-dir builds (#9860)
Éric Araujo <merwok@netwok.org>
parents: 71588
diff changeset
108 abspath = os.path.join(SRCDIR, path)
bea11ce24bb0 Let “make patchcheck” work for out-of-dir builds (#9860)
Éric Araujo <merwok@netwok.org>
parents: 71588
diff changeset
109 with open(abspath, 'r') as f:
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
110 if '\t' not in f.read():
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
111 continue
71672
bea11ce24bb0 Let “make patchcheck” work for out-of-dir builds (#9860)
Éric Araujo <merwok@netwok.org>
parents: 71588
diff changeset
112 untabify.process(abspath, 8, verbose=False)
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
113 fixed.append(path)
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
114 return fixed
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
115
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
116
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
117 ws_re = re.compile(br'\s+(\r?\n)$')
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
118
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
119 @status("Fixing docs whitespace", info=report_modified_files)
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
120 def normalize_docs_whitespace(file_paths):
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
121 fixed = []
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
122 for path in file_paths:
71672
bea11ce24bb0 Let “make patchcheck” work for out-of-dir builds (#9860)
Éric Araujo <merwok@netwok.org>
parents: 71588
diff changeset
123 abspath = os.path.join(SRCDIR, path)
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
124 try:
71672
bea11ce24bb0 Let “make patchcheck” work for out-of-dir builds (#9860)
Éric Araujo <merwok@netwok.org>
parents: 71588
diff changeset
125 with open(abspath, 'rb') as f:
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
126 lines = f.readlines()
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
127 new_lines = [ws_re.sub(br'\1', line) for line in lines]
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
128 if new_lines != lines:
71672
bea11ce24bb0 Let “make patchcheck” work for out-of-dir builds (#9860)
Éric Araujo <merwok@netwok.org>
parents: 71588
diff changeset
129 shutil.copyfile(abspath, abspath + '.bak')
bea11ce24bb0 Let “make patchcheck” work for out-of-dir builds (#9860)
Éric Araujo <merwok@netwok.org>
parents: 71588
diff changeset
130 with open(abspath, 'wb') as f:
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
131 f.writelines(new_lines)
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
132 fixed.append(path)
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
133 except Exception as err:
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
134 print 'Cannot fix %s: %s' % (path, err)
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
135 return fixed
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
136
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
137
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
138 @status("Docs modified", modal=True)
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
139 def docs_modified(file_paths):
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
140 """Report if any file in the Doc directory has been changed."""
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
141 return bool(file_paths)
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
142
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
143
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
144 @status("Misc/ACKS updated", modal=True)
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
145 def credit_given(file_paths):
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
146 """Check if Misc/ACKS has been changed."""
50786
2d453b221bec Merged revisions 68292,68344,68361,68378,68424,68426,68429-68430,68450,68457,68480-68481,68493,68495,68499,68501,68512,68514-68515 via svnmerge from
Georg Brandl <georg@python.org>
parents: 45859
diff changeset
147 return 'Misc/ACKS' in file_paths
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
148
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
149
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
150 @status("Misc/NEWS updated", modal=True)
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
151 def reported_news(file_paths):
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
152 """Check if Misc/NEWS has been changed."""
50786
2d453b221bec Merged revisions 68292,68344,68361,68378,68424,68426,68429-68430,68450,68457,68480-68481,68493,68495,68499,68501,68512,68514-68515 via svnmerge from
Georg Brandl <georg@python.org>
parents: 45859
diff changeset
153 return 'Misc/NEWS' in file_paths
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
154
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
155
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
156 def main():
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
157 file_paths = changed_files()
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
158 python_files = [fn for fn in file_paths if fn.endswith('.py')]
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
159 c_files = [fn for fn in file_paths if fn.endswith(('.c', '.h'))]
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
160 doc_files = [fn for fn in file_paths if fn.startswith('Doc')]
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
161 special_files = {'Misc/ACKS', 'Misc/NEWS'} & set(file_paths)
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
162 # PEP 8 whitespace rules enforcement.
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
163 normalize_whitespace(python_files)
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
164 # C rules enforcement.
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
165 normalize_c_whitespace(c_files)
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
166 # Doc whitespace enforcement.
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
167 normalize_docs_whitespace(doc_files)
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
168 # Docs updated.
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
169 docs_modified(doc_files)
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
170 # Misc/ACKS changed.
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
171 credit_given(special_files)
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
172 # Misc/NEWS changed.
66460
2955f337969e Merged revisions 85766-85767 via svnmerge from
Georg Brandl <georg@python.org>
parents: 50786
diff changeset
173 reported_news(special_files)
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
174
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
175 # Test suite run and passed.
71960
11662a6e34df patchcheck: don’t talk about the test suite when no code file were changed.
Éric Araujo <merwok@netwok.org>
parents: 71672
diff changeset
176 if python_files or c_files:
11662a6e34df patchcheck: don’t talk about the test suite when no code file were changed.
Éric Araujo <merwok@netwok.org>
parents: 71672
diff changeset
177 print
11662a6e34df patchcheck: don’t talk about the test suite when no code file were changed.
Éric Araujo <merwok@netwok.org>
parents: 71672
diff changeset
178 print "Did you run the test suite?"
45859
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
179
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
180
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
181 if __name__ == '__main__':
c424099b4ce4 Add Tools/scripts/patchcheck.py. Invoked from ``make check``, the script does
Brett Cannon <bcannon@gmail.com>
parents:
diff changeset
182 main()