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

Timestamp:

Jun 1, 2016 2:17:30 PM (9 years ago)

Author:

vboxsync

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

107684

Message:

Main/glue/vboxapi.py: fix API termination issue (double deinit, once by the API client and once by the module when the garbage collector kicks in) and some forgotten print_ uses from the time before python 2.6 was the minimum supported version

File:

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

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

@@ -993 +993 @@
             self.vbox = self.platform.getVirtualBox()
         except NameError:
-            print_("Installation problem: check that appropriate libs in place")
+            print("Installation problem: check that appropriate libs in place")
             traceback.print_exc()
             raise
         except Exception:
             _, e, _ = sys.exc_info()
-            print_("init exception: ", e)
+            print("init exception: ", e)
             traceback.print_exc()
             if self.remote:
@@ -1074 +1074 @@
         Do not access it after calling this method.
         """
-        if hasattr(self, "vbox"):
+        if hasattr(self, "vbox") and self.vbox is not None:
             del self.vbox
             self.vbox = None
-        if hasattr(self, "platform"):
+        if hasattr(self, "platform") and self.platform is not None:
             self.platform.deinit()
             self.platform = None