openstack/python-swiftclient
Code Issues Proposed changes

(Mostly) revert "Cleanup session on delete"

Browse Source 
This reverts commit 1f26c57369 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
This commit is contained in:
Tim Burke
2020-06-17 15:44:22 -07:00
parent 9d8db8f612
commit 0c70d164ba
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
swiftclient/client.py
View File

@@ -443,14 +443,16 @@ class HTTPConnection(object):
if timeout: if timeout:
self.requests_args['timeout'] = timeout self.requests_args['timeout'] = timeout
def __del__(self): if not six.PY2:
"""Cleanup resources other than memory""" def __del__(self):
if self.request_session: """Cleanup resources other than memory"""
# The session we create must be closed to free up file descriptors if self.request_session:
try: # The session we create must be closed to free up
self.request_session.close() # file descriptors
finally: try:
self.request_session = None self.request_session.close()
finally:
self.request_session = None
def _request(self, *arg, **kwarg): def _request(self, *arg, **kwarg):
"""Final wrapper before requests call, to be patched in tests""" """Final wrapper before requests call, to be patched in tests"""