diff options
Diffstat (limited to 'Lib/mailcap.py')
-rw-r--r-- | Lib/mailcap.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/mailcap.py b/Lib/mailcap.py index 4ae13d7ed7..0c0b19c47c 100644 --- a/Lib/mailcap.py +++ b/Lib/mailcap.py @@ -22,8 +22,8 @@ def getcaps(): fp = open(mailcap, 'r') except IOError: continue - morecaps = readmailcapfile(fp) - fp.close() + with fp: + morecaps = readmailcapfile(fp) for key, value in morecaps.items(): if not key in caps: caps[key] = value @@ -33,10 +33,10 @@ def getcaps(): def listmailcapfiles(): """Return a list of all mailcap files found on the system.""" - # XXX Actually, this is Unix-specific + # This is mostly a Unix thing, but we use the OS path separator anyway if 'MAILCAPS' in os.environ: - str = os.environ['MAILCAPS'] - mailcaps = str.split(':') + pathstr = os.environ['MAILCAPS'] + mailcaps = pathstr.split(os.pathsep) else: if 'HOME' in os.environ: home = os.environ['HOME'] |