'update'

[talweg.git] / reports / ipynb_generator.py

diff --git a/reports/ipynb_generator.py b/reports/ipynb_generator.py
index 339f96a..456fc22 100755 (executable)
--- a/reports/ipynb_generator.py
+++ b/reports/ipynb_generator.py
@@ -63,9 +63,7 @@ def read(text, argv=sys.argv[3:]):
                 if shortname:
                     # Check if code is to be typeset as static
                     # Markdown code (e.g., shortname=py-t)
-                        .format(shortname))
                     astext = shortname[-2:] == '-t'
-                        .format(astext, shortname))
                     if astext:
                         # Markdown
                         shortname = shortname[:-2]
@@ -123,18 +121,18 @@ def driver():
     """Compile a document and its variables."""
     try:
         inputfile = sys.argv[1]
-        with open(filename, 'r') as f:
+        with open(inputfile, 'r') as f:
             text = f.read()
-        outputfile = '-' if len(sys.argv) <= 2 else sys.argv[2]
+        # Assuming file extension .gj (generate Jupyter); TODO: less strict
+        outputfile = inputfile[:-3]+'.ipynb' if (len(sys.argv)<=2 or sys.argv[2]=='-') \
+            else sys.argv[2]
     except (IndexError, IOError) as e:
         print('Usage: %s inputfile [outputfile|- [Mako args]]' % (sys.argv[0]))
         print(e)
         sys.exit(1)
     cells = read(text, argv=sys.argv[3:])
     filestr = write(cells)
-    # Assuming file extension .gj (generate Jupyter); TODO: less strict
-    outputfile = inputfile[:-3]+'.ipynb' if outputfile == '-' else outputfile
-    with open(filename, 'w') as f:
+    with open(outputfile, 'w') as f:
         f.write(filestr)
 
 if __name__ == '__main__':