fix handling of callable wildcards in RPCFS

fs/base.py

@@ -830,8 +830,6 @@ class FS(object):
             else:
                 return self.listdir(path, *args, **kwargs)
             
-        if search == "breadth":
-            
         if wildcard is None:
             wildcard = lambda f:True
         elif not callable(wildcard):
@@ -844,6 +842,8 @@ class FS(object):
             dir_wildcard_re = re.compile(fnmatch.translate(dir_wildcard))
             dir_wildcard = lambda fn:bool (dir_wildcard_re.match(fn))              
         
+        if search == "breadth":
+            
             dirs = [path]
             while dirs:
                 current_path = dirs.pop()

fs/rpcfs.py

@@ -210,9 +210,21 @@ class RPCFS(FS):
         return self.proxy.isfile(path)
 
     def listdir(self, path="./", wildcard=None, full=False, absolute=False, dirs_only=False, files_only=False):        
-        path = self.encode_path(path)
-        entries =  self.proxy.listdir(path,wildcard,full,absolute,dirs_only,files_only)
-        return [self.decode_path(e) for e in entries]
+        enc_path = self.encode_path(path)
+        if not callable(wildcard):
+            entries =  self.proxy.listdir(enc_path,wildcard,full,absolute,
+                                          dirs_only,files_only)
+            entries = [self.decode_path(e) for e in entries]
+        else:
+            entries =  self.proxy.listdir(enc_path,None,False,False,
+                                          dirs_only,files_only)
+            entries = [self.decode_path(e) for e in entries]
+            entries = [e for e in entries if wildcard(e)]
+            if full:
+                entries = [relpath(pathjoin(path,e)) for e in entries]
+            elif absolute:
+                entries = [abspath(pathjoin(path,e)) for e in entries]
+        return entries
 
     def makedir(self, path, recursive=False, allow_recreate=False):
         path = self.encode_path(path)