Pep corrections

opytex/__main__.py

@@ -2,13 +2,11 @@
 # encoding: utf-8
 
 
-
 from .opytex import main
 
 main()
 
 
-
 # -----------------------------
 # Reglages pour 'vim'
 # vim:set autoindent expandtab tabstop=4 shiftwidth=4:

opytex/opytex.py

@@ -1,44 +1,48 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import os
+"""
-import sys
+Producing then compiling templates
-import optparse
+"""
-import csv
-from path import Path
 
+import os
+import csv
+import math as m
+import optparse
+import random as rd
+import sys
+
+from path import Path
+from pymath.calculus.polynomDeg2 import Polynom_deg2
+from pymath import Dataset
+from pymath import Equation
+from pymath import Expression
+from pymath import Fraction 
+from pymath import Polynom
+from pymath import random_pythagore
+from pymath import random_str 
+from pymath import WeightedDataset
 from .texenv import texenv
 
-import math as m
+EXPORT_DICT = {}
-import random as rd
+EXPORT_DICT.update(m.__dict__)
-from pymath import Expression
+EXPORT_DICT.update(rd.__dict__)
-from pymath import Polynom
+EXPORT_DICT.update(__builtins__)
-from pymath import Equation
+EXPORT_DICT.update({
-from pymath.calculus.polynomDeg2 import Polynom_deg2
+    "Expression": Expression,
-from pymath import Fraction 
+    "Polynom": Polynom,
-from pymath import random_str 
+    "Polynom_deg2": Polynom_deg2,
-from pymath import random_pythagore
+    "Fraction": Fraction,
-from pymath import Dataset
+    "Equation": Equation,
-from pymath import WeightedDataset
+    "random_str": random_str,
-
+    "random_pythagore": random_pythagore,
-
+    "Dataset": Dataset,
-export_dict = {}
+    "WeightedDataset": WeightedDataset,
-export_dict.update(m.__dict__)
-export_dict.update(rd.__dict__)
-export_dict.update(__builtins__)
-export_dict.update({"Expression":Expression,\
-        "Polynom":Polynom,\
-        "Polynom_deg2":Polynom_deg2,\
-        "Fraction":Fraction,\
-        "Equation":Equation,\
-        "random_str": random_str,\
-        "random_pythagore":random_pythagore,\
-        "Dataset": Dataset, \
-        "WeightedDataset": WeightedDataset,\
     })
 
+
 def produce_and_compile(options):
-    #template = report_renderer.get_template(options.template)
+    # template = report_renderer.get_template(options.template)
     template = texenv.get_template(options.template)
 
     # Saving place
@@ -50,12 +54,15 @@ def produce_and_compile(options):
 
     if not options.csv_file:
         # {:02:0f} means that we want a 2 digits number
-        list_infos = [{"num": "{:02.0f}".format(i+1)} for i in range(options.num_subj)]
+        list_infos = [
+            {"num": "{:02.0f}".format(i+1)}
+            for i in range(options.num_subj)
+            ]
     else:
-        with open(options.csv_file, 'r', encoding = 'ISO-8859-1') as f:
+        with open(options.csv_file, 'r', encoding='ISO-8859-1') as csv_file:
-            list_infos = list(csv.DictReader(f, delimiter=";"))
+            list_infos = list(csv.DictReader(csv_file, delimiter=";"))
-            for (i,a) in enumerate(list_infos):
+            for (i, info) in enumerate(list_infos):
-                a['num'] = "{:02.0f}".format(i+1)
+                info['num'] = "{:02.0f}".format(i+1)
 
     if output.dirname() != "":
         output.dirname().cd()
@@ -67,11 +74,16 @@ def produce_and_compile(options):
     else:
         tmp_pdf = []
         for infos in list_infos:
-            #print("_______" + str(infos))
+            # print("_______" + str(infos))
             dest = Path(str(infos['num']) + output)
             tmp_pdf.append(dest.namebase + ".pdf")
-            with open( dest, 'w') as f:
+            with open(dest, 'w') as output_file:
-                f.write(template.render(  infos = infos, **export_dict ))
+                output_file.write(
+                    template.render(
+                        infos=infos,
+                        **EXPORT_DICT
+                        )
+                    )
 
             if not options.no_compil:
                 os.system("pdflatex " + dest)
@@ -81,46 +93,125 @@ def produce_and_compile(options):
 
         if not options.no_join:
             print(Path("./").abspath())
-            print("pdfjam "+ " ".join(tmp_pdf) + " -o all" + Path(output).namebase + ".pdf")
+            print(
-            os.system("pdfjam "+ " ".join(tmp_pdf) + " -o all" + Path(output).namebase + ".pdf")
+                "pdfjam "
-            #os.system("pdfjam *.pdf -o all" + Path(output).namebase + ".pdf")
+                + " ".join(tmp_pdf)
+                + " -o all"
+                + Path(output).namebase
+                + ".pdf"
+                )
+            os.system(
+                "pdfjam "
+                + " ".join(tmp_pdf)
+                + " -o all"
+                + Path(output).namebase
+                + ".pdf"
+                )
+            # os.system("pdfjam *.pdf -o all" + Path(output).namebase + ".pdf")
             print("rm " + " ".join(tmp_pdf))
             os.system("rm " + " ".join(tmp_pdf))
 
     if options.corr:
         find_subj_tex_files = "find ./ -iname '[0-9]*_*.tex' "
-        os.system( find_subj_tex_files + " -exec sed -i 's/%\\\\printanswers/\\\\printanswers/g' {} \\;")
+        os.system(
+            find_subj_tex_files
+            + " -exec sed -i 's/%\\\\printanswers/\\\\printanswers/g' {} \\;"
+            )
 
         if not options.no_compil:
-            os.system(find_subj_tex_files + " -exec pdflatex {} \\;")
+            os.system(
-            os.system( find_subj_tex_files + " -exec sed -i 's/\\\\printanswers/%\\\\printanswers/g' {} \\;")
+                find_subj_tex_files
+                + " -exec pdflatex {} \\;"
+                )
+            os.system(
+                find_subj_tex_files
+                + " -exec sed -i 's/\\\\printanswers/%\\\\printanswers/g' {} \\;"
+                )
 
         if not options.dirty:
             os.system("rm *.aux *.log")
 
         if not options.no_join:
             print(Path("./").abspath())
-            print("pdfjam `find ./ -iname '[0-9]*.pdf'` -o corr" + Path(output).namebase + ".pdf")
+            print(
-            os.system("pdfjam `find ./ -iname '[0-9]*.pdf'` -o corr" + Path(output).namebase + ".pdf")
+                "pdfjam `find ./ -iname '[0-9]*.pdf'` -o corr"
-            #os.system("pdfjam *.pdf -o all" + Path(output).namebase + ".pdf")
+                + Path(output).namebase + ".pdf"
-            print("find ./ -iname '[0-9]*.pdf' -exec rm -f {} \;")
+                )
-            os.system("find ./ -iname '[0-9]*.pdf' -exec rm -f {} \;")
+            os.system(
+                "pdfjam `find ./ -iname '[0-9]*.pdf'` -o corr"
+                + Path(output).namebase + ".pdf"
+                )
+            # os.system("pdfjam *.pdf -o all" + Path(output).namebase + ".pdf")
+            print(r"find ./ -iname '[0-9]*.pdf' -exec rm -f {} \;")
+            os.system(r"find ./ -iname '[0-9]*.pdf' -exec rm -f {} \;")
 
     cwd.cd()
 
+
 def main():
     parser = optparse.OptionParser()
-    parser.add_option("-t","--template",action="store",type="string",dest="template", help="File with the template. The name should have the following form tpl_... .")
+    parser.add_option(
-    parser.add_option("-C","--csv", action="store", type="string", dest="csv_file", help="Filename of the csv file where informations on subjects are stored")
+        "-t",
-    parser.add_option("-N","--number_subjects", action="store",type="int", dest="num_subj", default = 1, help="The number of subjects to make")
+        "--template",
-    parser.add_option("-d","--dirty", action="store_true", dest="dirty", help="Do not clean after compilation")
+        action="store",
-    parser.add_option("-n","--no-compile", action="store_true", dest="no_compil", help="Do not compile source code")
+        type="string",
-    parser.add_option("-j","--no-join", action="store_true", dest="no_join", help="Do not join pdf and clean single pdf")
+        dest="template",
-    parser.add_option("-o","--only-corr", action="store_true",dest="only_corr", help="Create and compile only correction from existing subjects")
+        help="File with the template. The name should have the following form tpl_... ."
-    parser.add_option("-c","--corr", action="store_true",dest="corr", help="Create and compile correction while making subjects")
+        )
+    parser.add_option(
+        "-C",
+        "--csv",
+        action="store",
+        type="string",
+        dest="csv_file",
+        help="Filename of the csv file where informations on subjects are stored"
+        )
+    parser.add_option(
+        "-N",
+        "--number_subjects",
+        action="store",
+        type="int",
+        dest="num_subj",
+        default = 1,
+        help="The number of subjects to make"
+        )
+    parser.add_option(
+        "-d",
+        "--dirty",
+        action="store_true",
+        dest="dirty",
+        help="Do not clean after compilation"
+        )
+    parser.add_option(
+        "-n",
+        "--no-compile",
+        action="store_true",
+        dest="no_compil",
+        help="Do not compile source code"
+        )
+    parser.add_option(
+        "-j",
+        "--no-join",
+        action="store_true",
+        dest="no_join",
+        help="Do not join pdf and clean single pdf"
+        )
+    parser.add_option(
+        "-o",
+        "--only-corr",
+        action="store_true",
+        dest="only_corr",
+        help="Create and compile only correction from existing subjects"
+        )
+    parser.add_option(
+        "-c",
+        "--corr",
+        action="store_true",
+        dest="corr",
+        help="Create and compile correction while making subjects"
+        )
 
-
+    (options, _) = parser.parse_args()
-    (options, args) = parser.parse_args()
 
     if not options.template:
         print("I need a template!")
@@ -128,11 +219,11 @@ def main():
 
     produce_and_compile(options)
 
+
 if __name__ == '__main__':
     main()
 
 
-
 # -----------------------------
 # Reglages pour 'vim'
 # vim:set autoindent expandtab tabstop=4 shiftwidth=4:

opytex/texenv.py

@@ -1,26 +1,26 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import jinja2, os
+import os
+import jinja2
 
 __all__ = ["texenv"]
 
 # Definition of jinja syntax for latex
 texenv = jinja2.Environment(
-    block_start_string = '\Block{',
+    block_start_string='\Block{',
-    # Gros WTF!! Si on le met en maj ça ne marche pas alors que c'est en maj dans le template...
+    block_end_string='}',
-    block_end_string = '}',
+    variable_start_string='\Var{',
-    variable_start_string = '\Var{',
+    variable_end_string='}',
-    variable_end_string = '}',
+    line_statement_prefix='%-',
-    line_statement_prefix = '%-',
+    line_comment_prefix='%#',
-    line_comment_prefix = '%#',
+    loader=jinja2.FileSystemLoader(os.path.abspath('.')),
-    loader = jinja2.FileSystemLoader(os.path.abspath('.')),
+    extensions=['jinja2.ext.do']
-    extensions = ['jinja2.ext.do']
 )
 
-# Filters
 
-def do_calculus(steps, name = "A", sep = "=", end = "", joining = " \\\\ \n"):
+# Filters
+def do_calculus(steps, name="A", sep="=", end="", joining=" \\\\ \n"):
     """Display properly the calculus
 
     Generate this form string:
@@ -32,9 +32,14 @@ def do_calculus(steps, name = "A", sep = "=", end = "", joining = " \\\\ \n"):
 
     """
 
-    ans = joining.join([name + " & " + sep + " & " + str(s) + end for s in steps])
+    ans = joining.join([
+        name + " & "
+        + sep + " & "
+        + str(s) + end for s in steps
+        ])
     return ans
 
+
 texenv.filters['calculus'] = do_calculus
 
 from random import shuffle
@@ -42,13 +47,6 @@ texenv.filters['shuffle'] = shuffle
 
 
 
-if __name__ == '__main__':
-    from pymath.expression import Expression
-    exp = Expression("2/4 + 18")
-    print(do_calculus(exp.simplify()))
-
-
-
 # -----------------------------
 # Reglages pour 'vim'
 # vim:set autoindent expandtab tabstop=4 shiftwidth=4: