[Python-checkins] cpython (merge 3.3 -> 3.3): merge

[christian.heimes]

http://hg.python.org/cpython/rev/3cd6858c9f63
changeset:   84783:3cd6858c9f63
branch:      3.3
parent:      84781:03b937e5b19f
parent:      84773:26686d227e41
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Jul 22 10:37:41 2013 +0200
summary:
  merge

files:
  Misc/NEWS                   |   2 ++
  Tools/scripts/patchcheck.py |  11 ++++++-----
  2 files changed, 8 insertions(+), 5 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -242,6 +242,8 @@
 Tools/Demos
 -----------
 
+- Issue #18439: Make patchcheck work on Windows for ACKS, NEWS.
+
 - Issue #18448: Fix a typo in Tools/demo/eiffel.py.
 
 - Issue #18457: Fixed saving of formulas and complex numbers in
diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py
--- a/Tools/scripts/patchcheck.py
+++ b/Tools/scripts/patchcheck.py
@@ -124,13 +124,13 @@
 @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
 
 @status("configure regenerated", modal=True, info=str)
 def regenerated_configure(file_paths):
@@ -153,7 +153,8 @@
     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.
@@ -163,9 +164,9 @@
     # 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)
     # Regenerated configure, if necessary.
     regenerated_configure(file_paths)
     # Regenerated pyconfig.h.in, if necessary.

-- 
Repository URL: http://hg.python.org/cpython