roll "common" DEPS, and replace tools/pyutils with it

gm/rebaseline_server/compare_configs.py

 #!/usr/bin/python
 
 """
 Copyright 2014 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 Compare GM results for two configs, across all builders.
 """
 
 # System-level imports
 import argparse
-import fnmatch
-import json
 import logging
-import re
 import time
 
+# Must fix up PYTHONPATH before importing from within Skia
+# pylint: disable=W0611
+import fix_pythonpath
+# pylint: enable=W0611

[borenet, 2014/07/11 12:59:11]

Why not:

import fix_pythonpath  # pylint: disable=W0611

[epoger, 2014/07/11 14:18:42]

Good idea, fixed throughout.  I wasn't sure that would re-enable the warning for
following lines, but I confirmed that it does.

+
 # Imports from within Skia
-import fix_pythonpath  # must do this first
-from pyutils import url_utils
+from py.utils import url_utils
 import gm_json
 import imagediffdb
 import imagepair
 import imagepairset
 import results
 
 
 class ConfigComparisons(results.BaseComparisons):
   """Loads results from two different configurations into an ImagePairSet.
 
@@ skipping 72 matching lines @@
                    (builder_num, num_builders, builder))
       actual_results_for_this_builder = (
           actual_builder_dicts[builder][gm_json.JSONKEY_ACTUALRESULTS])
       for result_type in sorted(actual_results_for_this_builder.keys()):
         results_of_this_type = actual_results_for_this_builder[result_type]
         if not results_of_this_type:
           continue
 
         tests_found = set()
         for image_name in sorted(results_of_this_type.keys()):
-          (test, config) = results.IMAGE_FILENAME_RE.match(image_name).groups()
+          (test, _) = results.IMAGE_FILENAME_RE.match(image_name).groups()
           tests_found.add(test)
 
         for test in tests_found:
           # Get image_relative_url (or None) for each of configA, configB
           image_name_A = results.IMAGE_FILENAME_FORMATTER % (test, configA)
           configA_image_relative_url = ConfigComparisons._create_relative_url(
               hashtype_and_digest=results_of_this_type.get(image_name_A),
               test_name=test)
           image_name_B = results.IMAGE_FILENAME_FORMATTER % (test, configB)
           configB_image_relative_url = ConfigComparisons._create_relative_url(
@@ skipping 27 matching lines @@
                   image_diff_db=self._image_diff_db,
                   base_url=gm_json.GM_ACTUALS_ROOT_HTTP_URL,
                   imageA_relative_url=configA_image_relative_url,
                   imageB_relative_url=configB_image_relative_url,
                   extra_columns=extra_columns_dict)
               all_image_pairs.add_image_pair(image_pair)
               if result_type != results.KEY__RESULT_TYPE__SUCCEEDED:
                 failing_image_pairs.add_image_pair(image_pair)
             except (KeyError, TypeError):
               logging.exception(
-                  'got exception while creating ImagePair for image_name '
-                  '"%s", builder "%s"' % (image_name, builder))
+                  'got exception while creating ImagePair for test '
+                  '"%s", builder "%s"' % (test, builder))
 
+    # pylint: disable=W0201
     self._results = {
       results.KEY__HEADER__RESULTS_ALL: all_image_pairs.as_dict(),
       results.KEY__HEADER__RESULTS_FAILURES: failing_image_pairs.as_dict(),
     }
 
 
 def main():
   logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s',
                       datefmt='%m/%d/%Y %H:%M:%S',
                       level=logging.INFO)
@@ skipping 22 matching lines @@
   results_obj = ConfigComparisons(configs=args.config,
                                   actuals_root=args.actuals,
                                   generated_images_root=args.workdir)
   gm_json.WriteToFile(
       results_obj.get_packaged_results_of_type(results_type=args.results),
       args.outfile)
 
 
 if __name__ == '__main__':
   main()