Use cached_property from functools

Now we have a minimum supported python version which has
functools.cached_property

Author: philpep

testinfra/backend/paramiko.py

@@ -22,10 +22,11 @@
         )
     )
 
+import functools
+
 import paramiko.ssh_exception
 
 from testinfra.backend import base
-from testinfra.utils import cached_property
 
 
 class IgnorePolicy(paramiko.MissingHostKeyPolicy):
@@ -83,7 +84,7 @@ def _load_ssh_config(self, client, cfg, ssh_config, ssh_config_dir="~/.ssh"):
                     new_ssh_config.parse(f)
                     self._load_ssh_config(client, cfg, new_ssh_config, ssh_config_dir)
 
-    @cached_property
+    @functools.cached_property
     def client(self):
         client = paramiko.SSHClient()
         client.set_missing_host_key_policy(paramiko.WarningPolicy())

testinfra/host.py

@@ -10,11 +10,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import functools
 import os
 
 import testinfra.backend
 import testinfra.modules
-from testinfra.utils import cached_property
 
 
 class Host:
@@ -28,7 +28,7 @@ def __init__(self, backend):
     def __repr__(self):
         return "<testinfra.host.Host {}>".format(self.backend.get_pytest_id())
 
-    @cached_property
+    @functools.cached_property
     def has_command_v(self):
         """Return True if `command -v` is available"""
         return self.run("command -v command").rc == 0

testinfra/modules/blockdevice.py

@@ -10,8 +10,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import functools
+
 from testinfra.modules.base import Module
-from testinfra.utils import cached_property
 
 
 class BlockDevice(Module):
@@ -124,7 +125,7 @@ def __repr__(self):
 
 
 class LinuxBlockDevice(BlockDevice):
-    @cached_property
+    @functools.cached_property
     def _data(self):
         header = ["RO", "RA", "SSZ", "BSZ", "StartSec", "Size", "Device"]
         command = "blockdev  --report %s"

testinfra/modules/interface.py

@@ -10,11 +10,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import functools
 import json
 import re
 
 from testinfra.modules.base import Module
-from testinfra.utils import cached_property
 
 
 class Interface(Module):
@@ -107,7 +107,7 @@ def default(cls, family=None):
 
 
 class LinuxInterface(Interface):
-    @cached_property
+    @functools.cached_property
     def _ip(self):
         ip_cmd = self.find_command("ip")
         if self.family is not None:

testinfra/modules/service.py

@@ -10,8 +10,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import functools
+
 from testinfra.modules.base import Module
-from testinfra.utils import cached_property
 
 
 class Service(Module):
@@ -60,7 +61,7 @@ def is_masked(self):
         """
         raise NotImplementedError
 
-    @cached_property
+    @functools.cached_property
     def systemd_properties(self):
         """Properties of the service (unit).
 
@@ -112,7 +113,7 @@ def __repr__(self):
 
 
 class SysvService(Service):
-    @cached_property
+    @functools.cached_property
     def _service_command(self):
         return self.find_command("service")
 
@@ -181,7 +182,7 @@ def is_masked(self):
         cmd = self.run_test("systemctl is-enabled %s", self.name)
         return cmd.stdout.strip() == "masked"
 
-    @cached_property
+    @functools.cached_property
     def systemd_properties(self):
         out = self.check_output("systemctl show %s", self.name)
         out_d = {}
@@ -221,7 +222,7 @@ def is_running(self):
 
 
 class OpenRCService(SysvService):
-    @cached_property
+    @functools.cached_property
     def _service_command(self):
         return self.find_command("rc-service")
 

testinfra/modules/socket.py

@@ -10,15 +10,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import functools
 import socket
 from typing import List, Optional, Tuple
 
 from testinfra.modules.base import Module
-from testinfra.utils import cached_property
 
 
 def parse_socketspec(socketspec):
-
     protocol, address = socketspec.split("://", 1)
 
     if protocol not in ("udp", "tcp", "unix"):
@@ -314,7 +313,7 @@ def _iter_sockets(self, listening):
 
 
 class BSDSocket(Socket):
-    @cached_property
+    @functools.cached_property
     def _command(self):
         return self.find_command("netstat")
 
@@ -333,7 +332,6 @@ def _iter_sockets(self, listening):
             # FreeBSD: tcp4/tcp6
             # OpeNBSD/NetBSD: tcp/tcp6
             if splitted[0] in ("tcp", "udp", "udp4", "tcp4", "tcp6", "udp6"):
-
                 address = splitted[3]
                 if address == "*.*":
                     # On OpenBSD 6.3 (issue #338)

testinfra/modules/sysctl.py

@@ -10,8 +10,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import functools
+
 from testinfra.modules.base import InstanceModule
-from testinfra.utils import cached_property
 
 
 class Sysctl(InstanceModule):
@@ -23,7 +24,7 @@ class Sysctl(InstanceModule):
     20
     """
 
-    @cached_property
+    @functools.cached_property
     def _sysctl_command(self):
         return self.find_command("sysctl")
 

testinfra/modules/systeminfo.py

@@ -10,16 +10,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import functools
 import re
 
 from testinfra.modules.base import InstanceModule
-from testinfra.utils import cached_property
 
 
 class SystemInfo(InstanceModule):
     """Return system information"""
 
-    @cached_property
+    @functools.cached_property
     def sysinfo(self):
         sysinfo = {
             "type": None,

testinfra/utils/__init__.py

@@ -1,30 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-class cached_property:
-    """A cached property computed only once per instance
-
-    A property that is only computed once per instance and then replaces itself
-    with an ordinary attribute. Deleting the attribute resets the property.
-    Source: https://github.com/bottlepy/bottle/commit/fa7733e075da0d790d809aa3d2f53071897e6f76
-    """  # noqa
-
-    def __init__(self, func):
-        self.__doc__ = func.__doc__
-        self.func = func
-
-    def __get__(self, obj, cls):
-        if obj is None:
-            return self
-        value = obj.__dict__[self.func.__name__] = self.func(obj)
-        return value

testinfra/utils/ansible_runner.py

@@ -12,14 +12,14 @@
 
 import configparser
 import fnmatch
+import functools
 import ipaddress
 import json
 import os
 import tempfile
 from typing import Any, Dict, List, Optional, Union
 
 import testinfra
-from testinfra.utils import cached_property
 
 __all__ = ["AnsibleRunner"]
 
@@ -270,11 +270,11 @@ def get_hosts(self, pattern="all"):
                         result.add(host)
         return sorted(result)
 
-    @cached_property
+    @functools.cached_property
     def inventory(self):
         return get_ansible_inventory(self.ansible_config, self.inventory_file)
 
-    @cached_property
+    @functools.cached_property
     def ansible_config(self):
         return get_ansible_config()