From 52c00542ebf05899f6d3fc9be0467d8b8d067454 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 23 Mar 2020 14:50:52 -0700 Subject: [PATCH] Streamline fetching WX_CONFIG from the environment --- build.py | 5 ++--- buildtools/config.py | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/build.py b/build.py index 37d6093d..72d7c28a 100755 --- a/build.py +++ b/build.py @@ -1573,9 +1573,8 @@ def cmd_build_py(options, args): os.environ['WXPYTHON_RELEASE'] = 'yes' if not isWindows: - if 'WX_CONFIG' in os.environ: - WX_CONFIG = os.environ['WX_CONFIG'] - else: + WX_CONFIG = os.environ.get('WX_CONFIG', None) + if WX_CONFIG is None: WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config') if options.use_syswx: wxcfg = posixjoin(options.prefix, 'bin', 'wx-config') diff --git a/buildtools/config.py b/buildtools/config.py index 5898c9db..009edaa1 100644 --- a/buildtools/config.py +++ b/buildtools/config.py @@ -400,10 +400,7 @@ class Configuration(object): """ # if WX_CONFIG hasn't been set to an explicit value then construct one. if self.WX_CONFIG is None: - if 'WX_CONFIG' in os.environ: - self.WX_CONFIG = os.environ['WX_CONFIG'] - else: - self.WX_CONFIG='wx-config' + self.WX_CONFIG = os.environ.get('WX_CONFIG', 'wx-config') port = self.WXPORT if port == "x11": port = "x11univ"