Cleanup

Author: domdfcoding

domdf_python_tools/pagesizes/units.py

@@ -164,8 +164,8 @@ class Unit(float):
 	_in_pt: float = 1
 
 	def __repr__(self):
-		value = _rounders(float(self), '0.000')
-		as_pt = _rounders(self.as_pt(), '0.000')
+		value = _rounders(float(self), "0.000")
+		as_pt = _rounders(self.as_pt(), "0.000")
 		return f"<Unit '{value}\u205F{self.name}': {as_pt}pt>"
 
 	def __mul__(self, other: Union[float, "Unit"]) -> "Unit":

domdf_python_tools/pagesizes/utils.py

@@ -126,17 +126,17 @@ def to_length(s):
 	"""
 
 	try:
-		if s[-2:] == 'cm':
+		if s[-2:] == "cm":
 			return float(s[:-2]) * cm
-		if s[-2:] == 'in':
+		if s[-2:] == "in":
 			return float(s[:-2]) * inch
-		if s[-2:] == 'pt':
+		if s[-2:] == "pt":
 			return float(s[:-2])
 		if s[-1:] == 'i':
 			return float(s[:-1]) * inch
-		if s[-2:] == 'mm':
+		if s[-2:] == "mm":
 			return float(s[:-2]) * mm
-		if s[-4:] == 'pica':
+		if s[-4:] == "pica":
 			return float(s[:-4]) * pica
 		return float(s)
 	except:

domdf_python_tools/paths.py

@@ -127,12 +127,7 @@ def delete(filename: PathLike):
 	os.remove(os.path.join(os.getcwd(), filename))
 
 
-def maybe_make(
-		directory: PathLike,
-		mode=0o777,
-		parents: bool = False,
-		exist_ok: bool = False
-		):
+def maybe_make(directory: PathLike, mode=0o777, parents: bool = False, exist_ok: bool = False):
 	"""
 	Create a directory at this given path, but only if the directory does not already exist.
 
@@ -194,10 +189,7 @@ def read(filename: PathLike) -> str:
 		return f.read()
 
 
