Use yapf-isort for reformat output files.

Author: domdfcoding

.isort.cfg

@@ -18,6 +18,7 @@ known_third_party =
     astroid
     coverage
     coverage_pyver_pragma
+    domdf_python_tools
     github
     nbconvert
     pylint
@@ -27,5 +28,6 @@ known_third_party =
     pytest_rerunfailures
     pytest_timeout
     requests
+    yapf_isort
 known_first_party = notebook2script
 remove_redundant_aliases = True

MANIFEST.in

@@ -2,5 +2,7 @@ include __pkginfo__.py
 include LICENSE
 include requirements.txt
 prune **/__pycache__
+include notebook2script/isort.cfg
+include notebook2script/style.yapf
 recursive-include notebook2script *.pyi
 include notebook2script/py.typed

notebook2script/__main__.py

@@ -84,7 +84,7 @@ def process_multiple_notebooks(
 	for notebook in notebooks:
 		all_notebooks += glob.glob(str(notebook))
 
-	print(all_notebooks)
+	# print(all_notebooks)
 	# input(">")
 
 	for notebook in all_notebooks:

notebook2script/ipynb2py.py

@@ -22,37 +22,66 @@
 #                                                                              #
 ################################################################################
 
-# stdlib
-import os
-import pathlib
-from typing import Union
-
 # 3rd party
+import isort
+import yapf_isort
+from domdf_python_tools.compat import importlib_resources
+from domdf_python_tools.paths import PathPlus
+from domdf_python_tools.typing import PathLike
 from nbconvert import PythonExporter  # type: ignore
 
+# this package
+import notebook2script
+
 __all__ = ["convert_notebook"]
 
 py_exporter = PythonExporter()
 
 
 def convert_notebook(
-		nb_file: Union[str, pathlib.Path],
-		outfile: Union[str, pathlib.Path, os.PathLike],
+		nb_file: PathLike,
+		outfile: PathLike,
 		):
 	"""
 	Convert a notebook to a python file.
 
-	:param nb_file: Filename of the Jupyter Notebook to convert
-	:param outfile: Filename to save the output script as
+	:param nb_file: Filename of the Jupyter Notebook to convert.
+	:param outfile: Filename to save the output script as.
 	"""
 
+	nb_file = PathPlus(nb_file)
+	outfile = PathPlus(outfile)
+	outfile.parent.maybe_make()
+
 	script, *_ = py_exporter.from_file(str(nb_file))
 
-	if not isinstance(outfile, pathlib.Path):
-		outfile = pathlib.Path(outfile)
+	outfile.write_clean(script)
+
+	with importlib_resources.path(notebook2script, "isort.cfg") as isort_config:
+		with importlib_resources.path(notebook2script, "style.yapf") as yapf_style:
+			reformat_file(outfile, yapf_style=str(yapf_style), isort_config_file=str(isort_config))
+
+
+def reformat_file(filename: PathLike, yapf_style: str, isort_config_file: str) -> int:
+	"""
+	Reformat the given file.
+
+	:param filename:
+	:param yapf_style: The name of the yapf style, or the path to the yapf style file.
+	:param isort_config_file: The filename of the isort configuration file.
+	"""
+
+	old_isort_settings = isort.settings.CONFIG_SECTIONS.copy()
+
+	try:
+		isort.settings.CONFIG_SECTIONS["isort.cfg"] = ("settings", "isort")
+
+		isort_config = isort.Config(settings_file=str(isort_config_file))
+		r = yapf_isort.Reformatter(filename, yapf_style, isort_config)
+		ret = r.run()
+		r.to_file()
 
-	if not outfile.parent.is_dir():
-		outfile.parent.mkdir(parents=True)
+		return ret
 
-	with outfile.open('w') as fp:
-		fp.write(script)
+	finally:
+		isort.settings.CONFIG_SECTIONS = old_isort_settings

notebook2script/isort.cfg

@@ -0,0 +1,10 @@
+[settings]
+line_length = 115
+force_to_top = True
+indent = "		"
+multi_line_output = 8
+balanced_wrapping = False
+lines_between_types = 0
+use_parentheses = True
+default_section = THIRDPARTY
+remove_redundant_aliases = True

notebook2script/pointless.py

@@ -207,7 +207,7 @@ def process_file(self, filename):
 				line = file_lines[lineno]
 				line_pre_statement = line[:col]
 				line_post_statement = line[col + len(value):]
-				print(f"{line_pre_statement}print({value}){line_post_statement}")
+				# print(f"{line_pre_statement}print({value}){line_post_statement}")
 				file_lines[lineno] = f"{line_pre_statement}print({value}){line_post_statement}"
 
 		if file_lines[-1]: