From 8a3911fbd1853e42f11be786d75213c05b44a15c 2017-01-05 17:43:03
From: Srinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com>
Date: 2017-01-05 17:43:03
Subject: [PATCH] remove python2 specific code

---

diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index a350316..cbc2566 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -16,10 +16,8 @@ import shutil
 import sys
 import tempfile
 import unittest
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
+
 from os.path import join
 
 import nose.tools as nt
diff --git a/IPython/core/tests/test_paths.py b/IPython/core/tests/test_paths.py
index 20257ba..8f09001 100644
--- a/IPython/core/tests/test_paths.py
+++ b/IPython/core/tests/test_paths.py
@@ -4,11 +4,7 @@ import shutil
 import sys
 import tempfile
 import warnings
-
-try:                    # Python 3
-    from unittest.mock import patch
-except ImportError:     # Python 2
-    from mock import patch
+from unittest.mock import patch
 
 import nose.tools as nt
 from testpath import modified_env, assert_isdir, assert_isfile
diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index f73d235..883a6b7 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -20,11 +20,7 @@ import random
 import sys
 import textwrap
 import unittest
-
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
+from unittest.mock import patch
 
 import nose.tools as nt
 from nose import SkipTest
diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index c9c86c0..f89ebb2 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -7,11 +7,7 @@ import os.path
 from textwrap import dedent
 import traceback
 import unittest
-
-try:
-    from unittest import mock
-except ImportError:
-    import mock    # Python 2
+from unittest import mock
 
 from ..ultratb import ColorTB, VerboseTB, find_recursion
 
diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index 966f3a8..f8d25a4 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -11,19 +11,12 @@ import sys
 import tempfile
 import warnings
 from contextlib import contextmanager
-
-try:  # Python 3.3+
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
-
+from unittest.mock import patch
 from os.path import join, abspath, split
 
-from nose import SkipTest
+from nose import SkipTest, with_setup
 import nose.tools as nt
 
-from nose import with_setup
-
 import IPython
 from IPython import paths
 from IPython.testing import decorators as dec