Pyro URI now accepts spaces in the location part (for unix sockets)

Author: irmen

Pyro5/core.py

@@ -41,7 +41,7 @@ class URI(object):
     You can write the protocol in lowercase if you like (``pyro:...``) but it will
     automatically be converted to uppercase internally.
     """
-    uriRegEx = re.compile(r"(?P<protocol>[Pp][Yy][Rr][Oo][a-zA-Z]*):(?P<object>\S+?)(@(?P<location>\S+))?$")
+    uriRegEx = re.compile(r"(?P<protocol>[Pp][Yy][Rr][Oo][a-zA-Z]*):(?P<object>\S+?)(@(?P<location>.+))?$")
 
     def __init__(self, uri):
         if isinstance(uri, URI):

tests/test_core.py

@@ -14,3 +14,13 @@ def test_uri(self):
         assert u1 == u2
         assert u1 is not u2
 
+    def test_unix_uri(self):
+        p = Pyro5.core.URI("PYRO:12345@./u:/tmp/sockname")
+        assert p.object == "12345"
+        assert p.sockname == "/tmp/sockname"
+        p = Pyro5.core.URI("PYRO:12345@./u:../sockname")
+        assert p.object == "12345"
+        assert p.sockname == "../sockname"
+        p = Pyro5.core.URI("PYRO:12345@./u:/path with spaces/sockname  ")
+        assert p.object == "12345"
+        assert p.sockname == "/path with spaces/sockname  "