diff --git a/IPython/core/tests/test_events.py b/IPython/core/tests/test_events.py index 3053a70..7143c82 100644 --- a/IPython/core/tests/test_events.py +++ b/IPython/core/tests/test_events.py @@ -1,8 +1,5 @@ import unittest -try: # Python 3.3 + - from unittest.mock import Mock -except ImportError: - from mock import Mock +from unittest.mock import Mock from IPython.core import events import IPython.testing.tools as tt diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py index c3230dd..2b1b2c7 100644 --- a/IPython/lib/latextools.py +++ b/IPython/lib/latextools.py @@ -9,6 +9,7 @@ import os import tempfile import shutil import subprocess +from base64 import encodebytes from IPython.utils.process import find_cmd, FindCmdError from traitlets.config import get_config @@ -16,11 +17,6 @@ from traitlets.config.configurable import SingletonConfigurable from traitlets import List, Bool, Unicode from IPython.utils.py3compat import cast_unicode, cast_unicode_py2 as u, PY3 -try: # Py3 - from base64 import encodebytes -except ImportError: # Py2 - from base64 import encodestring as encodebytes - class LaTeXTool(SingletonConfigurable): """An object to store configuration of the LaTeX tool.""" diff --git a/IPython/lib/tests/test_latextools.py b/IPython/lib/tests/test_latextools.py index 6d0d1a1..2772784 100644 --- a/IPython/lib/tests/test_latextools.py +++ b/IPython/lib/tests/test_latextools.py @@ -3,12 +3,7 @@ # Copyright (c) IPython Development Team. # Distributed under the terms of the Modified BSD License. - -try: - from unittest.mock import patch -except ImportError: - from mock import patch - +from unittest.mock import patch import nose.tools as nt from IPython.lib import latextools