diff --git a/scripts/change-link.py b/scripts/change-link.py index e67b284..f063027 100755 --- a/scripts/change-link.py +++ b/scripts/change-link.py @@ -31,14 +31,9 @@ KEY = 'dotfiles' ENTRY = 'link' -def main(): - """entry point""" - args = docopt(USAGE) - path = os.path.expanduser(args['']) - value = args['--value'] - ignores = args['--ignore'] - - with open(path, 'r') as file: +def change_link(path, value, ignores): + """change link value""" + with open(path, 'r', encoding='utf-8') as file: content = yaml(typ='safe').load(file) for k, val in content[KEY].items(): if k in ignores: @@ -54,5 +49,14 @@ def main(): print(output) +def main(): + """entry point""" + args = docopt(USAGE) + path = os.path.expanduser(args['']) + value = args['--value'] + ignores = args['--ignore'] + change_link(path, value, ignores) + + if __name__ == '__main__': main() diff --git a/scripts/yaml-to-toml.py b/scripts/yaml-to-toml.py index 7e7d918..604df87 100755 --- a/scripts/yaml-to-toml.py +++ b/scripts/yaml-to-toml.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 - """ author: deadc0de6 (https://github.com/deadc0de6) Copyright (c) 2022, deadc0de6 @@ -17,13 +16,13 @@ import toml def yaml_load(path): """load from yaml""" with open(path, 'r', encoding='utf8') as file: - data = yaml() - data.typ = 'rt' - content = data.load(file) + cont = yaml() + cont.typ = 'rt' + content = cont.load(file) return content -def replace_None(content): +def replace_none(content): """replace any occurence of None with empty string""" n = {} for k in content: @@ -35,7 +34,7 @@ def replace_None(content): n[k] = "" continue if isinstance(content[k], dict): - n[k] = replace_None(content[k]) + n[k] = replace_none(content[k]) continue n[k] = content[k] return n @@ -48,11 +47,10 @@ def toml_dump(content): if __name__ == '__main__': if len(sys.argv) < 2: - print("usage: {} ".format(sys.argv[0])) + print(f"usage: {sys.argv[0]} ") sys.exit(1) - path = sys.argv[1] - content = yaml_load(path) - content = replace_None(content) - out = toml_dump(content) + data = yaml_load(sys.argv[1]) + data = replace_none(data) + out = toml_dump(data) print(out) diff --git a/test-syntax.sh b/test-syntax.sh index c62fd92..1e99e0b 100755 --- a/test-syntax.sh +++ b/test-syntax.sh @@ -28,6 +28,7 @@ pycodestyle scripts/ echo "testing with pyflakes" pyflakes dotdrop/ pyflakes tests/ +pyflakes scripts/ # pylint echo "testing with pylint" @@ -51,6 +52,19 @@ pylint \ --disable=R0904 \ dotdrop/ +# C0103: invalid-name +pylint \ + --disable=R0902 \ + --disable=R0913 \ + --disable=R0903 \ + --disable=R0914 \ + --disable=R0915 \ + --disable=R0912 \ + --disable=R0911 \ + --disable=R0904 \ + --disable=C0103 \ + scripts/ + set +e exceptions="save_uservariables_name\|@@\|diff_cmd\|original,\|modified," # f-string errors and missing f literal diff --git a/tests/test_listings.py b/tests/test_listings.py index 72a82e6..e568ad7 100644 --- a/tests/test_listings.py +++ b/tests/test_listings.py @@ -19,6 +19,7 @@ from tests.helpers import create_dir, get_string, get_tempdir, \ class TestListings(unittest.TestCase): + """listing test""" CONFIG_BACKUP = False CONFIG_CREATE = True