Update mojo sdk to rev 04a510fb37db10642e156957f9b2c11c2f6442ac

mojo/public/tools/bindings/generators/mojom_python_generator.py

 # Copyright 2014 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.
 
 """Generates Python source files from a mojom.Module."""
 
 import re
 from itertools import ifilter
 
 import mojom.generate.generator as generator
@@ skipping 33 matching lines @@
   mojom.INT8:   'b',
   mojom.UINT8:  'B',
   mojom.INT16:  'h',
   mojom.UINT16: 'H',
   mojom.INT32:  'i',
   mojom.UINT32: 'I',
   mojom.FLOAT:  'f',
   mojom.DOUBLE: 'd',
 }
 
-_kind_to_typecode = dict(_kind_to_typecode_for_native_array)
-_kind_to_typecode.update({
-  mojom.INT64:                 'q',
-  mojom.UINT64:                'Q',
-  mojom.HANDLE:                'i',
-  mojom.DCPIPE:                'i',
-  mojom.DPPIPE:                'i',
-  mojom.MSGPIPE:               'i',
-  mojom.SHAREDBUFFER:          'i',
-  mojom.NULLABLE_HANDLE:       'i',
-  mojom.NULLABLE_DCPIPE:       'i',
-  mojom.NULLABLE_DPPIPE:       'i',
-  mojom.NULLABLE_MSGPIPE:      'i',
-  mojom.NULLABLE_SHAREDBUFFER: 'i',
-})
-
 
 def NameToComponent(name):
   # insert '_' between anything and a Title name (e.g, HTTPEntry2FooBar ->
   # HTTP_Entry2_FooBar)
   name = re.sub('([^_])([A-Z][^A-Z_]+)', r'\1_\2', name)
   # insert '_' between non upper and start of upper blocks (e.g.,
   # HTTP_Entry2_FooBar -> HTTP_Entry2_Foo_Bar)
   name = re.sub('([^A-Z_])([A-Z])', r'\1_\2', name)
   return [x.lower() for x in name.split('_')]
 
@@ skipping 50 matching lines @@
   name = []
   if kind.imported_from:
     name.append(kind.imported_from['python_module'])
   name.append(GetNameForElement(kind))
   return '.'.join(name)
 
 def GetFieldType(kind, field=None):
   if mojom.IsArrayKind(kind):
     arguments = []
     if kind.kind in _kind_to_typecode_for_native_array:
-      arguments.append('%r' %_kind_to_typecode_for_native_array[kind.kind])
+      arguments.append('%r' % _kind_to_typecode_for_native_array[kind.kind])
     elif kind.kind != mojom.BOOL:
       arguments.append(GetFieldType(kind.kind))
     if mojom.IsNullableKind(kind):
       arguments.append('nullable=True')
     if kind.length is not None:
       arguments.append('length=%d' % kind.length)
     array_type = 'GenericArrayType'
     if kind.kind == mojom.BOOL:
       array_type = 'BooleanArrayType'
     elif kind.kind in _kind_to_typecode_for_native_array:
@@ skipping 11 matching lines @@
 
   if mojom.IsStructKind(kind):
     arguments = [ 'lambda: %s' % GetFullyQualifiedName(kind) ]
     if mojom.IsNullableKind(kind):
       arguments.append('nullable=True')
     return '_descriptor.StructType(%s)' % ', '.join(arguments)
 
   if mojom.IsEnumKind(kind):
     return GetFieldType(mojom.INT32)
 
-  return _kind_to_type.get(kind, '_descriptor.TYPE_NONE')
+  if mojom.IsInterfaceKind(kind):
+    arguments = [ 'lambda: %s' % GetFullyQualifiedName(kind) ]
+    if mojom.IsNullableKind(kind):
+      arguments.append('nullable=True')
+    return '_descriptor.InterfaceType(%s)' % ', '.join(arguments)
+
+  if mojom.IsInterfaceRequestKind(kind):
+    arguments = []
+    if mojom.IsNullableKind(kind):
+      arguments.append('nullable=True')
+    return '_descriptor.InterfaceRequestType(%s)' % ', '.join(arguments)
+
+  return _kind_to_type[kind]
 
 def GetFieldDescriptor(packed_field):
   field = packed_field.field
   class_name = 'SingleFieldGroup'
   if field.kind == mojom.BOOL:
     class_name = 'FieldDescriptor'
   arguments = [ '%r' % GetNameForElement(field) ]
   arguments.append(GetFieldType(field.kind, field))
   arguments.append(str(packed_field.index))
   arguments.append(str(packed_field.ordinal))
@@ skipping 148 matching lines @@
             'Unable to find interface %s declared as client of %s.' %
             (interface.client, interface.name))
         interface.qualified_client = interfaces_by_name[interface.client]
     return sorted(interfaces, key=lambda i: (bool(i.client), i.name))
 
   def GetJinjaParameters(self):
     return {
       'lstrip_blocks': True,
       'trim_blocks': True,
     }