Fix CheckSvnProperty canned check.

presubmit_canned_checks.py

 #!/usr/bin/env python
 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Generic presubmit checks that can be reused by other presubmit checks."""
 
 
 ### Description checks
 
@@ skipping 180 matching lines @@
   """Checks that the source files have svn:eol-style=LF."""
   return CheckSvnProperty(input_api, output_api,
                           'svn:eol-style', 'LF',
                           input_api.AffectedSourceFiles(source_file_filter))
 
 
 def CheckSvnForCommonMimeTypes(input_api, output_api):
   """Checks that common binary file types have the correct svn:mime-type."""
   output = []
   files = input_api.AffectedFiles(include_deletes=False)
+  def IsExts(x, exts):
+    path = x.LocalPath()
+    for extension in exts:
+      if path.endswith(extension):
+        return True
+    return False
   def FilterFiles(extension):
-    return filter(lambda x: x.endswith(extension), files)
-  def JpegFiles():
-    return filter(lambda x: (x.endswith('.jpg') or x.endswith('.jpeg') or
-                             x.endswith('.jpe')),
-                  files)
+    return filter(lambda x: IsExts(x, extension), files)
   def RunCheck(mime_type, files):
     output.extend(CheckSvnProperty(input_api, output_api, 'svn:mime-type',
                                    mime_type, files))
-  RunCheck('application/pdf', FilterFiles('.pdf'))
-  RunCheck('image/bmp', FilterFiles('.bmp'))
-  RunCheck('image/gif', FilterFiles('.gif'))
-  RunCheck('image/png', FilterFiles('.png'))
-  RunCheck('image/jpeg', JpegFiles())
-  RunCheck('image/vnd.microsoft.icon', FilterFiles('.ico'))
+  RunCheck('application/pdf', FilterFiles(['.pdf']))
+  RunCheck('image/bmp', FilterFiles(['.bmp']))
+  RunCheck('image/gif', FilterFiles(['.gif']))
+  RunCheck('image/png', FilterFiles(['.png']))
+  RunCheck('image/jpeg', FilterFiles(['.jpg', '.jpeg', '.jpe']))
+  RunCheck('image/vnd.microsoft.icon', FilterFiles(['.ico']))
   return output
 
 
 def CheckSvnProperty(input_api, output_api, prop, expected, affected_files):
   """Checks that affected_files files have prop=expected."""
   bad = filter(lambda f: f.scm == 'svn' and f.Property(prop) != expected,
                affected_files)
   if bad:
     if input_api.is_committing:
       type = output_api.PresubmitError
@@ skipping 73 matching lines @@
         stderr=input_api.subprocess.PIPE)
     stdoutdata, stderrdata = subproc.communicate()
     # Discard the output if returncode == 0
     if subproc.returncode:
       outputs.append("Test '%s' failed with code %d\n%s\n%s\n" % (
           unit_test_name, subproc.returncode, stdoutdata, stderrdata))
   if outputs:
     return [message_type("%d unit tests failed." % len(outputs),
                                 long_text='\n'.join(outputs))]
   return []