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

tests/gclient_scm_test.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.
 
 """Unit tests for gclient_scm.py."""
 
-# pylint: disable=E1101,E1103,W0403
+# pylint: disable=E1103
 
+import logging
+import os
 # Import before super_mox to keep valid references.
 from os import rename
 from shutil import rmtree
 from subprocess import Popen, PIPE, STDOUT

[Dirk Pranke, 2011/11/09 23:18:47]

Nit: I think all of the "from"s are supposed to be sorted before the "import"s.

[M-A Ruel, 2011/11/10 15:38:21]

I think http://google-styleguide.googlecode.com/svn/trunk/pyguide.html#Imports
is uninformative about that.

I agree it's ugly. Fixing.

+import sys
 import tempfile
 import unittest
 import __builtin__
 
-# Fixes include path.
-from super_mox import mox, StdoutCheck, TestCaseUtils, SuperMoxTestBase
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import logging
-import sys
+from super_mox import mox, StdoutCheck, SuperMoxTestBase
+from super_mox import TestCaseUtils
+
 import gclient_scm
 import subprocess2
 
 # 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."""
+    # pylint: disable=E1101
     try:
       fn(*args, **kwargs)
     except gclient_scm.gclient_utils.Error, e:
       self.assertEquals(e.args[0], msg)
     else:
       self.fail('%s not raised' % msg)
 
 
 class BaseTestCase(GCBaseTestCase, SuperMoxTestBase):
   def setUp(self):
@@ skipping 202 matching lines @@
     items = [
       ('~      ', '.'),
     ]
     gclient_scm.scm.SVN.CaptureStatus(self.base_path).AndReturn(items)
     file_path = join(self.base_path, '.')
     gclient_scm.os.path.exists(file_path).AndReturn(True)
     gclient_scm.os.path.isfile(file_path).AndReturn(False)
     gclient_scm.os.path.islink(file_path).AndReturn(False)
     gclient_scm.os.path.isdir(file_path).AndReturn(True)
     gclient_scm.gclient_utils.RemoveDirectory(file_path)
+    # pylint: disable=E1120
     gclient_scm.os.path.isdir(self.base_path).AndReturn(False)
-    # The mock is unbound so self is not necessary.
-    # pylint: disable=E1120
     gclient_scm.SVNWrapper.update(options, [], ['.'])
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     file_list2 = []
     scm.revert(options, self.args, file_list2)
     self.checkstdout(('%s\n' % file_path))
 
   def testStatus(self):
@@ skipping 694 matching lines @@
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(asctime).19s %(levelname)s %(filename)s:'
                '%(lineno)s %(message)s')
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: