| Index: gm/rebaseline_server/compare_configs.py
|
| diff --git a/gm/rebaseline_server/compare_configs.py b/gm/rebaseline_server/compare_configs.py
|
| index 4075da4263ad33ef1ace0fd361c58aa35d56e019..cdc19dd8313b7fded3b7f9c5b51e33c93b782dd4 100755
|
| --- a/gm/rebaseline_server/compare_configs.py
|
| +++ b/gm/rebaseline_server/compare_configs.py
|
| @@ -11,15 +11,14 @@ 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
|
| +import fix_pythonpath # pylint: disable=W0611
|
| +
|
| # 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
|
| @@ -112,7 +111,7 @@ class ConfigComparisons(results.BaseComparisons):
|
|
|
| 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:
|
| @@ -160,9 +159,10 @@ class ConfigComparisons(results.BaseComparisons):
|
| 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(),
|
|
|