From bd6d13732187df9dd21118d33ee865ee21c06a8a 2013-07-31 00:16:23 From: Paul Ivanov Date: 2013-07-31 00:16:23 Subject: [PATCH] use new get_ipython_cmd functionality --- diff --git a/IPython/nbconvert/tests/base.py b/IPython/nbconvert/tests/base.py index 374ff0f..2adeae4 100644 --- a/IPython/nbconvert/tests/base.py +++ b/IPython/nbconvert/tests/base.py @@ -20,13 +20,10 @@ import shutil import IPython from IPython.utils.tempdir import TemporaryDirectory from IPython.utils.process import get_output_error_code -from IPython.utils import py3compat +from IPython.testing.tools import get_ipython_cmd -# Define ipython command line name -if py3compat.PY3: - ipy_cmd = 'ipython3 ' -else: - ipy_cmd = 'ipython ' +# a trailing space allows for simpler concatenation with the other arguments +ipy_cmd = get_ipython_cmd(as_string=True) + " " #----------------------------------------------------------------------------- # Classes and functions