##// END OF EJS Templates
remove simplegeneric from external...
MinRK -
Show More
@@ -73,7 +73,7 b' from IPython.testing.skipdoctest import skip_doctest'
73 from IPython.core.magic_arguments import (
73 from IPython.core.magic_arguments import (
74 argument, magic_arguments, parse_argstring
74 argument, magic_arguments, parse_argstring
75 )
75 )
76 from IPython.external.simplegeneric import generic
76 from simplegeneric import generic
77 from IPython.utils.py3compat import (str_to_unicode, unicode_to_str, PY3,
77 from IPython.utils.py3compat import (str_to_unicode, unicode_to_str, PY3,
78 unicode_type)
78 unicode_type)
79 from IPython.utils.text import dedent
79 from IPython.utils.text import dedent
@@ -1,26 +1,11 b''
1 # encoding: utf-8
1 # encoding: utf-8
2 """Generic functions for extending IPython.
2 """Generic functions for extending IPython.
3
3
4 See http://cheeseshop.python.org/pypi/simplegeneric.
4 See http://pypi.python.org/pypi/simplegeneric.
5 """
5 """
6
6
7 #-----------------------------------------------------------------------------
8 # Copyright (C) 2008-2011 The IPython Development Team
9 #
10 # Distributed under the terms of the BSD License. The full license is in
11 # the file COPYING, distributed as part of this software.
12 #-----------------------------------------------------------------------------
13
14 #-----------------------------------------------------------------------------
15 # Imports
16 #-----------------------------------------------------------------------------
17
18 from IPython.core.error import TryNext
7 from IPython.core.error import TryNext
19 from IPython.external.simplegeneric import generic
8 from simplegeneric import generic
20
21 #-----------------------------------------------------------------------------
22 # Imports
23 #-----------------------------------------------------------------------------
24
9
25
10
26 @generic
11 @generic
@@ -271,6 +271,7 b" extras_require['nbconvert'].extend(extras_require['nbformat'])"
271 install_requires = [
271 install_requires = [
272 'decorator',
272 'decorator',
273 'path.py', # required by pickleshare, remove when pickleshare is added here
273 'path.py', # required by pickleshare, remove when pickleshare is added here
274 'simplegeneric>0.8',
274 ]
275 ]
275
276
276 # add platform-specific dependencies
277 # add platform-specific dependencies
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now