Commit 40ade748 by willmcgugan

Fix for fs url parsing so that credentials can contain an exclamation mark

parent f03463f0
...@@ -119,8 +119,8 @@ class OpenerRegistry(object): ...@@ -119,8 +119,8 @@ class OpenerRegistry(object):
:\/\/ :\/\/
(?: (?:
(?:(.*?)@(.*?))
|(.*?) |(.*?)
|(?:(.*?)!)
) )
(?: (?:
...@@ -129,7 +129,6 @@ class OpenerRegistry(object): ...@@ -129,7 +129,6 @@ class OpenerRegistry(object):
''', re.VERBOSE) ''', re.VERBOSE)
def __init__(self, openers=[]): def __init__(self, openers=[]):
self.registry = {} self.registry = {}
self.openers = {} self.openers = {}
...@@ -181,7 +180,11 @@ class OpenerRegistry(object): ...@@ -181,7 +180,11 @@ class OpenerRegistry(object):
match = self.split_segments(fs_url) match = self.split_segments(fs_url)
if match: if match:
fs_name, fs_url, _, path = match.groups() fs_name, credentials, url1, url2, path = match.groups()
if credentials:
fs_url = '%s@%s' % (credentials, url1)
else:
fs_url = url2
path = path or '' path = path or ''
fs_url = fs_url or '' fs_url = fs_url or ''
if ':' in fs_name: if ':' in fs_name:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment