diff --git a/IPython/qt/console/ansi_code_processor.py b/IPython/qt/console/ansi_code_processor.py index f2fbf81..0bd757f 100644 --- a/IPython/qt/console/ansi_code_processor.py +++ b/IPython/qt/console/ansi_code_processor.py @@ -106,7 +106,7 @@ class AnsiCodeProcessor(object): self.actions = [] start = match.end() - groups = filter(lambda x: x is not None, match.groups()) + groups = [g for g in match.groups() if (g is not None)] g0 = groups[0] if g0 == '\a': self.actions.append(BeepAction('beep')) @@ -129,7 +129,7 @@ class AnsiCodeProcessor(object): if g0.startswith('['): # Case 1: CSI code. try: - params = map(int, params) + params = list(map(int, params)) except ValueError: # Silently discard badly formed codes. pass diff --git a/IPython/qt/console/console_widget.py b/IPython/qt/console/console_widget.py index 68a605c..3d10053 100644 --- a/IPython/qt/console/console_widget.py +++ b/IPython/qt/console/console_widget.py @@ -21,7 +21,6 @@ from IPython.config.configurable import LoggingConfigurable from IPython.core.inputsplitter import ESC_SEQUENCES from IPython.qt.rich_text import HtmlExporter from IPython.qt.util import MetaQObjectHasTraits, get_font -from IPython.utils.py3compat import with_metaclass from IPython.utils.text import columnize from IPython.utils.traitlets import Bool, Enum, Integer, Unicode from .ansi_code_processor import QtAnsiCodeProcessor @@ -70,7 +69,7 @@ def is_letter_or_number(char): # Classes #----------------------------------------------------------------------------- -class ConsoleWidget(with_metaclass(MetaQObjectHasTraits, type('NewBase', (LoggingConfigurable, QtGui.QWidget), {}))): +class ConsoleWidget(MetaQObjectHasTraits('NewBase', (LoggingConfigurable, QtGui.QWidget), {})): """ An abstract base class for console-type widgets. This class has functionality for: @@ -221,9 +220,9 @@ class ConsoleWidget(with_metaclass(MetaQObjectHasTraits, type('NewBase', (Loggin # The shortcuts defined by this widget. We need to keep track of these to # support 'override_shortcuts' above. - _shortcuts = set(_ctrl_down_remap.keys() + - [ QtCore.Qt.Key_C, QtCore.Qt.Key_G, QtCore.Qt.Key_O, - QtCore.Qt.Key_V ]) + _shortcuts = set(_ctrl_down_remap.keys()) | \ + { QtCore.Qt.Key_C, QtCore.Qt.Key_G, QtCore.Qt.Key_O, + QtCore.Qt.Key_V } _temp_buffer_filled = False