Merge pull request #10122 from srinivasreddy/patch-5

import mock from unittest

IPython/lib/tests/test_editorhooks.py

@@ -1,9 +1,5 b''
 """Test installing editor hooks"""
 import sys
-
-try:
-    import mock
-except ImportError:
     from unittest import mock
 
 import nose.tools as nt