Merge pull request #1884 from volatilityfoundation/issues/ruff-formatter

Apply changes that ruff formatter would make which black doesn't mind

Author: ikelos

development/banner_server.py

@@ -14,7 +14,6 @@
 
 
 class BannerCacheGenerator:
-
     def __init__(self, path: str, url_prefix: str):
         self._path = path
         self._url_prefix = url_prefix
@@ -79,7 +78,6 @@ def run(self):
 
 
 if __name__ == "__main__":
-
     parser = argparse.ArgumentParser()
     parser.add_argument("--path", default=os.path.dirname(__file__))
     parser.add_argument(

development/compare-vol.py

@@ -208,7 +208,6 @@ def plugin_cmd(self, plugin: VolatilityPlugin, image: VolatilityImage) -> List[s
 
 
 class VolatilityTester:
-
     def __init__(
         self,
         images: List[VolatilityImage],

development/pdbparse-to-json.py

@@ -22,7 +22,6 @@
 
 
 class PDBRetreiver:
-
     def retreive_pdb(self, guid: str, file_name: str) -> Optional[str]:
         logger.info("Download PDB file...")
         file_name = ".".join(file_name.split(".")[:-1] + ["pdb"])

development/stock-linux-json.py

@@ -13,7 +13,6 @@
 
 
 class Downloader:
-
     def __init__(self, url_lists: List[List[str]]) -> None:
         self.url_lists = url_lists
 

test/plugins/windows/test_scheduled_tasks.py

@@ -8,9 +8,10 @@
     import pyarrow as pa
     import pyarrow.parquet as pq
     import pyarrow.compute as pc
+
     HAS_PYARROW = True
 except ImportError:
-   # The user doesn't have pyarrow installed, but HAS_PYARROW will be false so just continue
+    # The user doesn't have pyarrow installed, but HAS_PYARROW will be false so just continue
     pass
 
 
@@ -41,10 +42,33 @@ def test_windows_generic_pslist(self, volatility, python, image):
         table = self._get_table_from_output(out)
         assert table.num_rows > 10
 
-        assert table.filter(pc.match_substring(pc.utf8_lower(table.column('ImageFileName')), "system")).num_rows > 0
-        assert table.filter(pc.match_substring(pc.utf8_lower(table.column('ImageFileName')), "csrss.exe")).num_rows > 0
-        assert table.filter(pc.match_substring(pc.utf8_lower(table.column('ImageFileName')), "svchost.exe")).num_rows > 0
-        assert table.filter(pc.greater(table.column('PID'), 0)).num_rows == table.num_rows
+        assert (
+            table.filter(
+                pc.match_substring(
+                    pc.utf8_lower(table.column("ImageFileName")), "system"
+                )
+            ).num_rows
+            > 0
+        )
+        assert (
+            table.filter(
+                pc.match_substring(
+                    pc.utf8_lower(table.column("ImageFileName")), "csrss.exe"
+                )
+            ).num_rows
+            > 0
+        )
+        assert (
+            table.filter(
+                pc.match_substring(
+                    pc.utf8_lower(table.column("ImageFileName")), "svchost.exe"
+                )
+            ).num_rows
+            > 0
+        )
+        assert (
+            table.filter(pc.greater(table.column("PID"), 0)).num_rows == table.num_rows
+        )
 
     def test_linux_generic_pslist(self, volatility, python, image):
         rc, out, _err = test_volatility.runvol_plugin(
@@ -59,12 +83,23 @@ def test_linux_generic_pslist(self, volatility, python, image):
         table = self._get_table_from_output(out)
         assert table.num_rows > 10
 
-        init_rows = table.filter(pc.match_substring(pc.utf8_lower(table.column('COMM')), "init"))
-        systemd_rows = table.filter(pc.match_substring(pc.utf8_lower(table.column('COMM')), "systemd"))
+        init_rows = table.filter(
+            pc.match_substring(pc.utf8_lower(table.column("COMM")), "init")
+        )
+        systemd_rows = table.filter(
+            pc.match_substring(pc.utf8_lower(table.column("COMM")), "systemd")
+        )
         assert (init_rows.num_rows > 0) or (systemd_rows.num_rows > 0)
 
-        assert table.filter(pc.match_substring(pc.utf8_lower(table.column('COMM')), "watchdog")).num_rows > 0
-        assert table.filter(pc.greater(table.column('PID'), 0)).num_rows == table.num_rows
+        assert (
+            table.filter(
+                pc.match_substring(pc.utf8_lower(table.column("COMM")), "watchdog")
+            ).num_rows
+            > 0
+        )
+        assert (
+            table.filter(pc.greater(table.column("PID"), 0)).num_rows == table.num_rows
+        )
 
     def test_windows_generic_handles(self, volatility, python, image):
         rc, out, _err = test_volatility.runvol_plugin(
@@ -79,7 +114,14 @@ def test_windows_generic_handles(self, volatility, python, image):
 
         table = self._get_table_from_output(out)
         assert table.num_rows > 500
-        assert table.filter(pc.match_substring(pc.utf8_lower(table.column('Name')), "machine\\system")).num_rows > 0
+        assert (
+            table.filter(
+                pc.match_substring(
+                    pc.utf8_lower(table.column("Name")), "machine\\system"
+                )
+            ).num_rows
+            > 0
+        )
 
     def test_linux_generic_lsof(self, volatility, python, image):
         rc, out, _err = test_volatility.runvol_plugin(
@@ -94,6 +136,7 @@ def test_linux_generic_lsof(self, volatility, python, image):
         table = self._get_table_from_output(out)
         assert table.num_rows > 35
 
+
 class TestParquetRenderer(TestArrowRendererBase):
     renderer_format = "parquet"
 
@@ -106,4 +149,3 @@ class TestArrowRenderer(TestArrowRendererBase):
 
     def _get_table_from_output(self, output_bytes):
         return pa.ipc.open_stream(io.BytesIO(output_bytes)).read_all()
-

test/renderers/test_parquet_renderers.py

@@ -82,7 +82,6 @@ def __str__(self):
 
 
 class UnrequiredVersionableUsage(CodeViolation):
-
     def __init__(
         self,
         module: types.ModuleType,
@@ -107,7 +106,6 @@ def __str__(self) -> str:
 
 
 class DirectVolatilityImportUsage(CodeViolation):
-
     def __init__(
         self,
         module: types.ModuleType,
@@ -174,8 +172,11 @@ def _check_vol3_import_from(self, node: ast.ImportFrom):
         """
         if (
             node.module
-            and node.module.startswith("volatility3.") # Give a pass to volatility3 module
-            and node.module != "volatility3.framework.constants._version" # make an exception for this
+            and node.module.startswith(
+                "volatility3."
+            )  # Give a pass to volatility3 module
+            and node.module
+            != "volatility3.framework.constants._version"  # make an exception for this
         ):
             for name in node.names:
                 try:
@@ -204,7 +205,6 @@ def _check_vol3_import_from(self, node: ast.ImportFrom):
     def enter_ImportFrom(self, node: ast.ImportFrom):
         self._check_vol3_import_from(node)
 
-
     def enter_ClassDef(self, node: ast.ClassDef) -> Any:
         logger.debug("Entering class %s", node.name)
         clazz = None

test/volatility3_code_analysis.py

@@ -2,6 +2,7 @@
 # which is available at https://www.volatilityfoundation.org/license/vsl-v1.0
 #
 """Volatility 3 - An open-source memory forensics framework"""
+
 import inspect
 import sys
 from importlib import abc

volatility3/__init__.py

@@ -10,6 +10,7 @@
  * run the plugin
  * display the results
 """
+
 import argparse
 import inspect
 import io
@@ -458,8 +459,9 @@ def run(self):
                     raise ValueError(
                         "Invalid extension (extensions must be of the format \"conf.path.value='value'\")"
                     )
-                address, value = extension[: extension.find("=")], json.loads(
-                    extension[extension.find("=") + 1 :]
+                address, value = (
+                    extension[: extension.find("=")],
+                    json.loads(extension[extension.find("=") + 1 :]),
                 )
                 ctx.config[address] = value
 
@@ -574,7 +576,7 @@ def load_system_defaults(
                 delayed_logs.append(
                     (
                         logging.DEBUG,
-                        f"Loaded configuration: {json.dumps(result, indent = 2, sort_keys = True)}",
+                        f"Loaded configuration: {json.dumps(result, indent=2, sort_keys=True)}",
                     )
                 )
                 return delayed_logs, result
@@ -763,7 +765,7 @@ def order_extra_verbose_levels(self):
                 constants.LOGLEVEL_VVVV,
             ]
         ):
-            logging.addLevelName(level_value, f"DETAIL {level+1}")
+            logging.addLevelName(level_value, f"DETAIL {level + 1}")
 
     def file_handler_class_factory(self, direct=True):
         output_dir = self.output_dir

volatility3/cli/__init__.py

@@ -278,7 +278,6 @@ def ignored_columns(
 
 
 class QuickTextRenderer(CLIRenderer):
-
     name = "quick"
 
     def get_render_options(self):
@@ -348,7 +347,6 @@ def render(self, grid: interfaces.renderers.TreeGrid) -> None:
 
 
 class CSVRenderer(CLIRenderer):
-
     name = "csv"
     structured_output = True