Revert 231982 "Docserver: Display enum value descriptions in API..."

trunk/src/tools/json_schema_compiler/model.py

 # Copyright (c) 2012 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.
 
 import os.path
 
 from json_parse import OrderedDict
 from memoize import memoize
 
 class ParseException(Exception):
@@ skipping 123 matching lines @@
     json_type = json.get('type', None)
     if json_type == 'array':
       self.property_type = PropertyType.ARRAY
       self.item_type = Type(
           self, '%sType' % name, json['items'], namespace, origin)
     elif '$ref' in json:
       self.property_type = PropertyType.REF
       self.ref_type = json['$ref']
     elif 'enum' in json and json_type == 'string':
       self.property_type = PropertyType.ENUM
-      self.enum_values = [EnumValue(value) for value in json['enum']]
+      self.enum_values = [value for value in json['enum']]
     elif json_type == 'any':
       self.property_type = PropertyType.ANY
     elif json_type == 'binary':
       self.property_type = PropertyType.BINARY
     elif json_type == 'boolean':
       self.property_type = PropertyType.BOOLEAN
     elif json_type == 'integer':
       self.property_type = PropertyType.INTEGER
     elif (json_type == 'double' or
           json_type == 'number'):
@@ skipping 181 matching lines @@
       return
     if self._unix_name_used:
       raise AttributeError(
           'Cannot set the unix_name on %s; '
           'it is already used elsewhere as %s' %
           (self.name, self._unix_name))
     self._unix_name = unix_name
 
   unix_name = property(GetUnixName, SetUnixName)
 
-class EnumValue(object):
-  """A single value from an enum.
-  Properties:
-  - |name| name of the property as in the json.
-  - |description| a description of the property (if provided)
-  """
-  def __init__(self, json):
-    if isinstance(json, dict):
-      self.name = json['name']
-      self.description = json.get('description')
-    else:
-      self.name = json
-      self.description = None
-
 class _Enum(object):
   """Superclass for enum types with a "name" field, setting up repr/eq/ne.
   Enums need to do this so that equality/non-equality work over pickling.
   """
   @staticmethod
   def GetAll(cls):
     """Yields all _Enum objects declared in |cls|.
     """
     for prop_key in dir(cls):
       prop_value = getattr(cls, prop_key)
@@ skipping 135 matching lines @@
   # Sanity check: platforms should not be an empty list.
   if not json['platforms']:
     raise ValueError('"platforms" cannot be an empty list')
   platforms = []
   for platform_name in json['platforms']:
     for platform_enum in _Enum.GetAll(Platforms):
       if platform_name == platform_enum.name:
         platforms.append(platform_enum)
         break
   return platforms