remove decorator from external

IPython/config/application.py

@@ -14,7 +14,7 b' import sys'
 from copy import deepcopy
 from collections import defaultdict
 
-from IPython.external.decorator import decorator
+from decorator import decorator
 
 from IPython.config.configurable import SingletonConfigurable
 from IPython.config.loader import (

IPython/core/formatters.py

@@ -17,7 +17,7 b' import sys'
 import traceback
 import warnings
 
-from IPython.external.decorator import decorator
+from decorator import decorator
 
 from IPython.config.configurable import Configurable
 from IPython.core.getipython import get_ipython

IPython/core/history.py

@@ -28,7 +28,7 b' import threading'
 
 # Our own packages
 from IPython.config.configurable import Configurable
-from IPython.external.decorator import decorator
+from decorator import decorator
 from IPython.utils.decorators import undoc
 from IPython.utils.path import locate_profile
 from IPython.utils import py3compat

IPython/core/magic.py

@@ -27,7 +27,7 b' from IPython.config.configurable import Configurable'
 from IPython.core import oinspect
 from IPython.core.error import UsageError
 from IPython.core.inputsplitter import ESC_MAGIC, ESC_MAGIC2
-from IPython.external.decorator import decorator
+from decorator import decorator
 from IPython.utils.ipstruct import Struct
 from IPython.utils.process import arg_split
 from IPython.utils.py3compat import string_types, iteritems

IPython/core/tests/test_oinspect.py

@@ -26,7 +26,7 b' from IPython.core.magic import (Magics, magics_class, line_magic,'
                                 cell_magic, line_cell_magic,
                                 register_line_magic, register_cell_magic,
                                 register_line_cell_magic)
-from IPython.external.decorator import decorator
+from decorator import decorator
 from IPython.testing.decorators import skipif
 from IPython.testing.tools import AssertPrints
 from IPython.utils.path import compress_user

IPython/parallel/client/asyncresult.py

@@ -12,7 +12,7 b' from datetime import datetime'
 from zmq import MessageTracker
 
 from IPython.core.display import clear_output, display, display_pretty
-from IPython.external.decorator import decorator
+from decorator import decorator
 from IPython.parallel import error
 from IPython.utils.py3compat import string_types
 

IPython/parallel/client/client.py

@@ -31,7 +31,7 b' from IPython.utils.path import get_ipython_dir, compress_user'
 from IPython.utils.py3compat import cast_bytes, string_types, xrange, iteritems
 from IPython.utils.traitlets import (HasTraits, Integer, Instance, Unicode,
                                     Dict, List, Bool, Set, Any)
-from IPython.external.decorator import decorator
+from decorator import decorator
 
 from IPython.parallel import Reference
 from IPython.parallel import error

IPython/parallel/client/remotefunction.py

@@ -8,7 +8,7 b' from __future__ import division'
 import sys
 import warnings
 
-from IPython.external.decorator import decorator
+from decorator import decorator
 from IPython.testing.skipdoctest import skip_doctest
 
 from . import map as Map

IPython/parallel/client/view.py

@@ -18,7 +18,7 b' from IPython.utils import pickleutil'
 from IPython.utils.traitlets import (
     HasTraits, Any, Bool, List, Dict, Set, Instance, CFloat, Integer
 )
-from IPython.external.decorator import decorator
+from decorator import decorator
 
 from IPython.parallel import util
 from IPython.parallel.controller.dependency import Dependency, dependent

IPython/parallel/controller/scheduler.py

@@ -26,7 +26,7 b' import zmq'
 from zmq.eventloop import ioloop, zmqstream
 
 # local imports
-from IPython.external.decorator import decorator
+from decorator import decorator
 from IPython.config.application import Application
 from IPython.config.loader import Config
 from IPython.utils.traitlets import Instance, Dict, List, Set, Integer, Enum, CBytes

IPython/parallel/tests/clienttest.py

@@ -22,7 +22,7 b' from nose import SkipTest'
 import zmq
 from zmq.tests import BaseZMQTestCase
 
-from IPython.external.decorator import decorator
+from decorator import decorator
 
 from IPython.parallel import error
 from IPython.parallel import Client

IPython/parallel/util.py

@@ -28,7 +28,7 b' import zmq'
 from zmq.log import handlers
 
 from IPython.utils.log import get_logger
-from IPython.external.decorator import decorator
+from decorator import decorator
 
 from IPython.config.application import Application
 from IPython.utils.localinterfaces import localhost, is_public_ip, public_ips

IPython/testing/decorators.py

@@ -52,7 +52,7 b' import unittest'
 # Third-party imports
 
 # This is Michele Simionato's decorator module, kept verbatim.
-from IPython.external.decorator import decorator
+from decorator import decorator
 
 # Expose the unittest-driven decorators
 from .ipunittest import ipdoctest, ipdocstring

setup.py

@@ -269,6 +269,7 b" extras_require['notebook'].extend(extras_require['nbformat'])"
 extras_require['nbconvert'].extend(extras_require['nbformat'])
 
 install_requires = [
+    'decorator',
     'path.py', # required by pickleshare, remove when pickleshare is added here
 ]