Changeset 21968 in vbox

Timestamp:

Aug 5, 2009 8:01:34 AM (16 years ago)

Author:

vboxsync

Message:

Python WS: use symbolic enumeration values, not numerical

Location:

trunk/src/VBox/Main/glue

Files:

• constants-python.xsl (modified) (2 diffs)
• vboxapi.py (modified) (5 diffs)

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

@@ -49 +49 @@
 </xsl:text>
 class VirtualBoxReflectionInfo:
-   def __init__(self):
-      self.map = {}
+   def __init__(self, isSym):
+      self.isSym = isSym
 
    _Values = {<xsl:for-each select="//enum">
@@ -68 +68 @@
                    <xsl:if test="not(position()=last())">,</xsl:if>
                   </xsl:for-each>}
+ 
+   _ValuesFlatSym = {<xsl:for-each select="//enum">
+                   <xsl:variable name="ename">
+                    <xsl:value-of select="@name"/>
+                   </xsl:variable>
+                   <xsl:for-each select="const">
+                     <xsl:variable name="eval">
+                       <xsl:value-of select="concat($ename, '_', @name)"/>
+                   </xsl:variable>
+                        '<xsl:value-of select="$eval"/>': '<xsl:value-of select="$eval"/>'<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 self.isSym:
+        v = self._ValuesFlatSym.get(attr)
+      else:
+        v = self._ValuesFlat.get(attr)
       if v is not None:
          return v

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

@@ -205 +205 @@
             import pythoncom
             import win32api
-            self.constants = PlatformMSCOM.InterfacesWrapper()
             from win32con import DUPLICATE_SAME_ACCESS
             from win32api import GetCurrentThread,GetCurrentThreadId,DuplicateHandle,GetCurrentProcess
@@ -230 +229 @@
         return win32com.client.Dispatch("VirtualBox.VirtualBox")
 
-    def getConstants(self):
-        return self.constants
-
     def getType(self):
         return 'MSCOM'
@@ -321 +317 @@
         import xpcom.components
         return xpcom.components.classes["@virtualbox.org/VirtualBox;1"].createInstance()
-
-    def getConstants(self):
-        import xpcom.components
-        return xpcom.components.interfaces
 
     def getType(self):
@@ -411 +403 @@
                 self.wsmgr = None
 
-    def getConstants(self):
-        return None
-
     def getType(self):
         return 'WEBSERVICE'
@@ -457 +446 @@
                 style = "XPCOM"
 
+
         exec "self.platform = Platform"+style+"(platparams)"
-
-        self.constants = VirtualBoxReflectionInfo()
+        # for webservices, enums are symbolic
+        self.constants = VirtualBoxReflectionInfo(style == "WEBSERVICE")
         self.type = self.platform.getType()
         self.remote = self.platform.getRemote()