Skip to content

Commit 7a7229b

Browse files
committed
deps: drop usage of python-six
We don't need to support Python 2 anymore. So the usage of python-six can be dropped. Signed-off-by: Jean-Louis Dupond <jean-louis@dupond.be>
1 parent ea115ef commit 7a7229b

156 files changed

Lines changed: 430 additions & 787 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

configure.ac

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,6 @@ fi
266266

267267
AC_SUBST([CONFIGURE_FLAGS], ["$configure_flags"])
268268

269-
AX_PYTHON_MODULE([six], [fatal], python3)
270-
271269
AC_PATH_PROG([PYTHON_CONFIG], ["python3-config"])
272270
if test "x$PYTHON_CONFIG" = "x"; then
273271
AC_MSG_ERROR([python3-devel not found, please install it.])

contrib/install-pkg.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ sudo dnf install -y \
4444
python3-pyyaml \
4545
python3-requests \
4646
python3-sanlock \
47-
python3-six \
4847
python3-yaml \
4948
qemu-img \
5049
rpm-build \

contrib/repostat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ from __future__ import division
1414
from __future__ import print_function
1515
import fileinput
1616
import re
17-
import six
1817

1918
pattern = re.compile(r' FINISH repoStats return=(\{.+\}\}) from=internal')
2019

@@ -36,7 +35,7 @@ for line in fileinput.input():
3635
stats[uuid]['delays'].append(float(info['delay']))
3736
stats[uuid]['checks'].append(float(info['lastCheck']))
3837

39-
for uuid, info in six.iteritems(stats):
38+
for uuid, info in stats.items():
4039
print('domain:', uuid)
4140
print(' delay avg: %f min: %f max: %f' % liststat(info['delays']))
4241
print(' last check avg: %f min: %f max: %f' % liststat(info['checks']))

docker/Dockerfile.alma-9

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ RUN dnf install -y 'dnf-command(copr)' \
5151
python3-requests \
5252
python3-rpm \
5353
python3-sanlock \
54-
python3-six \
5554
python3-yaml \
5655
qemu-img \
5756
redhat-rpm-config \

docker/Dockerfile.centos-10

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ RUN dnf install -y 'dnf-command(copr)' \
5151
python3-requests \
5252
python3-rpm \
5353
python3-sanlock \
54-
python3-six \
5554
python3-yaml \
5655
qemu-img \
5756
redhat-rpm-config \

docker/Dockerfile.centos-9

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ RUN dnf install -y 'dnf-command(copr)' \
5151
python3-requests \
5252
python3-rpm \
5353
python3-sanlock \
54-
python3-six \
5554
python3-yaml \
5655
qemu-img \
5756
redhat-rpm-config \

docker/network/unit/Dockerfile.alma-9

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ RUN dnf -y install dnf-plugins-core \
2121
nmstate \
2222
python3-devel \
2323
python3-libnmstate \
24-
python3-six \
2524
python3-pip \
2625
systemd \
2726
&& \

docker/network/unit/Dockerfile.centos-10

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ RUN dnf -y install dnf-plugins-core \
2121
nmstate \
2222
python3-devel \
2323
python3-libnmstate \
24-
python3-six \
2524
python3-pip \
2625
systemd \
2726
&& \

docker/network/unit/Dockerfile.centos-9

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ RUN dnf -y install dnf-plugins-core \
2121
nmstate \
2222
python3-devel \
2323
python3-libnmstate \
24-
python3-six \
2524
python3-pip \
2625
systemd \
2726
&& \

lib/vdsm/API.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import pickle
1111
import subprocess
1212

13-
import six
14-
1513
from vdsm.network.api import confirm_connectivity
1614
from vdsm.network.errors import ConfigNetworkError
1715

@@ -1263,7 +1261,7 @@ def check_virt_fencing_policies(policy):
12631261
# HOST_STATUS_LIVE means that host renewed its lease in last 80
12641262
# seconds. If so, we consider the host Up and we won't execute
12651263
# fencing, even when it's unreachable from engine
1266-
for sd, status in six.iteritems(result['domains']):
1264+
for sd, status in result['domains'].items():
12671265
if status == clusterlock.HOST_STATUS_LIVE:
12681266
self.log.debug("Host has live lease on '%s'", sd)
12691267
return False

0 commit comments

Comments
 (0)