tests extended

app/Formater.py

@@ -1,6 +1,5 @@
 import abc
 import json
-from Notebook import Notebook,Cell
 
 
 class Formater():

app/Notebook.py

@@ -62,12 +62,13 @@ def open_cell(line, execution_count):
                 current_cell = 'markdown'
             elif '<codecell>' in line:
                 cell = {'cell_type': 'code',
-                       'execution_count': execution_count,
+                        'execution_count': execution_count,
                         'metadata': {'collapsed': False},
                         'outputs': []}
                 source = []
                 current_cell = 'code'
             return cell, source, current_cell
+
         current_cell = 'unknown'
         execution_count = 1
         skip_one_line = False
@@ -81,20 +82,20 @@ def open_cell(line, execution_count):
                     skip_one_line = False
                     continue
 
-                if line=='# <markdowncell>\n' or line=='# <codecell>\n':
+                if line == '# <markdowncell>\n' or line == '# <codecell>\n':
                     outputcells = close_cell(current_cell)
-                    if current_cell=='code':
+                    if current_cell == 'code':
                         execution_count += 1
                     cell, source, current_cell = open_cell(line, execution_count)
                     skip_one_line = True
                     continue
 
-                if current_cell=='markdown':
+                if current_cell == 'markdown':
                     if len(line) > 1:
                         source.append(line[2:])
                     else:
                         source.append(line)
-                elif current_cell=='code':
+                elif current_cell == 'code':
                     source.append(line)
 
             last_cell = True
@@ -103,14 +104,15 @@ def open_cell(line, execution_count):
                 self.cells.append(Cell(cell))
 
     def to_dict(self):
-        cells = {   'metadata': self.metadata,
-                    'nbformat': self.nbformat,
-                    'nbformat_minor': self.nbformat_minor,
-                    'cells':[]}
+        cells = {'metadata': self.metadata,
+                 'nbformat': self.notebook_format,
+                 'nbformat_minor': self.nbformat_minor,
+                 'cells': []}
         for cell in self.cells:
             cells['cells'].append(cell.to_dict())
         return cells
 
+
 class Cell(object):
     def __init__(self, cell):
         self.cell_type = cell['cell_type']
@@ -126,4 +128,4 @@ def generate_field_output(self):
         return output + "\n"
 
     def to_dict(self):
-        return {'cell_type':self.cell_type, 'source': self.source}
+        return {'cell_type': self.cell_type, 'source': self.source}

app/NotebookToPy.py

@@ -1,10 +1,10 @@
 import os
 import fnmatch
 from Notebook import Notebook
-from Formater import ToPy,ToNotebook
+from Formater import ToPy
 
 
-class PyGenerator(object):
+class NotebookToPy(object):
     def convert_all_notebook_to_py(self, directory, overwrite=False):
         for root, dirnames, filenames in os.walk(directory):
             for filename in fnmatch.filter(filenames, '*.ipynb'):
@@ -33,7 +33,7 @@ def construct_output_path_for_py(input_path):
     parser.add_argument('-f', '--file', help='Specify an Ipython notebook if you only want to convert one. '
                                              '(This will overwrite default.)')
     args = parser.parse_args()
-    pg = PyGenerator()
+    pg = NotebookToPy()
 
     if args.file is not None:
         pg.convert_notebook_to_py(args.file, overwrite=args.overwrite)

app/PythonToNotebook.py → app/PyToNotebook.py

@@ -4,7 +4,7 @@
 from Formater import ToNotebook
 
 
-class NbGenerator(object):
+class PyToNotebook(object):
     def convert_all_py_to_notebook(self, directory, overwrite=False, dry_run=False):
         for root, dirnames, filenames in os.walk(directory):
             for filename in fnmatch.filter(filenames, '*.py'):
@@ -34,7 +34,7 @@ def construct_output_path_for_py(input_path):
                                        '(This will overwrite default.)')
     parser.add_argument('--dry-run', action='store_true', help='Only prints what would happen', default=False)
     args = parser.parse_args()
-    ng = NbGenerator()
+    ng = PyToNotebook()
 
     if args.file is not None:
         ng.convert_py_to_notebook(args.file, overwrite=args.overwrite, dry_run=args.dry_run)