From: Martin Willi <martin@strongswan.org>
Date: Fri, 4 Nov 2022 12:26:35 +0000 (+0100)
Subject: vici: Remove support for Python 2
X-Git-Tag: 5.9.9rc1~13^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11b18f65b1efeba9ed55ae5bb67bfe2966b930ec;p=thirdparty%2Fstrongswan.git

vici: Remove support for Python 2

Python 2 is dead and unmaintained for a while now. Time to stop carrying
on its support.
---

diff --git a/src/libcharon/plugins/vici/python/Makefile.am b/src/libcharon/plugins/vici/python/Makefile.am
index aa036c96c9..6728e4eb7a 100644
--- a/src/libcharon/plugins/vici/python/Makefile.am
+++ b/src/libcharon/plugins/vici/python/Makefile.am
@@ -6,7 +6,6 @@ EXTRA_DIST = LICENSE README.rst MANIFEST.in \
 	test/test_protocol.py \
 	vici/__init__.py \
 	vici/command_wrappers.py \
-	vici/compat.py \
 	vici/exception.py \
 	vici/protocol.py \
 	vici/session.py
diff --git a/src/libcharon/plugins/vici/python/setup.py.in b/src/libcharon/plugins/vici/python/setup.py.in
index ea012c69b7..130575197e 100644
--- a/src/libcharon/plugins/vici/python/setup.py.in
+++ b/src/libcharon/plugins/vici/python/setup.py.in
@@ -20,7 +20,6 @@ setup(
         "Intended Audience :: System Administrators",
         "License :: OSI Approved :: MIT License",
         "Natural Language :: English",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
diff --git a/src/libcharon/plugins/vici/python/tox.ini b/src/libcharon/plugins/vici/python/tox.ini
index 7b058d5b0d..66df3a79ae 100644
--- a/src/libcharon/plugins/vici/python/tox.ini
+++ b/src/libcharon/plugins/vici/python/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py36, py37, py38, py39
+envlist = py36, py37, py38, py39
 
 [testenv]
 deps =
@@ -7,10 +7,6 @@ deps =
 	pytest-pycodestyle
 commands = pytest --pycodestyle
 
-[testenv:py{27}]
-deps = pytest
-commands = pytest
-
 [pycodestyle]
 max-line-length = 80
 show-source = True
diff --git a/src/libcharon/plugins/vici/python/vici/compat.py b/src/libcharon/plugins/vici/python/vici/compat.py
deleted file mode 100644
index b5f46992e4..0000000000
--- a/src/libcharon/plugins/vici/python/vici/compat.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Help functions for compatibility between python version 2 and 3
-
-
-# From http://legacy.python.org/dev/peps/pep-0469
-try:
-    dict.iteritems
-except AttributeError:
-    # python 3
-    def iteritems(d):
-        return iter(d.items())
-else:
-    # python 2
-    def iteritems(d):
-        return d.iteritems()
diff --git a/src/libcharon/plugins/vici/python/vici/protocol.py b/src/libcharon/plugins/vici/python/vici/protocol.py
index 3702294638..86f6d9c153 100644
--- a/src/libcharon/plugins/vici/python/vici/protocol.py
+++ b/src/libcharon/plugins/vici/python/vici/protocol.py
@@ -5,7 +5,6 @@ import struct
 from collections import namedtuple
 from collections import OrderedDict
 
-from .compat import iteritems
 from .exception import DeserializationException
 
 
@@ -121,7 +120,7 @@ class Message(object):
 
         def serialize_dict(d):
             segment = bytes()
-            for key, value in iteritems(d):
+            for key, value in d.items():
                 if isinstance(value, dict):
                     segment += (
                         encode_named_type(cls.SECTION_START, key)