Skip to content

Commit 024d321

Browse files
committed
Condensed init.json_dir()
1 parent 7b5b38c commit 024d321

1 file changed

Lines changed: 11 additions & 14 deletions

File tree

remove-json-keys/lib/init.py

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,15 @@ def cli():
2121

2222
return cli
2323

24-
def json_dir(json_dir):
24+
def json_dir(target_dir):
2525
lib_dir = os.path.abspath(os.path.dirname(__file__))
26-
for root, dirs, _ in os.walk(lib_dir): # search lib dir recursively
27-
if json_dir in dirs:
28-
json_dir = os.path.join(root, json_dir) ; break
29-
else: # search lib parent dirs recursively
30-
parent_dir = os.path.dirname(lib_dir)
31-
while parent_dir and parent_dir != lib_dir:
32-
for root, dirs, _ in os.walk(parent_dir):
33-
if json_dir in dirs:
34-
json_dir = os.path.join(root, json_dir) ; break
35-
if json_dir : break
36-
parent_dir = os.path.dirname(parent_dir)
37-
else : json_dir = None
38-
return json_dir
26+
for root, dirs, _ in os.walk(lib_dir): # search lib_dir recursively
27+
if target_dir in dirs:
28+
return os.path.join(root, target_dir)
29+
parent_dir = os.path.dirname(lib_dir)
30+
while parent_dir and parent_dir != os.path.dirname(parent_dir):
31+
for root, dirs, _ in os.walk(parent_dir): # search parent dirs recursively
32+
if target_dir in dirs:
33+
return os.path.join(root, target_dir)
34+
parent_dir = os.path.dirname(parent_dir)
35+
return None

0 commit comments

Comments
 (0)