Changeset 20036 in vbox for trunk/src/VBox/Main/glue

Timestamp:

May 26, 2009 1:21:41 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

47769

Message:

Python: docs update, webserice bindings support custom URLs, cleanup

File:

• trunk/src/VBox/Main/glue/vboxapi.py (modified) (5 diffs)

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

@@ -106 +106 @@
             #win32com.client.gencache.EnsureDispatch('VirtualBox.VirtualBox')
 
-    def getSessionObject(self):
+    def getSessionObject(self, vbox):
         import win32com
         from win32com.client import Dispatch
@@ -145 +145 @@
         import xpcom.components
 
-    def getSessionObject(self):
+    def getSessionObject(self, vbox):
         import xpcom.components
         return xpcom.components.classes["@virtualbox.org/Session;1"].createInstance()
@@ -177 +177 @@
         import VirtualBox_services
         import VirtualBox_wrappers
-        from VirtualBox_wrappers import IWebsessionManager
-        from VirtualBox_wrappers import g_port
-        from VirtualBox_wrappers import g_reflectionInfo
-        self.wsmgr = IWebsessionManager()
-        self.port = g_port
-        self.constants = g_reflectionInfo
-        self.user = ""
-        self.password = ""
-
-    def getSessionObject(self):
-        return self.wsmgr.getSessionObject()
+        from VirtualBox_wrappers import IWebsessionManager2
+        if params is not None:
+            self.user = params.get("user", "")
+            self.password = params.get("password", "")
+            self.url = params.get("url", "")
+        else:
+            self.user = ""
+            self.password = ""
+            self.url = None
+        self.wsmgr = IWebsessionManager2(self.url)
+
+    def getSessionObject(self, vbox):
+        return self.wsmgr.getSessionObject(vbox)
 
     def getVirtualBox(self):
@@ -193 +195 @@
 
     def getConstants(self):
-        from VirtualBox_wrappers import g_reflectionInfo
-        return g_reflectionInfo
+        return None
     
     def getType(self):
@@ -216 +217 @@
 
     def getSessionObject(self, vbox):
-        return self.mgr.platform.getSessionObject()
+        return self.mgr.platform.getSessionObject(vbox)
 
 class VirtualBoxManager: