rsync is now a recognized protocol that uses "netloc" (i.e. specifies a network

location) in its addressing.

Closes bug #981299.

diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 2f1965aca7d9687678bfca09e0d7d9b3e1aac694..37dd36265b859c309ac444244d32391639f5131f 100644 (file)
--- a/Lib/urlparse.py
+++ b/Lib/urlparse.py
@@ -13,7 +13,7 @@ uses_relative = ['ftp', 'http', 'gopher', 'nntp', 'imap',
                                'prospero', 'rtsp', 'rtspu', '']
 uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet',
                              'imap', 'wais', 'file', 'mms', 'https', 'shttp',
-                             'snews', 'prospero', 'rtsp', 'rtspu', '']
+                             'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '']
 non_hierarchical = ['gopher', 'hdl', 'mailto', 'news',
                                   'telnet', 'wais', 'imap', 'snews', 'sip']
 uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap',

diff --git a/Misc/NEWS b/Misc/NEWS
index 138afe279324919b265fa5149619f2012e92eea4..414b6e668bf166ee617c365ed130dd14033cab07 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -350,6 +350,9 @@ Extension modules
 Library
 -------
 
+- Bug #981299: rsync is now a recognized protocol that uses a "netloc" portion
+  of a URL.
+
 - Bug #919012: shutil.move() will not try to move a directory into itself.
   Thanks Johannes Gijsbers.