Minor formatting fix in Terminal._load_mailcaps()
This commit is contained in:
@@ -71,29 +71,37 @@ class Terminal(object):
|
|||||||
|
|
||||||
def _load_mailcaps(self):
|
def _load_mailcaps(self):
|
||||||
mailcap_file = self.config.MAILCAP
|
mailcap_file = self.config.MAILCAP
|
||||||
|
|
||||||
if not os.path.exists(mailcap_file):
|
if not os.path.exists(mailcap_file):
|
||||||
return mailcap.getcaps()
|
return mailcap.getcaps()
|
||||||
|
|
||||||
mailcaps_env = 'MAILCAPS'
|
mailcaps_env = 'MAILCAPS'
|
||||||
caps = dict()
|
caps = dict()
|
||||||
|
|
||||||
# Prepends application-specific mailcap file to MAILCAPS env
|
# Prepends application-specific mailcap file to MAILCAPS env
|
||||||
# This allows mailcap.getcaps to read it before other mailcap files
|
# This allows mailcap.getcaps to read it before other mailcap files
|
||||||
# Previous value of MAILCAPS is restored after usage
|
# Previous value of MAILCAPS is restored after usage
|
||||||
prev_mailcaps = os.getenv(mailcaps_env)
|
prev_mailcaps = os.getenv(mailcaps_env)
|
||||||
|
|
||||||
if prev_mailcaps is None:
|
if prev_mailcaps is None:
|
||||||
# start with default system caps files; will be overwritten by local file
|
# start with default system caps files; will be overwritten by local file
|
||||||
caps = mailcap.getcaps()
|
caps = mailcap.getcaps()
|
||||||
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.environ[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:
|
||||||
del os.environ[mailcaps_env]
|
del os.environ[mailcaps_env]
|
||||||
else:
|
else:
|
||||||
os.environ[mailcaps_env] = prev_mailcaps
|
os.environ[mailcaps_env] = prev_mailcaps
|
||||||
|
|
||||||
return caps
|
return caps
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|||||||
Reference in New Issue
Block a user