Largely reduce the number of pylint warnings and fix one typo.

tests/gclient_scm_test.py

 #!/usr/bin/python
 # Copyright (c) 2010 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.
 
 """Unit tests for gclient_scm.py."""
 
 # Import before super_mox to keep valid references.
 from os import rename
 from shutil import rmtree
 import StringIO
 from subprocess import Popen, PIPE, STDOUT
 import tempfile
 import unittest
 import __builtin__
 
 # Fixes include path.
 from super_mox import mox, StdoutCheck, TestCaseUtils, SuperMoxTestBase
 
+import sys
 import gclient_scm
 
 # Shortcut since this function is used often
 join = gclient_scm.os.path.join
 
 
 class GCBaseTestCase(object):
   def assertRaisesError(self, msg, fn, *args, **kwargs):
     """Like unittest's assertRaises() but checks for Gclient.Error."""
     try:
@@ skipping 752 matching lines @@
     exception = ('\n____ . at refs/heads/master\n'
                  '\tYou have unstaged changes.\n'
                  '\tPlease commit, stash, or reset.\n')
     self.assertRaisesError(exception, scm.update, options, (), [])
     # The hash always changes. Use a cheap trick.
     start = ('\n________ running \'git commit -am test\' in \'%s\'\n'
              '[new ') % join(self.root_dir, '.')
     end = ('] test\n 1 files changed, 1 insertions(+), '
          '1 deletions(-)\n\n_____ . at refs/heads/master\n'
          'Attempting rebase onto refs/remotes/origin/master...\n')
-    self.assertTrue(gclient_scm.sys.stdout.getvalue().startswith(start))
-    self.assertTrue(gclient_scm.sys.stdout.getvalue().endswith(end))
-    self.assertEquals(len(gclient_scm.sys.stdout.getvalue()),
+    self.assertTrue(sys.stdout.getvalue().startswith(start))
+    self.assertTrue(sys.stdout.getvalue().endswith(end))
+    self.assertEquals(len(sys.stdout.getvalue()),
                       len(start) + len(end) + 7)
-    gclient_scm.sys.stdout.close()
+    sys.stdout.close()
 
   def testUpdateNotGit(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     git_path = join(self.base_path, '.git')
     rename(git_path, git_path + 'foo')
     exception = ('\n____ . at refs/heads/master\n'
@@ skipping 10 matching lines @@
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     rev_info = scm.revinfo(options, (), None)
     self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458')
 
 
 if __name__ == '__main__':
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: