Merge pull request #9475 from Carreau/t42-api-fix

Traitlets 4.2 API fix.

IPython/core/extensions.py

@@ -49,8 +49,7 b' class ExtensionManager(Configurable):'
     is added to ``sys.path`` automatically.
     """
 
-    shell = Instance('IPython.core.interactiveshell.InteractiveShellABC').tag(
-                     allow_none=True)
+    shell = Instance('IPython.core.interactiveshell.InteractiveShellABC', allow_none=True)
 
     def __init__(self, shell=None, **kwargs):
         super(ExtensionManager, self).__init__(shell=shell, **kwargs)

IPython/utils/terminal.py

@@ -13,7 +13,6 b' Authors:'
 # Distributed under the terms of the Modified BSD License.
 
 import os
-import struct
 import sys
 import warnings
 try: