portal 3.1.1__tar.gz → 3.1.3__tar.gz

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

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

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

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

{portal-3.1.1 → portal-3.1.3}/portal/client.py

@@ -47,7 +47,7 @@ class Client:
   def stats(self):
     now = time.time()
     stats = {
-        'inflight': self._numinflight(),
+        'inflight': len(self.futures),
         'numsend': self.sendrate[0],
         'numrecv': self.recvrate[0],
         'sendrate': self.sendrate[0] / (now - self.sendrate[1]),
@@ -65,7 +65,7 @@ class Client:
   def call(self, method, *data):
     reqnum = next(self.reqnum).to_bytes(8, 'little', signed=False)
     start = time.time()
-    while self._numinflight() >= self.maxinflight:
+    while len(self.futures) >= self.maxinflight:
       with self.cond: self.cond.wait(timeout=0.2)
       try:
         self.socket.require_connection(timeout=0)
@@ -93,9 +93,6 @@ class Client:
     self.futures.clear()
     self.socket.close(timeout)
 
-  def _numinflight(self):
-    return len([x for x in self.futures.values() if not x.don])
-
   def _recv(self, data):
     assert len(data) >= 16, 'Unexpectedly short response'
     reqnum = bytes(data[:8])

{portal-3.1.1 → portal-3.1.3}/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})
@@ -227,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.1 → portal-3.1.3}/portal/contextlib.py

@@ -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.1 → portal-3.1.3}/portal/server_socket.py

@@ -7,7 +7,6 @@ import socket
 from . import buffers
 from . import contextlib
 from . import thread
-from . import utils
 
 
 class Connection:
@@ -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.1 → portal-3.1.3/portal.egg-info}/PKG-INFO

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