Changeset 54123 in vbox for trunk

Timestamp:

Feb 10, 2015 11:15:24 AM (10 years ago)

Author:

vboxsync

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

98134

Message:

Main/glue/vboxapi.py: fix circular reference sabotaging garbage collection and a typo in the webservice part of the python glue.

File:

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

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

@@ -884 +884 @@
     def deinit(self):
         try:
-            disconnect()
+            self.disconnect()
         except:
             pass
@@ -1002 +1002 @@
                 raise e
 
-        ## @deprecated
-        # This used to refer to a session manager class with only one method
-        # called getSessionObject.  The method has moved into this call.
-        self.mgr = self
-
     def __del__(self):
         self.deinit()
@@ -1016 +1011 @@
         """
         return 3
+
+    @deprecated
+    @property
+    def mgr(self):
+        """
+        This used to be an attribute referring to a session manager class with
+        only one method called getSessionObject. It moved into this class.
+        """
+        return self;
 
     #
@@ -1077 +1081 @@
     def openMachineSession(self, oIMachine, fPermitSharing=True):
         """
-        Attemts to open the a session to the machine.
+        Attempts to open the a session to the machine.
         Returns a session object on success.
         Raises exception on failure.
         """
-        oSession = self.mgr.getSessionObject(self.vbox)
+        oSession = self.getSessionObject(self.vbox);
         if fPermitSharing:
             type_ = self.constants.LockType_Shared