diff options
| -rw-r--r-- | doc/requirements.txt | 4 | ||||
| -rw-r--r-- | doc/source/conf.py | 10 | ||||
| -rw-r--r-- | lower-constraints.txt | 4 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 6 | ||||
| -rw-r--r-- | swiftclient/client.py | 18 |
5 files changed, 21 insertions, 21 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt index 5700e3b..6894ce1 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,4 +1,4 @@ keystoneauth1>=3.4.0 # Apache-2.0 sphinx>=1.6.2,!=1.6.6,!=1.6.7,!=2.1.0,!=3.0.0 # BSD -reno>=2.5.0 # Apache-2.0 -openstackdocstheme>=1.31.2 # Apache-2.0 +reno>=3.1.0 # Apache-2.0 +openstackdocstheme>=2.2.1 # Apache-2.0 diff --git a/doc/source/conf.py b/doc/source/conf.py index 5f88f5a..8381605 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -55,6 +55,12 @@ master_doc = 'index' # General information about the project. copyright = u'2013-2016 OpenStack, LLC.' +# -- Options for openstackdocstheme ------------------------------------------- +openstackdocs_repo_name = 'openstack/python-swiftclient' +openstackdocs_bug_project = 'python-swiftclient' +openstackdocs_bug_tag = '' +openstackdocs_pdf_link = True + # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None @@ -131,10 +137,6 @@ html_theme_options = {'show_other_versions': True} # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -# html_last_updated_fmt = '%b %d, %Y' - # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. # html_use_smartypants = True diff --git a/lower-constraints.txt b/lower-constraints.txt index 1e4ffb9..28a1060 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -20,7 +20,6 @@ MarkupSafe==1.0 mccabe==0.2.1 mock==1.2.0 netaddr==0.7.10 -openstackdocstheme==2.0.0 openstacksdk==0.11.0 oslo.config==1.2.0 pbr==2.0.0 @@ -33,12 +32,9 @@ python-mimeparse==1.6.0 python-subunit==1.0.0 pytz==2013.6 PyYAML==3.12 -reno==2.5.0 requests==1.1.0 six==1.9.0 snowballstemmer==1.2.1 -sphinx==2.0.0 -sphinxcontrib-websupport==1.0.1 stestr==2.0.0 testtools==2.2.0 traceback2==1.4.0 diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 9bdbbe4..a050a54 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -339,6 +339,6 @@ htmlhelp_basename = 'SwiftClientReleaseNotesdoc' locale_dirs = ['locale/'] # -- Options for openstackdocstheme ------------------------------------------- -repository_name = 'openstack/python-swiftclient' -bug_project = 'python-swiftclient' -bug_tag = '' +openstackdocs_repo_name = 'openstack/python-swiftclient' +openstackdocs_bug_project = 'python-swiftclient' +openstackdocs_bug_tag = '' 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""" |