Merge branch 'recursive-wildcard' of https://github.com/moi90/anytree …

…into moi90-recursive-wildcard

anytree/resolver.py

@@ -6,6 +6,7 @@
 import re
 
 from .config import ASSERTIONS
+from anytree.iterators.preorderiter import PreOrderIter
 
 _MAXCACHE = 20
 
@@ -207,26 +208,37 @@ def __start(self, node, path, cmp_):
     def __glob(self, node, parts):
         if ASSERTIONS:  # pragma: no branch
             assert node is not None
-        nodes = []
-        if parts:
-            name = parts[0]
-            remainder = parts[1:]
-            # handle relative
-            if name == "..":
-                parent = node.parent
-                if parent is None:
-                    raise RootResolverError(node)
-                nodes += self.__glob(parent, remainder)
-            elif name in ("", "."):
-                nodes += self.__glob(node, remainder)
-            else:
-                matches = self.__find(node, name, remainder)
-                if not matches and not Resolver.is_wildcard(name):
-                    raise ChildResolverError(node, name, self.pathattr)
-                nodes += matches
-        else:
-            nodes = [node]
-        return nodes
+
+        if not parts:
+            return [node]
+
+        name = parts[0]
+        remainder = parts[1:]
+
+        # handle relative
+        if name == "..":
+            parent = node.parent
+            if parent is None:
+                raise RootResolverError(node)
+            return self.__glob(parent, remainder)
+
+        if name in ("", "."):
+            return self.__glob(node, remainder)
+
+        # handle recursive
+        if name == "**":
+            matches = []
+            for n in PreOrderIter(node):
+                try:
+                    matches += self.__glob(n, remainder)
+                except ChildResolverError:
+                    pass
+            return matches
+
+        matches = self.__find(node, name, remainder)
+        if not matches and not Resolver.is_wildcard(name):
+            raise ChildResolverError(node, name, self.pathattr)
+        return matches
 
     def __find(self, node, pat, remainder):
         matches = []

tests/test_resolver.py

@@ -75,6 +75,9 @@ def test_glob():
     with assert_raises(at.ResolverError, "unknown root node '/z*'. root is '/top'."):
         r.glob(sub1, "/z*")
 
+    # Recursive matching
+    eq_(r.glob(top, "**/sub0"), [sub0, sub0sub0, sub0sub1sub0, sub1sub0])
+
 
 def test_glob_cache():
     """Wildcard Cache."""