From f7b2b0a1fdb421f0330a3214e2d7833c2e030085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 2 Jun 2020 19:56:10 +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: I5f0224f85939cf3fe86cf14d950dae0e2e1db869 --- src/lib/charm/openstack/manila_generic.py | 1 - src/reactive/manila_generic_handlers.py | 1 - unit_tests/test_lib_charm_openstack_manila_generic.py | 3 --- unit_tests/test_manila_generic_handlers.py | 3 --- 4 files changed, 8 deletions(-) diff --git a/src/lib/charm/openstack/manila_generic.py b/src/lib/charm/openstack/manila_generic.py index e9ef963..6c0e5bf 100644 --- a/src/lib/charm/openstack/manila_generic.py +++ b/src/lib/charm/openstack/manila_generic.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 os import textwrap diff --git a/src/reactive/manila_generic_handlers.py b/src/reactive/manila_generic_handlers.py index ebd2d4c..c16922e 100644 --- a/src/reactive/manila_generic_handlers.py +++ b/src/reactive/manila_generic_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 import charms_openstack.charm diff --git a/unit_tests/test_lib_charm_openstack_manila_generic.py b/unit_tests/test_lib_charm_openstack_manila_generic.py index 7c17cbf..27878db 100644 --- a/unit_tests/test_lib_charm_openstack_manila_generic.py +++ b/unit_tests/test_lib_charm_openstack_manila_generic.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 charm.openstack.manila_generic as manila_generic diff --git a/unit_tests/test_manila_generic_handlers.py b/unit_tests/test_manila_generic_handlers.py index e9a8d9d..d256384 100644 --- a/unit_tests/test_manila_generic_handlers.py +++ b/unit_tests/test_manila_generic_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.manila_generic_handlers as handlers