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

gm/rebaseline_server/compare_rendered_pictures.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 results of two render_pictures runs.
 """
 
 # System-level imports
 import logging
 import os
-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]

Same comment.

+
 # 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
 
 # URL under which all render_pictures images can be found in Google Storage.
+#
+# pylint: disable=C0301
 # TODO(epoger): Move this default value into
 # https://skia.googlesource.com/buildbot/+/master/site_config/global_variables.json
-DEFAULT_IMAGE_BASE_URL = 'http://chromium-skia-gm.commondatastorage.googleapis.com/render_pictures/images'
+# pylint: enable=C0301
+DEFAULT_IMAGE_BASE_URL = (
+    'http://chromium-skia-gm.commondatastorage.googleapis.com/'
+    'render_pictures/images')
 
 
 class RenderedPicturesComparisons(results.BaseComparisons):
   """Loads results from two different render_pictures runs into an ImagePairSet.
   """
 
   def __init__(self, subdirs, actuals_root,
                generated_images_root=results.DEFAULT_GENERATED_IMAGES_ROOT,
                image_base_url=DEFAULT_IMAGE_BASE_URL,
                diff_base_url=None):
@@ skipping 97 matching lines @@
           # TODO(epoger): Report an error if we find a different number of tiles
           # for A and B?
           num_tiles = len(tiled_images_A)
           for tile_num in range(num_tiles):
             imagepairs_for_this_skp.append(self._create_image_pair(
                 test=skp_name,
                 config='%s-%d' % (gm_json.JSONKEY_SOURCE_TILEDIMAGES, tile_num),
                 image_dict_A=tiled_images_A[tile_num],
                 image_dict_B=tiled_images_B[tile_num]))
 
-        for imagepair in imagepairs_for_this_skp:
-          if imagepair:
-            all_image_pairs.add_image_pair(imagepair)
-            result_type = imagepair.extra_columns_dict\
+        for one_imagepair in imagepairs_for_this_skp:
+          if one_imagepair:
+            all_image_pairs.add_image_pair(one_imagepair)
+            result_type = one_imagepair.extra_columns_dict\
                 [results.KEY__EXTRACOLUMNS__RESULT_TYPE]
             if result_type != results.KEY__RESULT_TYPE__SUCCEEDED:
-              failing_image_pairs.add_image_pair(imagepair)
+              failing_image_pairs.add_image_pair(one_imagepair)
 
+    # 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 _validate_dict_version(self, result_dict):
     """Raises Exception if the dict is not the type/version we know how to read.
 
     Args:
       result_dict: dictionary holding output of render_pictures
@@ skipping 68 matching lines @@
           extra_columns=extra_columns_dict)
     except (KeyError, TypeError):
       logging.exception(
           'got exception while creating ImagePair for'
           ' test="%s", config="%s", urlPair=("%s","%s")' % (
               test, config, imageA_relative_url, imageB_relative_url))
       return None
 
 
 # TODO(epoger): Add main() so this can be called by vm_run_skia_try.sh