From 409c973dc4fca2576c4860343a2d8a54fb640bec Mon Sep 17 00:00:00 2001 From: Hardirc Date: Sun, 10 Apr 2016 09:36:06 -0400 Subject: [PATCH] Enhance markmin2pdf.py PEP8 --- gluon/contrib/markmin/markmin2pdf.py | 55 ++++++++++++++-------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/gluon/contrib/markmin/markmin2pdf.py b/gluon/contrib/markmin/markmin2pdf.py index 9774ee64..ec71ae5d 100644 --- a/gluon/contrib/markmin/markmin2pdf.py +++ b/gluon/contrib/markmin/markmin2pdf.py @@ -13,21 +13,22 @@ from markmin2latex import markmin2latex __all__ = ['markmin2pdf'] -def removeall(path): - ERROR_STR= """Error removing %(path)s, %(error)s """ +def removeall(path): + ERROR_STR = """Error removing %(path)s, %(error)s """ + def rmgeneric(path, __func__): try: __func__(path) except OSError, (errno, strerror): - print ERROR_STR % {'path' : path, 'error': strerror } + print ERROR_STR % {'path': path, 'error': strerror} - files=[path] + files = [path] while files: - file=files[0] + file = files[0] if os.path.isfile(file): - f=os.remove + f = os.remove rmgeneric(file, os.remove) del files[0] elif os.path.isdir(file): @@ -36,7 +37,7 @@ def removeall(path): rmgeneric(file, os.rmdir) del files[0] else: - files = [os.path.join(file,x) for x in nested] + files + files = [os.path.join(file, x) for x in nested] + files def latex2pdf(latex, pdflatex='pdflatex', passes=3): @@ -49,13 +50,13 @@ def latex2pdf(latex, pdflatex='pdflatex', passes=3): - passes: defines how often pdflates should be run in the texfile. """ - pdflatex=pdflatex - passes=passes - warnings=[] + pdflatex = pdflatex + passes = passes + warnings = [] # setup the envoriment tmpdir = mkdtemp() - texfile = open(tmpdir+'/test.tex','wb') + texfile = open(tmpdir + '/test.tex', 'wb') texfile.write(latex) texfile.seek(0) texfile.close() @@ -63,8 +64,8 @@ def latex2pdf(latex, pdflatex='pdflatex', passes=3): # start doing some work for i in range(0, passes): - logfd,logname = mkstemp() - outfile=os.fdopen(logfd) + logfd, logname = mkstemp() + outfile = os.fdopen(logfd) try: ret = subprocess.call([pdflatex, '-interaction=nonstopmode', @@ -75,18 +76,18 @@ def latex2pdf(latex, pdflatex='pdflatex', passes=3): stderr=subprocess.PIPE) finally: outfile.close() - re_errors=re.compile('^\!(.*)$',re.M) - re_warnings=re.compile('^LaTeX Warning\:(.*)$',re.M) + re_errors = re.compile('^\!(.*)$', re.M) + re_warnings = re.compile('^LaTeX Warning\:(.*)$', re.M) flog = open(logname) try: loglines = flog.read() finally: flog.close() - errors=re_errors.findall(loglines) - warnings=re_warnings.findall(loglines) + errors = re_errors.findall(loglines) + warnings = re_warnings.findall(loglines) os.unlink(logname) - pdffile=texfile.rsplit('.',1)[0]+'.pdf' + pdffile = texfile.rsplit('.', 1)[0] + '.pdf' if os.path.isfile(pdffile): fpdf = open(pdffile, 'rb') try: @@ -100,31 +101,31 @@ def latex2pdf(latex, pdflatex='pdflatex', passes=3): def markmin2pdf(text, image_mapper=lambda x: None, extra={}): - return latex2pdf(markmin2latex(text,image_mapper=image_mapper, extra=extra)) + return latex2pdf(markmin2latex(text, image_mapper=image_mapper, extra=extra)) if __name__ == '__main__': import sys import doctest import markmin2html - if sys.argv[1:2]==['-h']: + + if sys.argv[1:2] == ['-h']: data, warnings, errors = markmin2pdf(markmin2html.__doc__) if errors: - print 'ERRORS:'+'\n'.join(errors) - print 'WARNGINS:'+'\n'.join(warnings) + print 'ERRORS:' + '\n'.join(errors) + print 'WARNGINS:' + '\n'.join(warnings) else: print data - elif len(sys.argv)>1: - fargv = open(sys.argv[1],'rb') + elif len(sys.argv) > 1: + fargv = open(sys.argv[1], 'rb') try: data, warnings, errors = markmin2pdf(fargv.read()) finally: fargv.close() if errors: - print 'ERRORS:'+'\n'.join(errors) - print 'WARNGINS:'+'\n'.join(warnings) + print 'ERRORS:' + '\n'.join(errors) + print 'WARNGINS:' + '\n'.join(warnings) else: print data else: doctest.testmod() -