Skip to content
Browse files

Do not import deprecated functions from external decorators library.

Closes gh-470
  • Loading branch information...
1 parent ef34a2f commit b45902e3088d33f48c56f59054ffd05ecb26c4bb @takluyver committed
Showing with 1 addition and 5 deletions.
  1. +0 −4 IPython/external/decorator/__init__.py
  2. +1 −1 IPython/testing/decorators.py
View
4 IPython/external/decorator/__init__.py
@@ -1,8 +1,4 @@
try:
from decorator import *
- from decorator import getinfo, new_wrapper
- # the following funcion is deprecated so using the python own one
- from functools import update_wrapper
except ImportError:
from _decorator import *
- from _decorator import getinfo, update_wrapper, new_wrapper
View
2 IPython/testing/decorators.py
@@ -56,7 +56,7 @@
# Third-party imports
# This is Michele Simionato's decorator module, kept verbatim.
-from IPython.external.decorator import decorator, update_wrapper
+from IPython.external.decorator import decorator
# We already have python3-compliant code for parametric tests
if sys.version[0]=='2':

0 comments on commit b45902e

Please sign in to comment.
Something went wrong with that request. Please try again.