more improvements and bugfixes

Author: thomasWeise

bookbase

@@ -9,7 +9,8 @@
 \listingPythonAndOutput{tuples:tuples_2}{tuples_2.py}{%
 A second example of using tuples in \python:~tuples with elements of different types and tuple unpacking.}{}%
 %
-\gitPythonAndErrorOutput{\programmingWithPythonCodeRepo}{collections}{tuples_3.py}{--args format}{tuples:tuples_3}{%
+\gitLoadAndExecPythonAndErrors{tuples:tuples_3}{}{collections}{tuples_3.py}{}%
+\listingPythonAndError{tuples:tuples_3}{tuples_3.py}{%
 A third example of using tuples in \python:~testing the immutability property.}%
 %
 \gitExec{exec:tuples:tuples_3:mypy}{\programmingWithPythonCodeRepo}{.}{_scripts_/mypy.sh collections tuples_3.py}%

text/main/basics/collections/tuples/tuples.tex

@@ -1,8 +1,9 @@
 \hsection{Interlude: Finding Errors in your Code with the IDE}%
 \label{sec:errorsInIde}%
 %
-\gitPythonAndErrorOutput{\programmingWithPythonCodeRepo}{variables}{assignment_wrong.py}{--args format}{variables:assignment_wrong}{%
-A variant of \cref{lst:variables:assignment} with an error: \pythonil{int_var} is accidentally spelled as \pythonil{intvar} in one location.}%
+\gitLoadAndExecPythonAndErrors{variables:assignment_wrong}{}{variables}{assignment_wrong.py}{}%
+\listingPythonAndError{variables:assignment_wrong}{assignment_wrong.py}{%
+A variant of \cref{lst:variables:assignment} with an error:~\pythonil{int_var} is accidentally spelled as \pythonil{intvar} in one location.}%
 %
 \begin{figure}%
 \centering%

text/main/basics/variables/errorsInIde/errorsInIde.tex

@@ -114,7 +114,8 @@
 \listingPython{exceptions:sqrt_raise}{%
 A new variant of the \pythonil{sqrt} function from back in \cref{lst:functions:my_math_2} that raises an \pythonilIdx{ArithmeticError} if its input is non-finite or negative.}%
 %
-\gitPythonAndErrorOutput{\programmingWithPythonCodeRepo}{exceptions}{use_sqrt_raise.py}{--args format}{exceptions:use_sqrt_raise}{%
+\gitLoadAndExecPythonAndErrors{exceptions:use_sqrt_raise}{}{exceptions}{use_sqrt_raise.py}{}%
+\listingPythonAndError{exceptions:use_sqrt_raise}{use_sqrt_raise.py}{%
 Using the new variant of the \pythonil{sqrt} function from \cref{lst:exceptions:sqrt_raise} that raises an \pythonilIdx{ArithmeticError} if its input is non-finite or negative.}%
 %
 Let us now first look at an example of how we can signal an error condition in our code.
@@ -298,7 +299,8 @@
 The \pythonilIdx{except} block is not to be used to just catch any exception, to implement \gls{GIGO}, or to try to sanitize erroneous input.%
 }%
 %
-\gitPythonAndErrorOutput{\programmingWithPythonCodeRepo}{exceptions}{try_multi_except.py}{--args format}{exceptions:try_multi_except}{%
+\gitLoadAndExecPythonAndErrors{exceptions:try_multi_except}{}{exceptions}{try_multi_except.py}{}%
+\listingPythonAndError{exceptions:try_multi_except}{try_multi_except.py}{%
 The handling of multiple errors, namely \pythonilIdx{ZeroDivisionError} and \pythonilIdx{ArithmeticError}, as well as what happens if a variable remains unassigned due to an error (a \pythonilIdx{NameError} is raised).}%
 %
 In \cref{lst:exceptions:try_multi_except}, we revisit our new \pythonil{sqrt} function.
@@ -341,7 +343,8 @@
 %
 \hsection{Exceptions in Exception Handlers}%
 %
-\gitPythonAndErrorOutput{\programmingWithPythonCodeRepo}{exceptions}{try_except_nested_1.py}{--args format}{exceptions:try_except_nested_1}{%
+\gitLoadAndExecPythonAndErrors{exceptions:try_except_nested_1}{}{exceptions}{try_except_nested_1.py}{}%
+\listingPythonAndError{exceptions:try_except_nested_1}{try_except_nested_1.py}{%
 An example of \pythonils{Exception} being raised inside an \pythonilIdx{except} block.}%
 %
 What happens if an exception is raised \emph{inside} an \pythonilIdx{except} block?
@@ -445,7 +448,8 @@
 next statement  # Executed only if there are no uncaught Exceptions.
 \end{pythonSyntax}
 %
-\gitPythonAndErrorOutput{\programmingWithPythonCodeRepo}{exceptions}{try_except_else_finally.py}{--args format}{exceptions:try_except_else_finally}{%
+\gitLoadAndExecPythonAndErrors{exceptions:try_except_else_finally}{}{exceptions}{try_except_else_finally.py}{}%
+\listingPythonAndError{exceptions:try_except_else_finally}{try_except_else_finally.py}{%
 An example for the \pythonilIdx{try}-\pythonilIdx{except}-\pythonilIdx{else}-\pythonilIdx{finally} block.}%
 %
 \gitExec{exec:exceptions:try_except_else_finally:mypy}{\programmingWithPythonCodeRepo}{.}{_scripts_/mypy.sh exceptions try_except_else_finally.py}%

text/main/controlFlow/exceptions/exceptions.tex

@@ -498,7 +498,8 @@
 In our example program, we stop here.
 This means that the 999'999'996 elements are never created.
 
-\gitPythonAndErrorOutput{\programmingWithPythonCodeRepo}{iteration}{generator_expressions_next_2.py}{--args format}{iteration:generator_expressions_next_2}{%
+\gitLoadAndExecPythonAndErrors{iteration:generator_expressions_next_2}{}{iteration}{generator_expressions_next_2.py}{}%
+\listingPythonAndError{iteration:generator_expressions_next_2}{generator_expressions_next_2.py}{%
 An investigation of the lazy evaluation in generator expressions\pythonIdx{Generator} by using the \pythonilIdx{next} function.}%
 \afterpage{\clearpage}%
 %
@@ -646,7 +647,8 @@
 %
 \hsection{Generator Functions}%
 %
-\gitPythonAndErrorOutput{\programmingWithPythonCodeRepo}{iteration}{simple_generator_function_1.py}{--args format}{iteration:simple_generator_function_1}{%
+\gitLoadAndExecPythonAndErrors{iteration:simple_generator_function_1}{}{iteration}{simple_generator_function_1.py}{}%
+\listingPythonAndError{iteration:simple_generator_function_1}{simple_generator_function_1.py}{%
 A very simple generator function yielding the numbers~1, 2, and~3\pythonIdx{Generator}.}%
 %
 \gitLoadAndExecPython{iteration:simple_generator_function_2}{}{iteration}{simple_generator_function_2.py}{}%

text/main/controlFlow/iteration/iteration.tex

@@ -74,8 +74,13 @@
 After \aptGet\ completes, we can check the version of \pip\ via \bashil{pip --version}.
 Whether \venv\ is installed correctly can be checked via \bashil{python3 -m venv -h}.
 
-\gitBashAndOutput{\programmingWithPythonCodeRepo}{packages}{numpy_user_venv.sh}{packages:numpy_user_venv_sh}{%
-An example of using \pglspl{virtualEnvironment} and \pip\ under \ubuntu\ \linux\ to install \numpy\ and to run our program \cref{lst:packages:numpy_user}.}%
+\gitLoad{lst:packages:numpy_user_venv_sh}{\programmingWithPythonCodeRepo}{packages/numpy_user_venv.sh}{}%
+\gitExecBash{exec:packages:numpy_user_venv_sh}{\programmingWithPythonCodeRepo}{packages}{numpy_user_venv.sh}
+\listingDoubleBox{packages:numpy_user_venv_sh}{%
+An example of using \pglspl{virtualEnvironment} and \pip\ under \ubuntu\ \linux\ to install \numpy\ and to run our program \cref{lst:packages:numpy_user}.}{%
+\captionStdout{packages:numpy_user}{numpy_user_venv.sh}}{%
+,style=bash_style}{,style=text_style}{%
+\listingSepBash{numpy_user_venv.sh}}%
 %
 \begin{figure}%
 \centering%

text/main/ecosystem/packages/pipAndVenv/pipAndVenv.tex

@@ -6,8 +6,13 @@
 \listingTxt{packages:requirementstxt}{%
 A requirements file demanding that version~\textil{1.26.4} of \numpy\ be installed.}%
 %
-\gitBashAndOutput{\programmingWithPythonCodeRepo}{packages}{numpy_user_venv_req.sh}{packages:numpy_user_venv_req_sh}{%
-A script that runs our example program using a \pgls{virtualEnvironment} created by using the \textil{requirements.txt} file given in \cref{lst:packages:requirementstxt}.}%
+\gitLoad{lst:packages:numpy_user_venv_req_sh}{\programmingWithPythonCodeRepo}{packages/numpy_user_venv_req.sh}{}%
+\gitExecBash{exec:packages:numpy_user_venv_req_sh}{\programmingWithPythonCodeRepo}{packages}{numpy_user_venv_req.sh}
+\listingDoubleBox{packages:numpy_user_venv_req_sh}{%
+A script that runs our example program using a \pgls{virtualEnvironment} created by using the \textil{requirements.txt} file given in \cref{lst:packages:requirementstxt}.}{%
+\captionStdout{packages:numpy_user_venv_req_sh}{numpy_user_venv_req.sh}}{%
+,style=bash_style}{,style=text_style}{%
+\listingSepBash{numpy_user_venv_req.sh}}%
 %
 It is very normal that our projects require multiple different \pglspl{package}.
 Sometimes, they require specific versions of specific \pglspl{package}.