Fixing leftover from prior reveiew, plus more lint.

pylib/gyp/input.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.
 
 from compiler.ast import Const
 from compiler.ast import Dict
 from compiler.ast import Discard
 from compiler.ast import List
 from compiler.ast import Module
 from compiler.ast import Node
@@ skipping 284 matching lines @@
 def ProcessToolsetsInDict(data):
   if 'targets' in data:
     target_list = data['targets']
     new_target_list = []
     for target in target_list:
       # If this target already has an explicit 'toolset', and no 'toolsets'
       # list, don't modify it further.
       if 'toolset' in target and 'toolsets' not in target:
         new_target_list.append(target)
         continue
-      global multiple_toolsets
       if multiple_toolsets:
         toolsets = target.get('toolsets', ['target'])
       else:
         toolsets = ['target']
       # Make sure this 'toolsets' definition is only processed once.
       if 'toolsets' in target:
         del target['toolsets']
       if len(toolsets) > 0:
         # Optimization: only do copies if more than one toolset is specified.
         for build in toolsets[1:]:
           new_target = copy.deepcopy(target)
           new_target['toolset'] = build
           new_target_list.append(new_target)
         target['toolset'] = toolsets[0]
         new_target_list.append(target)
     data['targets'] = new_target_list
   if 'conditions' in data:
     for condition in data['conditions']:
       if isinstance(condition, list):
         for condition_dict in condition[1:]:
           ProcessToolsetsInDict(condition_dict)
 
 
 # TODO(mark): I don't love this name.  It just means that it's going to load
 # a build file that contains targets and is expected to provide a targets dict
 # that contains the targets...
 def LoadTargetBuildFile(build_file_path, data, aux_data, variables, includes,
                         depth, check):
-  global absolute_build_file_paths
-
   # If depth is set, predefine the DEPTH variable to be a relative path from
   # this build file's directory to the directory identified by depth.
   if depth:
     # TODO(dglazkov) The backslash/forward-slash replacement at the end is a
     # temporary measure. This should really be addressed by keeping all paths
     # in POSIX until actual project generation.
     d = gyp.common.RelativePath(depth, os.path.dirname(build_file_path))
     if d == '':
       variables['DEPTH'] = '.'
     else:
@@ skipping 789 matching lines @@
                              for op in ('', '!', '/')]
 
   for target, target_dict in targets.iteritems():
     target_build_file = gyp.common.BuildFile(target)
     toolset = target_dict['toolset']
     for dependency_key in all_dependency_sections:
       dependencies = target_dict.get(dependency_key, [])
       for index in xrange(0, len(dependencies)):
         dep_file, dep_target, dep_toolset = gyp.common.ResolveTarget(
             target_build_file, dependencies[index], toolset)
-        global multiple_toolsets
         if not multiple_toolsets:
           # Ignore toolset specification in the dependency if it is specified.
           dep_toolset = toolset
         dependency = gyp.common.QualifiedTarget(dep_file,
                                                 dep_target,
                                                 dep_toolset)
         dependencies[index] = dependency
 
         # Make sure anything appearing in a list other than "dependencies" also
         # appears in the "dependencies" list.
@@ skipping 715 matching lines @@
   # Merge it into the new config.
   MergeDicts(new_configuration_dict, configuration_dict,
              build_file, build_file)
 
   # Drop abstract.
   if 'abstract' in new_configuration_dict:
     del new_configuration_dict['abstract']
 
 
 def SetUpConfigurations(target, target_dict):
-  global non_configuration_keys
   # key_suffixes is a list of key suffixes that might appear on key names.
   # These suffixes are handled in conditional evaluations (for =, +, and ?)
   # and rules/exclude processing (for ! and /).  Keys with these suffixes
   # should be treated the same as keys without.
   key_suffixes = ['=', '+', '?', '!', '/']
 
   build_file = gyp.common.BuildFile(target)
 
   # Provide a single configuration by default if none exists.
   # TODO(mark): Signal an error if default_configurations exists but
@@ skipping 167 matching lines @@
 
         if action == 'exclude':
           # This item matches an exclude regex, so set its value to 0 (exclude).
           action_value = 0
         elif action == 'include':
           # This item matches an include regex, so set its value to 1 (include).
           action_value = 1
         else:
           # This is an action that doesn't make any sense.
           raise ValueError, 'Unrecognized action ' + action + ' in ' + name + \
-                            ' key ' + key
+                            ' key ' + regex_key
 
         for index in xrange(0, len(the_list)):
           list_item = the_list[index]
           if list_actions[index] == action_value:
             # Even if the regex matches, nothing will change so continue (regex
             # searches are expensive).
             continue
           if pattern_re.search(list_item):
             # Regular expression match.
             list_actions[index] = action_value
@@ skipping 401 matching lines @@
     ValidateRunAsInTarget(target, target_dict, build_file)
     ValidateActionsInTarget(target, target_dict, build_file)
 
   # Generators might not expect ints.  Turn them into strs.
   TurnIntIntoStrInDict(data)
 
   # TODO(mark): Return |data| for now because the generator needs a list of
   # build files that came in.  In the future, maybe it should just accept
   # a list, and not the whole data dict.
   return [flat_list, targets, data]