diff --git a/python/nav/alertengine/base.py b/python/nav/alertengine/base.py index 1698ed2744..8a678e764f 100644 --- a/python/nav/alertengine/base.py +++ b/python/nav/alertengine/base.py @@ -22,10 +22,10 @@ import gc import logging from datetime import datetime, timedelta +from functools import lru_cache from django.db import transaction, reset_queries -from nav.compatibility import lru_cache from nav.models.profiles import ( Account, AccountAlertQueue, diff --git a/python/nav/compatibility.py b/python/nav/compatibility.py deleted file mode 100644 index 07ca52d024..0000000000 --- a/python/nav/compatibility.py +++ /dev/null @@ -1,9 +0,0 @@ -# lru_cache isn't used that much but one application of sed is faster -# than changing a block into a line three times. - -# When no longer supporting 2.2: -# s/nav.compatibility import lru_cache/functools import lru_cache/ -try: - from functools import lru_cache -except ImportError: - from django.utils.lru_cache import lru_cache diff --git a/python/nav/metrics/lookup.py b/python/nav/metrics/lookup.py index 79b1f15c3c..8d1b87ba38 100644 --- a/python/nav/metrics/lookup.py +++ b/python/nav/metrics/lookup.py @@ -16,9 +16,9 @@ # """Functions for reverse-mapping metric names to NAV objects""" +from functools import lru_cache import re -from nav.compatibility import lru_cache from nav.models.manage import Netbox, Interface, Prefix, Sensor diff --git a/python/nav/web/ipdevinfo/host_information.py b/python/nav/web/ipdevinfo/host_information.py index fd7a685879..c60b27dd39 100644 --- a/python/nav/web/ipdevinfo/host_information.py +++ b/python/nav/web/ipdevinfo/host_information.py @@ -15,10 +15,10 @@ # """Provides a function for getting host information""" +from functools import lru_cache import IPy from nav import asyncdns -from nav.compatibility import lru_cache from nav.util import is_valid_ip