From 41402d74766c0f7c008bfb6186c7bda15f703993 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Mon, 14 Nov 2022 12:11:47 -0700 Subject: Fix some pyside complaints Signed-off-by: Mats Wichmann --- SCons/Defaults.py | 3 +-- SCons/Environment.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/SCons/Defaults.py b/SCons/Defaults.py index da90260..ad64041 100644 --- a/SCons/Defaults.py +++ b/SCons/Defaults.py @@ -36,7 +36,6 @@ import shutil import stat import sys import time -from collections import deque import SCons.Action import SCons.Builder @@ -539,7 +538,7 @@ def processDefines(defs): dlist.append(str(define)) else: raise SCons.Errors.UserError( - f"DEFINE {d!r} is not a list, dict, string or None." + f"DEFINE {define!r} is not a list, dict, string or None." ) elif is_Dict(defs): for macro, value in defs.items(): diff --git a/SCons/Environment.py b/SCons/Environment.py index bc69f05..4be5df0 100644 --- a/SCons/Environment.py +++ b/SCons/Environment.py @@ -263,8 +263,8 @@ def _add_cppdefines( item = _macro_conv(item) for define in defines: - if item == _macro_conv(define): - return define + if item == _macro_conv(define): + return define return False -- cgit v0.12