portal 3.1.0__tar.gz → 3.1.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.1.0
+Version: 3.1.2
 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.2}/portal/__init__.py

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

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

@@ -10,7 +10,6 @@ import time
 from . import buffers
 from . import contextlib
 from . import thread
-from . import utils
 
 
 class Disconnected(Exception):
@@ -39,6 +38,7 @@ class ClientSocket:
     if port is None:
       host, port = host.rsplit(':', 1)
       port = int(port)
+      assert host, host
     self.addr = (host, port)
     self.name = name
     self.options = Options(**{**contextlib.context.clientkw, **kwargs})
@@ -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
@@ -225,9 +227,5 @@ class ClientSocket:
   def _log(self, *args):
     if not self.options.logging:
       return
-    if self.options.logging_color:
-      style = utils.style(color=self.options.logging_color)
-      reset = utils.style(reset=True)
-    else:
-      style, reset = '', ''
-    print(style + f'[{self.name}]' + reset, *args)
+    contextlib.context.print(
+        self.name, *args, color=self.options.logging_color)

{portal-3.1.0 → portal-3.1.2}/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
@@ -96,6 +96,16 @@ class Context:
     self.initfns.append(pkl)
     call_now and fn()
 
+  def print(self, name, *args, color=None):
+    assert args
+    if color:
+      style = utils.style(color=color)
+      reset = utils.style(reset=True)
+    else:
+      style, reset = '', ''
+    with self.printlock:
+      print(style + f'[{name}]' + reset, *args)
+
   def error(self, e, name=None):
     typ, tb = type(e), e.__traceback__
     summary = list(traceback.format_exception_only(typ, e))[0].strip('\n')

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

@@ -7,7 +7,6 @@ import socket
 from . import buffers
 from . import contextlib
 from . import thread
-from . import utils
 
 
 class Connection:
@@ -26,7 +25,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 +42,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)
@@ -164,9 +163,5 @@ class ServerSocket:
   def _log(self, *args, **kwargs):
     if not self.options.logging:
       return
-    if self.options.logging_color:
-      style = utils.style(color=self.options.logging_color)
-      reset = utils.style(reset=True)
-    else:
-      style, reset = '', ''
-    print(style + f'[{self.name}]' + reset, *args)
+    contextlib.context.print(
+        self.name, *args, color=self.options.logging_color)

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

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