SF feature #618024, urlparse fails on imap://

diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 1dec261b8b798b2fa9a25487a8c4475295eac380..b8f747fbecbb4de778f56be6f7b5af64cda6c0cf 100644 (file)
--- a/Lib/urlparse.py
+++ b/Lib/urlparse.py
@@ -8,20 +8,20 @@ __all__ = ["urlparse", "urlunparse", "urljoin", "urldefrag",
            "urlsplit", "urlunsplit"]
 
 # A classification of schemes ('' means apply by default)
-uses_relative = ['ftp', 'http', 'gopher', 'nntp', 'wais', 'file',
+uses_relative = ['ftp', 'http', 'gopher', 'nntp', 'imap', 'wais', 'file',
                  'https', 'shttp',
                  'prospero', 'rtsp', 'rtspu', '']
-uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet', 'wais',
+uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet', 'imap', 'wais',
                'file',
                'https', 'shttp', 'snews',
                'prospero', 'rtsp', 'rtspu', '']
 non_hierarchical = ['gopher', 'hdl', 'mailto', 'news', 'telnet', 'wais',
-                    'snews', 'sip',
+                    'imap', 'snews', 'sip',
                     ]
-uses_params = ['ftp', 'hdl', 'prospero', 'http',
+uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap',
                'https', 'shttp', 'rtsp', 'rtspu', 'sip',
                '']
-uses_query = ['http', 'wais',
+uses_query = ['http', 'wais', 'imap',
               'https', 'shttp',
               'gopher', 'rtsp', 'rtspu', 'sip',
               '']

diff --git a/Misc/NEWS b/Misc/NEWS
index 305111058c698d33038b9e57039c0f92f35de235..e1456fe7dcd51996d85cf9ab5aa503b7c21d81eb 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -67,6 +67,7 @@ Library
   to tar archive files with transparent gzip and bzip2 compression.
   See SF patch #651082.
 
+- urlparse can now parse imap:// URLs.  See SF feature request #618024.
 
 Tools/Demos
 -----------