Fixing leftover from prior reveiew, plus more lint.

PRESUBMIT.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 """Top-level presubmit script for GYP.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into gcl.
 """
@@ skipping 41 matching lines @@
     # Undefined variable.
     'E0602',
     # Not exception type specified.
     'W0702',
     # No member of that name.
     'E1101',
     # Dangerous default {}.
     'W0102',
     # Others, too many to sort.
     'W0201', 'W0232', 'E1103', 'W0621', 'W0108', 'W0223', 'W0231',
-    'R0201', 'E0101', 'C0321', 'W0602', 'W0631', 'W0601', 'W0701',
-    'E0102', 'W0221', 'W0403',
+    'R0201', 'E0101', 'C0321',
 ]
 
 
 def CheckChangeOnUpload(input_api, output_api):
   report = []
   report.extend(input_api.canned_checks.PanProjectChecks(
       input_api, output_api))
   return report
 
 
@@ skipping 24 matching lines @@
         output_api,
         black_list=PYLINT_BLACKLIST,
         disabled_warnings=PYLINT_DISABLED_WARNINGS))
   finally:
     sys.path = old_sys_path
   return report
 
 
 def GetPreferredTrySlaves():
   return ['gyp-win32', 'gyp-win64', 'gyp-linux', 'gyp-mac']