Use yapf for code formatting

Author: domdfcoding

domdf_python_tools/paths.py

@@ -76,7 +76,8 @@ def copytree(
 		src: Union[str, pathlib.Path, os.PathLike],
 		dst: Union[str, pathlib.Path, os.PathLike],
 		symlinks: bool = False,
-		ignore: Callable = None):
+		ignore: Callable = None,
+		):
 	"""
 	Alternative to :func:`shutil.copytree` to work in some situations where it doesn't.
 
@@ -135,7 +136,8 @@ def maybe_make(
 		directory: Union[str, pathlib.Path, os.PathLike],
 		mode=0o777,
 		parents: bool = False,
-		exist_ok: bool = False):
+		exist_ok: bool = False
+		):
 	"""
 	Create a directory at this given path, but only if the directory does not already exist.
 
@@ -201,7 +203,10 @@ def read(filename: Union[str, pathlib.Path, os.PathLike]) -> str:
 		return f.read()
 
 
-def relpath(path: Union[str, pathlib.Path, os.PathLike], relative_to: Union[str, pathlib.Path, os.PathLike] = None) -> pathlib.Path:
+def relpath(
+		path: Union[str, pathlib.Path, os.PathLike],
+		relative_to: Union[str, pathlib.Path, os.PathLike] = None
+		) -> pathlib.Path:
 	"""
 	Returns the path for the given file or directory relative to the given
 	directory or, if that would require path traversal, returns the absolute path.
@@ -250,4 +255,3 @@ def write(var: AnyStr, filename: Union[str, pathlib.Path, os.PathLike]):
 
 	with open(os.path.join(os.getcwd(), filename), 'w') as f:
 		f.write(var)
-

domdf_python_tools/utils.py

@@ -205,4 +205,3 @@ def str2tuple(input_string: str, sep: str = ",") -> Tuple[int]:
 	"""
 
 	return tuple(int(x) for x in input_string.split(sep))
-

tests/test_bases.py

@@ -114,4 +114,5 @@ def test_namedlist(capsys):
 	stdout = captured.out.split("\n")
 	assert stdout[0] == "<class 'domdf_python_tools.bases.namedlist.<locals>.NamedList'>"
 	assert stdout[1] == "['egg and bacon', 'egg sausage and bacon', 'egg and spam', 'egg bacon and spam']"
-	assert stdout[2] == "ShoppingList['egg and bacon', 'egg sausage and bacon', 'egg and spam', 'egg bacon and spam']"
+	assert stdout[2] == (
+			"ShoppingList['egg and bacon', 'egg sausage and bacon', 'egg and spam', 'egg bacon and spam']")

tests/test_paths.py

@@ -18,7 +18,6 @@
 # this package
 from domdf_python_tools import paths
 
-
 # TODO: Still need tests for copytree, relpath, relpath2, delete, write,
 #  read and append.
 #  Some of those might want deprecating in favour of pathlib
@@ -69,19 +68,23 @@ def test_parent_path():
 		assert str(paths.parent_path("spam/spam/spam")) == "spam/spam"
 
 
-@pytest.mark.parametrize("relto, relpath", [
-		("/home/username/Documents/games/chess.py", "/home/username/Documents/letter.doc"),
-		("/home/username/Documents", "letter.doc"),
-		(pathlib.Path("/home/username/Documents/games/chess.py"), "/home/username/Documents/letter.doc"),
-		(pathlib.Path("/home/username/Documents"), "letter.doc"),
-		])
+@pytest.mark.parametrize(
+		"relto, relpath",
+		[
+				("/home/username/Documents/games/chess.py", "/home/username/Documents/letter.doc"),
+				("/home/username/Documents", "letter.doc"),
+				(pathlib.Path("/home/username/Documents/games/chess.py"), "/home/username/Documents/letter.doc"),
+				(pathlib.Path("/home/username/Documents"), "letter.doc"),
+				]
+		)
 def test_relpath(relto, relpath):
 	path = "/home/username/Documents/letter.doc"
 	assert paths.relpath(path, relative_to=relto) == pathlib.Path(relpath)
 	assert isinstance(paths.relpath(path, relative_to=relto), pathlib.Path)
 
 
 class TestCurrentDirOperations:
+
 	def test_append(self):
 		file = pathlib.Path("paths_append_test_file.txt")
 		file.write_text("initial content\n")

tests/test_utils.py

@@ -21,16 +21,19 @@ def test_pyversion():
 	assert isinstance(pyversion, int)
 
 
