diff options
author | Tim Burke <tim.burke@gmail.com> | 2020-06-17 15:44:22 -0700 |
---|---|---|
committer | Tim Burke <tim.burke@gmail.com> | 2020-09-08 15:04:54 -0700 |
commit | 0c70d164ba52d76a6dbbbe8765d15fb969fc07ff (patch) | |
tree | 5d9a5053869859c47dd81375323c706e39b95a0e | |
parent | 9d8db8f6126542dc18ea1b14e078d64cc1a254e4 (diff) | |
download | python-swiftclient-0c70d164ba52d76a6dbbbe8765d15fb969fc07ff.tar.gz |
(Mostly) revert "Cleanup session on delete"
This reverts commit 1f26c5736949e1c3b57c024a315e33fc419f126e for py2.
Apparently the existence of the __del__ method on Python 2 prevents us
from cleaning up all file descriptors.
Change-Id: Id6cff5dd7b9faf9c4240c0cb26b74d05ed37da5b
Closes-Bug: #1873435
Related-Bug: #1838775
-rw-r--r-- | swiftclient/client.py | 18 |
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""" |