remove simplegeneric from external

make it a dependency

IPython/extensions/rmagic.py

@@ -73,7 +73,7 b' from IPython.testing.skipdoctest import skip_doctest'
 from IPython.core.magic_arguments import (
     argument, magic_arguments, parse_argstring
 )
-from IPython.external.simplegeneric import generic
+from simplegeneric import generic
 from IPython.utils.py3compat import (str_to_unicode, unicode_to_str, PY3,
                                      unicode_type)
 from IPython.utils.text import dedent

IPython/utils/generics.py

@@ -1,26 +1,11 b''
 # encoding: utf-8
 """Generic functions for extending IPython.
 
-See http://cheeseshop.python.org/pypi/simplegeneric.
+See http://pypi.python.org/pypi/simplegeneric.
 """
 
-#-----------------------------------------------------------------------------
-#  Copyright (C) 2008-2011  The IPython Development Team
-#
-#  Distributed under the terms of the BSD License.  The full license is in
-#  the file COPYING, distributed as part of this software.
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
-
 from IPython.core.error import TryNext
-from IPython.external.simplegeneric import generic
-
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
+from simplegeneric import generic
 
 
 @generic

setup.py

@@ -271,6 +271,7 b" extras_require['nbconvert'].extend(extras_require['nbformat'])"
 install_requires = [
     'decorator',
     'path.py', # required by pickleshare, remove when pickleshare is added here
+    'simplegeneric>0.8',
 ]
 
 # add platform-specific dependencies