From 4f442372ccaea501edcce67cd16028023af0d2e2 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Mon, 6 Jan 2003 06:51:36 +0000
Subject: SF feature #618024, urlparse fails on imap://

---
 Lib/urlparse.py | 10 +++++-----
 Misc/NEWS       |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 1dec261..b8f747f 100644
--- 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 3051110..e1456fe 100644
--- 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
 -----------
-- 
cgit v0.12