Fix scons-time fix

Apparently, the weird structor of the SConsTimer class is such that the previous fix for the "makedict" method fails on older Pythons. Just moved the "static method" outside the class to be a top-level function, that seems to work better. Signed-off-by: Mats Wichmann <[email protected]>
SCons · Jul 6, 2024 · 93a7d1e · 93a7d1e
1 parent 9fc1857
commit 93a7d1e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -178,6 +178,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Regularized header (copyright, licens) at top of documentation files
       using SPDX.
     - Updated introductory section of manual page.
+    - Minor cleanups in tests - drop unused "% locals()" stanzas.
 
 
 RELEASE 4.7.0 -  Sun, 17 Mar 2024 17:22:20 -0700

diff --git a/bin/scons-time.py b/bin/scons-time.py
@@ -260,6 +260,8 @@ def redirect_to_file(command, log):
 def tee_to_file(command, log):
     return '%s 2>&1 | tee %s' % (command, log)
 
+def makedict(**kw):
+    return kw
 
 class SConsTimer:
     """
@@ -278,10 +280,6 @@ class SConsTimer:
     name = 'scons-time'
     name_spaces = ' ' * len(name)
 
-    @staticmethod
-    def makedict(**kw):
-        return kw
-
     default_settings = makedict(
         chdir=None,
         config_file=None,