Index: /trunk/src/VBox/Frontends/VBoxShell/shellcommon.py
===================================================================
--- /trunk/src/VBox/Frontends/VBoxShell/shellcommon.py	(revision 19899)
+++ /trunk/src/VBox/Frontends/VBoxShell/shellcommon.py	(revision 19900)
@@ -246,5 +246,5 @@
             traceback.print_exc()
         return
-    if session.state != ctx['ifaces'].SessionState.Open:
+    if session.state != ctx['ifaces'].SessionState_Open:
         print "Session to '%s' in wrong state: %s" %(mach.name, session.state)
         return
Index: /trunk/src/VBox/Main/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/Makefile.kmk	(revision 19899)
+++ /trunk/src/VBox/Main/Makefile.kmk	(revision 19900)
@@ -726,5 +726,5 @@
 $(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.
Index: /trunk/src/VBox/Main/glue/constants-python.xsl
===================================================================
--- /trunk/src/VBox/Main/glue/constants-python.xsl	(revision 19899)
+++ /trunk/src/VBox/Main/glue/constants-python.xsl	(revision 19900)
@@ -57,5 +57,5 @@
                   </xsl:for-each>}<xsl:if test="not(position()=last())">,</xsl:if>
 
-              </xsl:for-each>
+              </xsl:for-each>}
 
    _ValuesFlat = {<xsl:for-each select="//enum">
@@ -66,12 +66,13 @@
                         '<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>
Index: /trunk/src/VBox/Main/glue/vboxapi.py
===================================================================
--- /trunk/src/VBox/Main/glue/vboxapi.py	(revision 19899)
+++ /trunk/src/VBox/Main/glue/vboxapi.py	(revision 19900)
@@ -31,4 +31,6 @@
 sys.path.append(VboxBinDir)
 sys.path.append(VboxSdkDir+"/bindings/glue/python")
+
+from VirtualBox_constants import VirtualBoxReflectionInfo
 
 class PlatformMSCOM:
@@ -207,5 +209,5 @@
             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()