From 4db2fc4b902779ff2cdb76cfd86060e69b69f785 Mon Sep 17 00:00:00 2001 From: Shivam Mukherjee Date: Fri, 14 Aug 2020 00:08:56 +0530 Subject: [PATCH 1/3] Trivially pgrade to Python 3 --- src/parseBook.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/parseBook.py b/src/parseBook.py index e09df8d..330ae79 100644 --- a/src/parseBook.py +++ b/src/parseBook.py @@ -1,5 +1,3 @@ -#! /usr/bin/python2.7 - import os import os.path import re @@ -46,7 +44,7 @@ def injectShaderBlocks(_folder, _text): shaderCommand = "glslViewer " + shaderPath + " " + \ " ".join(shaderTexturePaths) + \ " -s 0.5 --headless -o " + shaderImage - print shaderCommand + print(shaderCommand if not args.skip_image_generation: returnCode = subprocess.call(shaderCommand, shell=True) rta += "![](" + shaderImage + ")\n" @@ -55,7 +53,7 @@ def injectShaderBlocks(_folder, _text): gifName, gifExt = os.path.splitext(gifPath) pngImage = gifName + ".png" convertCommand = "convert " + gifPath + " " + pngImage - print convertCommand + print(convertCommand if not args.skip_image_generation: returnCode = subprocess.call(convertCommand, shell=True) rta += re.sub(r'\!\[(.*)\]\((.*)\.gif\)', @@ -105,16 +103,16 @@ for outputFormat in args.format: pandocCommand = ["pandoc"] + inputOptions + outputOptions \ + generalOptions + latexOptions - # Print out of the chapters being built and the flags being used - print "Generating {0} from:".format(bookPath) + # print(out of the chapters being built and the flags being used + print("Generating {0} from:".format(bookPath) for chapter in inputOptions: - print "\t{0}".format(chapter) - print "Using the following flags:" + print("\t{0}".format(chapter)) + print("Using the following flags:") for flag in outputOptions + generalOptions + latexOptions: - print "\t{0}".format(flag) + print("\t{0}".format(flag)) returnCode = subprocess.call(pandocCommand) if returnCode == 0: - print "Successful building of {0}".format(bookPath) + print("Successful building of {0}".format(bookPath)) else: - print "Error in building of {0}".format(bookPath) + print("Error in building of {0}".format(bookPath)) From 204c0e2051e6062c949fef2414de91afad9863b8 Mon Sep 17 00:00:00 2001 From: Shivam Mukherjee Date: Fri, 14 Aug 2020 00:10:13 +0530 Subject: [PATCH 2/3] Trivially upgrade to Python 3 --- src/makeThumbs.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/makeThumbs.py b/src/makeThumbs.py index e7dcab5..d70370c 100644 --- a/src/makeThumbs.py +++ b/src/makeThumbs.py @@ -1,5 +1,3 @@ -#! /usr/bin/python2.7 - import glob import os import re From 301a5436a78f9d022392528070f19cb55de4590f Mon Sep 17 00:00:00 2001 From: Shivam Mukherjee Date: Sun, 30 Aug 2020 15:00:09 +0530 Subject: [PATCH 3/3] Append missing right parentheses --- src/parseBook.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parseBook.py b/src/parseBook.py index 330ae79..9189913 100644 --- a/src/parseBook.py +++ b/src/parseBook.py @@ -44,7 +44,7 @@ def injectShaderBlocks(_folder, _text): shaderCommand = "glslViewer " + shaderPath + " " + \ " ".join(shaderTexturePaths) + \ " -s 0.5 --headless -o " + shaderImage - print(shaderCommand + print(shaderCommand) if not args.skip_image_generation: returnCode = subprocess.call(shaderCommand, shell=True) rta += "![](" + shaderImage + ")\n" @@ -53,7 +53,7 @@ def injectShaderBlocks(_folder, _text): gifName, gifExt = os.path.splitext(gifPath) pngImage = gifName + ".png" convertCommand = "convert " + gifPath + " " + pngImage - print(convertCommand + print(convertCommand) if not args.skip_image_generation: returnCode = subprocess.call(convertCommand, shell=True) rta += re.sub(r'\!\[(.*)\]\((.*)\.gif\)',