summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/urlparse.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 2f1965aca7..37dd36265b 100644
--- 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 138afe2793..414b6e668b 100644
--- 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.