From 0126d029c2f74cbea11f049d2f15b2b120639041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 2 Jun 2020 20:33:28 +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: Ic435def472b13d5c89645c2bb083702cb251d132 --- templates/swift_rings.py.j2 | 4 +--- templates/swift_rings_check.py.j2 | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/templates/swift_rings.py.j2 b/templates/swift_rings.py.j2 index 4504ab26..1e06b8bf 100644 --- a/templates/swift_rings.py.j2 +++ b/templates/swift_rings.py.j2 @@ -1,4 +1,4 @@ -#!{{ swift_bin }}/{{ (swift_install_method == 'distro' and ansible_os_family | lower == 'redhat' and ansible_distribution_major_version is version('7', '<=')) | ternary('python', swift_venv_python_executable) }} +#!{{ swift_bin }}/{{ swift_venv_python_executable }} # Copyright 2014, Rackspace US, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,8 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -from __future__ import print_function from optparse import OptionParser from os.path import exists, dirname, join, basename diff --git a/templates/swift_rings_check.py.j2 b/templates/swift_rings_check.py.j2 index 7b894822..16de5cad 100644 --- a/templates/swift_rings_check.py.j2 +++ b/templates/swift_rings_check.py.j2 @@ -1,4 +1,4 @@ -#!{{ swift_bin }}/{{ (swift_install_method == 'distro' and ansible_os_family | lower == 'redhat' and ansible_distribution_major_version is version('7', '<=')) | ternary('python', swift_venv_python_executable) }} +#!{{ swift_bin }}/{{ swift_venv_python_executable }} # Copyright 2014, Rackspace US, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,8 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -from __future__ import print_function from optparse import OptionParser from os.path import exists