summaryrefslogtreecommitdiffstats
path: root/Lib/mailcap.py
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2011-08-27 14:17:31 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2011-08-27 14:17:31 (GMT)
commit2093730454b329ed019a06645e08592ae6662688 (patch)
tree3b72553f95f8aa13f21ede91ade3dc01fcd867e9 /Lib/mailcap.py
parent513886aabb634d4b46c6727340c396faf8f7e2b4 (diff)
downloadcpython-2093730454b329ed019a06645e08592ae6662688.zip
cpython-2093730454b329ed019a06645e08592ae6662688.tar.gz
cpython-2093730454b329ed019a06645e08592ae6662688.tar.bz2
Fix #9923: mailcap now uses the OS path separator for the MAILCAP envvar. Not backported, since it could break cases where people worked around the old POSIX-specific behaviour on non-POSIX platforms.
Diffstat (limited to 'Lib/mailcap.py')
-rw-r--r--Lib/mailcap.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/mailcap.py b/Lib/mailcap.py
index 4ae13d7..99f4958 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']