From c81fd76874922bf12b18a89ee729930fd0e0a83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Alvergnat?= <remi.alvergnat@gfi.world>
Date: Mon, 21 Dec 2020 23:11:47 +0100
Subject: [PATCH] fix(file): Fix recursive=False parameter in FileWalker

---
 ddb/utils/file.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ddb/utils/file.py b/ddb/utils/file.py
index 80d88426..80134b1b 100644
--- a/ddb/utils/file.py
+++ b/ddb/utils/file.py
@@ -198,11 +198,6 @@ def _do_yield(self, source):  # pylint:disable=no-self-use
 
     def _walk(self, *args, recursive=True, **kwargs):
         _walk_generator = os.walk(*args, **kwargs)
-        if not recursive:
-            try:
-                _walk_generator = next(_walk_generator)
-            except StopIteration:
-                return
         for root, dirs, files in os.walk(*args, **kwargs):
             for dirs_item in list(dirs):
                 dirpath = os.path.join(root, dirs_item)
@@ -215,6 +210,9 @@ def _walk(self, *args, recursive=True, **kwargs):
                         not self._is_excluded(filepath, *self.excludes):
                     yield filepath
 
+            if not recursive:
+                break
+
     @staticmethod
     def _braceexpand(includes, excludes):
         expanded_includes = []