Merge pull request #11393 from hugovk/replace-simplegeneric

Replace simplegeneric with functools.singledispatch

IPython/core/tests/test_completer.py

@@ -115,7 +115,7 b' def test_custom_completion_error():'
     class A(object): pass
     ip.user_ns['a'] = A()
     
-    @complete_object.when_type(A)
+    @complete_object.register(A)
     def complete_A(a, existing_completions):
         raise TypeError("this should be silenced")
     

IPython/external/__init__.py

@@ -2,4 +2,4 b''
 This package contains all third-party modules bundled with IPython.
 """
 
-__all__ = ["simplegeneric"]
+__all__ = []

IPython/utils/generics.py

@@ -1,20 +1,18 b''
 # encoding: utf-8
 """Generic functions for extending IPython.
-
-See http://pypi.python.org/pypi/simplegeneric.
 """
 
 from IPython.core.error import TryNext
-from simplegeneric import generic
+from functools import singledispatch
 
 
-@generic
+@singledispatch
 def inspect_object(obj):
     """Called when you do obj?"""
     raise TryNext
 
 
-@generic
+@singledispatch
 def complete_object(obj, prev_completions):
     """Custom completer dispatching for python objects.
 
@@ -30,5 +28,3 b' def complete_object(obj, prev_completions):'
     own_attrs + prev_completions.
     """
     raise TryNext
-
-

IPython/utils/text.py

@@ -81,7 +81,7 b' class LSString(str):'
 #     print arg
 #
 #
-# print_lsstring = result_display.when_type(LSString)(print_lsstring)
+# print_lsstring = result_display.register(LSString)(print_lsstring)
 
 
 class SList(list):
@@ -243,7 +243,7 b' class SList(list):'
 #
 #     nlprint(arg)   # This was a nested list printer, now removed.
 #
-# print_slist = result_display.when_type(SList)(print_slist)
+# print_slist = result_display.register(SList)(print_slist)
 
 
 def indent(instr,nspaces=4, ntabs=0, flatten=False):

setup.py

@@ -188,7 +188,6 b' install_requires = ['
     'jedi>=0.10',
     'decorator',
     'pickleshare',
-    'simplegeneric>0.8',
     'traitlets>=4.2',
     'prompt_toolkit>=2.0.0,<2.1.0',
     'pygments',