Changeset 19900 in vbox for trunk/src/VBox/Main

Timestamp:

May 22, 2009 7:45:29 AM (16 years ago)

Author:

vboxsync

Message:

Python: constant works everywhere with glue (note that SessionState_Open, not SessionState.Open is what shall be used now)

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• glue/constants-python.xsl (modified) (2 diffs)
• glue/vboxapi.py (modified) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -726 +726 @@
 $(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)
+        $(QUIET)$(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE)
 
 # Aliases for testing purposes.

trunk/src/VBox/Main/glue/constants-python.xsl

@@ -57 +57 @@
                   </xsl:for-each>}<xsl:if test="not(position()=last())">,</xsl:if>
 
-              </xsl:for-each>
+              </xsl:for-each>}
 
    _ValuesFlat = {<xsl:for-each select="//enum">
@@ -66 +66 @@
                         '<xsl:value-of select="$ename"/>_<xsl:value-of select="@name"/>':<xsl:value-of select="@value"/><xsl:if test="not(position()=last())">,</xsl:if>
                    </xsl:for-each>
+                   <xsl:if test="not(position()=last())">,</xsl:if>
                   </xsl:for-each>}
 
    def __getattr__(self,attr):
       v = self._ValuesFlat.get(attr)
-      if v == None:
-          return self.__dict__[name]
-      return v
-
+      if v is not None:
+         return v
+      else:
+         raise AttributeError
 
 </xsl:template>

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

@@ -31 +31 @@
 sys.path.append(VboxBinDir)
 sys.path.append(VboxSdkDir+"/bindings/glue/python")
+
+from VirtualBox_constants import VirtualBoxReflectionInfo
 
 class PlatformMSCOM:
@@ -207 +209 @@
             self.vbox = self.platform.getVirtualBox()
             self.mgr = SessionManager(self)
-            self.constants = self.platform.getConstants()
+            self.constants = VirtualBoxReflectionInfo()
             self.type = self.platform.getType()
             self.remote = self.platform.getRemote()