Merge pull request #28 from minrk/fix-difftool-args

fix git-nbdifftool args
jupyter · Mar 12, 2016 · 72fc51f · 72fc51f
2 parents fbcb81f + dc2407b
commit 72fc51f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/nbdime/gitdifftool.py b/nbdime/gitdifftool.py
@@ -57,7 +57,7 @@ def show_diff(before, after):
     """
     # TODO: handle /dev/null (Windows equivalent?) for new or deleted files
     if before.endswith('.ipynb') or after.endswith('ipynb'):
-        nbdiffapp.main_diff(before, after)
+        nbdiffapp.main([before, after])
     else:
         os.execvp('git', ['git', 'diff', before, after])
 

diff --git a/nbdime/nbdiffapp.py b/nbdime/nbdiffapp.py
@@ -111,7 +111,7 @@ def _build_arg_parser():
     return parser
 
 
-def main():
-    args = _build_arg_parser().parse_args()
+def main(argv=None):
+    args = _build_arg_parser().parse_args(argv)
     r = main_diff(args)
     sys.exit(r)