Remove SPECIAL_KEYS and GclChange.Changelist() to simplify the code.

presubmit_support.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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.
 
 """Enables directory-specific presubmit checks to run at upload and/or commit.
 """
 
 __version__ = '1.1'
 
@@ skipping 23 matching lines @@
 import gcl
 import gclient
 import presubmit_canned_checks
 
 
 # Matches key/value (or "tag") lines in changelist descriptions.
 _tag_line_re = re.compile(
     '^\s*(?P<key>[A-Z][A-Z_0-9]*)\s*=\s*(?P<value>.*?)\s*$')
 
 
-# Friendly names may be used for certain keys.  All values for key-value pairs
-# in change descriptions (like BUG=123) can be retrieved from a change object
-# directly as if they were attributes, e.g. change.R (or equivalently because
-# we have a friendly name for it, change.Reviewers), change.BUG (or
-# change.BugIDs) and so forth.
-#
-# Add to this mapping as needed/desired.
-SPECIAL_KEYS = {
-  'Reviewers' : 'R',
-  'BugIDs' : 'BUG',
-  'Tested': 'TESTED',
-  'Test': 'TEST'
-}
-
-
 class NotImplementedException(Exception):
   """We're leaving placeholders in a bunch of places to remind us of the
   design of the API, but we have not implemented all of it yet. Implement as
   the need arises.
   """
   pass
 
 
 def normpath(path):
   '''Version of os.path.normpath that also changes backward slashes to
@@ skipping 383 matching lines @@
 
     self.affected_files = [
         SvnAffectedFile(info[1], info[0].strip(), repository_root)
         for info in change_info.files
     ]
 
   def Change(self):
     """Returns the change name."""
     return self.name
 
-  def Changelist(self):
-    """Synonym for Change()."""
-    return self.Change()
-
   def DescriptionText(self):
     """Returns the user-entered changelist description, minus tags.
 
     Any line in the user-provided description starting with e.g. "FOO="
     (whitespace permitted before and around) is considered a tag line.  Such
     lines are stripped out of the description this function returns.
     """
     return self.description_without_tags
 
   def FullDescriptionText(self):
     """Returns the complete changelist description including tags."""
     return self.full_description
 
   def RepositoryRoot(self):
     """Returns the repository root for this change, as an absolute path."""
     return self.repository_root
 
   def __getattr__(self, attr):
     """Return keys directly as attributes on the object.
 
     You may use a friendly name (from SPECIAL_KEYS) or the actual name of
     the key.
     """
-    if attr in SPECIAL_KEYS:
-      key = SPECIAL_KEYS[attr]
-      if key in self.tags:
-        return self.tags[key]
-    if attr in self.tags:
-      return self.tags[attr]
+    return self.tags.get(attr)
 
   def AffectedFiles(self, include_dirs=False, include_deletes=True):
     """Returns a list of AffectedFile instances for all files in the change.
 
     Args:
       include_deletes: If false, deleted files will be filtered out.
       include_dirs: True to include directories in the list
 
     Returns:
       [AffectedFile(path, action), AffectedFile(path, action)]
@@ skipping 239 matching lines @@
   return not DoPresubmitChecks(gcl.ChangeInfo(name='temp', files=files),
                                options.commit,
                                options.verbose,
                                sys.stdout,
                                sys.stdin,
                                default_presubmit=None)
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))