Changeset 19883 in vbox for trunk/src

Timestamp:

May 21, 2009 3:03:06 PM (16 years ago)

Author:

vboxsync

Message:

Python: generate constants, instead of relying on (*)COM mechanisms (WIP)

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (2 diffs)
• glue/vboxapi.py (modified) (3 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -174 +174 @@
 # so for users it look 'just being here' 
 VBox-python-glue_SOURCES = glue/vboxapi.py=>glue/python/vboxapi.py
+
+VBOX_PYTHON_CONSTANTS = $(VBOX_PATH_SDK)/bindings/glue/python/VirtualBox_constants.py
+OTHERS += $(VBOX_PYTHON_CONSTANTS)
 
 ifndef VBOX_ONLY_SDK # Note this goes on for *very* long
@@ -721 +724 @@
         $(QUIET)$(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE)
 
+$(VBOX_PYTHON_CONSTANTS):  $(VBOX_PATH_MAIN_SRC)/glue/constants-python.xsl $(VBOX_XIDL_FILE) | $$(dir $$@)
+        $(call MSG_TOOL,xsltproc,Python constants,$<,$@)
+        $(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE)
 
 # Aliases for testing purposes.

trunk/src/VBox/Main/glue/vboxapi.py

@@ -45 +45 @@
                     raise AttributeError
 
-            def __getattr__(self, attr):
-                if attr.startswith("__"):
-                    raise AttributeError
-
-                consts = self.__dict__['_consts']
-                fake = consts.get(attr, None)
-                if fake != None:
-                    return fake  
-                try:
-                    name = makeFullName(self, attr)
-                    return win32com.client.constants.__getattr__(name)
-                except AttributeError,e:
-                    fake = ConstantFake(self, attr)
-                    consts[attr] = fake
-                    return fake     
+        def __getattr__(self, attr):
+            import win32com
+            from win32com.client import constants
+                
+            if attr.startswith("__"):
+                raise AttributeError
+
+            consts = self.__dict__['_consts']
+            
+            fake = consts.get(attr, None)
+            if fake != None:
+               return fake  
+            try:
+               name = self.__dict__['_name']
+               parent = self.__dict__['_parent']
+               while parent != None:                  
+                  if parent._name is not None:
+                    name = parent._name+'_'+name
+                  parent = parent._parent
+                
+               if name is not None:
+                  name += "_" + attr
+               else:
+                  name = attr
+               print "ask",name
+               return win32com.client.constants.__getattr__(name)
+            except AttributeError,e:
+               fake = PlatformMSCOM.ConstantFake(self, attr)
+               consts[attr] = fake
+               return fake 
+
 
     class InterfacesWrapper:
@@ -66 +82 @@
 
             def __getattr__(self, a):
+                import win32com
+                from win32com.client import constants
                 if a.startswith("__"):
                     raise AttributeError
@@ -72 +90 @@
                 except AttributeError,e:
                     return self.__dict__['_rootFake'].__getattr__(a)
-
-    def makeFullName(fake, attr):
-            name = fake._name
-            parent = fake._parent
-            while parent != None:
-                if parent._name is not None:
-                    name = parent._name+'_'+name
-                parent = parent._parent
-                
-            if name is not None:
-                name += "_" + attr
-            else:
-                name = attr
-            return name
 
     def __init__(self, params):