Commit Python 3.6+ style issues caught by pyupgrade
This commit is contained in:
parent
5e57380194
commit
5246ca29ae
|
@ -99,7 +99,7 @@ def main():
|
||||||
hash_msg = " (git %s)" % git_hash[:10]
|
hash_msg = " (git %s)" % git_hash[:10]
|
||||||
except (OSError, subprocess.CalledProcessError):
|
except (OSError, subprocess.CalledProcessError):
|
||||||
hash_msg = ""
|
hash_msg = ""
|
||||||
print("Dotbot version %s%s" % (dotbot.__version__, hash_msg))
|
print(f"Dotbot version {dotbot.__version__}{hash_msg}")
|
||||||
exit(0)
|
exit(0)
|
||||||
if options.super_quiet:
|
if options.super_quiet:
|
||||||
log.set_level(Level.WARNING)
|
log.set_level(Level.WARNING)
|
||||||
|
|
|
@ -16,7 +16,7 @@ class Messenger(metaclass=Singleton):
|
||||||
|
|
||||||
def log(self, level, message):
|
def log(self, level, message):
|
||||||
if level >= self._level:
|
if level >= self._level:
|
||||||
print("%s%s%s" % (self._color(level), message, self._reset()))
|
print(f"{self._color(level)}{message}{self._reset()}")
|
||||||
|
|
||||||
def debug(self, message):
|
def debug(self, message):
|
||||||
self.log(Level.DEBUG, message)
|
self.log(Level.DEBUG, message)
|
||||||
|
|
|
@ -57,10 +57,10 @@ class Clean(Plugin):
|
||||||
if sys.platform[:5] == "win32" and points_at.startswith("\\\\?\\"):
|
if sys.platform[:5] == "win32" and points_at.startswith("\\\\?\\"):
|
||||||
points_at = points_at[4:]
|
points_at = points_at[4:]
|
||||||
if self._in_directory(path, self._context.base_directory()) or force:
|
if self._in_directory(path, self._context.base_directory()) or force:
|
||||||
self._log.lowinfo("Removing invalid link %s -> %s" % (path, points_at))
|
self._log.lowinfo(f"Removing invalid link {path} -> {points_at}")
|
||||||
os.remove(path)
|
os.remove(path)
|
||||||
else:
|
else:
|
||||||
self._log.lowinfo("Link %s -> %s not removed." % (path, points_at))
|
self._log.lowinfo(f"Link {path} -> {points_at} not removed.")
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def _in_directory(self, path, directory):
|
def _in_directory(self, path, directory):
|
||||||
|
|
|
@ -45,7 +45,7 @@ class Create(Plugin):
|
||||||
def _create(self, path, mode):
|
def _create(self, path, mode):
|
||||||
success = True
|
success = True
|
||||||
if not self._exists(path):
|
if not self._exists(path):
|
||||||
self._log.debug("Trying to create path %s with mode %o" % (path, mode))
|
self._log.debug(f"Trying to create path {path} with mode {mode:o}")
|
||||||
try:
|
try:
|
||||||
self._log.lowinfo("Creating path %s" % path)
|
self._log.lowinfo("Creating path %s" % path)
|
||||||
os.makedirs(path, mode)
|
os.makedirs(path, mode)
|
||||||
|
|
|
@ -103,7 +103,7 @@ class Link(Plugin):
|
||||||
# want to remove the original (this is tested by
|
# want to remove the original (this is tested by
|
||||||
# link-force-leaves-when-nonexistent.bash)
|
# link-force-leaves-when-nonexistent.bash)
|
||||||
success = False
|
success = False
|
||||||
self._log.warning("Nonexistent source %s -> %s" % (destination, path))
|
self._log.warning(f"Nonexistent source {destination} -> {path}")
|
||||||
continue
|
continue
|
||||||
if force or relink:
|
if force or relink:
|
||||||
success &= self._delete(path, destination, relative, canonical_path, force)
|
success &= self._delete(path, destination, relative, canonical_path, force)
|
||||||
|
@ -254,9 +254,7 @@ class Link(Plugin):
|
||||||
and self._is_link(link_name)
|
and self._is_link(link_name)
|
||||||
and self._link_destination(link_name) != source
|
and self._link_destination(link_name) != source
|
||||||
):
|
):
|
||||||
self._log.warning(
|
self._log.warning(f"Invalid link {link_name} -> {self._link_destination(link_name)}")
|
||||||
"Invalid link %s -> %s" % (link_name, self._link_destination(link_name))
|
|
||||||
)
|
|
||||||
# we need to use absolute_source below because our cwd is the dotfiles
|
# we need to use absolute_source below because our cwd is the dotfiles
|
||||||
# directory, and if source is relative, it will be relative to the
|
# directory, and if source is relative, it will be relative to the
|
||||||
# destination directory
|
# destination directory
|
||||||
|
@ -264,23 +262,21 @@ class Link(Plugin):
|
||||||
try:
|
try:
|
||||||
os.symlink(source, destination)
|
os.symlink(source, destination)
|
||||||
except OSError:
|
except OSError:
|
||||||
self._log.warning("Linking failed %s -> %s" % (link_name, source))
|
self._log.warning(f"Linking failed {link_name} -> {source}")
|
||||||
else:
|
else:
|
||||||
self._log.lowinfo("Creating link %s -> %s" % (link_name, source))
|
self._log.lowinfo(f"Creating link {link_name} -> {source}")
|
||||||
success = True
|
success = True
|
||||||
elif self._exists(link_name) and not self._is_link(link_name):
|
elif self._exists(link_name) and not self._is_link(link_name):
|
||||||
self._log.warning("%s already exists but is a regular file or directory" % link_name)
|
self._log.warning("%s already exists but is a regular file or directory" % link_name)
|
||||||
elif self._is_link(link_name) and self._link_destination(link_name) != source:
|
elif self._is_link(link_name) and self._link_destination(link_name) != source:
|
||||||
self._log.warning(
|
self._log.warning(f"Incorrect link {link_name} -> {self._link_destination(link_name)}")
|
||||||
"Incorrect link %s -> %s" % (link_name, self._link_destination(link_name))
|
|
||||||
)
|
|
||||||
# again, we use absolute_source to check for existence
|
# again, we use absolute_source to check for existence
|
||||||
elif not self._exists(absolute_source):
|
elif not self._exists(absolute_source):
|
||||||
if self._is_link(link_name):
|
if self._is_link(link_name):
|
||||||
self._log.warning("Nonexistent source %s -> %s" % (link_name, source))
|
self._log.warning(f"Nonexistent source {link_name} -> {source}")
|
||||||
else:
|
else:
|
||||||
self._log.warning("Nonexistent source for %s : %s" % (link_name, source))
|
self._log.warning(f"Nonexistent source for {link_name} : {source}")
|
||||||
else:
|
else:
|
||||||
self._log.lowinfo("Link exists %s -> %s" % (link_name, source))
|
self._log.lowinfo(f"Link exists {link_name} -> {source}")
|
||||||
success = True
|
success = True
|
||||||
return success
|
return success
|
||||||
|
|
|
@ -46,7 +46,7 @@ class Shell(Plugin):
|
||||||
elif msg is None:
|
elif msg is None:
|
||||||
self._log.lowinfo(cmd)
|
self._log.lowinfo(cmd)
|
||||||
else:
|
else:
|
||||||
self._log.lowinfo("%s [%s]" % (msg, cmd))
|
self._log.lowinfo(f"{msg} [{cmd}]")
|
||||||
stdout = options.get("stdout", stdout)
|
stdout = options.get("stdout", stdout)
|
||||||
stderr = options.get("stderr", stderr)
|
stderr = options.get("stderr", stderr)
|
||||||
ret = shell_command(
|
ret = shell_command(
|
||||||
|
|
|
@ -4,7 +4,7 @@ import subprocess
|
||||||
|
|
||||||
|
|
||||||
def shell_command(command, cwd=None, enable_stdin=False, enable_stdout=False, enable_stderr=False):
|
def shell_command(command, cwd=None, enable_stdin=False, enable_stdout=False, enable_stderr=False):
|
||||||
with open(os.devnull, "w") as devnull_w, open(os.devnull, "r") as devnull_r:
|
with open(os.devnull, "w") as devnull_w, open(os.devnull) as devnull_r:
|
||||||
stdin = None if enable_stdin else devnull_r
|
stdin = None if enable_stdin else devnull_r
|
||||||
stdout = None if enable_stdout else devnull_w
|
stdout = None if enable_stdout else devnull_w
|
||||||
stderr = None if enable_stderr else devnull_w
|
stderr = None if enable_stderr else devnull_w
|
||||||
|
|
|
@ -3,5 +3,5 @@ class Singleton(type):
|
||||||
|
|
||||||
def __call__(cls, *args, **kwargs):
|
def __call__(cls, *args, **kwargs):
|
||||||
if cls not in cls._instances:
|
if cls not in cls._instances:
|
||||||
cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
|
cls._instances[cls] = super().__call__(*args, **kwargs)
|
||||||
return cls._instances[cls]
|
return cls._instances[cls]
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
def indent_lines(string, amount=2, delimiter="\n"):
|
def indent_lines(string, amount=2, delimiter="\n"):
|
||||||
whitespace = " " * amount
|
whitespace = " " * amount
|
||||||
sep = "%s%s" % (delimiter, whitespace)
|
sep = f"{delimiter}{whitespace}"
|
||||||
return "%s%s" % (whitespace, sep.join(string.split(delimiter)))
|
return f"{whitespace}{sep.join(string.split(delimiter))}"
|
||||||
|
|
|
@ -188,7 +188,7 @@ def root(standardize_tmp):
|
||||||
|
|
||||||
# These values must be passed to a separate function
|
# These values must be passed to a separate function
|
||||||
# to ensure the variable closures work correctly.
|
# to ensure the variable closures work correctly.
|
||||||
function_path = "{0}.{1}".format(module.__name__, function_name)
|
function_path = f"{module.__name__}.{function_name}"
|
||||||
function = getattr(module, function_name)
|
function = getattr(module, function_name)
|
||||||
wrapped = wrap_function(function, function_path, arg_index, kwarg_key, current_root)
|
wrapped = wrap_function(function, function_path, arg_index, kwarg_key, current_root)
|
||||||
patches.append(mock.patch(function_path, wrapped))
|
patches.append(mock.patch(function_path, wrapped))
|
||||||
|
|
|
@ -140,7 +140,7 @@ def test_plugin_loading_file(home, dotfiles, run_dotbot):
|
||||||
dotfiles.write_config([{"plugin_file": "~"}])
|
dotfiles.write_config([{"plugin_file": "~"}])
|
||||||
run_dotbot("--plugin", os.path.join(dotfiles.directory, "file.py"))
|
run_dotbot("--plugin", os.path.join(dotfiles.directory, "file.py"))
|
||||||
|
|
||||||
with open(os.path.join(home, "flag"), "r") as file:
|
with open(os.path.join(home, "flag")) as file:
|
||||||
assert file.read() == "file plugin loading works"
|
assert file.read() == "file plugin loading works"
|
||||||
|
|
||||||
|
|
||||||
|
@ -155,7 +155,7 @@ def test_plugin_loading_directory(home, dotfiles, run_dotbot):
|
||||||
dotfiles.write_config([{"plugin_directory": "~"}])
|
dotfiles.write_config([{"plugin_directory": "~"}])
|
||||||
run_dotbot("--plugin-dir", os.path.join(dotfiles.directory, "plugins"))
|
run_dotbot("--plugin-dir", os.path.join(dotfiles.directory, "plugins"))
|
||||||
|
|
||||||
with open(os.path.join(home, "flag"), "r") as file:
|
with open(os.path.join(home, "flag")) as file:
|
||||||
assert file.read() == "directory plugin loading works"
|
assert file.read() == "directory plugin loading works"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ def test_link_default_source(root, home, dst, include_force, dotfiles, run_dotbo
|
||||||
dotfiles.write_config(config)
|
dotfiles.write_config(config)
|
||||||
run_dotbot()
|
run_dotbot()
|
||||||
|
|
||||||
with open(os.path.abspath(os.path.expanduser(dst)), "r") as file:
|
with open(os.path.abspath(os.path.expanduser(dst))) as file:
|
||||||
assert file.read() == "apple"
|
assert file.read() == "apple"
|
||||||
|
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ def test_link_environment_user_expansion_target(home, dotfiles, run_dotbot):
|
||||||
dotfiles.write_config([{"link": {target: src}}])
|
dotfiles.write_config([{"link": {target: src}}])
|
||||||
run_dotbot()
|
run_dotbot()
|
||||||
|
|
||||||
with open(os.path.abspath(os.path.expanduser(target)), "r") as file:
|
with open(os.path.abspath(os.path.expanduser(target))) as file:
|
||||||
assert file.read() == "apple"
|
assert file.read() == "apple"
|
||||||
|
|
||||||
|
|
||||||
|
@ -75,7 +75,7 @@ def test_link_environment_variable_expansion_source(monkeypatch, root, home, dot
|
||||||
dotfiles.write_config([{"link": {target: src}}])
|
dotfiles.write_config([{"link": {target: src}}])
|
||||||
run_dotbot()
|
run_dotbot()
|
||||||
|
|
||||||
with open(os.path.abspath(os.path.expanduser(target)), "r") as file:
|
with open(os.path.abspath(os.path.expanduser(target))) as file:
|
||||||
assert file.read() == "grape"
|
assert file.read() == "grape"
|
||||||
|
|
||||||
|
|
||||||
|
@ -91,7 +91,7 @@ def test_link_environment_variable_expansion_source_extended(
|
||||||
dotfiles.write_config([{"link": {target: {"path": src, "relink": True}}}])
|
dotfiles.write_config([{"link": {target: {"path": src, "relink": True}}}])
|
||||||
run_dotbot()
|
run_dotbot()
|
||||||
|
|
||||||
with open(os.path.abspath(os.path.expanduser(target)), "r") as file:
|
with open(os.path.abspath(os.path.expanduser(target))) as file:
|
||||||
assert file.read() == "grape"
|
assert file.read() == "grape"
|
||||||
|
|
||||||
|
|
||||||
|
@ -122,9 +122,9 @@ def test_link_environment_variable_expansion_target(monkeypatch, root, home, dot
|
||||||
dotfiles.write_config(config)
|
dotfiles.write_config(config)
|
||||||
run_dotbot()
|
run_dotbot()
|
||||||
|
|
||||||
with open(os.path.join(home, ".config", "g"), "r") as file:
|
with open(os.path.join(home, ".config", "g")) as file:
|
||||||
assert file.read() == "apple"
|
assert file.read() == "apple"
|
||||||
with open(os.path.join(home, "$PEAR"), "r") as file:
|
with open(os.path.join(home, "$PEAR")) as file:
|
||||||
assert file.read() == "grape"
|
assert file.read() == "grape"
|
||||||
|
|
||||||
|
|
||||||
|
@ -136,7 +136,7 @@ def test_link_environment_variable_unset(monkeypatch, root, home, dotfiles, run_
|
||||||
dotfiles.write_config([{"link": {"~/f": "$ORANGE"}}])
|
dotfiles.write_config([{"link": {"~/f": "$ORANGE"}}])
|
||||||
run_dotbot()
|
run_dotbot()
|
||||||
|
|
||||||
with open(os.path.join(home, "f"), "r") as file:
|
with open(os.path.join(home, "f")) as file:
|
||||||
assert file.read() == "apple"
|
assert file.read() == "apple"
|
||||||
|
|
||||||
|
|
||||||
|
@ -759,7 +759,7 @@ def test_link_leaves_file(home, dotfiles, run_dotbot):
|
||||||
with pytest.raises(SystemExit):
|
with pytest.raises(SystemExit):
|
||||||
run_dotbot()
|
run_dotbot()
|
||||||
|
|
||||||
with open(os.path.join(home, ".f"), "r") as file:
|
with open(os.path.join(home, ".f")) as file:
|
||||||
assert file.read() == "grape"
|
assert file.read() == "grape"
|
||||||
|
|
||||||
|
|
||||||
|
@ -880,7 +880,7 @@ def test_link_relink_leaves_file(home, dotfiles, run_dotbot):
|
||||||
dotfiles.write_config([{"link": {"~/.f": {"path": "f", "relink": True}}}])
|
dotfiles.write_config([{"link": {"~/.f": {"path": "f", "relink": True}}}])
|
||||||
with pytest.raises(SystemExit):
|
with pytest.raises(SystemExit):
|
||||||
run_dotbot()
|
run_dotbot()
|
||||||
with open(os.path.join(home, ".f"), "r") as file:
|
with open(os.path.join(home, ".f")) as file:
|
||||||
assert file.read() == "grape"
|
assert file.read() == "grape"
|
||||||
|
|
||||||
|
|
||||||
|
@ -893,7 +893,7 @@ def test_link_relink_overwrite_symlink(home, dotfiles, run_dotbot):
|
||||||
os.symlink(os.path.join(home, "f"), os.path.join(home, ".f"))
|
os.symlink(os.path.join(home, "f"), os.path.join(home, ".f"))
|
||||||
dotfiles.write_config([{"link": {"~/.f": {"path": "f", "relink": True}}}])
|
dotfiles.write_config([{"link": {"~/.f": {"path": "f", "relink": True}}}])
|
||||||
run_dotbot()
|
run_dotbot()
|
||||||
with open(os.path.join(home, ".f"), "r") as file:
|
with open(os.path.join(home, ".f")) as file:
|
||||||
assert file.read() == "apple"
|
assert file.read() == "apple"
|
||||||
|
|
||||||
|
|
||||||
|
@ -944,7 +944,7 @@ def test_link_defaults_1(home, dotfiles, run_dotbot):
|
||||||
with pytest.raises(SystemExit):
|
with pytest.raises(SystemExit):
|
||||||
run_dotbot()
|
run_dotbot()
|
||||||
|
|
||||||
with open(os.path.join(home, ".f"), "r") as file:
|
with open(os.path.join(home, ".f")) as file:
|
||||||
assert file.read() == "grape"
|
assert file.read() == "grape"
|
||||||
|
|
||||||
|
|
||||||
|
@ -963,5 +963,5 @@ def test_link_defaults_2(home, dotfiles, run_dotbot):
|
||||||
)
|
)
|
||||||
run_dotbot()
|
run_dotbot()
|
||||||
|
|
||||||
with open(os.path.join(home, ".f"), "r") as file:
|
with open(os.path.join(home, ".f")) as file:
|
||||||
assert file.read() == "apple"
|
assert file.read() == "apple"
|
||||||
|
|
|
@ -5,9 +5,9 @@ import pytest
|
||||||
|
|
||||||
def test_success(root):
|
def test_success(root):
|
||||||
path = os.path.join(root, "abc.txt")
|
path = os.path.join(root, "abc.txt")
|
||||||
with open(path, "wt") as f:
|
with open(path, "w") as f:
|
||||||
f.write("hello")
|
f.write("hello")
|
||||||
with open(path, "rt") as f:
|
with open(path) as f:
|
||||||
assert f.read() == "hello"
|
assert f.read() == "hello"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -45,5 +45,5 @@ def test_shim(root, home, dotfiles, run_dotbot):
|
||||||
subprocess.check_call(args, env=env, cwd=dotfiles.directory)
|
subprocess.check_call(args, env=env, cwd=dotfiles.directory)
|
||||||
|
|
||||||
assert os.path.islink(os.path.join(home, ".foo"))
|
assert os.path.islink(os.path.join(home, ".foo"))
|
||||||
with open(os.path.join(home, ".foo"), "r") as file:
|
with open(os.path.join(home, ".foo")) as file:
|
||||||
assert file.read() == "pear"
|
assert file.read() == "pear"
|
||||||
|
|
Loading…
Reference in New Issue