redesign of walker objects

Author: willmcgugan

docs/source/reference/walk.rst

@@ -5,7 +5,7 @@ Walk a directory structure.
 
 The ``Walker`` class in this module does the work of *walking* a filesystem. In other words, listing each resource in a directory, and any sub-directories.
 
-To walk a filesystem (or directory) you can construct a :class::`fs.walk.Walker` object and use its methods to do the walking. Here's an example that prints the path to every Python file in your projects directory::
+To walk a filesystem (or directory) you can construct a :class:`fs.walk.Walker` object and use its methods to do the walking. Here's an example that prints the path to every Python file in your projects directory::
 
     >>> from fs import open_fs
     >>> from fs.walk import Walker
@@ -32,4 +32,4 @@ There are two general algorithms for searching a directory tree. The first metho
 Generally speaking, you will only need the a *depth* search if you will be deleting resources as you walk through them. The default *breadth* search is a generally more efficient way of looking through a filesystem. You can specify which method you want with the ``search`` parameter on most ``Walker`` methods.
 
 .. automodule:: fs.walk
-    :members:
+    :members:

fs/_repr.py

@@ -0,0 +1,10 @@
+from __future__ import unicode_literals
+
+def make_repr(class_name, args):
+    """Generate a repr string."""
+    arguments = [
+        "{!s}={!r}".format(name, value)
+        for name, value, default in args
+        if value != default
+    ]
+    return "{}({})".format(class_name, ', '.join(arguments))

fs/base.py

@@ -834,12 +834,8 @@ def removetree(self, dir_path):
 
         _dir_path = abspath(normpath(dir_path))
         with self._lock:
-            walker = walk.Walker()
-            gen_info = walker.walk_info(
-                self,
-                _dir_path,
-                search="depth"
-            )
+            walker = walk.Walker(search="depth")
+            gen_info = walker.walk_info(self, _dir_path)
             for _path, info in gen_info:
                 if info.is_dir:
                     self.removedir(_path)

fs/copy.py

@@ -1,15 +1,15 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from . import walk
+from .walk import Walker
 from .opener import manage_fs
 from .path import abspath
 from .path import combine
 from .path import frombase
 from .path import normpath
 
 
-def copy_fs(src_fs, dst_fs):
+def copy_fs(src_fs, dst_fs, walker=None):
     """
     Copy the contents of one filesystem to another.
 
@@ -21,7 +21,7 @@ def copy_fs(src_fs, dst_fs):
     :type dst_fs: FS URL or instance
 
     """
-    copy_dir(src_fs, '/', dst_fs, '/')
+    copy_dir(src_fs, '/', dst_fs, '/', walker=walker)
 
 
 def copy_file(src_fs, src_path, dst_fs, dst_path):
@@ -51,7 +51,7 @@ def copy_file(src_fs, src_path, dst_fs, dst_path):
                         dst_fs.setbin(dst_path, read_file)
 
 
-def copy_structure(src_fs, dst_fs):
+def copy_structure(src_fs, dst_fs, walker=None):
     """
     Copy directories (but not files) from ``src_fs`` to ``dst_fs``.
 
@@ -61,14 +61,15 @@ def copy_structure(src_fs, dst_fs):
     :type dst_fs: FS URL or instance
 
     """
+    walker = walker or Walker()
     with manage_fs(src_fs, writeable=False) as src_fs:
         with manage_fs(dst_fs, create=True) as dst_fs:
             with src_fs.lock(), dst_fs.lock():
-                for dir_path in walk.walk_dirs(src_fs):
+                for dir_path in walker.walk_dirs(src_fs):
                     dst_fs.makedir(dir_path, recreate=True)
 
 
-def copy_dir(src_fs, src_path, dst_fs, dst_path):
+def copy_dir(src_fs, src_path, dst_fs, dst_path, walker=None):
     """
     Copy a directory from one filesystem to another.
 
@@ -82,14 +83,15 @@ def copy_dir(src_fs, src_path, dst_fs, dst_path):
 
     """
 
+    walker = walker or Walker()
     _src_path = abspath(normpath(src_path))
     _dst_path = abspath(normpath(dst_path))
 
     with manage_fs(src_fs, writeable=False) as src_fs:
         with manage_fs(dst_fs, create=True) as dst_fs:
             with src_fs.lock(), dst_fs.lock():
                 dst_fs.makedir(_dst_path, recreate=True)
-                for dir_path, dirs, files in walk.walk(src_fs, _src_path):
+                for dir_path, dirs, files in walker.walk(src_fs, _src_path):
                     copy_path = combine(
                         _dst_path,
                         frombase(_src_path, dir_path)