[Python-checkins] cpython: general cleaning up

[benjamin.peterson]

http://hg.python.org/cpython/rev/39fadb0255cd
changeset:   71026:39fadb0255cd
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jun 27 18:25:06 2011 -0500
summary:
  general cleaning up

files:
  Tools/scripts/patchcheck.py |  14 +++-----------
  1 files changed, 3 insertions(+), 11 deletions(-)


diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py
--- a/Tools/scripts/patchcheck.py
+++ b/Tools/scripts/patchcheck.py
@@ -36,7 +36,6 @@
 def changed_files():
     """Get the list of changed or added files from the VCS."""
     if os.path.isdir('.hg'):
-        vcs = 'hg'
         cmd = 'hg status --added --modified --no-status'
     else:
         sys.exit('need a checkout to get modified files')
@@ -44,12 +43,7 @@
     st = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE)
     try:
         st.wait()
-        if vcs == 'hg':
-            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))
+        return [x.decode().rstrip() for x in st.stdout]
     finally:
         st.stdout.close()
 
@@ -69,10 +63,8 @@
 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 = []
-    for path in (x for x in file_paths if x.endswith('.py')):
-        if reindent.check(path):
-            fixed.append(path)
+    fixed = [path for path in file_paths if path.endswith('.py') and
+             reindent.check(path)]
     return fixed
 
 

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