From: Michael Tremer Date: Thu, 14 Apr 2022 17:11:49 +0000 (+0000) Subject: Revert "configure: Require Python >= 3.9" X-Git-Tag: 0.9.14~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cd4ddbceb551bad72dc0786f5963c675179c90d;p=location%2Flibloc.git Revert "configure: Require Python >= 3.9" This reverts commit 643b8d062ac11efef6c74cf8af7281079e2533e9. Signed-off-by: Michael Tremer --- diff --git a/configure.ac b/configure.ac index e96e9ce..8b27cf6 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/python/export.py b/src/python/export.py index 3cdece4..13c0540 100644 --- a/src/python/export.py +++ b/src/python/export.py @@ -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",