portal 3.1.0__tar.gz → 3.1.1__tar.gz

{portal-3.1.0/portal.egg-info → portal-3.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.1.0
+Version: 3.1.1
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner

{portal-3.1.0 → portal-3.1.1}/portal/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.1.0'
+__version__ = '3.1.1'
 
 import multiprocessing as mp
 try:

{portal-3.1.0 → portal-3.1.1}/portal/client_socket.py

@@ -186,11 +186,13 @@ class ClientSocket:
         sock.settimeout(0)
         self._log('Connection established')
         return sock
+      except TimeoutError as e:
+        error = e
       except ConnectionError as e:
         error = e
-        time.sleep(0.1)
-      except TimeoutError as e:
+      except socket.gaierror as e:
         error = e
+      time.sleep(0.1)
       if once:
         self._log(f'Still trying to connect... ({error})')
         once = False

{portal-3.1.0 → portal-3.1.1}/portal/contextlib.py

@@ -44,7 +44,7 @@ class Context:
       initfns=None,
       clientkw=None,
       serverkw=None,
-      hostname=None,
+      host=None,
       ipv6=None,
   ):
 
@@ -77,8 +77,8 @@ class Context:
       assert isinstance(serverkw, dict)
       self.serverkw = serverkw
 
-    if hostname is not None:
-      self.serverkw['hostname'] = hostname
+    if host is not None:
+      self.serverkw['host'] = host
 
     if ipv6 is not None:
       self.clientkw['ipv6'] = ipv6

{portal-3.1.0 → portal-3.1.1}/portal/server_socket.py

@@ -26,7 +26,7 @@ class Connection:
 class Options:
 
   ipv6: bool = False
-  hostname: str = ''
+  host: str = ''
   max_msg_size: int = 4 * 1024 ** 3
   max_recv_queue: int = 4096
   max_send_queue: int = 4096
@@ -43,10 +43,10 @@ class ServerSocket:
     self.options = Options(**{**contextlib.context.serverkw, **kwargs})
     if self.options.ipv6:
       self.sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-      self.addr = (self.options.hostname, port, 0, 0)
+      self.addr = (self.options.host, port, 0, 0)
     else:
       self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-      self.addr = (self.options.hostname, port)
+      self.addr = (self.options.host, port)
     self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     self.sock.bind(self.addr)
     self.sock.setblocking(False)

{portal-3.1.0 → portal-3.1.1/portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.1.0
+Version: 3.1.1
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner