From 5be8308b27653d17ce65dd9da13494d59c4cc9f2 Mon Sep 17 00:00:00 2001 From: Adam Simpkins Date: Mon, 26 Jun 2017 11:31:30 -0700 Subject: [PATCH] setup: move environment computation into a helper function Add a helper function to compute the environment used for invoking mercurial, rather than doing this computation entirely at global scope. This will make it easier to do some subsequent refactoring. --- setup.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/setup.py b/setup.py index 300f8e2013..d07efa0c95 100644 --- a/setup.py +++ b/setup.py @@ -165,20 +165,23 @@ def runhg(cmd, env): return '' return out -version = '' -# Execute hg out of this directory with a custom environment which takes care -# to not use any hgrc files and do no localization. -env = {'HGMODULEPOLICY': 'py', - 'HGRCPATH': '', - 'LANGUAGE': 'C', - 'PATH': ''} # make pypi modules that use os.environ['PATH'] happy -if 'LD_LIBRARY_PATH' in os.environ: - env['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH'] -if 'SystemRoot' in os.environ: - # SystemRoot is required by Windows to load various DLLs. See: - # https://bugs.python.org/issue13524#msg148850 - env['SystemRoot'] = os.environ['SystemRoot'] +def gethgenv(): + # Execute hg out of this directory with a custom environment which takes + # care to not use any hgrc files and do no localization. + env = {'HGMODULEPOLICY': 'py', + 'HGRCPATH': '', + 'LANGUAGE': 'C', + 'PATH': ''} # make pypi modules that use os.environ['PATH'] happy + if 'LD_LIBRARY_PATH' in os.environ: + env['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH'] + if 'SystemRoot' in os.environ: + # SystemRoot is required by Windows to load various DLLs. See: + # https://bugs.python.org/issue13524#msg148850 + env['SystemRoot'] = os.environ['SystemRoot'] + +env = gethgenv() +version = '' if os.path.isdir('.hg'): cmd = [sys.executable, 'hg', 'log', '-r', '.', '--template', '{tags}\n']