portal 3.5.0__tar.gz → 3.6.0__tar.gz

{portal-3.5.0/portal.egg-info → portal-3.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.5.0
+Version: 3.6.0
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner
@@ -58,7 +58,7 @@ def server():
 
 def client():
   import portal
-  client = portal.Client('localhost', 2222)
+  client = portal.Client('localhost:2222')
   future = client.add(12, 42)
   result = future.result()
   print(result)  # 54

{portal-3.5.0 → portal-3.6.0}/README.md

@@ -45,7 +45,7 @@ def server():
 
 def client():
   import portal
-  client = portal.Client('localhost', 2222)
+  client = portal.Client('localhost:2222')
   future = client.add(12, 42)
   result = future.result()
   print(result)  # 54

{portal-3.5.0 → portal-3.6.0}/portal/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.5.0'
+__version__ = '3.6.0'
 
 import multiprocessing as mp
 try:

{portal-3.5.0 → portal-3.6.0}/portal/buffers.py

@@ -17,7 +17,7 @@ class SendBuffer:
     assert all(len(x) for x in buffers)
     assert 1 <= length, length
     assert not maxsize or length <= length, (length, maxsize)
-    lenbuf = length.to_bytes(4, 'little', signed=False)
+    lenbuf = length.to_bytes(8, 'little', signed=False)
     self.buffers = [lenbuf, *buffers]
     self.remaining = collections.deque(self.buffers)
     self.pos = 0
@@ -64,10 +64,10 @@ class RecvBuffer:
 
   def recv(self, sock):
     if self.buffer is None:
-      part = sock.recv(4 - len(self.lenbuf))
+      part = sock.recv(8 - len(self.lenbuf))
       self.lenbuf += part
       size = len(part)
-      if len(self.lenbuf) == 4:
+      if len(self.lenbuf) == 8:
         length = int.from_bytes(self.lenbuf, 'little', signed=False)
         assert 1 <= length <= self.maxsize, (1, length, self.maxsize)
         # We use Numpy to allocate uninitialized memory because Python's

{portal-3.5.0 → portal-3.6.0}/portal/client_socket.py

@@ -238,9 +238,10 @@ class ClientSocket:
         sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPIDLE, after)
         sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, every)
         sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPCNT, fails)
-        sock.setsockopt(
-            socket.IPPROTO_TCP, socket.TCP_USER_TIMEOUT,
-            1000 * (after + every * fails))
+        if hasattr(socket, 'TCP_USER_TIMEOUT'):  # Linux
+          sock.setsockopt(
+              socket.IPPROTO_TCP, socket.TCP_USER_TIMEOUT,
+              1000 * (after + every * fails))
       if sys.platform == 'darwin':
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
         sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPALIVE, every)

{portal-3.5.0 → portal-3.6.0}/portal/server.py

@@ -168,3 +168,5 @@ class Server:
       # Wait until the error is delivered to the client and then raise.
       self.close(internal=True)
       raise RuntimeError(message)
+    else:
+      print(f'Error in server method: {message}')

{portal-3.5.0 → portal-3.6.0/portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.5.0
+Version: 3.6.0
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner
@@ -58,7 +58,7 @@ def server():
 
 def client():
   import portal
-  client = portal.Client('localhost', 2222)
+  client = portal.Client('localhost:2222')
   future = client.add(12, 42)
   result = future.result()
   print(result)  # 54