-@pytest.mark.parametrize("value, expects", [
-		(12345, "12345"),
-		(123.45, "123.45"),
-		([123.45], "[123.45]"),
-		({123.45}, "{123.45}"),
-		((123.45, ), "(123.45,)"),
-		(None, ""),
-		(pathlib.Path("."), "."),
-		(decimal.Decimal("1234"), "1234"),
-		])
+@pytest.mark.parametrize(
+		"value, expects",
+		[
+				(12345, "12345"),
+				(123.45, "123.45"),
+				([123.45], "[123.45]"),
+				({123.45}, "{123.45}"),
+				((123.45, ), "(123.45,)"),
+				(None, ""),
+				(pathlib.Path("."), "."),
+				(decimal.Decimal("1234"), "1234"),
+				]
+		)
 def test_as_text(value, expects):
 	assert utils.as_text(value) == expects
 
@@ -69,15 +72,19 @@ def test_chunks():
 	assert list(chunks(list(range(100)), 5))[0] == [0, 1, 2, 3, 4]
 	assert list(chunks(["a", "b", "c"], 1)) == [["a"], ["b"], ["c"]]
 
+
 # TODO: cmp
 
 
-@pytest.mark.parametrize("value, expects", [
-		([1, 2, 3], "1,2,3"),
-		(["a", "b", "c"], "a,b,c"),
-		(["a", "b", 1, 2], "a,b,1,2"),
-		(["a", 2, pathlib.Path("foo.txt")], "a,2,foo.txt"),
-		])
+@pytest.mark.parametrize(
+		"value, expects",
+		[
+				([1, 2, 3], "1,2,3"),
+				(["a", "b", "c"], "a,b,c"),
+				(["a", "b", 1, 2], "a,b,1,2"),
+				(["a", 2, pathlib.Path("foo.txt")], "a,2,foo.txt"),
+				]
+		)
 def test_list2str(value, expects):
 	str_representation = list2str(value)
 	assert isinstance(str_representation, str)
@@ -88,12 +95,15 @@ def test_list2str(value, expects):
 	assert str_representation == expects
 
 
-@pytest.mark.parametrize("value, expects", [
-		([1, 2, 3], "1;2;3"),
-		(["a", "b", "c"], "a;b;c"),
-		(["a", "b", 1, 2], "a;b;1;2"),
-		(["a", 2, pathlib.Path("foo.txt")], "a;2;foo.txt"),
-		])
+@pytest.mark.parametrize(
+		"value, expects",
+		[
+				([1, 2, 3], "1;2;3"),
+				(["a", "b", "c"], "a;b;c"),
+				(["a", "b", 1, 2], "a;b;1;2"),
+				(["a", 2, pathlib.Path("foo.txt")], "a;2;foo.txt"),
+				]
+		)
 def test_list2str_semicolon(value, expects):
 	str_representation = list2str(value, sep=";")
 	assert isinstance(str_representation, str)
@@ -159,6 +169,7 @@ def test_permutations():
 
 
 class CustomRepr:
+
 	def __init__(self):
 		pass
 
@@ -167,6 +178,7 @@ def __repr__(self):
 
 
 class NoRepr:
+
 	def __init__(self):
 		pass
 
@@ -211,19 +223,25 @@ def test_split_len():
 	assert utils.split_len("Spam Spam Spam Spam Spam Spam Spam Spam ", 5) == ["Spam "] * 8
 
 
-@pytest.mark.parametrize("value, expects", [
-		("1,2,3", (1, 2, 3)),  # tests without spaces
-		("1, 2, 3", (1, 2, 3)),  # tests with spaces
-		])
+@pytest.mark.parametrize(
+		"value, expects",
+		[
+				("1,2,3", (1, 2, 3)),  # tests without spaces
+				("1, 2, 3", (1, 2, 3)),  # tests with spaces
+				]
+		)
 def test_str2tuple(value, expects):
 	assert isinstance(str2tuple(value), tuple)
 	assert str2tuple(value) == expects
 
 
-@pytest.mark.parametrize("value, expects", [
-		("1;2;3", (1, 2, 3)),  # tests without semicolon
-		("1; 2; 3", (1, 2, 3)),  # tests with semicolon
-		])
+@pytest.mark.parametrize(
+		"value, expects",
+		[
+				("1;2;3", (1, 2, 3)),  # tests without semicolon
+				("1; 2; 3", (1, 2, 3)),  # tests with semicolon
+				]
+		)
 def test_str2tuple_semicolon(value, expects):
 	assert isinstance(str2tuple(value, sep=";"), tuple)
 	assert str2tuple(value, sep=";") == expects