Spelling/typos fixes

IPython/nbformat/convert.py

@@ -1,72 +1,72 b''
 """API for converting notebooks between versions.
 
 Authors:
 
 * Jonathan Frederic
 """
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2013  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
 import re
 
 from .reader import get_version, versions
 
 #-----------------------------------------------------------------------------
 # Functions
 #-----------------------------------------------------------------------------
 
 def convert(nb, to_version):
     """Convert a notebook node object to a specific version.  Assumes that
     all the versions starting from 1 to the latest major X are implemented.
     In other words, there should never be a case where v1 v2 v3 v5 exist without
     a v4.  Also assumes that all conversions can be made in one step increments
     between major versions and ignores minor revisions.
 
     PARAMETERS:
     -----------
     nb : NotebookNode
     to_version : int
         Major revision to convert the notebook to.  Can either be an upgrade or
         a downgrade.
     """
 
     # Get input notebook version.
     (version, version_minor) = get_version(nb)
 
     # Check if destination is current version, if so return contents
     if version == to_version:
         return nb
 
     # If the version exist, try to convert to it one step at a time.
     elif to_version in versions:
 
         # Get the the version that this recursion will convert to as a step 
         # closer to the final revision.  Make sure the newer of the conversion
         # functions is used to perform the conversion.
         if to_version > version:
             step_version = version + 1
             convert_function = versions[step_version].upgrade
         else:
             step_version = version - 1
             convert_function = versions[version].downgrade
 
         # Convert and make sure version changed during conversion.
         converted = convert_function(nb)
         if converted.get('nbformat', 1) == version:
             raise Exception("Cannot convert notebook from v%d to v%d.  Operation" \
                 "failed silently." % (major, step_version))
 
-        # Recuresively convert until target version is reached.
+        # Recursively convert until target version is reached.
         return convert(converted, to_version)
     else:
         raise Exception("Cannot convert notebook to v%d because that " \
                         "version doesn't exist" % (to_version))

IPython/nbformat/tests/test_convert.py

@@ -1,69 +1,69 b''
 """
 Contains tests class for convert.py
 """
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2013  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
 from .base import TestsBase
 
 from ..convert import convert
 from ..reader import read, get_version
 from ..current import current_nbformat
 
 #-----------------------------------------------------------------------------
 # Classes and functions
 #-----------------------------------------------------------------------------
 
 class TestConvert(TestsBase):
 
     def test_downgrade(self):
         """Do notebook downgrades work?"""
 
         # Open a version 3 notebook and attempt to downgrade it to version 2.
         with self.fopen(u'test3.ipynb', u'r') as f:
             nb = read(f)
         nb = convert(nb, 2)
 
         # Check if downgrade was successful.
         (major, minor) = get_version(nb)
         self.assertEqual(major, 2)
 
 
     def test_upgrade(self):
         """Do notebook upgrades work?"""
 
         # Open a version 2 notebook and attempt to upgrade it to version 3.
         with self.fopen(u'test2.ipynb', u'r') as f:
             nb = read(f)
         nb = convert(nb, 3)
 
         # Check if upgrade was successful.
         (major, minor) = get_version(nb)
         self.assertEqual(major, 3)
 
 
     def test_open_current(self):
-        """Can an old notebook be opened and converted to the current verion while
-        remembering the original version of the notebook?"""
+        """Can an old notebook be opened and converted to the current version 
+        while remembering the original version of the notebook?"""
 
         # Open a version 2 notebook and attempt to upgrade it to the current version
         # while remembering it's version information.
         with self.fopen(u'test2.ipynb', u'r') as f:
             nb = read(f)
         (original_major, original_minor) = get_version(nb)
         nb = convert(nb, current_nbformat)
 
         # Check if upgrade was successful.
         (major, minor) = get_version(nb)
         self.assertEqual(major, current_nbformat)
 
         # Check if the original major revision was remembered.
         self.assertEqual(original_major, 2)