Show More
@@ -1,8 +1,5 b'' | |||||
1 | import unittest |
|
1 | import unittest | |
2 | try: # Python 3.3 + |
|
2 | from unittest.mock import Mock | |
3 | from unittest.mock import Mock |
|
|||
4 | except ImportError: |
|
|||
5 | from mock import Mock |
|
|||
6 |
|
3 | |||
7 | from IPython.core import events |
|
4 | from IPython.core import events | |
8 | import IPython.testing.tools as tt |
|
5 | import IPython.testing.tools as tt |
@@ -16,10 +16,8 b' import shutil' | |||||
16 | import sys |
|
16 | import sys | |
17 | import tempfile |
|
17 | import tempfile | |
18 | import unittest |
|
18 | import unittest | |
19 | try: |
|
19 | from unittest import mock | |
20 | from unittest import mock |
|
20 | ||
21 | except ImportError: |
|
|||
22 | import mock |
|
|||
23 | from os.path import join |
|
21 | from os.path import join | |
24 |
|
22 | |||
25 | import nose.tools as nt |
|
23 | import nose.tools as nt |
@@ -4,11 +4,7 b' import shutil' | |||||
4 | import sys |
|
4 | import sys | |
5 | import tempfile |
|
5 | import tempfile | |
6 | import warnings |
|
6 | import warnings | |
7 |
|
7 | from unittest.mock import patch | ||
8 | try: # Python 3 |
|
|||
9 | from unittest.mock import patch |
|
|||
10 | except ImportError: # Python 2 |
|
|||
11 | from mock import patch |
|
|||
12 |
|
8 | |||
13 | import nose.tools as nt |
|
9 | import nose.tools as nt | |
14 | from testpath import modified_env, assert_isdir, assert_isfile |
|
10 | from testpath import modified_env, assert_isdir, assert_isfile |
@@ -20,11 +20,7 b' import random' | |||||
20 | import sys |
|
20 | import sys | |
21 | import textwrap |
|
21 | import textwrap | |
22 | import unittest |
|
22 | import unittest | |
23 |
|
23 | from unittest.mock import patch | ||
24 | try: |
|
|||
25 | from unittest.mock import patch |
|
|||
26 | except ImportError: |
|
|||
27 | from mock import patch |
|
|||
28 |
|
24 | |||
29 | import nose.tools as nt |
|
25 | import nose.tools as nt | |
30 | from nose import SkipTest |
|
26 | from nose import SkipTest |
@@ -7,11 +7,7 b' import os.path' | |||||
7 | from textwrap import dedent |
|
7 | from textwrap import dedent | |
8 | import traceback |
|
8 | import traceback | |
9 | import unittest |
|
9 | import unittest | |
10 |
|
10 | from unittest import mock | ||
11 | try: |
|
|||
12 | from unittest import mock |
|
|||
13 | except ImportError: |
|
|||
14 | import mock # Python 2 |
|
|||
15 |
|
11 | |||
16 | from ..ultratb import ColorTB, VerboseTB, find_recursion |
|
12 | from ..ultratb import ColorTB, VerboseTB, find_recursion | |
17 |
|
13 |
@@ -9,6 +9,7 b' import os' | |||||
9 | import tempfile |
|
9 | import tempfile | |
10 | import shutil |
|
10 | import shutil | |
11 | import subprocess |
|
11 | import subprocess | |
|
12 | from base64 import encodebytes | |||
12 |
|
13 | |||
13 | from IPython.utils.process import find_cmd, FindCmdError |
|
14 | from IPython.utils.process import find_cmd, FindCmdError | |
14 | from traitlets.config import get_config |
|
15 | from traitlets.config import get_config | |
@@ -16,11 +17,6 b' from traitlets.config.configurable import SingletonConfigurable' | |||||
16 | from traitlets import List, Bool, Unicode |
|
17 | from traitlets import List, Bool, Unicode | |
17 | from IPython.utils.py3compat import cast_unicode, cast_unicode_py2 as u, PY3 |
|
18 | from IPython.utils.py3compat import cast_unicode, cast_unicode_py2 as u, PY3 | |
18 |
|
19 | |||
19 | try: # Py3 |
|
|||
20 | from base64 import encodebytes |
|
|||
21 | except ImportError: # Py2 |
|
|||
22 | from base64 import encodestring as encodebytes |
|
|||
23 |
|
||||
24 |
|
20 | |||
25 | class LaTeXTool(SingletonConfigurable): |
|
21 | class LaTeXTool(SingletonConfigurable): | |
26 | """An object to store configuration of the LaTeX tool.""" |
|
22 | """An object to store configuration of the LaTeX tool.""" |
@@ -3,12 +3,7 b'' | |||||
3 |
|
3 | |||
4 | # Copyright (c) IPython Development Team. |
|
4 | # Copyright (c) IPython Development Team. | |
5 | # Distributed under the terms of the Modified BSD License. |
|
5 | # Distributed under the terms of the Modified BSD License. | |
6 |
|
6 | from unittest.mock import patch | ||
7 | try: |
|
|||
8 | from unittest.mock import patch |
|
|||
9 | except ImportError: |
|
|||
10 | from mock import patch |
|
|||
11 |
|
||||
12 | import nose.tools as nt |
|
7 | import nose.tools as nt | |
13 |
|
8 | |||
14 | from IPython.lib import latextools |
|
9 | from IPython.lib import latextools |
@@ -11,19 +11,12 b' import sys' | |||||
11 | import tempfile |
|
11 | import tempfile | |
12 | import warnings |
|
12 | import warnings | |
13 | from contextlib import contextmanager |
|
13 | from contextlib import contextmanager | |
14 |
|
14 | from unittest.mock import patch | ||
15 | try: # Python 3.3+ |
|
|||
16 | from unittest.mock import patch |
|
|||
17 | except ImportError: |
|
|||
18 | from mock import patch |
|
|||
19 |
|
||||
20 | from os.path import join, abspath, split |
|
15 | from os.path import join, abspath, split | |
21 |
|
16 | |||
22 | from nose import SkipTest |
|
17 | from nose import SkipTest, with_setup | |
23 | import nose.tools as nt |
|
18 | import nose.tools as nt | |
24 |
|
19 | |||
25 | from nose import with_setup |
|
|||
26 |
|
||||
27 | import IPython |
|
20 | import IPython | |
28 | from IPython import paths |
|
21 | from IPython import paths | |
29 | from IPython.testing import decorators as dec |
|
22 | from IPython.testing import decorators as dec |
General Comments 0
You need to be logged in to leave comments.
Login now