# HG changeset patch # User Julien Cristau # Date 1391008753 -3600 # Node ID 0ae4e6d7ce2f384cc138200f86df8859cc508732 # Parent 197b7a4ef54472803e7544825ff7492b656fa2b2 [server/session] use _free_cnxset instead of free_cnxset to avoid warnings No need to make DeprecationWarning noise for something the user doesn't have any control over. diff -r 197b7a4ef544 -r 0ae4e6d7ce2f server/session.py --- a/server/session.py Tue Jan 28 15:29:23 2014 +0100 +++ b/server/session.py Wed Jan 29 16:19:13 2014 +0100 @@ -530,7 +530,7 @@ def __exit__(self, exctype=None, excvalue=None, tb=None): assert self._open # actually already open - self.free_cnxset(ignoremode=True) + self._free_cnxset(ignoremode=True) self.clear() self._open = False @@ -1047,7 +1047,7 @@ finally: self._session_timestamp.touch() if free_cnxset: - self.free_cnxset(ignoremode=True) + self._free_cnxset(ignoremode=True) self.clear() @_open_only @@ -1136,7 +1136,7 @@ finally: self._session_timestamp.touch() if free_cnxset: - self.free_cnxset(ignoremode=True) + self._free_cnxset(ignoremode=True) self.clear() # resource accessors ###################################################### @@ -1618,7 +1618,7 @@ pass else: if free_cnxset: - self.free_cnxset() + cnx._free_cnxset() if cnx.ctx_count == 0: self._close_cnx(cnx) else: