Skip to content

Commit a3086fd

Browse files
committed
Fixed init.<json|locales>_dir() to work w/ global installs
1 parent 1d04f8f commit a3086fd

3 files changed

Lines changed: 5 additions & 17 deletions

File tree

remove-json-keys/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "remove-json-keys"
7-
version = "0.0.18"
7+
version = "0.0.19"
88
description = "Remove key/value pairs from json_dir/**/*.json."
99
authors = [{name = "Adam Lui", email = "adam@kudoai.com"}]
1010
license = "MIT"

remove-json-keys/src/remove_json_keys/lib/init.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,8 @@ def cli():
2828
return cli
2929

3030
def json_dir(target_dir):
31-
lib_dir = os.path.abspath(os.path.dirname(__file__))
32-
for root, dirs, _ in os.walk(lib_dir): # search lib_dir recursively
31+
start_dir = os.getcwd()
32+
for root, dirs, _ in os.walk(start_dir):
3333
if target_dir in dirs:
3434
return os.path.join(root, target_dir)
35-
parent_dir = os.path.dirname(lib_dir)
36-
while parent_dir and parent_dir != os.path.dirname(parent_dir):
37-
for root, dirs, _ in os.walk(parent_dir): # search parent dirs recursively
38-
if target_dir in dirs:
39-
return os.path.join(root, target_dir)
40-
parent_dir = os.path.dirname(parent_dir)
4135
return None

translate-messages/src/translate_messages/lib/init.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,8 @@ def config_file(cli):
6868
print(f'Default config created at {cli.config_path}')
6969

7070
def locales_dir(target_dir):
71-
lib_dir = os.path.abspath(os.path.dirname(__file__))
72-
for root, dirs, _ in os.walk(lib_dir): # search lib_dir recursively
71+
start_dir = os.getcwd()
72+
for root, dirs, _ in os.walk(start_dir):
7373
if target_dir in dirs:
7474
return os.path.join(root, target_dir)
75-
parent_dir = os.path.dirname(lib_dir)
76-
while parent_dir and parent_dir != os.path.dirname(parent_dir):
77-
for root, dirs, _ in os.walk(parent_dir): # search parent dirs recursively
78-
if target_dir in dirs:
79-
return os.path.join(root, target_dir)
80-
parent_dir = os.path.dirname(parent_dir)
8175
return None

0 commit comments

Comments
 (0)