Use new common utils where possible.

slave/skia_slave_scripts/utils/gs_utils.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This module contains utilities related to Google Storage manipulations.
 
 TODO(epoger): Make this use google-api-python-client rather than the gsutil
 tool.  See http://skbug.com/2618 .
 """
 
 import hashlib
 import os
 import posixpath
 import re
 import shutil
 import tempfile
 import time
 
+from py.utils import shell_utils
 from slave import slave_utils
 
 import file_utils
-import shell_utils
 
 
 DEFAULT_DEST_GSBASE = 'gs://chromium-skia-gm'
 TIMESTAMP_STARTED_FILENAME = 'TIMESTAMP_LAST_UPLOAD_STARTED'
 TIMESTAMP_COMPLETED_FILENAME = 'TIMESTAMP_LAST_UPLOAD_COMPLETED'
 LAST_REBASELINED_BY_FILENAME = 'LAST_REBASELINED_BY'
 
 FILES_CHUNK = 500
 BUFSIZE = 64 * 1024
 
@@ skipping 413 matching lines @@
     slave_utils.GSUtilCopyFile(filename=timestamp_file, gs_base=gs_base,
                                subdir=gs_relative_dir, gs_acl=gs_acl)
 
 
 def _convert_to_posixpath(localpath):
   """Convert localpath to posix format."""
   if os.sep == '/':
     return localpath
   else:
     return '/'.join(localpath.split(os.sep))