From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sat, 27 Aug 2011 14:17:31 +0000 (+1000)
Subject: Fix #9923: mailcap now uses the OS path separator for the MAILCAP envvar. Not backpor... 
X-Git-Tag: v3.3.0a1~1610
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2093730454b329ed019a06645e08592ae6662688;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Lib/mailcap.py b/Lib/mailcap.py
index 4ae13d7ed7fb..99f4958bf706 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']
diff --git a/Misc/NEWS b/Misc/NEWS
index c0fa159adacc..85dbe25876b2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -268,6 +268,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #9923: The mailcap module now correctly uses the platform path
+  separator for the MAILCAP environment variable on non-POSIX platforms.
+
 - Issue #12835: Follow up to #6560 that unconditionally prevents use of the
   unencrypted sendmsg/recvmsg APIs on SSL wrapped sockets. Patch by David
   Watson.