* add mms (windows media) as another scheme

* reformat schemes to 80 columns

diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
index a9d55d3737d93d6b7ddd7c05d027fc01840b3778..6744867a475e4c161acebb44ba0f3a1bc704ab2f 100644 (file)
--- a/Lib/test/test_urlparse.py
+++ b/Lib/test/test_urlparse.py
@@ -28,6 +28,9 @@ class UrlParseTestCase(unittest.TestCase):
             ('imap://mail.python.org/mbox1',
              ('imap', 'mail.python.org', '/mbox1', '', '', ''),
              ('imap', 'mail.python.org', '/mbox1', '', '')),
+            ('mms://wms.sys.hinet.net/cts/Drama/09006251100.asf',
+             ('mms', 'wms.sys.hinet.net', '/cts/Drama/09006251100.asf', '', '', ''),
+             ('mms', 'wms.sys.hinet.net', '/cts/Drama/09006251100.asf', '', '')),
             ]:
             result = urlparse.urlparse(url)
             self.assertEqual(result, parsed)

diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 171092e92ef27a23df784cb9c80d582c4fb86a4b..01064691de1bda8dd0c6615e891d6088cb238ca1 100644 (file)
--- a/Lib/urlparse.py
+++ b/Lib/urlparse.py
@@ -8,26 +8,22 @@ __all__ = ["urlparse", "urlunparse", "urljoin", "urldefrag",
            "urlsplit", "urlunsplit"]
 
 # A classification of schemes ('' means apply by default)
-uses_relative = dict.fromkeys(['ftp', 'http', 'gopher', 'nntp', 'imap', 'wais', 'file',
-                 'https', 'shttp',
-                 'prospero', 'rtsp', 'rtspu', ''])
-uses_netloc = dict.fromkeys(['ftp', 'http', 'gopher', 'nntp', 'telnet', 'imap', 'wais',
-               'file',
-               'https', 'shttp', 'snews',
-               'prospero', 'rtsp', 'rtspu', ''])
-non_hierarchical = dict.fromkeys(['gopher', 'hdl', 'mailto', 'news', 'telnet', 'wais',
-                    'imap', 'snews', 'sip',
-                    ])
+uses_relative = dict.fromkeys(['ftp', 'http', 'gopher', 'nntp', 'imap',
+                               'wais', 'file', 'https', 'shttp', 'mms',
+                               'prospero', 'rtsp', 'rtspu', ''])
+uses_netloc = dict.fromkeys(['ftp', 'http', 'gopher', 'nntp', 'telnet',
+                             'imap', 'wais', 'file', 'mms', 'https', 'shttp',
+                             'snews', 'prospero', 'rtsp', 'rtspu', ''])
+non_hierarchical = dict.fromkeys(['gopher', 'hdl', 'mailto', 'news',
+                                  'telnet', 'wais', 'imap', 'snews', 'sip'])
 uses_params = dict.fromkeys(['ftp', 'hdl', 'prospero', 'http', 'imap',
-               'https', 'shttp', 'rtsp', 'rtspu', 'sip',
-               ''])
-uses_query = dict.fromkeys(['http', 'wais', 'imap',
-              'https', 'shttp',
-              'gopher', 'rtsp', 'rtspu', 'sip',
-              ''])
-uses_fragment = dict.fromkeys(['ftp', 'hdl', 'http', 'gopher', 'news', 'nntp', 'wais',
-                 'https', 'shttp', 'snews',
-                 'file', 'prospero', ''])
+                             'https', 'shttp', 'rtsp', 'rtspu', 'sip',
+                             'mms', ''])
+uses_query = dict.fromkeys(['http', 'wais', 'imap', 'https', 'shttp', 'mms',
+                            'gopher', 'rtsp', 'rtspu', 'sip', ''])
+uses_fragment = dict.fromkeys(['ftp', 'hdl', 'http', 'gopher', 'news',
+                               'nntp', 'wais', 'https', 'shttp', 'snews',
+                               'file', 'prospero', ''])
 
 # Characters valid in scheme names
 scheme_chars = ('abcdefghijklmnopqrstuvwxyz'