WIP: facts: process and process_data are not staticmethods

Author: bauen1

pyinfra/facts/mysql.py

@@ -214,8 +214,7 @@ def command(  # type: ignore[override]
             mysql_port,
         )
 
-    @staticmethod
-    def process(output):
+    def process(self, output):
         database_table_privileges = defaultdict(set)
 
         for line in output:

pyinfra/facts/server.py

@@ -32,8 +32,7 @@ class Home(FactBase[Optional[str]]):
     Returns the home directory of the given user, or the current user if no user is given.
     """
 
-    @staticmethod
-    def command(user=""):
+    def command(self, user=""):
         return f"echo ~{user}"
 
 
@@ -124,8 +123,7 @@ class Command(FactBase[str]):
     Returns the raw output lines of a given command.
     """
 
-    @staticmethod
-    def command(command):
+    def command(self, command):
         return command
 
 
@@ -134,8 +132,7 @@ class Which(FactBase[Optional[str]]):
     Returns the path of a given command according to `command -v`, if available.
     """
 
-    @staticmethod
-    def command(command):
+    def command(self, command):
         return "command -v {0} || true".format(command)
 
 

pyinfra/facts/zfs.py

@@ -19,39 +19,34 @@ class Pools(FactBase):
     def command(self):
         return "zpool get -H all"
 
-    @staticmethod
-    def process(output):
+    def process(self, output):
         return _process_zfs_props_table(output)
 
 
 class Datasets(FactBase):
     def command(self):
         return "zfs get -H all"
 
-    @staticmethod
-    def process(output):
+    def process(self, output):
         return _process_zfs_props_table(output)
 
 
 class Filesystems(ShortFactBase):
     fact = Datasets
 
-    @staticmethod
-    def process_data(data):
+    def process_data(self, data):
         return {name: props for name, props in data.items() if props.get("type") == "filesystem"}
 
 
 class Snapshots(ShortFactBase):
     fact = Datasets
 
-    @staticmethod
-    def process_data(data):
+    def process_data(self, data):
         return {name: props for name, props in data.items() if props.get("type") == "snapshot"}
 
 
 class Volumes(ShortFactBase):
     fact = Datasets
 
-    @staticmethod
-    def process_data(data):
+    def process_data(self, data):
         return {name: props for name, props in data.items() if props.get("type") == "volume"}