djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/manifestfile.py: Replace recursive glob with os.walk.

Browse Source 
Recursive glob isn't supported before Python 3.5.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared 2022-09-30 15:33:43 +10:00
parent 924a3e03ec
commit 282401da5c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/manifestfile.py
View File

@ -311,14 +311,14 @@ class ManifestFile:
lib_dirs = ["unix-ffi"] + lib_dirs
for lib_dir in lib_dirs:
for manifest_path in glob.glob(
os.path.join(
self._path_vars["MPY_LIB_DIR"], lib_dir, "**", name, "manifest.py"
),
recursive=True,
# Search for {lib_dir}/**/{name}/manifest.py.
for root, dirnames, filenames in os.walk(
os.path.join(self._path_vars["MPY_LIB_DIR"], lib_dir)
):
self.include(manifest_path, **kwargs)
if os.path.basename(root) == name and "manifest.py" in filenames:
self.include(root, **kwargs)
return
raise ValueError("Library not found in local micropython-lib: {}".format(name))
else:
# TODO: HTTP request to obtain URLs from manifest.json.