From 7fcce6b6c4ff9c7f74b78cd0c72ff120c2f0a12a Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis@chromium.org>
Date: Mon, 15 Jan 2024 22:35:43 -0500
Subject: [PATCH] Meta/run.py: Move arguments_generator() out of class

@staticmethod decorators seem to not work in 3.9. Just move
arguments_generator() to the toplevel.
---
 Meta/run.py | 54 ++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/Meta/run.py b/Meta/run.py
index dacc2d9469..502018924b 100755
--- a/Meta/run.py
+++ b/Meta/run.py
@@ -85,6 +85,33 @@ class MachineType(Enum):
         ]
 
 
+def arguments_generator(prefix: str) -> Any:
+    """
+    Construct an argument generator that returns some prefix and the member value(s) if the member value
+    is not None, or returns an empty list otherwise.
+    The member value is the return value of the function decorated with this decorator.
+    If a default is provided, in this case we return [prefix, default] instead.
+    Many of our configurable QEMU arguments work like this.
+    """
+
+    def decorate_function(member_accessor: Callable[[Configuration], str | list[str]]):
+        def generate_arguments(self: Configuration) -> list[str]:
+            member_value = member_accessor(self)
+            if member_value is not None:
+                if type(member_value) is list:
+                    # apply the prefix to every element of the list
+                    return list(chain(*zip(repeat(prefix), member_value)))
+                # NOTE: the typechecker gets confused and can't figure out that
+                # type(member_value) is *always* str here.
+                elif type(member_value) is str:
+                    return [prefix, member_value]
+            return []
+
+        return generate_arguments
+
+    return decorate_function
+
+
 @dataclass
 class Configuration:
     """Run configuration, populated from command-line or environment variable data."""
@@ -158,33 +185,6 @@ class Configuration:
     # Arbitrary extra arguments
     extra_arguments: list[str] = field(default_factory=list)
 
-    @staticmethod
-    def arguments_generator(prefix: str) -> Any:
-        """
-        Construct an argument generator that returns some prefix and the member value(s) if the member value
-        is not None, or returns an empty list otherwise.
-        The member value is the return value of the function decorated with this decorator.
-        If a default is provided, in this case we return [prefix, default] instead.
-        Many of our configurable QEMU arguments work like this.
-        """
-
-        def decorate_function(member_accessor: Callable[[Configuration], str | list[str]]):
-            def generate_arguments(self: Configuration) -> list[str]:
-                member_value = member_accessor(self)
-                if member_value is not None:
-                    if type(member_value) is list:
-                        # apply the prefix to every element of the list
-                        return list(chain(*zip(repeat(prefix), member_value)))
-                    # NOTE: the typechecker gets confused and can't figure out that
-                    # type(member_value) is *always* str here.
-                    elif type(member_value) is str:
-                        return [prefix, member_value]
-                return []
-
-            return generate_arguments
-
-        return decorate_function
-
     @property
     @arguments_generator(prefix="-accel")
     def accelerator_arguments(self) -> str | None: