Remove duplicate function definitions I accidentally added in r1357.

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 2155 matching lines @@
     if len(files) > 1:
       error += '  %s: %s\n' % (basename, ' '.join(files))
 
   if error:
     print ('static library %s has several files with the same basename:\n' %
            target + error + 'Some build systems, e.g. MSVC08, '
            'cannot handle that.')
     raise KeyError, 'Duplicate basenames in sources section, see list above'
 
 
-def ValidateSourcesInTarget(target, target_dict, build_file):
-  # TODO: Check if MSVC allows this for non-static_library targets.
-  if target_dict.get('type', None) != 'static_library':
-    return
-  sources = target_dict.get('sources', [])
-  basenames = {}
-  for source in sources:
-    name, ext = os.path.splitext(source)
-    is_compiled_file = ext in [
-        '.c', '.cc', '.cpp', '.cxx', '.m', '.mm', '.s', '.S']
-    if not is_compiled_file:
-      continue
-    basename = os.path.basename(name)  # Don't include extension.
-    basenames.setdefault(basename, []).append(source)
-
-  error = ''
-  for basename, files in basenames.iteritems():
-    if len(files) > 1:
-      error += '  %s: %s\n' % (basename, ' '.join(files))
-
-  if error:
-    print ('static library %s has several files with the same basename:\n' %
-           target + error + 'Some build systems, e.g. MSVC08, '
-           'cannot handle that.')
-    raise KeyError, 'Duplicate basenames in sources section, see list above'
-
-
 def ValidateRulesInTarget(target, target_dict, extra_sources_for_rules):
   """Ensures that the rules sections in target_dict are valid and consistent,
   and determines which sources they apply to.
 
   Arguments:
     target: string, name of target.
     target_dict: dict, target spec containing "rules" and "sources" lists.
     extra_sources_for_rules: a list of keys to scan for rule matches in
         addition to 'sources'.
   """
@@ skipping 83 matching lines @@
     if not action_name:
       raise Exception("Anonymous action in target %s.  "
                       "An action must have an 'action_name' field." %
                       target_name)
     inputs = action.get('inputs', [])
     action_command = action.get('action')
     if action_command and not action_command[0]:
       raise Exception("Empty action as command in target %s." % target_name)
 
 
-def ValidateActionsInTarget(target, target_dict, build_file):
-  '''Validates the inputs to the actions in a target.'''
-  target_name = target_dict.get('target_name')
-  actions = target_dict.get('actions', [])
-  for action in actions:
-    action_name = action.get('action_name')
-    if not action_name:
-      raise Exception("Anonymous action in target %s.  "
-                      "An action must have an 'action_name' field." %
-                      target_name)
-    inputs = action.get('inputs', [])
-    action_command = action.get('action')
-    if action_command and not action_command[0]:
-      raise Exception("Empty action as command in target %s." % target_name)
-
-
 def TurnIntIntoStrInDict(the_dict):
   """Given dict the_dict, recursively converts all integers into strings.
   """
   # Use items instead of iteritems because there's no need to try to look at
   # reinserted keys and their associated values.
   for k, v in the_dict.items():
     if isinstance(v, int):
       v = str(v)
       the_dict[k] = v
     elif isinstance(v, dict):
@@ skipping 190 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]