Consistent argument order.

tests/test_server.py

@@ -280,7 +280,7 @@ def donefn(data):
       with lock:
         done_calls[0] += 1
       time.sleep(0.01)
-    server = Server(addr, workers)
+    server = Server(addr, workers=workers)
     server.bind('function', workfn, donefn)
     with server:
       client = zerofun.Client(addr, pings=0, maxage=1, connect=True)

zerofun/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '1.1.0'
+__version__ = '1.2.0'
 
 import multiprocessing as mp
 try:

zerofun/client.py

@@ -11,9 +11,12 @@
 
 class Client:
 
+  RESOLVERS = []
+
   def __init__(
-      self, address, identity=None, name='Client', ipv6=False, pings=10,
-      maxage=120, maxinflight=16, errors=True, connect=False):
+      self, address, name='Client', ipv6=False, identity=None,
+      pings=10, maxage=120, maxinflight=16, errors=True,
+      connect=False):
     if identity is None:
       identity = int(np.random.randint(2 ** 32))
     self.address = address
@@ -128,8 +131,10 @@ def _listen(self):
 
   @elements.timer.section('client_resolve')
   def _resolve(self, address):
-    protocol, address = address.split('://', 1)
-    return f'{protocol}://{address}'
+    for check, resolve in self.RESOLVERS:
+      if check(address):
+        return resolve(address)
+    return address
 
   def _print(self, text):
     elements.print(f'[{self.name}] {text}')

zerofun/proc_server.py

@@ -12,12 +12,12 @@
 class ProcServer:
 
   def __init__(
-      self, address, workers=1, name='Server', errors=True, ipv6=False):
+      self, address, name='Server', ipv6=False, workers=1, errors=True):
     self.address = address
     self.inner = f'ipc:///tmp/inner{np.random.randint(2 ** 32)}'
     self.name = name
     self.ipv6 = ipv6
-    self.server = server.Server(self.inner, workers, name, errors, ipv6)
+    self.server = server.Server(self.inner, name, ipv6, workers, errors)
     self.batches = {}
     self.batcher = None
 

zerofun/server.py

@@ -16,7 +16,7 @@
 class Server:
 
   def __init__(
-      self, address, workers=1, name='Server', errors=True, ipv6=False):
+      self, address, name='Server', ipv6=False, workers=1, errors=True):
     self.address = address
     self.workers = workers
     self.name = name