Merge pull request #1284 from BuhtigithuB/more-markmin-pep8

More markmin pep8

gluon/contrib/markmin/markmin2latex.py

@@ -39,16 +39,20 @@ regex_link = re.compile('\[\[(?P<t>[^\]]*?) +(?P<k>\S+)\]\]')
 regex_auto = re.compile('(?<!["\w])(?P<k>\w+://[\w\.\-\?&%\:]+)', re.M)
 regex_commas = re.compile('[ ]+(?P<t>[,;\.])')
 regex_noindent = re.compile('\n\n(?P<t>[a-z])')
+
+
 # regex_quote_left = re.compile('"(?=\w)')
 # regex_quote_right = re.compile('(?=\w\.)"')
 
 def latex_escape(text, pound=True):
     text = text.replace('\\', '{\\textbackslash}')
-    for c in '^_&$%{}': text=text.replace(c,'\\'+c)
+    for c in '^_&$%{}':
+        text = text.replace(c, '\\' + c)
     text = text.replace('\\{\\textbackslash\\}', '{\\textbackslash}')
     if pound: text = text.replace('#', '\\#')
     return text
 
+
 def render(text,
            extra={},
            allowed={},
@@ -65,26 +69,29 @@ def render(text,
     text = regex_newlines.sub('\n', text)
     while True:
         item = regex_code.search(text, i)
-        if not item: break
+        if not item:
+            break
         if item.group() == META:
             segments.append((None, None))
             text = text[:item.start()] + META + text[item.end():]
         else:
             c = item.group('c') or ''
-            if 'code' in allowed and not c in allowed['code']: c = ''
+            if 'code' in allowed and c not in allowed['code']:
+                c = ''
             code = item.group('t').replace('!`!', '`')
             segments.append((code, c))
             text = text[:item.start()] + META + text[item.end():]
         i = item.start() + 3
 
-
     #############################################################
     # do h1,h2,h3,h4,h5,h6,b,i,ol,ul and normalize spaces
     #############################################################
 
     title = regex_title.search(text)
-    if not title: title='Title'
+    if not title:
-    else: title=title.group('t')
+        title = 'Title'
+    else:
+        title = title.group('t')
 
     text = latex_escape(text, pound=False)
 
@@ -106,9 +113,11 @@ def render(text,
     #############################################################
     while True:
         item = regex_table.search(text)
-        if not item: break
+        if not item:
+            break
         c = item.group('c') or ''
-        if 'table' in allowed and not c in allowed['table']: c = ''
+        if 'table' in allowed and c not in allowed['table']:
+            c = ''
         content = item.group('t')
         if ' | ' in content:
             rows = content.replace('\n', '\\\\\n').replace(' | ', ' & ')
@@ -116,7 +125,8 @@ def render(text,
             cols = row0.count(' & ') + 1
             cal = '{' + ''.join('l' for j in range(cols)) + '}'
             tabular = '\\begin{center}\n{\\begin{tabular}' + cal + '\\hline\n' + row0 + '\\\\ \\hline\n' + row2 + ' \\\\ \\hline\n\\end{tabular}}\n\\end{center}'
-            if row2.count('\n')>20: tabular='\\newpage\n'+tabular
+            if row2.count('\n') > 20:
+                tabular = '\\newpage\n' + tabular
             text = text[:item.start()] + tabular + text[item.end():]
         else:
             text = text[:item.start()] + '\\begin{quote}' + content + '\\end{quote}' + text[item.end():]
@@ -127,8 +137,10 @@ def render(text,
 
     def sub(x):
         f = image_mapper(x.group('k'))
-        if not f: return None
+        if not f:
-        return '\n\\begin{center}\\includegraphics[width=8cm]{%s}\\end{center}\n' % (f)
+            return None
+        return '\n\\begin{center}\\includegraphics[width=8cm]{%s}\\end{center}\n' % f
+
     text = regex_image_width.sub(sub, text)
     text = regex_image.sub(sub, text)
 
@@ -140,7 +152,8 @@ def render(text,
     regex = re.compile('\\\\_\w*\.(eps|png|jpg|gif)')
     while True:
         match = regex.search(text)
-        if not match: break
+        if not match:
+            break
         text = text[:match.start()] + text[match.start() + 1:]
     # text = regex_quote_left.sub('``',text)
     # text = regex_quote_right.sub("''",text)
@@ -157,7 +170,7 @@ def render(text,
     text = parts[0]
     authors = []
     for i, (code, b) in enumerate(segments):
-        if code==None:
+        if code is None:
             html = META
         else:
             if b == 'hidden':
@@ -185,19 +198,25 @@ def render(text,
                 key = b[6:]
                 html = '\\begin{%s}%s\\end{%s}' % (key, code, key)
             elif b in extra:
-                if code[:1]=='\n': code=code[1:]
+                if code[:1] == '\n':
-                if code[-1:]=='\n': code=code[:-1]
+                    code = code[1:]
+                if code[-1:] == '\n':
+                    code = code[:-1]
                 html = extra[b](code)
             elif code[:1] == '\n' or code[:-1] == '\n':
-                if code[:1]=='\n': code=code[1:]
+                if code[:1] == '\n':
-                if code[-1:]=='\n': code=code[:-1]
+                    code = code[1:]
+                if code[-1:] == '\n':
+                    code = code[:-1]
                 if code.startswith('<') or code.startswith('{{') or code.startswith('http'):
                     html = '\\begin{lstlisting}[keywords={}]\n%s\n\\end{lstlisting}' % code
                 else:
                     html = '\\begin{lstlisting}\n%s\n\\end{lstlisting}' % code
             else:
-                if code[:1]=='\n': code=code[1:]
+                if code[:1] == '\n':
-                if code[-1:]=='\n': code=code[:-1]
+                    code = code[1:]
+                if code[-1:] == '\n':
+                    code = code[:-1]
                 html = '{\\ft %s}' % latex_escape(code)
         try:
             text = text + html + parts[i + 1]
@@ -207,6 +226,7 @@ def render(text,
     text = text.replace(' ~\\cite', '~\\cite')
     return text, title, authors
 
+
 WRAPPER = """
 \\documentclass[12pt]{article}
 \\usepackage{hyperref}
@@ -239,12 +259,14 @@ WRAPPER = """
 \\end{document}
 """
 
+
 def markmin2latex(data, image_mapper=lambda x: x, extra={},
                   wrapper=WRAPPER):
     body, title, authors = render(data, extra=extra, image_mapper=image_mapper)
     author = '\n\\and\n'.join(a.replace('\n', '\\\\\n\\footnotesize ') for a in authors)
     return wrapper % dict(title=title, author=author, body=body)
 
+
 if __name__ == '__main__':
     parser = OptionParser()
     parser.add_option("-i", "--info", dest="info",
@@ -261,6 +283,7 @@ if __name__ == '__main__':
     (options, args) = parser.parse_args()
     if options.info:
         import markmin2html
+
         markmin2latex(markmin2html.__doc__)
     elif options.test:
         doctest.testmod()
@@ -287,5 +310,3 @@ if __name__ == '__main__':
                                wrapper=wrapper,
                                chapters=options.chapters)
         print output
-
-

gluon/contrib/markmin/markmin2pdf.py

@@ -13,9 +13,10 @@ from markmin2latex import markmin2latex
 
 __all__ = ['markmin2pdf']
 
-def removeall(path):
 
+def removeall(path):
     ERROR_STR = """Error removing %(path)s, %(error)s """
+
     def rmgeneric(path, __func__):
         try:
             __func__(path)
@@ -107,6 +108,7 @@ if __name__ == '__main__':
     import sys
     import doctest
     import markmin2html
+
     if sys.argv[1:2] == ['-h']:
         data, warnings, errors = markmin2pdf(markmin2html.__doc__)
         if errors:
@@ -127,4 +129,3 @@ if __name__ == '__main__':
             print data
     else:
         doctest.testmod()
-