summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-09-19 03:44:31 +0000
committerGerrit Code Review <review@openstack.org>2020-09-19 03:44:31 +0000
commitb13712949fd58ba1332cb0507dd39853c0ee0efe (patch)
treef29ddcd56ee03f0d76e278cf14abc989654a35a3
parente367b6270c6d544312817ab31723aae54f4c234a (diff)
parent0c70d164ba52d76a6dbbbe8765d15fb969fc07ff (diff)
downloadpython-swiftclient-b13712949fd58ba1332cb0507dd39853c0ee0efe.tar.gz
Merge "(Mostly) revert "Cleanup session on delete""
-rw-r--r--swiftclient/client.py18
1 files changed, 10 insertions, 8 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py
index 0aba629..5c63b60 100644
--- a/swiftclient/client.py
+++ b/swiftclient/client.py
@@ -443,14 +443,16 @@ class HTTPConnection(object):
if timeout:
self.requests_args['timeout'] = timeout
- def __del__(self):
- """Cleanup resources other than memory"""
- if self.request_session:
- # The session we create must be closed to free up file descriptors
- try:
- self.request_session.close()
- finally:
- self.request_session = None
+ if not six.PY2:
+ def __del__(self):
+ """Cleanup resources other than memory"""
+ if self.request_session:
+ # The session we create must be closed to free up
+ # file descriptors
+ try:
+ self.request_session.close()
+ finally:
+ self.request_session = None
def _request(self, *arg, **kwarg):
"""Final wrapper before requests call, to be patched in tests"""