allow listdir/ilistdir to take non-keyword args

fs/__init__.py

@@ -15,7 +15,7 @@ implementations of this interface such as:
 
 """
 
-__version__ = "0.4.0a7"
+__version__ = "0.4.0a8"
 __author__ = "Will McGugan (will@willmcgugan.com)"
 
 #  'base' imports * from 'path' and 'errors', so their

fs/base.py

@@ -491,7 +491,12 @@ class FS(object):
         instead of a list.  Depending on the filesystem this may be more
         efficient than calling listdir() and iterating over the resulting list.
         """
-        return iter(self.listdir(path,wildcard,full,absolute,dirs_only,files_only))
+        return iter(self.listdir(path,
+                                 wildcard=wildcard,
+                                 full=full,
+                                 absolute=absolute,
+                                 dirs_only=dirs_only,
+                                 files_only=files_only))
 
     def ilistdirinfo(self, path="./",
                            wildcard=None,

fs/remote.py

@@ -493,12 +493,12 @@ class CacheFS(WrapFS):
         return super(CacheFS,self).isfile(path)
 
     @_cached_method
-    def listdir(self,path="",**kwds):
-        return super(CacheFS,self).listdir(path,**kwds)
+    def listdir(self,path="",*args,**kwds):
+        return super(CacheFS,self).listdir(path,*args,**kwds)
 
     @_cached_method
-    def listdirinfo(self,path="",**kwds):
-        return super(CacheFS,self).listdirinfo(path,**kwds)
+    def listdirinfo(self,path="",*args,**kwds):
+        return super(CacheFS,self).listdirinfo(path,*args,**kwds)
 
     @_cached_method
     def getinfo(self,path):

fs/tests/test_wrapfs.py

@@ -93,11 +93,14 @@ class TestHideDotFilesFS(unittest.TestCase):
 
     def test_hidden(self):
         self.assertEquals(len(self.fs.listdir(hidden=False)), 2)
+        self.assertEquals(len(list(self.fs.ilistdir(hidden=False))), 2)
 
     def test_nonhidden(self):
         self.assertEquals(len(self.fs.listdir(hidden=True)), 4)
+        self.assertEquals(len(list(self.fs.ilistdir(hidden=True))), 4)
 
     def test_default(self):
         self.assertEquals(len(self.fs.listdir()), 2)
+        self.assertEquals(len(list(self.fs.ilistdir())), 2)
 
 

fs/wrapfs/__init__.py

@@ -224,7 +224,12 @@ class WrapFS(FS):
             yield e
 
     @rewrite_errors
-    def listdirinfo(self, path="", **kwds):
+    def listdirinfo(self, path="", wildcard=None, full=False, absolute=False, dirs_only=False, files_only=False):
+        kwds = dict(wildcard=wildcard,
+                    full=full,
+                    absolute=absolute,
+                    dirs_only=dirs_only,
+                    files_only=files_only)        
         full = kwds.pop("full",False)
         absolute = kwds.pop("absolute",False)
         wildcard = kwds.pop("wildcard",None)
@@ -247,7 +252,12 @@ class WrapFS(FS):
         return entries
 
     @rewrite_errors
-    def ilistdirinfo(self, path="", **kwds):
+    def ilistdirinfo(self, path="", wildcard=None, full=False, absolute=False, dirs_only=False, files_only=False):
+        kwds = dict(wildcard=wildcard,
+                    full=full,
+                    absolute=absolute,
+                    dirs_only=dirs_only,
+                    files_only=files_only)
         full = kwds.pop("full",False)
         absolute = kwds.pop("absolute",False)
         wildcard = kwds.pop("wildcard",None)

fs/wrapfs/hidedotfilesfs.py

@@ -28,13 +28,27 @@ class HideDotFilesFS(WrapFS):
     def _decode(self, path):
         return path
 
-    def listdir(self, path="", **kwds):
-        hidden = kwds.pop("hidden",False)
+    def listdir(self, path="", wildcard=None, full=False, absolute=False, dirs_only=False, files_only=False, hidden=False):
+        kwds = dict(wildcard=wildcard,
+                    full=full,
+                    absolute=absolute,
+                    dirs_only=dirs_only,
+                    files_only=files_only)
         entries = self.wrapped_fs.listdir(path,**kwds)
         if not hidden:
             entries = [e for e in entries if not self.is_hidden(e)]
         return entries
 
+    def ilistdir(self, path="", wildcard=None, full=False, absolute=False, dirs_only=False, files_only=False, hidden=False):
+        kwds = dict(wildcard=wildcard,
+                    full=full,
+                    absolute=absolute,
+                    dirs_only=dirs_only,
+                    files_only=files_only)
+        for e in self.wrapped_fs.ilistdir(path,**kwds):
+            if hidden or not self.is_hidden(e):
+                yield e
+
     def walk(self, path="/", wildcard=None, dir_wildcard=None, search="breadth",hidden=False):
         if search == "breadth":
             dirs = [path]

fs/xattrs.py

@@ -144,14 +144,14 @@ class SimulateXAttr(WrapFS):
     def _decode(self,path):
         return path
 
-    def listdir(self,path="",**kwds):
+    def listdir(self,path="",*args,**kwds):
         """Prevent .xattr from appearing in listings."""
-        entries = self.wrapped_fs.listdir(path,**kwds)
+        entries = self.wrapped_fs.listdir(path,*args,**kwds)
         return [e for e in entries if not self._is_attr_path(e)]
 
-    def ilistdir(self,path="",**kwds):
+    def ilistdir(self,path="",*args,**kwds):
         """Prevent .xattr from appearing in listings."""
-        for e in self.wrapped_fs.ilistdir(path,**kwds):
+        for e in self.wrapped_fs.ilistdir(path,*args,**kwds):
             if not self._is_attr_path(e):
                 yield e