Remove all public references to EventLoop to match changes to async API

examples/example_capability.py

@@ -15,22 +15,20 @@ def example_simple_rpc():
     def _restore(ref_id):
         return capability.TestInterface.new_server(Server(100))
 
-    loop = capnp.EventLoop()
+    # loop = capnp.EventLoop()
     
     read, write = socket.socketpair(socket.AF_UNIX)
-    read_stream = capnp.FdAsyncIoStream(read.fileno())
-    write_stream = capnp.FdAsyncIoStream(write.fileno())
 
     restorer = capnp.Restorer(capability.TestSturdyRefObjectId, _restore)
-    server = capnp.RpcServer(loop, write_stream, restorer)
-    client = capnp.RpcClient(loop, read_stream)
+    server = capnp.RpcServer(write, restorer)
+    client = capnp.RpcClient(read)
 
     ref = capability.TestSturdyRefObjectId.new_message()
     cap = client.restore(ref.as_reader())
     cap = cap.cast_as(capability.TestInterface)
 
     remote = cap.foo(i=5)
-    response = loop.wait(remote)
+    response = remote.wait()
 
     assert response.x == '125'
 

examples/example_client.py

@@ -5,20 +5,15 @@ import test_capnp
 import socket
 
 def example_client():
-    loop = capnp.EventLoop()
-    
     c = socket.create_connection(('localhost', 49999))
-    read_stream = capnp.FdAsyncIoStream(c.fileno())
 
-    client = capnp.RpcClient(loop, read_stream)
+    client = capnp.RpcClient(c)
 
-    ref = test_capnp.TestSturdyRefObjectId.new_message()
-    ref.tag = 'testInterface'
-    cap = client.restore(ref)
+    cap = client.restore(test_capnp.TestSturdyRefObjectId.new_message(tag='testInterface'))
     cap = cap.cast_as(test_capnp.TestInterface)
 
     remote = cap.foo(i=5)
-    response = loop.wait(remote)
+    response = remote.wait()
 
     assert response.x == '125'
     c.close()

examples/example_server.py

@@ -12,7 +12,10 @@ class Server:
         return str(i * 5 + self.val)
 
 def restore(ref_id):
-    return test_capnp.TestInterface.new_server(Server(100))
+    if ref_id.tag == 'testInterface':
+        return test_capnp.TestInterface.new_server(Server(100))
+    else:
+        raise ValueError('invalid ref')
 
 def example_server(host='localhost', port=49999):
     backlog = 1 
@@ -21,13 +24,11 @@ def example_server(host='localhost', port=49999):
     s.bind((host,port)) 
     s.listen(backlog) 
 
-    loop = capnp.EventLoop()
     while 1:
         try:
             (clientsocket, address) = s.accept()
-            stream = capnp.FdAsyncIoStream(clientsocket.fileno())
             restorer = capnp.Restorer(test_capnp.TestSturdyRefObjectId, restore)
-            server = capnp.RpcServer(loop, stream, restorer)
+            server = capnp.RpcServer(clientsocket, restorer)
 
             server.run_forever()
         except KeyboardInterrupt: