Merge 5ae0867 into 2e5e1ea

PyFilesystem · Sep 6, 2017 · 316ffcd · 316ffcd
2 parents 2e5e1ea + 5ae0867
commit 316ffcd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/fs/opener/registry.py b/fs/opener/registry.py
@@ -45,7 +45,7 @@ class Registry(object):
     :\/\/
 
     (?:
-    (?:(.*?)@(.*?))
+    (?:(.*)@(.*?))
     |(.*?)
     )
 

diff --git a/tests/test_opener.py b/tests/test_opener.py
@@ -56,6 +56,16 @@ def test_parse_credentials(self):
         )
         self.assertEqual(expected, parsed)
 
+        parsed = opener.parse('ftp://user@ftp.example.org:password@proxy')
+        expected = opener.registry.ParseResult(
+            'ftp',
+            'user@ftp.example.org',
+            'password',
+            'proxy',
+            None
+        )
+        self.assertEqual(expected, parsed)
+
     def test_parse_path(self):
         parsed = opener.parse('osfs://foo/bar!example.txt')
         expected = opener.registry.ParseResult(