diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-10-12 12:04:32 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-10-12 12:04:32 -0400 |
| commit | 22bb42e43c74ca9f882d3ade8e5e47a884788e73 (patch) | |
| tree | 4aa46f808b18a4ef41ec674982e8e44d36ceb508 /Lib/mailcap.py | |
| parent | 0cd22c598b57b4107e90a0b4cde98c21f6a803d9 (diff) | |
| parent | d51b506754163bc7fbccb1c1f58d8dd849c18dad (diff) | |
| download | cpython-22bb42e43c74ca9f882d3ade8e5e47a884788e73.tar.gz | |
merge 3.2
Diffstat (limited to 'Lib/mailcap.py')
| -rw-r--r-- | Lib/mailcap.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/mailcap.py b/Lib/mailcap.py index 4ae13d7ed7..99f4958bf7 100644 --- a/Lib/mailcap.py +++ b/Lib/mailcap.py @@ -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'] |