Restore try/except in __del__ methods

Fixed #1339

Author: andymccurdy

CHANGES

@@ -1,3 +1,6 @@
+* (in development)
+ * Restore try/except clauses to __del__ methods. These will be removed
+ in 4.0 when more explicit resource management if enforced. #1339
 * 3.5.2 (May 14, 2020)
  * Tune the locking in ConnectionPool.get_connection so that the lock is
  not held while waiting for the socket to establish and validate the

redis/client.py

@@ -3410,10 +3410,13 @@ def __exit__(self, exc_type, exc_value, traceback):
  self.reset()
 
  def __del__(self):
- # if this object went out of scope prior to shutting down
- # subscriptions, close the connection manually before
- # returning it to the connection pool
- self.reset()
+ try:
+ # if this object went out of scope prior to shutting down
+ # subscriptions, close the connection manually before
+ # returning it to the connection pool
+ self.reset()
+ except Exception:
+ pass
 
  def reset(self):
  if self.connection:
@@ -3762,7 +3765,10 @@ def __exit__(self, exc_type, exc_value, traceback):
  self.reset()
 
  def __del__(self):
- self.reset()
+ try:
+ self.reset()
+ except Exception:
+ pass
 
  def __len__(self):
  return len(self.command_stack)

redis/connection.py

@@ -296,7 +296,10 @@ def __init__(self, socket_read_size):
  self._buffer = None
 
  def __del__(self):
- self.on_disconnect()
+ try:
+ self.on_disconnect()
+ except Exception:
+ pass
 
  def on_connect(self, connection):
  "Called when the socket connects"
@@ -374,7 +377,10 @@ def __init__(self, socket_read_size):
  self._buffer = bytearray(socket_read_size)
 
  def __del__(self):
- self.on_disconnect()
+ try:
+ self.on_disconnect()
+ except Exception:
+ pass
 
  def on_connect(self, connection):
  self._sock = connection._sock
@@ -534,7 +540,10 @@ def repr_pieces(self):
  return pieces
 
  def __del__(self):
- self.disconnect()
+ try:
+ self.disconnect()
+ except Exception:
+ pass
 
  def register_connect_callback(self, callback):
  self._connect_callbacks.append(callback)