Standardize the sys.path fix up and fix a few pylint warnings.

gcl.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
@@ skipping 260 matching lines @@
     name: change name.
     issue: the Rietveld issue number or 0 if it hasn't been uploaded yet.
     patchset: the Rietveld latest patchset number or 0.
     description: the description.
     files: a list of 2 tuple containing (status, filename) of changed files,
            with paths being relative to the top repository directory.
     local_root: Local root directory
     rietveld: rietveld server for this change
   """
   # Kept for unit test support. This is for the old format, it's deprecated.
-  _SEPARATOR = "\n-----\n"
+  SEPARATOR = "\n-----\n"
 
   def __init__(self, name, issue, patchset, description, files, local_root,
                rietveld_url, needs_upload):
     self.name = name
     self.issue = int(issue)
     self.patchset = int(patchset)
     self._description = None
     self._subject = None
     self._reviewers = None
     self._set_description(description)
@@ skipping 277 matching lines @@
         values.get('rietveld'),
         values['needs_upload'])
     if save:
       change_info.Save()
     return change_info
 
   @staticmethod
   def _LoadOldFormat(content):
     # The info files have the following format:
     # issue_id, patchset\n   (, patchset is optional)
-    # _SEPARATOR\n
+    # SEPARATOR\n
     # filepath1\n
     # filepath2\n
     # .
     # .
     # filepathn\n
-    # _SEPARATOR\n
+    # SEPARATOR\n
     # description
-    split_data = content.split(ChangeInfo._SEPARATOR, 2)
+    split_data = content.split(ChangeInfo.SEPARATOR, 2)
     if len(split_data) != 3:
       raise ValueError('Bad change format')
     values = {
       'issue': 0,
       'patchset': 0,
       'needs_upload': False,
       'files': [],
     }
     items = split_data[0].split(', ')
     if items[0]:
@@ skipping 840 matching lines @@
       raise
     print >> sys.stderr, (
         'AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
         'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))
     return 1
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))