From 7da1f26398555879ce92e6b1e9785a8d890e659e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 2 Jun 2020 19:36:47 +0200 Subject: [PATCH] Stop to use the __future__ module. The __future__ module [1] was used in this context to ensure compatibility between python 2 and python 3. We previously dropped the support of python 2.7 [2] and now we only support python 3 so we don't need to continue to use this module and the imports listed below. Imports commonly used and their related PEPs: - `division` is related to PEP 238 [3] - `print_function` is related to PEP 3105 [4] - `unicode_literals` is related to PEP 3112 [5] - `with_statement` is related to PEP 343 [6] - `absolute_import` is related to PEP 328 [7] [1] https://docs.python.org/3/library/__future__.html [2] https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html [3] https://www.python.org/dev/peps/pep-0238 [4] https://www.python.org/dev/peps/pep-3105 [5] https://www.python.org/dev/peps/pep-3112 [6] https://www.python.org/dev/peps/pep-0343 [7] https://www.python.org/dev/peps/pep-0328 Change-Id: Iea37866cb1e319b443acf66e593d8f37bf692b50 --- src/lib/charm/openstack/barbican.py | 1 - src/reactive/barbican_handlers.py | 1 - unit_tests/test_barbican_handlers.py | 3 --- unit_tests/test_lib_charm_openstack_barbican.py | 3 --- 4 files changed, 8 deletions(-) diff --git a/src/lib/charm/openstack/barbican.py b/src/lib/charm/openstack/barbican.py index a47cfc4..d5993f2 100644 --- a/src/lib/charm/openstack/barbican.py +++ b/src/lib/charm/openstack/barbican.py @@ -15,7 +15,6 @@ # bare functions are provided to the reactive handlers to perform the functions # needed on the class. -from __future__ import absolute_import import collections import subprocess diff --git a/src/reactive/barbican_handlers.py b/src/reactive/barbican_handlers.py index 99b0451..ff855bc 100644 --- a/src/reactive/barbican_handlers.py +++ b/src/reactive/barbican_handlers.py @@ -13,7 +13,6 @@ # limitations under the License. # this is just for the reactive handlers and calls into the charm. -from __future__ import absolute_import import charms.reactive as reactive import charmhelpers.core.hookenv as hookenv diff --git a/unit_tests/test_barbican_handlers.py b/unit_tests/test_barbican_handlers.py index 0003a34..e37f460 100644 --- a/unit_tests/test_barbican_handlers.py +++ b/unit_tests/test_barbican_handlers.py @@ -12,9 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import -from __future__ import print_function - import mock import reactive.barbican_handlers as handlers diff --git a/unit_tests/test_lib_charm_openstack_barbican.py b/unit_tests/test_lib_charm_openstack_barbican.py index 4ed6401..41f6123 100644 --- a/unit_tests/test_lib_charm_openstack_barbican.py +++ b/unit_tests/test_lib_charm_openstack_barbican.py @@ -12,9 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import -from __future__ import print_function - import mock import charms_openstack.test_utils as test_utils