# HG changeset patch # User Julien Cristau # Date 1391005505 -3600 # Node ID 592c22e1c5f0ca3af4867c605ba4cbca1799cfbf # Parent 1263f125879652973c3ac1fac1c5e529b1a75051 [server/session] avoid spurious warnings from Session.close Add internal non-noisy _rollback method. diff -r 1263f1258796 -r 592c22e1c5f0 server/session.py --- a/server/session.py Wed Jan 29 15:29:49 2014 +0100 +++ b/server/session.py Wed Jan 29 15:25:05 2014 +0100 @@ -1638,8 +1638,11 @@ self._clear_thread_data(free_cnxset) @deprecated('[3.19] use a Connection object instead') - def rollback(self, free_cnxset=True, **kwargs): + def rollback(self, *args, **kwargs): """rollback the current session's transaction""" + return self._rollback(*args, **kwargs) + + def _rollback(self, free_cnxset=True, **kwargs): try: return self._cnx.rollback(free_cnxset, **kwargs) finally: @@ -1651,7 +1654,7 @@ with self._lock: self._closed = True tracker.close() - self.rollback() + self._rollback() self.debug('waiting for open connection of session: %s', self) timeout = 10 pendings = tracker.wait(timeout)