Fix #1155: Fixed crash on python 3.5 with cli importer

2020-06-11 05:57:53 +02:00 · 2020-06-11 05:57:53 +02:00 · 85c6baca9a
parent 3a0c930dd5
commit 85c6baca9a
2 changed files with 2 additions and 1 deletions
--- a/api/funkwhale_api/music/management/commands/import_files.py
+++ b/api/funkwhale_api/music/management/commands/import_files.py
@ -37,7 +37,7 @@ def crawl_dir(dir, extensions, recursive=True, ignored=[]):
                            yield entry.path
            elif recursive and entry.is_dir():
                yield from crawl_dir(
-                    entry, extensions, recursive=recursive, ignored=ignored
+                    entry.path, extensions, recursive=recursive, ignored=ignored
                )
    finally:
        if hasattr(scanner, "close"):
--- a/changes/changelog.d/1155.bugfix
+++ b/changes/changelog.d/1155.bugfix
@ -0,0 +1 @@
+Fixed crash on python 3.5 with cli importer (#1155)
				`@ -0,0 +1 @@`
				`Fixed crash on python 3.5 with cli importer (#1155)`