openstack
/
tripleo-common
Code Issues Proposed changes

Remove leftovers of Python 2 support 

... because Python 2 is no longer supported.

Change-Id: If244f26f431a9387a8797a0a93470b285bb8bc2b
This commit is contained in:
Takashi Kajinami 2022-06-23 21:26:14 +09:00
parent d84377e570
commit e19696206b
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bindep.txt
View File

@ -18,14 +18,10 @@ gcc-c++ [platform:rpm]
git [platform:rpm]
libffi-devel [platform:rpm]
openssl-devel [platform:rpm]
python-devel [(platform:rpm platform:base-py2)]
python2-dnf [(platform:rpm platform:base-py2)]
# For SELinux
libselinux-python [(platform:rpm platform:base-py2)]
python3-libselinux [(platform:rpm platform:base-py3)]
libsemanage-python [(platform:rpm platform:base-py2)]
python3-libsemanage-python [(platform:rpm platform:base-py3)]
python3-libselinux [(platform:rpm)]
python3-libsemanage-python [(platform:rpm)]
# Required for compressing collected log files in CI
gzip

3
container-images/kolla/base/set_configs.py
View File

@ -361,8 +361,7 @@ def handle_permissions(config):
path, uid, gid)
if perm:
# NOTE(Jeffrey4l): py3 need '0oXXX' format for octal literals,
# and py2 support such format too.
# NOTE(Jeffrey4l): py3 need '0oXXX' format for octal literals.
if len(perm) == 4 and perm[1] != 'o':
perm = ''.join([perm[:1], 'o', perm[1:]])
perm = int(perm, base=0)

6
tripleo_common/utils/overcloudrc.py
View File

@ -13,16 +13,12 @@
# under the License.
import logging
from shlex import quote
import urllib
from tripleo_common import constants
from tripleo_common.utils import common as common_utils
try: # py3
from shlex import quote
except ImportError: # py2
from pipes import quote
LOG = logging.getLogger(__name__)