Skip to content

Commit 93a7d1e

Browse files
committed
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 <mats@linux.com>
1 parent 9fc1857 commit 93a7d1e

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
178178
- Regularized header (copyright, licens) at top of documentation files
179179
using SPDX.
180180
- Updated introductory section of manual page.
181+
- Minor cleanups in tests - drop unused "% locals()" stanzas.
181182

182183

183184
RELEASE 4.7.0 - Sun, 17 Mar 2024 17:22:20 -0700

bin/scons-time.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,8 @@ def redirect_to_file(command, log):
260260
def tee_to_file(command, log):
261261
return '%s 2>&1 | tee %s' % (command, log)
262262

263+
def makedict(**kw):
264+
return kw
263265

264266
class SConsTimer:
265267
"""
@@ -278,10 +280,6 @@ class SConsTimer:
278280
name = 'scons-time'
279281
name_spaces = ' ' * len(name)
280282

281-
@staticmethod
282-
def makedict(**kw):
283-
return kw
284-
285283
default_settings = makedict(
286284
chdir=None,
287285
config_file=None,

0 commit comments

Comments
 (0)