openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Merge "Stop to use the __future__ module."

Browse Source
This commit is contained in:
Zuul 2020-12-04 16:38:31 +00:00 committed by Gerrit Code Review
commit afc82768d4
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/swift_rings.py.j2
View File

@ -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. # Copyright 2014, Rackspace US, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # 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. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from __future__ import print_function
from optparse import OptionParser from optparse import OptionParser
from os.path import exists, dirname, join, basename from os.path import exists, dirname, join, basename

4
templates/swift_rings_check.py.j2
View File

@ -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. # Copyright 2014, Rackspace US, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # 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. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from __future__ import print_function
from optparse import OptionParser from optparse import OptionParser
from os.path import exists from os.path import exists