##// END OF EJS Templates
Remove uses of with_metaclass compatibility hack
Thomas Kluyver -
Show More
@@ -28,9 +28,6 b' from traitlets import ('
28 ForwardDeclaredInstance,
28 ForwardDeclaredInstance,
29 default, observe,
29 default, observe,
30 )
30 )
31 from IPython.utils.py3compat import (
32 with_metaclass
33 )
34
31
35
32
36 class DisplayFormatter(Configurable):
33 class DisplayFormatter(Configurable):
@@ -202,7 +199,7 b' def catch_format_error(method, self, *args, **kwargs):'
202 return self._check_return(r, args[0])
199 return self._check_return(r, args[0])
203
200
204
201
205 class FormatterABC(with_metaclass(abc.ABCMeta, object)):
202 class FormatterABC(metaclass=abc.ABCMeta):
206 """ Abstract base class for Formatters.
203 """ Abstract base class for Formatters.
207
204
208 A formatter is a callable class that is responsible for computing the
205 A formatter is a callable class that is responsible for computing the
@@ -9,7 +9,7 b' import re'
9
9
10 from IPython.core.splitinput import LineInfo
10 from IPython.core.splitinput import LineInfo
11 from IPython.utils import tokenize2
11 from IPython.utils import tokenize2
12 from IPython.utils.py3compat import with_metaclass, PY3
12 from IPython.utils.py3compat import PY3
13 from IPython.utils.tokenize2 import generate_tokens, untokenize, TokenError
13 from IPython.utils.tokenize2 import generate_tokens, untokenize, TokenError
14
14
15 if PY3:
15 if PY3:
@@ -42,7 +42,7 b' ESC_SEQUENCES = [ESC_SHELL, ESC_SH_CAP, ESC_HELP ,\\'
42 ESC_QUOTE, ESC_QUOTE2, ESC_PAREN ]
42 ESC_QUOTE, ESC_QUOTE2, ESC_PAREN ]
43
43
44
44
45 class InputTransformer(with_metaclass(abc.ABCMeta, object)):
45 class InputTransformer(metaclass=abc.ABCMeta):
46 """Abstract base class for line-based input transformers."""
46 """Abstract base class for line-based input transformers."""
47
47
48 @abc.abstractmethod
48 @abc.abstractmethod
@@ -67,7 +67,7 b' from IPython.utils.ipstruct import Struct'
67 from IPython.paths import get_ipython_dir
67 from IPython.paths import get_ipython_dir
68 from IPython.utils.path import get_home_dir, get_py_filename, ensure_dir_exists
68 from IPython.utils.path import get_home_dir, get_py_filename, ensure_dir_exists
69 from IPython.utils.process import system, getoutput
69 from IPython.utils.process import system, getoutput
70 from IPython.utils.py3compat import builtin_mod, with_metaclass
70 from IPython.utils.py3compat import builtin_mod
71 from IPython.utils.strdispatch import StrDispatch
71 from IPython.utils.strdispatch import StrDispatch
72 from IPython.utils.syspathcontext import prepended_to_syspath
72 from IPython.utils.syspathcontext import prepended_to_syspath
73 from IPython.utils.text import format_screen, LSString, SList, DollarFormatter
73 from IPython.utils.text import format_screen, LSString, SList, DollarFormatter
@@ -3217,7 +3217,7 b' class InteractiveShell(SingletonConfigurable):'
3217 pass
3217 pass
3218
3218
3219
3219
3220 class InteractiveShellABC(with_metaclass(abc.ABCMeta, object)):
3220 class InteractiveShellABC(metaclass=abc.ABCMeta):
3221 """An abstract base class for InteractiveShell."""
3221 """An abstract base class for InteractiveShell."""
3222
3222
3223 InteractiveShellABC.register(InteractiveShell)
3223 InteractiveShellABC.register(InteractiveShell)
General Comments 0
You need to be logged in to leave comments. Login now