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

Timestamp:

Jul 20, 2009 4:48:08 PM (16 years ago)

Author:

vboxsync

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

50303

Message:

SDK: make documentation match reality, minor refactoring

File:

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

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

@@ -25 +25 @@
 
 if VboxSdkDir is None:
-    VboxSdkDir = VboxBinDir+"/sdk"
+    VboxSdkDir = os.path.join(VboxBinDir,"sdk")
 
 os.environ["VBOX_PROGRAM_PATH"] = VboxBinDir
@@ -378 +378 @@
 class PlatformWEBSERVICE:
     def __init__(self, params):
-        sys.path.append(VboxSdkDir+'/bindings/webservice/python/lib')
+        sys.path.append(os.path.join(VboxSdkDir,'bindings', 'webservice', 'python', 'lib'))
         # not really needed, but just fail early if misconfigured
         import VirtualBox_services
         import VirtualBox_wrappers
         from VirtualBox_wrappers import IWebsessionManager2
+
         if params is not None:
             self.user = params.get("user", "")
@@ -472 +473 @@
             else:
                 style = "XPCOM"
+        
+        exec "self.platform = Platform"+style+"(platparams)"
+            
+        self.constants = VirtualBoxReflectionInfo()
+        self.type = self.platform.getType()
+        self.remote = self.platform.getRemote()
+        self.style = style 
+        self.mgr = SessionManager(self)
+        
         try:
-            exec "self.platform = Platform"+style+"(platparams)"
-            
-            self.constants = VirtualBoxReflectionInfo()
-            self.type = self.platform.getType()
-            self.remote = self.platform.getRemote()
-            self.style = style            
-
-            self.mgr = SessionManager(self)
             self.vbox = self.platform.getVirtualBox()
+        except NameError,ne:
+            print "Installation problem: check that appropriate libs in place"
+            traceback.print_exc()
+            raise ne
         except Exception,e:
             print "init exception: ",e