Fix a bug with mojom imports where 2 imports with the same namespace would

mojo/public/bindings/pylib/generate/mojom.py

 # Copyright 2013 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.
 
 # mojom's classes provide an interface to mojo modules. Modules are collections
 # of interfaces and structs to be used by mojo ipc clients and servers.
 #
 # A simple interface would be created this way:
 # module = mojom.Module('Foo')
 # interface = module.AddInterface('Bar')
@@ skipping 51 matching lines @@
   def __init__(self, name = None, kind = None, ordinal = None, default = None):
     self.name = name
     self.kind = kind
     self.ordinal = ordinal
     self.default = default
 
 
 class Struct(Kind):
   def __init__(self, name = None):
     self.name = name
-    self.imported_from_namespace = None
+    self.imported_from = None
     if name != None:
       spec = 'x:' + name
     else:
       spec = None
     Kind.__init__(self, spec)
     self.fields = []
 
   @classmethod
-  def CreateFromImport(cls, kind, import_namespace):
+  def CreateFromImport(cls, kind, imported_from):
     """Used with 'import module' - clones the kind imported from the
     given module's namespace."""
     kind = copy.deepcopy(kind)
-    kind.imported_from_namespace = import_namespace
+    kind.imported_from = imported_from
     return kind
 
   def AddField(self, name, kind, ordinal = None, default = None):
     field = Field(name, kind, ordinal, default)
     self.fields.append(field)
     return field
 
   def GetFullName(self, separator):
     """Returns the fully qualified type name, including namespace prefix."""
-    if self.imported_from_namespace:
-      return separator.join([self.imported_from_namespace, self.name])
+    if self.imported_from:
+      return separator.join([self.imported_from["namespace"], self.name])
     return self.name
 
   def GetFullNameInternal(self, separator):
     """Returns the fully qualified type name for an internal data structure,
     including namespace prefix."""
-    if self.imported_from_namespace:
+    if self.imported_from:
       return separator.join(
-          [self.imported_from_namespace, "internal", self.name])
+          [self.imported_from["namespace"], "internal", self.name])
     return self.name
 
 
 class Array(Kind):
   def __init__(self, kind = None):
     self.kind = kind
     if kind != None:
       Kind.__init__(self, 'a:' + kind.spec)
     else:
       Kind.__init__(self)
@@ skipping 57 matching lines @@
 
   def AddInterface(self, name):
     interface = Interface(name);
     self.interfaces.append(interface)
     return interface;
 
   def AddStruct(self, name):
     struct = Struct(name)
     self.structs.append(struct)
     return struct;