From 09d3a4ee6384881876543f6934e4e05ee23e3c18 2014-05-14 20:31:14
From: Thomas Kluyver <takowl@gmail.com>
Date: 2014-05-14 20:31:14
Subject: [PATCH] Merge pull request #5835 from minrk/v2-typo

fix typo in v2 convert
---

diff --git a/IPython/nbformat/v2/convert.py b/IPython/nbformat/v2/convert.py
index bf23383..d084ae6 100644
--- a/IPython/nbformat/v2/convert.py
+++ b/IPython/nbformat/v2/convert.py
@@ -32,10 +32,10 @@ def upgrade(nb, from_version=1):
     ----------
     nb : NotebookNode
         The Python representation of the notebook to convert.
-    orig_version : int
-        The original version of the notebook to convert.
+    from_version : int
+        The version of the notebook to convert from.
     """
-    if orig_version == 1:
+    if from_version == 1:
         newnb = new_notebook()
         ws = new_worksheet()
         for cell in nb.cells:
@@ -47,7 +47,7 @@ def upgrade(nb, from_version=1):
         newnb.worksheets.append(ws)
         return newnb
     else:
-        raise ValueError('Cannot convert a notebook from v%s to v2' % orig_version)
+        raise ValueError('Cannot convert a notebook from v%s to v2' % from_version)
 
 
 def downgrade(nb):