summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-07-22 00:57:44 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-07-22 00:57:44 (GMT)
commit68ad1d13725f52e0051edd2859126f043cfe2a2d (patch)
tree09d597b26cbdb3ec253afa6a63dbacec658c27c9
parent2c636fd6550e6fcc922f94e36b5a34d978ad019c (diff)
downloadcpython-68ad1d13725f52e0051edd2859126f043cfe2a2d.zip
cpython-68ad1d13725f52e0051edd2859126f043cfe2a2d.tar.gz
cpython-68ad1d13725f52e0051edd2859126f043cfe2a2d.tar.bz2
Issue #18439: Make patchcheck work on Windows for ACKS, NEWS.
-rw-r--r--Misc/NEWS2
-rwxr-xr-xTools/scripts/patchcheck.py11
2 files changed, 8 insertions, 5 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 87a4ec5..72e44e2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -137,6 +137,8 @@ Documentation
- Issue #17844: Refactor a documentation of Python specific encodings.
Add links to encoders and decoders for binary-to-binary codecs.
+- Issue #18439: Make patchcheck work on Windows for ACKS, NEWS.
+
What's New in Python 2.7.5?
===========================
diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py
index fe2e291..418dd26 100755
--- a/Tools/scripts/patchcheck.py
+++ b/Tools/scripts/patchcheck.py
@@ -144,13 +144,13 @@ def docs_modified(file_paths):
@status("Misc/ACKS updated", modal=True)
def credit_given(file_paths):
"""Check if Misc/ACKS has been changed."""
- return 'Misc/ACKS' in file_paths
+ return os.path.join('Misc', 'ACKS') in file_paths
@status("Misc/NEWS updated", modal=True)
def reported_news(file_paths):
"""Check if Misc/NEWS has been changed."""
- return 'Misc/NEWS' in file_paths
+ return os.path.join('Misc', 'NEWS') in file_paths
def main():
@@ -158,7 +158,8 @@ def main():
python_files = [fn for fn in file_paths if fn.endswith('.py')]
c_files = [fn for fn in file_paths if fn.endswith(('.c', '.h'))]
doc_files = [fn for fn in file_paths if fn.startswith('Doc')]
- special_files = {'Misc/ACKS', 'Misc/NEWS'} & set(file_paths)
+ misc_files = {os.path.join('Misc', 'ACKS'), os.path.join('Misc', 'NEWS')}\
+ & set(file_paths)
# PEP 8 whitespace rules enforcement.
normalize_whitespace(python_files)
# C rules enforcement.
@@ -168,9 +169,9 @@ def main():
# Docs updated.
docs_modified(doc_files)
# Misc/ACKS changed.
- credit_given(special_files)
+ credit_given(misc_files)
# Misc/NEWS changed.
- reported_news(special_files)
+ reported_news(misc_files)
# Test suite run and passed.
if python_files or c_files: