diff options
Diffstat (limited to 'contrib/python/ipython/py2/IPython/testing/tools.py')
| -rw-r--r-- | contrib/python/ipython/py2/IPython/testing/tools.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/python/ipython/py2/IPython/testing/tools.py b/contrib/python/ipython/py2/IPython/testing/tools.py index fbe91abcca6..23bf6a68cb2 100644 --- a/contrib/python/ipython/py2/IPython/testing/tools.py +++ b/contrib/python/ipython/py2/IPython/testing/tools.py @@ -196,7 +196,7 @@ def ipexec(fname, options=None, commands=()): """ if options is None: options = [] - cmdargs = default_argv() + options + cmdargs = default_argv() + options test_dir = os.path.dirname(__file__) @@ -291,13 +291,13 @@ class TempFileMixin(object): # delete it. I have no clue why pass - def __enter__(self): - return self - - def __exit__(self, exc_type, exc_value, traceback): - self.tearDown() - - + def __enter__(self): + return self + + def __exit__(self, exc_type, exc_value, traceback): + self.tearDown() + + pair_fail_msg = ("Testing {0}\n\n" "In:\n" " {1!r}\n" |
