Added 'renderMode' and 'builder' as columns to the SKP front-end.

gm/rebaseline_server/imagepairset.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.
 
 ImagePairSet class; see its docstring below.
 """
 
 # System-level imports
 import posixpath
 
 # Must fix up PYTHONPATH before importing from within Skia
-import fix_pythonpath  # pylint: disable=W0611
+import rs_fixpypath  # pylint: disable=W0611
 
 # Imports from within Skia
 import column
 import imagediffdb
 from py.utils import gs_utils
 
 # Keys used within dictionary representation of ImagePairSet.
 # NOTE: Keep these in sync with static/constants.js
 KEY__ROOT__EXTRACOLUMNHEADERS = 'extraColumnHeaders'
 KEY__ROOT__EXTRACOLUMNORDER = 'extraColumnOrder'
@@ skipping 189 matching lines @@
     anyfile_utils.py for copying files between HTTP/GS/local filesystem')
 
     Args:
       gs_url: "gs://bucket/path" format URL
     """
     bucket, path = gs_utils.GSUtils.split_gs_url(gs_url)
     http_url = 'http://storage.cloud.google.com/' + bucket
     if path:
       http_url += '/' + path
     return http_url