Fix test after rebase

 - fix length error and conflict import name
 - invert try/except where necessary
 - use index for token for 2.7 compat
 - don't deep reload some things.

Closes  #8321 and closes  #8457

IPython/core/displayhook.py

@@ -10,12 +10,13 b' This defines a callable class that IPython uses for `sys.displayhook`.'
 from __future__ import print_function
 
 import sys
-import io, tokenize
+import io as _io
+import tokenize
 
 from IPython.core.formatters import _safe_get_formatter_method
 from traitlets.config.configurable import Configurable
 from IPython.utils import io
-from IPython.utils.py3compat import builtin_mod
+from IPython.utils.py3compat import builtin_mod, cast_unicode_py2
 from traitlets import Instance, Float
 from IPython.utils.warn import warn
 
@@ -85,21 +86,22 b' class DisplayHook(Configurable):'
         """Should we silence the display hook because of ';'?"""
         # do not print output if input ends in ';'
 
-        cell = self.shell.history_manager.input_hist_parsed[self.prompt_count]
-        sio = io.StringIO(cell)
+        try:
+            cell = cast_unicode_py2(self.shell.history_manager.input_hist_parsed[-1])
+        except IndexError:
+            # some uses of ipshellembed may fail here
+            return False
+        
+        sio = _io.StringIO(cell)
         tokens = list(tokenize.generate_tokens(sio.readline))
 
-        try:
             for token in reversed(tokens):
-                if token.type in (tokenize.ENDMARKER, tokenize.COMMENT):
+            if token[0] in (tokenize.ENDMARKER, tokenize.COMMENT):
                     continue
-                if (token.type == tokenize.OP) and (token.string == ';'):
+            if (token[0] == tokenize.OP) and (token[1] == ';'):
                     return True
                 else:
                     return False
-        except IndexError:
-            # some uses of ipshellembed may fail here
-            return False
 
     def start_displayhook(self):
         """Start the displayhook, initializing resources."""

IPython/lib/tests/test_deepreload.py

@@ -27,7 +27,7 b' def test_deepreload_numpy():'
         # Standard exclusions:
         'sys', 'os.path', builtin_mod_name, '__main__',
         # Test-related exclusions:
-        'unittest', 'UserDict',
+        'unittest', 'UserDict', '_collections_abc', 'tokenize'
         ]
 
     # `collections` builtin shall not be reloaded to avoid failure