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

tests/fix_encoding_test.py

 #!/usr/bin/env python
 # coding=utf8
 # 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 fix_encoding.py."""
 
 import os
 import sys
 import unittest
 
-ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-sys.path.insert(0, ROOT_DIR)
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import fix_encoding
 
 
 class FixEncodingTest(unittest.TestCase):
   # Nice mix of latin, hebrew, arabic and chinese. Doesn't mean anything.
   text = u'Héllô 偉大 سيد'
 
   def test_code_page(self):
     # Make sure printing garbage won't throw.
@@ skipping 27 matching lines @@
     self.assertEquals(sys.stderr.encoding, sys.getdefaultencoding())
 
   def test_multiple_calls(self):
     # Shouldn't do anything.
     self.assertEquals(False, fix_encoding.fix_encoding())
 
 
 if __name__ == '__main__':
   assert fix_encoding.fix_encoding()
   unittest.main()