]> git.ipfire.org Git - location/libloc.git/commitdiff
Revert "configure: Require Python >= 3.9"
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 14 Apr 2022 17:11:49 +0000 (17:11 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 14 Apr 2022 17:11:49 +0000 (17:11 +0000)
This reverts commit 643b8d062ac11efef6c74cf8af7281079e2533e9.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
configure.ac
src/python/export.py

index e96e9cea6b74ab3294dfcda5fd4b31a342db3b08..8b27cf686a12a3d82a03e6cbd0f76702c378786a 100644 (file)
@@ -154,7 +154,7 @@ AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$have_systemd" = "xyes"])
 # ------------------------------------------------------------------------------
 
 # Python
-AM_PATH_PYTHON([3.9])
+AM_PATH_PYTHON([3.4])
 PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}])
 
 # Perl
index 3cdece43b0b476606678275508c08911630ac751..13c0540ca5da3498fae113ad7ed4077993824999 100644 (file)
@@ -17,7 +17,6 @@
 #                                                                             #
 ###############################################################################
 
-import functools
 import io
 import ipaddress
 import logging
@@ -59,6 +58,9 @@ class OutputWriter(object):
                else:
                        self.f = io.StringIO()
 
+               # Tag
+               self.tag = self._make_tag()
+
                # Call any custom initialization
                self.init()
 
@@ -74,8 +76,7 @@ class OutputWriter(object):
        def __repr__(self):
                return "<%s %s f=%s>" % (self.__class__.__name__, self, self.f)
 
-       @functools.cached_property
-       def tag(self):
+       def _make_tag(self):
                families = {
                        socket.AF_INET6 : "6",
                        socket.AF_INET  : "4",