=== modified file 'mandos'
--- mandos	2015-05-31 17:46:06 +0000
+++ mandos	2015-05-31 19:05:32 +0000
@@ -2153,7 +2153,8 @@
         
         if command == 'getattr':
             attrname = request[1]
-            if callable(client_object.__getattribute__(attrname)):
+            if isinstance(client_object.__getattribute__(attrname),
+                          collections.Callable):
                 parent_pipe.send(('function', ))
             else:
                 parent_pipe.send((