server/session.py
changeset 9120 fa513ac7a2a5
parent 9113 af6efc15fc90
child 9121 182c620c960b
--- a/server/session.py	Thu Jun 27 18:14:35 2013 +0200
+++ b/server/session.py	Thu Jun 27 18:47:08 2013 +0200
@@ -164,7 +164,7 @@
         super_exit = super(_session_hooks_control, self).__exit__
         ret = super_exit(exctype, exc, traceback)
         if self.cnx.ctx_count == 0:
-            self.session.close_cnx(self.cnx)
+            self.session._close_cnx(self.cnx)
         return ret
 
 @deprecated('[3.17] use <object>.security_enabled instead')
@@ -219,7 +219,7 @@
         super_exit = super(_session_security_enabled, self).__exit__
         ret = super_exit(exctype, exc, traceback)
         if self.cnx.ctx_count == 0:
-            self.session.close_cnx(self.cnx)
+            self.session._close_cnx(self.cnx)
         return ret
 
 HOOKS_ALLOW_ALL = object()
@@ -1377,7 +1377,7 @@
         """
         return Connection(self)
 
-    def get_cnx(self, cnxid):
+    def _get_cnx(self, cnxid):
         """return the <cnxid> connection attached to this session
 
         Connection is created if necessary"""
@@ -1394,7 +1394,7 @@
                 cnx.__enter__()
         return cnx
 
-    def close_cnx(self, cnx):
+    def _close_cnx(self, cnx):
         """Close a Connection related to a session"""
         assert cnx._session_handled
         cnx.__exit__()
@@ -1411,7 +1411,7 @@
         Connection is created if necessary"""
         if cnxid is None:
             cnxid = threading.currentThread().getName()
-        cnx = self.get_cnx(cnxid)
+        cnx = self._get_cnx(cnxid)
         # New style session should not be accesed through the session.
         assert cnx._session_handled
         self.__threaddata.cnx = cnx
@@ -1606,7 +1606,7 @@
             if free_cnxset:
                 self.free_cnxset()
                 if cnx.ctx_count == 0:
-                    self.close_cnx(cnx)
+                    self._close_cnx(cnx)
                 else:
                     cnx.clear()
             else: