Allow exporting non-hashable function

bombela · bombela · commit fec4d82bd5e6 · 2014-09-13T01:23:01.000-07:00
Instead of hashing the function object, hash its name instead. There is
no particular reason to consider a function instance and its name as two
independent entities in the context of the same object.

As a bonus, this means you can now replace your methods on the fly and
the next call will reach the new one. I am not sure why you would want
to do that though.
diff --git a/zerorpc/core.py b/zerorpc/core.py
@@ -68,16 +68,15 @@ def __init__(self, channel, methods=None, name=None, context=None,
 
     @staticmethod
     def _filter_methods(cls, self, methods):
-        if hasattr(methods, '__getitem__'):
+        if isinstance(methods, dict):
             return methods
-        server_methods = set(getattr(self, k) for k in dir(cls) if not
-                             k.startswith('_'))
+        server_methods = set(k for k in dir(cls) if not k.startswith('_'))
         return dict((k, getattr(methods, k))
-                    for k in dir(methods)
-                    if (callable(getattr(methods, k))
-                        and not k.startswith('_')
-                        and getattr(methods, k) not in server_methods
-                        ))
+                for k in dir(methods)
+                if callable(getattr(methods, k))
+                and not k.startswith('_')
+                and k not in server_methods
+                )
 
     @staticmethod
     def _extract_name(methods):
