Terminal._load_mailcaps uses os.environ instead of os.putenv

This commit is contained in:
OKelt
2019-11-12 00:58:49 -08:00
parent 4ecaf612f6
commit cf4f40ff04

View File

@@ -83,15 +83,15 @@ class Terminal(object):
new_mailcaps = mailcap_file new_mailcaps = mailcap_file
else: else:
new_mailcaps = os.pathsep.join((mailcap_file, prev_mailcaps)) new_mailcaps = os.pathsep.join((mailcap_file, prev_mailcaps))
os.putenv(mailcaps_env, new_mailcaps) os.environ[mailcaps_env] = new_mailcaps
# merge local mailcaps file with default caps # merge local mailcaps file with default caps
# settings in local file will override defaults # settings in local file will override defaults
for k, v in mailcap.getcaps().items(): for k, v in mailcap.getcaps().items():
caps[k] = v caps[k] = v
if prev_mailcaps is None: if prev_mailcaps is None:
os.unsetenv(mailcaps_env) del os.environ[mailcaps_env]
else: else:
os.putenv(mailcaps_env, prev_mailcaps) os.environ[mailcaps_env] = prev_mailcaps
return caps return caps
@property @property