From 1c0749822fef716012c12e03b7ebfec515ccfb4b Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Sat, 20 Feb 2021 13:36:24 +0100 Subject: [PATCH] code quality --- dotdrop/cfg_yaml.py | 13 +++++++------ dotdrop/dotfile.py | 4 ++-- dotdrop/installer.py | 3 --- scripts/change-link.py | 4 +--- setup.py | 1 - 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dotdrop/cfg_yaml.py b/dotdrop/cfg_yaml.py index 9b14b12..4ebd20b 100644 --- a/dotdrop/cfg_yaml.py +++ b/dotdrop/cfg_yaml.py @@ -669,13 +669,15 @@ class CfgYaml: err = 'bad format for chmod: {}'.format(val) self._log.err(err) raise YamlException('config content error: {}'.format(err)) + # normalize chmod value for x in list(val): y = int(x) - if y >= 0 or y <= 7: - continue - err = 'bad format for chmod: {}'.format(val) - self._log.err(err) - raise YamlException('config content error: {}'.format(err)) + if y < 0 or y > 7: + err = 'bad format for chmod: {}'.format(val) + self._log.err(err) + raise YamlException( + 'config content error: {}'.format(err) + ) v[self.key_dotfile_chmod] = int(val, 8) return new @@ -1028,7 +1030,6 @@ class CfgYaml: if not yamldict[self.key_dotfiles]: return for k, dotfile in yamldict[self.key_dotfiles].items(): - new = self.lnk_nolink if self.key_dotfile_link in dotfile and \ type(dotfile[self.key_dotfile_link]) is bool: # patch link: diff --git a/dotdrop/dotfile.py b/dotdrop/dotfile.py index 21a6557..6de3397 100644 --- a/dotdrop/dotfile.py +++ b/dotdrop/dotfile.py @@ -64,8 +64,8 @@ class Dotfile(DictParser): msg = '[{}] transformations disabled'.format(key) msg += ' because dotfile is linked' self.log.warn(msg) - trans_r = [] - trans_w = [] + self.trans_r = [] + self.trans_w = [] def get_dotfile_variables(self): """return this dotfile specific variables""" diff --git a/dotdrop/installer.py b/dotdrop/installer.py index e76b8c4..b2295b8 100644 --- a/dotdrop/installer.py +++ b/dotdrop/installer.py @@ -563,9 +563,6 @@ class Installer: err = 'broken symlink {}'.format(dst) return False, err - src_mode = chmod - if not src_mode: - src_mode = utils.get_file_perm(src) if self.diff: if not self._is_different(src, dst, content=content): if self.debug: diff --git a/scripts/change-link.py b/scripts/change-link.py index 542cf51..8e67e53 100755 --- a/scripts/change-link.py +++ b/scripts/change-link.py @@ -58,6 +58,4 @@ def main(): if __name__ == '__main__': - if main(): - sys.exit(0) - sys.exit(1) + main(): diff --git a/setup.py b/setup.py index 0a61822..112390e 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,6 @@ from setuptools import setup, find_packages from codecs import open from os import path -import dotdrop from dotdrop.version import __version__ as VERSION readme = 'README.md'