From bc3b1423f987e9d577f1a275589aae1c88f8ae64 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Wed, 5 May 2021 12:07:27 -0600 Subject: Redo botched changes for sider complaints Signed-off-by: Mats Wichmann --- SCons/Tool/intelc.py | 1 - SCons/Tool/msgfmt.py | 6 ++---- SCons/Tool/msginit.py | 6 ++---- SCons/Tool/msgmerge.py | 6 ++---- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/SCons/Tool/intelc.py b/SCons/Tool/intelc.py index bc27cef..2542f81 100644 --- a/SCons/Tool/intelc.py +++ b/SCons/Tool/intelc.py @@ -447,7 +447,6 @@ def generate(env, version=None, abi=None, topdir=None, verbose=0): except (SCons.Util.RegError, IntelCError): topdir = None -if not topdir: if not topdir: # Normally this is an error, but it might not be if the compiler is # on $PATH and the user is importing their env. diff --git a/SCons/Tool/msgfmt.py b/SCons/Tool/msgfmt.py index 676b1b1..efa5ce4 100644 --- a/SCons/Tool/msgfmt.py +++ b/SCons/Tool/msgfmt.py @@ -77,11 +77,10 @@ def generate(env, **kw): """ Generate `msgfmt` tool """ import sys import os - import SCons.Errors import SCons.Tool import SCons.Util import SCons.Warnings - from SCons.Tool.GettextCommon import _detect_msgfmt + from SCons.Tool.GettextCommon import _detect_msgfmt, MsgfmtNotFound from SCons.Platform.mingw import MINGW_DEFAULT_PATHS from SCons.Platform.cygwin import CYGWIN_DEFAULT_PATHS @@ -114,8 +113,7 @@ def generate(env, **kw): def exists(env): """ Check if the tool exists """ - import SCons.Errors - from SCons.Tool.GettextCommon import _msgfmt_exists + from SCons.Tool.GettextCommon import _msgfmt_exists, MsgfmtNotFound try: return _msgfmt_exists(env) diff --git a/SCons/Tool/msginit.py b/SCons/Tool/msginit.py index e3ef7ba..8a30092 100644 --- a/SCons/Tool/msginit.py +++ b/SCons/Tool/msginit.py @@ -70,10 +70,9 @@ def generate(env, **kw): """ Generate the `msginit` tool """ import sys import os - import SCons.Errors import SCons.Tool import SCons.Warnings - from SCons.Tool.GettextCommon import _detect_msginit + from SCons.Tool.GettextCommon import _detect_msginit, MsginitNotFound from SCons.Platform.mingw import MINGW_DEFAULT_PATHS from SCons.Platform.cygwin import CYGWIN_DEFAULT_PATHS @@ -118,8 +117,7 @@ def generate(env, **kw): def exists(env): """ Check if the tool exists """ - import SCons.Errors - from SCons.Tool.GettextCommon import _msginit_exists + from SCons.Tool.GettextCommon import _msginit_exists, MsginitNotFound try: return _msginit_exists(env) diff --git a/SCons/Tool/msgmerge.py b/SCons/Tool/msgmerge.py index 846c0c1..e4688e0 100644 --- a/SCons/Tool/msgmerge.py +++ b/SCons/Tool/msgmerge.py @@ -68,10 +68,9 @@ def generate(env, **kw): """ Generate the `msgmerge` tool """ import sys import os - import SCons.Errors import SCons.Tool import SCons.Warnings - from SCons.Tool.GettextCommon import _detect_msgmerge + from SCons.Tool.GettextCommon import _detect_msgmerge, MsgmergeNotFound from SCons.Platform.mingw import MINGW_DEFAULT_PATHS from SCons.Platform.cygwin import CYGWIN_DEFAULT_PATHS @@ -106,8 +105,7 @@ def generate(env, **kw): def exists(env): """ Check if the tool exists """ - import SCons.Errors - from SCons.Tool.GettextCommon import _msgmerge_exists + from SCons.Tool.GettextCommon import _msgmerge_exists, MsgmergeNotFound try: return _msgmerge_exists(env) -- cgit v0.12