-def relpath(
-		path: PathLike,
-		relative_to: Optional[PathLike] = None
-		) -> pathlib.Path:
+def relpath(path: PathLike, relative_to: Optional[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.
@@ -256,10 +248,10 @@ def clean_writer(string: str, fp: IO) -> None:
 
 	buffer = []
 
-	for line in string.split("\n"):
+	for line in string.split('\n'):
 		buffer.append(line.rstrip())
 
-	while buffer[-1:] == [""]:
+	while buffer[-1:] == ['']:
 		buffer = buffer[:-1]
 
 	for line in buffer:

domdf_python_tools/terminal.py

@@ -60,6 +60,7 @@
 #
 
 # stdlib
+import fcntl
 import inspect
 import os
 import platform
@@ -68,6 +69,7 @@
 import struct
 import subprocess
 import sys
+import termios
 import textwrap
 from typing import Optional, Tuple
 
@@ -80,7 +82,7 @@ def clear() -> None:
 	"""
 
 	if os.name == "nt":
-		os.system('cls')
+		os.system("cls")
 	else:
 		print("\033c", end='')
 
@@ -90,7 +92,7 @@ def br() -> None:
 	Prints a line break
 	"""
 
-	print("")
+	print('')
 
 
 def interrupt() -> None:
@@ -148,13 +150,13 @@ def get_terminal_size() -> Tuple[int, int]:
 	current_os = platform.system()
 	tuple_xy = None
 
-	if current_os == 'Windows':
+	if current_os == "Windows":
 		tuple_xy = _get_terminal_size_windows()
 		if tuple_xy is None:
 			tuple_xy = _get_terminal_size_tput()
 		# needed for window's python in cygwin's xterm!
 
-	if current_os in ['Linux', 'Darwin'] or current_os.startswith('CYGWIN'):
+	if current_os in {"Linux", "Darwin"} or current_os.startswith("CYGWIN"):
 		tuple_xy = _get_terminal_size_linux()
 
 	if tuple_xy is None:
@@ -194,8 +196,8 @@ def _get_terminal_size_tput() -> Optional[Tuple[int, int]]:
 	# get terminal width
 	# src: http://stackoverflow.com/questions/263890/how-do-i-find-the-width-height-of-a-terminal-window
 	try:
-		cols = int(subprocess.check_call(shlex.split('tput cols')))
-		rows = int(subprocess.check_call(shlex.split('tput lines')))
+		cols = int(subprocess.check_call(shlex.split("tput cols")))
+		rows = int(subprocess.check_call(shlex.split("tput lines")))
 		return cols, rows
 	except:
 		return None
@@ -205,11 +207,7 @@ def _get_terminal_size_linux() -> Optional[Tuple[int, int]]:
 
 	def ioctl_GWINSZ(fd):
 		try:
-
-			# stdlib
-			import fcntl
-			import termios
-			cr = struct.unpack('hh', fcntl.ioctl(fd, termios.TIOCGWINSZ, '1234'))
+			cr = struct.unpack("hh", fcntl.ioctl(fd, termios.TIOCGWINSZ, "1234"))
 			return cr
 		except:
 			pass
@@ -218,15 +216,15 @@ def ioctl_GWINSZ(fd):
 
 	if not cr:
 		try:
-			fd = os.open(os.ctermid(), os.O_RDONLY)   # type: ignore
+			fd = os.open(os.ctermid(), os.O_RDONLY)  # type: ignore
 			cr = ioctl_GWINSZ(fd)
 			os.close(fd)
 		except:
 			pass
 
 	if not cr:
 		try:
-			cr = (os.environ['LINES'], os.environ['COLUMNS'])
+			cr = (os.environ["LINES"], os.environ["COLUMNS"])
 		except:
 			return None
 
@@ -238,7 +236,7 @@ class Echo:
 	Context manager for echoing variable assignments (in CPython)
 	"""
 
-	def __init__(self, msg: str, indent: str = '  '):
+	def __init__(self, msg: str, indent: str = "  "):
 		self.msg = msg
 		self.indent = indent
 
@@ -259,4 +257,4 @@ def __exit__(self, exc_t, exc_v, tb):
 
 if __name__ == "__main__":
 	size_x, size_y = get_terminal_size()
-	print('width =', size_x, 'height =', size_y)
+	print("width =", size_x, "height =", size_y)

domdf_python_tools/utils.py

@@ -43,7 +43,7 @@ def as_text(value: Any) -> str:
 	"""
 
 	if value is None:
-		return ""
+		return ''
 
 	return str(value)
 
@@ -77,7 +77,7 @@ def check_dependencies(dependencies: Iterable[str], prt: bool = True) -> List[st
 			print("The following modules are missing.")
 			print(missing_modules)
 			print("Please check the documentation.")
-		print("")
+		print('')
 
 	return missing_modules
 
@@ -110,7 +110,7 @@ def cmp(x, y) -> int:
 	return int((x > y) - (x < y))
 
 
-def list2str(the_list: Iterable[Any], sep: str = ",") -> str:
+def list2str(the_list: Iterable[Any], sep: str = ',') -> str:
 	"""
 	Convert an iterable, such as a list, to a comma separated string.
 
@@ -203,7 +203,7 @@ def split_len(string: str, n: int) -> List[str]:
 splitLen = split_len
 
 
-def str2tuple(input_string: str, sep: str = ",") -> Tuple[int, ...]:
+def str2tuple(input_string: str, sep: str = ',') -> Tuple[int, ...]:
 	"""
 	Convert a comma-separated string of integers into a tuple.
 
@@ -239,9 +239,9 @@ def strtobool(val: Union[str, bool]) -> bool:
 		return bool(val)
 
 	val = val.lower()
-	if val in ('y', 'yes', 't', 'true', 'on', '1'):
+	if val in ('y', "yes", 't', "true", "on", '1'):
 		return True
-	elif val in ('n', 'no', 'f', 'false', 'off', '0'):
+	elif val in ('n', "no", 'f', "false", "off", '0'):
 		return False
 	else:
 		raise ValueError(f"invalid truth value {val!r}")
@@ -251,7 +251,7 @@ def enquote_value(value: Any) -> Union[str, bool, float]:
 	"""
 	Adds quotes to the given value, suitable for use in a templating system such as Jinja2.
 
-	floats, integerss, booleans, None, and the strings "True", "False" and "None" are returned as-is.
+	floats, integers, booleans, None, and the strings "True", "False" and "None" are returned as-is.
 
 	:param value: The value to enquote
 	"""

tests/test_bases.py

@@ -51,7 +51,7 @@ def __dict__(self):
 		return class_dict
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def alice():
 	return Person("Alice", 20, "IRC Lurker")
 

tests/test_dates.py

@@ -89,10 +89,10 @@ def test_set_timezone():
 		if tz in {
 				"America/Punta_Arenas",
 				"America/Santiago",
-				'Antarctica/Palmer',
-				'Chile/Continental',
-				'Chile/EasterIsland',
-				'Pacific/Easter',
+				"Antarctica/Palmer",
+				"Chile/Continental",
+				"Chile/EasterIsland",
+				"Pacific/Easter",
 				}:
 			continue
 
@@ -144,7 +144,7 @@ def test_parse_month():
 
 		assert dates.parse_month(month_idx) == month
 
-	for value in ["abc", 0, "0", -1, "-1", 13, "13"]:
+	for value in ["abc", 0, '0', -1, "-1", 13, "13"]:
 		with pytest.raises(ValueError):
 			dates.parse_month(value)
 
@@ -164,7 +164,7 @@ def test_get_month_number():
 	for month_idx in range(1, 13):
 		assert dates.get_month_number(month_idx) == month_idx
 
-	for value in ["abc", 0, "0", -1, "-1", 13, "13"]:
+	for value in ["abc", 0, '0', -1, "-1", 13, "13"]:
 		with pytest.raises(ValueError):
 			dates.get_month_number(value)
 

tests/test_doctools.py

@@ -166,13 +166,13 @@ def function_in_class_with_same_args(self, a, b, c, d):
 
 def test_deindent_string():
 	assert doctools.deindent_string("\t\t\t   ") == ''
-	assert doctools.deindent_string("\t\t\t   Spam") == 'Spam'
-	assert doctools.deindent_string("\t\t\t   Spam   \t\t\t") == 'Spam   \t\t\t'
-	assert doctools.deindent_string("\t\t\t   Spam\n   \t\t\t") == 'Spam\n'
+	assert doctools.deindent_string("\t\t\t   Spam") == "Spam"
+	assert doctools.deindent_string("\t\t\t   Spam   \t\t\t") == "Spam   \t\t\t"
+	assert doctools.deindent_string("\t\t\t   Spam\n   \t\t\t") == "Spam\n"
 	assert doctools.deindent_string("   \t\t\t") == ''
-	assert doctools.deindent_string("   \t\t\tSpam") == 'Spam'
-	assert doctools.deindent_string("   \t\t\tSpam\t\t\t   ") == 'Spam\t\t\t   '
-	assert doctools.deindent_string("   \t\t\tSpam\n\t\t\t   ") == 'Spam\n'
+	assert doctools.deindent_string("   \t\t\tSpam") == "Spam"
+	assert doctools.deindent_string("   \t\t\tSpam\t\t\t   ") == "Spam\t\t\t   "
+	assert doctools.deindent_string("   \t\t\tSpam\n\t\t\t   ") == "Spam\n"
 
 
 def test_decorators():

tests/test_paths.py

@@ -45,12 +45,13 @@ def test_maybe_make():
 		# Delete the directory and replace with a file
 		test_dir.rmdir()
 		assert test_dir.exists() is False
-		test_dir.write_text("")
+		test_dir.write_text('')
 		assert test_dir.exists()
 		assert test_dir.is_file()
 
 		paths.maybe_make(test_dir)
-		assert test_dir.exists() and test_dir.is_file()
+		assert test_dir.exists()
+		assert test_dir.is_file()
 
 
 def test_parent_path():
@@ -67,7 +68,7 @@ def test_parent_path():
 		assert str(paths.parent_path("spam/spam/spam")) == os.path.join("spam", "spam")
 
 
-@pytest.mark.skipif(sys.platform == 'win32', reason="Needs special-casing for Windows")
+@pytest.mark.skipif(sys.platform == "win32", reason="Needs special-casing for Windows")
 @pytest.mark.parametrize(
 		"relto, relpath",
 		[