Revert "rebaseline_server: download actual-results.json files from GCS instead of SVN"

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 os
 import re
+import sys
 import time
 
 # Imports from within Skia
-import fix_pythonpath  # must do this first
-from pyutils import url_utils
+#
+# TODO(epoger): Once we move the create_filepath_url() function out of
+# download_actuals into a shared utility module, we won't need to import
+# download_actuals anymore.
+#
+# We need to add the 'gm' directory, so that we can import gm_json.py within
+# that directory.  That script allows us to parse the actual-results.json file
+# written out by the GM tool.
+# Make sure that the 'gm' dir is in the PYTHONPATH, but add it at the *end*
+# so any dirs that are already in the PYTHONPATH will be preferred.
+PARENT_DIRECTORY = os.path.dirname(os.path.realpath(__file__))
+GM_DIRECTORY = os.path.dirname(PARENT_DIRECTORY)
+TRUNK_DIRECTORY = os.path.dirname(GM_DIRECTORY)
+if GM_DIRECTORY not in sys.path:
+  sys.path.append(GM_DIRECTORY)
+import download_actuals
 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 15 matching lines @@
           of generated_images_root
       builder_regex_list: List of regular expressions specifying which builders
           we will process. If None, process all builders.
     """
     time_start = int(time.time())
     if builder_regex_list != None:
       self.set_match_builders_pattern_list(builder_regex_list)
     self._image_diff_db = imagediffdb.ImageDiffDB(generated_images_root)
     self._diff_base_url = (
         diff_base_url or
-        url_utils.create_filepath_url(generated_images_root))
+        download_actuals.create_filepath_url(generated_images_root))
     self._actuals_root = actuals_root
     self._load_config_pairs(configs)
     self._timestamp = int(time.time())
     logging.info('Results complete; took %d seconds.' %
                  (self._timestamp - time_start))
 
   def _load_config_pairs(self, configs):
     """Loads the results of all tests, across all builders (based on the
     files within self._actuals_root), compares them across two configs,
     and stores the summary in self._results.
@@ skipping 129 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()