From 221eb78a8e09cea6c1634ae71fdc8621a2fe05df Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Sat, 14 Sep 2019 20:32:53 +0200
Subject: [PATCH 0001/1407] Initial integration of stack_data

---
 IPython/core/ultratb.py | 516 +++-------------------------------------
 1 file changed, 35 insertions(+), 481 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 9e7e8fb390d..f7fb9e3a226 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -89,23 +89,20 @@
 #*****************************************************************************
 
 
-import dis
 import inspect
-import keyword
 import linecache
-import os
 import pydoc
-import re
 import sys
 import time
 import tokenize
 import traceback
 
-from tokenize import generate_tokens
+import stack_data
 
-# For purposes of monkeypatching inspect to fix a bug in it.
-from inspect import getsourcefile, getfile, getmodule, \
-    ismodule, isclass, ismethod, isfunction, istraceback, isframe, iscode
+try:  # Python 2
+    generate_tokens = tokenize.generate_tokens
+except AttributeError:  # Python 3
+    generate_tokens = tokenize.tokenize
 
 # IPython's own modules
 from IPython import get_ipython
@@ -115,13 +112,8 @@
 from IPython.utils import PyColorize
 from IPython.utils import path as util_path
 from IPython.utils import py3compat
-from IPython.utils.data import uniq_stable
 from IPython.utils.terminal import get_terminal_size
 
-from logging import info, error, debug
-
-from importlib.util import source_from_cache
-
 import IPython.utils.colorable as colorable
 
 # Globals
@@ -134,264 +126,26 @@
 # to users of ultratb who are NOT running inside ipython.
 DEFAULT_SCHEME = 'NoColor'
 
-
-# Number of frame above which we are likely to have a recursion and will
-# **attempt** to detect it.  Made modifiable mostly to speedup test suite
-# as detecting recursion is one of our slowest test
-_FRAME_RECURSION_LIMIT = 500
-
 # ---------------------------------------------------------------------------
 # Code begins
 
-# Utility functions
-def inspect_error():
-    """Print a message about internal inspect errors.
-
-    These are unfortunately quite common."""
-
-    error('Internal Python error in the inspect module.\n'
-          'Below is the traceback from this internal error.\n')
-
-
-# This function is a monkeypatch we apply to the Python inspect module. We have
-# now found when it's needed (see discussion on issue gh-1456), and we have a
-# test case (IPython.core.tests.test_ultratb.ChangedPyFileTest) that fails if
-# the monkeypatch is not applied. TK, Aug 2012.
-def findsource(object):
-    """Return the entire source file and starting line number for an object.
-
-    The argument may be a module, class, method, function, traceback, frame,
-    or code object.  The source code is returned as a list of all the lines
-    in the file and the line number indexes a line in that list.  An IOError
-    is raised if the source code cannot be retrieved.
-
-    FIXED version with which we monkeypatch the stdlib to work around a bug."""
-
-    file = getsourcefile(object) or getfile(object)
-    # If the object is a frame, then trying to get the globals dict from its
-    # module won't work. Instead, the frame object itself has the globals
-    # dictionary.
-    globals_dict = None
-    if inspect.isframe(object):
-        # XXX: can this ever be false?
-        globals_dict = object.f_globals
-    else:
-        module = getmodule(object, file)
-        if module:
-            globals_dict = module.__dict__
-    lines = linecache.getlines(file, globals_dict)
-    if not lines:
-        raise IOError('could not get source code')
-
-    if ismodule(object):
-        return lines, 0
-
-    if isclass(object):
-        name = object.__name__
-        pat = re.compile(r'^(\s*)class\s*' + name + r'\b')
-        # make some effort to find the best matching class definition:
-        # use the one with the least indentation, which is the one
-        # that's most probably not inside a function definition.
-        candidates = []
-        for i, line in enumerate(lines):
-            match = pat.match(line)
-            if match:
-                # if it's at toplevel, it's already the best one
-                if line[0] == 'c':
-                    return lines, i
-                # else add whitespace to candidate list
-                candidates.append((match.group(1), i))
-        if candidates:
-            # this will sort by whitespace, and by line number,
-            # less whitespace first
-            candidates.sort()
-            return lines, candidates[0][1]
-        else:
-            raise IOError('could not find class definition')
-
-    if ismethod(object):
-        object = object.__func__
-    if isfunction(object):
-        object = object.__code__
-    if istraceback(object):
-        object = object.tb_frame
-    if isframe(object):
-        object = object.f_code
-    if iscode(object):
-        if not hasattr(object, 'co_firstlineno'):
-            raise IOError('could not find function definition')
-        pat = re.compile(r'^(\s*def\s)|(.*(?<!\w)lambda(:|\s))|^(\s*@)')
-        pmatch = pat.match
-        # fperez - fix: sometimes, co_firstlineno can give a number larger than
-        # the length of lines, which causes an error.  Safeguard against that.
-        lnum = min(object.co_firstlineno, len(lines)) - 1
-        while lnum > 0:
-            if pmatch(lines[lnum]):
-                break
-            lnum -= 1
-
-        return lines, lnum
-    raise IOError('could not find code object')
-
-
-# This is a patched version of inspect.getargs that applies the (unmerged)
-# patch for http://bugs.python.org/issue14611 by Stefano Taschini.  This fixes
-# https://github.com/ipython/ipython/issues/8205 and
-# https://github.com/ipython/ipython/issues/8293
-def getargs(co):
-    """Get information about the arguments accepted by a code object.
-
-    Three things are returned: (args, varargs, varkw), where 'args' is
-    a list of argument names (possibly containing nested lists), and
-    'varargs' and 'varkw' are the names of the * and ** arguments or None."""
-    if not iscode(co):
-        raise TypeError('{!r} is not a code object'.format(co))
-
-    nargs = co.co_argcount
-    names = co.co_varnames
-    args = list(names[:nargs])
-    step = 0
-
-    # The following acrobatics are for anonymous (tuple) arguments.
-    for i in range(nargs):
-        if args[i][:1] in ('', '.'):
-            stack, remain, count = [], [], []
-            while step < len(co.co_code):
-                op = ord(co.co_code[step])
-                step = step + 1
-                if op >= dis.HAVE_ARGUMENT:
-                    opname = dis.opname[op]
-                    value = ord(co.co_code[step]) + ord(co.co_code[step+1])*256
-                    step = step + 2
-                    if opname in ('UNPACK_TUPLE', 'UNPACK_SEQUENCE'):
-                        remain.append(value)
-                        count.append(value)
-                    elif opname in ('STORE_FAST', 'STORE_DEREF'):
-                        if op in dis.haslocal:
-                            stack.append(co.co_varnames[value])
-                        elif op in dis.hasfree:
-                            stack.append((co.co_cellvars + co.co_freevars)[value])
-                        # Special case for sublists of length 1: def foo((bar))
-                        # doesn't generate the UNPACK_TUPLE bytecode, so if
-                        # `remain` is empty here, we have such a sublist.
-                        if not remain:
-                            stack[0] = [stack[0]]
-                            break
-                        else:
-                            remain[-1] = remain[-1] - 1
-                            while remain[-1] == 0:
-                                remain.pop()
-                                size = count.pop()
-                                stack[-size:] = [stack[-size:]]
-                                if not remain:
-                                    break
-                                remain[-1] = remain[-1] - 1
-                            if not remain:
-                                break
-            args[i] = stack[0]
-
-    varargs = None
-    if co.co_flags & inspect.CO_VARARGS:
-        varargs = co.co_varnames[nargs]
-        nargs = nargs + 1
-    varkw = None
-    if co.co_flags & inspect.CO_VARKEYWORDS:
-        varkw = co.co_varnames[nargs]
-    return inspect.Arguments(args, varargs, varkw)
-
-
-# Monkeypatch inspect to apply our bugfix.
-def with_patch_inspect(f):
-    """
-    Deprecated since IPython 6.0
-    decorator for monkeypatching inspect.findsource
-    """
-
-    def wrapped(*args, **kwargs):
-        save_findsource = inspect.findsource
-        save_getargs = inspect.getargs
-        inspect.findsource = findsource
-        inspect.getargs = getargs
-        try:
-            return f(*args, **kwargs)
-        finally:
-            inspect.findsource = save_findsource
-            inspect.getargs = save_getargs
-
-    return wrapped
-
-
-def fix_frame_records_filenames(records):
-    """Try to fix the filenames in each record from inspect.getinnerframes().
-
-    Particularly, modules loaded from within zip files have useless filenames
-    attached to their code object, and inspect.getinnerframes() just uses it.
-    """
-    fixed_records = []
-    for frame, filename, line_no, func_name, lines, index in records:
-        # Look inside the frame's globals dictionary for __file__,
-        # which should be better. However, keep Cython filenames since
-        # we prefer the source filenames over the compiled .so file.
-        if not filename.endswith(('.pyx', '.pxd', '.pxi')):
-            better_fn = frame.f_globals.get('__file__', None)
-            if isinstance(better_fn, str):
-                # Check the type just in case someone did something weird with
-                # __file__. It might also be None if the error occurred during
-                # import.
-                filename = better_fn
-        fixed_records.append((frame, filename, line_no, func_name, lines, index))
-    return fixed_records
-
-
-@with_patch_inspect
-def _fixed_getinnerframes(etb, context=1, tb_offset=0):
-    LNUM_POS, LINES_POS, INDEX_POS = 2, 4, 5
-
-    records = fix_frame_records_filenames(inspect.getinnerframes(etb, context))
-    # If the error is at the console, don't build any context, since it would
-    # otherwise produce 5 blank lines printed out (there is no file at the
-    # console)
-    rec_check = records[tb_offset:]
-    try:
-        rname = rec_check[0][1]
-        if rname == '<ipython console>' or rname.endswith('<string>'):
-            return rec_check
-    except IndexError:
-        pass
-
-    aux = traceback.extract_tb(etb)
-    assert len(records) == len(aux)
-    for i, (file, lnum, _, _) in enumerate(aux):
-        maybeStart = lnum - 1 - context // 2
-        start = max(maybeStart, 0)
-        end = start + context
-        lines = linecache.getlines(file)[start:end]
-        buf = list(records[i])
-        buf[LNUM_POS] = lnum
-        buf[INDEX_POS] = lnum - 1 - start
-        buf[LINES_POS] = lines
-        records[i] = tuple(buf)
-    return records[tb_offset:]
-
 # Helper function -- largely belongs to VerboseTB, but we need the same
 # functionality to produce a pseudo verbose TB for SyntaxErrors, so that they
 # can be recognized properly by ipython.el's py-traceback-line-re
 # (SyntaxErrors have to be treated specially because they have no traceback)
 
 
-def _format_traceback_lines(lnum, index, lines, Colors, lvals, _line_format):
+def _format_traceback_lines(lines, Colors, lvals, _line_format):
     """
     Format tracebacks lines with pointing arrow, leading numbers...
 
     Parameters
     ==========
 
-    lnum: int
-    index: int
-    lines: list[string]
+    lines: list[Line]
     Colors:
         ColorScheme used.
-    lvals: bytes
+    lvals: str
         Values of local variables, already colored, to inject just after the error line.
     _line_format: f (str) -> (str, bool)
         return (colorized version of str, failure to do so)
@@ -399,80 +153,30 @@ def _format_traceback_lines(lnum, index, lines, Colors, lvals, _line_format):
     numbers_width = INDENT_SIZE - 1
     res = []
 
-    for i,line in enumerate(lines, lnum-index):
-        line = py3compat.cast_unicode(line)
+    for stack_line in lines:
+        line = stack_line.text.rstrip('\n') + '\n'
 
         new_line, err = _line_format(line, 'str')
         if not err:
             line = new_line
 
-        if i == lnum:
+        lineno = stack_line.lineno
+        if stack_line.is_current:
             # This is the line with the error
-            pad = numbers_width - len(str(i))
-            num = '%s%s' % (debugger.make_arrow(pad), str(lnum))
+            pad = numbers_width - len(str(lineno))
+            num = '%s%s' % (debugger.make_arrow(pad), str(lineno))
             line = '%s%s%s %s%s' % (Colors.linenoEm, num,
                                     Colors.line, line, Colors.Normal)
         else:
-            num = '%*s' % (numbers_width, i)
+            num = '%*s' % (numbers_width, lineno)
             line = '%s%s%s %s' % (Colors.lineno, num,
                                   Colors.Normal, line)
 
         res.append(line)
-        if lvals and i == lnum:
+        if lvals and stack_line.is_current:
             res.append(lvals + '\n')
     return res
 
-def is_recursion_error(etype, value, records):
-    try:
-        # RecursionError is new in Python 3.5
-        recursion_error_type = RecursionError
-    except NameError:
-        recursion_error_type = RuntimeError
-
-    # The default recursion limit is 1000, but some of that will be taken up
-    # by stack frames in IPython itself. >500 frames probably indicates
-    # a recursion error.
-    return (etype is recursion_error_type) \
-           and "recursion" in str(value).lower() \
-           and len(records) > _FRAME_RECURSION_LIMIT
-
-def find_recursion(etype, value, records):
-    """Identify the repeating stack frames from a RecursionError traceback
-
-    'records' is a list as returned by VerboseTB.get_records()
-
-    Returns (last_unique, repeat_length)
-    """
-    # This involves a bit of guesswork - we want to show enough of the traceback
-    # to indicate where the recursion is occurring. We guess that the innermost
-    # quarter of the traceback (250 frames by default) is repeats, and find the
-    # first frame (from in to out) that looks different.
-    if not is_recursion_error(etype, value, records):
-        return len(records), 0
-
-    # Select filename, lineno, func_name to track frames with
-    records = [r[1:4] for r in records]
-    inner_frames = records[-(len(records)//4):]
-    frames_repeated = set(inner_frames)
-
-    last_seen_at = {}
-    longest_repeat = 0
-    i = len(records)
-    for frame in reversed(records):
-        i -= 1
-        if frame not in frames_repeated:
-            last_unique = i
-            break
-
-        if frame in last_seen_at:
-            distance = last_seen_at[frame] - i
-            longest_repeat = max(longest_repeat, distance)
-
-        last_seen_at[frame] = i
-    else:
-        last_unique = 0 # The whole traceback was recursion
-
-    return last_unique, longest_repeat
 
 #---------------------------------------------------------------------------
 # Module classes
@@ -880,63 +584,28 @@ def __init__(self, color_scheme='Linux', call_pdb=False, ostream=None,
 
         self.debugger_cls = debugger_cls or debugger.Pdb
 
-    def format_records(self, records, last_unique, recursion_repeat):
-        """Format the stack frames of the traceback"""
-        frames = []
-        for r in records[:last_unique+recursion_repeat+1]:
-            #print '*** record:',file,lnum,func,lines,index  # dbg
-            frames.append(self.format_record(*r))
-
-        if recursion_repeat:
-            frames.append('... last %d frames repeated, from the frame below ...\n' % recursion_repeat)
-            frames.append(self.format_record(*records[last_unique+recursion_repeat+1]))
-
-        return frames
-
-    def format_record(self, frame, file, lnum, func, lines, index):
+    def format_record(self, frame_info):
         """Format a single stack frame"""
         Colors = self.Colors  # just a shorthand + quicker name lookup
         ColorsNormal = Colors.Normal  # used a lot
         col_scheme = self.color_scheme_table.active_scheme_name
         indent = ' ' * INDENT_SIZE
         em_normal = '%s\n%s%s' % (Colors.valEm, indent, ColorsNormal)
-        undefined = '%sundefined%s' % (Colors.em, ColorsNormal)
         tpl_link = '%s%%s%s' % (Colors.filenameEm, ColorsNormal)
         tpl_call = 'in %s%%s%s%%s%s' % (Colors.vName, Colors.valEm,
                                         ColorsNormal)
         tpl_call_fail = 'in %s%%s%s(***failed resolving arguments***)%s' % \
                         (Colors.vName, Colors.valEm, ColorsNormal)
         tpl_local_var = '%s%%s%s' % (Colors.vName, ColorsNormal)
-        tpl_global_var = '%sglobal%s %s%%s%s' % (Colors.em, ColorsNormal,
-                                                 Colors.vName, ColorsNormal)
         tpl_name_val = '%%s %s= %%s%s' % (Colors.valEm, ColorsNormal)
 
-        if not file:
-            file = '?'
-        elif file.startswith(str("<")) and file.endswith(str(">")):
-            # Not a real filename, no problem...
-            pass
-        elif not os.path.isabs(file):
-            # Try to make the filename absolute by trying all
-            # sys.path entries (which is also what linecache does)
-            for dirname in sys.path:
-                try:
-                    fullname = os.path.join(dirname, file)
-                    if os.path.isfile(fullname):
-                        file = os.path.abspath(fullname)
-                        break
-                except Exception:
-                    # Just in case that sys.path contains very
-                    # strange entries...
-                    pass
-
+        file = frame_info.filename
         file = py3compat.cast_unicode(file, util_path.fs_encoding)
         link = tpl_link % util_path.compress_user(file)
-        args, varargs, varkw, locals_ = inspect.getargvalues(frame)
+        args, varargs, varkw, locals_ = inspect.getargvalues(frame_info.frame)
 
-        if func == '?':
-            call = ''
-        elif func == '<module>':
+        func = frame_info.executing.code_qualname()
+        if func == '<module>':
             call = tpl_call % (func, '')
         else:
             # Decide whether to include variable details or not
@@ -964,111 +633,19 @@ def format_record(self, frame, file, lnum, func, lines, index):
                 # disabled.
                 call = tpl_call_fail % func
 
-        # Don't attempt to tokenize binary files.
-        if file.endswith(('.so', '.pyd', '.dll')):
-            return '%s %s\n' % (link, call)
-
-        elif file.endswith(('.pyc', '.pyo')):
-            # Look up the corresponding source file.
-            try:
-                file = source_from_cache(file)
-            except ValueError:
-                # Failed to get the source file for some reason
-                # E.g. https://github.com/ipython/ipython/issues/9486
-                return '%s %s\n' % (link, call)
-
-        def linereader(file=file, lnum=[lnum], getline=linecache.getline):
-            line = getline(file, lnum[0])
-            lnum[0] += 1
-            return line
-
-        # Build the list of names on this line of code where the exception
-        # occurred.
-        try:
-            names = []
-            name_cont = False
-
-            for token_type, token, start, end, line in generate_tokens(linereader):
-                # build composite names
-                if token_type == tokenize.NAME and token not in keyword.kwlist:
-                    if name_cont:
-                        # Continuation of a dotted name
-                        try:
-                            names[-1].append(token)
-                        except IndexError:
-                            names.append([token])
-                        name_cont = False
-                    else:
-                        # Regular new names.  We append everything, the caller
-                        # will be responsible for pruning the list later.  It's
-                        # very tricky to try to prune as we go, b/c composite
-                        # names can fool us.  The pruning at the end is easy
-                        # to do (or the caller can print a list with repeated
-                        # names if so desired.
-                        names.append([token])
-                elif token == '.':
-                    name_cont = True
-                elif token_type == tokenize.NEWLINE:
-                    break
-
-        except (IndexError, UnicodeDecodeError, SyntaxError):
-            # signals exit of tokenizer
-            # SyntaxError can occur if the file is not actually Python
-            #  - see gh-6300
-            pass
-        except tokenize.TokenError as msg:
-            # Tokenizing may fail for various reasons, many of which are
-            # harmless. (A good example is when the line in question is the
-            # close of a triple-quoted string, cf gh-6864). We don't want to
-            # show this to users, but want make it available for debugging
-            # purposes.
-            _m = ("An unexpected error occurred while tokenizing input\n"
-                  "The following traceback may be corrupted or invalid\n"
-                  "The error message is: %s\n" % msg)
-            debug(_m)
-
-        # Join composite names (e.g. "dict.fromkeys")
-        names = ['.'.join(n) for n in names]
-        # prune names list of duplicates, but keep the right order
-        unique_names = uniq_stable(names)
-
-        # Start loop over vars
         lvals = ''
         lvals_list = []
         if self.include_vars:
-            for name_full in unique_names:
-                name_base = name_full.split('.', 1)[0]
-                if name_base in frame.f_code.co_varnames:
-                    if name_base in locals_:
-                        try:
-                            value = repr(eval(name_full, locals_))
-                        except:
-                            value = undefined
-                    else:
-                        value = undefined
-                    name = tpl_local_var % name_full
-                else:
-                    if name_base in frame.f_globals:
-                        try:
-                            value = repr(eval(name_full, frame.f_globals))
-                        except:
-                            value = undefined
-                    else:
-                        value = undefined
-                    name = tpl_global_var % name_full
-                lvals_list.append(tpl_name_val % (name, value))
+            for var in frame_info.variables_in_executing_piece:
+                lvals_list.append(tpl_name_val % (var.name, var.value))
         if lvals_list:
             lvals = '%s%s' % (indent, em_normal.join(lvals_list))
 
-        level = '%s %s\n' % (link, call)
+        result = '%s %s\n' % (link, call)
 
-        if index is None:
-            return level
-        else:
-            _line_format = PyColorize.Parser(style=col_scheme, parent=self).format2
-            return '%s%s' % (level, ''.join(
-                _format_traceback_lines(lnum, index, lines, Colors, lvals,
-                                         _line_format)))
+        _line_format = PyColorize.Parser(style=col_scheme, parent=self).format2
+        result += ''.join(_format_traceback_lines(frame_info.lines, Colors, lvals, _line_format))
+        return result
 
     def prepare_header(self, etype, long_version=False):
         colors = self.Colors  # just a shorthand + quicker name lookup
@@ -1123,46 +700,23 @@ def format_exception_as_a_whole(self, etype, evalue, etb, number_of_lines_of_con
         head = self.prepare_header(etype, self.long_header)
         records = self.get_records(etb, number_of_lines_of_context, tb_offset)
 
-        if records is None:
-            return ""
-
-        last_unique, recursion_repeat = find_recursion(orig_etype, evalue, records)
-
-        frames = self.format_records(records, last_unique, recursion_repeat)
+        frames = list(map(self.format_record, records))
 
         formatted_exception = self.format_exception(etype, evalue)
         if records:
-            filepath, lnum = records[-1][1:3]
-            filepath = os.path.abspath(filepath)
+            frame_info = records[-1]
             ipinst = get_ipython()
             if ipinst is not None:
-                ipinst.hooks.synchronize_with_editor(filepath, lnum, 0)
+                ipinst.hooks.synchronize_with_editor(frame_info.filename, frame_info.lineno, 0)
 
         return [[head] + frames + [''.join(formatted_exception[0])]]
 
     def get_records(self, etb, number_of_lines_of_context, tb_offset):
-        try:
-            # Try the default getinnerframes and Alex's: Alex's fixes some
-            # problems, but it generates empty tracebacks for console errors
-            # (5 blanks lines) where none should be returned.
-            return _fixed_getinnerframes(etb, number_of_lines_of_context, tb_offset)
-        except UnicodeDecodeError:
-            # This can occur if a file's encoding magic comment is wrong.
-            # I can't see a way to recover without duplicating a bunch of code
-            # from the stdlib traceback module. --TK
-            error('\nUnicodeDecodeError while processing traceback.\n')
-            return None
-        except:
-            # FIXME: I've been getting many crash reports from python 2.3
-            # users, traceable to inspect.py.  If I can find a small test-case
-            # to reproduce this, I should either write a better workaround or
-            # file a bug report against inspect (if that's the real problem).
-            # So far, I haven't been able to find an isolated example to
-            # reproduce the problem.
-            inspect_error()
-            traceback.print_exc(file=self.ostream)
-            info('\nUnfortunately, your original traceback can not be constructed.\n')
-            return None
+        context = number_of_lines_of_context - 1
+        after = context // 2
+        before = context - after
+        options = stack_data.Options(before=before, after=after)
+        return list(stack_data.FrameInfo.stack_data(etb, options=options))[tb_offset:]
 
     def structured_traceback(self, etype, evalue, etb, tb_offset=None,
                              number_of_lines_of_context=5):

From 5471d4a427ab6b7486612d89ffbee1d8927f669d Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Thu, 12 Dec 2019 22:56:47 +0200
Subject: [PATCH 0002/1407] Handle stackdata.RepeatedFrames

---
 IPython/core/ultratb.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index f7fb9e3a226..96a4a48f2db 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -588,6 +588,11 @@ def format_record(self, frame_info):
         """Format a single stack frame"""
         Colors = self.Colors  # just a shorthand + quicker name lookup
         ColorsNormal = Colors.Normal  # used a lot
+
+        if isinstance(frame_info, stack_data.RepeatedFrames):
+            return '    %s[... skipping similar frames: %s]%s\n' % (
+                Colors.excName, frame_info.description, ColorsNormal)
+
         col_scheme = self.color_scheme_table.active_scheme_name
         indent = ' ' * INDENT_SIZE
         em_normal = '%s\n%s%s' % (Colors.valEm, indent, ColorsNormal)

From 245012e25756a7a4ed317e332e2ad47e89c39660 Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Thu, 12 Dec 2019 23:10:22 +0200
Subject: [PATCH 0003/1407] Handle line gaps for truncated pieces

---
 IPython/core/ultratb.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 96a4a48f2db..f7d9fca19b0 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -154,6 +154,10 @@ def _format_traceback_lines(lines, Colors, lvals, _line_format):
     res = []
 
     for stack_line in lines:
+        if stack_line is stack_data.LINE_GAP:
+            res.append('%s   (...)%s\n' % (Colors.linenoEm, Colors.Normal))
+            continue
+
         line = stack_line.text.rstrip('\n') + '\n'
 
         new_line, err = _line_format(line, 'str')

From a0dcb06b3bc084e3fe33e797c90ebcbf82bf5b19 Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Tue, 17 Dec 2019 20:43:15 +0200
Subject: [PATCH 0004/1407] Fix test_ultratb (particularly recursion-related
 tests)

---
 IPython/core/tests/test_ultratb.py | 45 ++++++------------------------
 1 file changed, 9 insertions(+), 36 deletions(-)

diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index 3ab0ce3cf00..71af25231d8 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -8,10 +8,8 @@
 from textwrap import dedent
 import traceback
 import unittest
-from unittest import mock
 
-import IPython.core.ultratb as ultratb
-from IPython.core.ultratb import ColorTB, VerboseTB, find_recursion
+from IPython.core.ultratb import ColorTB, VerboseTB
 
 
 from IPython.testing import tools as tt
@@ -38,16 +36,12 @@ def recursionlimit(frames):
 
     def inner(test_function):
         def wrapper(*args, **kwargs):
-            _orig_rec_limit = ultratb._FRAME_RECURSION_LIMIT
-            ultratb._FRAME_RECURSION_LIMIT = 50
-
             rl = sys.getrecursionlimit()
             sys.setrecursionlimit(frames)
             try:
                 return test_function(*args, **kwargs)
             finally:
                 sys.setrecursionlimit(rl)
-                ultratb._FRAME_RECURSION_LIMIT = _orig_rec_limit
 
         return wrapper
 
@@ -350,45 +344,24 @@ def setUp(self):
         ip.run_cell(self.DEFINITIONS)
 
     def test_no_recursion(self):
-        with tt.AssertNotPrints("frames repeated"):
+        with tt.AssertNotPrints("skipping similar frames"):
             ip.run_cell("non_recurs()")
 
     @recursionlimit(150)
     def test_recursion_one_frame(self):
-        with tt.AssertPrints("1 frames repeated"):
+        with tt.AssertPrints("[... skipping similar frames: r1 at line 5 (95 times)]"):
             ip.run_cell("r1()")
 
     @recursionlimit(150)
     def test_recursion_three_frames(self):
-        with tt.AssertPrints("3 frames repeated"):
+        with tt.AssertPrints(
+            "[... skipping similar frames: "
+            "r3a at line 8 (29 times), "
+            "r3b at line 11 (29 times), "
+            "r3c at line 14 (29 times)]"
+        ):
             ip.run_cell("r3o2()")
 
-    @recursionlimit(150)
-    def test_find_recursion(self):
-        captured = []
-        def capture_exc(*args, **kwargs):
-            captured.append(sys.exc_info())
-        with mock.patch.object(ip, 'showtraceback', capture_exc):
-            ip.run_cell("r3o2()")
-
-        self.assertEqual(len(captured), 1)
-        etype, evalue, tb = captured[0]
-        self.assertIn("recursion", str(evalue))
-
-        records = ip.InteractiveTB.get_records(tb, 3, ip.InteractiveTB.tb_offset)
-        for r in records[:10]:
-            print(r[1:4])
-
-        # The outermost frames should be:
-        # 0: the 'cell' that was running when the exception came up
-        # 1: r3o2()
-        # 2: r3o1()
-        # 3: r3a()
-        # Then repeating r3b, r3c, r3a
-        last_unique, repeat_length = find_recursion(etype, evalue, records)
-        self.assertEqual(last_unique, 2)
-        self.assertEqual(repeat_length, 3)
-
 
 #----------------------------------------------------------------------------
 

From 85d8abf0335ceb909c657895c65fb7cf4ffe1eae Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Tue, 17 Dec 2019 22:08:37 +0200
Subject: [PATCH 0005/1407] Require stack_data

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 593e3a6a0af..9ce9f37c992 100755
--- a/setup.py
+++ b/setup.py
@@ -193,6 +193,7 @@
     'prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1',
     'pygments',
     'backcall',
+    'stack_data',
 ]
 
 # Platform-specific dependencies:

From 4013529c4deeb5a601726905c6da4d2d5cf9e2b0 Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Wed, 18 Dec 2019 23:26:08 +0200
Subject: [PATCH 0006/1407] Update doctests. Use repr when showing variables

---
 IPython/core/tests/test_iplib.py | 17 ++++-------------
 IPython/core/ultratb.py          |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index adadae56ab9..8f380f93722 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -65,8 +65,8 @@ def doctest_tb_context():
 ZeroDivisionError                         Traceback (most recent call last)
 <BLANKLINE>
 ... in <module>
+     29     except IndexError:
      30         mode = 'div'
-     31 
 ---> 32     bar(mode)
 <BLANKLINE>
 ... in bar(mode)
@@ -80,8 +80,6 @@ def doctest_tb_context():
       6     x = 1
       7     y = 0
 ----> 8     x/y
-      9 
-     10 def sysexit(stat, mode):
 <BLANKLINE>
 ZeroDivisionError: ...
 """
@@ -97,17 +95,15 @@ def doctest_tb_verbose():
 ZeroDivisionError                         Traceback (most recent call last)
 <BLANKLINE>
 ... in <module>
+     29     except IndexError:
      30         mode = 'div'
-     31 
 ---> 32     bar(mode)
-        global bar = <function bar at ...>
-        global mode = 'div'
+        mode = 'div'
 <BLANKLINE>
 ... in bar(mode='div')
      14     "bar"
      15     if mode=='div':
 ---> 16         div0()
-        global div0 = <function div0 at ...>
      17     elif mode=='exit':
      18         try:
 <BLANKLINE>
@@ -117,8 +113,6 @@ def doctest_tb_verbose():
 ----> 8     x/y
         x = 1
         y = 0
-      9 
-     10 def sysexit(stat, mode):
 <BLANKLINE>
 ZeroDivisionError: ...
       """
@@ -154,8 +148,8 @@ def doctest_tb_sysexit():
 SystemExit                                Traceback (most recent call last)
 <BLANKLINE>
 ...<module>
+     29     except IndexError:
      30         mode = 'div'
-     31 
 ---> 32     bar(mode)
 <BLANKLINE>
 ...bar(mode)
@@ -166,11 +160,8 @@ def doctest_tb_sysexit():
      24         raise ValueError('Unknown mode')
 <BLANKLINE>
 ...sysexit(stat, mode)
-      9 
      10 def sysexit(stat, mode):
 ---> 11     raise SystemExit(stat, 'Mode = %s' % mode)
-     12 
-     13 def bar(mode):
 <BLANKLINE>
 SystemExit: (2, 'Mode = exit')
 
diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index f7d9fca19b0..e8d4fbb6dae 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -646,7 +646,7 @@ def format_record(self, frame_info):
         lvals_list = []
         if self.include_vars:
             for var in frame_info.variables_in_executing_piece:
-                lvals_list.append(tpl_name_val % (var.name, var.value))
+                lvals_list.append(tpl_name_val % (var.name, repr(var.value)))
         if lvals_list:
             lvals = '%s%s' % (indent, em_normal.join(lvals_list))
 

From f302408307b1fea6e5d2059618d405967ee998e3 Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Wed, 18 Dec 2019 23:56:25 +0200
Subject: [PATCH 0007/1407] Remove all tokenizing stuff

---
 IPython/core/tests/test_ultratb.py | 32 ------------------------------
 IPython/core/ultratb.py            |  6 ------
 2 files changed, 38 deletions(-)

diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index 71af25231d8..83939ef7ff1 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -405,35 +405,3 @@ def eggs(f, g, z=globals()):
     except:
         handler(*sys.exc_info())
     buff.write('')
-
-from IPython.testing.decorators import skipif
-
-class TokenizeFailureTest(unittest.TestCase):
-    """Tests related to https://github.com/ipython/ipython/issues/6864."""
-
-    # that appear to test that we are handling an exception that can be thrown
-    # by the tokenizer due to a bug that seem to have been fixed in 3.8, though
-    # I'm unsure if other sequences can make it raise this error. Let's just
-    # skip in 3.8 for now
-    @skipif(sys.version_info > (3,8))
-    def testLogging(self):
-        message = "An unexpected error occurred while tokenizing input"
-        cell = 'raise ValueError("""a\nb""")'
-
-        stream = io.StringIO()
-        handler = logging.StreamHandler(stream)
-        logger = logging.getLogger()
-        loglevel = logger.level
-        logger.addHandler(handler)
-        self.addCleanup(lambda: logger.removeHandler(handler))
-        self.addCleanup(lambda: logger.setLevel(loglevel))
-
-        logger.setLevel(logging.INFO)
-        with tt.AssertNotPrints(message):
-            ip.run_cell(cell)
-        self.assertNotIn(message, stream.getvalue())
-
-        logger.setLevel(logging.DEBUG)
-        with tt.AssertNotPrints(message):
-            ip.run_cell(cell)
-        self.assertIn(message, stream.getvalue())
diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index e8d4fbb6dae..fe08e68a8f2 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -94,16 +94,10 @@
 import pydoc
 import sys
 import time
-import tokenize
 import traceback
 
 import stack_data
 
-try:  # Python 2
-    generate_tokens = tokenize.generate_tokens
-except AttributeError:  # Python 3
-    generate_tokens = tokenize.tokenize
-
 # IPython's own modules
 from IPython import get_ipython
 from IPython.core import debugger

From 5743d5278ac226b1827d89994ece4b0a5949172a Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Fri, 20 Dec 2019 21:37:50 +0200
Subject: [PATCH 0008/1407] Fix doctest_tb_sysexit

---
 IPython/core/tests/test_iplib.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index 8f380f93722..52fafcae422 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -173,31 +173,25 @@ def doctest_tb_sysexit():
 SystemExit                                Traceback (most recent call last)
 <BLANKLINE>
 ... in <module>
+     29     except IndexError:
      30         mode = 'div'
-     31 
 ---> 32     bar(mode)
-        global bar = <function bar at ...>
-        global mode = 'exit'
+        mode = 'exit'
 <BLANKLINE>
 ... in bar(mode='exit')
      20         except:
      21             stat = 1
 ---> 22         sysexit(stat, mode)
-        global sysexit = <function sysexit at ...>
-        stat = 2
         mode = 'exit'
+        stat = 2
      23     else:
      24         raise ValueError('Unknown mode')
 <BLANKLINE>
 ... in sysexit(stat=2, mode='exit')
-      9 
      10 def sysexit(stat, mode):
 ---> 11     raise SystemExit(stat, 'Mode = %s' % mode)
-        global SystemExit = undefined
         stat = 2
         mode = 'exit'
-     12 
-     13 def bar(mode):
 <BLANKLINE>
 SystemExit: (2, 'Mode = exit')
     """

From 6335e7281a9df5966bd62bff0c09494964d14485 Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Sat, 21 Dec 2019 00:17:13 +0200
Subject: [PATCH 0009/1407] Allow any number of frame repeats in recursion
 tests

---
 IPython/core/tests/test_ultratb.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index 83939ef7ff1..f17972562ec 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -3,6 +3,7 @@
 """
 import io
 import logging
+import re
 import sys
 import os.path
 from textwrap import dedent
@@ -349,17 +350,19 @@ def test_no_recursion(self):
 
     @recursionlimit(150)
     def test_recursion_one_frame(self):
-        with tt.AssertPrints("[... skipping similar frames: r1 at line 5 (95 times)]"):
+        with tt.AssertPrints(re.compile(
+            r"\[\.\.\. skipping similar frames: r1 at line 5 \(\d{2} times\)\]")
+        ):
             ip.run_cell("r1()")
 
     @recursionlimit(150)
     def test_recursion_three_frames(self):
-        with tt.AssertPrints(
-            "[... skipping similar frames: "
-            "r3a at line 8 (29 times), "
-            "r3b at line 11 (29 times), "
-            "r3c at line 14 (29 times)]"
-        ):
+        with tt.AssertPrints(re.compile(
+            r"\[\.\.\. skipping similar frames: "
+            r"r3a at line 8 \(\d{2} times\), "
+            r"r3b at line 11 \(\d{2} times\), "
+            r"r3c at line 14 \(\d{2} times\)\]"
+        )):
             ip.run_cell("r3o2()")
 
 

From 01b1cdfb5ae129a4e5a7fe5e6151fdede0f50aa6 Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Sat, 21 Dec 2019 00:31:14 +0200
Subject: [PATCH 0010/1407] Allow repeated frames in any order in test

---
 IPython/core/tests/test_ultratb.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index f17972562ec..7e20a4b60b5 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -357,12 +357,10 @@ def test_recursion_one_frame(self):
 
     @recursionlimit(150)
     def test_recursion_three_frames(self):
-        with tt.AssertPrints(re.compile(
-            r"\[\.\.\. skipping similar frames: "
-            r"r3a at line 8 \(\d{2} times\), "
-            r"r3b at line 11 \(\d{2} times\), "
-            r"r3c at line 14 \(\d{2} times\)\]"
-        )):
+        with tt.AssertPrints("[... skipping similar frames: "), \
+                tt.AssertPrints(re.compile(r"r3a at line 8 \(\d{2} times\)"), suppress=False), \
+                tt.AssertPrints(re.compile(r"r3b at line 11 \(\d{2} times\)"), suppress=False), \
+                tt.AssertPrints(re.compile(r"r3c at line 14 \(\d{2} times\)"), suppress=False):
             ip.run_cell("r3o2()")
 
 

From a9d2a6869b6a75f7a77061c8691357a8920f9022 Mon Sep 17 00:00:00 2001
From: Inception95 <yangyiheng@inspur.com>
Date: Tue, 11 Feb 2020 15:33:11 -0800
Subject: [PATCH 0011/1407] Pop the last if path ends with slash

---
 IPython/terminal/ptutils.py                    | 1 +
 IPython/terminal/tests/test_interactivshell.py | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/IPython/terminal/ptutils.py b/IPython/terminal/ptutils.py
index 4f21cb04e35..cda26973299 100644
--- a/IPython/terminal/ptutils.py
+++ b/IPython/terminal/ptutils.py
@@ -42,6 +42,7 @@ def _elide(string, *, min_elide=30):
 
     object_parts = string.split('.')
     file_parts = string.split(os.sep)
+    file_parts.pop() if file_parts[-1] == '' else None
 
     if len(object_parts) > 3:
         return '{}.{}\N{HORIZONTAL ELLIPSIS}{}.{}'.format(object_parts[0], object_parts[1][0], object_parts[-2][-1], object_parts[-1])
diff --git a/IPython/terminal/tests/test_interactivshell.py b/IPython/terminal/tests/test_interactivshell.py
index 9651a224dad..6bacc8ea48a 100644
--- a/IPython/terminal/tests/test_interactivshell.py
+++ b/IPython/terminal/tests/test_interactivshell.py
@@ -5,6 +5,7 @@
 
 import sys
 import unittest
+import os
 
 from IPython.core.inputtransformer import InputTransformer
 from IPython.testing import tools as tt
@@ -19,6 +20,10 @@ def test_elide(self):
         _elide('concatenate((a1, a2, ...), axis') # do not raise
         _elide('concatenate((a1, a2, ..), . axis') # do not raise
         nt.assert_equal(_elide('aaaa.bbbb.ccccc.dddddd.eeeee.fffff.gggggg.hhhhhh'), 'aaaa.b…g.hhhhhh')
+        
+        test_string = os.sep.join(['', 10*'a', 10*'b', 10*'c', ''])
+        expect_stirng = os.sep + 'a' + '\N{HORIZONTAL ELLIPSIS}' + 'b' + os.sep + 10*'c'
+        nt.assert_equal(_elide(test_string), expect_stirng)
 
 
 class TestContextAwareCompletion(unittest.TestCase):

From 44a51949fbaecb61ac9090b80178bfb6bf0dfa75 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 11 Feb 2020 16:11:01 -0800
Subject: [PATCH 0012/1407] Change version number to reflect that we're working
 toward a 8.x

---
 IPython/core/release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index feb09c0e335..b1c61d9bf48 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -19,8 +19,8 @@
 # IPython version information.  An empty _version_extra corresponds to a full
 # release.  'dev' as a _version_extra string means this is a development
 # version
-_version_major = 7
-_version_minor = 13
+_version_major = 8
+_version_minor = 0
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'

From f7318cfff58b20cae41dcc5b0c05fe8174eb2735 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Wed, 12 Feb 2020 08:51:50 -0800
Subject: [PATCH 0013/1407] Stop testing on -dev, they are broken on travis-ci

pip is missing on recent builds; and remove duplicate 3.7 testing if we
drop -dev suffix
---
 .travis.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cccdfb3db14..f65f4fda796 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,11 +75,7 @@ matrix:
       env: ARM64=True
       sudo: true
     - arch: amd64
-      python: "3.8-dev"
-      dist: xenial
-      sudo: true
-    - arch: amd64
-      python: "3.7-dev"
+      python: "3.8"
       dist: xenial
       sudo: true
     - arch: amd64

From 080452149a59d7215575d5ae8493beca375bb9fc Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 12 Feb 2020 09:17:08 -0800
Subject: [PATCH 0014/1407] Revert "Use update brew tap to fix test failures."

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f65f4fda796..def0d930b97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ before_install:
     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       env | sort
       if ! which python$TRAVIS_PYTHON_VERSION; then
-        HOMEBREW_NO_AUTO_UPDATE=1 brew tap carreau/homebrew-python-frameworks
+        HOMEBREW_NO_AUTO_UPDATE=1 brew tap minrk/homebrew-python-frameworks
         HOMEBREW_NO_AUTO_UPDATE=1 brew cask install python-framework-${TRAVIS_PYTHON_VERSION/./}
       fi
       python3 -m pip install virtualenv

From 1400f5e58a5e5c69fbb5c0e56aaa939ef409a760 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 12 Feb 2020 16:26:43 -0800
Subject: [PATCH 0015/1407] Be more explicit and don't use side effect of
 expression.

---
 IPython/terminal/ptutils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/terminal/ptutils.py b/IPython/terminal/ptutils.py
index cda26973299..47fd6f40612 100644
--- a/IPython/terminal/ptutils.py
+++ b/IPython/terminal/ptutils.py
@@ -42,7 +42,8 @@ def _elide(string, *, min_elide=30):
 
     object_parts = string.split('.')
     file_parts = string.split(os.sep)
-    file_parts.pop() if file_parts[-1] == '' else None
+    if file_parts[-1] == '':
+        file_parts.pop()
 
     if len(object_parts) > 3:
         return '{}.{}\N{HORIZONTAL ELLIPSIS}{}.{}'.format(object_parts[0], object_parts[1][0], object_parts[-2][-1], object_parts[-1])

From fb0abc20aa02d30e9b22b9ec4f560ec6151a9235 Mon Sep 17 00:00:00 2001
From: "Coon, Ethan T" <coonet@ornl.gov>
Date: Thu, 13 Feb 2020 10:39:40 -0500
Subject: [PATCH 0016/1407] Improves detection of whether tab-completion is in
 a string and supresses Jedi.

Refs #10926 and #11530

Jedi results swamp file_matches and dict_key_matches in
tab-completion, which is a real nuisance.  The logic in the jedi
completor tried to catch cases where it was "in a string", but that
logic only looked at the previous character, and was a little fragile,
breaking in lots of cases such as:

'./<tab>
"mypath/<tab>

etc.

This seems a bit more robust in that it searchs for the first token in
the current parser tree and checks if its value starts with ' or ".

This detection of "in a string" then turns of jedi and returns some
sanity to the set of matches.
---
 IPython/core/completer.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 0942798f3b3..5fd92f377ff 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1371,18 +1371,18 @@ def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str):
         try_jedi = True
 
         try:
-            # should we check the type of the node is Error ?
+            # find the first token in the current tree -- if it is a ' or " then we are in a string
+            completing_string = False
             try:
-                # jedi < 0.11
-                from jedi.parser.tree import ErrorLeaf
-            except ImportError:
-                # jedi >= 0.11
-                from parso.tree import ErrorLeaf
+                first_child = next(c for c in interpreter._get_module().tree_node.children if hasattr(c, 'value'))
+            except StopIteration:
+                pass
+            else:
+                # note the value may be ', ", or it may also be ''' or """, or
+                # in some cases, """what/you/typed..., but all of these are
+                # strings.
+                completing_string = len(first_child.value) > 0 and first_child.value[0] in {"'", '"'}
 
-            next_to_last_tree = interpreter._get_module().tree_node.children[-2]
-            completing_string = False
-            if isinstance(next_to_last_tree, ErrorLeaf):
-                completing_string = next_to_last_tree.value.lstrip()[0] in {'"', "'"}
             # if we are in a string jedi is likely not the right candidate for
             # now. Skip it.
             try_jedi = not completing_string

From b5826b358582ef1c7b02acb5de453b41eeab4515 Mon Sep 17 00:00:00 2001
From: Nathan Goldbaum <nathan12343@gmail.com>
Date: Fri, 14 Feb 2020 15:29:14 -0700
Subject: [PATCH 0017/1407] Ensure set_custom_completer is working. Fixes
 #11272

---
 IPython/core/completer.py                   |  4 ++++
 IPython/core/interactiveshell.py            |  2 +-
 IPython/core/tests/test_interactiveshell.py | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 0942798f3b3..9a81d637f15 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -626,6 +626,8 @@ def __init__(self, namespace=None, global_namespace=None, **kwargs):
         else:
             self.global_namespace = global_namespace
 
+        self.custom_matchers = []
+
         super(Completer, self).__init__(**kwargs)
 
     def complete(self, text, state):
@@ -1122,12 +1124,14 @@ def matchers(self):
 
         if self.use_jedi:
             return [
+                *self.custom_matchers,
                 self.file_matches,
                 self.magic_matches,
                 self.dict_key_matches,
             ]
         else:
             return [
+                *self.custom_matchers,
                 self.python_matches,
                 self.file_matches,
                 self.magic_matches,
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 4cbc885cb29..848a14a481c 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2218,7 +2218,7 @@ def set_custom_completer(self, completer, pos=0):
         list where you want the completer to be inserted."""
 
         newcomp = types.MethodType(completer,self.Completer)
-        self.Completer.matchers.insert(pos,newcomp)
+        self.Completer.custom_matchers.insert(pos,newcomp)
 
     def set_completer_frame(self, frame=None):
         """Set the frame of the completer."""
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 578ef27d36f..496e3bd02bc 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -998,3 +998,21 @@ def test_should_run_async():
     assert not ip.should_run_async("a = 5")
     assert ip.should_run_async("await x")
     assert ip.should_run_async("import asyncio; await asyncio.sleep(1)")
+
+
+def test_set_custom_completer():
+    num_completers = len(ip.Completer.matchers)
+
+    def foo(*args, **kwargs):
+        return "I'm a completer!"
+
+    ip.set_custom_completer(foo, 0)
+
+    # check that we've really added a new completer
+    assert len(ip.Completer.matchers) == num_completers + 1
+
+    # check that the first completer is the function we defined
+    assert ip.Completer.matchers[0]() == "I'm a completer!"
+
+    # clean up
+    ip.Completer.custom_matchers.pop()

From e73dcec46701ec3faa074e599dcc998a8e286499 Mon Sep 17 00:00:00 2001
From: Nathan Goldbaum <nathan12343@gmail.com>
Date: Fri, 14 Feb 2020 15:51:50 -0700
Subject: [PATCH 0018/1407] increase timeout for ARM tests

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index def0d930b97..4139cc2b6f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,7 +72,7 @@ matrix:
     - arch: arm64
       python: "3.7"
       dist: xenial
-      env: ARM64=True
+      env: ARM64=True IPYTHON_TESTING_TIMEOUT_SCALE=2
       sudo: true
     - arch: amd64
       python: "3.8"

From edc1a29fb6095ea0afa95a573ab9888c229d1e18 Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Sun, 16 Feb 2020 10:08:30 +0200
Subject: [PATCH 0019/1407] Use Pygments instead of PyColorize to syntax
 highlight tracebacks

---
 IPython/core/ultratb.py | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index fe08e68a8f2..aabb76c02c1 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -97,13 +97,13 @@
 import traceback
 
 import stack_data
+from pygments.formatters.terminal import TerminalFormatter
 
 # IPython's own modules
 from IPython import get_ipython
 from IPython.core import debugger
 from IPython.core.display_trap import DisplayTrap
 from IPython.core.excolors import exception_colors
-from IPython.utils import PyColorize
 from IPython.utils import path as util_path
 from IPython.utils import py3compat
 from IPython.utils.terminal import get_terminal_size
@@ -129,7 +129,7 @@
 # (SyntaxErrors have to be treated specially because they have no traceback)
 
 
-def _format_traceback_lines(lines, Colors, lvals, _line_format):
+def _format_traceback_lines(lines, Colors, lvals):
     """
     Format tracebacks lines with pointing arrow, leading numbers...
 
@@ -141,8 +141,6 @@ def _format_traceback_lines(lines, Colors, lvals, _line_format):
         ColorScheme used.
     lvals: str
         Values of local variables, already colored, to inject just after the error line.
-    _line_format: f (str) -> (str, bool)
-        return (colorized version of str, failure to do so)
     """
     numbers_width = INDENT_SIZE - 1
     res = []
@@ -152,23 +150,18 @@ def _format_traceback_lines(lines, Colors, lvals, _line_format):
             res.append('%s   (...)%s\n' % (Colors.linenoEm, Colors.Normal))
             continue
 
-        line = stack_line.text.rstrip('\n') + '\n'
-
-        new_line, err = _line_format(line, 'str')
-        if not err:
-            line = new_line
-
+        line = stack_line.render(pygmented=True).rstrip('\n') + '\n'
         lineno = stack_line.lineno
         if stack_line.is_current:
             # This is the line with the error
             pad = numbers_width - len(str(lineno))
             num = '%s%s' % (debugger.make_arrow(pad), str(lineno))
-            line = '%s%s%s %s%s' % (Colors.linenoEm, num,
-                                    Colors.line, line, Colors.Normal)
+            start_color = Colors.linenoEm
         else:
             num = '%*s' % (numbers_width, lineno)
-            line = '%s%s%s %s' % (Colors.lineno, num,
-                                  Colors.Normal, line)
+            start_color = Colors.lineno
+        
+        line = '%s%s%s %s' % (start_color, num, Colors.Normal, line)
 
         res.append(line)
         if lvals and stack_line.is_current:
@@ -591,7 +584,6 @@ def format_record(self, frame_info):
             return '    %s[... skipping similar frames: %s]%s\n' % (
                 Colors.excName, frame_info.description, ColorsNormal)
 
-        col_scheme = self.color_scheme_table.active_scheme_name
         indent = ' ' * INDENT_SIZE
         em_normal = '%s\n%s%s' % (Colors.valEm, indent, ColorsNormal)
         tpl_link = '%s%%s%s' % (Colors.filenameEm, ColorsNormal)
@@ -646,8 +638,7 @@ def format_record(self, frame_info):
 
         result = '%s %s\n' % (link, call)
 
-        _line_format = PyColorize.Parser(style=col_scheme, parent=self).format2
-        result += ''.join(_format_traceback_lines(frame_info.lines, Colors, lvals, _line_format))
+        result += ''.join(_format_traceback_lines(frame_info.lines, Colors, lvals))
         return result
 
     def prepare_header(self, etype, long_version=False):
@@ -718,7 +709,7 @@ def get_records(self, etb, number_of_lines_of_context, tb_offset):
         context = number_of_lines_of_context - 1
         after = context // 2
         before = context - after
-        options = stack_data.Options(before=before, after=after)
+        options = stack_data.Options(before=before, after=after, pygments_formatter=TerminalFormatter())
         return list(stack_data.FrameInfo.stack_data(etb, options=options))[tb_offset:]
 
     def structured_traceback(self, etype, evalue, etb, tb_offset=None,

From bebaa9e29e60adb69658fb983b427fce2e973369 Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Sun, 16 Feb 2020 12:53:57 +0200
Subject: [PATCH 0020/1407] Increase recursion limit in test_ultratb since
 pygments calls get very deep.

---
 IPython/core/tests/test_ultratb.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index 7e20a4b60b5..209c9c4a423 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -348,14 +348,14 @@ def test_no_recursion(self):
         with tt.AssertNotPrints("skipping similar frames"):
             ip.run_cell("non_recurs()")
 
-    @recursionlimit(150)
+    @recursionlimit(200)
     def test_recursion_one_frame(self):
         with tt.AssertPrints(re.compile(
-            r"\[\.\.\. skipping similar frames: r1 at line 5 \(\d{2} times\)\]")
+            r"\[\.\.\. skipping similar frames: r1 at line 5 \(\d{2,3} times\)\]")
         ):
             ip.run_cell("r1()")
 
-    @recursionlimit(150)
+    @recursionlimit(200)
     def test_recursion_three_frames(self):
         with tt.AssertPrints("[... skipping similar frames: "), \
                 tt.AssertPrints(re.compile(r"r3a at line 8 \(\d{2} times\)"), suppress=False), \

From 71199efeb8fed92f29aee69360a0a7bc4cf97abb Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 16 Feb 2020 19:56:39 +0100
Subject: [PATCH 0021/1407] Use default shortcuts with terminal debugger

This uses `create_ipython_shortcuts` also for `TerminalPdb`, which then
allows for using e.g. `F2` there also etc.

`create_ipython_shortcuts` is used in
`TerminalInteractiveShell.init_prompt_toolkit_cli` otherwise only, also
passing them to `PromptSession` then only.
Therefore this could be done there (in `PromptSession`) by default maybe
even.
---
 IPython/terminal/debugger.py | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index 475c6b8ca94..030e4ae8689 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -6,7 +6,7 @@
 
 from IPython.core.completer import IPCompleter
 from .ptutils import IPythonPTCompleter
-from .shortcuts import suspend_to_bg, cursor_in_leading_ws
+from .shortcuts import create_ipython_shortcuts, suspend_to_bg, cursor_in_leading_ws
 
 from prompt_toolkit.enums import DEFAULT_BUFFER
 from prompt_toolkit.filters import (Condition, has_focus, has_selection,
@@ -42,21 +42,10 @@ def get_prompt_tokens():
                                        )
             self._ptcomp = IPythonPTCompleter(compl)
 
-        kb = KeyBindings()
-        supports_suspend = Condition(lambda: hasattr(signal, 'SIGTSTP'))
-        kb.add('c-z', filter=supports_suspend)(suspend_to_bg)
-
-        if self.shell.display_completions == 'readlinelike':
-            kb.add('tab', filter=(has_focus(DEFAULT_BUFFER)
-                                  & ~has_selection
-                                  & vi_insert_mode | emacs_insert_mode
-                                  & ~cursor_in_leading_ws
-                              ))(display_completions_like_readline)
-
         options = dict(
             message=(lambda: PygmentsTokens(get_prompt_tokens())),
             editing_mode=getattr(EditingMode, self.shell.editing_mode.upper()),
-            key_bindings=kb,
+            key_bindings=create_ipython_shortcuts(self.shell),
             history=self.shell.debugger_history,
             completer=self._ptcomp,
             enable_history_search=True,

From 534e3c995b1e2744705428706d35f20dabbb1c45 Mon Sep 17 00:00:00 2001
From: Nathan Goldbaum <nathan12343@gmail.com>
Date: Thu, 20 Feb 2020 15:57:30 -0700
Subject: [PATCH 0022/1407] add configuration controlling whether the CWD gets
 added to sys.path

---
 IPython/core/shellapp.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py
index 3147c59f9f6..33052c44d15 100644
--- a/IPython/core/shellapp.py
+++ b/IPython/core/shellapp.py
@@ -60,6 +60,10 @@
     colours.""",
     "Disable using colors for info related things."
 )
+addflag('ignore-cwd', 'InteractiveShellApp.ignore_cwd',
+        "Exclude the current working directory from sys.path",
+        "Include the current working directory in sys.path",
+)
 nosep_config = Config()
 nosep_config.InteractiveShell.separate_in = ''
 nosep_config.InteractiveShell.separate_out = ''
@@ -168,6 +172,12 @@ class InteractiveShellApp(Configurable):
         When False, pylab mode should not import any names into the user namespace.
         """
     ).tag(config=True)
+    ignore_cwd = Bool(
+        False,
+        help="""If True, IPython will not add the current working directory to sys.path.
+        When False, the current working directory is added to sys.path, allowing imports
+        of modules defined in the current directory."""
+    ).tag(config=True)
     shell = Instance('IPython.core.interactiveshell.InteractiveShellABC',
                      allow_none=True)
     # whether interact-loop should start
@@ -189,8 +199,10 @@ def init_path(self):
 
         .. versionchanged:: 7.2
             Try to insert after the standard library, instead of first.
+        .. versionchanged:: 8.0
+            Allow optionally not including the current directory in sys.path
         """
-        if '' in sys.path:
+        if '' in sys.path or self.ignore_cwd:
             return
         for idx, path in enumerate(sys.path):
             parent, last_part = os.path.split(path)

From 261bc98cb1213be2c22eebe35f4fdf77158e365d Mon Sep 17 00:00:00 2001
From: Augusto <augusto@britecore.com>
Date: Thu, 20 Feb 2020 22:26:13 -0300
Subject: [PATCH 0023/1407] Set up automatic release notes

---
 .github/workflows/release-notes.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/workflows/release-notes.yml

diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
new file mode 100644
index 00000000000..d895f2d924c
--- /dev/null
+++ b/.github/workflows/release-notes.yml
@@ -0,0 +1,16 @@
+# Trigger the workflow on milestone events
+on: 
+  milestone:
+    types: [closed]
+name: New Release
+jobs:
+  create-release-notes:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Create Release Notes
+      uses: docker://decathlon/release-notes-generator-action:2.0.1
+      env:
+        GITHUB_TOKEN: ${{ secrets.RELEASE_NOTES_TOKEN }}
+        OUTPUT_FOLDER: temp_release_notes
+        USE_MILESTONE_TITLE: "true"

From 15172451fd652ca7d81b3b990e4eaa2dd53ea16d Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 21 Feb 2020 14:00:49 -0500
Subject: [PATCH 0024/1407] Test that the system() subprocess can be
 interrupted.

---
 IPython/utils/tests/test_process.py | 30 ++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index 0c81138cd19..1e03e75e91c 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -16,6 +16,9 @@
 
 import sys
 import os
+import time
+from _thread import interrupt_main  # Py 3
+import threading
 
 import nose.tools as nt
 
@@ -107,6 +110,29 @@ def test_system_quotes(self):
         status = system('%s -c "import sys"' % python)
         self.assertEqual(status, 0)
 
+    def test_system_interrupt(self):
+        """
+        When interrupted in the way ipykernel interrupts IPython, the
+        subprocess is interrupted.
+        """
+        if threading.main_thread() != threading.current_thread():
+            raise nt.SkipTest("Can't run this test if not in main thread.")
+
+        def interrupt():
+            # Wait for subprocess to start:
+            time.sleep(0.5)
+            interrupt_main()
+
+        threading.Thread(target=interrupt).start()
+        try:
+            status = system('%s -c "import time; time.sleep(5)"' % python)
+        except KeyboardInterrupt:
+            # Success!
+            return
+        self.assertNotEqual(
+            status, 0, "The process wasn't interrupted. Status: %s" % (status,)
+        )
+
     def test_getoutput(self):
         out = getoutput('%s "%s"' % (python, self.fname))
         # we can't rely on the order the line buffered streams are flushed
@@ -131,7 +157,7 @@ def test_getoutput_error(self):
         out, err = getoutputerror('%s "%s"' % (python, self.fname))
         self.assertEqual(out, 'on stdout')
         self.assertEqual(err, 'on stderr')
-    
+
     def test_get_output_error_code(self):
         quiet_exit = '%s -c "import sys; sys.exit(1)"' % python
         out, err, code = get_output_error_code(quiet_exit)
@@ -142,3 +168,5 @@ def test_get_output_error_code(self):
         self.assertEqual(out, 'on stdout')
         self.assertEqual(err, 'on stderr')
         self.assertEqual(code, 0)
+
+        

From bfd4fd2f8fdca88d7758a2f7af03b247ec0d9a44 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 21 Feb 2020 16:14:15 -0500
Subject: [PATCH 0025/1407] Also run unit tests, some of them are system
 specific.

---
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index b79c7f26ff4..a6f897daed3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,3 +36,4 @@ install:
   - "%CMD_IN_ENV%  cd results"
 test_script:
   - "%CMD_IN_ENV%  iptest --coverage xml"
+  - "%CMD_IN_ENV%  pytest IPython"

From c7cb9de69737dc7a3d4a88e4852d1c738d760e5f Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 21 Feb 2020 16:18:17 -0500
Subject: [PATCH 0026/1407] See if test is running on Windows.

---
 IPython/utils/tests/test_process.py | 1 +
 appveyor.yml                        | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index 1e03e75e91c..78f27fb4a5d 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -115,6 +115,7 @@ def test_system_interrupt(self):
         When interrupted in the way ipykernel interrupts IPython, the
         subprocess is interrupted.
         """
+        raise RuntimeError("Is this even being run on Windows?")
         if threading.main_thread() != threading.current_thread():
             raise nt.SkipTest("Can't run this test if not in main thread.")
 
diff --git a/appveyor.yml b/appveyor.yml
index a6f897daed3..b79c7f26ff4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,4 +36,3 @@ install:
   - "%CMD_IN_ENV%  cd results"
 test_script:
   - "%CMD_IN_ENV%  iptest --coverage xml"
-  - "%CMD_IN_ENV%  pytest IPython"

From f34471502949d4d526e1eb1214b8eb1c72ee9c87 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 21 Feb 2020 16:23:05 -0500
Subject: [PATCH 0027/1407] Is it not in main thread?

---
 IPython/utils/tests/test_process.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index 78f27fb4a5d..023e2e75538 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -115,8 +115,8 @@ def test_system_interrupt(self):
         When interrupted in the way ipykernel interrupts IPython, the
         subprocess is interrupted.
         """
-        raise RuntimeError("Is this even being run on Windows?")
         if threading.main_thread() != threading.current_thread():
+            raise RuntimeEror("Not in main thread")
             raise nt.SkipTest("Can't run this test if not in main thread.")
 
         def interrupt():

From b156d6954058af82c7b1adff273e6fd48b4dab26 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 21 Feb 2020 16:27:31 -0500
Subject: [PATCH 0028/1407] Make sure it exited quickly.

---
 IPython/utils/tests/test_process.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index 023e2e75538..e1ae51c9f77 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -116,7 +116,6 @@ def test_system_interrupt(self):
         subprocess is interrupted.
         """
         if threading.main_thread() != threading.current_thread():
-            raise RuntimeEror("Not in main thread")
             raise nt.SkipTest("Can't run this test if not in main thread.")
 
         def interrupt():
@@ -125,14 +124,19 @@ def interrupt():
             interrupt_main()
 
         threading.Thread(target=interrupt).start()
+        start = time.time()
         try:
             status = system('%s -c "import time; time.sleep(5)"' % python)
         except KeyboardInterrupt:
             # Success!
             return
+        end = time.time()
         self.assertNotEqual(
             status, 0, "The process wasn't interrupted. Status: %s" % (status,)
         )
+        self.assertTrue(
+            end - start < 2, "Process didn't die quickly: %s" % (end - start)
+        )
 
     def test_getoutput(self):
         out = getoutput('%s "%s"' % (python, self.fname))

From 356ea80d838dc945a229d2f830718761d73933e0 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 21 Feb 2020 16:40:05 -0500
Subject: [PATCH 0029/1407] Add interrupt test for getoutput(); disabled for
 now.

---
 IPython/utils/tests/test_process.py | 36 +++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index e1ae51c9f77..dc12a7c826a 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -19,6 +19,7 @@
 import time
 from _thread import interrupt_main  # Py 3
 import threading
+from unittest import SkipTest
 
 import nose.tools as nt
 
@@ -110,10 +111,9 @@ def test_system_quotes(self):
         status = system('%s -c "import sys"' % python)
         self.assertEqual(status, 0)
 
-    def test_system_interrupt(self):
+    def assert_interrupts(self, command):
         """
-        When interrupted in the way ipykernel interrupts IPython, the
-        subprocess is interrupted.
+        Interrupt a subprocess after a second.
         """
         if threading.main_thread() != threading.current_thread():
             raise nt.SkipTest("Can't run this test if not in main thread.")
@@ -126,17 +126,28 @@ def interrupt():
         threading.Thread(target=interrupt).start()
         start = time.time()
         try:
-            status = system('%s -c "import time; time.sleep(5)"' % python)
+            result = command()
         except KeyboardInterrupt:
             # Success!
             return
         end = time.time()
-        self.assertNotEqual(
-            status, 0, "The process wasn't interrupted. Status: %s" % (status,)
-        )
         self.assertTrue(
             end - start < 2, "Process didn't die quickly: %s" % (end - start)
         )
+        return result
+
+    def test_system_interrupt(self):
+        """
+        When interrupted in the way ipykernel interrupts IPython, the
+        subprocess is interrupted.
+        """
+        def command():
+            return system('%s -c "import time; time.sleep(5)"' % python)
+
+        status = self.assert_interrupts(command)
+        self.assertNotEqual(
+            status, 0, "The process wasn't interrupted. Status: %s" % (status,)
+        )
 
     def test_getoutput(self):
         out = getoutput('%s "%s"' % (python, self.fname))
@@ -146,6 +157,17 @@ def test_getoutput(self):
         except AssertionError:
             self.assertEqual(out, 'on stdouton stderr')
 
+    def test_getoutput_interrupt(self):
+        """
+        When interrupted in the way ipykernel interrupts IPython, the
+        subprocess is interrupted.
+        """
+        raise SkipTest("This fails on POSIX too, revisit in future.")
+        def command():
+            return getoutput('%s -c "import time; time.sleep(5)"' % (python, ))
+
+        self.assert_interrupts(command)
+
     def test_getoutput_quoted(self):
         out = getoutput('%s -c "print (1)"' % python)
         self.assertEqual(out.strip(), '1')

From 0cc916d47a423c40ddb15208cfd8582573bc08a0 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 21 Feb 2020 16:58:22 -0500
Subject: [PATCH 0030/1407] Attempt to make Popen.wait() interruptible.

---
 IPython/utils/_process_win32.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py
index fb17e4c5d37..b5edd2b53b4 100644
--- a/IPython/utils/_process_win32.py
+++ b/IPython/utils/_process_win32.py
@@ -21,7 +21,7 @@
 
 from ctypes import c_int, POINTER
 from ctypes.wintypes import LPCWSTR, HLOCAL
-from subprocess import STDOUT
+from subprocess import STDOUT, TimeoutExpired
 
 # our own imports
 from ._process_common import read_no_interrupt, process_handler, arg_split as py_arg_split
@@ -100,8 +100,14 @@ def _system_body(p):
         line = line.decode(enc, 'replace')
         print(line, file=sys.stderr)
 
-    # Wait to finish for returncode
-    return p.wait()
+    # Wait to finish for returncode. Unfortunately, Python has a bug where
+    # wait() isn't interruptible (https://bugs.python.org/issue28168) so poll in
+    # a loop instead of just doing `return p.wait()`.
+    while True:
+        try:
+            return p.wait(0.01)
+        except TimeoutExpired:
+            pass
 
 
 def system(cmd):

From 080263d2ed5217ce925753acbb6b02702b5d6219 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 21 Feb 2020 17:07:36 -0500
Subject: [PATCH 0031/1407] A different approach, avoiding wait() altogether.

---
 IPython/utils/_process_win32.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py
index b5edd2b53b4..149b5dc095b 100644
--- a/IPython/utils/_process_win32.py
+++ b/IPython/utils/_process_win32.py
@@ -18,6 +18,7 @@
 import os
 import sys
 import ctypes
+import time
 
 from ctypes import c_int, POINTER
 from ctypes.wintypes import LPCWSTR, HLOCAL
@@ -104,10 +105,11 @@ def _system_body(p):
     # wait() isn't interruptible (https://bugs.python.org/issue28168) so poll in
     # a loop instead of just doing `return p.wait()`.
     while True:
-        try:
-            return p.wait(0.01)
-        except TimeoutExpired:
-            pass
+        result = p.poll()
+        if result is None:
+            time.sleep(0.01)
+        else:
+            return result
 
 
 def system(cmd):

From 660d44f7c4f24ceb2ed7a679e20b929141c0c137 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 21 Feb 2020 17:20:06 -0500
Subject: [PATCH 0032/1407] Debug prints.

---
 IPython/utils/_process_win32.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py
index 149b5dc095b..4bf1543de30 100644
--- a/IPython/utils/_process_win32.py
+++ b/IPython/utils/_process_win32.py
@@ -94,6 +94,7 @@ def _find_cmd(cmd):
 def _system_body(p):
     """Callback for _system."""
     enc = DEFAULT_ENCODING
+    print("READING...")
     for line in read_no_interrupt(p.stdout).splitlines():
         line = line.decode(enc, 'replace')
         print(line, file=sys.stdout)
@@ -106,6 +107,7 @@ def _system_body(p):
     # a loop instead of just doing `return p.wait()`.
     while True:
         result = p.poll()
+        print("POLLED")
         if result is None:
             time.sleep(0.01)
         else:

From 9f40a0695d7348150a7c0144fc474ebd4a24995d Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Sat, 22 Feb 2020 15:13:50 +0200
Subject: [PATCH 0033/1407] Check user config to decide whether to use pygments

---
 IPython/core/ultratb.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index aabb76c02c1..512594736e7 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -97,7 +97,7 @@
 import traceback
 
 import stack_data
-from pygments.formatters.terminal import TerminalFormatter
+from pygments.formatters.terminal256 import Terminal256Formatter
 
 # IPython's own modules
 from IPython import get_ipython
@@ -129,7 +129,7 @@
 # (SyntaxErrors have to be treated specially because they have no traceback)
 
 
-def _format_traceback_lines(lines, Colors, lvals):
+def _format_traceback_lines(lines, Colors, has_colors, lvals):
     """
     Format tracebacks lines with pointing arrow, leading numbers...
 
@@ -150,7 +150,7 @@ def _format_traceback_lines(lines, Colors, lvals):
             res.append('%s   (...)%s\n' % (Colors.linenoEm, Colors.Normal))
             continue
 
-        line = stack_line.render(pygmented=True).rstrip('\n') + '\n'
+        line = stack_line.render(pygmented=has_colors).rstrip('\n') + '\n'
         lineno = stack_line.lineno
         if stack_line.is_current:
             # This is the line with the error
@@ -246,6 +246,10 @@ def prepare_chained_exception_message(self, cause):
             message = [[exception_during_handling]]
         return message
 
+    @property
+    def has_colors(self):
+        return self.color_scheme_table.active_scheme_name.lower() != "nocolor"
+
     def set_colors(self, *args, **kw):
         """Shorthand access to the color table scheme selector method."""
 
@@ -638,7 +642,7 @@ def format_record(self, frame_info):
 
         result = '%s %s\n' % (link, call)
 
-        result += ''.join(_format_traceback_lines(frame_info.lines, Colors, lvals))
+        result += ''.join(_format_traceback_lines(frame_info.lines, Colors, self.has_colors, lvals))
         return result
 
     def prepare_header(self, etype, long_version=False):
@@ -709,7 +713,15 @@ def get_records(self, etb, number_of_lines_of_context, tb_offset):
         context = number_of_lines_of_context - 1
         after = context // 2
         before = context - after
-        options = stack_data.Options(before=before, after=after, pygments_formatter=TerminalFormatter())
+        if self.has_colors:
+            formatter = Terminal256Formatter()
+        else:
+            formatter = None
+        options = stack_data.Options(
+            before=before,
+            after=after,
+            pygments_formatter=formatter,
+        )
         return list(stack_data.FrameInfo.stack_data(etb, options=options))[tb_offset:]
 
     def structured_traceback(self, etype, evalue, etb, tb_offset=None,

From 4686edc9c88c53dbfcc5433c123bcef5b7544a1e Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 24 Feb 2020 09:29:01 -0500
Subject: [PATCH 0034/1407] Test for filling stderr buffer.

---
 IPython/utils/tests/test_process.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index dc12a7c826a..a4369e3339e 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -26,6 +26,7 @@
 from IPython.utils.process import (find_cmd, FindCmdError, arg_split,
                                    system, getoutput, getoutputerror,
                                    get_output_error_code)
+from IPython.utils.capture import capture_output
 from IPython.testing import decorators as dec
 from IPython.testing import tools as tt
 
@@ -149,6 +150,16 @@ def command():
             status, 0, "The process wasn't interrupted. Status: %s" % (status,)
         )
 
+    def test_stderr_while_stdout_open(self):
+        """
+        If lots of data is written to stderr while stdout is still open, enough
+        data to fill the pipe buffer in fact, the process still exits (i.e.
+        there is no deadlock).
+        """
+        with capture_output(display=False):
+            system(("%s -c 'import sys\nfor i in range(2000): " +
+                    "sys.stderr.write(\" \" * 100 + \"\\n\")'") % (python,))
+
     def test_getoutput(self):
         out = getoutput('%s "%s"' % (python, self.fname))
         # we can't rely on the order the line buffered streams are flushed

From 4fc3645982e72ded809d6c484790298363021fc7 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 24 Feb 2020 09:46:39 -0500
Subject: [PATCH 0035/1407] Increase write size.

---
 IPython/utils/tests/test_process.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index a4369e3339e..958888c55d7 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -157,7 +157,7 @@ def test_stderr_while_stdout_open(self):
         there is no deadlock).
         """
         with capture_output(display=False):
-            system(("%s -c 'import sys\nfor i in range(2000): " +
+            system(("%s -c 'import sys\nfor i in range(20000): " +
                     "sys.stderr.write(\" \" * 100 + \"\\n\")'") % (python,))
 
     def test_getoutput(self):

From c37a68e233fb4c126c70c99bf75942dedeb14237 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 24 Feb 2020 10:45:36 -0500
Subject: [PATCH 0036/1407] Assert status is OK.

---
 IPython/utils/tests/test_process.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index 958888c55d7..bae941db855 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -157,8 +157,9 @@ def test_stderr_while_stdout_open(self):
         there is no deadlock).
         """
         with capture_output(display=False):
-            system(("%s -c 'import sys\nfor i in range(20000): " +
-                    "sys.stderr.write(\" \" * 100 + \"\\n\")'") % (python,))
+            status = system(("%s -c \"import sys\nfor i in range(20000): " +
+                             "sys.stderr.write('b' * 100)\"") % (python,))
+        self.assertEqual(status, 0)
 
     def test_getoutput(self):
         out = getoutput('%s "%s"' % (python, self.fname))

From 14a4a46b013f8c865c334b27c6d95b529a9d79b0 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 24 Feb 2020 10:57:56 -0500
Subject: [PATCH 0037/1407] Match pre-existing reality.

---
 IPython/utils/_process_win32.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py
index 4bf1543de30..13a1aedb0b1 100644
--- a/IPython/utils/_process_win32.py
+++ b/IPython/utils/_process_win32.py
@@ -126,9 +126,7 @@ def system(cmd):
 
     Returns
     -------
-    None : we explicitly do NOT return the subprocess status code, as this
-    utility is meant to be used extensively in IPython, where any return value
-    would trigger :func:`sys.displayhook` calls.
+    int : child process' exit code.
     """
     # The controller provides interactivity with both
     # stdin and stdout

From 4b4dbb81ece6875dcae1fa2c31e6458f22f2d979 Mon Sep 17 00:00:00 2001
From: Jonathan Slenders <jonathan@slenders.be>
Date: Tue, 25 Feb 2020 19:56:37 +0100
Subject: [PATCH 0038/1407] Run ipdb in separate thread (required when using
 within asyncio applications).

---
 IPython/terminal/debugger.py | 45 ++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index 475c6b8ca94..96fb33b1440 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -1,6 +1,7 @@
 import asyncio
 import signal
 import sys
+import threading
 
 from IPython.core.debugger import Pdb
 
@@ -81,18 +82,11 @@ def cmdloop(self, intro=None):
         if not self.use_rawinput:
             raise ValueError('Sorry ipdb does not support use_rawinput=False')
 
-        # In order to make sure that asyncio code written in the
-        # interactive shell doesn't interfere with the prompt, we run the
-        # prompt in a different event loop.
-        # If we don't do this, people could spawn coroutine with a
-        # while/true inside which will freeze the prompt.
-
-        try:
-            old_loop = asyncio.get_event_loop()
-        except RuntimeError:
-            # This happens when the user used `asyncio.run()`.
-            old_loop = None
-
+        # In order to make sure that prompt, which uses asyncio doesn't
+        # interfere with applications in which it's used, we always run the
+        # prompt itself in a different thread (we can't start an event loop
+        # within an event loop). This new thread won't have any event loop
+        # running, and here we run our prompt-loop.
 
         self.preloop()
 
@@ -109,14 +103,25 @@ def cmdloop(self, intro=None):
                     self._ptcomp.ipy_completer.namespace = self.curframe_locals
                     self._ptcomp.ipy_completer.global_namespace = self.curframe.f_globals
 
-                    asyncio.set_event_loop(self.pt_loop)
-                    try:
-                        line = self.pt_app.prompt()
-                    except EOFError:
-                        line = 'EOF'
-                    finally:
-                        # Restore the original event loop.
-                        asyncio.set_event_loop(old_loop)
+                    # Run the prompt in a different thread.
+                    line = ''
+                    keyboard_interrupt = False
+
+                    def in_thread():
+                        nonlocal line, keyboard_interrupt
+                        try:
+                            line = self.pt_app.prompt()
+                        except EOFError:
+                            line = 'EOF'
+                        except KeyboardInterrupt:
+                            keyboard_interrupt = True
+
+                    th = threading.Thread(target=in_thread)
+                    th.start()
+                    th.join()
+
+                    if keyboard_interrupt:
+                        raise KeyboardInterrupt
 
                 line = self.precmd(line)
                 stop = self.onecmd(line)

From f862a7cc1863426c0763734a9ecfbe005ff22aff Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Wed, 26 Feb 2020 13:33:30 -0500
Subject: [PATCH 0039/1407] Delete irrelevant tests.

---
 IPython/utils/tests/test_process.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index bae941db855..f8d4cc34b8d 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -150,17 +150,6 @@ def command():
             status, 0, "The process wasn't interrupted. Status: %s" % (status,)
         )
 
-    def test_stderr_while_stdout_open(self):
-        """
-        If lots of data is written to stderr while stdout is still open, enough
-        data to fill the pipe buffer in fact, the process still exits (i.e.
-        there is no deadlock).
-        """
-        with capture_output(display=False):
-            status = system(("%s -c \"import sys\nfor i in range(20000): " +
-                             "sys.stderr.write('b' * 100)\"") % (python,))
-        self.assertEqual(status, 0)
-
     def test_getoutput(self):
         out = getoutput('%s "%s"' % (python, self.fname))
         # we can't rely on the order the line buffered streams are flushed
@@ -169,17 +158,6 @@ def test_getoutput(self):
         except AssertionError:
             self.assertEqual(out, 'on stdouton stderr')
 
-    def test_getoutput_interrupt(self):
-        """
-        When interrupted in the way ipykernel interrupts IPython, the
-        subprocess is interrupted.
-        """
-        raise SkipTest("This fails on POSIX too, revisit in future.")
-        def command():
-            return getoutput('%s -c "import time; time.sleep(5)"' % (python, ))
-
-        self.assert_interrupts(command)
-
     def test_getoutput_quoted(self):
         out = getoutput('%s -c "print (1)"' % python)
         self.assertEqual(out.strip(), '1')

From 844c6f764579bb406155db015428dca45798f84b Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Wed, 26 Feb 2020 13:35:24 -0500
Subject: [PATCH 0040/1407] Try to avoid blocking in read().

---
 IPython/utils/_process_win32.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py
index 13a1aedb0b1..6d05bdaa12e 100644
--- a/IPython/utils/_process_win32.py
+++ b/IPython/utils/_process_win32.py
@@ -23,6 +23,7 @@
 from ctypes import c_int, POINTER
 from ctypes.wintypes import LPCWSTR, HLOCAL
 from subprocess import STDOUT, TimeoutExpired
+from threading import Thread
 
 # our own imports
 from ._process_common import read_no_interrupt, process_handler, arg_split as py_arg_split
@@ -94,20 +95,25 @@ def _find_cmd(cmd):
 def _system_body(p):
     """Callback for _system."""
     enc = DEFAULT_ENCODING
-    print("READING...")
-    for line in read_no_interrupt(p.stdout).splitlines():
-        line = line.decode(enc, 'replace')
-        print(line, file=sys.stdout)
-    for line in read_no_interrupt(p.stderr).splitlines():
-        line = line.decode(enc, 'replace')
-        print(line, file=sys.stderr)
+
+    def stdout_read():
+        for line in read_no_interrupt(p.stdout).splitlines():
+            line = line.decode(enc, 'replace')
+            print(line, file=sys.stdout)
+
+    def stderr_read():
+        for line in read_no_interrupt(p.stderr).splitlines():
+            line = line.decode(enc, 'replace')
+            print(line, file=sys.stderr)
+
+    Thread(target=stdout_read).start()
+    Thread(target=stderr_read).start()
 
     # Wait to finish for returncode. Unfortunately, Python has a bug where
     # wait() isn't interruptible (https://bugs.python.org/issue28168) so poll in
     # a loop instead of just doing `return p.wait()`.
     while True:
         result = p.poll()
-        print("POLLED")
         if result is None:
             time.sleep(0.01)
         else:

From 561d08809d08a4473e5a085392678544888fdb61 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Wed, 26 Feb 2020 15:06:04 -0500
Subject: [PATCH 0041/1407] Fix the signal handler that was breaking the test

---
 IPython/utils/tests/test_process.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index f8d4cc34b8d..fbc000c3eeb 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -15,6 +15,7 @@
 #-----------------------------------------------------------------------------
 
 import sys
+import signal
 import os
 import time
 from _thread import interrupt_main  # Py 3
@@ -119,6 +120,11 @@ def assert_interrupts(self, command):
         if threading.main_thread() != threading.current_thread():
             raise nt.SkipTest("Can't run this test if not in main thread.")
 
+        # Some tests can overwrite SIGINT handler (by using pdb for example),
+        # which then breaks this test, so just make sure it's operating
+        # normally.
+        signal.signal(signal.SIGINT, signal.default_int_handler)
+
         def interrupt():
             # Wait for subprocess to start:
             time.sleep(0.5)
@@ -130,7 +136,7 @@ def interrupt():
             result = command()
         except KeyboardInterrupt:
             # Success!
-            return
+            pass
         end = time.time()
         self.assertTrue(
             end - start < 2, "Process didn't die quickly: %s" % (end - start)

From 47609e63b2d7e3b7e18b9404b0322584bb3d4a3e Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Mon, 20 Jan 2020 21:41:26 -0800
Subject: [PATCH 0042/1407] Remove clearly marked python 2 imports.

---
 IPython/core/debugger.py            | 6 ++----
 IPython/core/tests/test_debugger.py | 5 +----
 IPython/lib/display.py              | 5 +----
 IPython/lib/inputhook.py            | 5 +----
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index ebb8dcac0d8..0d0b71e88d8 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -361,10 +361,8 @@ def format_stack_entry(self, frame_lineno, lprefix=': ', context=None):
                 print("Context must be a positive integer", file=self.stdout)
         except (TypeError, ValueError):
                 print("Context must be a positive integer", file=self.stdout)
-        try:
-            import reprlib  # Py 3
-        except ImportError:
-            import repr as reprlib  # Py 2
+
+        import reprlib
 
         ret = []
 
diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index dcfd9a42438..665d8f84fa0 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -48,10 +48,7 @@ def __exit__(self, *exc):
 #-----------------------------------------------------------------------------
 
 def test_longer_repr():
-    try:
-        from reprlib import repr as trepr  # Py 3
-    except ImportError:
-        from repr import repr as trepr  # Py 2
+    from reprlib import repr as trepr
     
     a = '1234567890'* 7
     ar = "'1234567890123456789012345678901234567890123456789012345678901234567890'"
diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index de31788ab97..d24f455d782 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -266,10 +266,7 @@ def __init__(self, src, width, height, **kwargs):
     def _repr_html_(self):
         """return the embed iframe"""
         if self.params:
-            try:
-                from urllib.parse import urlencode # Py 3
-            except ImportError:
-                from urllib import urlencode
+            from urllib.parse import urlencode
             params = "?" + urlencode(self.params)
         else:
             params = ""
diff --git a/IPython/lib/inputhook.py b/IPython/lib/inputhook.py
index e6e8f2dbbc7..62f840d23f2 100644
--- a/IPython/lib/inputhook.py
+++ b/IPython/lib/inputhook.py
@@ -509,10 +509,7 @@ def enable(self, app=None):
         warn("This function is deprecated since IPython 5.0 and will be removed in future versions.",
                 DeprecationWarning, stacklevel=2)
         if app is None:
-            try:
-                from tkinter import Tk  # Py 3
-            except ImportError:
-                from Tkinter import Tk  # Py 2
+            from tkinter import Tk
             app = Tk()
             app.withdraw()
             self.manager.apps[GUI_TK] = app

From 97ebf97b95e2987b44b491ab3891680d6b9b7a2c Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Mon, 20 Jan 2020 21:45:45 -0800
Subject: [PATCH 0043/1407] Remove cProfile fallback import, since it was added
 in Python2.5

---
 IPython/core/magics/execution.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 438d0b5f0ad..e11ce3e3283 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -19,16 +19,8 @@
 import re
 from pdb import Restart
 
-# cProfile was added in Python2.5
-try:
-    import cProfile as profile
-    import pstats
-except ImportError:
-    # profile isn't bundled by default in Debian for license reasons
-    try:
-        import profile, pstats
-    except ImportError:
-        profile = pstats = None
+import cProfile as profile
+import pstats
 
 from IPython.core import oinspect
 from IPython.core import magic_arguments

From c1ce3a2634079a173bfac85d5ea9afaa0d11db36 Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Mon, 20 Jan 2020 21:54:28 -0800
Subject: [PATCH 0044/1407] Remove None check for fallback cProfile import and
 ExecutionMagics.profile_missing_notice.

This is the fallback for the fallback case of python < 2.5
---
 IPython/core/magics/execution.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index e11ce3e3283..2b26ebe9688 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -173,17 +173,9 @@ class ExecutionMagics(Magics):
 
     def __init__(self, shell):
         super(ExecutionMagics, self).__init__(shell)
-        if profile is None:
-            self.prun = self.profile_missing_notice
         # Default execution function used to actually run user code.
         self.default_runner = None
 
-    def profile_missing_notice(self, *args, **kwargs):
-        error("""\
-The profile module could not be found. It has been removed from the standard
-python packages because of its non-free license. To use profiling, install the
-python-profiler package from non-free.""")
-
     @skip_doctest
     @no_var_expand
     @line_cell_magic

From 7a0bdabecfa745b60c3a711e1da2df378687e746 Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Mon, 20 Jan 2020 22:00:23 -0800
Subject: [PATCH 0045/1407] Remove sqlite3 fallback imports and associated
 checks.

sqlite3 was add to the stdlib in python2.5
---
 IPython/core/history.py | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/IPython/core/history.py b/IPython/core/history.py
index 98373f279c9..66b4aeca9bb 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -8,13 +8,7 @@
 import datetime
 import os
 import re
-try:
-    import sqlite3
-except ImportError:
-    try:
-        from pysqlite2 import dbapi2 as sqlite3
-    except ImportError:
-        sqlite3 = None
+import sqlite3
 import threading
 
 from traitlets.config.configurable import LoggingConfigurable
@@ -49,26 +43,8 @@ def __exit__(self, *args, **kwargs):
         pass
 
 
-@decorator
-def needs_sqlite(f, self, *a, **kw):
-    """Decorator: return an empty list in the absence of sqlite."""
-    if sqlite3 is None or not self.enabled:
-        return []
-    else:
-        return f(self, *a, **kw)
-
-
-if sqlite3 is not None:
-    DatabaseError = sqlite3.DatabaseError
-    OperationalError = sqlite3.OperationalError
-else:
-    @undoc
-    class DatabaseError(Exception):
-        "Dummy exception when sqlite could not be imported. Should never occur."
-    
-    @undoc
-    class OperationalError(Exception):
-        "Dummy exception when sqlite could not be imported. Should never occur."
+DatabaseError = sqlite3.DatabaseError
+OperationalError = sqlite3.OperationalError
 
 # use 16kB as threshold for whether a corrupt history db should be saved
 # that should be at least 100 entries or so
@@ -302,7 +278,6 @@ def _run_sql(self, sql, params, raw=True, output=False):
             return ((ses, lin, (inp, out)) for ses, lin, inp, out in cur)
         return cur
 
-    @needs_sqlite
     @catch_corrupt_db
     def get_session_info(self, session):
         """Get info about a session.
@@ -558,7 +533,6 @@ def _get_hist_file_name(self, profile=None):
         profile_dir = self.shell.profile_dir.location
         return os.path.join(profile_dir, 'history.sqlite')
     
-    @needs_sqlite
     def new_session(self, conn=None):
         """Get a new session number."""
         if conn is None:
@@ -769,7 +743,6 @@ def _writeout_output_cache(self, conn):
                 conn.execute("INSERT INTO output_history VALUES (?, ?, ?)",
                                 (self.session_number,)+line)
 
-    @needs_sqlite
     def writeout_cache(self, conn=None):
         """Write any entries in the cache to the database."""
         if conn is None:
@@ -818,7 +791,6 @@ def __init__(self, history_manager):
         self.enabled = history_manager.enabled
         atexit.register(self.stop)
 
-    @needs_sqlite
     def run(self):
         # We need a separate db connection per thread:
         try:

From cf265cd8bdaef49709baa36f14934d34bbc53e47 Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Mon, 20 Jan 2020 22:06:26 -0800
Subject: [PATCH 0046/1407] Remove unused import of sys.


From fe7570442bf8d1021835225cb7f99b8e90c5e448 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Wed, 12 Feb 2020 09:11:23 -0800
Subject: [PATCH 0047/1407] revert back ultratb to version on master

Stack_data has been introduced in a previous PRs so woudl have a lot of
merge conflicts.

From 49f973a0f8ea0eabbc4507cfa1d6194f15fd37b7 Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Tue, 25 Feb 2020 21:24:21 -0800
Subject: [PATCH 0048/1407] Remove sqlite3 None checks and simplify.

---
 IPython/core/history.py | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/IPython/core/history.py b/IPython/core/history.py
index 66b4aeca9bb..7f79b18f9e9 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -19,7 +19,6 @@
     Any, Bool, Dict, Instance, Integer, List, Unicode, TraitError,
     default, observe,
 )
-from warnings import warn
 
 #-----------------------------------------------------------------------------
 # Classes and functions
@@ -43,8 +42,14 @@ def __exit__(self, *args, **kwargs):
         pass
 
 
-DatabaseError = sqlite3.DatabaseError
-OperationalError = sqlite3.OperationalError
+@decorator
+def needs_sqlite(f, self, *a, **kw):
+    """Decorator: return an empty list in the absence of sqlite."""
+    if not self.enabled:
+        return []
+    else:
+        return f(self, *a, **kw)
+
 
 # use 16kB as threshold for whether a corrupt history db should be saved
 # that should be at least 100 entries or so
@@ -61,7 +66,7 @@ def catch_corrupt_db(f, self, *a, **kw):
     """
     try:
         return f(self, *a, **kw)
-    except (DatabaseError, OperationalError) as e:
+    except (sqlite3.DatabaseError, sqlite3.OperationalError) as e:
         self._corrupt_db_counter += 1
         self.log.error("Failed to open SQLite history %s (%s).", self.hist_file, e)
         if self.hist_file != ':memory:':
@@ -165,9 +170,7 @@ class HistoryAccessor(HistoryAccessorBase):
     def _db_changed(self, change):
         """validate the db, since it can be an Instance of two different types"""
         new = change['new']
-        connection_types = (DummyDB,)
-        if sqlite3 is not None:
-            connection_types = (DummyDB, sqlite3.Connection)
+        connection_types = (DummyDB, sqlite3.Connection)
         if not isinstance(new, connection_types):
             msg = "%s.db must be sqlite3 Connection or DummyDB, not %r" % \
                     (self.__class__.__name__, new)
@@ -197,10 +200,6 @@ def __init__(self, profile='default', hist_file=u'', **traits):
         if self.hist_file == u'':
             # No one has set the hist_file, yet.
             self.hist_file = self._get_hist_file_name(profile)
-
-        if sqlite3 is None and self.enabled:
-            warn("IPython History requires SQLite, your history will not be saved")
-            self.enabled = False
         
         self.init_db()
     
@@ -278,6 +277,7 @@ def _run_sql(self, sql, params, raw=True, output=False):
             return ((ses, lin, (inp, out)) for ses, lin, inp, out in cur)
         return cur
 
+    @needs_sqlite
     @catch_corrupt_db
     def get_session_info(self, session):
         """Get info about a session.
@@ -516,7 +516,7 @@ def __init__(self, shell=None, config=None, **traits):
         
         try:
             self.new_session()
-        except OperationalError:
+        except sqlite3.OperationalError:
             self.log.error("Failed to create history session in %s. History will not be saved.",
                 self.hist_file, exc_info=True)
             self.hist_file = ':memory:'
@@ -533,6 +533,7 @@ def _get_hist_file_name(self, profile=None):
         profile_dir = self.shell.profile_dir.location
         return os.path.join(profile_dir, 'history.sqlite')
     
+    @needs_sqlite
     def new_session(self, conn=None):
         """Get a new session number."""
         if conn is None:
@@ -743,6 +744,7 @@ def _writeout_output_cache(self, conn):
                 conn.execute("INSERT INTO output_history VALUES (?, ?, ?)",
                                 (self.session_number,)+line)
 
+    @needs_sqlite
     def writeout_cache(self, conn=None):
         """Write any entries in the cache to the database."""
         if conn is None:
@@ -791,6 +793,7 @@ def __init__(self, history_manager):
         self.enabled = history_manager.enabled
         atexit.register(self.stop)
 
+    @needs_sqlite
     def run(self):
         # We need a separate db connection per thread:
         try:

From 02a3317e701b73326996a8989b95560ced97737d Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Tue, 25 Feb 2020 22:20:35 -0800
Subject: [PATCH 0049/1407] Rename decorator needs_sqlite to only_when_enabled.

---
 IPython/core/history.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/IPython/core/history.py b/IPython/core/history.py
index 7f79b18f9e9..82d4d6e334b 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -43,7 +43,7 @@ def __exit__(self, *args, **kwargs):
 
 
 @decorator
-def needs_sqlite(f, self, *a, **kw):
+def only_when_enabled(f, self, *a, **kw):
     """Decorator: return an empty list in the absence of sqlite."""
     if not self.enabled:
         return []
@@ -277,7 +277,7 @@ def _run_sql(self, sql, params, raw=True, output=False):
             return ((ses, lin, (inp, out)) for ses, lin, inp, out in cur)
         return cur
 
-    @needs_sqlite
+    @only_when_enabled
     @catch_corrupt_db
     def get_session_info(self, session):
         """Get info about a session.
@@ -533,7 +533,7 @@ def _get_hist_file_name(self, profile=None):
         profile_dir = self.shell.profile_dir.location
         return os.path.join(profile_dir, 'history.sqlite')
     
-    @needs_sqlite
+    @only_when_enabled
     def new_session(self, conn=None):
         """Get a new session number."""
         if conn is None:
@@ -744,7 +744,7 @@ def _writeout_output_cache(self, conn):
                 conn.execute("INSERT INTO output_history VALUES (?, ?, ?)",
                                 (self.session_number,)+line)
 
-    @needs_sqlite
+    @only_when_enabled
     def writeout_cache(self, conn=None):
         """Write any entries in the cache to the database."""
         if conn is None:
@@ -793,7 +793,7 @@ def __init__(self, history_manager):
         self.enabled = history_manager.enabled
         atexit.register(self.stop)
 
-    @needs_sqlite
+    @only_when_enabled
     def run(self):
         # We need a separate db connection per thread:
         try:

From 7b277c4fb582a2bb16e34ab47619a2052654d33e Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Tue, 25 Feb 2020 22:25:31 -0800
Subject: [PATCH 0050/1407] Assume sqlite3 always available in testing.

---
 IPython/core/tests/test_run.py      | 10 ++--------
 IPython/core/tests/test_shellapp.py |  7 ++-----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index 38d71b31740..e4f37d55822 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -248,10 +248,7 @@ def test_obj_del(self):
                "        print('object A deleted')\n"
                "a = A()\n")
         self.mktmp(src)
-        if dec.module_not_available('sqlite3'):
-            err = 'WARNING: IPython History requires SQLite, your history will not be saved\n'
-        else:
-            err = None
+        err = None
         tt.ipexec_validate(self.fname, 'object A deleted', err)
     
     def test_aggressive_namespace_cleanup(self):
@@ -306,10 +303,7 @@ def test_tclass(self):
 tclass.py: deleting object: C-second
 tclass.py: deleting object: C-third
 """
-        if dec.module_not_available('sqlite3'):
-            err = 'WARNING: IPython History requires SQLite, your history will not be saved\n'
-        else:
-            err = None
+        err = None
         tt.ipexec_validate(self.fname, out, err)
 
     def test_run_i_after_reset(self):
diff --git a/IPython/core/tests/test_shellapp.py b/IPython/core/tests/test_shellapp.py
index 6808114b82e..f9ea57825be 100644
--- a/IPython/core/tests/test_shellapp.py
+++ b/IPython/core/tests/test_shellapp.py
@@ -20,9 +20,6 @@
 from IPython.testing import decorators as dec
 from IPython.testing import tools as tt
 
-sqlite_err_maybe = dec.module_not_available('sqlite3')
-SQLITE_NOT_AVAILABLE_ERROR = ('WARNING: IPython History requires SQLite,'
-                              ' your history will not be saved\n')
 
 class TestFileToRun(tt.TempFileMixin, unittest.TestCase):
     """Test the behavior of the file_to_run parameter."""
@@ -32,7 +29,7 @@ def test_py_script_file_attribute(self):
         src = "print(__file__)\n"
         self.mktmp(src)
 
-        err = SQLITE_NOT_AVAILABLE_ERROR if sqlite_err_maybe else None
+        err = None
         tt.ipexec_validate(self.fname, self.fname, err)
 
     def test_ipy_script_file_attribute(self):
@@ -40,7 +37,7 @@ def test_ipy_script_file_attribute(self):
         src = "print(__file__)\n"
         self.mktmp(src, ext='.ipy')
 
-        err = SQLITE_NOT_AVAILABLE_ERROR if sqlite_err_maybe else None
+        err = None
         tt.ipexec_validate(self.fname, self.fname, err)
 
     # The commands option to ipexec_validate doesn't work on Windows, and it

From 54396af2640f615c9a7695b9dd8e8b5fc01f0b70 Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Tue, 25 Feb 2020 22:21:49 -0800
Subject: [PATCH 0051/1407] test_magic: Remove skip_without('sqlite3').

---
 IPython/core/tests/test_magic.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 9882d052db1..3d7012c62cd 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -174,7 +174,6 @@ def test_magic_parse_long_options():
     nt.assert_equal(opts['bar'], "bubble")
 
 
-@dec.skip_without('sqlite3')
 def doctest_hist_f():
     """Test %hist -f with temporary filename.
 
@@ -188,7 +187,6 @@ def doctest_hist_f():
     """
 
 
-@dec.skip_without('sqlite3')
 def doctest_hist_r():
     """Test %hist -r
 
@@ -207,7 +205,6 @@ def doctest_hist_r():
     """
 
 
-@dec.skip_without('sqlite3')
 def doctest_hist_op():
     """Test %hist -op
 
@@ -285,7 +282,6 @@ def test_hist_pof():
         assert os.path.isfile(tf)
 
 
-@dec.skip_without('sqlite3')
 def test_macro():
     ip = get_ipython()
     ip.history_manager.reset()   # Clear any existing history.
@@ -299,7 +295,6 @@ def test_macro():
     nt.assert_in("test", ip.magic("macro"))
 
 
-@dec.skip_without('sqlite3')
 def test_macro_run():
     """Test that we can run a multi-line macro successfully."""
     ip = get_ipython()

From 383f73aeffcc4e57b500b3f492b42784feb551e5 Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Tue, 25 Feb 2020 22:27:21 -0800
Subject: [PATCH 0052/1407] Remove sqlite3 checks in test setup.

---
 IPython/testing/iptest.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index 8efcc97201c..a713071b9ea 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -137,7 +137,7 @@ def test_for(item, min_version=None, callback=extract_version):
 # have available at test run time
 have = {'matplotlib': test_for('matplotlib'),
         'pygments': test_for('pygments'),
-        'sqlite3': test_for('sqlite3')}
+        }
 
 #-----------------------------------------------------------------------------
 # Test suite definitions
@@ -176,9 +176,6 @@ def will_run(self):
 
 # core:
 sec = test_sections['core']
-if not have['sqlite3']:
-    sec.exclude('tests.test_history')
-    sec.exclude('history')
 if not have['matplotlib']:
     sec.exclude('pylabtools'),
     sec.exclude('tests.test_pylabtools')

From 499e491ec57e15c65c7a5274d4d863a069a33f2e Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Tue, 25 Feb 2020 22:40:23 -0800
Subject: [PATCH 0053/1407] remove broken test.

Got error: "IPython.core.error.UsageError: unrecognized arguments: -rl"
`-r` doesn't appear to be a valid option for %history/%hist.
---
 IPython/core/tests/test_magic.py | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 3d7012c62cd..5f58b110e01 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -187,24 +187,6 @@ def doctest_hist_f():
     """
 
 
-def doctest_hist_r():
-    """Test %hist -r
-
-    XXX - This test is not recording the output correctly.  For some reason, in
-    testing mode the raw history isn't getting populated.  No idea why.
-    Disabling the output checking for now, though at least we do run it.
-
-    In [1]: 'hist' in _ip.lsmagic()
-    Out[1]: True
-
-    In [2]: x=1
-
-    In [3]: %hist -rl 2
-    x=1 # random
-    %hist -r 2
-    """
-
-
 def doctest_hist_op():
     """Test %hist -op
 

From b43008515d506c0a8cabe307cf38fe8a25cfd346 Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Tue, 25 Feb 2020 23:04:58 -0800
Subject: [PATCH 0054/1407] remove __future__ import of print function

---
 setup.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setup.py b/setup.py
index 9ce9f37c992..252fe11fa3d 100755
--- a/setup.py
+++ b/setup.py
@@ -17,8 +17,6 @@
 #  The full license is in the file COPYING.rst, distributed with this software.
 #-----------------------------------------------------------------------------
 
-from __future__ import print_function
-
 import os
 import sys
 

From 023e5b5d3ba3d2f04fbbdd1f911ff2b7f11cefbb Mon Sep 17 00:00:00 2001
From: linar-jether <linar@jether-energy.com>
Date: Thu, 27 Feb 2020 02:05:45 -0600
Subject: [PATCH 0055/1407] Fix locals collisions with shell variables

Fixes issues with namespace collisions, e.g. :
```python
cfg = 'trap'
%config IPCompleter.use_jedi = False
```
Causes: `AttributeError: 'str' object has no attribute 'IPCompleter'`

fixes https://github.com/ipython/ipython/issues/11835
---
 IPython/core/magics/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/config.py b/IPython/core/magics/config.py
index 97b13df02e6..b582bdd6eac 100644
--- a/IPython/core/magics/config.py
+++ b/IPython/core/magics/config.py
@@ -149,7 +149,7 @@ def config(self, s):
         # leave quotes on args when splitting, because we want
         # unquoted args to eval in user_ns
         cfg = Config()
-        exec("cfg."+line, locals(), self.shell.user_ns)
+        exec("cfg."+line, self.shell.user_ns, locals())
 
         for configurable in configurables:
             try:

From af3efd58f06cbd5701f267c99f375ff6fda71e57 Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Thu, 27 Feb 2020 20:49:47 +0200
Subject: [PATCH 0056/1407] Highlight the executing node with stack_data

---
 IPython/core/ultratb.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 512594736e7..bea9a518033 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -98,6 +98,7 @@
 
 import stack_data
 from pygments.formatters.terminal256 import Terminal256Formatter
+from pygments.styles import get_style_by_name
 
 # IPython's own modules
 from IPython import get_ipython
@@ -714,7 +715,9 @@ def get_records(self, etb, number_of_lines_of_context, tb_offset):
         after = context // 2
         before = context - after
         if self.has_colors:
-            formatter = Terminal256Formatter()
+            style = get_style_by_name('default')
+            style = stack_data.style_with_executing_node(style, 'bg:#00005f')
+            formatter = Terminal256Formatter(style=style)
         else:
             formatter = None
         options = stack_data.Options(

From 9bc3eae8511f533882cbe8bcbf55b080a782863b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 28 Feb 2020 14:04:55 -0800
Subject: [PATCH 0057/1407] Whats new in 7.13

---
 docs/source/whatsnew/version7.rst | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index e9d4ef3ce66..f54f0e5ef0c 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,28 @@
  7.x Series
 ============
 
+.. _version 713:
+
+IPython 7.13
+============
+
+IPython 7.13 is the first release of the 7.x branch since master is diverging
+toward an 8.0. Exiting new features have already been merged in 8.0 and will
+not be available on the 7.x branch. All the changes bellow have been backported
+from the master branch.
+
+
+ - Fix inability to run PDB when inside an event loop :ghpull:`12141`
+ - Fix ability to interrupt some processes on windows :ghpull:`12137`
+ - Fix debugger shortcuts :ghpull:`12132`
+ - improve tab completion when inside a string by removing irrelevant elements :ghpull:`12128`
+ - Fix display of filename tab completion when the path is long :ghpull:`12122`
+ - Many removal of Python 2 specific code path :ghpull:`12110`
+ - displaying wav files do not require NumPy anymore, and is 5x to 30x faster :ghpull:`12113`
+
+See the list of all closed issues and pull request on `github
+<https://github.com/ipython/ipython/pulls?q=is%3Aclosed+milestone%3A7.13>`_.
+
 .. _version 712:
 
 IPython 7.12

From be199d33e191535d7b907cbef9aec0c4fd192597 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 28 Feb 2020 16:36:36 -0800
Subject: [PATCH 0058/1407] update stats

---
 docs/source/whatsnew/github-stats-7.rst | 26 +++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index c2abed72017..91955bb2afa 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -1,6 +1,32 @@
 Issues closed in the 7.x development cycle
 ==========================================
 
+Issues closed in 8.12
+---------------------
+
+
+GitHub stats for 2020/02/01 - 2020/02/28 (tag: 7.12.0)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 1 issues and merged 24 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A7.13>`__
+
+The following 12 authors contributed 108 commits.
+
+* Alex Hall
+* Augusto
+* Coon, Ethan T
+* Daniel Hahler
+* Inception95
+* Itamar Turner-Trauring
+* Jonas Haag
+* Jonathan Slenders
+* linar-jether
+* Matthias Bussonnier
+* Nathan Goldbaum
+* Terry Davis
+
 Issues closed in 7.12
 ---------------------
 

From 2921bf257484fb0cd8d9e90f3f5e761f9c0e7204 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 29 Feb 2020 15:10:53 -0800
Subject: [PATCH 0059/1407] remove deprecated aliases

---
 IPython/core/excolors.py | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/IPython/core/excolors.py b/IPython/core/excolors.py
index 487bde18c88..c47ce922c4e 100644
--- a/IPython/core/excolors.py
+++ b/IPython/core/excolors.py
@@ -164,21 +164,3 @@ def exception_colors():
         ex_colors.add_scheme(ex_colors['Linux'].copy('Neutral'))
 
     return ex_colors
-
-class Deprec(object):
-
-    def __init__(self, wrapped_obj):
-        self.wrapped=wrapped_obj
-
-    def __getattr__(self, name):
-        val = getattr(self.wrapped, name)
-        warnings.warn("Using ExceptionColors global is deprecated and will be removed in IPython 6.0",
-                DeprecationWarning, stacklevel=2)
-        # using getattr after warnings break ipydoctest in weird way for 3.5
-        return val
-
-# For backwards compatibility, keep around a single global object.  Note that
-# this should NOT be used, the factory function should be used instead, since
-# these objects are stateful and it's very easy to get strange bugs if any code
-# modifies the module-level object's state.
-ExceptionColors = Deprec(exception_colors())

From 5d39b579262dda44b321fe5b6f4a3dd42fd29f0c Mon Sep 17 00:00:00 2001
From: foobarbyte <61650320+foobarbyte@users.noreply.github.com>
Date: Sun, 1 Mar 2020 10:45:52 +0000
Subject: [PATCH 0060/1407] Pass tempfile_suffix argument to PromptSession.

This ensures that when the open_in_editor() method of the current buffer (a prompt_toolkit.buffer.Buffer) is called, the tempfile opened in the editor will always have a .py extension, to support editor syntax highlighting.

The open_input_in_editor(event) function associated with the f2 keybinding manually sets the tempfile_suffix property of the current buffer before calling its open_in_editor() method. The vi keybinding (v) and emacs mode keybinding (c-x c-e) are handled by prompt_toolkit directly, bypassing this function, so the tempfile created when they are used is a .txt file. Passing the tempfile_suffix argument to the PrompSession constructor ensures that .py extension is always used.
---
 IPython/terminal/interactiveshell.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 9f7d335ead8..7f18ac2d6bd 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -322,6 +322,7 @@ def prompt():
                             mouse_support=self.mouse_support,
                             enable_open_in_editor=self.extra_open_editor_shortcuts,
                             color_depth=self.color_depth,
+                            tempfile_suffix=".py",
                             **self._extra_prompt_options())
 
     def _make_style_from_name_or_cls(self, name_or_cls):

From ae0cfb2d1cbcf52e992359d2dad1e8cb7ce96286 Mon Sep 17 00:00:00 2001
From: foobarbyte <61650320+foobarbyte@users.noreply.github.com>
Date: Sun, 1 Mar 2020 10:48:15 +0000
Subject: [PATCH 0061/1407] Remove redundant setting of tempfile_suffix.

Since tempfile_suffix is set in the PromptSession constructor, it does not need to be set when calling the open_input_in_editor function.
---
 IPython/terminal/shortcuts.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index e44e34277e2..24224d4f804 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -250,7 +250,6 @@ def newline_autoindent(event):
 
 
 def open_input_in_editor(event):
-    event.app.current_buffer.tempfile_suffix = ".py"
     event.app.current_buffer.open_in_editor()
 
 

From a0e4b1b4ef4d79e7f9a7cb5d3b089a9fe22fd909 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 2 Mar 2020 14:30:01 -0500
Subject: [PATCH 0062/1407] =?UTF-8?q?Fix=20built-in=20and=20standard=20lib?=
 =?UTF-8?q?rary=20pdb=20(=F0=9F=99=88)=20so=20they=20are=20interruptible?=
 =?UTF-8?q?=20from=20Jupyter.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IPython/core/debugger.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 0d0b71e88d8..fff875f2cd0 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -290,7 +290,7 @@ def interaction(self, frame, traceback):
         try:
             OldPdb.interaction(self, frame, traceback)
         except KeyboardInterrupt:
-            self.stdout.write('\n' + self.shell.get_exception_only())
+            raise
 
     def new_do_up(self, arg):
         OldPdb.do_up(self, arg)
@@ -627,6 +627,19 @@ def do_where(self, arg):
 
     do_w = do_where
 
+    def _cmdloop(self):
+        # Variant that doesn't catch KeyboardInterrupts.
+        while True:
+            try:
+                # keyboard interrupts allow for an easy way to cancel
+                # the current command, so allow them during interactive input
+                self.allow_kbdint = True
+                self.cmdloop()
+                self.allow_kbdint = False
+                break
+            except KeyboardInterrupt:
+                raise
+
 
 def set_trace(frame=None):
     """
@@ -635,3 +648,10 @@ def set_trace(frame=None):
     If frame is not specified, debugging starts from caller's frame.
     """
     Pdb().set_trace(frame or sys._getframe().f_back)
+
+
+# Override built-in Pdb, since that version doesn't allow interrupting:
+import pdb
+pdb.set_trace = set_trace
+pdb.Pdb = Pdb
+del pdb

From 901a6507cd0d9cf63d8764ff7285db0baf241176 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 2 Mar 2020 15:36:12 -0500
Subject: [PATCH 0063/1407] Test for debugger interruption.

---
 IPython/core/debugger.py            |  7 -----
 IPython/core/tests/test_debugger.py | 43 +++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index fff875f2cd0..8502874c86b 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -648,10 +648,3 @@ def set_trace(frame=None):
     If frame is not specified, debugging starts from caller's frame.
     """
     Pdb().set_trace(frame or sys._getframe().f_back)
-
-
-# Override built-in Pdb, since that version doesn't allow interrupting:
-import pdb
-pdb.set_trace = set_trace
-pdb.Pdb = Pdb
-del pdb
diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 665d8f84fa0..1dfefe9cb46 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -6,6 +6,8 @@
 
 import sys
 import warnings
+from tempfile import NamedTemporaryFile
+from subprocess import check_output
 
 import nose.tools as nt
 
@@ -220,3 +222,44 @@ def can_exit():
 
     >>> sys.settrace(old_trace)
     '''
+
+
+interruptible_debugger = """\
+import threading
+import time
+from os import _exit
+
+from IPython.core.debugger import set_trace
+
+def interrupt():
+    time.sleep(0.1)
+    import os, signal
+    os.kill(os.getpid(), signal.SIGINT)
+threading.Thread(target=interrupt).start()
+
+# Timeout if the interrupt doesn't happen:
+def interrupt():
+    time.sleep(2)
+    _exit(7)
+threading.Thread(target=interrupt, daemon=True).start()
+
+def main():
+    set_trace()
+
+if __name__ == '__main__':
+    try:
+        main()
+    except KeyboardInterrupt:
+        print("PASSED")
+"""
+
+
+def test_interruptible_core_debugger():
+    """The debugger can be interrupted."""
+    with NamedTemporaryFile("w") as f:
+        f.write(interruptible_debugger)
+        f.flush()
+        result = check_output([sys.executable, f.name],
+                              encoding=sys.getdefaultencoding())
+        # Wait for it to start:
+        assert "PASSED" in result

From acf7e595dbc2743f5642018e5ec1f044be697a44 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 6 Mar 2020 09:13:48 -0500
Subject: [PATCH 0064/1407] Add some debugging prints.

---
 IPython/core/tests/test_debugger.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 1dfefe9cb46..60aca503abf 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -239,7 +239,10 @@ def interrupt():
 
 # Timeout if the interrupt doesn't happen:
 def interrupt():
-    time.sleep(2)
+    try:
+        time.sleep(2)
+    except KeyboardInterrupt:
+        return
     _exit(7)
 threading.Thread(target=interrupt, daemon=True).start()
 
@@ -248,9 +251,14 @@ def main():
 
 if __name__ == '__main__':
     try:
+        print("Starting debugger...")
         main()
+        print("Debugger exited without error.")
     except KeyboardInterrupt:
-        print("PASSED")
+        print("Caught KeyboardInterrupt, PASSED")
+    except Exception as e:
+        print("Got wrong exception...")
+        raise e
 """
 
 

From f0c34badc558ff1bf54ea3f8b9ea6fff975ff396 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 6 Mar 2020 09:32:35 -0500
Subject: [PATCH 0065/1407] A BdbQuit error is fine too.

---
 IPython/core/tests/test_debugger.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 60aca503abf..74a14c8b4cb 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -228,6 +228,7 @@ def can_exit():
 import threading
 import time
 from os import _exit
+from bdb import BdbQuit
 
 from IPython.core.debugger import set_trace
 
@@ -251,11 +252,11 @@ def main():
 
 if __name__ == '__main__':
     try:
-        print("Starting debugger...")
+        #print("Starting debugger...")
         main()
         print("Debugger exited without error.")
-    except KeyboardInterrupt:
-        print("Caught KeyboardInterrupt, PASSED")
+    except (KeyboardInterrupt, BdbQuit):
+        print("Caught KeyboardInterrupt or BdbQuit, PASSED")
     except Exception as e:
         print("Got wrong exception...")
         raise e

From 3eb14a5d04a2c5dd2ded3fe2145116bf992fe9bd Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 6 Mar 2020 09:39:13 -0500
Subject: [PATCH 0066/1407] Windows doesn't let you read files open for
 writing, I think.

---
 IPython/core/tests/test_debugger.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 74a14c8b4cb..88eee102de6 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -265,10 +265,10 @@ def main():
 
 def test_interruptible_core_debugger():
     """The debugger can be interrupted."""
-    with NamedTemporaryFile("w") as f:
+    with NamedTemporaryFile("w", delete=False) as f:
         f.write(interruptible_debugger)
         f.flush()
-        result = check_output([sys.executable, f.name],
-                              encoding=sys.getdefaultencoding())
-        # Wait for it to start:
-        assert "PASSED" in result
+    result = check_output([sys.executable, f.name],
+                          encoding=sys.getdefaultencoding())
+    # Wait for it to start:
+    assert "PASSED" in result

From 4b28af2bcec563f3c2512a01ff5d4379873bbcf8 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 6 Mar 2020 09:51:31 -0500
Subject: [PATCH 0067/1407] Include stdout in output if the test fails.

---
 IPython/core/tests/test_debugger.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 88eee102de6..da087a1a06f 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -7,7 +7,7 @@
 import sys
 import warnings
 from tempfile import NamedTemporaryFile
-from subprocess import check_output
+from subprocess import check_output, CalledProcessError
 
 import nose.tools as nt
 
@@ -268,7 +268,12 @@ def test_interruptible_core_debugger():
     with NamedTemporaryFile("w", delete=False) as f:
         f.write(interruptible_debugger)
         f.flush()
-    result = check_output([sys.executable, f.name],
-                          encoding=sys.getdefaultencoding())
+    try:
+        result = check_output([sys.executable, f.name],
+                              encoding=sys.getdefaultencoding())
+    except CalledProcessError as e:
+        print("STDOUT FROM SUBPROCESS:\n{}\n".format(e.stdout),
+              file=sys.stderr)
+        raise
     # Wait for it to start:
     assert "PASSED" in result

From 66dafa1ab81457c09866d6a603ba6706bf0f513b Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Fri, 6 Mar 2020 09:59:41 -0500
Subject: [PATCH 0068/1407] Interrupt process in way that ipykernel does it on
 Windows.

---
 IPython/core/tests/test_debugger.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index da087a1a06f..0d7612dcffb 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -225,6 +225,7 @@ def can_exit():
 
 
 interruptible_debugger = """\
+import sys
 import threading
 import time
 from os import _exit
@@ -233,9 +234,14 @@ def can_exit():
 from IPython.core.debugger import set_trace
 
 def interrupt():
+    # Try to emulate the way interruption works in ipykernel
     time.sleep(0.1)
-    import os, signal
-    os.kill(os.getpid(), signal.SIGINT)
+    if sys.platform == "win32":
+        from _thread import interrupt_main
+        interrupt_main()
+    else:
+        import os, signal
+        os.kill(os.getpid(), signal.SIGINT)
 threading.Thread(target=interrupt).start()
 
 # Timeout if the interrupt doesn't happen:

From ffbdfae99a2b3428ca152259f95c87f423eb5eab Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 10 Mar 2020 12:20:02 -0700
Subject: [PATCH 0069/1407] exclude matpltlib in travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4139cc2b6f7..88111acc470 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ install:
   - pip install setuptools --upgrade
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
   - pip install trio curio --upgrade --upgrade-strategy eager
-  - pip install pytest matplotlib
+  - pip install pytest 'matplotlib !=3.2.0'
   - pip install codecov check-manifest --upgrade
 
 script:

From 6e079503b806fca8d28959d06e6ee087fec5a5e6 Mon Sep 17 00:00:00 2001
From: Nathan Goldbaum <nathan12343@gmail.com>
Date: Thu, 5 Mar 2020 12:30:22 -0700
Subject: [PATCH 0070/1407] support using '%run -m' for modules importable via
 an import hook

---
 IPython/core/magics/execution.py |  5 ++++
 IPython/core/tests/test_magic.py | 46 ++++++++++++++++++++++++++++++++
 IPython/utils/module_paths.py    |  3 +++
 3 files changed, 54 insertions(+)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 2b26ebe9688..fb2df90b5d5 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -692,6 +692,11 @@ def run(self, parameter_s='', runner=None,
                 warn('For Windows, use double quotes to wrap a filename: %run "mypath\\myfile.py"')
             error(msg)
             return
+        except TypeError:
+            if fpath in sys.meta_path:
+                filename = ""
+            else:
+                raise
 
         if filename.lower().endswith(('.ipy', '.ipynb')):
             with preserve_keys(self.shell.user_ns, '__file__'):
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 5f58b110e01..e5ad820c18a 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -1198,3 +1198,49 @@ def test_timeit_arguments():
         # 3.7 optimize no-op statement like above out, and complain there is
         # nothing in the for loop.
         _ip.magic("timeit -n1 -r1 a=('#')")
+
+
+TEST_MODULE = """
+print('Loaded my_tmp')
+if __name__ == "__main__":
+    print('I just ran a script')
+"""
+
+
+def test_run_module_from_import_hook():
+    "Test that a module can be loaded via an import hook"
+    with TemporaryDirectory() as tmpdir:
+        fullpath = os.path.join(tmpdir, 'my_tmp.py')
+        with open(fullpath, 'w') as f:
+            f.write(TEST_MODULE)
+
+        class MyTempImporter(object):
+            def __init__(self):
+                pass
+
+            def find_module(self, fullname, path=None):
+                if 'my_tmp' in fullname:
+                    return self
+                return None
+
+            def load_module(self, name):
+                import imp
+                return imp.load_source('my_tmp', fullpath)
+
+            def get_code(self, fullname):
+                with open(fullpath, 'r') as f:
+                    return compile(f.read(), 'foo', 'exec')
+
+            def is_package(self, __):
+                return False
+
+        sys.meta_path.insert(0, MyTempImporter())
+
+        with capture_output() as captured:
+            _ip.magic("run -m my_tmp")
+            _ip.run_cell("import my_tmp")
+
+        output = "Loaded my_tmp\nI just ran a script\nLoaded my_tmp\n"
+        nt.assert_equal(output, captured.stdout)
+
+        sys.meta_path.pop(0)
diff --git a/IPython/utils/module_paths.py b/IPython/utils/module_paths.py
index 0570c322e6a..32ecab8501d 100644
--- a/IPython/utils/module_paths.py
+++ b/IPython/utils/module_paths.py
@@ -20,6 +20,7 @@
 # Stdlib imports
 import importlib
 import os
+import sys
 
 # Third-party imports
 
@@ -61,6 +62,8 @@ def find_mod(module_name):
     loader = importlib.util.find_spec(module_name)
     module_path = loader.origin
     if module_path is None:
+        if loader.loader in sys.meta_path:
+            return loader.loader
         return None
     else:
         split_path = module_path.split(".")

From 3c2bf1f13742d02e5b927a770750fcbfe604ff3b Mon Sep 17 00:00:00 2001
From: luttik <dtluttik@gmail.com>
Date: Tue, 10 Mar 2020 19:11:35 +0100
Subject: [PATCH 0071/1407] Fixed objs in the display.py docstrings.

---
 IPython/core/display.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 465c000c55a..3addc1d012b 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -57,7 +57,7 @@ def _display_mimetype(mimetype, objs, raw=False, metadata=None):
     ----------
     mimetype : str
         The mimetype to be published (e.g. 'image/png')
-    objs : tuple of objects
+    *objs : object
         The Python objects to display, or if raw=True raw text data to
         display.
     raw : bool
@@ -139,7 +139,7 @@ def display(*objs, include=None, exclude=None, metadata=None, transient=None, di
 
     Parameters
     ----------
-    objs : tuple of objects
+    *objs : object
         The Python objects to display.
     raw : bool, optional
         Are the objects to be displayed already mimetype-keyed dicts of raw display data,
@@ -398,7 +398,7 @@ def display_pretty(*objs, **kwargs):
 
     Parameters
     ----------
-    objs : tuple of objects
+    *objs : object
         The Python objects to display, or if raw=True raw text data to
         display.
     raw : bool
@@ -418,7 +418,7 @@ def display_html(*objs, **kwargs):
 
     Parameters
     ----------
-    objs : tuple of objects
+    *objs : object
         The Python objects to display, or if raw=True raw HTML data to
         display.
     raw : bool
@@ -435,7 +435,7 @@ def display_markdown(*objs, **kwargs):
 
     Parameters
     ----------
-    objs : tuple of objects
+    *objs : object
         The Python objects to display, or if raw=True raw markdown data to
         display.
     raw : bool
@@ -453,7 +453,7 @@ def display_svg(*objs, **kwargs):
 
     Parameters
     ----------
-    objs : tuple of objects
+    *objs : object
         The Python objects to display, or if raw=True raw svg data to
         display.
     raw : bool
@@ -470,7 +470,7 @@ def display_png(*objs, **kwargs):
 
     Parameters
     ----------
-    objs : tuple of objects
+    *objs : object
         The Python objects to display, or if raw=True raw png data to
         display.
     raw : bool
@@ -487,7 +487,7 @@ def display_jpeg(*objs, **kwargs):
 
     Parameters
     ----------
-    objs : tuple of objects
+    *objs : object
         The Python objects to display, or if raw=True raw JPEG data to
         display.
     raw : bool
@@ -504,7 +504,7 @@ def display_latex(*objs, **kwargs):
 
     Parameters
     ----------
-    objs : tuple of objects
+    *objs : object
         The Python objects to display, or if raw=True raw latex data to
         display.
     raw : bool
@@ -523,7 +523,7 @@ def display_json(*objs, **kwargs):
 
     Parameters
     ----------
-    objs : tuple of objects
+    *objs : object
         The Python objects to display, or if raw=True raw json data to
         display.
     raw : bool
@@ -540,7 +540,7 @@ def display_javascript(*objs, **kwargs):
 
     Parameters
     ----------
-    objs : tuple of objects
+    *objs : object
         The Python objects to display, or if raw=True raw javascript data to
         display.
     raw : bool
@@ -557,7 +557,7 @@ def display_pdf(*objs, **kwargs):
 
     Parameters
     ----------
-    objs : tuple of objects
+    *objs : object
         The Python objects to display, or if raw=True raw javascript data to
         display.
     raw : bool

From 66a30dc18f9397027d8de04c7af05635684c0760 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 16 Mar 2020 14:30:41 -0500
Subject: [PATCH 0072/1407] Sketch of working interrupt mechanism for Windows.
 Will need to be implemented in ipykernel.

---
 IPython/core/tests/test_debugger.py | 71 +++++++++++++++++------------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 0d7612dcffb..78991999d16 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -4,10 +4,13 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+import signal
 import sys
+import time
 import warnings
 from tempfile import NamedTemporaryFile
-from subprocess import check_output, CalledProcessError
+from subprocess import check_output, CalledProcessError, PIPE
+import subprocess
 
 import nose.tools as nt
 
@@ -233,32 +236,24 @@ def can_exit():
 
 from IPython.core.debugger import set_trace
 
-def interrupt():
-    # Try to emulate the way interruption works in ipykernel
-    time.sleep(0.1)
-    if sys.platform == "win32":
-        from _thread import interrupt_main
-        interrupt_main()
-    else:
-        import os, signal
-        os.kill(os.getpid(), signal.SIGINT)
-threading.Thread(target=interrupt).start()
-
 # Timeout if the interrupt doesn't happen:
-def interrupt():
-    try:
-        time.sleep(2)
-    except KeyboardInterrupt:
-        return
+def timeout():
+    time.sleep(5)
     _exit(7)
-threading.Thread(target=interrupt, daemon=True).start()
+threading.Thread(target=timeout, daemon=True).start()
+
+def break_handler(*args):
+    print("BREAK!")
+    raise KeyboardInterrupt()
 
 def main():
+    import signal
+    signal.signal(signal.SIGBREAK, break_handler)
     set_trace()
 
 if __name__ == '__main__':
     try:
-        #print("Starting debugger...")
+        print("Starting debugger...")
         main()
         print("Debugger exited without error.")
     except (KeyboardInterrupt, BdbQuit):
@@ -270,16 +265,34 @@ def main():
 
 
 def test_interruptible_core_debugger():
-    """The debugger can be interrupted."""
+    """The debugger can be interrupted.
+    
+    See https://stackoverflow.com/a/35792192 for details on Windows.
+    """
     with NamedTemporaryFile("w", delete=False) as f:
         f.write(interruptible_debugger)
         f.flush()
-    try:
-        result = check_output([sys.executable, f.name],
-                              encoding=sys.getdefaultencoding())
-    except CalledProcessError as e:
-        print("STDOUT FROM SUBPROCESS:\n{}\n".format(e.stdout),
-              file=sys.stderr)
-        raise
-    # Wait for it to start:
-    assert "PASSED" in result
+    start = time.time()
+    
+    p = subprocess.Popen([sys.executable, "-u", f.name],
+                         creationflags=subprocess.CREATE_NEW_PROCESS_GROUP, # TODO disable on posix
+                         encoding=sys.getdefaultencoding(),
+                         stderr=PIPE, stdout=PIPE)
+    time.sleep(1)  # wait for it to hit pdb
+    if sys.platform == "win32":
+        # Yes, this has to happen once. I have no idea why.
+        p.send_signal(signal.CTRL_BREAK_EVENT)
+        p.send_signal(signal.CTRL_BREAK_EVENT)
+    else:
+        p.send_signal(signal.SIGINT)
+    exit_code = p.wait()
+    stdout = p.stdout.read()
+    stderr = p.stderr.read()
+    print("STDOUT", stdout, file=sys.__stderr__)
+    print("STDERR", stderr, file=sys.__stderr__)
+    assert exit_code == 0
+    print("SUCCESS!", file=sys.__stderr__)
+    # Make sure it exited cleanly, and quickly:
+    end = time.time()
+    assert end - start < 2  # timeout is 5 seconds
+    assert "PASSED" in stdout
\ No newline at end of file

From b2bbf3d9929448bbd5e40e4b02397dea23e41657 Mon Sep 17 00:00:00 2001
From: Theo Ouzhinski <32401143+theo-o@users.noreply.github.com>
Date: Fri, 20 Mar 2020 12:36:39 -0400
Subject: [PATCH 0073/1407] Fix typo in 7.x series release notes

7.13 is the _final_ release of the 7.x series
---
 docs/source/whatsnew/version7.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index f54f0e5ef0c..7d122b9f998 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -7,7 +7,7 @@
 IPython 7.13
 ============
 
-IPython 7.13 is the first release of the 7.x branch since master is diverging
+IPython 7.13 is the final release of the 7.x branch since master is diverging
 toward an 8.0. Exiting new features have already been merged in 8.0 and will
 not be available on the 7.x branch. All the changes bellow have been backported
 from the master branch.

From 0b9d5ae4079ba5f9bb0ee74a2f5434306c2856de Mon Sep 17 00:00:00 2001
From: Theo Ouzhinski <32401143+theo-o@users.noreply.github.com>
Date: Fri, 20 Mar 2020 12:39:57 -0400
Subject: [PATCH 0074/1407] Fix typo in 7.13 release notes

bellow -> below
---
 docs/source/whatsnew/version7.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 7d122b9f998..62990dfc1e7 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -9,7 +9,7 @@ IPython 7.13
 
 IPython 7.13 is the final release of the 7.x branch since master is diverging
 toward an 8.0. Exiting new features have already been merged in 8.0 and will
-not be available on the 7.x branch. All the changes bellow have been backported
+not be available on the 7.x branch. All the changes below have been backported
 from the master branch.
 
 

From 1e79c167a41d13eee673b8bb54798cb2f920f957 Mon Sep 17 00:00:00 2001
From: Diego Fernandez <aiguo.fernandez@gmail.com>
Date: Thu, 26 Mar 2020 14:07:22 -0600
Subject: [PATCH 0075/1407] Bump jedi to at least 0.16.0 and fix deprecated
 function usage

---
 IPython/core/completer.py | 5 +++--
 setup.py                  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 985ac5ab9eb..fd3939f1e18 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -988,7 +988,8 @@ def _make_signature(completion)-> str:
 
     """
 
-    return '(%s)'% ', '.join([f for f in (_formatparamchildren(p) for p in completion.params) if f])
+    return '(%s)'% ', '.join([f for f in (_formatparamchildren(p) for signature in completion.get_signatures()
+                                          for p in signature.defined_names()) if f])
 
 class IPCompleter(Completer):
     """Extension of the completer class with IPython-specific features"""
@@ -1398,7 +1399,7 @@ def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str):
         if not try_jedi:
             return []
         try:
-            return filter(completion_filter, interpreter.completions())
+            return filter(completion_filter, interpreter.complete())
         except Exception as e:
             if self.debug:
                 return [_FakeJediCompletion('Oops Jedi has crashed, please report a bug with the following:\n"""\n%s\ns"""' % (e))]
diff --git a/setup.py b/setup.py
index 252fe11fa3d..9ec67cb7c8e 100755
--- a/setup.py
+++ b/setup.py
@@ -184,7 +184,7 @@
 
 install_requires = [
     'setuptools>=18.5',
-    'jedi>=0.10',
+    'jedi>=0.16',
     'decorator',
     'pickleshare',
     'traitlets>=4.2',

From d9c0e690a2015544bff683cd2403491a0fa974ba Mon Sep 17 00:00:00 2001
From: Markus Wageringel <markus.wageringel+gh@gmail.com>
Date: Thu, 26 Mar 2020 21:04:20 +0100
Subject: [PATCH 0076/1407] support for unicode identifiers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This rewrites some of the regular expressions that are used to match
Python identifiers, so that they are unicode compatible. In Python 3,
identifiers can contain unicode characters as long as the first
character is not numeric.

Examples for the changes:

• inputtransformer:

```
In [1]: π = 3.14
In [2]: π.is_integer?
Object `is_integer` not found.
```

----------
• namespace:

```
π.is_integ*?
```
or
```
In [1]: %psearch π.is_integ
Python identifiers can only contain ascii characters.
```

----------
• prefilter:

```
%autocall 1
φ = float
get_ipython().prefilter("φ 3")  # should be 'φ(3)', but returns 'φ 3'
```

----------
• completerlib:

If there is a file e.g. named `π.py` in the current directory, then

```
import IPython
IPython.core.completerlib.module_list('.')  # should contain module 'π'
```
---
 IPython/core/completerlib.py                 |  2 +-
 IPython/core/inputtransformer.py             |  4 ++--
 IPython/core/inputtransformer2.py            |  4 ++--
 IPython/core/magics/namespace.py             |  6 ------
 IPython/core/prefilter.py                    |  2 +-
 IPython/core/tests/test_inputtransformer.py  |  1 +
 IPython/core/tests/test_inputtransformer2.py |  8 ++++++++
 IPython/core/tests/test_magic.py             |  2 ++
 IPython/core/tests/test_prefilter.py         | 10 ++++++++++
 9 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/IPython/core/completerlib.py b/IPython/core/completerlib.py
index 9e592b0817e..7860cb67dcb 100644
--- a/IPython/core/completerlib.py
+++ b/IPython/core/completerlib.py
@@ -52,7 +52,7 @@
 TIMEOUT_GIVEUP = 20
 
 # Regular expression for the python import statement
-import_re = re.compile(r'(?P<name>[a-zA-Z_][a-zA-Z0-9_]*?)'
+import_re = re.compile(r'(?P<name>[^\W\d]\w*?)'
                        r'(?P<package>[/\\]__init__)?'
                        r'(?P<suffix>%s)$' %
                        r'|'.join(re.escape(s) for s in _suffixes))
diff --git a/IPython/core/inputtransformer.py b/IPython/core/inputtransformer.py
index 1c35eb64f32..afeca93cc0e 100644
--- a/IPython/core/inputtransformer.py
+++ b/IPython/core/inputtransformer.py
@@ -278,8 +278,8 @@ def escaped_commands(line):
 _initial_space_re = re.compile(r'\s*')
 
 _help_end_re = re.compile(r"""(%{0,2}
-                              [a-zA-Z_*][\w*]*        # Variable name
-                              (\.[a-zA-Z_*][\w*]*)*   # .etc.etc
+                              (?!\d)[\w*]+            # Variable name
+                              (\.(?!\d)[\w*]+)*       # .etc.etc
                               )
                               (\?\??)$                # ? or ??
                               """,
diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index 4562fe01d2c..0443e6829b4 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -405,8 +405,8 @@ def transform(self, lines):
         return lines_before + [new_line] + lines_after
 
 _help_end_re = re.compile(r"""(%{0,2}
-                              [a-zA-Z_*][\w*]*        # Variable name
-                              (\.[a-zA-Z_*][\w*]*)*   # .etc.etc
+                              (?!\d)[\w*]+            # Variable name
+                              (\.(?!\d)[\w*]+)*       # .etc.etc
                               )
                               (\?\??)$                # ? or ??
                               """,
diff --git a/IPython/core/magics/namespace.py b/IPython/core/magics/namespace.py
index cef6ddba8d7..acc4620549b 100644
--- a/IPython/core/magics/namespace.py
+++ b/IPython/core/magics/namespace.py
@@ -208,12 +208,6 @@ def psearch(self, parameter_s=''):
         
           %psearch -l            list all available object types
         """
-        try:
-            parameter_s.encode('ascii')
-        except UnicodeEncodeError:
-            print('Python identifiers can only contain ascii characters.')
-            return
-
         # default namespaces to be searched
         def_search = ['user_local', 'user_global', 'builtin']
 
diff --git a/IPython/core/prefilter.py b/IPython/core/prefilter.py
index dbf185e6a42..bf801f999c4 100644
--- a/IPython/core/prefilter.py
+++ b/IPython/core/prefilter.py
@@ -37,7 +37,7 @@ class PrefilterError(Exception):
 
 
 # RegExp to identify potential function names
-re_fun_name = re.compile(r'[a-zA-Z_]([a-zA-Z0-9_.]*) *$')
+re_fun_name = re.compile(r'[^\W\d]([\w.]*) *$')
 
 # RegExp to exclude strings with this start from autocalling.  In
 # particular, all binary operators should be excluded, so that if foo is
diff --git a/IPython/core/tests/test_inputtransformer.py b/IPython/core/tests/test_inputtransformer.py
index 90a1d5afd1e..0d97fd4d6b1 100644
--- a/IPython/core/tests/test_inputtransformer.py
+++ b/IPython/core/tests/test_inputtransformer.py
@@ -113,6 +113,7 @@ def transform_checker(tests, transformer, **kwargs):
         (u'%hist2??', "get_ipython().run_line_magic('pinfo2', '%hist2')"),
         (u'%%hist3?', "get_ipython().run_line_magic('pinfo', '%%hist3')"),
         (u'%%hist4??', "get_ipython().run_line_magic('pinfo2', '%%hist4')"),
+        (u'π.foo?', "get_ipython().run_line_magic('pinfo', 'π.foo')"),
         (u'f*?', "get_ipython().run_line_magic('psearch', 'f*')"),
         (u'ax.*aspe*?', "get_ipython().run_line_magic('psearch', 'ax.*aspe*')"),
         (u'a = abc?', "get_ipython().set_next_input('a = abc');"
diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index cde9eca0d06..b29a0196d3f 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -119,6 +119,11 @@ def test():
 [r"get_ipython().set_next_input('(a,\nb) = zip');get_ipython().run_line_magic('pinfo', 'zip')" + "\n"]
 )
 
+HELP_UNICODE = (
+    ["π.foo?\n"], (1, 0),
+    ["get_ipython().run_line_magic('pinfo', 'π.foo')\n"]
+)
+
 
 def null_cleanup_transformer(lines):
     """
@@ -223,6 +228,9 @@ def test_transform_help():
     tf = ipt2.HelpEnd((1, 0), (2, 8))
     nt.assert_equal(tf.transform(HELP_MULTILINE[0]), HELP_MULTILINE[2])
 
+    tf = ipt2.HelpEnd((1, 0), (1, 0))
+    nt.assert_equal(tf.transform(HELP_UNICODE[0]), HELP_UNICODE[2])
+
 def test_find_assign_op_dedent():
     """
     be careful that empty token like dedent are not counted as parens
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index e5ad820c18a..56feb82af71 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -602,6 +602,8 @@ def doctest_precision():
 def test_psearch():
     with tt.AssertPrints("dict.fromkeys"):
         _ip.run_cell("dict.fr*?")
+    with tt.AssertPrints("π.is_integer"):
+        _ip.run_cell("π = 3.14;\nπ.is_integ*?")
 
 def test_timeit_shlex():
     """test shlex issues with timeit (#1109)"""
diff --git a/IPython/core/tests/test_prefilter.py b/IPython/core/tests/test_prefilter.py
index 0e61b4693f7..ca447b3d0b7 100644
--- a/IPython/core/tests/test_prefilter.py
+++ b/IPython/core/tests/test_prefilter.py
@@ -115,3 +115,13 @@ def __call__(self, x):
     finally:
         del ip.user_ns['x']
         ip.magic('autocall 0')
+
+
+def test_autocall_should_support_unicode():
+    ip.magic('autocall 2')
+    ip.user_ns['π'] = lambda x: x
+    try:
+        nt.assert_equal(ip.prefilter('π 3'),'π(3)')
+    finally:
+        ip.magic('autocall 0')
+        del ip.user_ns['π']

From d394d7e451e94ada5a876262e7f61ec3e48a0668 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 28 Mar 2020 11:49:23 -0700
Subject: [PATCH 0077/1407] update link to rpy2 object inventory

---
 docs/source/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index afdff72b5c4..3dde0f3ecfb 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -223,7 +223,7 @@ def is_stable(extra):
 htmlhelp_basename = 'ipythondoc'
 
 intersphinx_mapping = {'python': ('https://docs.python.org/3/', None),
-                       'rpy2': ('https://rpy2.readthedocs.io/en/latest/', None),
+                       'rpy2': ('https://rpy2.github.io/doc/latest/html/', None),
                        'jupyterclient': ('https://jupyter-client.readthedocs.io/en/latest/', None),
                        'jupyter': ('https://jupyter.readthedocs.io/en/latest/', None),
                        'jedi': ('https://jedi.readthedocs.io/en/latest/', None),

From 3f0f9d507593edbbb6348a05976faea5bef1ed22 Mon Sep 17 00:00:00 2001
From: Matthieu Ancellin <matthieu.ancellin@ens-paris-saclay.fr>
Date: Mon, 30 Mar 2020 14:29:43 +0200
Subject: [PATCH 0078/1407] Add option for video html display.

---
 IPython/core/display.py                        | 18 ++++++++++++------
 .../whatsnew/pr/video-display-attributes.rst   |  4 ++++
 2 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 docs/source/whatsnew/pr/video-display-attributes.rst

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 3addc1d012b..507fd304df5 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -1308,7 +1308,7 @@ def _find_ext(self, s):
 class Video(DisplayObject):
 
     def __init__(self, data=None, url=None, filename=None, embed=False,
-                 mimetype=None, width=None, height=None):
+                 mimetype=None, width=None, height=None, html_attributes="controls"):
         """Create a video object given raw data or an URL.
 
         When this object is returned by an input cell or passed to the
@@ -1346,6 +1346,11 @@ def __init__(self, data=None, url=None, filename=None, embed=False,
         height : int
             Height in pixels to which to constrain the video in html.
             If not supplied, defaults to the height of the video.
+        html_attributes : str
+            Attributes for the HTML `<video>` block.
+            Default: "controls" to get video controls.
+            Other examples: "controls muted" for muted video with controls,
+            "loop autoplay" for looping autoplaying video without controls.
 
         Examples
         --------
@@ -1377,6 +1382,7 @@ def __init__(self, data=None, url=None, filename=None, embed=False,
         self.embed = embed
         self.width = width
         self.height = height
+        self.html_attributes = html_attributes
         super(Video, self).__init__(data=data, url=url, filename=filename)
 
     def _repr_html_(self):
@@ -1390,9 +1396,9 @@ def _repr_html_(self):
         # notebook output.
         if not self.embed:
             url = self.url if self.url is not None else self.filename
-            output = """<video src="{0}" controls {1} {2}>
+            output = """<video src="{0}" {1} {2} {3}>
       Your browser does not support the <code>video</code> element.
-    </video>""".format(url, width, height)
+    </video>""".format(url, self.html_attributes, width, height)
             return output
 
         # Embedded videos are base64-encoded.
@@ -1411,10 +1417,10 @@ def _repr_html_(self):
         else:
             b64_video = b2a_base64(video).decode('ascii').rstrip()
 
-        output = """<video controls {0} {1}>
- <source src="data:{2};base64,{3}" type="{2}">
+        output = """<video {0} {1} {2}>
+ <source src="data:{3};base64,{4}" type="{3}">
  Your browser does not support the video tag.
- </video>""".format(width, height, mimetype, b64_video)
+ </video>""".format(self.html_attributes, width, height, mimetype, b64_video)
         return output
 
     def reload(self):
diff --git a/docs/source/whatsnew/pr/video-display-attributes.rst b/docs/source/whatsnew/pr/video-display-attributes.rst
new file mode 100644
index 00000000000..1e7434e895d
--- /dev/null
+++ b/docs/source/whatsnew/pr/video-display-attributes.rst
@@ -0,0 +1,4 @@
+Video HTML attributes
+=====================
+
+Add an option to `IPython.display.Video` to change the attributes of the HTML display of the video.

From e371438fe2370c1399953f8e3ce7897ca95ef1a3 Mon Sep 17 00:00:00 2001
From: Matthieu Ancellin <matthieu.ancellin@ens-paris-saclay.fr>
Date: Mon, 30 Mar 2020 14:48:59 +0200
Subject: [PATCH 0079/1407] Fix examples in Video docstring.

---
 IPython/core/display.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 507fd304df5..22ca42c9f28 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -1348,17 +1348,20 @@ def __init__(self, data=None, url=None, filename=None, embed=False,
             If not supplied, defaults to the height of the video.
         html_attributes : str
             Attributes for the HTML `<video>` block.
-            Default: "controls" to get video controls.
-            Other examples: "controls muted" for muted video with controls,
-            "loop autoplay" for looping autoplaying video without controls.
+            Default: `"controls"` to get video controls.
+            Other examples: `"controls muted"` for muted video with controls,
+            `"loop autoplay"` for looping autoplaying video without controls.
 
         Examples
         --------
 
-        Video('https://archive.org/download/Sita_Sings_the_Blues/Sita_Sings_the_Blues_small.mp4')
-        Video('path/to/video.mp4')
-        Video('path/to/video.mp4', embed=True)
-        Video(b'raw-videodata', embed=True)
+        ::
+
+            Video('https://archive.org/download/Sita_Sings_the_Blues/Sita_Sings_the_Blues_small.mp4')
+            Video('path/to/video.mp4')
+            Video('path/to/video.mp4', embed=True)
+            Video('path/to/video.mp4', embed=True, html_attributes="controls muted autoplay")
+            Video(b'raw-videodata', embed=True)
         """
         if isinstance(data, (Path, PurePath)):
             data = str(data)

From e691be99e33a83bca5b07d8552ba13bbf173a34c Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 30 Mar 2020 13:35:50 -0400
Subject: [PATCH 0080/1407] Switch to a much simpler test. Interrupting
 processes encountered some issues with with Windows, that will be addressed
 in ipykernel (which will grow its own test).

---
 IPython/core/tests/test_debugger.py | 82 ++++++-----------------------
 1 file changed, 16 insertions(+), 66 deletions(-)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 78991999d16..4cf77439082 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -11,6 +11,8 @@
 from tempfile import NamedTemporaryFile
 from subprocess import check_output, CalledProcessError, PIPE
 import subprocess
+from unittest.mock import patch
+import builtins
 
 import nose.tools as nt
 
@@ -227,72 +229,20 @@ def can_exit():
     '''
 
 
-interruptible_debugger = """\
-import sys
-import threading
-import time
-from os import _exit
-from bdb import BdbQuit
-
-from IPython.core.debugger import set_trace
-
-# Timeout if the interrupt doesn't happen:
-def timeout():
-    time.sleep(5)
-    _exit(7)
-threading.Thread(target=timeout, daemon=True).start()
-
-def break_handler(*args):
-    print("BREAK!")
-    raise KeyboardInterrupt()
-
-def main():
-    import signal
-    signal.signal(signal.SIGBREAK, break_handler)
-    set_trace()
-
-if __name__ == '__main__':
-    try:
-        print("Starting debugger...")
-        main()
-        print("Debugger exited without error.")
-    except (KeyboardInterrupt, BdbQuit):
-        print("Caught KeyboardInterrupt or BdbQuit, PASSED")
-    except Exception as e:
-        print("Got wrong exception...")
-        raise e
-"""
-
-
 def test_interruptible_core_debugger():
     """The debugger can be interrupted.
-    
-    See https://stackoverflow.com/a/35792192 for details on Windows.
+
+    The presumption is there is some mechanism that causes a KeyboardInterrupt
+    (this is implemented in ipykernel).  We want to ensure the
+    KeyboardInterrupt cause debugging to cease.
     """
-    with NamedTemporaryFile("w", delete=False) as f:
-        f.write(interruptible_debugger)
-        f.flush()
-    start = time.time()
-    
-    p = subprocess.Popen([sys.executable, "-u", f.name],
-                         creationflags=subprocess.CREATE_NEW_PROCESS_GROUP, # TODO disable on posix
-                         encoding=sys.getdefaultencoding(),
-                         stderr=PIPE, stdout=PIPE)
-    time.sleep(1)  # wait for it to hit pdb
-    if sys.platform == "win32":
-        # Yes, this has to happen once. I have no idea why.
-        p.send_signal(signal.CTRL_BREAK_EVENT)
-        p.send_signal(signal.CTRL_BREAK_EVENT)
-    else:
-        p.send_signal(signal.SIGINT)
-    exit_code = p.wait()
-    stdout = p.stdout.read()
-    stderr = p.stderr.read()
-    print("STDOUT", stdout, file=sys.__stderr__)
-    print("STDERR", stderr, file=sys.__stderr__)
-    assert exit_code == 0
-    print("SUCCESS!", file=sys.__stderr__)
-    # Make sure it exited cleanly, and quickly:
-    end = time.time()
-    assert end - start < 2  # timeout is 5 seconds
-    assert "PASSED" in stdout
\ No newline at end of file
+    def raising_input(msg=""):
+        raise KeyboardInterrupt()
+
+    with patch.object(builtins, "input", raising_input):
+        debugger.set_trace()
+        # The way this test will fail is by set_trace() never exiting,
+        # resulting in a timeout by the test runner. The alternative
+        # implementation would involve a subprocess, but that adds issues with
+        # interrupting subprocesses that are rather complex, so it's simpler
+        # just to do it this way.

From 1276f6bb4210c8eb7240073470bf714be3ddd6be Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Mon, 30 Mar 2020 14:21:56 -0400
Subject: [PATCH 0081/1407] What's new entry.

---
 docs/source/whatsnew/pr/interruptible-debugger.rst | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/interruptible-debugger.rst

diff --git a/docs/source/whatsnew/pr/interruptible-debugger.rst b/docs/source/whatsnew/pr/interruptible-debugger.rst
new file mode 100644
index 00000000000..f501b3476b8
--- /dev/null
+++ b/docs/source/whatsnew/pr/interruptible-debugger.rst
@@ -0,0 +1,4 @@
+IPython.core.debugger.Pdb is now interruptible
+==============================================
+
+A ``KeyboardInterrupt`` will now interrupt IPython's extended debugger, in order to make Jupyter able to interrupt it.

From 70b7090a438f7962f28acc23fa78cdb6f5d084a0 Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Tue, 14 Apr 2020 10:22:06 +0200
Subject: [PATCH 0082/1407] Fix compatibility with the latest release of Sphinx

`l_` from sphinx.locale has been deprecated for a long time.
`_` is the new name for the same function but it seems that the
imports there are useless.

https://github.com/sphinx-doc/sphinx/commit/8d653a406dc0dc6c2632176ab4757ca15474b10f
---
 docs/sphinxext/configtraits.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/sphinxext/configtraits.py b/docs/sphinxext/configtraits.py
index 4e767694097..2b05d2bf6c8 100644
--- a/docs/sphinxext/configtraits.py
+++ b/docs/sphinxext/configtraits.py
@@ -8,8 +8,7 @@
 
     Cross reference like this: :configtrait:`Application.log_datefmt`.
 """
-from sphinx.locale import l_
-from sphinx.util.docfields import Field
+
 
 def setup(app):
     app.add_object_type('configtrait', 'configtrait', objname='Config option')

From 9cadcc951a212d636494e6d88f0b3f5d46fa24ea Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 15 Apr 2020 10:45:36 -0700
Subject: [PATCH 0083/1407] Try to add a filter in Sphinx to get rid of
 warnings.

Duplicate configtraits warnings are causing CI failures
---
 docs/source/conf.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 3dde0f3ecfb..5012da2694e 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -121,6 +121,29 @@ def is_stable(extra):
 numpydoc_class_members_toctree = False
 warning_is_error = True
 
+import logging
+
+class ConfigtraitFilter(logging.Filter):
+    """
+    This is a filter to remove in sphinx 3+ the error about config traits being duplicated. 
+
+    As we autogenerate configuration traits from, subclasses have lots of
+    duplication and we want to silence them. Indeed we build on travis with
+    warnings-as-error set to True, so those duplicate items make the build fail.
+    """
+
+    def filter(self, record):
+        if record.args and record.args[0] == 'configtrait' and 'duplicate' in record.msg:
+            return False
+        return True
+
+ct_filter = ConfigtraitFilter()
+
+import sphinx.util
+logger = sphinx.util.logging.getLogger('sphinx.domains.std').logger
+
+logger.addFilter(ct_filter)
+
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
 #

From cc8769c3164bc703704b69f657ac30d595c5e7a3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 15 Apr 2020 12:02:45 -0700
Subject: [PATCH 0084/1407] Rename one example to avoid duplicate errors with
 sphinx

---
 docs/source/development/wrapperkernels.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/development/wrapperkernels.rst b/docs/source/development/wrapperkernels.rst
index eb0a0488807..d734c30ee99 100644
--- a/docs/source/development/wrapperkernels.rst
+++ b/docs/source/development/wrapperkernels.rst
@@ -116,7 +116,7 @@ You can override a number of other methods to improve the functionality of your
 kernel. All of these methods should return a dictionary as described in the
 relevant section of the :doc:`messaging spec <messaging>`.
 
-.. class:: MyKernel
+.. class:: MyBetterKernel
 
    .. method:: do_complete(code, cusor_pos)
 

From 1c26ff886ebdbd3adf7f561eb081537390481bd9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 15 Apr 2020 13:31:50 -0700
Subject: [PATCH 0085/1407] Diable ARM for now as some wheel do not build

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 88111acc470..62615ed2cac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,11 +69,6 @@ matrix:
       python: "3.7"
       dist: xenial
       sudo: true
-    - arch: arm64
-      python: "3.7"
-      dist: xenial
-      env: ARM64=True IPYTHON_TESTING_TIMEOUT_SCALE=2
-      sudo: true
     - arch: amd64
       python: "3.8"
       dist: xenial

From 46ca535fa11bb7291facbfd0060c23ce15f0a67b Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@gmail.com>
Date: Fri, 17 Apr 2020 10:27:32 +0200
Subject: [PATCH 0086/1407] Move display core functions into a separate file

Signed-off-by: martinRenou <martin.renou@gmail.com>
---
 IPython/core/display.py           | 373 ++----------------------------
 IPython/core/display_functions.py | 367 +++++++++++++++++++++++++++++
 2 files changed, 382 insertions(+), 358 deletions(-)
 create mode 100644 IPython/core/display_functions.py

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 3addc1d012b..ff9f405e22f 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -5,12 +5,11 @@
 # Distributed under the terms of the Modified BSD License.
 
 
-from binascii import b2a_hex, b2a_base64, hexlify
+from binascii import b2a_base64, hexlify
 import json
 import mimetypes
 import os
 import struct
-import sys
 import warnings
 from copy import deepcopy
 from os.path import splitext
@@ -18,14 +17,15 @@
 
 from IPython.utils.py3compat import cast_unicode
 from IPython.testing.skipdoctest import skip_doctest
+from .display_functions import display, clear_output, publish_display_data, update_display, DisplayHandle
 
 __all__ = ['display', 'display_pretty', 'display_html', 'display_markdown',
-'display_svg', 'display_png', 'display_jpeg', 'display_latex', 'display_json',
-'display_javascript', 'display_pdf', 'DisplayObject', 'TextDisplayObject',
-'Pretty', 'HTML', 'Markdown', 'Math', 'Latex', 'SVG', 'ProgressBar', 'JSON',
-'GeoJSON', 'Javascript', 'Image', 'clear_output', 'set_matplotlib_formats',
-'set_matplotlib_close', 'publish_display_data', 'update_display', 'DisplayHandle',
-'Video']
+           'display_svg', 'display_png', 'display_jpeg', 'display_latex', 'display_json',
+           'display_javascript', 'display_pdf', 'DisplayObject', 'TextDisplayObject',
+           'Pretty', 'HTML', 'Markdown', 'Math', 'Latex', 'SVG', 'ProgressBar', 'JSON',
+           'GeoJSON', 'Javascript', 'Image', 'clear_output', 'set_matplotlib_formats',
+           'set_matplotlib_close', 'publish_display_data', 'update_display', 'DisplayHandle',
+           'Video']
 
 #-----------------------------------------------------------------------------
 # utility functions
@@ -38,17 +38,6 @@ def _safe_exists(path):
     except Exception:
         return False
 
-def _merge(d1, d2):
-    """Like update, but merges sub-dicts instead of clobbering at the top level.
-
-    Updates d1 in-place
-    """
-
-    if not isinstance(d2, dict) or not isinstance(d1, dict):
-        return d2
-    for key, value in d2.items():
-        d1[key] = _merge(d1.get(key), value)
-    return d1
 
 def _display_mimetype(mimetype, objs, raw=False, metadata=None):
     """internal implementation of all display_foo methods
@@ -77,321 +66,6 @@ def _display_mimetype(mimetype, objs, raw=False, metadata=None):
 # Main functions
 #-----------------------------------------------------------------------------
 
-# use * to indicate transient is keyword-only
-def publish_display_data(data, metadata=None, source=None, *, transient=None, **kwargs):
-    """Publish data and metadata to all frontends.
-
-    See the ``display_data`` message in the messaging documentation for
-    more details about this message type.
-
-    Keys of data and metadata can be any mime-type.
-
-    Parameters
-    ----------
-    data : dict
-        A dictionary having keys that are valid MIME types (like
-        'text/plain' or 'image/svg+xml') and values that are the data for
-        that MIME type. The data itself must be a JSON'able data
-        structure. Minimally all data should have the 'text/plain' data,
-        which can be displayed by all frontends. If more than the plain
-        text is given, it is up to the frontend to decide which
-        representation to use.
-    metadata : dict
-        A dictionary for metadata related to the data. This can contain
-        arbitrary key, value pairs that frontends can use to interpret
-        the data. mime-type keys matching those in data can be used
-        to specify metadata about particular representations.
-    source : str, deprecated
-        Unused.
-    transient : dict, keyword-only
-        A dictionary of transient data, such as display_id.
-        """
-    from IPython.core.interactiveshell import InteractiveShell
-
-    display_pub = InteractiveShell.instance().display_pub
-
-    # only pass transient if supplied,
-    # to avoid errors with older ipykernel.
-    # TODO: We could check for ipykernel version and provide a detailed upgrade message.
-    if transient:
-        kwargs['transient'] = transient
-
-    display_pub.publish(
-        data=data,
-        metadata=metadata,
-        **kwargs
-    )
-
-
-def _new_id():
-    """Generate a new random text id with urandom"""
-    return b2a_hex(os.urandom(16)).decode('ascii')
-
-
-def display(*objs, include=None, exclude=None, metadata=None, transient=None, display_id=None, **kwargs):
-    """Display a Python object in all frontends.
-
-    By default all representations will be computed and sent to the frontends.
-    Frontends can decide which representation is used and how.
-
-    In terminal IPython this will be similar to using :func:`print`, for use in richer
-    frontends see Jupyter notebook examples with rich display logic.
-
-    Parameters
-    ----------
-    *objs : object
-        The Python objects to display.
-    raw : bool, optional
-        Are the objects to be displayed already mimetype-keyed dicts of raw display data,
-        or Python objects that need to be formatted before display? [default: False]
-    include : list, tuple or set, optional
-        A list of format type strings (MIME types) to include in the
-        format data dict. If this is set *only* the format types included
-        in this list will be computed.
-    exclude : list, tuple or set, optional
-        A list of format type strings (MIME types) to exclude in the format
-        data dict. If this is set all format types will be computed,
-        except for those included in this argument.
-    metadata : dict, optional
-        A dictionary of metadata to associate with the output.
-        mime-type keys in this dictionary will be associated with the individual
-        representation formats, if they exist.
-    transient : dict, optional
-        A dictionary of transient data to associate with the output.
-        Data in this dict should not be persisted to files (e.g. notebooks).
-    display_id : str, bool optional
-        Set an id for the display.
-        This id can be used for updating this display area later via update_display.
-        If given as `True`, generate a new `display_id`
-    kwargs: additional keyword-args, optional
-        Additional keyword-arguments are passed through to the display publisher.
-
-    Returns
-    -------
-
-    handle: DisplayHandle
-        Returns a handle on updatable displays for use with :func:`update_display`,
-        if `display_id` is given. Returns :any:`None` if no `display_id` is given
-        (default).
-
-    Examples
-    --------
-
-    >>> class Json(object):
-    ...     def __init__(self, json):
-    ...         self.json = json
-    ...     def _repr_pretty_(self, pp, cycle):
-    ...         import json
-    ...         pp.text(json.dumps(self.json, indent=2))
-    ...     def __repr__(self):
-    ...         return str(self.json)
-    ...
-
-    >>> d = Json({1:2, 3: {4:5}})
-
-    >>> print(d)
-    {1: 2, 3: {4: 5}}
-
-    >>> display(d)
-    {
-      "1": 2,
-      "3": {
-        "4": 5
-      }
-    }
-
-    >>> def int_formatter(integer, pp, cycle):
-    ...     pp.text('I'*integer)
-
-    >>> plain = get_ipython().display_formatter.formatters['text/plain']
-    >>> plain.for_type(int, int_formatter)
-    <function _repr_pprint at 0x...>
-    >>> display(7-5)
-    II
-
-    >>> del plain.type_printers[int]
-    >>> display(7-5)
-    2
-
-    See Also
-    --------
-
-    :func:`update_display`
-
-    Notes
-    -----
-
-    In Python, objects can declare their textual representation using the
-    `__repr__` method. IPython expands on this idea and allows objects to declare
-    other, rich representations including:
-
-      - HTML
-      - JSON
-      - PNG
-      - JPEG
-      - SVG
-      - LaTeX
-
-    A single object can declare some or all of these representations; all are
-    handled by IPython's display system.
-
-    The main idea of the first approach is that you have to implement special
-    display methods when you define your class, one for each representation you
-    want to use. Here is a list of the names of the special methods and the
-    values they must return:
-
-      - `_repr_html_`: return raw HTML as a string, or a tuple (see below).
-      - `_repr_json_`: return a JSONable dict, or a tuple (see below).
-      - `_repr_jpeg_`: return raw JPEG data, or a tuple (see below).
-      - `_repr_png_`: return raw PNG data, or a tuple (see below).
-      - `_repr_svg_`: return raw SVG data as a string, or a tuple (see below).
-      - `_repr_latex_`: return LaTeX commands in a string surrounded by "$",
-                        or a tuple (see below).
-      - `_repr_mimebundle_`: return a full mimebundle containing the mapping
-                             from all mimetypes to data.
-                             Use this for any mime-type not listed above.
-
-    The above functions may also return the object's metadata alonside the
-    data.  If the metadata is available, the functions will return a tuple
-    containing the data and metadata, in that order.  If there is no metadata
-    available, then the functions will return the data only.
-
-    When you are directly writing your own classes, you can adapt them for
-    display in IPython by following the above approach. But in practice, you
-    often need to work with existing classes that you can't easily modify.
-
-    You can refer to the documentation on integrating with the display system in
-    order to register custom formatters for already existing types
-    (:ref:`integrating_rich_display`).
-
-    .. versionadded:: 5.4 display available without import
-    .. versionadded:: 6.1 display available without import
-
-    Since IPython 5.4 and 6.1 :func:`display` is automatically made available to
-    the user without import. If you are using display in a document that might
-    be used in a pure python context or with older version of IPython, use the
-    following import at the top of your file::
-
-        from IPython.display import display
-
-    """
-    from IPython.core.interactiveshell import InteractiveShell
-    
-    if not InteractiveShell.initialized():
-        # Directly print objects.
-        print(*objs)
-        return
-    
-    raw = kwargs.pop('raw', False)
-    if transient is None:
-        transient = {}
-    if metadata is None:
-        metadata={}
-    if display_id:
-        if display_id is True:
-            display_id = _new_id()
-        transient['display_id'] = display_id
-    if kwargs.get('update') and 'display_id' not in transient:
-        raise TypeError('display_id required for update_display')
-    if transient:
-        kwargs['transient'] = transient
-
-    if not objs and display_id:
-        # if given no objects, but still a request for a display_id,
-        # we assume the user wants to insert an empty output that
-        # can be updated later
-        objs = [{}]
-        raw = True
-
-    if not raw:
-        format = InteractiveShell.instance().display_formatter.format
-
-    for obj in objs:
-        if raw:
-            publish_display_data(data=obj, metadata=metadata, **kwargs)
-        else:
-            format_dict, md_dict = format(obj, include=include, exclude=exclude)
-            if not format_dict:
-                # nothing to display (e.g. _ipython_display_ took over)
-                continue
-            if metadata:
-                # kwarg-specified metadata gets precedence
-                _merge(md_dict, metadata)
-            publish_display_data(data=format_dict, metadata=md_dict, **kwargs)
-    if display_id:
-        return DisplayHandle(display_id)
-
-
-# use * for keyword-only display_id arg
-def update_display(obj, *, display_id, **kwargs):
-    """Update an existing display by id
-
-    Parameters
-    ----------
-
-    obj:
-        The object with which to update the display
-    display_id: keyword-only
-        The id of the display to update
-
-    See Also
-    --------
-
-    :func:`display`
-    """
-    kwargs['update'] = True
-    display(obj, display_id=display_id, **kwargs)
-
-
-class DisplayHandle(object):
-    """A handle on an updatable display
-
-    Call `.update(obj)` to display a new object.
-
-    Call `.display(obj`) to add a new instance of this display,
-    and update existing instances.
-
-    See Also
-    --------
-
-        :func:`display`, :func:`update_display`
-
-    """
-
-    def __init__(self, display_id=None):
-        if display_id is None:
-            display_id = _new_id()
-        self.display_id = display_id
-
-    def __repr__(self):
-        return "<%s display_id=%s>" % (self.__class__.__name__, self.display_id)
-
-    def display(self, obj, **kwargs):
-        """Make a new display with my id, updating existing instances.
-        
-        Parameters
-        ----------
-        
-        obj:
-            object to display
-        **kwargs:
-            additional keyword arguments passed to display
-        """
-        display(obj, display_id=self.display_id, **kwargs)
-
-    def update(self, obj, **kwargs):
-        """Update existing displays with my id
-        
-        Parameters
-        ----------
-        
-        obj:
-            object to display
-        **kwargs:
-            additional keyword arguments passed to update_display
-        """
-        update_display(obj, display_id=self.display_id, **kwargs)
-
 
 def display_pretty(*objs, **kwargs):
     """Display the pretty (default) representation of an object.
@@ -764,16 +438,16 @@ def data(self, svg):
             pass
         svg = cast_unicode(svg)
         self._data = svg
-    
+
     def _repr_svg_(self):
         return self._data_and_metadata()
 
 class ProgressBar(DisplayObject):
-    """Progressbar supports displaying a progressbar like element 
+    """Progressbar supports displaying a progressbar like element
     """
     def __init__(self, total):
         """Creates a new progressbar
-        
+
         Parameters
         ----------
         total : int
@@ -853,7 +527,7 @@ def __init__(self, data=None, url=None, filename=None, expanded=False, metadata=
         metadata: dict
             Specify extra metadata to attach to the json display object.
         root : str
-            The name of the root element of the JSON tree 
+            The name of the root element of the JSON tree
         """
         self.metadata = {
             'expanded': expanded,
@@ -916,7 +590,7 @@ class GeoJSON(JSON):
 
     Scalar types (None, number, string) are not allowed, only dict containers.
     """
-    
+
     def __init__(self, *args, **kwargs):
         """Create a GeoJSON display object given raw data.
 
@@ -965,7 +639,7 @@ def __init__(self, *args, **kwargs):
         the GeoJSON object.
 
         """
-        
+
         super(GeoJSON, self).__init__(*args, **kwargs)
 
 
@@ -1200,7 +874,7 @@ def __init__(self, data=None, url=None, filename=None, format=None,
         self.height = height
         self.retina = retina
         self.unconfined = unconfined
-        super(Image, self).__init__(data=data, url=url, filename=filename, 
+        super(Image, self).__init__(data=data, url=url, filename=filename,
                 metadata=metadata)
 
         if self.width is None and self.metadata.get('width', {}):
@@ -1422,23 +1096,6 @@ def reload(self):
         pass
 
 
-def clear_output(wait=False):
-    """Clear the output of the current cell receiving output.
-
-    Parameters
-    ----------
-    wait : bool [default: false]
-        Wait to clear the output until new output is available to replace it."""
-    from IPython.core.interactiveshell import InteractiveShell
-    if InteractiveShell.initialized():
-        InteractiveShell.instance().display_pub.clear_output(wait)
-    else:
-        print('\033[2K\r', end='')
-        sys.stdout.flush()
-        print('\033[2K\r', end='')
-        sys.stderr.flush()
-
-
 @skip_doctest
 def set_matplotlib_formats(*formats, **kwargs):
     """Select figure formats for the inline backend. Optionally pass quality for JPEG.
diff --git a/IPython/core/display_functions.py b/IPython/core/display_functions.py
new file mode 100644
index 00000000000..5b49faaedd9
--- /dev/null
+++ b/IPython/core/display_functions.py
@@ -0,0 +1,367 @@
+# -*- coding: utf-8 -*-
+"""Top-level display functions for displaying object in different formats."""
+
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
+
+
+from binascii import b2a_hex
+import os
+import sys
+
+__all__ = ['display', 'clear_output', 'publish_display_data', 'update_display', 'DisplayHandle']
+
+#-----------------------------------------------------------------------------
+# utility functions
+#-----------------------------------------------------------------------------
+
+
+def _merge(d1, d2):
+    """Like update, but merges sub-dicts instead of clobbering at the top level.
+
+    Updates d1 in-place
+    """
+
+    if not isinstance(d2, dict) or not isinstance(d1, dict):
+        return d2
+    for key, value in d2.items():
+        d1[key] = _merge(d1.get(key), value)
+    return d1
+
+
+#-----------------------------------------------------------------------------
+# Main functions
+#-----------------------------------------------------------------------------
+
+
+# use * to indicate transient is keyword-only
+def publish_display_data(data, metadata=None, source=None, *, transient=None, **kwargs):
+    """Publish data and metadata to all frontends.
+
+    See the ``display_data`` message in the messaging documentation for
+    more details about this message type.
+
+    Keys of data and metadata can be any mime-type.
+
+    Parameters
+    ----------
+    data : dict
+        A dictionary having keys that are valid MIME types (like
+        'text/plain' or 'image/svg+xml') and values that are the data for
+        that MIME type. The data itself must be a JSON'able data
+        structure. Minimally all data should have the 'text/plain' data,
+        which can be displayed by all frontends. If more than the plain
+        text is given, it is up to the frontend to decide which
+        representation to use.
+    metadata : dict
+        A dictionary for metadata related to the data. This can contain
+        arbitrary key, value pairs that frontends can use to interpret
+        the data. mime-type keys matching those in data can be used
+        to specify metadata about particular representations.
+    source : str, deprecated
+        Unused.
+    transient : dict, keyword-only
+        A dictionary of transient data, such as display_id.
+        """
+    from IPython.core.interactiveshell import InteractiveShell
+
+    display_pub = InteractiveShell.instance().display_pub
+
+    # only pass transient if supplied,
+    # to avoid errors with older ipykernel.
+    # TODO: We could check for ipykernel version and provide a detailed upgrade message.
+    if transient:
+        kwargs['transient'] = transient
+
+    display_pub.publish(
+        data=data,
+        metadata=metadata,
+        **kwargs
+    )
+
+
+def _new_id():
+    """Generate a new random text id with urandom"""
+    return b2a_hex(os.urandom(16)).decode('ascii')
+
+
+def display(*objs, include=None, exclude=None, metadata=None, transient=None, display_id=None, **kwargs):
+    """Display a Python object in all frontends.
+
+    By default all representations will be computed and sent to the frontends.
+    Frontends can decide which representation is used and how.
+
+    In terminal IPython this will be similar to using :func:`print`, for use in richer
+    frontends see Jupyter notebook examples with rich display logic.
+
+    Parameters
+    ----------
+    *objs : object
+        The Python objects to display.
+    raw : bool, optional
+        Are the objects to be displayed already mimetype-keyed dicts of raw display data,
+        or Python objects that need to be formatted before display? [default: False]
+    include : list, tuple or set, optional
+        A list of format type strings (MIME types) to include in the
+        format data dict. If this is set *only* the format types included
+        in this list will be computed.
+    exclude : list, tuple or set, optional
+        A list of format type strings (MIME types) to exclude in the format
+        data dict. If this is set all format types will be computed,
+        except for those included in this argument.
+    metadata : dict, optional
+        A dictionary of metadata to associate with the output.
+        mime-type keys in this dictionary will be associated with the individual
+        representation formats, if they exist.
+    transient : dict, optional
+        A dictionary of transient data to associate with the output.
+        Data in this dict should not be persisted to files (e.g. notebooks).
+    display_id : str, bool optional
+        Set an id for the display.
+        This id can be used for updating this display area later via update_display.
+        If given as `True`, generate a new `display_id`
+    kwargs: additional keyword-args, optional
+        Additional keyword-arguments are passed through to the display publisher.
+
+    Returns
+    -------
+
+    handle: DisplayHandle
+        Returns a handle on updatable displays for use with :func:`update_display`,
+        if `display_id` is given. Returns :any:`None` if no `display_id` is given
+        (default).
+
+    Examples
+    --------
+
+    >>> class Json(object):
+    ...     def __init__(self, json):
+    ...         self.json = json
+    ...     def _repr_pretty_(self, pp, cycle):
+    ...         import json
+    ...         pp.text(json.dumps(self.json, indent=2))
+    ...     def __repr__(self):
+    ...         return str(self.json)
+    ...
+
+    >>> d = Json({1:2, 3: {4:5}})
+
+    >>> print(d)
+    {1: 2, 3: {4: 5}}
+
+    >>> display(d)
+    {
+      "1": 2,
+      "3": {
+        "4": 5
+      }
+    }
+
+    >>> def int_formatter(integer, pp, cycle):
+    ...     pp.text('I'*integer)
+
+    >>> plain = get_ipython().display_formatter.formatters['text/plain']
+    >>> plain.for_type(int, int_formatter)
+    <function _repr_pprint at 0x...>
+    >>> display(7-5)
+    II
+
+    >>> del plain.type_printers[int]
+    >>> display(7-5)
+    2
+
+    See Also
+    --------
+
+    :func:`update_display`
+
+    Notes
+    -----
+
+    In Python, objects can declare their textual representation using the
+    `__repr__` method. IPython expands on this idea and allows objects to declare
+    other, rich representations including:
+
+      - HTML
+      - JSON
+      - PNG
+      - JPEG
+      - SVG
+      - LaTeX
+
+    A single object can declare some or all of these representations; all are
+    handled by IPython's display system.
+
+    The main idea of the first approach is that you have to implement special
+    display methods when you define your class, one for each representation you
+    want to use. Here is a list of the names of the special methods and the
+    values they must return:
+
+      - `_repr_html_`: return raw HTML as a string, or a tuple (see below).
+      - `_repr_json_`: return a JSONable dict, or a tuple (see below).
+      - `_repr_jpeg_`: return raw JPEG data, or a tuple (see below).
+      - `_repr_png_`: return raw PNG data, or a tuple (see below).
+      - `_repr_svg_`: return raw SVG data as a string, or a tuple (see below).
+      - `_repr_latex_`: return LaTeX commands in a string surrounded by "$",
+                        or a tuple (see below).
+      - `_repr_mimebundle_`: return a full mimebundle containing the mapping
+                             from all mimetypes to data.
+                             Use this for any mime-type not listed above.
+
+    The above functions may also return the object's metadata alonside the
+    data.  If the metadata is available, the functions will return a tuple
+    containing the data and metadata, in that order.  If there is no metadata
+    available, then the functions will return the data only.
+
+    When you are directly writing your own classes, you can adapt them for
+    display in IPython by following the above approach. But in practice, you
+    often need to work with existing classes that you can't easily modify.
+
+    You can refer to the documentation on integrating with the display system in
+    order to register custom formatters for already existing types
+    (:ref:`integrating_rich_display`).
+
+    .. versionadded:: 5.4 display available without import
+    .. versionadded:: 6.1 display available without import
+
+    Since IPython 5.4 and 6.1 :func:`display` is automatically made available to
+    the user without import. If you are using display in a document that might
+    be used in a pure python context or with older version of IPython, use the
+    following import at the top of your file::
+
+        from IPython.display import display
+
+    """
+    from IPython.core.interactiveshell import InteractiveShell
+
+    if not InteractiveShell.initialized():
+        # Directly print objects.
+        print(*objs)
+        return
+
+    raw = kwargs.pop('raw', False)
+    if transient is None:
+        transient = {}
+    if metadata is None:
+        metadata={}
+    if display_id:
+        if display_id is True:
+            display_id = _new_id()
+        transient['display_id'] = display_id
+    if kwargs.get('update') and 'display_id' not in transient:
+        raise TypeError('display_id required for update_display')
+    if transient:
+        kwargs['transient'] = transient
+
+    if not objs and display_id:
+        # if given no objects, but still a request for a display_id,
+        # we assume the user wants to insert an empty output that
+        # can be updated later
+        objs = [{}]
+        raw = True
+
+    if not raw:
+        format = InteractiveShell.instance().display_formatter.format
+
+    for obj in objs:
+        if raw:
+            publish_display_data(data=obj, metadata=metadata, **kwargs)
+        else:
+            format_dict, md_dict = format(obj, include=include, exclude=exclude)
+            if not format_dict:
+                # nothing to display (e.g. _ipython_display_ took over)
+                continue
+            if metadata:
+                # kwarg-specified metadata gets precedence
+                _merge(md_dict, metadata)
+            publish_display_data(data=format_dict, metadata=md_dict, **kwargs)
+    if display_id:
+        return DisplayHandle(display_id)
+
+
+# use * for keyword-only display_id arg
+def update_display(obj, *, display_id, **kwargs):
+    """Update an existing display by id
+
+    Parameters
+    ----------
+
+    obj:
+        The object with which to update the display
+    display_id: keyword-only
+        The id of the display to update
+
+    See Also
+    --------
+
+    :func:`display`
+    """
+    kwargs['update'] = True
+    display(obj, display_id=display_id, **kwargs)
+
+
+class DisplayHandle(object):
+    """A handle on an updatable display
+
+    Call `.update(obj)` to display a new object.
+
+    Call `.display(obj`) to add a new instance of this display,
+    and update existing instances.
+
+    See Also
+    --------
+
+        :func:`display`, :func:`update_display`
+
+    """
+
+    def __init__(self, display_id=None):
+        if display_id is None:
+            display_id = _new_id()
+        self.display_id = display_id
+
+    def __repr__(self):
+        return "<%s display_id=%s>" % (self.__class__.__name__, self.display_id)
+
+    def display(self, obj, **kwargs):
+        """Make a new display with my id, updating existing instances.
+
+        Parameters
+        ----------
+
+        obj:
+            object to display
+        **kwargs:
+            additional keyword arguments passed to display
+        """
+        display(obj, display_id=self.display_id, **kwargs)
+
+    def update(self, obj, **kwargs):
+        """Update existing displays with my id
+
+        Parameters
+        ----------
+
+        obj:
+            object to display
+        **kwargs:
+            additional keyword arguments passed to update_display
+        """
+        update_display(obj, display_id=self.display_id, **kwargs)
+
+
+def clear_output(wait=False):
+    """Clear the output of the current cell receiving output.
+
+    Parameters
+    ----------
+    wait : bool [default: false]
+        Wait to clear the output until new output is available to replace it."""
+    from IPython.core.interactiveshell import InteractiveShell
+    if InteractiveShell.initialized():
+        InteractiveShell.instance().display_pub.clear_output(wait)
+    else:
+        print('\033[2K\r', end='')
+        sys.stdout.flush()
+        print('\033[2K\r', end='')
+        sys.stderr.flush()

From cc16a36c639628c0d4d328eeba0da47bf3652c95 Mon Sep 17 00:00:00 2001
From: Ian Castleden <ian.castleden@gmail.com>
Date: Mon, 13 Apr 2020 03:38:20 +0800
Subject: [PATCH 0087/1407] ensure SVG(url=...) is set correctly

---
 IPython/core/display.py | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 3addc1d012b..8cdd07f1907 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -615,9 +615,12 @@ def __init__(self, data=None, url=None, filename=None, metadata=None):
                 filename = data
                 data = None
 
-        self.data = data
         self.url = url
         self.filename = filename
+        # because of @data.setter methods in
+        # subclasses ensure url and filename are set
+        # before assigning to self.data
+        self.data = data
 
         if metadata is not None:
             self.metadata = metadata
@@ -652,23 +655,27 @@ def reload(self):
             with open(self.filename, self._read_flags) as f:
                 self.data = f.read()
         elif self.url is not None:
-            try:
-                # Deferred import
-                from urllib.request import urlopen
-                response = urlopen(self.url)
-                self.data = response.read()
-                # extract encoding from header, if there is one:
-                encoding = None
+            # Deferred import
+            from urllib.request import urlopen
+            response = urlopen(self.url)
+            data = response.read()
+            # extract encoding from header, if there is one:
+            encoding = None
+            if "content-type" in response.headers:
                 for sub in response.headers['content-type'].split(';'):
                     sub = sub.strip()
                     if sub.startswith('charset'):
                         encoding = sub.split('=')[-1].strip()
                         break
-                # decode data, if an encoding was specified
-                if encoding:
-                    self.data = self.data.decode(encoding, 'replace')
-            except:
-                self.data = None
+            # decode data, if an encoding was specified
+            # We only touch self.data once since
+            # subclasses such as SVG have @data.setter methods
+            # that transform self.data into ... well svg.
+            if encoding:
+                self.data = data.decode(encoding, 'replace')
+            else:
+                self.data = data
+
 
 class TextDisplayObject(DisplayObject):
     """Validate that display data is text"""
@@ -879,7 +886,7 @@ def data(self, data):
             data = str(data)
 
         if isinstance(data, str):
-            if getattr(self, 'filename', None) is None:
+            if self.filename is None and self.url is None:
                 warnings.warn("JSON expects JSONable dict or list, not JSON strings")
             data = json.loads(data)
         self._data = data

From a8c7ba28db34854af56da138245f321533ecc282 Mon Sep 17 00:00:00 2001
From: Ian Castleden <ian.castleden@gmail.com>
Date: Mon, 13 Apr 2020 04:21:32 +0800
Subject: [PATCH 0088/1407] uncompress compressed data

---
 IPython/core/display.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 8cdd07f1907..2b97bc69c66 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -661,12 +661,21 @@ def reload(self):
             data = response.read()
             # extract encoding from header, if there is one:
             encoding = None
-            if "content-type" in response.headers:
+            if 'content-type' in response.headers:
                 for sub in response.headers['content-type'].split(';'):
                     sub = sub.strip()
                     if sub.startswith('charset'):
                         encoding = sub.split('=')[-1].strip()
                         break
+            if 'content-encoding' in response.headers:
+                # TODO: do deflate?
+                if 'gzip' in response.headers['content-encoding']:
+                    import gzip
+                    from io import BytesIO
+                    with gzip.open(BytesIO(data), 'rt', encoding=encoding) as fp:
+                        encoding = None
+                        data = fp.read()
+                    
             # decode data, if an encoding was specified
             # We only touch self.data once since
             # subclasses such as SVG have @data.setter methods

From fe09867a23afab467985080770fd7f984460aa69 Mon Sep 17 00:00:00 2001
From: Ian Castleden <ian.castleden@gmail.com>
Date: Mon, 13 Apr 2020 10:31:51 +0800
Subject: [PATCH 0089/1407] added documentation and test

---
 IPython/core/display.py            | 5 +++++
 IPython/core/tests/test_display.py | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 2b97bc69c66..a420993a5af 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -752,6 +752,11 @@ def _repr_latex_(self):
 
 
 class SVG(DisplayObject):
+    """Embed an SVG into the display.
+
+    Note if you just want to view a svg image via a URL use `:class:Image` with
+    a url=URL keyword argument.
+    """
 
     _read_flags = 'rb'
     # wrap data in a property, which extracts the <svg> tag, discarding
diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index 0ce4ad2b429..bf44010500f 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -72,6 +72,12 @@ def test_retina_png():
     nt.assert_equal(md['width'], 1)
     nt.assert_equal(md['height'], 1)
 
+def test_embed_svg_url():
+    # 6.1kB of data
+    url = "https://upload.wikimedia.org/wikipedia/commons/3/30/Vector-based_example.svg"
+    svg = display.SVG(url=url)
+    nt.assert_true(svg._repr_svg_().startswith('<svg '))
+
 def test_retina_jpeg():
     here = os.path.dirname(__file__)
     img = display.Image(os.path.join(here, "2x2.jpg"), retina=True)

From 50321c89ae7c49ad24f509353436f28d4bfbdd25 Mon Sep 17 00:00:00 2001
From: Ian Castleden <ian.castleden@gmail.com>
Date: Mon, 13 Apr 2020 11:22:57 +0800
Subject: [PATCH 0090/1407] added mocked response

---
 IPython/core/tests/test_display.py | 39 +++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index bf44010500f..04c93258448 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -73,11 +73,44 @@ def test_retina_png():
     nt.assert_equal(md['height'], 1)
 
 def test_embed_svg_url():
-    # 6.1kB of data
+    import gzip
+    from io import BytesIO
+    svg_data = b'<svg><circle x="0" y="0" r="1"/></svg>'
+    url = 'http://test.com/circle.svg'
+    
+    gzip_svg = BytesIO()
+    with gzip.open(gzip_svg, 'wb') as fp:
+        fp.write(svg_data)
+    gzip_svg = gzip_svg.getvalue()
+    
+    def mocked_urlopen(*args, **kwargs):
+        class MockResponse:
+            def __init__(self, svg):
+                self._svg_data = svg
+                self.headers = {'content-type': 'image/svg+xml'}
+
+            def read(self):
+                return self._svg_data
+
+        if args[0] == url:
+            return MockResponse(svg_data)
+        elif args[0] == url + 'z':          
+            ret= MockResponse(gzip_svg)
+            ret.headers['content-encoding']= 'gzip'
+            return ret
+        return MockResponse(None)
+
+    with mock.patch('urllib.request.urlopen', side_effect=mocked_urlopen):
+        svg = display.SVG(url=url)
+        nt.assert_true(svg._repr_svg_().startswith('<svg'))
+        svg = display.SVG(url=url + 'z')
+        nt.assert_true(svg._repr_svg_().startswith('<svg'))
+
+    # do it for real: 6.1kB of data
     url = "https://upload.wikimedia.org/wikipedia/commons/3/30/Vector-based_example.svg"
     svg = display.SVG(url=url)
-    nt.assert_true(svg._repr_svg_().startswith('<svg '))
-
+    nt.assert_true(svg._repr_svg_().startswith('<svg'))
+    
 def test_retina_jpeg():
     here = os.path.dirname(__file__)
     img = display.Image(os.path.join(here, "2x2.jpg"), retina=True)

From 40b4d0f0cfcc4fd7c26f7e73afa47a093bd44178 Mon Sep 17 00:00:00 2001
From: Quentin Peter <impact27@users.noreply.github.com>
Date: Fri, 3 Apr 2020 14:54:12 +0200
Subject: [PATCH 0091/1407] Catch ValueError

Typing "w = 1" in the debugger crashes the debugger
---
 IPython/core/debugger.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 0d0b71e88d8..cc41f20fb27 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -620,7 +620,11 @@ def do_where(self, arg):
         Take a number as argument as an (optional) number of context line to
         print"""
         if arg:
-            context = int(arg)
+            try:
+                context = int(arg)
+            except ValueError:
+                self.stdout.write('\n' + self.shell.get_exception_only())
+                return
             self.print_stack_trace(context)
         else:
             self.print_stack_trace()

From d982803182f5e783afebe933e63179628e6f0e8c Mon Sep 17 00:00:00 2001
From: Quentin Peter <impact27@users.noreply.github.com>
Date: Sat, 18 Apr 2020 11:55:43 +0200
Subject: [PATCH 0092/1407] use self.error

---
 IPython/core/debugger.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index cc41f20fb27..ca0c1f4227e 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -622,8 +622,8 @@ def do_where(self, arg):
         if arg:
             try:
                 context = int(arg)
-            except ValueError:
-                self.stdout.write('\n' + self.shell.get_exception_only())
+            except ValueError as err:
+                self.error(err)
                 return
             self.print_stack_trace(context)
         else:

From 24fed1257f3b17d0a829f535c5cf196417c7e208 Mon Sep 17 00:00:00 2001
From: Eric Wieser <wieser.eric@gmail.com>
Date: Fri, 10 Apr 2020 18:06:10 +0100
Subject: [PATCH 0093/1407] Add pretty-printing for types.SimpleNamespace

---
 IPython/lib/pretty.py            | 17 +++++++++++++++++
 IPython/lib/tests/test_pretty.py | 20 ++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/IPython/lib/pretty.py b/IPython/lib/pretty.py
index 3115d3f6dbf..1cb46b1413d 100644
--- a/IPython/lib/pretty.py
+++ b/IPython/lib/pretty.py
@@ -648,6 +648,22 @@ def _re_pattern_pprint(obj, p, cycle):
     p.text(')')
 
 
+def _types_simplenamespace_pprint(obj, p, cycle):
+    """The pprint function for types.SimpleNamespace."""
+    name = 'namespace'
+    with p.group(len(name) + 1, name + '(', ')'):
+        if cycle:
+            p.text('...')
+        else:
+            for idx, (attr, value) in enumerate(obj.__dict__.items()):
+                if idx:
+                    p.text(',')
+                    p.breakable()
+                attr_kwarg = '{}='.format(attr)
+                with p.group(len(attr_kwarg), attr_kwarg):
+                    p.pretty(value)
+
+
 def _type_pprint(obj, p, cycle):
     """The pprint for classes and types."""
     # Heap allocated types might not have the module attribute,
@@ -741,6 +757,7 @@ def _exception_pprint(obj, p, cycle):
     types.FunctionType:         _function_pprint,
     types.BuiltinFunctionType:  _function_pprint,
     types.MethodType:           _repr_pprint,
+    types.SimpleNamespace:      _types_simplenamespace_pprint,
     datetime.datetime:          _repr_pprint,
     datetime.timedelta:         _repr_pprint,
     _exception_base:            _exception_pprint
diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py
index 695012d6fc9..ba4c3296694 100644
--- a/IPython/lib/tests/test_pretty.py
+++ b/IPython/lib/tests/test_pretty.py
@@ -407,6 +407,26 @@ def test_mappingproxy():
         nt.assert_equal(pretty.pretty(obj), expected)
 
 
+def test_simplenamespace():
+    SN = types.SimpleNamespace
+
+    sn_recursive = SN()
+    sn_recursive.first = sn_recursive
+    sn_recursive.second = sn_recursive
+    cases = [
+        (SN(), "namespace()"),
+        (SN(x=SN()), "namespace(x=namespace())"),
+        (SN(a_long_name=[SN(s=string.ascii_lowercase)]*3, a_short_name=None),
+         "namespace(a_long_name=[namespace(s='abcdefghijklmnopqrstuvwxyz'),\n"
+         "                       namespace(s='abcdefghijklmnopqrstuvwxyz'),\n"
+         "                       namespace(s='abcdefghijklmnopqrstuvwxyz')],\n"
+         "          a_short_name=None)"),
+        (sn_recursive, "namespace(first=namespace(...), second=namespace(...))"),
+    ]
+    for obj, expected in cases:
+        nt.assert_equal(pretty.pretty(obj), expected)
+
+
 def test_pretty_environ():
     dict_repr = pretty.pretty(dict(os.environ))
     # reindent to align with 'environ' prefix

From 43a01a21101ea65dbd52cf760c1e4f149bfab588 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 18 Apr 2020 15:26:16 -0700
Subject: [PATCH 0094/1407] Do not import from IPython.core.display and warn
 users.

---
 IPython/core/display.py            | 30 +++++++++++++++++++----
 IPython/core/displaypub.py         |  2 +-
 IPython/core/magics/display.py     |  2 +-
 IPython/core/page.py               |  2 +-
 IPython/core/pylabtools.py         |  2 +-
 IPython/core/tests/test_display.py |  2 +-
 IPython/display.py                 | 38 ++++++++++++++++++++++++++----
 IPython/testing/iptest.py          |  1 +
 8 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index ff9f405e22f..36658f49a59 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -17,16 +17,38 @@
 
 from IPython.utils.py3compat import cast_unicode
 from IPython.testing.skipdoctest import skip_doctest
-from .display_functions import display, clear_output, publish_display_data, update_display, DisplayHandle
+from . import display_functions
 
-__all__ = ['display', 'display_pretty', 'display_html', 'display_markdown',
+
+__all__ = ['display_pretty', 'display_html', 'display_markdown',
            'display_svg', 'display_png', 'display_jpeg', 'display_latex', 'display_json',
            'display_javascript', 'display_pdf', 'DisplayObject', 'TextDisplayObject',
            'Pretty', 'HTML', 'Markdown', 'Math', 'Latex', 'SVG', 'ProgressBar', 'JSON',
-           'GeoJSON', 'Javascript', 'Image', 'clear_output', 'set_matplotlib_formats',
-           'set_matplotlib_close', 'publish_display_data', 'update_display', 'DisplayHandle',
+           'GeoJSON', 'Javascript', 'Image', 'set_matplotlib_formats',
+           'set_matplotlib_close',
            'Video']
 
+_deprecated_names = ["display", "clear_output", "publish_display_data", "update_display", "DisplayHandle"]
+
+__all__ = __all__ + _deprecated_names
+
+
+# ----- warn to import from IPython.display -----
+
+from warnings import warn
+
+
+def __getattr__(name):
+    if name in _deprecated_names:
+        warn(f"Importing {name} from IPython.core.display is deprecated since IPython 7.14, please import from IPython display", DeprecationWarning, stacklevel=2)
+        return getattr(display_functions, name)
+
+    if name in globals().keys():
+        return globals()[name]
+    else:
+        raise AttributeError(f"module {__name__} has no attribute {name}")
+
+
 #-----------------------------------------------------------------------------
 # utility functions
 #-----------------------------------------------------------------------------
diff --git a/IPython/core/displaypub.py b/IPython/core/displaypub.py
index 1da0458cf08..14719a2e21a 100644
--- a/IPython/core/displaypub.py
+++ b/IPython/core/displaypub.py
@@ -22,7 +22,7 @@
 from traitlets import List
 
 # This used to be defined here - it is imported for backwards compatibility
-from .display import publish_display_data
+from .display_functions import publish_display_data
 
 #-----------------------------------------------------------------------------
 # Main payload class
diff --git a/IPython/core/magics/display.py b/IPython/core/magics/display.py
index 07853944715..d159f89aece 100644
--- a/IPython/core/magics/display.py
+++ b/IPython/core/magics/display.py
@@ -12,7 +12,7 @@
 #-----------------------------------------------------------------------------
 
 # Our own packages
-from IPython.core.display import display, Javascript, Latex, SVG, HTML, Markdown
+from IPython.display import display, Javascript, Latex, SVG, HTML, Markdown
 from IPython.core.magic import  (
     Magics, magics_class, cell_magic
 )
diff --git a/IPython/core/page.py b/IPython/core/page.py
index ed16b617812..8a8f14fec5b 100644
--- a/IPython/core/page.py
+++ b/IPython/core/page.py
@@ -24,7 +24,7 @@
 from io import UnsupportedOperation
 
 from IPython import get_ipython
-from IPython.core.display import display
+from IPython.display import display
 from IPython.core.error import TryNext
 from IPython.utils.data import chop
 from IPython.utils.process import system
diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index cb1ce811984..ef1539a4a42 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -354,7 +354,7 @@ def import_pylab(user_ns, import_all=True):
     
     # IPython symbols to add
     user_ns['figsize'] = figsize
-    from IPython.core.display import display
+    from IPython.display import display
     # Add display and getfigs to the user's namespace
     user_ns['display'] = display
     user_ns['getfigs'] = getfigs
diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index 0ce4ad2b429..46a9bbb35b7 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -9,7 +9,7 @@
 
 import nose.tools as nt
 
-from IPython.core import display
+from IPython import display
 from IPython.core.getipython import get_ipython
 from IPython.utils.io import capture_output
 from IPython.utils.tempdir import NamedFileInTemporaryDirectory
diff --git a/IPython/display.py b/IPython/display.py
index 7d248ba023d..b7f64f25c97 100644
--- a/IPython/display.py
+++ b/IPython/display.py
@@ -1,16 +1,44 @@
 """Public API for display tools in IPython.
 """
 
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 #       Copyright (C) 2012 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.display import *
+from IPython.core.display_functions import *
+from IPython.core.display import (
+    display_pretty,
+    display_html,
+    display_markdown,
+    display_svg,
+    display_png,
+    display_jpeg,
+    display_latex,
+    display_json,
+    display_javascript,
+    display_pdf,
+    DisplayObject,
+    TextDisplayObject,
+    Pretty,
+    HTML,
+    Markdown,
+    Math,
+    Latex,
+    SVG,
+    ProgressBar,
+    JSON,
+    GeoJSON,
+    Javascript,
+    Image,
+    set_matplotlib_formats,
+    set_matplotlib_close,
+    Video,
+)
 from IPython.lib.display import *
diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index a713071b9ea..9bdaefd9fb0 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -57,6 +57,7 @@
 warnings.filterwarnings('error', message='.*disable_gui.*', category=DeprecationWarning, module='.*')
 
 warnings.filterwarnings('error', message='.*ExceptionColors global is deprecated.*', category=DeprecationWarning, module='.*')
+warnings.filterwarnings('error', message='.*IPython.core.display.*', category=DeprecationWarning, module='.*')
 
 # Jedi older versions
 warnings.filterwarnings(

From d54d1bf56be0ef3051682c9627a37468c21b3af0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 18 Apr 2020 15:27:16 -0700
Subject: [PATCH 0095/1407] remove deprecated usage of matplotlib quality
 parameter

---
 IPython/core/tests/test_pylabtools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_pylabtools.py b/IPython/core/tests/test_pylabtools.py
index 7b724000f58..7b64aab111a 100644
--- a/IPython/core/tests/test_pylabtools.py
+++ b/IPython/core/tests/test_pylabtools.py
@@ -61,7 +61,7 @@ def test_figure_to_jpeg():
     ax = fig.add_subplot(1,1,1)
     ax.plot([1,2,3])
     plt.draw()
-    jpeg = pt.print_figure(fig, 'jpeg', quality=50)[:100].lower()
+    jpeg = pt.print_figure(fig, 'jpeg', pil_kwargs={'optimize': 50})[:100].lower()
     assert jpeg.startswith(_JPEG)
 
 def test_retina_figure():

From ab968f0ff8df260afbb8c2474195f82ec07f900e Mon Sep 17 00:00:00 2001
From: Eric Wieser <wieser.eric@gmail.com>
Date: Sat, 18 Apr 2020 21:20:15 +0100
Subject: [PATCH 0096/1407] Add helper objects to help implement _repr_pretty_

Closes #2137.
---
 IPython/lib/pretty.py | 198 ++++++++++++++++++++++++++++--------------
 1 file changed, 133 insertions(+), 65 deletions(-)

diff --git a/IPython/lib/pretty.py b/IPython/lib/pretty.py
index 1cb46b1413d..ae2efd0c037 100644
--- a/IPython/lib/pretty.py
+++ b/IPython/lib/pretty.py
@@ -34,6 +34,22 @@ class MyObject(object):
         def _repr_pretty_(self, p, cycle):
             ...
 
+Here's an example for a class with a simple constructor::
+
+    class MySimpleObject:
+
+        def __init__(self, a, b, *, c=None):
+            self.a = a
+            self.b = b
+            self.c = c
+
+        def _repr_pretty_(self, p, cycle):
+            ctor = CallExpression.factory(self.__class__.__name__)
+            if self.c is None:
+                p.pretty(ctor(a, b))
+            else:
+                p.pretty(ctor(a, b, c=c))
+
 Here is an example implementation of a `_repr_pretty_` method for a list
 subclass::
 
@@ -93,7 +109,7 @@ def _repr_pretty_(self, p, cycle):
 from IPython.utils.py3compat import PYPY
 
 __all__ = ['pretty', 'pprint', 'PrettyPrinter', 'RepresentationPrinter',
-    'for_type', 'for_type_by_name']
+    'for_type', 'for_type_by_name', 'RawText', 'RawStringLiteral', 'CallExpression']
 
 
 MAX_SEQ_LENGTH = 1000
@@ -500,6 +516,75 @@ def remove(self, group):
             pass
 
 
+class RawText:
+    """ Object such that ``p.pretty(RawText(value))`` is the same as ``p.text(value)``.
+
+    An example usage of this would be to show a list as binary numbers, using
+    ``p.pretty([RawText(bin(i)) for i in integers])``.
+    """
+    def __init__(self, value):
+        self.value = value
+
+    def _repr_pretty_(self, p, cycle):
+        p.text(self.value)
+
+
+class CallExpression:
+    """ Object which emits a line-wrapped call expression in the form `__name(*args, **kwargs)` """
+    def __init__(__self, __name, *args, **kwargs):
+        # dunders are to avoid clashes with kwargs, as python's name manging
+        # will kick in.
+        self = __self
+        self.name = __name
+        self.args = args
+        self.kwargs = kwargs
+
+    @classmethod
+    def factory(cls, name):
+        def inner(*args, **kwargs):
+            return cls(name, *args, **kwargs)
+        return inner
+
+    def _repr_pretty_(self, p, cycle):
+        # dunders are to avoid clashes with kwargs, as python's name manging
+        # will kick in.
+
+        started = False
+        def new_item():
+            nonlocal started
+            if started:
+                p.text(",")
+                p.breakable()
+            started = True
+
+        prefix = self.name + "("
+        with p.group(len(prefix), prefix, ")"):
+            for arg in self.args:
+                new_item()
+                p.pretty(arg)
+            for arg_name, arg in self.kwargs.items():
+                new_item()
+                arg_prefix = arg_name + "="
+                with p.group(len(arg_prefix), arg_prefix):
+                    p.pretty(arg)
+
+
+class RawStringLiteral:
+    """ Wrapper that shows a string with a `r` prefix """
+    def __init__(self, value):
+        self.value = value
+
+    def _repr_pretty_(self, p, cycle):
+        base_repr = repr(self.value)
+        if base_repr[:1] in 'uU':
+            base_repr = base_repr[1:]
+            prefix = 'ur'
+        else:
+            prefix = 'r'
+        base_repr = prefix + base_repr.replace('\\\\', '\\')
+        p.text(base_repr)
+
+
 def _default_pprint(obj, p, cycle):
     """
     The default print function.  Used if an object does not provide one and
@@ -623,45 +708,38 @@ def _super_pprint(obj, p, cycle):
     p.end_group(8, '>')
 
 
-def _re_pattern_pprint(obj, p, cycle):
-    """The pprint function for regular expression patterns."""
-    p.text('re.compile(')
-    pattern = repr(obj.pattern)
-    if pattern[:1] in 'uU':
-        pattern = pattern[1:]
-        prefix = 'ur'
-    else:
-        prefix = 'r'
-    pattern = prefix + pattern.replace('\\\\', '\\')
-    p.text(pattern)
-    if obj.flags:
-        p.text(',')
-        p.breakable()
+
+class _ReFlags:
+    def __init__(self, value):
+        self.value = value
+
+    def _repr_pretty_(self, p, cycle):
         done_one = False
         for flag in ('TEMPLATE', 'IGNORECASE', 'LOCALE', 'MULTILINE', 'DOTALL',
             'UNICODE', 'VERBOSE', 'DEBUG'):
-            if obj.flags & getattr(re, flag):
+            if self.value & getattr(re, flag):
                 if done_one:
                     p.text('|')
                 p.text('re.' + flag)
                 done_one = True
-    p.text(')')
+
+
+def _re_pattern_pprint(obj, p, cycle):
+    """The pprint function for regular expression patterns."""
+    re_compile = CallExpression.factory('re.compile')
+    if obj.flags:
+        p.pretty(re_compile(RawStringLiteral(obj.pattern), _ReFlags(obj.flags)))
+    else:
+        p.pretty(re_compile(RawStringLiteral(obj.pattern)))
 
 
 def _types_simplenamespace_pprint(obj, p, cycle):
     """The pprint function for types.SimpleNamespace."""
-    name = 'namespace'
-    with p.group(len(name) + 1, name + '(', ')'):
-        if cycle:
-            p.text('...')
-        else:
-            for idx, (attr, value) in enumerate(obj.__dict__.items()):
-                if idx:
-                    p.text(',')
-                    p.breakable()
-                attr_kwarg = '{}='.format(attr)
-                with p.group(len(attr_kwarg), attr_kwarg):
-                    p.pretty(value)
+    namespace = CallExpression.factory('namespace')
+    if cycle:
+        p.pretty(namespace(RawText("...")))
+    else:
+        p.pretty(namespace(**obj.__dict__))
 
 
 def _type_pprint(obj, p, cycle):
@@ -724,14 +802,8 @@ def _exception_pprint(obj, p, cycle):
     name = getattr(obj.__class__, '__qualname__', obj.__class__.__name__)
     if obj.__class__.__module__ not in ('exceptions', 'builtins'):
         name = '%s.%s' % (obj.__class__.__module__, name)
-    step = len(name) + 1
-    p.begin_group(step, name + '(')
-    for idx, arg in enumerate(getattr(obj, 'args', ())):
-        if idx:
-            p.text(',')
-            p.breakable()
-        p.pretty(arg)
-    p.end_group(step, ')')
+
+    p.pretty(CallExpression(name, *getattr(obj, 'args', ())))
 
 
 #: the exception base
@@ -817,40 +889,36 @@ def for_type_by_name(type_module, type_name, func):
 
 
 def _defaultdict_pprint(obj, p, cycle):
-    name = obj.__class__.__name__
-    with p.group(len(name) + 1, name + '(', ')'):
-        if cycle:
-            p.text('...')
-        else:
-            p.pretty(obj.default_factory)
-            p.text(',')
-            p.breakable()
-            p.pretty(dict(obj))
+    cls_ctor = CallExpression.factory(obj.__class__.__name__)
+    if cycle:
+        p.pretty(cls_ctor(RawText("...")))
+    else:
+        p.pretty(cls_ctor(obj.default_factory, dict(obj)))
 
 def _ordereddict_pprint(obj, p, cycle):
-    name = obj.__class__.__name__
-    with p.group(len(name) + 1, name + '(', ')'):
-        if cycle:
-            p.text('...')
-        elif len(obj):
-            p.pretty(list(obj.items()))
+    cls_ctor = CallExpression.factory(obj.__class__.__name__)
+    if cycle:
+        p.pretty(cls_ctor(RawText("...")))
+    elif len(obj):
+        p.pretty(cls_ctor(list(obj.items())))
+    else:
+        p.pretty(cls_ctor())
 
 def _deque_pprint(obj, p, cycle):
-    name = obj.__class__.__name__
-    with p.group(len(name) + 1, name + '(', ')'):
-        if cycle:
-            p.text('...')
-        else:
-            p.pretty(list(obj))
-
+    cls_ctor = CallExpression.factory(obj.__class__.__name__)
+    if cycle:
+        p.pretty(cls_ctor(RawText("...")))
+    else:
+        p.pretty(cls_ctor(list(obj)))
 
 def _counter_pprint(obj, p, cycle):
-    name = obj.__class__.__name__
-    with p.group(len(name) + 1, name + '(', ')'):
-        if cycle:
-            p.text('...')
-        elif len(obj):
-            p.pretty(dict(obj))
+    cls_ctor = CallExpression.factory(obj.__class__.__name__)
+    if cycle:
+        p.pretty(cls_ctor(RawText("...")))
+    elif len(obj):
+        p.pretty(cls_ctor(dict(obj)))
+    else:
+        p.pretty(cls_ctor())
 
 for_type_by_name('collections', 'defaultdict', _defaultdict_pprint)
 for_type_by_name('collections', 'OrderedDict', _ordereddict_pprint)

From 3d73e875185da1c65865e691e6e65c4ac19b7d71 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 19 Apr 2020 14:49:24 -0700
Subject: [PATCH 0097/1407] prepare release notes for 7.14

---
 docs/source/whatsnew/development.rst | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 9d4493a3a53..9fab2b878ec 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -24,6 +24,28 @@ Need to be updated:
 
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 
+As a reminder, IPython master has diverged from the 7.x branch, thus master may
+have more feature and API changes.
+
+Important changes:
+
+ - Fix compatibility with Sphinx 3+ :ghpull:`12235`
+ - Remove deprecated matplotlib parameter usage, compatibility with matplotlib
+   3.3+ :`122250`
+
+Misc Changes
+
+ - set ``.py`` extension when editing current buffer in vi/emacs. :ghpull:`12167`
+ - support for unicode identifiers in ``?``/``??`` :ghpull:`12208`
+ - add extra options to the ``Video`` Rich objects :ghpull:`12212`
+ - add pretty-printing to SimpleNamespace :ghpull:`12230`
+
+New Deprecation Warnings. 
+
+ - Many object present in ``IPython.core.display`` should  be imported from
+   ``IPython.display`` by user and external libraries. Trying to import those
+   from ``IPython.core.display`` will trigger a deprecation warning in IPython
+   7.14+ and _may_ raise an error in IPython 8+
 
 Backwards incompatible changes
 ------------------------------

From 95ab5c53c07d0a7f30e0365c8b49641ba1860989 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 20 Apr 2020 18:23:26 -0700
Subject: [PATCH 0098/1407] fix getting signatures in jedi 0.17

---
 IPython/core/completer.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index fd3939f1e18..207e48738f7 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -988,6 +988,11 @@ def _make_signature(completion)-> str:
 
     """
 
+    # it looks like this might work on jedi 0.17
+    if hasattr(completion, 'get_signatures'):
+        c0 = completion.get_signatures()[0]
+        return '('+c0.to_string().split('(', maxsplit=1)[1]
+
     return '(%s)'% ', '.join([f for f in (_formatparamchildren(p) for signature in completion.get_signatures()
                                           for p in signature.defined_names()) if f])
 

From 55f88a2581b73d5b38578a756ff90da32a7f01fa Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Tue, 21 Apr 2020 16:27:09 -0400
Subject: [PATCH 0099/1407] A maybe better-working interruptible Pdb. Also make
 separate class so we don't impact existing usage behavior.

---
 IPython/core/debugger.py            | 19 +++++++++++++++++--
 IPython/core/tests/test_debugger.py | 11 ++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 8502874c86b..48b24f01582 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -290,7 +290,7 @@ def interaction(self, frame, traceback):
         try:
             OldPdb.interaction(self, frame, traceback)
         except KeyboardInterrupt:
-            raise
+            self.stdout.write('\n' + self.shell.get_exception_only())
 
     def new_do_up(self, arg):
         OldPdb.do_up(self, arg)
@@ -627,8 +627,22 @@ def do_where(self, arg):
 
     do_w = do_where
 
+
+class InterruptiblePdb(Pdb):
+    """Version of debugger where KeyboardInterrupt exits the debugger altogether."""
+
+    def cmdloop(self):
+        """Wrap cmdloop() such that KeyboardInterrupt stops the debugger."""
+        try:
+            return OldPdb.cmdloop(self)
+        except KeyboardInterrupt:
+            self.stop_here = lambda frame: False
+            self.do_quit("")
+            sys.settrace(None)
+            self.quitting = False
+            raise
+
     def _cmdloop(self):
-        # Variant that doesn't catch KeyboardInterrupts.
         while True:
             try:
                 # keyboard interrupts allow for an easy way to cancel
@@ -638,6 +652,7 @@ def _cmdloop(self):
                 self.allow_kbdint = False
                 break
             except KeyboardInterrupt:
+                self.message('--KeyboardInterrupt--')
                 raise
 
 
diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 4cf77439082..69506800b2b 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -13,6 +13,7 @@
 import subprocess
 from unittest.mock import patch
 import builtins
+import bdb
 
 import nose.tools as nt
 
@@ -236,11 +237,15 @@ def test_interruptible_core_debugger():
     (this is implemented in ipykernel).  We want to ensure the
     KeyboardInterrupt cause debugging to cease.
     """
-    def raising_input(msg=""):
-        raise KeyboardInterrupt()
+    def raising_input(msg="", called=[0]):
+        called[0] += 1
+        if called[0] == 1:
+            raise KeyboardInterrupt()
+        else:
+            raise AssertionError("input() should only be called once!")
 
     with patch.object(builtins, "input", raising_input):
-        debugger.set_trace()
+        debugger.InterruptiblePdb().set_trace()
         # The way this test will fail is by set_trace() never exiting,
         # resulting in a timeout by the test runner. The alternative
         # implementation would involve a subprocess, but that adds issues with

From 387da044fcdfa88385ac64daf5b05c6fe1ae6104 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 21 Apr 2020 09:34:16 -0700
Subject: [PATCH 0100/1407] handle when no signatures are found

---
 IPython/core/completer.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 207e48738f7..16fbb81f551 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -990,6 +990,10 @@ def _make_signature(completion)-> str:
 
     # it looks like this might work on jedi 0.17
     if hasattr(completion, 'get_signatures'):
+        signatures = completion.get_signatures()
+        if not signatures:
+            return  '(?)'
+
         c0 = completion.get_signatures()[0]
         return '('+c0.to_string().split('(', maxsplit=1)[1]
 

From b361f8e9bc3d50b8de49310fb198893fe152fcb3 Mon Sep 17 00:00:00 2001
From: Eric Wieser <wieser.eric@gmail.com>
Date: Wed, 22 Apr 2020 14:20:25 +0100
Subject: [PATCH 0101/1407] Keep trailing commas for tuple subclasses of length
 1

---
 IPython/lib/pretty.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/lib/pretty.py b/IPython/lib/pretty.py
index ae2efd0c037..921c19d0b83 100644
--- a/IPython/lib/pretty.py
+++ b/IPython/lib/pretty.py
@@ -638,7 +638,7 @@ def inner(obj, p, cycle):
                 p.text(',')
                 p.breakable()
             p.pretty(x)
-        if len(obj) == 1 and type(obj) is tuple:
+        if len(obj) == 1 and isinstance(obj, tuple):
             # Special case for 1-item tuples.
             p.text(',')
         p.end_group(step, end)

From dcd9dc90aee7e4c5c52ce44c18e7518934790612 Mon Sep 17 00:00:00 2001
From: gorogoroumaru <force.minpiku@gmail.com>
Date: Fri, 10 Apr 2020 10:24:52 +0900
Subject: [PATCH 0102/1407] Fix DeprecationWarning on autocompletion with jedi
 0.17.0

---
 IPython/core/completer.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 16fbb81f551..01730fff2dd 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -110,26 +110,23 @@
 # Copyright (C) 2001 Python Software Foundation, www.python.org
 
 
-import __main__
 import builtins as builtin_mod
 import glob
-import time
 import inspect
 import itertools
 import keyword
 import os
 import re
+import string
 import sys
+import time
 import unicodedata
-import string
 import warnings
-
 from contextlib import contextmanager
 from importlib import import_module
-from typing import Iterator, List, Tuple, Iterable
 from types import SimpleNamespace
+from typing import Iterable, Iterator, List, Tuple
 
-from traitlets.config.configurable import Configurable
 from IPython.core.error import TryNext
 from IPython.core.inputtransformer2 import ESC_MAGIC
 from IPython.core.latex_symbols import latex_symbols, reverse_latex_symbol
@@ -137,7 +134,10 @@
 from IPython.utils import generics
 from IPython.utils.dir2 import dir2, get_real_method
 from IPython.utils.process import arg_split
-from traitlets import Bool, Enum, observe, Int
+from traitlets import Bool, Enum, Int, observe
+from traitlets.config.configurable import Configurable
+
+import __main__
 
 # skip module docstests
 skip_doctest = True
@@ -1380,8 +1380,7 @@ def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str):
                 else:
                     raise ValueError("Don't understand self.omit__names == {}".format(self.omit__names))
 
-        interpreter = jedi.Interpreter(
-            text[:offset], namespaces, column=cursor_column, line=cursor_line + 1)
+        interpreter = jedi.Interpreter(text[:offset], namespaces)
         try_jedi = True
 
         try:
@@ -1408,7 +1407,7 @@ def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str):
         if not try_jedi:
             return []
         try:
-            return filter(completion_filter, interpreter.complete())
+            return filter(completion_filter, interpreter.complete(column=cursor_column, line=cursor_line + 1))
         except Exception as e:
             if self.debug:
                 return [_FakeJediCompletion('Oops Jedi has crashed, please report a bug with the following:\n"""\n%s\ns"""' % (e))]

From 267fc7abf81f6f17ceaa2ad61a900db8861b9eae Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 22 Apr 2020 17:40:22 -0700
Subject: [PATCH 0103/1407] Update instruction on git blame

---
 .git-blame-ignore-revs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 70971c53b5a..b8f093569c0 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,8 +1,14 @@
 # When making commits that are strictly formatting/style changes, add the
-# commit hash here, so git blame can ignore the change.
-# See docs for more details:
+# commit hash here, so git blame can ignore the change. See docs for more
+# details:
 # https://git-scm.com/docs/git-config#Documentation/git-config.txt-blameignoreRevsFile
-
+#
+# 
+# You should be able to execute either
+# ./tools/configure-git-blame-ignore-revs.bat or
+# ./tools/configure-git-blame-ignore-revs.sh
+#
 # Example entries:
-# <full commit hash>  # initial black-format
+#
+# <full commit hash>  # initial black-format 
 # <full commit hash>  # rename something internal

From c19d68aa571ef6aa38fbd0eac0c8a1a3c31ea516 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 22 Apr 2020 18:24:17 -0700
Subject: [PATCH 0104/1407] Remove all usage of u_format (no op), and remove
 function

u_format was a compatibility layer between Py2 and 3 , now useless.
---
 IPython/core/tests/test_inputtransformer.py | 46 +++++++++------------
 IPython/utils/py3compat.py                  | 32 --------------
 2 files changed, 19 insertions(+), 59 deletions(-)

diff --git a/IPython/core/tests/test_inputtransformer.py b/IPython/core/tests/test_inputtransformer.py
index 0d97fd4d6b1..bf0d1af6c57 100644
--- a/IPython/core/tests/test_inputtransformer.py
+++ b/IPython/core/tests/test_inputtransformer.py
@@ -3,7 +3,6 @@
 
 from IPython.testing import tools as tt
 from IPython.utils import py3compat
-u_fmt = py3compat.u_format
 
 from IPython.core import inputtransformer as ipt
 
@@ -38,7 +37,6 @@ def transform_checker(tests, transformer, **kwargs):
 
 syntax = \
   dict(assign_system =
-       [(i,py3compat.u_format(o)) for i,o in \
        [(u'a =! ls', "a = get_ipython().getoutput('ls')"),
         (u'b = !ls', "b = get_ipython().getoutput('ls')"),
         (u'c= !ls', "c = get_ipython().getoutput('ls')"),
@@ -53,10 +51,9 @@ def transform_checker(tests, transformer, **kwargs):
         (u"a, b = range(2)", u"a, b = range(2)"),
         (u"a, = range(1)", u"a, = range(1)"),
         (u"a, *bc = range(3)", u"a, *bc = range(3)"),
-        ]],
+        ],
 
        assign_magic =
-       [(i,py3compat.u_format(o)) for i,o in \
        [(u'a =% who', "a = get_ipython().run_line_magic('who', '')"),
         (u'b = %who', "b = get_ipython().run_line_magic('who', '')"),
         (u'c= %ls', "c = get_ipython().run_line_magic('ls', '')"),
@@ -64,7 +61,7 @@ def transform_checker(tests, transformer, **kwargs):
         ('x=1', 'x=1'), # normal input is unmodified
         ('    ','    '),  # blank lines are kept intact
         (u"a, b = %foo", u"a, b = get_ipython().run_line_magic('foo', '')"),
-        ]],
+        ],
 
        classic_prompt =
        [('>>> x=1', 'x=1'),
@@ -86,16 +83,14 @@ def transform_checker(tests, transformer, **kwargs):
 
        # System calls
        escaped_shell =
-       [(i,py3compat.u_format(o)) for i,o in \
        [ (u'!ls', "get_ipython().system('ls')"),
          # Double-escape shell, this means to capture the output of the
          # subprocess and return it
          (u'!!ls', "get_ipython().getoutput('ls')"),
-         ]],
+         ],
 
        # Help/object info
        escaped_help =
-       [(i,py3compat.u_format(o)) for i,o in \
        [ (u'?', 'get_ipython().show_usage()'),
          (u'?x1', "get_ipython().run_line_magic('pinfo', 'x1')"),
          (u'??x2', "get_ipython().run_line_magic('pinfo2', 'x2')"),
@@ -103,10 +98,9 @@ def transform_checker(tests, transformer, **kwargs):
          (u'?%hist1', "get_ipython().run_line_magic('pinfo', '%hist1')"),
          (u'?%%hist2', "get_ipython().run_line_magic('pinfo', '%%hist2')"),
          (u'?abc = qwe', "get_ipython().run_line_magic('pinfo', 'abc')"),
-         ]],
+         ],
 
       end_help =
-      [(i,py3compat.u_format(o)) for i,o in \
       [ (u'x3?', "get_ipython().run_line_magic('pinfo', 'x3')"),
         (u'x4??', "get_ipython().run_line_magic('pinfo2', 'x4')"),
         (u'%hist1?', "get_ipython().run_line_magic('pinfo', '%hist1')"),
@@ -125,17 +119,16 @@ def transform_checker(tests, transformer, **kwargs):
         (u'plot(a?', "get_ipython().set_next_input('plot(a');"
                      "get_ipython().run_line_magic('pinfo', 'a')"),
         (u'a*2 #comment?', 'a*2 #comment?'),
-        ]],
+        ],
 
        # Explicit magic calls
        escaped_magic =
-       [(i,py3compat.u_format(o)) for i,o in \
        [ (u'%cd', "get_ipython().run_line_magic('cd', '')"),
          (u'%cd /home', "get_ipython().run_line_magic('cd', '/home')"),
          # Backslashes need to be escaped.
          (u'%cd C:\\User', "get_ipython().run_line_magic('cd', 'C:\\\\User')"),
          (u'    %magic', "    get_ipython().run_line_magic('magic', '')"),
-         ]],
+         ],
 
        # Quoting with separate arguments
        escaped_quote =
@@ -163,13 +156,12 @@ def transform_checker(tests, transformer, **kwargs):
 
        # Check that we transform prompts before other transforms
        mixed =
-       [(i,py3compat.u_format(o)) for i,o in \
        [ (u'In [1]: %lsmagic', "get_ipython().run_line_magic('lsmagic', '')"),
          (u'>>> %lsmagic', "get_ipython().run_line_magic('lsmagic', '')"),
          (u'In [2]: !ls', "get_ipython().system('ls')"),
          (u'In [3]: abs?', "get_ipython().run_line_magic('pinfo', 'abs')"),
          (u'In [4]: b = %who', "b = get_ipython().run_line_magic('who', '')"),
-         ]],
+         ],
        )
 
 # multiline syntax examples.  Each of these should be a list of lists, with
@@ -284,11 +276,11 @@ def transform_checker(tests, transformer, **kwargs):
        
        cellmagic =
        [ [(u'%%foo a', None),
-          (None, u_fmt("get_ipython().run_cell_magic('foo', 'a', '')")),
+          (None, "get_ipython().run_cell_magic('foo', 'a', '')"),
           ],
          [(u'%%bar 123', None),
           (u'hello', None),
-          (None , u_fmt("get_ipython().run_cell_magic('bar', '123', 'hello')")),
+          (None , "get_ipython().run_cell_magic('bar', '123', 'hello')"),
           ],
          [(u'a=5', 'a=5'),
           (u'%%cellmagic', '%%cellmagic'),
@@ -297,31 +289,31 @@ def transform_checker(tests, transformer, **kwargs):
        
        escaped =
        [ [('%abc def \\', None),
-          ('ghi', u_fmt("get_ipython().run_line_magic('abc', 'def ghi')")),
+          ('ghi', "get_ipython().run_line_magic('abc', 'def ghi')"),
           ],
          [('%abc def \\', None),
           ('ghi\\', None),
-          (None, u_fmt("get_ipython().run_line_magic('abc', 'def ghi')")),
+          (None, "get_ipython().run_line_magic('abc', 'def ghi')"),
           ],
        ],
        
        assign_magic =
        [ [(u'a = %bc de \\', None),
-          (u'fg', u_fmt("a = get_ipython().run_line_magic('bc', 'de fg')")),
+          (u'fg', "a = get_ipython().run_line_magic('bc', 'de fg')"),
           ],
          [(u'a = %bc de \\', None),
           (u'fg\\', None),
-          (None, u_fmt("a = get_ipython().run_line_magic('bc', 'de fg')")),
+          (None, "a = get_ipython().run_line_magic('bc', 'de fg')"),
           ],
        ],
        
        assign_system =
        [ [(u'a = !bc de \\', None),
-          (u'fg', u_fmt("a = get_ipython().getoutput('bc de fg')")),
+          (u'fg', "a = get_ipython().getoutput('bc de fg')"),
           ],
          [(u'a = !bc de \\', None),
           (u'fg\\', None),
-          (None, u_fmt("a = get_ipython().getoutput('bc de fg')")),
+          (None, "a = get_ipython().getoutput('bc de fg')"),
           ],
        ],
        )
@@ -437,7 +429,7 @@ def test_cellmagic():
     
     line_example = [(u'%%bar 123', None),
                     (u'hello', None),
-                    (u'' , u_fmt("get_ipython().run_cell_magic('bar', '123', 'hello')")),
+                    (u'' , "get_ipython().run_cell_magic('bar', '123', 'hello')"),
                    ]
     transform_checker(line_example, ipt.cellmagic, end_on_blank_line=True)
 
@@ -475,16 +467,16 @@ def decistmt(tokens):
 
 
 def test_token_input_transformer():
-    tests = [(u'1.2', u_fmt(u"Decimal ('1.2')")),
+    tests = [(u'1.2', u"Decimal ('1.2')"),
              (u'"1.2"', u'"1.2"'),
              ]
     tt.check_pairs(transform_and_reset(decistmt), tests)
     ml_tests = \
     [ [(u"a = 1.2; b = '''x", None),
-       (u"y'''", u_fmt(u"a =Decimal ('1.2');b ='''x\ny'''")),
+       (u"y'''", u"a =Decimal ('1.2');b ='''x\ny'''"),
       ],
       [(u"a = [1.2,", None),
-       (u"3]", u_fmt(u"a =[Decimal ('1.2'),\n3 ]")),
+       (u"3]", u"a =[Decimal ('1.2'),\n3 ]"),
       ],
       [(u"a = '''foo", None),  # Test resetting when within a multi-line string
        (u"bar", None),
diff --git a/IPython/utils/py3compat.py b/IPython/utils/py3compat.py
index c7587873005..62bcc917b05 100644
--- a/IPython/utils/py3compat.py
+++ b/IPython/utils/py3compat.py
@@ -39,26 +39,6 @@ def buffer_to_bytes(buf):
         buf = bytes(buf)
     return buf
 
-def _modify_str_or_docstring(str_change_func):
-    @functools.wraps(str_change_func)
-    def wrapper(func_or_str):
-        if isinstance(func_or_str, (str,)):
-            func = None
-            doc = func_or_str
-        else:
-            func = func_or_str
-            doc = func.__doc__
-
-        # PYTHONOPTIMIZE=2 strips docstrings, so they can disappear unexpectedly
-        if doc is not None:
-            doc = str_change_func(doc)
-
-        if func:
-            func.__doc__ = doc
-            return func
-        return doc
-    return wrapper
-
 def safe_unicode(e):
     """unicode(e) with various fallbacks. Used for exceptions, which may not be
     safe to call unicode() on.
@@ -167,18 +147,6 @@ def execfile(fname, glob, loc=None, compiler=None):
         compiler = compiler or compile
         exec(compiler(f.read(), fname, 'exec'), glob, loc)
 
-# Refactor print statements in doctests.
-_print_statement_re = re.compile(r"\bprint (?P<expr>.*)$", re.MULTILINE)
-
-# Abstract u'abc' syntax:
-@_modify_str_or_docstring
-def u_format(s):
-    """"{u}'abc'" --> "'abc'" (Python 3)
-
-    Accepts a string or a function, so it can be used as a decorator."""
-    return s.format(u='')
-
-
 PY2 = not PY3
 PYPY = platform.python_implementation() == "PyPy"
 

From 6e748726282d1acb9a4f9f264ee679c474c4b8f5 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 22 Apr 2020 18:29:13 -0700
Subject: [PATCH 0105/1407] Apply pygrade --36plus on
 IPython/core/tests/test_inputtransformer.py.

Previous commit remove the u_format compatiblity function, use the
occasion to update the file to a newer python 3.6 syntax.

This also use yield-from
---
 IPython/core/tests/test_inputtransformer.py | 197 ++++++++++----------
 1 file changed, 98 insertions(+), 99 deletions(-)

diff --git a/IPython/core/tests/test_inputtransformer.py b/IPython/core/tests/test_inputtransformer.py
index bf0d1af6c57..147a8e42e8d 100644
--- a/IPython/core/tests/test_inputtransformer.py
+++ b/IPython/core/tests/test_inputtransformer.py
@@ -37,30 +37,30 @@ def transform_checker(tests, transformer, **kwargs):
 
 syntax = \
   dict(assign_system =
-       [(u'a =! ls', "a = get_ipython().getoutput('ls')"),
-        (u'b = !ls', "b = get_ipython().getoutput('ls')"),
-        (u'c= !ls', "c = get_ipython().getoutput('ls')"),
-        (u'd == !ls', u'd == !ls'), # Invalid syntax, but we leave == alone.
+       [('a =! ls', "a = get_ipython().getoutput('ls')"),
+        ('b = !ls', "b = get_ipython().getoutput('ls')"),
+        ('c= !ls', "c = get_ipython().getoutput('ls')"),
+        ('d == !ls', 'd == !ls'), # Invalid syntax, but we leave == alone.
         ('x=1', 'x=1'), # normal input is unmodified
         ('    ','    '),  # blank lines are kept intact
         # Tuple unpacking
-        (u"a, b = !echo 'a\\nb'", u"a, b = get_ipython().getoutput(\"echo 'a\\\\nb'\")"),
-        (u"a,= !echo 'a'", u"a, = get_ipython().getoutput(\"echo 'a'\")"),
-        (u"a, *bc = !echo 'a\\nb\\nc'", u"a, *bc = get_ipython().getoutput(\"echo 'a\\\\nb\\\\nc'\")"),
+        ("a, b = !echo 'a\\nb'", "a, b = get_ipython().getoutput(\"echo 'a\\\\nb'\")"),
+        ("a,= !echo 'a'", "a, = get_ipython().getoutput(\"echo 'a'\")"),
+        ("a, *bc = !echo 'a\\nb\\nc'", "a, *bc = get_ipython().getoutput(\"echo 'a\\\\nb\\\\nc'\")"),
         # Tuple unpacking with regular Python expressions, not our syntax.
-        (u"a, b = range(2)", u"a, b = range(2)"),
-        (u"a, = range(1)", u"a, = range(1)"),
-        (u"a, *bc = range(3)", u"a, *bc = range(3)"),
+        ("a, b = range(2)", "a, b = range(2)"),
+        ("a, = range(1)", "a, = range(1)"),
+        ("a, *bc = range(3)", "a, *bc = range(3)"),
         ],
 
        assign_magic =
-       [(u'a =% who', "a = get_ipython().run_line_magic('who', '')"),
-        (u'b = %who', "b = get_ipython().run_line_magic('who', '')"),
-        (u'c= %ls', "c = get_ipython().run_line_magic('ls', '')"),
-        (u'd == %ls', u'd == %ls'), # Invalid syntax, but we leave == alone.
+       [('a =% who', "a = get_ipython().run_line_magic('who', '')"),
+        ('b = %who', "b = get_ipython().run_line_magic('who', '')"),
+        ('c= %ls', "c = get_ipython().run_line_magic('ls', '')"),
+        ('d == %ls', 'd == %ls'), # Invalid syntax, but we leave == alone.
         ('x=1', 'x=1'), # normal input is unmodified
         ('    ','    '),  # blank lines are kept intact
-        (u"a, b = %foo", u"a, b = get_ipython().run_line_magic('foo', '')"),
+        ("a, b = %foo", "a, b = get_ipython().run_line_magic('foo', '')"),
         ],
 
        classic_prompt =
@@ -83,51 +83,51 @@ def transform_checker(tests, transformer, **kwargs):
 
        # System calls
        escaped_shell =
-       [ (u'!ls', "get_ipython().system('ls')"),
+       [ ('!ls', "get_ipython().system('ls')"),
          # Double-escape shell, this means to capture the output of the
          # subprocess and return it
-         (u'!!ls', "get_ipython().getoutput('ls')"),
+         ('!!ls', "get_ipython().getoutput('ls')"),
          ],
 
        # Help/object info
        escaped_help =
-       [ (u'?', 'get_ipython().show_usage()'),
-         (u'?x1', "get_ipython().run_line_magic('pinfo', 'x1')"),
-         (u'??x2', "get_ipython().run_line_magic('pinfo2', 'x2')"),
-         (u'?a.*s', "get_ipython().run_line_magic('psearch', 'a.*s')"),
-         (u'?%hist1', "get_ipython().run_line_magic('pinfo', '%hist1')"),
-         (u'?%%hist2', "get_ipython().run_line_magic('pinfo', '%%hist2')"),
-         (u'?abc = qwe', "get_ipython().run_line_magic('pinfo', 'abc')"),
+       [ ('?', 'get_ipython().show_usage()'),
+         ('?x1', "get_ipython().run_line_magic('pinfo', 'x1')"),
+         ('??x2', "get_ipython().run_line_magic('pinfo2', 'x2')"),
+         ('?a.*s', "get_ipython().run_line_magic('psearch', 'a.*s')"),
+         ('?%hist1', "get_ipython().run_line_magic('pinfo', '%hist1')"),
+         ('?%%hist2', "get_ipython().run_line_magic('pinfo', '%%hist2')"),
+         ('?abc = qwe', "get_ipython().run_line_magic('pinfo', 'abc')"),
          ],
 
       end_help =
-      [ (u'x3?', "get_ipython().run_line_magic('pinfo', 'x3')"),
-        (u'x4??', "get_ipython().run_line_magic('pinfo2', 'x4')"),
-        (u'%hist1?', "get_ipython().run_line_magic('pinfo', '%hist1')"),
-        (u'%hist2??', "get_ipython().run_line_magic('pinfo2', '%hist2')"),
-        (u'%%hist3?', "get_ipython().run_line_magic('pinfo', '%%hist3')"),
-        (u'%%hist4??', "get_ipython().run_line_magic('pinfo2', '%%hist4')"),
-        (u'π.foo?', "get_ipython().run_line_magic('pinfo', 'π.foo')"),
-        (u'f*?', "get_ipython().run_line_magic('psearch', 'f*')"),
-        (u'ax.*aspe*?', "get_ipython().run_line_magic('psearch', 'ax.*aspe*')"),
-        (u'a = abc?', "get_ipython().set_next_input('a = abc');"
+      [ ('x3?', "get_ipython().run_line_magic('pinfo', 'x3')"),
+        ('x4??', "get_ipython().run_line_magic('pinfo2', 'x4')"),
+        ('%hist1?', "get_ipython().run_line_magic('pinfo', '%hist1')"),
+        ('%hist2??', "get_ipython().run_line_magic('pinfo2', '%hist2')"),
+        ('%%hist3?', "get_ipython().run_line_magic('pinfo', '%%hist3')"),
+        ('%%hist4??', "get_ipython().run_line_magic('pinfo2', '%%hist4')"),
+        ('π.foo?', "get_ipython().run_line_magic('pinfo', 'π.foo')"),
+        ('f*?', "get_ipython().run_line_magic('psearch', 'f*')"),
+        ('ax.*aspe*?', "get_ipython().run_line_magic('psearch', 'ax.*aspe*')"),
+        ('a = abc?', "get_ipython().set_next_input('a = abc');"
                       "get_ipython().run_line_magic('pinfo', 'abc')"),
-        (u'a = abc.qe??', "get_ipython().set_next_input('a = abc.qe');"
+        ('a = abc.qe??', "get_ipython().set_next_input('a = abc.qe');"
                           "get_ipython().run_line_magic('pinfo2', 'abc.qe')"),
-        (u'a = *.items?', "get_ipython().set_next_input('a = *.items');"
+        ('a = *.items?', "get_ipython().set_next_input('a = *.items');"
                           "get_ipython().run_line_magic('psearch', '*.items')"),
-        (u'plot(a?', "get_ipython().set_next_input('plot(a');"
+        ('plot(a?', "get_ipython().set_next_input('plot(a');"
                      "get_ipython().run_line_magic('pinfo', 'a')"),
-        (u'a*2 #comment?', 'a*2 #comment?'),
+        ('a*2 #comment?', 'a*2 #comment?'),
         ],
 
        # Explicit magic calls
        escaped_magic =
-       [ (u'%cd', "get_ipython().run_line_magic('cd', '')"),
-         (u'%cd /home', "get_ipython().run_line_magic('cd', '/home')"),
+       [ ('%cd', "get_ipython().run_line_magic('cd', '')"),
+         ('%cd /home', "get_ipython().run_line_magic('cd', '/home')"),
          # Backslashes need to be escaped.
-         (u'%cd C:\\User', "get_ipython().run_line_magic('cd', 'C:\\\\User')"),
-         (u'    %magic', "    get_ipython().run_line_magic('magic', '')"),
+         ('%cd C:\\User', "get_ipython().run_line_magic('cd', 'C:\\\\User')"),
+         ('    %magic', "    get_ipython().run_line_magic('magic', '')"),
          ],
 
        # Quoting with separate arguments
@@ -156,11 +156,11 @@ def transform_checker(tests, transformer, **kwargs):
 
        # Check that we transform prompts before other transforms
        mixed =
-       [ (u'In [1]: %lsmagic', "get_ipython().run_line_magic('lsmagic', '')"),
-         (u'>>> %lsmagic', "get_ipython().run_line_magic('lsmagic', '')"),
-         (u'In [2]: !ls', "get_ipython().system('ls')"),
-         (u'In [3]: abs?', "get_ipython().run_line_magic('pinfo', 'abs')"),
-         (u'In [4]: b = %who', "b = get_ipython().run_line_magic('who', '')"),
+       [ ('In [1]: %lsmagic', "get_ipython().run_line_magic('lsmagic', '')"),
+         ('>>> %lsmagic', "get_ipython().run_line_magic('lsmagic', '')"),
+         ('In [2]: !ls', "get_ipython().system('ls')"),
+         ('In [3]: abs?', "get_ipython().run_line_magic('pinfo', 'abs')"),
+         ('In [4]: b = %who', "b = get_ipython().run_line_magic('who', '')"),
          ],
        )
 
@@ -275,15 +275,15 @@ def transform_checker(tests, transformer, **kwargs):
        ],
        
        cellmagic =
-       [ [(u'%%foo a', None),
+       [ [('%%foo a', None),
           (None, "get_ipython().run_cell_magic('foo', 'a', '')"),
           ],
-         [(u'%%bar 123', None),
-          (u'hello', None),
+         [('%%bar 123', None),
+          ('hello', None),
           (None , "get_ipython().run_cell_magic('bar', '123', 'hello')"),
           ],
-         [(u'a=5', 'a=5'),
-          (u'%%cellmagic', '%%cellmagic'),
+         [('a=5', 'a=5'),
+          ('%%cellmagic', '%%cellmagic'),
           ],
        ],
        
@@ -298,21 +298,21 @@ def transform_checker(tests, transformer, **kwargs):
        ],
        
        assign_magic =
-       [ [(u'a = %bc de \\', None),
-          (u'fg', "a = get_ipython().run_line_magic('bc', 'de fg')"),
+       [ [('a = %bc de \\', None),
+          ('fg', "a = get_ipython().run_line_magic('bc', 'de fg')"),
           ],
-         [(u'a = %bc de \\', None),
-          (u'fg\\', None),
+         [('a = %bc de \\', None),
+          ('fg\\', None),
           (None, "a = get_ipython().run_line_magic('bc', 'de fg')"),
           ],
        ],
        
        assign_system =
-       [ [(u'a = !bc de \\', None),
-          (u'fg', "a = get_ipython().getoutput('bc de fg')"),
+       [ [('a = !bc de \\', None),
+          ('fg', "a = get_ipython().getoutput('bc de fg')"),
           ],
-         [(u'a = !bc de \\', None),
-          (u'fg\\', None),
+         [('a = !bc de \\', None),
+          ('fg\\', None),
           (None, "a = get_ipython().getoutput('bc de fg')"),
           ],
        ],
@@ -335,8 +335,8 @@ def test_classic_prompt():
     # Check that we don't transform the second line if the first is obviously
     # IPython syntax
     transform_checker([
-        (u'%foo', '%foo'),
-        (u'>>> bar', '>>> bar'),
+        ('%foo', '%foo'),
+        ('>>> bar', '>>> bar'),
     ], ipt.classic_prompt)
 
 
@@ -347,20 +347,20 @@ def test_ipy_prompt():
 
     # Check that we don't transform the second line if we're inside a cell magic
     transform_checker([
-        (u'%%foo', '%%foo'),
-        (u'In [1]: bar', 'In [1]: bar'),
+        ('%%foo', '%%foo'),
+        ('In [1]: bar', 'In [1]: bar'),
     ], ipt.ipy_prompt)
 
 def test_assemble_logical_lines():
     tests = \
-    [ [(u"a = \\", None),
-       (u"123", u"a = 123"),
+    [ [("a = \\", None),
+       ("123", "a = 123"),
       ],
-      [(u"a = \\", None),  # Test resetting when within a multi-line string
-       (u"12 *\\", None),
-       (None, u"a = 12 *"),
+      [("a = \\", None),  # Test resetting when within a multi-line string
+       ("12 *\\", None),
+       (None, "a = 12 *"),
       ],
-      [(u"# foo\\", u"# foo\\"), # Comments can't be continued like this
+      [("# foo\\", "# foo\\"), # Comments can't be continued like this
       ],
     ]
     for example in tests:
@@ -368,24 +368,24 @@ def test_assemble_logical_lines():
 
 def test_assemble_python_lines():
     tests = \
-    [ [(u"a = '''", None),
-       (u"abc'''", u"a = '''\nabc'''"),
+    [ [("a = '''", None),
+       ("abc'''", "a = '''\nabc'''"),
       ],
-      [(u"a = '''", None),  # Test resetting when within a multi-line string
-       (u"def", None),
-       (None, u"a = '''\ndef"),
+      [("a = '''", None),  # Test resetting when within a multi-line string
+       ("def", None),
+       (None, "a = '''\ndef"),
       ],
-      [(u"a = [1,", None),
-       (u"2]", u"a = [1,\n2]"),
+      [("a = [1,", None),
+       ("2]", "a = [1,\n2]"),
       ],
-      [(u"a = [1,", None),  # Test resetting when within a multi-line string
-       (u"2,", None),
-       (None, u"a = [1,\n2,"),
+      [("a = [1,", None),  # Test resetting when within a multi-line string
+       ("2,", None),
+       (None, "a = [1,\n2,"),
       ],
-      [(u"a = '''", None),  # Test line continuation within a multi-line string
-       (u"abc\\", None),
-       (u"def", None),
-       (u"'''", u"a = '''\nabc\\\ndef\n'''"),
+      [("a = '''", None),  # Test line continuation within a multi-line string
+       ("abc\\", None),
+       ("def", None),
+       ("'''", "a = '''\nabc\\\ndef\n'''"),
       ],
     ] + syntax_ml['multiline_datastructure']
     for example in tests:
@@ -427,9 +427,9 @@ def test_cellmagic():
     for example in syntax_ml['cellmagic']:
         transform_checker(example, ipt.cellmagic)
     
-    line_example = [(u'%%bar 123', None),
-                    (u'hello', None),
-                    (u'' , "get_ipython().run_cell_magic('bar', '123', 'hello')"),
+    line_example = [('%%bar 123', None),
+                    ('hello', None),
+                    ('' , "get_ipython().run_cell_magic('bar', '123', 'hello')"),
                    ]
     transform_checker(line_example, ipt.cellmagic, end_on_blank_line=True)
 
@@ -454,33 +454,32 @@ def decistmt(tokens):
     result = []
     for toknum, tokval, _, _, _  in tokens:
         if toknum == tokenize.NUMBER and '.' in tokval:  # replace NUMBER tokens
-            for newtok in [
+            yield from [
                 (tokenize.NAME, 'Decimal'),
                 (tokenize.OP, '('),
                 (tokenize.STRING, repr(tokval)),
                 (tokenize.OP, ')')
-            ]:
-                yield newtok
+            ]
         else:
             yield (toknum, tokval)
 
 
 
 def test_token_input_transformer():
-    tests = [(u'1.2', u"Decimal ('1.2')"),
-             (u'"1.2"', u'"1.2"'),
+    tests = [('1.2', "Decimal ('1.2')"),
+             ('"1.2"', '"1.2"'),
              ]
     tt.check_pairs(transform_and_reset(decistmt), tests)
     ml_tests = \
-    [ [(u"a = 1.2; b = '''x", None),
-       (u"y'''", u"a =Decimal ('1.2');b ='''x\ny'''"),
+    [ [("a = 1.2; b = '''x", None),
+       ("y'''", "a =Decimal ('1.2');b ='''x\ny'''"),
       ],
-      [(u"a = [1.2,", None),
-       (u"3]", u"a =[Decimal ('1.2'),\n3 ]"),
+      [("a = [1.2,", None),
+       ("3]", "a =[Decimal ('1.2'),\n3 ]"),
       ],
-      [(u"a = '''foo", None),  # Test resetting when within a multi-line string
-       (u"bar", None),
-       (None, u"a = '''foo\nbar"),
+      [("a = '''foo", None),  # Test resetting when within a multi-line string
+       ("bar", None),
+       (None, "a = '''foo\nbar"),
       ],
     ]
     for example in ml_tests:

From 7bf3f5d625ed5237842537cdc27ea593c6e2d7ae Mon Sep 17 00:00:00 2001
From: Quentin Peter <impact27@users.noreply.github.com>
Date: Thu, 23 Apr 2020 17:39:32 +0200
Subject: [PATCH 0106/1407] Do not exist if self.interact is True

---
 IPython/core/shellapp.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py
index 33052c44d15..9e8bfbfbb81 100644
--- a/IPython/core/shellapp.py
+++ b/IPython/core/shellapp.py
@@ -418,7 +418,8 @@ def _run_cmd_line_code(self):
                 fname = os.path.join(fname, "__main__.py")
             if not os.path.exists(fname):
                 self.log.warning("File '%s' doesn't exist", fname)
-                self.exit(2)
+                if not self.interact:
+                    self.exit(2)
             try:
                 self._exec_file(fname, shell_futures=True)
             except:

From d566e92c002b1593359db67ed5e5309ae5b25bae Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 1 May 2020 11:31:59 -0700
Subject: [PATCH 0107/1407] Update what's new for 7.14 release

---
 docs/source/whatsnew/development.rst | 20 --------------
 docs/source/whatsnew/version7.rst    | 39 ++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 9fab2b878ec..99821d1105c 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -27,26 +27,6 @@ Need to be updated:
 As a reminder, IPython master has diverged from the 7.x branch, thus master may
 have more feature and API changes.
 
-Important changes:
-
- - Fix compatibility with Sphinx 3+ :ghpull:`12235`
- - Remove deprecated matplotlib parameter usage, compatibility with matplotlib
-   3.3+ :`122250`
-
-Misc Changes
-
- - set ``.py`` extension when editing current buffer in vi/emacs. :ghpull:`12167`
- - support for unicode identifiers in ``?``/``??`` :ghpull:`12208`
- - add extra options to the ``Video`` Rich objects :ghpull:`12212`
- - add pretty-printing to SimpleNamespace :ghpull:`12230`
-
-New Deprecation Warnings. 
-
- - Many object present in ``IPython.core.display`` should  be imported from
-   ``IPython.display`` by user and external libraries. Trying to import those
-   from ``IPython.core.display`` will trigger a deprecation warning in IPython
-   7.14+ and _may_ raise an error in IPython 8+
-
 Backwards incompatible changes
 ------------------------------
 
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 62990dfc1e7..f68c8101404 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,45 @@
  7.x Series
 ============
 
+.. _version 714:
+
+IPython 7.14
+============
+
+IPython  7.14 is a minor release that fix a couple of bugs and prepare
+compatibility with new or future versions of some libraries. 
+
+Important changes:
+------------------
+
+ - Fix compatibility with Sphinx 3+ :ghpull:`12235`
+ - Remove deprecated matplotlib parameter usage, compatibility with matplotlib
+   3.3+ :`122250`
+
+Misc Changes
+------------
+
+ - set ``.py`` extension when editing current buffer in vi/emacs. :ghpull:`12167`
+ - support for unicode identifiers in ``?``/``??`` :ghpull:`12208`
+ - add extra options to the ``Video`` Rich objects :ghpull:`12212`
+ - add pretty-printing to ``SimpleNamespace`` :ghpull:`12230`
+
+Pending deprecated imports
+--------------------------
+
+Many object present in ``IPython.core.display`` are there for internal use only,
+and should  already been imported from ``IPython.display`` by users and external
+libraries. Trying to import those from ``IPython.core.display`` is still possible
+but will trigger a
+deprecation warning in later versions of IPython and will become errors in the
+future. 
+
+This will simplify compatibility with other Python kernels (like Xeus-Python),
+and simplify code base. 
+
+
+
+
 .. _version 713:
 
 IPython 7.13

From 36976c0ce8f0ee9b3333c0b9373914a1023bc703 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 1 May 2020 12:17:56 -0700
Subject: [PATCH 0108/1407] try to fix master docs

---
 docs/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 1ede58d111f..b3ff5285cc8 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -5,3 +5,4 @@ sphinx
 sphinx-rtd-theme
 docrepr
 matplotlib
+stack_data

From 299d9f808e4b2354d5058e21e4a49f8e512a3df3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 1 May 2020 17:44:03 -0700
Subject: [PATCH 0109/1407] Second try to fix readthedocs on master.

---
 docs/environment.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/environment.yml b/docs/environment.yml
index f5076d15e24..82388cfcd97 100644
--- a/docs/environment.yml
+++ b/docs/environment.yml
@@ -8,6 +8,7 @@ dependencies:
 - nose
 - testpath
 - matplotlib
+- stack_data
 - pip:
     - docrepr
     - prompt_toolkit

From 69cd5d0c09b6ac1be1c969aa1440d8e1c6389eac Mon Sep 17 00:00:00 2001
From: Paul Ivanov <pi@berkeley.edu>
Date: Fri, 1 May 2020 19:56:06 -0700
Subject: [PATCH 0110/1407] start using .git-blame-ignore-revs

---
 .git-blame-ignore-revs                   | 1 +
 tools/configure-git-blame-ignore-revs.sh | 1 +
 2 files changed, 2 insertions(+)
 mode change 100644 => 100755 tools/configure-git-blame-ignore-revs.sh

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index b8f093569c0..fbe0daac737 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -12,3 +12,4 @@
 #
 # <full commit hash>  # initial black-format 
 # <full commit hash>  # rename something internal
+6e748726282d1acb9a4f9f264ee679c474c4b8f5  # Apply pygrade --36plus on IPython/core/tests/test_inputtransformer.py.
diff --git a/tools/configure-git-blame-ignore-revs.sh b/tools/configure-git-blame-ignore-revs.sh
old mode 100644
new mode 100755
index e1892ef4d05..390d1877855
--- a/tools/configure-git-blame-ignore-revs.sh
+++ b/tools/configure-git-blame-ignore-revs.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 # Other config options for blame are markUnblamables and markIgnoredLines.
 # See docs for more details:
 # https://git-scm.com/docs/git-config#Documentation/git-config.txt-blameignoreRevsFile

From 5662950aee4eccf9d30da6700bb7814bacd648b1 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 3 May 2020 19:59:07 -0700
Subject: [PATCH 0111/1407] Unify API between completers.

Forward latex seem to be the only one that return a text match  when no
completions is provided.

In particular this leads to custom logins in other places.

Should close #12279
---
 IPython/core/completer.py            |  5 ++---
 IPython/core/tests/test_completer.py | 15 +++++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 01730fff2dd..9091ccad5d4 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1708,8 +1708,6 @@ def latex_matches(self, text):
         u"""Match Latex syntax for unicode characters.
 
         This does both ``\\alp`` -> ``\\alpha`` and ``\\alpha`` -> ``α``
-
-        Used on Python 3 only.
         """
         slashpos = text.rfind('\\')
         if slashpos > -1:
@@ -1722,7 +1720,8 @@ def latex_matches(self, text):
                 # If a user has partially typed a latex symbol, give them
                 # a full list of options \al -> [\aleph, \alpha]
                 matches = [k for k in latex_symbols if k.startswith(s)]
-                return s, matches
+                if matches:
+                    return s, matches
         return u'', []
 
     def dispatch_custom_completer(self, text):
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 2920d453936..2c19e2e0187 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -224,20 +224,27 @@ def test_latex_completions(self):
         nt.assert_in("\\alpha", matches)
         nt.assert_in("\\aleph", matches)
 
+    def test_latex_no_results(self):
+        """
+        forward latex should really return nothing in either field if nothing is found.
+        """
+        ip = get_ipython()
+        text, matches = ip.Completer.latex_matches("\\really_i_should_match_nothing")
+        nt.assert_equal(text, "")
+        nt.assert_equal(matches, [])
+
     def test_back_latex_completion(self):
         ip = get_ipython()
 
         # do not return more than 1 matches fro \beta, only the latex one.
         name, matches = ip.complete("\\β")
-        nt.assert_equal(len(matches), 1)
-        nt.assert_equal(matches[0], "\\beta")
+        nt.assert_equal(matches, ['\\beta'])
 
     def test_back_unicode_completion(self):
         ip = get_ipython()
 
         name, matches = ip.complete("\\Ⅴ")
-        nt.assert_equal(len(matches), 1)
-        nt.assert_equal(matches[0], "\\ROMAN NUMERAL FIVE")
+        nt.assert_equal(matches, ["\\ROMAN NUMERAL FIVE"])
 
     def test_forward_unicode_completion(self):
         ip = get_ipython()

From d5704fdc29c695d0349b411192b7acdd251dacc8 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 4 May 2020 16:21:28 -0700
Subject: [PATCH 0112/1407] Try to elide long completion  based on user input.

If what the user has typed is already in the completion and the
completion is really long, try to elide what the user has already typed
from the displayed text of the completion.

Keep the first 3 and last 3 of what is already present.

This will behave weirdly if all the completion have a common prefix as I
believe prompt toolkit will insert the common prefix (or do we?). I'll
have to check how to consider the common prefix as being typed.
---
 IPython/core/interactiveshell.py |  2 +-
 IPython/terminal/ptutils.py      | 30 ++++++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 848a14a481c..f5fdba6692b 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2217,7 +2217,7 @@ def set_custom_completer(self, completer, pos=0):
         The position argument (defaults to 0) is the index in the completers
         list where you want the completer to be inserted."""
 
-        newcomp = types.MethodType(completer,self.Completer)
+        newcomp = types.MethodType(completer, self.Completer)
         self.Completer.custom_matchers.insert(pos,newcomp)
 
     def set_completer_frame(self, frame=None):
diff --git a/IPython/terminal/ptutils.py b/IPython/terminal/ptutils.py
index 47fd6f40612..7c19e95eebc 100644
--- a/IPython/terminal/ptutils.py
+++ b/IPython/terminal/ptutils.py
@@ -23,7 +23,7 @@
 
 _completion_sentinel = object()
 
-def _elide(string, *, min_elide=30):
+def _elide_point(string, *, min_elide=30):
     """
     If a string is long enough, and has at least 3 dots,
     replace the middle part with ellipses.
@@ -53,6 +53,24 @@ def _elide(string, *, min_elide=30):
 
     return string
 
+def _elide_typed(string, typed, *, min_elide=30):
+    """
+    Elide the middle of a long string if the beginning has already been typed.
+    """
+
+    if len(string) < min_elide:
+        return string
+    cut_how_much = len(typed)-3
+    if string.startswith(typed) and len(string)> len(typed):
+        return f"{string[:3]}\N{HORIZONTAL ELLIPSIS}{string[cut_how_much:]}"
+    return string
+
+def _elide(string, typed, min_elide=30):
+    return _elide_typed(
+        _elide_point(string, min_elide=min_elide),
+        typed, min_elide=min_elide)
+
+
 
 def _adjust_completion_text_based_on_context(text, body, offset):
     if text.endswith('=') and len(body) > offset and body[offset] == '=':
@@ -89,7 +107,11 @@ def get_completions(self, document, complete_event):
             cursor_col = document.cursor_position_col
             cursor_position = document.cursor_position
             offset = cursor_to_position(body, cursor_row, cursor_col)
-            yield from self._get_completions(body, offset, cursor_position, self.ipy_completer)
+            try:
+                yield from self._get_completions(body, offset, cursor_position, self.ipy_completer)
+            except Exception as e:
+                from traceback import print_tb
+                print_tb(e)
 
     @staticmethod
     def _get_completions(body, offset, cursor_position, ipyc):
@@ -128,9 +150,9 @@ def _get_completions(body, offset, cursor_position, ipyc):
 
             adjusted_text = _adjust_completion_text_based_on_context(c.text, body, offset)
             if c.type == 'function':
-                yield Completion(adjusted_text, start_position=c.start - offset, display=_elide(display_text+'()'), display_meta=c.type+c.signature)
+                yield Completion(adjusted_text, start_position=c.start - offset, display=_elide(display_text+'()', body[c.start:c.end]), display_meta=c.type+c.signature)
             else:
-                yield Completion(adjusted_text, start_position=c.start - offset, display=_elide(display_text), display_meta=c.type)
+                yield Completion(adjusted_text, start_position=c.start - offset, display=_elide(display_text,  body[c.start:c.end]), display_meta=c.type)
 
 class IPythonPTLexer(Lexer):
     """

From c933ce5da967625bf5c8f1b4e61105a259adae0d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 4 May 2020 16:50:54 -0700
Subject: [PATCH 0113/1407] Fix a couple of edge cases, and update tests

Mostly when the match is super-short.
Ass type annotations,
run mypy on ptutils now.
---
 .travis.yml                                   |  3 +-
 IPython/terminal/ptutils.py                   |  8 +++--
 .../terminal/tests/test_interactivshell.py    | 30 +++++++++++++++----
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 62615ed2cac..20a966a03a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ install:
   - pip install setuptools --upgrade
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
   - pip install trio curio --upgrade --upgrade-strategy eager
-  - pip install pytest 'matplotlib !=3.2.0'
+  - pip install pytest 'matplotlib !=3.2.0' mypy
   - pip install codecov check-manifest --upgrade
 
 script:
@@ -50,6 +50,7 @@ script:
     fi
   - cd /tmp && iptest --coverage xml && cd -
   - pytest IPython
+  - mypy --ignore-missing-imports -m IPython.terminal.ptutils
   # On the latest Python (on Linux) only, make sure that the docs build.
   - |
     if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
diff --git a/IPython/terminal/ptutils.py b/IPython/terminal/ptutils.py
index 7c19e95eebc..ed7ad45eb45 100644
--- a/IPython/terminal/ptutils.py
+++ b/IPython/terminal/ptutils.py
@@ -23,7 +23,7 @@
 
 _completion_sentinel = object()
 
-def _elide_point(string, *, min_elide=30):
+def _elide_point(string:str, *, min_elide=30)->str:
     """
     If a string is long enough, and has at least 3 dots,
     replace the middle part with ellipses.
@@ -53,7 +53,7 @@ def _elide_point(string, *, min_elide=30):
 
     return string
 
-def _elide_typed(string, typed, *, min_elide=30):
+def _elide_typed(string:str, typed:str, *, min_elide:int=30)->str:
     """
     Elide the middle of a long string if the beginning has already been typed.
     """
@@ -61,11 +61,13 @@ def _elide_typed(string, typed, *, min_elide=30):
     if len(string) < min_elide:
         return string
     cut_how_much = len(typed)-3
+    if cut_how_much < 7:
+        return string
     if string.startswith(typed) and len(string)> len(typed):
         return f"{string[:3]}\N{HORIZONTAL ELLIPSIS}{string[cut_how_much:]}"
     return string
 
-def _elide(string, typed, min_elide=30):
+def _elide(string:str, typed:str, min_elide=30)->str:
     return _elide_typed(
         _elide_point(string, min_elide=min_elide),
         typed, min_elide=min_elide)
diff --git a/IPython/terminal/tests/test_interactivshell.py b/IPython/terminal/tests/test_interactivshell.py
index 6bacc8ea48a..640e5d482ae 100644
--- a/IPython/terminal/tests/test_interactivshell.py
+++ b/IPython/terminal/tests/test_interactivshell.py
@@ -17,14 +17,32 @@
 class TestElide(unittest.TestCase):
 
     def test_elide(self):
-        _elide('concatenate((a1, a2, ...), axis') # do not raise
-        _elide('concatenate((a1, a2, ..), . axis') # do not raise
-        nt.assert_equal(_elide('aaaa.bbbb.ccccc.dddddd.eeeee.fffff.gggggg.hhhhhh'), 'aaaa.b…g.hhhhhh')
-        
+        _elide('concatenate((a1, a2, ...), axis', '') # do not raise
+        _elide('concatenate((a1, a2, ..), . axis', '') # do not raise
+        nt.assert_equal(_elide('aaaa.bbbb.ccccc.dddddd.eeeee.fffff.gggggg.hhhhhh',''), 'aaaa.b…g.hhhhhh')
+
         test_string = os.sep.join(['', 10*'a', 10*'b', 10*'c', ''])
         expect_stirng = os.sep + 'a' + '\N{HORIZONTAL ELLIPSIS}' + 'b' + os.sep + 10*'c'
-        nt.assert_equal(_elide(test_string), expect_stirng)
-
+        nt.assert_equal(_elide(test_string, ''), expect_stirng)
+
+    def test_elide_typed_normal(self):
+        nt.assert_equal(_elide('the quick brown fox jumped over the lazy dog', 'the quick brown fox', min_elide=10), 'the…fox jumped over the lazy dog')
+
+
+    def test_elide_typed_short_match(self):
+        """
+        if the match is too short we don't elide.
+        avoid the "the...the"
+        """
+        nt.assert_equal(_elide('the quick brown fox jumped over the lazy dog', 'the', min_elide=10), 'the quick brown fox jumped over the lazy dog')
+
+    def test_elide_typed_no_match(self):
+        """
+        if the match is too short we don't elide.
+        avoid the "the...the"
+        """
+        # here we typed red instead of brown
+        nt.assert_equal(_elide('the quick brown fox jumped over the lazy dog', 'the quick red fox', min_elide=10), 'the quick brown fox jumped over the lazy dog')
 
 class TestContextAwareCompletion(unittest.TestCase):
 

From b86a55f235bb34b20d86330d6512c8d389e2009e Mon Sep 17 00:00:00 2001
From: Inception95 <yangyiheng@inspur.com>
Date: Thu, 7 May 2020 16:29:00 -0700
Subject: [PATCH 0114/1407] Delete 109-112 for removing external test

---
 IPython/core/tests/test_display.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index fec5412ef1a..375adf27b45 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -105,11 +105,6 @@ def read(self):
         nt.assert_true(svg._repr_svg_().startswith('<svg'))
         svg = display.SVG(url=url + 'z')
         nt.assert_true(svg._repr_svg_().startswith('<svg'))
-
-    # do it for real: 6.1kB of data
-    url = "https://upload.wikimedia.org/wikipedia/commons/3/30/Vector-based_example.svg"
-    svg = display.SVG(url=url)
-    nt.assert_true(svg._repr_svg_().startswith('<svg'))
     
 def test_retina_jpeg():
     here = os.path.dirname(__file__)

From 3792cd3ddcca8b7a5ec11bbe5e0751295cfdce8d Mon Sep 17 00:00:00 2001
From: Scott Sanderson <ssanderson@quantopian.com>
Date: Fri, 8 May 2020 12:34:40 -0400
Subject: [PATCH 0115/1407] ENH: Add configuration for profiling completions.

Adds two new configurable attributes to IPCompleter to enable profiling of the
completion subsystem.

- IPCompleter.profile_completions, a boolean indicating whether we should
  profile completions. Default is False.
- IPCompleter.profiler_output_dir, a string indicating the directory where
  profiling data should be written. Default is '.completion_profiles'.
---
 IPython/core/completer.py | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 9091ccad5d4..54b21ee1575 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -121,6 +121,7 @@
 import sys
 import time
 import unicodedata
+import uuid
 import warnings
 from contextlib import contextmanager
 from importlib import import_module
@@ -133,8 +134,9 @@
 from IPython.core.oinspect import InspectColors
 from IPython.utils import generics
 from IPython.utils.dir2 import dir2, get_real_method
+from IPython.utils.path import ensure_dir_exists
 from IPython.utils.process import arg_split
-from traitlets import Bool, Enum, Int, observe
+from traitlets import Bool, Enum, Int, Unicode, observe
 from traitlets.config.configurable import Configurable
 
 import __main__
@@ -1049,6 +1051,15 @@ def _greedy_changed(self, change):
         """,
     ).tag(config=True)
 
+    profile_completions = Bool(
+        default_value=False,
+        help="If True, emit profiling data for completion subsystem using cProfile."
+    ).tag(config=True)
+
+    profiler_output_dir = Unicode(
+        default_value=".completion_profiles",
+        help="Template for path at which to output profile data for completions."
+    ).tag(config=True)
     @observe('limit_to__all__')
     def _limit_to_all_changed(self, change):
         warnings.warn('`IPython.core.IPCompleter.limit_to__all__` configuration '
@@ -1824,6 +1835,13 @@ def completions(self, text: str, offset: int)->Iterator[Completion]:
 
         seen = set()
         try:
+            if self.profile_completions:
+                import cProfile
+                profiler = cProfile.Profile()
+                profiler.enable()
+            else:
+                profiler = None
+
             for c in self._completions(text, offset, _timeout=self.jedi_compute_type_timeout/1000):
                 if c and (c in seen):
                     continue
@@ -1833,6 +1851,13 @@ def completions(self, text: str, offset: int)->Iterator[Completion]:
             """if completions take too long and users send keyboard interrupt,
             do not crash and return ASAP. """
             pass
+        finally:
+            if profiler is not None:
+                profiler.disable()
+                ensure_dir_exists(self.profiler_output_dir)
+                output_path = os.path.join(self.profiler_output_dir, str(uuid.uuid4()))
+                print("Writing profiler output to", output_path)
+                profiler.dump_stats(output_path)
 
     def _completions(self, full_text: str, offset: int, *, _timeout)->Iterator[Completion]:
         """

From 8c57c0273fd813f709b76420bc30ded2efc6b5f2 Mon Sep 17 00:00:00 2001
From: Scott Sanderson <ssanderson@quantopian.com>
Date: Fri, 8 May 2020 12:42:23 -0400
Subject: [PATCH 0116/1407] PERF: Don't compute unicode names until they're
 needed.

This commit renames `IPCompleter._names` to ``_unicode_names`` and uses
traitlets default machinery to defer its initialization until first access.

Previously, initialization was deferred until the first call to
fwd_unicode_names, but that was still called on the first completion attempt,
which caused about a .5 second lag on the first completion attempt on
my (relatively powerful) machine.
---
 IPython/core/completer.py | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 54b21ee1575..87806e3b441 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -136,7 +136,7 @@
 from IPython.utils.dir2 import dir2, get_real_method
 from IPython.utils.path import ensure_dir_exists
 from IPython.utils.process import arg_split
-from traitlets import Bool, Enum, Int, Unicode, observe
+from traitlets import Bool, Enum, Int, List as ListTrait, Unicode, default, observe
 from traitlets.config.configurable import Configurable
 
 import __main__
@@ -1005,8 +1005,6 @@ def _make_signature(completion)-> str:
 class IPCompleter(Completer):
     """Extension of the completer class with IPython-specific features"""
 
-    _names = None
-
     @observe('greedy')
     def _greedy_changed(self, change):
         """update the splitter and readline delims when greedy is changed"""
@@ -1060,6 +1058,22 @@ def _greedy_changed(self, change):
         default_value=".completion_profiles",
         help="Template for path at which to output profile data for completions."
     ).tag(config=True)
+
+    _unicode_names = ListTrait(
+        Unicode(),
+        help="Lazily-initialized list of unicode code point names.",
+    )
+
+    @default('_unicode_names')
+    def _unicode_names_default_value(self):
+        names = []
+        for c in range(0,0x10FFFF + 1):
+            try:
+                names.append(unicodedata.name(chr(c)))
+            except ValueError:
+                pass
+        return names
+
     @observe('limit_to__all__')
     def _limit_to_all_changed(self, change):
         warnings.warn('`IPython.core.IPCompleter.limit_to__all__` configuration '
@@ -2103,19 +2117,17 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
         return text, _matches, origins, completions
         
     def fwd_unicode_match(self, text:str) -> Tuple[str, list]:
-        if self._names is None:
-            self._names = []
-            for c in range(0,0x10FFFF + 1):
-                try:
-                    self._names.append(unicodedata.name(chr(c)))
-                except ValueError:
-                    pass
 
         slashpos = text.rfind('\\')
         # if text starts with slash
         if slashpos > -1:
+            # PERF: It's important that we don't access self._unicode_names
+            # until we're inside this if-block. _unicode_names is lazily
+            # initialized, and it takes a user-noticeable amount of time to
+            # initialize it, so we don't want to initialize it unless we're
+            # actually going to use it.
             s = text[slashpos+1:]
-            candidates = [x for x in self._names if x.startswith(s)]
+            candidates = [x for x in self._unicode_names if x.startswith(s)]
             if candidates:
                 return s, candidates
             else:

From 13a5c5b40ce79c3b730833fa2bf0492ad6332f20 Mon Sep 17 00:00:00 2001
From: Scott Sanderson <ssanderson@quantopian.com>
Date: Fri, 8 May 2020 18:41:57 -0400
Subject: [PATCH 0117/1407] MAINT: Don't use traitlets for lazy init of unicode
 names.

---
 IPython/core/completer.py | 40 +++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 87806e3b441..a4e977f14b6 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1059,21 +1059,6 @@ def _greedy_changed(self, change):
         help="Template for path at which to output profile data for completions."
     ).tag(config=True)
 
-    _unicode_names = ListTrait(
-        Unicode(),
-        help="Lazily-initialized list of unicode code point names.",
-    )
-
-    @default('_unicode_names')
-    def _unicode_names_default_value(self):
-        names = []
-        for c in range(0,0x10FFFF + 1):
-            try:
-                names.append(unicodedata.name(chr(c)))
-            except ValueError:
-                pass
-        return names
-
     @observe('limit_to__all__')
     def _limit_to_all_changed(self, change):
         warnings.warn('`IPython.core.IPCompleter.limit_to__all__` configuration '
@@ -1151,6 +1136,12 @@ def __init__(self, shell=None, namespace=None, global_namespace=None,
         # This is set externally by InteractiveShell
         self.custom_completers = None
 
+        # This is a list of names of unicode characters that can be completed
+        # into their corresponding unicode value. The list is large, so we
+        # laziliy initialize it on first use. Consuming code should access this
+        # attribute through the `@unicode_names` property.
+        self._unicode_names = None
+
     @property
     def matchers(self):
         """All active matcher routines for completion"""
@@ -2127,7 +2118,7 @@ def fwd_unicode_match(self, text:str) -> Tuple[str, list]:
             # initialize it, so we don't want to initialize it unless we're
             # actually going to use it.
             s = text[slashpos+1:]
-            candidates = [x for x in self._unicode_names if x.startswith(s)]
+            candidates = [x for x in self.unicode_names if x.startswith(s)]
             if candidates:
                 return s, candidates
             else:
@@ -2136,3 +2127,20 @@ def fwd_unicode_match(self, text:str) -> Tuple[str, list]:
         # if text does not start with slash
         else:
             return u'', ()
+
+    @property
+    def unicode_names(self) -> List[str]:
+        """List of names of unicode code points that can be completed.
+
+        The list is lazily initialized on first access.
+        """
+        if self._unicode_names is None:
+            names = []
+            for c in range(0,0x10FFFF + 1):
+                try:
+                    names.append(unicodedata.name(chr(c)))
+                except ValueError:
+                    pass
+            self._unicode_names = names
+
+        return self._unicode_names

From ed08ce509ab0d76e11214d568414305ae13541ab Mon Sep 17 00:00:00 2001
From: Scott Sanderson <ssanderson@quantopian.com>
Date: Fri, 8 May 2020 18:42:45 -0400
Subject: [PATCH 0118/1407] DOC: Use valid completion in docs for unicode
 completions.

The unicode names are all upper case, so the example in the docstring doesn't
actually work.
---
 IPython/core/completer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index a4e977f14b6..9fd3598e303 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -35,7 +35,7 @@
 
 .. code::
 
-    \\greek small letter alpha<tab>
+    \\GREEK SMALL LETTER ALPHA<tab>
     α
 
 

From f1425b8ca6ce9ef9935a141b0ccb0938be425c91 Mon Sep 17 00:00:00 2001
From: palewire <ben.welsh@gmail.com>
Date: Sat, 9 May 2020 07:40:44 -0700
Subject: [PATCH 0119/1407] Exceptions raised when executing notebooks via the
 %run magic command

---
 IPython/core/magics/execution.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index fb2df90b5d5..61dc03938ff 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -701,7 +701,7 @@ def run(self, parameter_s='', runner=None,
         if filename.lower().endswith(('.ipy', '.ipynb')):
             with preserve_keys(self.shell.user_ns, '__file__'):
                 self.shell.user_ns['__file__'] = filename
-                self.shell.safe_execfile_ipy(filename)
+                self.shell.safe_execfile_ipy(filename, raise_exceptions=True)
             return
 
         # Control the response to exit() calls made by the script being run

From ad14ee336630f190f496ef8a65c0c1adb1b7a40d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 1 May 2020 20:41:35 -0700
Subject: [PATCH 0120/1407] Cleanup and type annotate completer.py

Remove some of the unnecessary u'' prefixes, replace some of the return
tuples with `namedtuples` to make the code a bit more clearer and
flexible.
---
 .travis.yml                          |   4 +-
 IPython/core/completer.py            | 200 +++++++++++++++++----------
 IPython/core/tests/test_completer.py |   7 +-
 MANIFEST.in                          |   1 +
 mypy.ini                             |   4 +
 5 files changed, 136 insertions(+), 80 deletions(-)
 create mode 100644 mypy.ini

diff --git a/.travis.yml b/.travis.yml
index 20a966a03a9..d3f2caadd9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,6 +40,7 @@ install:
   - pip install trio curio --upgrade --upgrade-strategy eager
   - pip install pytest 'matplotlib !=3.2.0' mypy
   - pip install codecov check-manifest --upgrade
+  - pip install mypy
 
 script:
   - check-manifest
@@ -50,7 +51,8 @@ script:
     fi
   - cd /tmp && iptest --coverage xml && cd -
   - pytest IPython
-  - mypy --ignore-missing-imports -m IPython.terminal.ptutils
+  - mypy IPython/terminal/ptutils.py
+  - mypy IPython/core/c*.py
   # On the latest Python (on Linux) only, make sure that the docs build.
   - |
     if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 9fd3598e303..cd54b42b42e 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -126,7 +126,7 @@
 from contextlib import contextmanager
 from importlib import import_module
 from types import SimpleNamespace
-from typing import Iterable, Iterator, List, Tuple
+from typing import Iterable, Iterator, List, Tuple, Union, Any, Sequence, Dict, NamedTuple, Pattern, Optional
 
 from IPython.core.error import TryNext
 from IPython.core.inputtransformer2 import ESC_MAGIC
@@ -745,7 +745,7 @@ def get__all__entries(obj):
     return [w for w in words if isinstance(w, str)]
 
 
-def match_dict_keys(keys: List[str], prefix: str, delims: str):
+def match_dict_keys(keys: List[Union[str, bytes]], prefix: str, delims: str) -> Tuple[str, int, List[str]]:
     """Used by dict_key_matches, matching the prefix to a list of keys
 
     Parameters
@@ -766,22 +766,25 @@ def match_dict_keys(keys: List[str], prefix: str, delims: str):
     ``matches`` a list of replacement/completion
 
     """
+    keys = [k for k in keys if isinstance(k, (str, bytes))]
     if not prefix:
-        return None, 0, [repr(k) for k in keys
+        return '', 0, [repr(k) for k in keys
                       if isinstance(k, (str, bytes))]
     quote_match = re.search('["\']', prefix)
+    assert quote_match is not None # silence mypy
     quote = quote_match.group()
     try:
         prefix_str = eval(prefix + quote, {})
     except Exception:
-        return None, 0, []
+        return '', 0, []
 
     pattern = '[^' + ''.join('\\' + c for c in delims) + ']*$'
     token_match = re.search(pattern, prefix, re.UNICODE)
+    assert token_match is not None # silence mypy
     token_start = token_match.start()
     token_prefix = token_match.group()
 
-    matched = []
+    matched:List[str] = []
     for key in keys:
         try:
             if not key.startswith(prefix_str):
@@ -794,14 +797,6 @@ def match_dict_keys(keys: List[str], prefix: str, delims: str):
         rem = key[len(prefix_str):]
         # force repr wrapped in '
         rem_repr = repr(rem + '"') if isinstance(rem, str) else repr(rem + b'"')
-        if rem_repr.startswith('u') and prefix[0] not in 'uU':
-            # Found key is unicode, but prefix is Py2 string.
-            # Therefore attempt to interpret key as string.
-            try:
-                rem_repr = repr(rem.encode('ascii') + '"')
-            except UnicodeEncodeError:
-                continue
-
         rem_repr = rem_repr[1 + rem_repr.index("'"):-2]
         if quote == '"':
             # The entered prefix is quoted with ",
@@ -887,9 +882,8 @@ def _safe_isinstance(obj, module, class_name):
     return (module in sys.modules and
             isinstance(obj, getattr(import_module(module), class_name)))
 
-
-def back_unicode_name_matches(text):
-    u"""Match unicode characters back to unicode name
+def back_unicode_name_matches(text:str) -> Tuple[str, Sequence[str]]:
+    """Match unicode characters back to unicode name
 
     This does  ``☃`` -> ``\\snowman``
 
@@ -898,25 +892,29 @@ def back_unicode_name_matches(text):
 
     This will not either back-complete standard sequences like \\n, \\b ...
 
-    Used on Python 3 only.
+    Returns
+    =======
+
+    Return a tuple of
+    
     """
     if len(text)<2:
-        return u'', ()
+        return '', ()
     maybe_slash = text[-2]
     if maybe_slash != '\\':
-        return u'', ()
+        return '', ()
 
     char = text[-1]
     # no expand on quote for completion in strings.
     # nor backcomplete standard ascii keys
     if char in string.ascii_letters or char in ['"',"'"]:
-        return u'', ()
+        return '', ()
     try :
         unic = unicodedata.name(char)
         return '\\'+char,['\\'+unic]
     except KeyError:
         pass
-    return u'', ()
+    return '', ()
 
 def back_latex_name_matches(text:str):
     """Match latex characters back to unicode name
@@ -1002,9 +1000,19 @@ def _make_signature(completion)-> str:
     return '(%s)'% ', '.join([f for f in (_formatparamchildren(p) for signature in completion.get_signatures()
                                           for p in signature.defined_names()) if f])
 
+
+class _CompleteResult(NamedTuple):
+    matched_text : str
+    matches: Sequence[str]
+    matches_origin: Sequence[str]
+    jedi_matches: Any
+
+
 class IPCompleter(Completer):
     """Extension of the completer class with IPython-specific features"""
 
+    __dict_key_regexps: Optional[Dict[bool,Pattern]] = None
+
     @observe('greedy')
     def _greedy_changed(self, change):
         """update the splitter and readline delims when greedy is changed"""
@@ -1143,7 +1151,7 @@ def __init__(self, shell=None, namespace=None, global_namespace=None,
         self._unicode_names = None
 
     @property
-    def matchers(self):
+    def matchers(self) -> List[Any]:
         """All active matcher routines for completion"""
         if self.dict_keys_only:
             return [self.dict_key_matches]
@@ -1165,7 +1173,7 @@ def matchers(self):
                 self.dict_key_matches,
             ]
 
-    def all_completions(self, text) -> List[str]:
+    def all_completions(self, text:str) -> List[str]:
         """
         Wrapper around the completion methods for the benefit of emacs.
         """
@@ -1176,14 +1184,14 @@ def all_completions(self, text) -> List[str]:
 
         return self.complete(text)[1]
 
-    def _clean_glob(self, text):
+    def _clean_glob(self, text:str):
         return self.glob("%s*" % text)
 
-    def _clean_glob_win32(self,text):
+    def _clean_glob_win32(self,text:str):
         return [f.replace("\\","/")
                 for f in self.glob("%s*" % text)]
 
-    def file_matches(self, text):
+    def file_matches(self, text:str)->List[str]:
         """Match filenames, expanding ~USER type strings.
 
         Most of the seemingly convoluted logic in this completer is an
@@ -1265,7 +1273,7 @@ def file_matches(self, text):
         # Mark directories in input list by appending '/' to their names.
         return [x+'/' if os.path.isdir(x) else x for x in matches]
 
-    def magic_matches(self, text):
+    def magic_matches(self, text:str):
         """Match magics"""
         # Get all shell magics now rather than statically, so magics loaded at
         # runtime show up too.
@@ -1356,7 +1364,7 @@ def magic_color_matches(self, text:str) -> List[str] :
                      if color.startswith(prefix) ]
         return []
 
-    def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str):
+    def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str) -> Iterable[Any]:
         """
 
         Return a list of :any:`jedi.api.Completions` object from a ``text`` and
@@ -1430,7 +1438,7 @@ def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str):
             else:
                 return []
 
-    def python_matches(self, text):
+    def python_matches(self, text:str)->list[str]:
         """Match attributes or global python names"""
         if "." in text:
             try:
@@ -1512,7 +1520,7 @@ def _default_arguments(self, obj):
 
         return list(set(ret))
 
-    def python_func_kw_matches(self,text):
+    def python_func_kw_matches(self, text):
         """Match named parameters (kwargs) of the last open function"""
 
         if "." in text: # a parameter cannot be dotted
@@ -1588,30 +1596,33 @@ def python_func_kw_matches(self,text):
 
         return argMatches
 
-    def dict_key_matches(self, text):
+    @staticmethod
+    def _get_keys(obj: Any) -> List[Any]:
+        # Objects can define their own completions by defining an
+        # _ipy_key_completions_() method.
+        method = get_real_method(obj, '_ipython_key_completions_')
+        if method is not None:
+            return method()
+
+        # Special case some common in-memory dict-like types
+        if isinstance(obj, dict) or\
+           _safe_isinstance(obj, 'pandas', 'DataFrame'):
+            try:
+                return list(obj.keys())
+            except Exception:
+                return []
+        elif _safe_isinstance(obj, 'numpy', 'ndarray') or\
+             _safe_isinstance(obj, 'numpy', 'void'):
+            return obj.dtype.names or []
+        return []
+
+    def dict_key_matches(self, text:str) -> List[str]:
         "Match string keys in a dictionary, after e.g. 'foo[' "
-        def get_keys(obj):
-            # Objects can define their own completions by defining an
-            # _ipy_key_completions_() method.
-            method = get_real_method(obj, '_ipython_key_completions_')
-            if method is not None:
-                return method()
-
-            # Special case some common in-memory dict-like types
-            if isinstance(obj, dict) or\
-               _safe_isinstance(obj, 'pandas', 'DataFrame'):
-                try:
-                    return list(obj.keys())
-                except Exception:
-                    return []
-            elif _safe_isinstance(obj, 'numpy', 'ndarray') or\
-                 _safe_isinstance(obj, 'numpy', 'void'):
-                return obj.dtype.names or []
-            return []
 
-        try:
+
+        if self.__dict_key_regexps is not None:
             regexps = self.__dict_key_regexps
-        except AttributeError:
+        else:
             dict_key_re_fmt = r'''(?x)
             (  # match dict-referring expression wrt greedy setting
                 %s
@@ -1651,7 +1662,7 @@ def get_keys(obj):
             except Exception:
                 return []
 
-        keys = get_keys(obj)
+        keys = self._get_keys(obj)
         if not keys:
             return keys
         closing_quote, token_offset, matches = match_dict_keys(keys, prefix, self.splitter.delims)
@@ -1696,16 +1707,15 @@ def get_keys(obj):
 
         return [leading + k + suf for k in matches]
 
-    def unicode_name_matches(self, text):
-        u"""Match Latex-like syntax for unicode characters base
+    @staticmethod
+    def unicode_name_matches(text:str) -> Tuple[str, List[str]] :
+        """Match Latex-like syntax for unicode characters base
         on the name of the character.
 
         This does  ``\\GREEK SMALL LETTER ETA`` -> ``η``
 
         Works only on valid python 3 identifier, or on combining characters that
         will combine to form a valid identifier.
-
-        Used on Python 3 only.
         """
         slashpos = text.rfind('\\')
         if slashpos > -1:
@@ -1717,7 +1727,7 @@ def unicode_name_matches(self, text):
                     return '\\'+s,[unic]
             except KeyError:
                 pass
-        return u'', []
+        return '', []
 
 
     def latex_matches(self, text):
@@ -1839,6 +1849,7 @@ def completions(self, text: str, offset: int)->Iterator[Completion]:
                       category=ProvisionalCompleterWarning, stacklevel=2)
 
         seen = set()
+        profiler:Optional[cProfile.Profile]
         try:
             if self.profile_completions:
                 import cProfile
@@ -1864,7 +1875,7 @@ def completions(self, text: str, offset: int)->Iterator[Completion]:
                 print("Writing profiler output to", output_path)
                 profiler.dump_stats(output_path)
 
-    def _completions(self, full_text: str, offset: int, *, _timeout)->Iterator[Completion]:
+    def _completions(self, full_text: str, offset: int, *, _timeout) -> Iterator[Completion]:
         """
         Core completion module.Same signature as :any:`completions`, with the
         extra `timeout` parameter (in seconds).
@@ -1949,7 +1960,7 @@ def _completions(self, full_text: str, offset: int, *, _timeout)->Iterator[Compl
             yield Completion(start=start_offset, end=offset, text=m, _origin=t, signature='', type='<unknown>')
 
 
-    def complete(self, text=None, line_buffer=None, cursor_pos=None):
+    def complete(self, text=None, line_buffer=None, cursor_pos=None) -> Tuple[str, Sequence[str]]:
         """Find completions for the given text and line context.
 
         Note that both the text and the line_buffer are optional, but at least
@@ -1973,9 +1984,9 @@ def complete(self, text=None, line_buffer=None, cursor_pos=None):
 
         Returns
         -------
+        Tuple of two items:
         text : str
           Text that was actually used in the completion.
-
         matches : list
           A list of completion matches.
 
@@ -1995,7 +2006,7 @@ def complete(self, text=None, line_buffer=None, cursor_pos=None):
         return self._complete(line_buffer=line_buffer, cursor_pos=cursor_pos, text=text, cursor_line=0)[:2]
 
     def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
-                  full_text=None) -> Tuple[str, List[str], List[str], Iterable[_FakeJediCompletion]]:
+                  full_text=None) -> _CompleteResult:
         """
 
         Like complete but can also returns raw jedi completions as well as the
@@ -2008,8 +2019,19 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
         caller) as the offset in the ``text`` or ``line_buffer``, or as the
         ``column`` when passing multiline strings this could/should be renamed
         but would add extra noise.
+
+        Return
+        ======
+
+        A tuple of N elements which are (likely):
+
+            matched_text: ? the text that the complete matched
+            matches: list of completions ?
+            matches_origin: ? list same lenght as matches, and where each completion came from
+            jedi_matches: list of Jedi matches, have it's own structure.
         """
 
+
         # if the cursor position isn't given, the only sane assumption we can
         # make is that it's at the end of the line (the common case)
         if cursor_pos is None:
@@ -2027,17 +2049,16 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
         if self.backslash_combining_completions:
             # allow deactivation of these on windows.
             base_text = text if not line_buffer else line_buffer[:cursor_pos]
-            latex_text, latex_matches = self.latex_matches(base_text)
-            if latex_matches:
-                return latex_text, latex_matches, ['latex_matches']*len(latex_matches), ()
-            name_text = ''
-            name_matches = []
-            # need to add self.fwd_unicode_match() function here when done
-            for meth in (self.unicode_name_matches, back_latex_name_matches, back_unicode_name_matches, self.fwd_unicode_match):
+
+            for meth in (self.latex_matches,
+                         self.unicode_name_matches,
+                         back_latex_name_matches,
+                         back_unicode_name_matches,
+                         self.fwd_unicode_match):
                 name_text, name_matches = meth(base_text)
                 if name_text:
-                    return name_text, name_matches[:MATCHES_LIMIT], \
-                           [meth.__qualname__]*min(len(name_matches), MATCHES_LIMIT), ()
+                    return _CompleteResult(name_text, name_matches[:MATCHES_LIMIT], \
+                           [meth.__qualname__]*min(len(name_matches), MATCHES_LIMIT), ())
 
 
         # If no line buffer is given, assume the input text is all there was
@@ -2052,7 +2073,7 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
             matches = list(matcher(line_buffer))[:MATCHES_LIMIT]
             if matches:
                 origins = [matcher.__qualname__] * len(matches)
-                return text, matches, origins, ()
+                return _CompleteResult(text, matches, origins, ())
 
         # Start with a clean slate of completions
         matches = []
@@ -2061,7 +2082,7 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
         # different types of objects.  The rlcomplete() method could then
         # simply collapse the dict into a list for readline, but we'd have
         # richer completion semantics in other environments.
-        completions = ()
+        completions:Iterable[Any] = []
         if self.use_jedi:
             if not full_text:
                 full_text = line_buffer
@@ -2105,9 +2126,38 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
 
         self.matches = _matches
 
-        return text, _matches, origins, completions
+        return _CompleteResult(text, _matches, origins, completions)
         
-    def fwd_unicode_match(self, text:str) -> Tuple[str, list]:
+    def fwd_unicode_match(self, text:str) -> Tuple[str, Iterable[str]]:
+        """
+
+        Forward match a string starting with a backslash with a list of
+        potential Unicode completions.
+
+        Will compute list list of Unicode character names on first call and cache it.
+
+        Return
+        ======
+
+        At tuple with:
+            - matched text (empty if no matches)
+            - list of potential completions, empty tuple  otherwise)
+        """
+        # TODO: self.unicode_names is here a list we traverse each time with ~100k elements.
+        # We could do a faster match using a Trie.
+
+        # Using pygtrie the follwing seem to work:
+
+        #     s = PrefixSet()
+
+        #     for c in range(0,0x10FFFF + 1):
+        #         try:
+        #             s.add(unicodedata.name(chr(c)))
+        #         except ValueError:
+        #             pass
+        #     [''.join(k) for k in s.iter(prefix)]
+
+        # But need to be timed and adds an extra dependency.
 
         slashpos = text.rfind('\\')
         # if text starts with slash
@@ -2126,7 +2176,7 @@ def fwd_unicode_match(self, text:str) -> Tuple[str, list]:
 
         # if text does not start with slash
         else:
-            return u'', ()
+            return '', ()
 
     @property
     def unicode_names(self) -> List[str]:
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 2c19e2e0187..5b03573d3b4 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -212,9 +212,8 @@ def test_latex_completions(self):
         keys = random.sample(latex_symbols.keys(), 10)
         for k in keys:
             text, matches = ip.complete(k)
-            nt.assert_equal(len(matches), 1)
             nt.assert_equal(text, k)
-            nt.assert_equal(matches[0], latex_symbols[k])
+            nt.assert_equal(matches, [latex_symbols[k]])
         # Test a more complex line
         text, matches = ip.complete("print(\\alpha")
         nt.assert_equal(text, "\\alpha")
@@ -250,8 +249,8 @@ def test_forward_unicode_completion(self):
         ip = get_ipython()
 
         name, matches = ip.complete("\\ROMAN NUMERAL FIVE")
-        nt.assert_equal(len(matches), 1)
-        nt.assert_equal(matches[0], "Ⅴ")
+        nt.assert_equal(matches, ["Ⅴ"] ) # This is not a V
+        nt.assert_equal(matches, ["\u2164"] ) # same as above but explicit.
 
     @nt.nottest  # now we have a completion for \jmath
     @decorators.knownfailureif(
diff --git a/MANIFEST.in b/MANIFEST.in
index d47a16d42f8..5bc59b9661b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,6 +5,7 @@ include setupbase.py
 include setupegg.py
 include MANIFEST.in
 include pytest.ini
+include mypy.ini
 include .mailmap
 
 recursive-exclude tools *
diff --git a/mypy.ini b/mypy.ini
new file mode 100644
index 00000000000..998aed51a29
--- /dev/null
+++ b/mypy.ini
@@ -0,0 +1,4 @@
+[mypy]
+python_version = 3.6
+ignore_missing_imports = True
+follow_imports = silent

From 1e6eb7a1f3c4b6504bc6e7ea36882329c67d4197 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 7 May 2020 14:55:05 -0700
Subject: [PATCH 0121/1407] documentation and cleanup

---
 IPython/core/completer.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index cd54b42b42e..5b181d6efe6 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -883,7 +883,7 @@ def _safe_isinstance(obj, module, class_name):
             isinstance(obj, getattr(import_module(module), class_name)))
 
 def back_unicode_name_matches(text:str) -> Tuple[str, Sequence[str]]:
-    """Match unicode characters back to unicode name
+    """Match Unicode characters back to Unicode name
 
     This does  ``☃`` -> ``\\snowman``
 
@@ -895,7 +895,12 @@ def back_unicode_name_matches(text:str) -> Tuple[str, Sequence[str]]:
     Returns
     =======
 
-    Return a tuple of
+    Return a tuple with two elements:
+
+    - The Unicode character that was matched (preceded with a backslash), or
+        empty string,
+    - a sequence (of 1), name for the match Unicode character, preceded by
+        backslash, or empty if no match.
     
     """
     if len(text)<2:
@@ -907,11 +912,11 @@ def back_unicode_name_matches(text:str) -> Tuple[str, Sequence[str]]:
     char = text[-1]
     # no expand on quote for completion in strings.
     # nor backcomplete standard ascii keys
-    if char in string.ascii_letters or char in ['"',"'"]:
+    if char in string.ascii_letters or char in ('"',"'"):
         return '', ()
     try :
         unic = unicodedata.name(char)
-        return '\\'+char,['\\'+unic]
+        return '\\'+char,('\\'+unic,)
     except KeyError:
         pass
     return '', ()

From 3dc4256d25c563a824d066bb1ec00bdd3e5a2a25 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 7 May 2020 14:58:11 -0700
Subject: [PATCH 0122/1407] less u-string, more types

---
 IPython/core/completer.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 5b181d6efe6..9857c27dcc0 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -921,32 +921,31 @@ def back_unicode_name_matches(text:str) -> Tuple[str, Sequence[str]]:
         pass
     return '', ()
 
-def back_latex_name_matches(text:str):
+def back_latex_name_matches(text:str) -> Tuple[str, Sequence[str]] :
     """Match latex characters back to unicode name
 
     This does ``\\ℵ`` -> ``\\aleph``
 
-    Used on Python 3 only.
     """
     if len(text)<2:
-        return u'', ()
+        return '', ()
     maybe_slash = text[-2]
     if maybe_slash != '\\':
-        return u'', ()
+        return '', ()
 
 
     char = text[-1]
     # no expand on quote for completion in strings.
     # nor backcomplete standard ascii keys
-    if char in string.ascii_letters or char in ['"',"'"]:
-        return u'', ()
+    if char in string.ascii_letters or char in ('"',"'"):
+        return '', ()
     try :
         latex = reverse_latex_symbol[char]
         # '\\' replace the \ as well
         return '\\'+char,[latex]
     except KeyError:
         pass
-    return u'', ()
+    return '', ()
 
 
 def _formatparamchildren(parameter) -> str:
@@ -1192,7 +1191,7 @@ def all_completions(self, text:str) -> List[str]:
     def _clean_glob(self, text:str):
         return self.glob("%s*" % text)
 
-    def _clean_glob_win32(self,text:str):
+    def _clean_glob_win32(self, text:str):
         return [f.replace("\\","/")
                 for f in self.glob("%s*" % text)]
 

From ca259e65245e0b97b4f2295347b0144b694f420c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 7 May 2020 15:09:41 -0700
Subject: [PATCH 0123/1407] fix tests

---
 IPython/core/tests/test_completer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 5b03573d3b4..feef38cc6e9 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -243,7 +243,7 @@ def test_back_unicode_completion(self):
         ip = get_ipython()
 
         name, matches = ip.complete("\\Ⅴ")
-        nt.assert_equal(matches, ["\\ROMAN NUMERAL FIVE"])
+        nt.assert_equal(matches, ("\\ROMAN NUMERAL FIVE",))
 
     def test_forward_unicode_completion(self):
         ip = get_ipython()

From 385c72e8b3f491fa6f135ef6b51f183012461702 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 10 May 2020 11:33:39 -0700
Subject: [PATCH 0124/1407] use LIst upper case for type

---
 IPython/core/completer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 9857c27dcc0..fb69375ffce 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1442,7 +1442,7 @@ def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str) -> Iterabl
             else:
                 return []
 
-    def python_matches(self, text:str)->list[str]:
+    def python_matches(self, text:str)->List[str]:
         """Match attributes or global python names"""
         if "." in text:
             try:

From 11b318d5f96855e6b14397c985dfa4dc6cf2b339 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 10 May 2020 11:36:41 -0700
Subject: [PATCH 0125/1407] remove some u prefix and add types

---
 IPython/core/completer.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index fb69375ffce..78aa1716630 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1594,7 +1594,7 @@ def python_func_kw_matches(self, text):
             # Remove used named arguments from the list, no need to show twice
             for namedArg in set(namedArgs) - usedNamedArgs:
                 if namedArg.startswith(text):
-                    argMatches.append(u"%s=" %namedArg)
+                    argMatches.append("%s=" %namedArg)
         except:
             pass
 
@@ -1734,8 +1734,8 @@ def unicode_name_matches(text:str) -> Tuple[str, List[str]] :
         return '', []
 
 
-    def latex_matches(self, text):
-        u"""Match Latex syntax for unicode characters.
+    def latex_matches(self, text:str) -> Tuple[str, Sequence[str]]:
+        """Match Latex syntax for unicode characters.
 
         This does both ``\\alp`` -> ``\\alpha`` and ``\\alpha`` -> ``α``
         """
@@ -1752,7 +1752,7 @@ def latex_matches(self, text):
                 matches = [k for k in latex_symbols if k.startswith(s)]
                 if matches:
                     return s, matches
-        return u'', []
+        return '', ()
 
     def dispatch_custom_completer(self, text):
         if not self.custom_completers:
@@ -2132,7 +2132,7 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
 
         return _CompleteResult(text, _matches, origins, completions)
         
-    def fwd_unicode_match(self, text:str) -> Tuple[str, Iterable[str]]:
+    def fwd_unicode_match(self, text:str) -> Tuple[str, Sequence[str]]:
         """
 
         Forward match a string starting with a backslash with a list of

From 76622da725ae58bcab27c0a73b7e6427dec5e304 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 10 May 2020 12:15:22 -0700
Subject: [PATCH 0126/1407] speedup completion of unicode names

---
 IPython/core/completer.py            | 22 ++++++++++++++++++++--
 IPython/core/tests/test_completer.py | 15 ++++++++++++++-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 78aa1716630..ee165c5e720 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -156,6 +156,14 @@
 # Globals
 #-----------------------------------------------------------------------------
 
+# ranges where we have most of the valid unicode names. We could be more finer
+# grained but is it worth it for performace  While unicode have character in the
+# rage 0, 0x110000, we seem to have name for about 10% of those. (131808 as I
+# write this). With below range we cover them all, with a density of ~67%
+# biggest next gap we consider only adds up about 1% density and there are 600
+# gaps that would need hard coding.
+_UNICODE_RANGES = [(32, 0x2fa1e), (0xe0001, 0xe01f0)]
+
 # Public API
 __all__ = ['Completer','IPCompleter']
 
@@ -2092,7 +2100,7 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
                 full_text = line_buffer
             completions = self._jedi_matches(
                 cursor_pos, cursor_line, full_text)
-                
+
         if self.merge_completions:
             matches = []
             for matcher in self.matchers:
@@ -2195,6 +2203,16 @@ def unicode_names(self) -> List[str]:
                     names.append(unicodedata.name(chr(c)))
                 except ValueError:
                     pass
-            self._unicode_names = names
+            self._unicode_names = _unicode_name_compute(_UNICODE_RANGES)
 
         return self._unicode_names
+
+def _unicode_name_compute(ranges:List[Tuple[int,int]]) -> List[str]:
+    names = []
+    for start,stop in ranges:
+        for c in range(start, stop) :
+            try:
+                names.append(unicodedata.name(chr(c)))
+            except ValueError:
+                pass
+    return names
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index feef38cc6e9..7c54518aa2f 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -33,6 +33,19 @@
 # Test functions
 # -----------------------------------------------------------------------------
 
+def test_unicode_range():
+    """
+    Test that the ranges we test for unicode names give the same number of
+    results than testing the full length.
+    """
+    from IPython.core.completer import  _unicode_name_compute, _UNICODE_RANGES
+
+    expected_list = _unicode_name_compute([(0, 0x110000)])
+    test = _unicode_name_compute(_UNICODE_RANGES)
+
+    assert len(expected_list) == len(test)
+    assert len(expected_list) == 131808
+
 
 @contextmanager
 def greedy_completion():
@@ -230,7 +243,7 @@ def test_latex_no_results(self):
         ip = get_ipython()
         text, matches = ip.Completer.latex_matches("\\really_i_should_match_nothing")
         nt.assert_equal(text, "")
-        nt.assert_equal(matches, [])
+        nt.assert_equal(matches, ())
 
     def test_back_latex_completion(self):
         ip = get_ipython()

From 12ab65d5c41d060d2332465fe7cf9270a2b32b0b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 10 May 2020 14:13:45 -0700
Subject: [PATCH 0127/1407] test failure

---
 IPython/core/tests/test_completer.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 7c54518aa2f..413fc4fa88a 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -42,9 +42,15 @@ def test_unicode_range():
 
     expected_list = _unicode_name_compute([(0, 0x110000)])
     test = _unicode_name_compute(_UNICODE_RANGES)
+    len_exp = len(expected_list)
+    len_test = len(test)
 
-    assert len(expected_list) == len(test)
-    assert len(expected_list) == 131808
+    # do not inline the len() or on error pytest will try to print the 130 000 +
+    # elements.
+    assert len_exp == len_test
+
+    # fail if new unicode symbols have been added. 
+    assert len_exp <= 131808
 
 
 @contextmanager

From 98f6e03804b284e7f8bbf81d2c87bd929d5b0ad3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 10 May 2020 14:54:58 -0700
Subject: [PATCH 0128/1407] Fix mightly parso error

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 20a966a03a9..a049cf419c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,7 @@ script:
   - |
     if [[ "$TRAVIS_PYTHON_VERSION" == "nightly" ]]; then
        # on nightly fake parso known the grammar
-       cp /home/travis/virtualenv/python3.8-dev/lib/python3.8/site-packages/parso/python/grammar37.txt /home/travis/virtualenv/python3.8-dev/lib/python3.8/site-packages/parso/python/grammar38.txt
+       cp /home/travis/virtualenv/python3.9-dev/lib/python3.9/site-packages/parso/python/grammar38.txt /home/travis/virtualenv/python3.9-dev/lib/python3.9/site-packages/parso/python/grammar39.txt
     fi
   - cd /tmp && iptest --coverage xml && cd -
   - pytest IPython

From c1ee4e0e3a497c9fd2de4f4ab53f329741b81a32 Mon Sep 17 00:00:00 2001
From: Thomas <Thomas@Zapsurgical.com>
Date: Sun, 10 May 2020 22:46:57 -0700
Subject: [PATCH 0129/1407] Fix ipython#11508: check if line_buffer is None

---
 IPython/core/completer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 9fd3598e303..98879afe554 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -2021,8 +2021,8 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
         # if text is either None or an empty string, rely on the line buffer
         if (not line_buffer) and full_text:
             line_buffer = full_text.split('\n')[cursor_line]
-        if not text:
-            text = self.splitter.split_line(line_buffer, cursor_pos)
+        if not text: # issue #11508: check line_buffer before calling split_line
+            text = self.splitter.split_line(line_buffer, cursor_pos)  if line_buffer else ''
 
         if self.backslash_combining_completions:
             # allow deactivation of these on windows.

From 6bde6703d7b924dfb308515e70ebd926c92fa3b2 Mon Sep 17 00:00:00 2001
From: palewire <ben.welsh@gmail.com>
Date: Mon, 11 May 2020 10:58:39 -0700
Subject: [PATCH 0130/1407] Add more exceptions

---
 IPython/core/magics/execution.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 61dc03938ff..81815a17071 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -680,9 +680,8 @@ def run(self, parameter_s='', runner=None,
             fpath = arg_lst[0]
             filename = file_finder(fpath)
         except IndexError:
-            warn('you must provide at least a filename.')
-            print('\n%run:\n', oinspect.getdoc(self.run))
-            return
+            msg = 'you must provide at least a filename.'
+            raise Exception(msg)
         except IOError as e:
             try:
                 msg = str(e)
@@ -690,8 +689,7 @@ def run(self, parameter_s='', runner=None,
                 msg = e.message
             if os.name == 'nt' and re.match(r"^'.*'$",fpath):
                 warn('For Windows, use double quotes to wrap a filename: %run "mypath\\myfile.py"')
-            error(msg)
-            return
+            raise Exception(msg)
         except TypeError:
             if fpath in sys.meta_path:
                 filename = ""

From d36bd04a4fb65aeff254e1f4398769de3800df0e Mon Sep 17 00:00:00 2001
From: palewire <ben.welsh@gmail.com>
Date: Mon, 11 May 2020 12:48:43 -0700
Subject: [PATCH 0131/1407] Raise exception

---
 IPython/core/magics/execution.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 81815a17071..6f73b8089d2 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -672,8 +672,8 @@ def run(self, parameter_s='', runner=None,
             modulename = opts["m"][0]
             modpath = find_mod(modulename)
             if modpath is None:
-                warn('%r is not a valid modulename on sys.path'%modulename)
-                return
+                msg = '%r is not a valid modulename on sys.path'%modulename
+                raise Exception(msg)
             arg_lst = [modpath] + arg_lst
         try:
             fpath = None # initialize to make sure fpath is in scope later

From 7432f3c8d7179034975725d95879bb00e17defeb Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 11 May 2020 16:49:14 -0700
Subject: [PATCH 0132/1407] Fix some test on python 3.9 (nightly).

Mostly

1) Pgen parser does not raise MemorryError anymore.
2) Function signature now understand "Optinal" correctly
---
 IPython/core/tests/test_async_helpers.py | 13 ++++++++-----
 IPython/core/tests/test_oinspect.py      |  8 ++++++++
 IPython/core/tests/test_ultratb.py       | 16 ++++++++++------
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/IPython/core/tests/test_async_helpers.py b/IPython/core/tests/test_async_helpers.py
index 86a516ccc1f..11c475874d7 100644
--- a/IPython/core/tests/test_async_helpers.py
+++ b/IPython/core/tests/test_async_helpers.py
@@ -8,7 +8,7 @@
 from textwrap import dedent, indent
 from unittest import TestCase
 from IPython.testing.decorators import skip_without
-
+import sys
 
 iprc = lambda x: ip.run_cell(dedent(x)).raise_error()
 iprc_nr = lambda x: ip.run_cell(dedent(x))
@@ -275,10 +275,13 @@ def test_autoawait(self):
         await sleep(0.1)
         """
         )
-
-    def test_memory_error(self):
-        with self.assertRaises(MemoryError):
-            iprc("(" * 200 + ")" * 200)
+    
+    if sys.version_info < (3,9):
+        # new pgen parser in 3.9 does not raise MemoryError on too many nested
+        # parens anymore
+        def test_memory_error(self):
+            with self.assertRaises(MemoryError):
+                iprc("(" * 200 + ")" * 200)
 
     @skip_without('curio')
     def test_autoawait_curio(self):
diff --git a/IPython/core/tests/test_oinspect.py b/IPython/core/tests/test_oinspect.py
index 8bdcfad98ce..19c6db7c4f8 100644
--- a/IPython/core/tests/test_oinspect.py
+++ b/IPython/core/tests/test_oinspect.py
@@ -421,6 +421,14 @@ def long_function(
         long_function.__name__,
     )
     nt.assert_in(sig, [
+        # Python >=3.9
+        '''\
+long_function(
+    a_really_long_parameter: int,
+    and_another_long_one: bool = False,
+    let_us_make_sure_this_is_looong: Optional[str] = None,
+) -> bool\
+''',
         # Python >=3.7
         '''\
 long_function(
diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index 209c9c4a423..d0f13dff066 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -247,12 +247,16 @@ def test_non_syntaxerror(self):
             with tt.AssertPrints('QWERTY'):
                 ip.showsyntaxerror()
 
-
-class MemoryErrorTest(unittest.TestCase):
-    def test_memoryerror(self):
-        memoryerror_code = "(" * 200 + ")" * 200
-        with tt.AssertPrints("MemoryError"):
-            ip.run_cell(memoryerror_code)
+import sys
+if sys.version_info < (3,9):
+    """
+    New 3.9 Pgen Parser does not raise Memory error, except on failed malloc.
+    """
+    class MemoryErrorTest(unittest.TestCase):
+        def test_memoryerror(self):
+            memoryerror_code = "(" * 200 + ")" * 200
+            with tt.AssertPrints("MemoryError"):
+                ip.run_cell(memoryerror_code)
 
 
 class Python3ChainedExceptionsTest(unittest.TestCase):

From 9c41419cf882ebb0736fe9e27af002db4baa52e8 Mon Sep 17 00:00:00 2001
From: palewire <ben.welsh@gmail.com>
Date: Mon, 11 May 2020 19:33:01 -0700
Subject: [PATCH 0133/1407] Added tests for %run exceptions

---
 IPython/core/tests/test_run.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index e4f37d55822..2974da40194 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -396,6 +396,25 @@ def test_run_nb(self):
         
         nt.assert_equal(_ip.user_ns['answer'], 42)
 
+    def test_run_nb_error(self):
+        """Test %run notebook.ipynb error"""
+        from nbformat import v4, writes
+        # %run when a file name isn't provided
+        nt.assert_raises(Exception, _ip.magic, "run")
+
+        # %run when a file doesn't exist
+        nt.assert_raises(Exception, _ip.magic, "run foobar.ipynb")
+
+        # %run on a notebook with an error
+        nb = v4.new_notebook(
+           cells=[
+                v4.new_code_cell("0/0")
+            ]
+        )
+        src = writes(nb, version=4)
+        self.mktmp(src, ext='.ipynb')
+        nt.assert_raises(Exception, _ip.magic, "run %s" % self.fname)
+
     def test_file_options(self):
         src = ('import sys\n'
                'a = " ".join(sys.argv[1:])\n')

From 1c09c1609e5865ea97f708a3e5b6b1a324e787b8 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 11 May 2020 22:00:33 -0700
Subject: [PATCH 0134/1407] Some more optional typing to make mypy happy

---
 IPython/core/inputtransformer2.py | 13 ++++++++-----
 IPython/external/__init__.py      |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index 0443e6829b4..097dd88920f 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -13,7 +13,7 @@
 from codeop import compile_command
 import re
 import tokenize
-from typing import List, Tuple, Union
+from typing import List, Tuple, Optional, Any
 import warnings
 
 _indent_re = re.compile(r'^[ \t]+')
@@ -100,7 +100,7 @@ def cell_magic(lines):
             % (magic_name, first_line, body)]
 
 
-def _find_assign_op(token_line) -> Union[int, None]:
+def _find_assign_op(token_line) -> Optional[int]:
     """Get the index of the first assignment in the line ('=' not inside brackets)
 
     Note: We don't try to support multiple special assignment (a = b = %foo)
@@ -115,6 +115,7 @@ def _find_assign_op(token_line) -> Union[int, None]:
         elif s in {')', ']', '}'}:
             if paren_level > 0:
                 paren_level -= 1
+    return None
 
 def find_end_of_continued_line(lines, start_line: int):
     """Find the last line of a line explicitly extended using backslashes.
@@ -475,8 +476,10 @@ def make_tokens_by_line(lines:List[str]):
     # lines or comments. This is intentional - see https://bugs.python.org/issue17061
     # We want to group the former case together but split the latter, so we
     # track parentheses level, similar to the internals of tokenize.
-    NEWLINE, NL = tokenize.NEWLINE, tokenize.NL
-    tokens_by_line = [[]]
+
+    #   reexported from token on 3.7+
+    NEWLINE, NL = tokenize.NEWLINE, tokenize.NL  # type: ignore
+    tokens_by_line:List[List[Any]] = [[]]
     if len(lines) > 1 and not lines[0].endswith(('\n', '\r', '\r\n', '\x0b', '\x0c')):
         warnings.warn("`make_tokens_by_line` received a list of lines which do not have lineending markers ('\\n', '\\r', '\\r\\n', '\\x0b', '\\x0c'), behavior will be unspecified")
     parenlev = 0
@@ -661,7 +664,7 @@ def check_complete(self, cell: str):
             # We're in a multiline string or expression
             return 'incomplete', find_last_indent(lines)
 
-        newline_types = {tokenize.NEWLINE, tokenize.COMMENT, tokenize.ENDMARKER}
+        newline_types = {tokenize.NEWLINE, tokenize.COMMENT, tokenize.ENDMARKER} # type: ignore
 
         # Pop the last line which only contains DEDENTs and ENDMARKER
         last_token_line = None
diff --git a/IPython/external/__init__.py b/IPython/external/__init__.py
index 1c8c546f118..b38110f1d91 100644
--- a/IPython/external/__init__.py
+++ b/IPython/external/__init__.py
@@ -2,4 +2,4 @@
 This package contains all third-party modules bundled with IPython.
 """
 
-__all__ = []
+__all__: List[str] = []

From 66fdfc8f5d053ca4d60881bc5bb630c0dd1dc234 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 11 May 2020 22:06:37 -0700
Subject: [PATCH 0135/1407] Remove dead code.

This code appear to be dead by searching in IPython, ipykernel and
github
---
 IPython/core/prefilter.py | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/IPython/core/prefilter.py b/IPython/core/prefilter.py
index bf801f999c4..0038e5c673e 100644
--- a/IPython/core/prefilter.py
+++ b/IPython/core/prefilter.py
@@ -120,7 +120,7 @@ class PrefilterManager(Configurable):
     def __init__(self, shell=None, **kwargs):
         super(PrefilterManager, self).__init__(shell=shell, **kwargs)
         self.shell = shell
-        self.init_transformers()
+        self._transformers = []
         self.init_handlers()
         self.init_checkers()
 
@@ -128,14 +128,6 @@ def __init__(self, shell=None, **kwargs):
     # API for managing transformers
     #-------------------------------------------------------------------------
 
-    def init_transformers(self):
-        """Create the default transformers."""
-        self._transformers = []
-        for transformer_cls in _default_transformers:
-            transformer_cls(
-                shell=self.shell, prefilter_manager=self, parent=self
-            )
-
     def sort_transformers(self):
         """Sort the transformers by priority.
 
@@ -687,9 +679,6 @@ def handle(self, line_info):
 #-----------------------------------------------------------------------------
 
 
-_default_transformers = [
-]
-
 _default_checkers = [
     EmacsChecker,
     MacroChecker,

From 02d6f690552586c002da55c8cec8124e9ec1855c Mon Sep 17 00:00:00 2001
From: Talley Lambert <talley.lambert@gmail.com>
Date: Sat, 16 May 2020 10:49:19 -0400
Subject: [PATCH 0136/1407] enable high dpi

---
 IPython/terminal/pt_inputhooks/qt.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/terminal/pt_inputhooks/qt.py b/IPython/terminal/pt_inputhooks/qt.py
index ce0a9da86bd..1504c3bde72 100644
--- a/IPython/terminal/pt_inputhooks/qt.py
+++ b/IPython/terminal/pt_inputhooks/qt.py
@@ -25,6 +25,7 @@ def inputhook(context):
                         'variable. Deactivate Qt5 code.'
                     )
                 return
+        QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)
         _appref = app = QtGui.QApplication([" "])
     event_loop = QtCore.QEventLoop(app)
 

From 93f7c2c5f36d20f1aa19e62a7e15377292040f93 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 18 May 2020 13:09:36 -0700
Subject: [PATCH 0137/1407] Reenable non-text formatter on terminal.

In many terminal it is possible to display images, and terminal IPython
now have the ability to register arbitrary mimehandler.
---
 IPython/terminal/interactiveshell.py          |  2 --
 .../terminal/tests/test_interactivshell.py    | 34 +++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 7f18ac2d6bd..412880d2de9 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -274,8 +274,6 @@ def init_display_formatter(self):
         super(TerminalInteractiveShell, self).init_display_formatter()
         # terminal only supports plain text
         self.display_formatter.active_types = ['text/plain']
-        # disable `_ipython_display_`
-        self.display_formatter.ipython_display_formatter.enabled = False
 
     def init_prompt_toolkit_cli(self):
         if self.simple_prompt:
diff --git a/IPython/terminal/tests/test_interactivshell.py b/IPython/terminal/tests/test_interactivshell.py
index 640e5d482ae..d17e0426489 100644
--- a/IPython/terminal/tests/test_interactivshell.py
+++ b/IPython/terminal/tests/test_interactivshell.py
@@ -135,11 +135,14 @@ def test_inputtransformer_syntaxerror(self):
         finally:
             ip.input_transformers_post.remove(syntax_error_transformer)
 
-    def test_plain_text_only(self):
+    def test_repl_not_plain_text(self):
         ip = get_ipython()
         formatter = ip.display_formatter
         assert formatter.active_types == ['text/plain']
-        assert not formatter.ipython_display_formatter.enabled
+
+        # terminal may have arbitrary mimetype handler to open external viewer
+        # or inline images.
+        assert formatter.ipython_display_formatter.enabled
 
         class Test(object):
             def __repr__(self):
@@ -155,16 +158,27 @@ def _repr_html_(self):
 
         class Test2(Test):
             def _ipython_display_(self):
-                from IPython.display import display
-                display('<custom>')
+                from IPython.display import display, HTML
+                display(HTML('<custom>'))
 
-        # verify that _ipython_display_ shortcut isn't called
-        obj = Test2()
-        with capture_output() as captured:
-            data, _ = formatter.format(obj)
+        # verify that mimehandlers are called
+        called = False
 
-        self.assertEqual(data, {'text/plain': repr(obj)})
-        assert captured.stdout == ''
+        def handler(data, metadata):
+            print('Handler called')
+            nonlocal called
+            called = True
+
+        ip.display_formatter.active_types.append("text/html")
+        ip.display_formatter.formatters["text/html"].enabled = True
+        ip.mime_renderers["text/html"] = handler
+
+
+        obj = Test()
+        display(obj)
+
+        assert called == True
+        
 
 def syntax_error_transformer(lines):
     """Transformer that throws SyntaxError if 'syntaxerror' is in the code."""

From 9ab89bf0b00d0371d4b3a023fbebd12e50e3d5fa Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 18 May 2020 16:04:26 -0700
Subject: [PATCH 0138/1407] Update unicode ranges to fix test on nightly.

The number of valid unicode symbols on nightly has increased, so update
the ranges we skip.
---
 IPython/core/completer.py            |  2 +-
 IPython/core/tests/test_completer.py | 52 ++++++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index ee165c5e720..dd09adddd05 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -162,7 +162,7 @@
 # write this). With below range we cover them all, with a density of ~67%
 # biggest next gap we consider only adds up about 1% density and there are 600
 # gaps that would need hard coding.
-_UNICODE_RANGES = [(32, 0x2fa1e), (0xe0001, 0xe01f0)]
+_UNICODE_RANGES = [(32, 0x3134b), (0xe0001, 0xe01f0)]
 
 # Public API
 __all__ = ['Completer','IPCompleter']
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 413fc4fa88a..80f479f156b 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -33,6 +33,40 @@
 # Test functions
 # -----------------------------------------------------------------------------
 
+def recompute_unicode_ranges():
+    """
+    utility to recompute the largest unicode range without any characters
+
+    use to recompute the gap in the global _UNICODE_RANGES of completer.py
+    """
+    import itertools
+    import unicodedata
+    valid = []
+    for c in range(0,0x10FFFF + 1):
+        try:
+            unicodedata.name(chr(c))
+        except ValueError:
+            continue
+        valid.append(c)
+
+    def ranges(i):
+        for a, b in itertools.groupby(enumerate(i), lambda pair: pair[1] - pair[0]):
+            b = list(b)
+            yield b[0][1], b[-1][1]
+
+    rg = list(ranges(valid))
+    lens = []
+    gap_lens = []
+    pstart, pstop = 0,0
+    for start, stop in rg:
+        lens.append(stop-start)
+        gap_lens.append((start - pstop, hex(pstop), hex(start), f'{round((start - pstop)/0xe01f0*100)}%'))
+        pstart, pstop = start, stop
+
+    return sorted(gap_lens)[-1]
+
+
+
 def test_unicode_range():
     """
     Test that the ranges we test for unicode names give the same number of
@@ -47,10 +81,24 @@ def test_unicode_range():
 
     # do not inline the len() or on error pytest will try to print the 130 000 +
     # elements.
-    assert len_exp == len_test
+    message = None
+    if len_exp != len_test or len_exp > 131808:
+        size, start, stop, prct = recompute_unicode_ranges()
+        message = f"""_UNICODE_RANGES likely wrong and need updating. This is
+        likely due to a new release of Python. We've find that the biggest gap
+        in unicode characters has reduces in size to be {size} charaters
+        ({prct}), from {start}, to {stop}. In completer.py likely update to
+
+            _UNICODE_RANGES = [(32, {start}), ({stop}, 0xe01f0)]
+
+        And update the assertion below to use
+
+            len_exp <= {len_exp}
+        """
+    assert len_exp == len_test, message
 
     # fail if new unicode symbols have been added. 
-    assert len_exp <= 131808
+    assert len_exp <= 137714, message
 
 
 @contextmanager

From c7f8f6ea61c24b03937a9d46f908a72828cd32b0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 18 May 2020 16:08:56 -0700
Subject: [PATCH 0139/1407] forgotten import

---
 IPython/external/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/external/__init__.py b/IPython/external/__init__.py
index b38110f1d91..eedc338eb84 100644
--- a/IPython/external/__init__.py
+++ b/IPython/external/__init__.py
@@ -2,4 +2,6 @@
 This package contains all third-party modules bundled with IPython.
 """
 
+from typing import List
+
 __all__: List[str] = []

From a0803825aa518ce7f39a81d287822a0cb7e4d12c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 18 May 2020 20:02:13 -0700
Subject: [PATCH 0140/1407] Remove deprecated and ignored travis.ci keys

If you head to any success ding build and look at the config tab. travis
issue a few warnings that the sudo keys have no effect, and that
skip_cleanup is deprecated and replaced by "cleanup"
---
 .travis.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8441023b9e1..e515c977892 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,6 @@ addons:
 python:
     - 3.6
 
-sudo: false
-
 env:
   global:
     - PATH=$TRAVIS_BUILD_DIR/pandoc:$PATH
@@ -71,20 +69,16 @@ matrix:
     - arch: amd64
       python: "3.7"
       dist: xenial
-      sudo: true
     - arch: amd64
       python: "3.8"
       dist: xenial
-      sudo: true
     - arch: amd64
       python: "nightly"
       dist: xenial
-      sudo: true
     - arch: arm64
       python: "nightly"
       dist: bionic
       env: ARM64=True
-      sudo: true
     - os: osx
       language: generic
       python: 3.6
@@ -107,7 +101,7 @@ deploy:
     secure: Y/Ae9tYs5aoBU8bDjN2YrwGG6tCbezj/h3Lcmtx8HQavSbBgXnhnZVRb2snOKD7auqnqjfT/7QMm4ZyKvaOEgyggGktKqEKYHC8KOZ7yp8I5/UMDtk6j9TnXpSqqBxPiud4MDV76SfRYEQiaDoG4tGGvSfPJ9KcNjKrNvSyyxns=
   file: dist/*
   file_glob: true
-  skip_cleanup: true
+  cleanup: false
   on:
     repo: ipython/ipython
     all_branches: true  # Backports are released from e.g. 5.x branch

From 3104cdc4e3e1f1644805c226a9f9ef2d94c693c1 Mon Sep 17 00:00:00 2001
From: Marcio Mazza <marciomazza@gmail.com>
Date: Tue, 19 May 2020 15:27:35 +0200
Subject: [PATCH 0141/1407] Fix broken link in docs

The target file was moved in prompt-toolkit
on the commit
https://github.com/prompt-toolkit/python-prompt-toolkit/commit/837609dd55162137ff7a177a8e293cb7a94f3980
---
 docs/source/config/details.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/config/details.rst b/docs/source/config/details.rst
index 6685b14d8f6..9e63232d81d 100644
--- a/docs/source/config/details.rst
+++ b/docs/source/config/details.rst
@@ -247,7 +247,7 @@ VI input mode to ``Normal`` when in insert mode::
 
 For more information on filters and what you can do with the ``event`` object,
 `see the prompt_toolkit docs
-<http://python-prompt-toolkit.readthedocs.io/en/latest/pages/building_prompts.html#adding-custom-key-bindings>`__.
+<https://python-prompt-toolkit.readthedocs.io/en/latest/pages/asking_for_input.html#adding-custom-key-bindings>`__.
 
 
 Enter to execute

From fe834bf4d310f9c25477caec593ef244d6d0339c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 22 May 2020 15:51:52 -0700
Subject: [PATCH 0142/1407] document ipython and ipykernel global configuration

---
 docs/source/config/intro.rst | 98 ++++++++++++++++++++++++++++++------
 1 file changed, 83 insertions(+), 15 deletions(-)

diff --git a/docs/source/config/intro.rst b/docs/source/config/intro.rst
index 115315c9ddb..97dc954881b 100644
--- a/docs/source/config/intro.rst
+++ b/docs/source/config/intro.rst
@@ -19,27 +19,29 @@ To create the blank config files, run::
     ipython profile create [profilename]
 
 If you leave out the profile name, the files will be created for the
-``default`` profile (see :ref:`profiles`). These will typically be
-located in :file:`~/.ipython/profile_default/`, and will be named
-:file:`ipython_config.py`, :file:`ipython_notebook_config.py`, etc.
-The settings in :file:`ipython_config.py` apply to all IPython commands.
+``default`` profile (see :ref:`profiles`). These will typically be located in
+:file:`~/.ipython/profile_default/`, and will be named
+:file:`ipython_config.py`, for hitorical reasons you may also find fiels
+named with IPytho nprefix instead of Jupyter:
+:file:`ipython_notebook_config.py`, etc. The settings in
+:file:`ipython_config.py` apply to all IPython commands.
 
-The files typically start by getting the root config object::
-
-    c = get_config()
+by default, configuration files are fully featured Python scripts that can
+execute arbitrary code, the main usage is to set value on the config object
+``c`` which exist in your configuration file.
 
 You can then configure class attributes like this::
 
     c.InteractiveShell.automagic = False
 
 Be careful with spelling--incorrect names will simply be ignored, with
-no error.
+no error. 
 
-To add to a collection which may have already been defined elsewhere,
-you can use methods like those found on lists, dicts and sets: append,
-extend, :meth:`~traitlets.config.LazyConfigValue.prepend` (like
-extend, but at the front), add and update (which works both for dicts
-and sets)::
+To add to a collection which may have already been defined elsewhere or have
+default values, you can use methods like those found on lists, dicts and
+sets: append, extend, :meth:`~traitlets.config.LazyConfigValue.prepend` (like
+extend, but at the front), add and update (which works both for dicts and
+sets)::
 
     c.InteractiveShellApp.extensions.append('Cython')
 
@@ -52,7 +54,6 @@ Example config file
 ::
 
     # sample ipython_config.py
-    c = get_config()
 
     c.TerminalIPythonApp.display_banner = True
     c.InteractiveShellApp.log_level = 20
@@ -78,6 +79,38 @@ Example config file
      ('la', 'ls -al')
     ]
 
+Json Configuration files
+------------------------
+
+in case where executability of configuration can be problematic, or
+configurations need to be modified programatically, IPython also support a
+limited set of functionalities via ``.json`` config files. 
+
+You can defined most of the configuration options via a json object which
+hierarchy represent the value you woudl normally set on the ``c`` object of
+``.py`` configuration files. The following ``ipython_config.json`` file::
+
+    {
+        "InteractiveShell": {
+            "colors": "LightBG",
+            "editor": "nano"
+        },
+        "InteractiveShellApp": {
+            "extensions": [
+                "myextension"
+            ]
+        }
+    }
+
+Is equivalent to the following ``ipython_config.py``::
+
+    c.InteractiveShellApp.extensions = [
+        'myextension'
+    ]
+
+    c.InteractiveShell.colors = 'LightBG'
+    c.InteractiveShell.editor = 'nano'
+
 
 Command line arguments
 ----------------------
@@ -94,7 +127,7 @@ Many frequently used options have short aliases and flags, such as
 To see all of these abbreviated options, run::
 
     ipython --help
-    ipython notebook --help
+    jupyter notebook --help
     # etc.
 
 Options specified at the command line, in either format, override
@@ -163,3 +196,38 @@ the directory :file:`~/.ipython/` by default.
 
 To see where IPython is looking for the IPython directory, use the command
 ``ipython locate``, or the Python function :func:`IPython.paths.get_ipython_dir`.
+
+
+Systemwide configuration
+========================
+
+It can be usefull to deploy systemwide ipython or ipykernel configuration
+when managing environment for many users. At startup time IPython and
+IPykernel will search for configuration file in multiple systemwide
+locations, mainly:
+
+  - ``/etc/ipython/``
+  - ``/usr/local/etc/ipython/``
+
+When the global install is a standalone python distribution it may also
+search in distribution specific location, for example:
+
+  - ``$ANACONDA_LOCATION/etc/ipython/``
+
+In those locations, Terminal IPython will look for a file called
+``ipython_config.py`` and ``ipython_config.json``, ipykernel will look for
+``ipython_kernel_config.py`` and ``ipython_kernel.json``.
+
+Configuration files are loaded in order and merged with configuration on
+later locatoin taking precedence on earlier locations (that is to say a user
+can overwrite a systemwide configuration option).
+
+You can see all locations in which IPython is looking for configuration files
+by starting ipython in debug mode::
+
+    $ ipython --debug -c 'exit()'
+
+Identically with ipykernel though the command is currently blocking until
+this process is killed with ``Ctrl-\``::
+ 
+    $ python -m ipykernel --debug
\ No newline at end of file

From 45bd2aa96f2560b4203e990dbff2e076eb1cc54e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 23 May 2020 14:43:08 -0700
Subject: [PATCH 0143/1407] try to fix build on readthedocs

---
 docs/environment.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/environment.yml b/docs/environment.yml
index 82388cfcd97..d24ae3129dc 100644
--- a/docs/environment.yml
+++ b/docs/environment.yml
@@ -1,6 +1,6 @@
 name: ipython_docs
 dependencies:
-- python=3.6
+- python=3.8
 - setuptools>=18.5
 - sphinx>=1.8
 - sphinx_rtd_theme
@@ -8,8 +8,8 @@ dependencies:
 - nose
 - testpath
 - matplotlib
-- stack_data
 - pip:
     - docrepr
     - prompt_toolkit
     - ipykernel
+    - stack_data

From 2eb0afe814064168e094e6cfc75312589724171e Mon Sep 17 00:00:00 2001
From: Matt Wozniski <godlygeek@gmail.com>
Date: Sun, 24 May 2020 01:07:04 -0400
Subject: [PATCH 0144/1407] DOC: Fix --matplotlib class name

---
 docs/source/interactive/reference.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/interactive/reference.rst b/docs/source/interactive/reference.rst
index ccd37733252..e89fec4d6e5 100644
--- a/docs/source/interactive/reference.rst
+++ b/docs/source/interactive/reference.rst
@@ -54,7 +54,7 @@ Indicate that the following::
 
 is equivalent to::
 
-   $ ipython --TerminalIPythonApp.matplotlib='qt'
+   $ ipython --InteractiveShellApp.matplotlib='qt'
 
 Note that in the second form, you *must* use the equal sign, as the expression
 is evaluated as an actual Python assignment.  While in the above example the

From b415502172c72142095ad05040cd2c3a8d78faf6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 25 May 2020 16:46:01 -0700
Subject: [PATCH 0145/1407] Better documentation for `space_for_menu`.

---
 IPython/terminal/interactiveshell.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 7f18ac2d6bd..b3bb5777450 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -102,7 +102,11 @@ class TerminalInteractiveShell(InteractiveShell):
     mime_renderers = Dict().tag(config=True)
 
     space_for_menu = Integer(6, help='Number of line at the bottom of the screen '
-                                     'to reserve for the completion menu'
+                                     'to reserve for the tab completion menu, '
+                                     'search history, ...etc, the height of '
+                                     'these menus will at most this value. '
+                                     'Increase it is you prefer long and skinny '
+                                     'menus, decrease for short and wide.'
                             ).tag(config=True)
 
     pt_app = None

From 6c057bff8f70edd2905ec9f0cb11e2e26a9b4585 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 25 May 2020 16:46:44 -0700
Subject: [PATCH 0146/1407] Fix auto formatting to be called only once.

There seem to be a small race-condition when trying to reformat the text
twice in a short amount of time where some of the non-changed test
diapear. For example

    async def b():pass

Lead to two reformatting where one does not see the `async` keyword
anymore., and would thus dedent the def by 1 space.
---
 IPython/terminal/shortcuts.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 24224d4f804..a23fa091a0e 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -130,8 +130,10 @@ def newline_or_execute(event):
         # if all we have after the cursor is whitespace: reformat current text
         # before cursor
         after_cursor = d.text[d.cursor_position:]
+        reformatted = False
         if not after_cursor.strip():
             reformat_text_before_cursor(b, d, shell)
+            reformatted = True
         if not (d.on_last_line or
                 d.cursor_position_row >= d.line_count - d.empty_line_count_at_the_end()
                 ):
@@ -142,7 +144,8 @@ def newline_or_execute(event):
             return
 
         if (status != 'incomplete') and b.accept_handler:
-            reformat_text_before_cursor(b, d, shell)
+            if not reformatted:
+                reformat_text_before_cursor(b, d, shell)
             b.validate_and_handle()
         else:
             if shell.autoindent:

From eaef217c2584a84850a7f159d8bbd74dae272339 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 26 May 2020 07:54:47 -0700
Subject: [PATCH 0147/1407] docs typoes

---
 docs/source/config/intro.rst | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/source/config/intro.rst b/docs/source/config/intro.rst
index 97dc954881b..6dccde1348c 100644
--- a/docs/source/config/intro.rst
+++ b/docs/source/config/intro.rst
@@ -11,24 +11,24 @@ Many of IPython's classes have configurable attributes (see
 :doc:`options/index` for the list). These can be
 configured in several ways.
 
-Python config files
--------------------
+Python configuration files
+--------------------------
 
-To create the blank config files, run::
+To create the blank configuration files, run::
 
     ipython profile create [profilename]
 
 If you leave out the profile name, the files will be created for the
 ``default`` profile (see :ref:`profiles`). These will typically be located in
 :file:`~/.ipython/profile_default/`, and will be named
-:file:`ipython_config.py`, for hitorical reasons you may also find fiels
-named with IPytho nprefix instead of Jupyter:
+:file:`ipython_config.py`, for historical reasons you may also find files
+named with IPython prefix instead of Jupyter:
 :file:`ipython_notebook_config.py`, etc. The settings in
 :file:`ipython_config.py` apply to all IPython commands.
 
-by default, configuration files are fully featured Python scripts that can
-execute arbitrary code, the main usage is to set value on the config object
-``c`` which exist in your configuration file.
+By default, configuration files are fully featured Python scripts that can
+execute arbitrary code, the main usage is to set value on the configuration
+object ``c`` which exist in your configuration file.
 
 You can then configure class attributes like this::
 
@@ -48,8 +48,8 @@ sets)::
 .. versionadded:: 2.0
    list, dict and set methods for config values
 
-Example config file
-```````````````````
+Example configuration file
+``````````````````````````
 
 ::
 
@@ -79,15 +79,15 @@ Example config file
      ('la', 'ls -al')
     ]
 
-Json Configuration files
+JSON Configuration files
 ------------------------
 
-in case where executability of configuration can be problematic, or
-configurations need to be modified programatically, IPython also support a
-limited set of functionalities via ``.json`` config files. 
+In case where executability of configuration can be problematic, or
+configurations need to be modified programmatically, IPython also support a
+limited set of functionalities via ``.json`` configuration files. 
 
 You can defined most of the configuration options via a json object which
-hierarchy represent the value you woudl normally set on the ``c`` object of
+hierarchy represent the value you would normally set on the ``c`` object of
 ``.py`` configuration files. The following ``ipython_config.json`` file::
 
     {
@@ -201,7 +201,7 @@ To see where IPython is looking for the IPython directory, use the command
 Systemwide configuration
 ========================
 
-It can be usefull to deploy systemwide ipython or ipykernel configuration
+It can be useful to deploy systemwide ipython or ipykernel configuration
 when managing environment for many users. At startup time IPython and
 IPykernel will search for configuration file in multiple systemwide
 locations, mainly:
@@ -219,7 +219,7 @@ In those locations, Terminal IPython will look for a file called
 ``ipython_kernel_config.py`` and ``ipython_kernel.json``.
 
 Configuration files are loaded in order and merged with configuration on
-later locatoin taking precedence on earlier locations (that is to say a user
+later location taking precedence on earlier locations (that is to say a user
 can overwrite a systemwide configuration option).
 
 You can see all locations in which IPython is looking for configuration files
@@ -230,4 +230,4 @@ by starting ipython in debug mode::
 Identically with ipykernel though the command is currently blocking until
 this process is killed with ``Ctrl-\``::
  
-    $ python -m ipykernel --debug
\ No newline at end of file
+    $ python -m ipykernel --debug

From 65bdbea9b8757b368dc7ed75a76157e3bc0f678a Mon Sep 17 00:00:00 2001
From: Bartosz Telenczuk <bartosz@telenczuk.pl>
Date: Wed, 27 May 2020 17:06:53 +0200
Subject: [PATCH 0148/1407] rename deprected magic method -> run_line_magic

---
 IPython/core/magics/osm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index ddc9b6f5874..c43bf687255 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -498,7 +498,7 @@ def pushd(self, parameter_s=''):
         if tgt:
             self.cd(parameter_s)
         dir_s.insert(0,cwd)
-        return self.shell.magic('dirs')
+        return self.shell.run_line_magic('dirs', '')
 
     @line_magic
     def popd(self, parameter_s=''):

From 3f0a22c207ed403edd659dc8aaf529a3e4f86c5e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 27 May 2020 16:46:19 -0700
Subject: [PATCH 0149/1407] start whatsnew 7.15

---
 docs/source/whatsnew/version7.rst | 42 +++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index f68c8101404..f050d00f60e 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,48 @@
  7.x Series
 ============
 
+.. _version 715:
+
+IPython 7.15
+============
+
+IPython 7.15 brings a number of bug fixes and user facing improvements.
+
+Noticeable changes:
+-------------------
+
+ - Long completion name have better elision in terminal :ghpull:`12284`
+ - We've started to test on Python 3.9 :ghpull:`12307` and fix some errors.
+ - Hi DPI scaling of figures when using qt eventloop :ghpull:`12314`
+ - Document the ability to have systemwide configuration for IPython.
+   :ghpull:`12328`
+ - Fix issues with input autoformatting :ghpull:`12336`
+
+
+Highlighted features
+--------------------
+
+Increase Tab Completion Menu Height
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In terminal IPython it is possible to increase the hight of the tab-completion
+menu. To do so set the value of
+:configtrait:`TerminalInteractiveShell.space_for_menu`, this will reserve more
+space at the bottom of the screen for various kind of menus in IPython including
+tab completion and searching in history. 
+
+Autoformat Code in the terminal
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you have a preferred code formatter, you can configure IPython to
+reformat your code. Set the value of
+:configtrait:`TerminalInteractiveShell.autoformatter` to for example ``'black'``
+and IPython will auto format your code when possible.
+
+
+
+
+
 .. _version 714:
 
 IPython 7.14

From 799e364240be645cd46167a10ef07d6aa7941b70 Mon Sep 17 00:00:00 2001
From: Blake Griffin <blakejgriffin@gmail.com>
Date: Tue, 26 May 2020 13:49:17 -0700
Subject: [PATCH 0150/1407] Fixed bug on windows where relative image path has
 wrong direction slashes

---
 IPython/sphinxext/ipython_directive.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/sphinxext/ipython_directive.py b/IPython/sphinxext/ipython_directive.py
index 0481624c42c..3d5b3768230 100644
--- a/IPython/sphinxext/ipython_directive.py
+++ b/IPython/sphinxext/ipython_directive.py
@@ -419,8 +419,8 @@ def process_image(self, decorator):
         # insert relative path to image file in source 
         # as absolute path for Sphinx
         # sphinx expects a posix path, even on Windows
-        posix_path = pathlib.Path(savefig_dir,filename).as_posix()
-        outfile = '/' + os.path.relpath(posix_path, source_dir)
+        path = pathlib.Path(savefig_dir, filename)
+        outfile = '/' + path.relative_to(source_dir).as_posix()
 
         imagerows = ['.. image:: %s' % outfile]
 

From 36ef3227590dd70541a2d3946c2d54e1ab606827 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 25 Sep 2017 13:50:29 -0700
Subject: [PATCH 0151/1407] Update the release process to attempt reproducible
 builds.

This include some refactoring of the current scripts as well as the
introduction of a script to repack the tar.gz in order to remove a
couple of artifact the build environment. Mostly timestamps, extra
files, and groups ownership of files.
---
 docs/source/coredev/index.rst | 17 ++++++++++
 setup.py                      |  2 +-
 tools/build_release           |  8 ++---
 tools/make_tarball.py         |  1 -
 tools/release                 |  5 +--
 tools/release_helper.sh       | 37 ++++++++++++++++-----
 tools/retar.py                | 60 +++++++++++++++++++++++++++++++++++
 7 files changed, 110 insertions(+), 20 deletions(-)
 create mode 100644 tools/retar.py

diff --git a/docs/source/coredev/index.rst b/docs/source/coredev/index.rst
index 60f1cb0fdfd..ee1eadb9b1e 100644
--- a/docs/source/coredev/index.rst
+++ b/docs/source/coredev/index.rst
@@ -80,6 +80,13 @@ for the release you are actually making::
     VERSION=5.0.0
     BRANCH=master
 
+For `reproducibility of builds <https://reproducible-builds.org/specs/source-date-epoch/>`_,
+we recommend setting ``SOURCE_DATE_EPOCH`` prior to running the build; record the used value
+of ``SOURCE_DATE_EPOCH`` as it may not be available from build artifact. You
+should be able to use ``date +%s`` to get a formatted timestamp::
+
+    SOURCE_DATE_EPOCH=$(date +%s)
+
 
 2. Create GitHub stats and finish release note
 ----------------------------------------------
@@ -229,6 +236,16 @@ uploading them to PyPI. We do not use an universal wheel as each wheel
 installs an ``ipython2`` or ``ipython3`` script, depending on the version of
 Python it is built for. Using an universal wheel would prevent this.
 
+Check the shasum of files with::
+
+    shasum -a 256 dist/*
+
+and takes notes of them you might need them to update the conda-forge recipes.
+Rerun the command and check the hash have not changed::
+
+    ./tools/release
+    shasum -a 256 dist/*
+
 Use the following to actually upload the result of the build::
 
     ./tools/release upload
diff --git a/setup.py b/setup.py
index 9ec67cb7c8e..29d7260b04b 100755
--- a/setup.py
+++ b/setup.py
@@ -224,7 +224,7 @@
 for key, deps in extras_require.items():
     if ':' not in key:
         everything.update(deps)
-extras_require['all'] = everything
+extras_require['all'] = list(sorted(everything))
 
 if 'setuptools' in sys.modules:
     setuptools_extra_args['python_requires'] = '>=3.6'
diff --git a/tools/build_release b/tools/build_release
index 26dc9ec874a..51fd87d54d9 100755
--- a/tools/build_release
+++ b/tools/build_release
@@ -2,6 +2,7 @@
 """IPython release build script.
 """
 import os
+import sys
 from shutil import rmtree
 
 from toollib import sh, pjoin, get_ipdir, cd, sdists, buildwheels
@@ -12,15 +13,10 @@ def build_release():
     ipdir = get_ipdir()
     cd(ipdir)
 
-    # Cleanup
-    for d in ['build', 'dist', pjoin('docs', 'build'), pjoin('docs', 'dist'),
-              pjoin('docs', 'source', 'api', 'generated')]:
-        if os.path.isdir(d):
-            rmtree(d)
-
     # Build source and binary distros
     sh(sdists)
     buildwheels()
+    sh(' '.join([sys.executable, 'tools/retar.py', 'dist/*.gz']))
 
 if __name__ == '__main__':
     build_release()
diff --git a/tools/make_tarball.py b/tools/make_tarball.py
index bdce25ba804..fb639f61f61 100755
--- a/tools/make_tarball.py
+++ b/tools/make_tarball.py
@@ -3,7 +3,6 @@
 """
 
 import subprocess
-import os
 
 from toollib import cd, sh
 
diff --git a/tools/release b/tools/release
index 5c8686b3145..2de8e120070 100755
--- a/tools/release
+++ b/tools/release
@@ -81,13 +81,10 @@ else:
     sh('mv ipython-*.tgz %s' % ipbackupdir)
 
     # Build release files
-    sh('./build_release %s' % ipdir)
+    sh('./build_release')
 
     cd(ipdir)
 
-    # Upload all files
-    sh(sdists)
-
     buildwheels()
     print("`./release upload` to upload source distribution on PyPI and ipython archive")
     sys.exit(0)
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 7489c16d756..6e2e8bf201a 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -98,12 +98,6 @@ then
 
 fi
 
-echo
-echo $BLUE"Attempting to build package..."$NOR
-
-tools/build_release
-rm dist/*
-
 if ask_section "Should we commit, tag, push... etc ? "
 then
    echo
@@ -160,14 +154,41 @@ fi
 
 if ask_section "Should we build and release ?"
 then
+    
+    echo $BLUE"going to set SOURCE_DATE_EPOCH"$NOR
+    echo $BLUE'export SOURCE_DATE_EPOCH=$(git show -s --format=%ct HEAD)'$NOR
+    echo $GREEN"Press enter to continue"$NOR
+    read
+
+    export SOURCE_DATE_EPOCH=$(git show -s --format=%ct HEAD)
+
+    echo $BLUE"SOURCE_DATE_EPOCH set to $SOURCE_DATE_EPOCH"$NOR
+    echo $GREEN"Press enter to continue"$NOR
+    read
+
+
+
+    echo
+    echo $BLUE"Attempting to build package..."$NOR
+
+    tools/release
+
+
+    echo $RED'$ shasum -a 256 dist/*'
+    shasum -a 256 dist/*
+    echo $NOR
+
+    echo $BLUE"We are going to rebuild, node the hash above, and compare them to the rebuild"$NOR
+    echo $GREEN"Press enter to continue"$NOR
+    read
 
     echo
     echo $BLUE"Attempting to build package..."$NOR
 
     tools/release
 
-    echo $RED
-    echo '$ shasum -a 256 dist/*'
+    echo $RED"Check the shasum for SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH"
+    echo $RED'$ shasum -a 256 dist/*'
     shasum -a 256 dist/*
     echo $NOR
 
diff --git a/tools/retar.py b/tools/retar.py
new file mode 100644
index 00000000000..dbdca0ed7f5
--- /dev/null
+++ b/tools/retar.py
@@ -0,0 +1,60 @@
+"""
+Un-targz and retargz a targz file to ensure reproducible build. 
+
+usage: 
+
+    $ export SOURCE_DATE_EPOCH=$(date +%s)
+    ...
+    $ python retar.py <tarfile.gz>
+
+The process of creating an sdist can be non-reproducible:
+  - directory created during the process get a mtime of the creation date; 
+  - gziping files embed the timestamp of fo zip creation. 
+
+This will untar-retar; ensuring that all mtime > SOURCE_DATE_EPOCH will be set
+equal to SOURCE_DATE_EPOCH.
+
+"""
+
+import tarfile
+import sys
+import os
+import gzip
+import io
+
+if len(sys.argv) > 2:
+    raise ValueError("Too many arguments")
+
+
+timestamp = int(os.environ["SOURCE_DATE_EPOCH"])
+
+old_buf = io.BytesIO()
+with open(sys.argv[1], "rb") as f:
+    old_buf.write(f.read())
+old_buf.seek(0)
+old = tarfile.open(fileobj=old_buf, mode="r:gz")
+
+buf = io.BytesIO()
+new = tarfile.open(fileobj=buf, mode="w", format=tarfile.GNU_FORMAT)
+for i, m in enumerate(old):
+    data = None
+    # mutation does not work, copy
+    if m.name.endswith('.DS_Store'):
+        continue
+    m2 = tarfile.TarInfo(m.name)
+    m2.mtime = min(timestamp, m.mtime)
+    m2.size = m.size
+    m2.type = m.type
+    m2.linkname = m.linkname
+    if m.isdir():
+        data = old.extractfile(m)
+        new.addfile(m2, data)
+    else:
+        new.addfile(m2)
+new.close()
+old.close()
+
+buf.seek(0)
+with open(sys.argv[1], "wb") as f:
+    with gzip.GzipFile('', "wb", fileobj=f, mtime=timestamp) as gzf:
+        gzf.write(buf.read())

From 78e57282377002eff680d6cc8de1649882acd2d7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 28 May 2020 22:57:06 -0700
Subject: [PATCH 0152/1407] whats new

---
 docs/source/whatsnew/version7.rst | 42 ++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index f050d00f60e..58f033c8764 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -13,16 +13,53 @@ Noticeable changes:
 -------------------
 
  - Long completion name have better elision in terminal :ghpull:`12284`
- - We've started to test on Python 3.9 :ghpull:`12307` and fix some errors.
+ - I've started to test on Python 3.9 :ghpull:`12307` and fix some errors.
  - Hi DPI scaling of figures when using qt eventloop :ghpull:`12314`
  - Document the ability to have systemwide configuration for IPython.
    :ghpull:`12328`
  - Fix issues with input autoformatting :ghpull:`12336`
 
+Reproducible Build
+------------------
+
+Starting with IPython 7.15 I am attempting to provide reproducible builds,
+that is to say you should be able from the source tree to generate an sdist
+and wheel that are identical byte for byte with the publish version on PyPI.
+
+I've only tested on a couple of machines so far and the process is relatively
+straightforward, so this mean that IPython not only have a deterministic build
+process, but also I have either removed, or put under control all effects of
+the build environments on the final artifact.  I encourage you to attempt the
+build process on your machine as documented in :ref:`core_developer_guide`
+and let me know if you do not obtain an identical artifact.
+
+While reproducible builds is critical to check that the supply chain of (open
+source) software has not been compromised, it can also help to speedup many
+of the build processes in large environment (conda, apt...) by allowing
+better caching of intermediate build steps.
+
+Learn more on `<https://reproducible-builds.org/>`_. `Reflections on trusting
+trust <https://dl.acm.org/doi/10.1145/358198.358210>`_ is also one of the
+cornerstone and recommended reads on this subject.
+
+.. note::
+
+   The build commit from which the sdist is generated is also `signed
+   <https://en.wikipedia.org/wiki/Digital_signature>`_, so you should be able to
+   check it has not been compromised, and the git repository is a `merkle-tree
+   <https://en.wikipedia.org/wiki/Merkle_tree>`_, you can check the consistency
+   with `git-fsck <https://git-scm.com/docs/git-fsck>`_ which you likely `want
+   to enable by default
+   <https://gist.github.com/mbbx6spp/14b86437e794bffb4120>`_.
+
 
 Highlighted features
 --------------------
 
+Highlighted features are not new, but seem to not be widely known, this
+section will help you discover in more narrative form what you can do with
+IPython.
+
 Increase Tab Completion Menu Height
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -41,9 +78,6 @@ reformat your code. Set the value of
 and IPython will auto format your code when possible.
 
 
-
-
-
 .. _version 714:
 
 IPython 7.14

From 5a9e14285ae086bff8429d6fe50de2e48fe5ea16 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 May 2020 09:39:55 -0700
Subject: [PATCH 0153/1407] warn drop 3.6

---
 docs/source/whatsnew/version7.rst | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 58f033c8764..c35a4651904 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -9,8 +9,8 @@ IPython 7.15
 
 IPython 7.15 brings a number of bug fixes and user facing improvements.
 
-Noticeable changes:
--------------------
+Misc Noticeable changes:
+------------------------
 
  - Long completion name have better elision in terminal :ghpull:`12284`
  - I've started to test on Python 3.9 :ghpull:`12307` and fix some errors.
@@ -22,7 +22,7 @@ Noticeable changes:
 Reproducible Build
 ------------------
 
-Starting with IPython 7.15 I am attempting to provide reproducible builds,
+Starting with IPython 7.15, I am attempting to provide reproducible builds,
 that is to say you should be able from the source tree to generate an sdist
 and wheel that are identical byte for byte with the publish version on PyPI.
 
@@ -52,6 +52,14 @@ cornerstone and recommended reads on this subject.
    to enable by default
    <https://gist.github.com/mbbx6spp/14b86437e794bffb4120>`_.
 
+NEP29: Last version to support Python 3.6
+-----------------------------------------
+
+IPython 7.15 will be the Last IPython version to officially support Python
+3.6, as stated by `NumPy Enhancement Proposal 29
+<https://numpy.org/neps/nep-0029-deprecation_policy.html>`_. Starting with
+next minor version of IPython I may stop testing on Python 3.6 and may stop
+publishing release artifacts that install on Python 3.6
 
 Highlighted features
 --------------------

From 330dd3fe930fa9ad4744163121eda537a1a6e9a4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 25 May 2020 20:09:05 -0700
Subject: [PATCH 0154/1407] Add instruction to list the API changes.

this uses frappuccino which is still in developpement.
---
 tools/release_helper.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 7489c16d756..6295946340e 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -81,6 +81,21 @@ then
 
 fi
 
+if ask_section "Generate API difference (using frapuccino)"
+then
+    echo $BLUE"Checking out $PREV_RELEASE"$NOR
+    git checkout $PREV_RELEASE
+    echo $BLUE"Saving API to file $PREV_RELEASE"$NOR
+    frappuccino IPython --save IPython-$PREV_RELEASE.json
+    echo $BLUE"comming back to $BRANCH"$NOR
+    git checkout $BRANCH
+    echo $BLUE"comparing ..."$NOR
+    frappuccino IPython --compare IPython-$PREV_RELEASE.json
+    echo $GREEN"Use the above guideline to write an API changelog ..."$NOR
+    echo $GREEN"Press any keys to continue"$NOR
+    read
+fi
+
 echo "Cleaning repository"
 git clean -xfdi
 

From 5deaea9f1b3d341201b03040ed5c37f7f0ee6218 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 May 2020 13:03:25 -0700
Subject: [PATCH 0155/1407] Update with forgotten 7.14 release notes.

---
 docs/source/whatsnew/development.rst              |  1 +
 .../source/whatsnew/pr/interruptible-debugger.rst |  4 ----
 .../whatsnew/pr/video-display-attributes.rst      |  4 ----
 docs/source/whatsnew/version7.rst                 | 15 +++++++++++++++
 4 files changed, 16 insertions(+), 8 deletions(-)
 delete mode 100644 docs/source/whatsnew/pr/interruptible-debugger.rst
 delete mode 100644 docs/source/whatsnew/pr/video-display-attributes.rst

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 99821d1105c..f2bde112f66 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -22,6 +22,7 @@ Need to be updated:
 
    pr/*
 
+
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 
 As a reminder, IPython master has diverged from the 7.x branch, thus master may
diff --git a/docs/source/whatsnew/pr/interruptible-debugger.rst b/docs/source/whatsnew/pr/interruptible-debugger.rst
deleted file mode 100644
index f501b3476b8..00000000000
--- a/docs/source/whatsnew/pr/interruptible-debugger.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-IPython.core.debugger.Pdb is now interruptible
-==============================================
-
-A ``KeyboardInterrupt`` will now interrupt IPython's extended debugger, in order to make Jupyter able to interrupt it.
diff --git a/docs/source/whatsnew/pr/video-display-attributes.rst b/docs/source/whatsnew/pr/video-display-attributes.rst
deleted file mode 100644
index 1e7434e895d..00000000000
--- a/docs/source/whatsnew/pr/video-display-attributes.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Video HTML attributes
-=====================
-
-Add an option to `IPython.display.Video` to change the attributes of the HTML display of the video.
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index c35a4651904..3d9abc96f6f 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -18,6 +18,10 @@ Misc Noticeable changes:
  - Document the ability to have systemwide configuration for IPython.
    :ghpull:`12328`
  - Fix issues with input autoformatting :ghpull:`12336`
+ - ``IPython.core.debugger.Pdb`` is now interruptible (:ghpull:`12168`, in 7.14
+   but forgotten in release notes)
+ - Video HTML attributes (:ghpull:`12212`, in 7.14 but forgotten in release
+   notes)
 
 Reproducible Build
 ------------------
@@ -109,6 +113,17 @@ Misc Changes
  - add extra options to the ``Video`` Rich objects :ghpull:`12212`
  - add pretty-printing to ``SimpleNamespace`` :ghpull:`12230`
 
+IPython.core.debugger.Pdb is now interruptible
+----------------------------------------------
+
+A ``KeyboardInterrupt`` will now interrupt IPython's extended debugger, in order to make Jupyter able to interrupt it. (:ghpull:`12168`)
+
+Video HTML attributes
+---------------------
+
+Add an option to `IPython.display.Video` to change the attributes of the HTML display of the video (:ghpull:`12212`)
+
+
 Pending deprecated imports
 --------------------------
 

From 798dbb53b74f4dcd027bb99e0c695e1fc74e1782 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 May 2020 15:35:16 -0700
Subject: [PATCH 0156/1407] stats 7.14

---
 docs/source/whatsnew/github-stats-7.rst | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index 91955bb2afa..5bdf97a26dd 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -1,7 +1,26 @@
 Issues closed in the 7.x development cycle
 ==========================================
 
-Issues closed in 8.12
+Issues closed in 7.15
+---------------------
+
+GitHub stats for 2020/05/01 - 2020/05/29 (tag: 7.14.0)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 1 issues and merged 29 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A7.15>`__
+
+The following 6 authors contributed 31 commits.
+
+* Blake Griffin
+* Inception95
+* Marcio Mazza
+* Matthias Bussonnier
+* Talley Lambert
+* Thomas
+
+Issues closed in 7.14
 ---------------------
 
 

From 5825acfcd7c46cae3eef924aa48a44a132b50e59 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 May 2020 15:36:41 -0700
Subject: [PATCH 0157/1407] fport 7.x stats

---
 docs/source/whatsnew/github-stats-7.rst | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index 5bdf97a26dd..a1025969b00 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -23,6 +23,29 @@ The following 6 authors contributed 31 commits.
 Issues closed in 7.14
 ---------------------
 
+GitHub stats for 2020/02/29 - 2020/05/01 (tag: 7.13.0)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 0 issues and merged 30 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A7.14>`__
+
+The following 10 authors contributed 47 commits.
+
+* Eric Wieser
+* foobarbyte
+* Ian Castleden
+* Itamar Turner-Trauring
+* Lumir Balhar
+* Markus Wageringel
+* Matthias Bussonnier
+* Matthieu Ancellin
+* Quentin Peter
+* Theo Ouzhinski
+
+Issues closed in 7.13
+---------------------
+
 
 GitHub stats for 2020/02/01 - 2020/02/28 (tag: 7.12.0)
 

From 999d03f97c2f217262dc25924bf7640f95c12e52 Mon Sep 17 00:00:00 2001
From: Talley Lambert <talley.lambert@gmail.com>
Date: Sun, 31 May 2020 15:36:03 -0400
Subject: [PATCH 0158/1407] fix notifier.activated connection

---
 IPython/terminal/pt_inputhooks/qt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/terminal/pt_inputhooks/qt.py b/IPython/terminal/pt_inputhooks/qt.py
index 1504c3bde72..9f5e1b41dcd 100644
--- a/IPython/terminal/pt_inputhooks/qt.py
+++ b/IPython/terminal/pt_inputhooks/qt.py
@@ -45,7 +45,7 @@ def inputhook(context):
                                           QtCore.QSocketNotifier.Read)
         try:
             # connect the callback we care about before we turn it on
-            notifier.activated.connect(event_loop.exit)
+            notifier.activated.connect(lambda: event_loop.exit())
             notifier.setEnabled(True)
             # only start the event loop we are not already flipped
             if not context.input_is_ready():

From 173e606b08c2d71318692ba61ac96b2cccdf25d7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 May 2020 16:37:00 -0700
Subject: [PATCH 0159/1407] Fix retaring process for twine.

Also check the failing function works
---
 tools/retar.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/retar.py b/tools/retar.py
index dbdca0ed7f5..9b5e73c6baa 100644
--- a/tools/retar.py
+++ b/tools/retar.py
@@ -47,10 +47,10 @@
     m2.type = m.type
     m2.linkname = m.linkname
     if m.isdir():
+        new.addfile(m2)
+    else:
         data = old.extractfile(m)
         new.addfile(m2, data)
-    else:
-        new.addfile(m2)
 new.close()
 old.close()
 
@@ -58,3 +58,7 @@
 with open(sys.argv[1], "wb") as f:
     with gzip.GzipFile('', "wb", fileobj=f, mtime=timestamp) as gzf:
         gzf.write(buf.read())
+
+# checks the archive is valid.
+archive = tarfile.open(sys.argv[1])
+names = archive.getnames()

From 5b5ac9494ccd8b7223232b8c640fffb017071000 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Tue, 2 Jun 2020 15:07:05 +0200
Subject: [PATCH 0160/1407] use $SHELL in system_piped

we already use this in our call to subprocess.call in system_raw used in the terminal

this makes kernel behavior better match terminal IPython

For an example that used to be different:

    !wc -l <(pwd)

with `SHELL=bash`
---
 IPython/utils/_process_posix.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/IPython/utils/_process_posix.py b/IPython/utils/_process_posix.py
index f3f93f774d6..a11cad7697c 100644
--- a/IPython/utils/_process_posix.py
+++ b/IPython/utils/_process_posix.py
@@ -59,11 +59,12 @@ class ProcessHandler(object):
 
     @property
     def sh(self):
-        if self._sh is None:        
-            self._sh = pexpect.which('sh')
+        if self._sh is None:
+            shell_name = os.environ.get("SHELL", "sh")
+            self._sh = pexpect.which(shell_name)
             if self._sh is None:
-                raise OSError('"sh" shell not found')
-        
+                raise OSError('"{}" shell not found'.format(shell_name))
+
         return self._sh
 
     def __init__(self, logfile=None, read_timeout=None, terminate_timeout=None):

From 5367915956abb514038442ed29037374276f5a4e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 2 Jun 2020 16:27:42 -0700
Subject: [PATCH 0161/1407] Migrate some tests to pytest only, and start
 removing yield-tests.

---
 IPython/lib/tests/test_latextools.py | 98 ++++++++++++++--------------
 IPython/testing/iptest.py            |  5 +-
 2 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/IPython/lib/tests/test_latextools.py b/IPython/lib/tests/test_latextools.py
index 2cbdb17a844..419db421aa9 100644
--- a/IPython/lib/tests/test_latextools.py
+++ b/IPython/lib/tests/test_latextools.py
@@ -1,32 +1,26 @@
-# encoding: utf-8
 """Tests for IPython.utils.path.py"""
-
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
+
+from contextlib import contextmanager
 from unittest.mock import patch
+
 import nose.tools as nt
+import pytest
 
 from IPython.lib import latextools
 from IPython.testing.decorators import onlyif_cmds_exist, skipif_not_matplotlib
 from IPython.utils.process import FindCmdError
 
 
-def test_latex_to_png_dvipng_fails_when_no_cmd():
-    """
-    `latex_to_png_dvipng` should return None when there is no required command
-    """
-    for command in ['latex', 'dvipng']:
-        yield (check_latex_to_png_dvipng_fails_when_no_cmd, command)
-
-
-def check_latex_to_png_dvipng_fails_when_no_cmd(command):
+@pytest.mark.parametrize('command', ['latex', 'dvipng'])
+def test_check_latex_to_png_dvipng_fails_when_no_cmd(command):
     def mock_find_cmd(arg):
         if arg == command:
             raise FindCmdError
 
     with patch.object(latextools, "find_cmd", mock_find_cmd):
-        nt.assert_equal(latextools.latex_to_png_dvipng("whatever", True),
-                         None)
+        assert latextools.latex_to_png_dvipng("whatever", True) == None
 
 
 @onlyif_cmds_exist('latex', 'dvipng')
@@ -35,7 +29,7 @@ def test_latex_to_png_dvipng_runs():
     Test that latex_to_png_dvipng just runs without error.
     """
     def mock_kpsewhich(filename):
-        nt.assert_equal(filename, "breqn.sty")
+        assert filename == "breqn.sty"
         return None
 
     for (s, wrap) in [(u"$$x^2$$", False), (u"x^2", True)]:
@@ -44,25 +38,39 @@ def mock_kpsewhich(filename):
         with patch.object(latextools, "kpsewhich", mock_kpsewhich):
             yield (latextools.latex_to_png_dvipng, s, wrap)
 
-@skipif_not_matplotlib
-def test_latex_to_png_mpl_runs():
-    """
-    Test that latex_to_png_mpl just runs without error.
-    """
-    def mock_kpsewhich(filename):
-        nt.assert_equal(filename, "breqn.sty")
+
+@contextmanager
+def no_op(*args, **kwargs):
+    yield
+
+def mock_kpsewhich(filename):
+        assert filename == "breqn.sty"
         return None
 
-    for (s, wrap) in [("$x^2$", False), ("x^2", True)]:
-        yield (latextools.latex_to_png_mpl, s, wrap)
+@contextmanager
+def patch_latextool():
+    with patch.object(latextools, "kpsewhich", mock_kpsewhich):
+        yield
 
-        with patch.object(latextools, "kpsewhich", mock_kpsewhich):
-            yield (latextools.latex_to_png_mpl, s, wrap)
+@pytest.mark.parametrize('context', [no_op, patch_latextool])
+@pytest.mark.parametrize('s_wrap', [("$x^2$", False), ("x^2", True)])
+def test_latex_to_png_mpl_runs(s_wrap, context):
+    """
+    Test that latex_to_png_mpl just runs without error.
+    """
+    try:
+        import matplotbli
+    except ImportError:
+        pytest.skip("This needs matplotlib to be availlable")
+        return
+    s, wrap = s_wrap
+    with context():
+        latextools.latex_to_png_mpl(s, wrap)
 
 @skipif_not_matplotlib
 def test_latex_to_html():
     img = latextools.latex_to_html("$x^2$")
-    nt.assert_in("data:image/png;base64,iVBOR", img)
+    assert "data:image/png;base64,iVBOR" in img
 
 
 def test_genelatex_no_wrap():
@@ -74,9 +82,7 @@ def mock_kpsewhich(filename):
                        "(called with {0})".format(filename))
 
     with patch.object(latextools, "kpsewhich", mock_kpsewhich):
-        nt.assert_equal(
-            '\n'.join(latextools.genelatex("body text", False)),
-            r'''\documentclass{article}
+        assert '\n'.join(latextools.genelatex("body text", False)) == r'''\documentclass{article}
 \usepackage{amsmath}
 \usepackage{amsthm}
 \usepackage{amssymb}
@@ -84,7 +90,7 @@ def mock_kpsewhich(filename):
 \pagestyle{empty}
 \begin{document}
 body text
-\end{document}''')
+\end{document}'''
 
 
 def test_genelatex_wrap_with_breqn():
@@ -92,13 +98,11 @@ def test_genelatex_wrap_with_breqn():
     Test genelatex with wrap=True for the case breqn.sty is installed.
     """
     def mock_kpsewhich(filename):
-        nt.assert_equal(filename, "breqn.sty")
+        assert filename == "breqn.sty"
         return "path/to/breqn.sty"
 
     with patch.object(latextools, "kpsewhich", mock_kpsewhich):
-        nt.assert_equal(
-            '\n'.join(latextools.genelatex("x^2", True)),
-            r'''\documentclass{article}
+        assert '\n'.join(latextools.genelatex("x^2", True)) == r'''\documentclass{article}
 \usepackage{amsmath}
 \usepackage{amsthm}
 \usepackage{amssymb}
@@ -109,7 +113,7 @@ def mock_kpsewhich(filename):
 \begin{dmath*}
 x^2
 \end{dmath*}
-\end{document}''')
+\end{document}'''
 
 
 def test_genelatex_wrap_without_breqn():
@@ -117,13 +121,11 @@ def test_genelatex_wrap_without_breqn():
     Test genelatex with wrap=True for the case breqn.sty is not installed.
     """
     def mock_kpsewhich(filename):
-        nt.assert_equal(filename, "breqn.sty")
+        assert filename == "breqn.sty"
         return None
 
     with patch.object(latextools, "kpsewhich", mock_kpsewhich):
-        nt.assert_equal(
-            '\n'.join(latextools.genelatex("x^2", True)),
-            r'''\documentclass{article}
+        assert '\n'.join(latextools.genelatex("x^2", True)) == r'''\documentclass{article}
 \usepackage{amsmath}
 \usepackage{amsthm}
 \usepackage{amssymb}
@@ -131,7 +133,7 @@ def mock_kpsewhich(filename):
 \pagestyle{empty}
 \begin{document}
 $$x^2$$
-\end{document}''')
+\end{document}'''
 
 
 @skipif_not_matplotlib
@@ -146,28 +148,28 @@ def test_latex_to_png_color():
                                                color='#000000')
     dvipng_default = latextools.latex_to_png_dvipng(latex_string, False)
     dvipng_black = latextools.latex_to_png_dvipng(latex_string, False, 'Black')
-    nt.assert_equal(dvipng_default, dvipng_black)
+    assert dvipng_default == dvipng_black
     mpl_default = latextools.latex_to_png_mpl(latex_string, False)
     mpl_black = latextools.latex_to_png_mpl(latex_string, False, 'Black')
-    nt.assert_equal(mpl_default, mpl_black)
-    nt.assert_in(default_value, [dvipng_black, mpl_black])
-    nt.assert_in(default_hexblack, [dvipng_black, mpl_black])
+    assert mpl_default == mpl_black
+    assert default_value in [dvipng_black, mpl_black]
+    assert default_hexblack in [dvipng_black, mpl_black]
 
     # Test that dvips name colors can be used without error
     dvipng_maroon = latextools.latex_to_png_dvipng(latex_string, False,
                                                    'Maroon')
     # And that it doesn't return the black one
-    nt.assert_not_equal(dvipng_black, dvipng_maroon)
+    assert dvipng_black != dvipng_maroon
 
     mpl_maroon = latextools.latex_to_png_mpl(latex_string, False, 'Maroon')
-    nt.assert_not_equal(mpl_black, mpl_maroon)
+    assert mpl_black != mpl_maroon
     mpl_white = latextools.latex_to_png_mpl(latex_string, False, 'White')
     mpl_hexwhite = latextools.latex_to_png_mpl(latex_string, False, '#FFFFFF')
-    nt.assert_equal(mpl_white, mpl_hexwhite)
+    assert mpl_white == mpl_hexwhite
 
     mpl_white_scale = latextools.latex_to_png_mpl(latex_string, False,
                                                   'White', 1.2)
-    nt.assert_not_equal(mpl_white, mpl_white_scale)
+    assert mpl_white != mpl_white_scale
 
 
 def test_latex_to_png_invalid_hex_colors():
diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index 9bdaefd9fb0..8b7e34cbb3e 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -183,7 +183,8 @@ def will_run(self):
 
 # lib:
 sec = test_sections['lib']
-sec.exclude('kernel')
+sec.exclude('tests.test_latextools')
+#sec.exclude('kernel')
 if not have['pygments']:
     sec.exclude('tests.test_lexers')
 # We do this unconditionally, so that the test suite doesn't import
@@ -210,8 +211,6 @@ def will_run(self):
 
 # extensions:
 sec = test_sections['extensions']
-# This is deprecated in favour of rpy2
-sec.exclude('rmagic')
 # autoreload does some strange stuff, so move it to its own test section
 sec.exclude('autoreload')
 sec.exclude('tests.test_autoreload')

From a91824acb37272da8bf200f15b48c1f76483e73c Mon Sep 17 00:00:00 2001
From: dalthviz <d.althviz10@uniandes.edu.co>
Date: Fri, 5 Jun 2020 11:14:12 -0500
Subject: [PATCH 0162/1407] Add handling for malformed pathext env var
 (Windows)

---
 IPython/core/magics/osm.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index c43bf687255..e337c665f45 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -25,6 +25,7 @@
 from IPython.utils.process import abbrev_cwd
 from IPython.utils.terminal import set_term_title
 from traitlets import Bool
+from warnings import warn
 
 
 @magics_class
@@ -48,8 +49,15 @@ def __init__(self, shell=None, **kwargs):
                 winext = os.environ['pathext'].replace(';','|').replace('.','')
             except KeyError:
                 winext = 'exe|com|bat|py'
-            
-            self.execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE)
+            try:
+                self.execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE)
+            except re.error:
+                warn("Seems like your pathext environmental "
+                     "variable is malformed. Please check it to "
+                     "enable a proper handle of file extensions "
+                     "managed for your system")
+                winext = 'exe|com|bat|py'
+                self.execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE)
 
         # call up the chain
         super().__init__(shell=shell, **kwargs)

From f4206657bafa3efe470cfdba4d0ed727887610ce Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 4 Jun 2020 07:05:05 -0700
Subject: [PATCH 0163/1407] Add comments to explain the lambda:

See #12355
---
 IPython/terminal/pt_inputhooks/qt.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/terminal/pt_inputhooks/qt.py b/IPython/terminal/pt_inputhooks/qt.py
index 9f5e1b41dcd..cdadfffc811 100644
--- a/IPython/terminal/pt_inputhooks/qt.py
+++ b/IPython/terminal/pt_inputhooks/qt.py
@@ -45,6 +45,8 @@ def inputhook(context):
                                           QtCore.QSocketNotifier.Read)
         try:
             # connect the callback we care about before we turn it on
+            # lambda is necessary as PyQT inspect the function signature to know
+            # what arguments to pass to. See https://github.com/ipython/ipython/pull/12355
             notifier.activated.connect(lambda: event_loop.exit())
             notifier.setEnabled(True)
             # only start the event loop we are not already flipped

From e85e6b36748722be31dcfd552bb13dbaba3c6958 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 5 Jun 2020 14:28:39 -0700
Subject: [PATCH 0164/1407] test traitlets master

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e515c977892..4c46bbc6bbc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,11 @@ install:
   - pip install pytest 'matplotlib !=3.2.0' mypy
   - pip install codecov check-manifest --upgrade
   - pip install mypy
+  - |
+    if [[ "$MASTER_DEPENDENCIES" == "True" ]]; then
+       pip install git+https://github.com/ipython/traitlets#egg=traitlets --force
+    fi
+
 
 script:
   - check-manifest
@@ -87,6 +92,9 @@ matrix:
       language: generic
       python: 3.7
       env: TRAVIS_PYTHON_VERSION=3.7
+    - arch: amd64
+      python: "3.8"
+      env: MASTER_DEPENDENCIES=True
   allow_failures:
     - python: nightly
 

From c5f2d928760daef58a92b3294165220b339d822c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 7 Jun 2020 21:12:36 -0700
Subject: [PATCH 0165/1407] Update IPython/terminal/interactiveshell.py

Co-authored-by: meeseeksdev[bot] <24485218+meeseeksdev[bot]@users.noreply.github.com>
---
 IPython/terminal/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 412880d2de9..7debfd4135a 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -273,7 +273,7 @@ def restore_term_title(self):
     def init_display_formatter(self):
         super(TerminalInteractiveShell, self).init_display_formatter()
         # terminal only supports plain text
-        self.display_formatter.active_types = ['text/plain']
+        self.display_formatter.active_types = ["text/plain"]
 
     def init_prompt_toolkit_cli(self):
         if self.simple_prompt:

From e0030b76e2f4cdcfbfd3f68f285bbe55e93b6835 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Mon, 8 Jun 2020 17:17:49 +0100
Subject: [PATCH 0166/1407] BF: Make sure to stop timer, otherwise poll
 function may continue to get called after ExitMainLoop has been called

---
 IPython/terminal/pt_inputhooks/wx.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/terminal/pt_inputhooks/wx.py b/IPython/terminal/pt_inputhooks/wx.py
index 618f092b4f9..a0f4442c771 100644
--- a/IPython/terminal/pt_inputhooks/wx.py
+++ b/IPython/terminal/pt_inputhooks/wx.py
@@ -177,11 +177,13 @@ def inputhook_wxphoenix(context):
 
     # Use a wx.Timer to periodically check whether input is ready - as soon as
     # it is, we exit the main loop
+    timer = wx.Timer()
+
     def poll(ev):
         if context.input_is_ready():
+            timer.Stop()
             app.ExitMainLoop()
 
-    timer = wx.Timer()
     timer.Start(poll_interval)
     timer.Bind(wx.EVT_TIMER, poll)
 

From 7ce32405279170a13d598da8cafe9d422d435379 Mon Sep 17 00:00:00 2001
From: Ram Rachum <ram@rachum.com>
Date: Tue, 9 Jun 2020 17:11:00 +0300
Subject: [PATCH 0167/1407] Fix exception causes in debugger.py

---
 IPython/core/debugger.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 50251698e11..b7dff187c60 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -220,8 +220,8 @@ def __init__(self, color_scheme=None, completekey=None,
             self.context = int(context)
             if self.context <= 0:
                 raise ValueError("Context must be a positive integer")
-        except (TypeError, ValueError):
-                raise ValueError("Context must be a positive integer")
+        except (TypeError, ValueError) as e:
+                raise ValueError("Context must be a positive integer") from e
 
         # `kwargs` ensures full compatibility with stdlib's `pdb.Pdb`.
         OldPdb.__init__(self, completekey, stdin, stdout, **kwargs)
@@ -326,8 +326,8 @@ def print_stack_trace(self, context=None):
             context=int(context)
             if context <= 0:
                 raise ValueError("Context must be a positive integer")
-        except (TypeError, ValueError):
-                raise ValueError("Context must be a positive integer")
+        except (TypeError, ValueError) as e:
+                raise ValueError("Context must be a positive integer") from e
         try:
             for frame_lineno in self.stack:
                 self.print_stack_entry(frame_lineno, context=context)
@@ -342,8 +342,8 @@ def print_stack_entry(self, frame_lineno, prompt_prefix='\n-> ',
             context=int(context)
             if context <= 0:
                 raise ValueError("Context must be a positive integer")
-        except (TypeError, ValueError):
-                raise ValueError("Context must be a positive integer")
+        except (TypeError, ValueError) as e:
+                raise ValueError("Context must be a positive integer") from e
         print(self.format_stack_entry(frame_lineno, '', context), file=self.stdout)
 
         # vds: >>

From fafc3fc2c2dbf3ef3431be33cff7152da5bb662d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E4=B9=9D=E9=BC=8E?= <109224573@qq.com>
Date: Wed, 10 Jun 2020 20:44:36 +0800
Subject: [PATCH 0168/1407] Update intro.rst

---
 docs/source/config/intro.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/config/intro.rst b/docs/source/config/intro.rst
index 6dccde1348c..48578e5e916 100644
--- a/docs/source/config/intro.rst
+++ b/docs/source/config/intro.rst
@@ -69,9 +69,9 @@ Example configuration file
         'fancy.ipy'
     ]
     c.InteractiveShell.colors = 'LightBG'
-    c.InteractiveShell.confirm_exit = False
-    c.InteractiveShell.editor = 'nano'
     c.InteractiveShell.xmode = 'Context'
+    c.TerminalInteractiveShell.confirm_exit = False
+    c.TerminalInteractiveShell.editor = 'nano'
 
     c.PrefilterManager.multi_line_specials = True
 

From 8c46885f7d2703638cfc4bad24f1a218fb9da117 Mon Sep 17 00:00:00 2001
From: Ram Rachum <ram@rachum.com>
Date: Wed, 10 Jun 2020 16:30:49 +0300
Subject: [PATCH 0169/1407] Fix exception causes in 7 modules

---
 IPython/core/formatters.py       | 12 ++++++------
 IPython/core/interactiveshell.py | 20 ++++++++++----------
 IPython/core/magic.py            |  2 +-
 IPython/core/magics/code.py      |  8 ++++----
 IPython/core/magics/execution.py |  6 +++---
 IPython/core/magics/namespace.py |  4 ++--
 IPython/core/magics/osm.py       | 16 ++++++++--------
 7 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/IPython/core/formatters.py b/IPython/core/formatters.py
index 237b959b9a6..839ef93ec10 100644
--- a/IPython/core/formatters.py
+++ b/IPython/core/formatters.py
@@ -643,17 +643,17 @@ def _float_precision_changed(self, change):
             fmt = new
             try:
                 fmt%3.14159
-            except Exception:
-                raise ValueError("Precision must be int or format string, not %r"%new)
+            except Exception as e:
+                raise ValueError("Precision must be int or format string, not %r"%new) from e
         elif new:
             # otherwise, should be an int
             try:
                 i = int(new)
                 assert i >= 0
-            except ValueError:
-                raise ValueError("Precision must be int or format string, not %r"%new)
-            except AssertionError:
-                raise ValueError("int precision must be non-negative, not %r"%i)
+            except ValueError as e:
+                raise ValueError("Precision must be int or format string, not %r"%new) from e
+            except AssertionError as e:
+                raise ValueError("int precision must be non-negative, not %r"%i) from e
 
             fmt = '%%.%if'%i
             if 'numpy' in sys.modules:
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index f5fdba6692b..e52b4191a57 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1490,8 +1490,8 @@ def del_var(self, varname, by_name=False):
         else:                         # Delete by object
             try:
                 obj = self.user_ns[varname]
-            except KeyError:
-                raise NameError("name '%s' is not defined" % varname)
+            except KeyError as e:
+                raise NameError("name '%s' is not defined" % varname) from e
             # Also check in output history
             ns_refs.append(self.history_manager.output_hist)
             for ns in ns_refs:
@@ -1521,8 +1521,8 @@ def reset_selective(self, regex=None):
         if regex is not None:
             try:
                 m = re.compile(regex)
-            except TypeError:
-                raise TypeError('regex must be a string or compiled pattern')
+            except TypeError as e:
+                raise TypeError('regex must be a string or compiled pattern') from e
             # Search for keys in each namespace that match the given regex
             # If a match is found, delete the key/value pair.
             for ns in self.all_ns_refs:
@@ -3614,13 +3614,13 @@ def find_user_code(self, target, raw=True, py_only=False, skip_encoding_cookie=T
         try:
             if target.startswith(('http://', 'https://')):
                 return openpy.read_py_url(target, skip_encoding_cookie=skip_encoding_cookie)
-        except UnicodeDecodeError:
+        except UnicodeDecodeError as e:
             if not py_only :
                 # Deferred import
                 from urllib.request import urlopen
                 response = urlopen(target)
                 return response.read().decode('latin1')
-            raise ValueError(("'%s' seem to be unreadable.") % target)
+            raise ValueError(("'%s' seem to be unreadable.") % target) from e
 
         potential_target = [target]
         try :
@@ -3632,11 +3632,11 @@ def find_user_code(self, target, raw=True, py_only=False, skip_encoding_cookie=T
             if os.path.isfile(tgt):                        # Read file
                 try :
                     return openpy.read_py_file(tgt, skip_encoding_cookie=skip_encoding_cookie)
-                except UnicodeDecodeError :
+                except UnicodeDecodeError as e:
                     if not py_only :
                         with io_open(tgt,'r', encoding='latin1') as f :
                             return f.read()
-                    raise ValueError(("'%s' seem to be unreadable.") % target)
+                    raise ValueError(("'%s' seem to be unreadable.") % target) from e
             elif os.path.isdir(os.path.expanduser(tgt)):
                 raise ValueError("'%s' is a directory, not a regular file." % target)
 
@@ -3648,9 +3648,9 @@ def find_user_code(self, target, raw=True, py_only=False, skip_encoding_cookie=T
 
         try:                                              # User namespace
             codeobj = eval(target, self.user_ns)
-        except Exception:
+        except Exception as e:
             raise ValueError(("'%s' was not found in history, as a file, url, "
-                                "nor in the user namespace.") % target)
+                                "nor in the user namespace.") % target) from e
 
         if isinstance(codeobj, str):
             return codeobj
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index bc51677f083..e64d3aa2afc 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -630,7 +630,7 @@ def parse_options(self, arg_str, opt_str, *long_opts, **kw):
                 opts,args = getopt(argv, opt_str, long_opts)
             except GetoptError as e:
                 raise UsageError('%s ( allowed: "%s" %s)' % (e.msg,opt_str,
-                                        " ".join(long_opts)))
+                                        " ".join(long_opts))) from e
             for o,a in opts:
                 if o.startswith('--'):
                     o = o[2:]
diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index a1841384651..f1289b5a4d1 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -440,10 +440,10 @@ class DataIsObject(Exception): pass
                         return (None, None, None)
                     use_temp = False
 
-                except DataIsObject:
+                except DataIsObject as e:
                     # macros have a special edit function
                     if isinstance(data, Macro):
-                        raise MacroToEdit(data)
+                        raise MacroToEdit(data) from e
 
                     # For objects, try to edit the file where they are defined
                     filename = find_file(data)
@@ -467,8 +467,8 @@ class DataIsObject(Exception): pass
                         
                         m = ipython_input_pat.match(os.path.basename(filename))
                         if m:
-                            raise InteractivelyDefined(int(m.groups()[0]))
-                        
+                            raise InteractivelyDefined(int(m.groups()[0])) from e
+
                         datafile = 1
                     if filename is None:
                         filename = make_filename(args)
diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 6f73b8089d2..effedbd3482 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -679,9 +679,9 @@ def run(self, parameter_s='', runner=None,
             fpath = None # initialize to make sure fpath is in scope later
             fpath = arg_lst[0]
             filename = file_finder(fpath)
-        except IndexError:
+        except IndexError as e:
             msg = 'you must provide at least a filename.'
-            raise Exception(msg)
+            raise Exception(msg) from e
         except IOError as e:
             try:
                 msg = str(e)
@@ -689,7 +689,7 @@ def run(self, parameter_s='', runner=None,
                 msg = e.message
             if os.name == 'nt' and re.match(r"^'.*'$",fpath):
                 warn('For Windows, use double quotes to wrap a filename: %run "mypath\\myfile.py"')
-            raise Exception(msg)
+            raise Exception(msg) from e
         except TypeError:
             if fpath in sys.meta_path:
                 filename = ""
diff --git a/IPython/core/magics/namespace.py b/IPython/core/magics/namespace.py
index acc4620549b..0f232a72625 100644
--- a/IPython/core/magics/namespace.py
+++ b/IPython/core/magics/namespace.py
@@ -683,8 +683,8 @@ def reset_selective(self, parameter_s=''):
         else:
             try:
                 m = re.compile(regex)
-            except TypeError:
-                raise TypeError('regex must be a string or compiled pattern')
+            except TypeError as e:
+                raise TypeError('regex must be a string or compiled pattern') from e
             for i in self.who_ls():
                 if m.search(i):
                     del(user_ns[i])
diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index e337c665f45..a6e3d64e942 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -293,8 +293,8 @@ def pwd(self, parameter_s=''):
         """
         try:
             return os.getcwd()
-        except FileNotFoundError:
-            raise UsageError("CWD no longer exists - please use %cd to change directory.")
+        except FileNotFoundError as e:
+            raise UsageError("CWD no longer exists - please use %cd to change directory.") from e
 
     @skip_doctest
     @line_magic
@@ -386,8 +386,8 @@ def cd(self, parameter_s=''):
         if ps == '-':
             try:
                 ps = self.shell.user_ns['_dh'][-2]
-            except IndexError:
-                raise UsageError('%cd -: No previous directory to change to.')
+            except IndexError as e:
+                raise UsageError('%cd -: No previous directory to change to.') from e
         # jump to bookmark if needed
         else:
             if not os.path.isdir(ps) or 'b' in opts:
@@ -764,15 +764,15 @@ def bookmark(self, parameter_s=''):
         if 'd' in opts:
             try:
                 todel = args[0]
-            except IndexError:
+            except IndexError as e:
                 raise UsageError(
-                    "%bookmark -d: must provide a bookmark to delete")
+                    "%bookmark -d: must provide a bookmark to delete") from e
             else:
                 try:
                     del bkms[todel]
-                except KeyError:
+                except KeyError as e:
                     raise UsageError(
-                        "%%bookmark -d: Can't delete bookmark '%s'" % todel)
+                        "%%bookmark -d: Can't delete bookmark '%s'" % todel) from e
 
         elif 'r' in opts:
             bkms = {}

From 62960a0322bf8391b4d2cc232a2b13d70114dba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E4=B9=9D=E9=BC=8E?= <109224573@qq.com>
Date: Wed, 10 Jun 2020 22:54:48 +0800
Subject: [PATCH 0170/1407] Update intro.rst

---
 docs/source/config/intro.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/source/config/intro.rst b/docs/source/config/intro.rst
index 48578e5e916..fa46ba01459 100644
--- a/docs/source/config/intro.rst
+++ b/docs/source/config/intro.rst
@@ -93,12 +93,14 @@ hierarchy represent the value you would normally set on the ``c`` object of
     {
         "InteractiveShell": {
             "colors": "LightBG",
-            "editor": "nano"
         },
         "InteractiveShellApp": {
             "extensions": [
                 "myextension"
             ]
+        },
+        "TerminalInteractiveShell": {
+            "editor": "nano"
         }
     }
 
@@ -109,7 +111,7 @@ Is equivalent to the following ``ipython_config.py``::
     ]
 
     c.InteractiveShell.colors = 'LightBG'
-    c.InteractiveShell.editor = 'nano'
+    c.TerminalInteractiveShell.editor = 'nano'
 
 
 Command line arguments

From daae1b9bf83dce40597bdd5b9db77d29860efe11 Mon Sep 17 00:00:00 2001
From: Ram Rachum <ram@rachum.com>
Date: Wed, 10 Jun 2020 22:02:37 +0300
Subject: [PATCH 0171/1407] Fix glut-related error messages

---
 IPython/lib/inputhookglut.py           | 2 +-
 IPython/terminal/pt_inputhooks/glut.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/lib/inputhookglut.py b/IPython/lib/inputhookglut.py
index e6f7f125758..9fc29bdfc79 100644
--- a/IPython/lib/inputhookglut.py
+++ b/IPython/lib/inputhookglut.py
@@ -63,7 +63,7 @@
             )
     except AttributeError:
         raise RuntimeError(
-            '''Your glut implementation does not allow interactive sessions'''
+            '''Your glut implementation does not allow interactive sessions. '''
             '''Consider installing freeglut.''')
     glutMainLoopEvent = glutCheckLoop
 elif glut.HAVE_FREEGLUT:
diff --git a/IPython/terminal/pt_inputhooks/glut.py b/IPython/terminal/pt_inputhooks/glut.py
index f6d54a55b4d..d26f91c5c1d 100644
--- a/IPython/terminal/pt_inputhooks/glut.py
+++ b/IPython/terminal/pt_inputhooks/glut.py
@@ -46,7 +46,7 @@
             )
     except AttributeError:
         raise RuntimeError(
-            '''Your glut implementation does not allow interactive sessions'''
+            '''Your glut implementation does not allow interactive sessions. '''
             '''Consider installing freeglut.''')
     glutMainLoopEvent = glutCheckLoop
 elif glut.HAVE_FREEGLUT:

From e0ea72228411c2935f610bb3303536177719f8b2 Mon Sep 17 00:00:00 2001
From: Ram Rachum <ram@rachum.com>
Date: Thu, 11 Jun 2020 19:56:11 +0300
Subject: [PATCH 0172/1407] Fix exception causes all over the codebase

---
 IPython/core/display.py                |  4 ++--
 IPython/core/page.py                   |  2 +-
 IPython/core/pylabtools.py             |  4 ++--
 IPython/core/tests/test_pylabtools.py  |  2 +-
 IPython/core/tests/test_run.py         |  4 ++--
 IPython/extensions/storemagic.py       | 12 ++++++------
 IPython/lib/clipboard.py               | 16 ++++++++--------
 IPython/lib/deepreload.py              | 12 ++++++------
 IPython/lib/display.py                 |  4 ++--
 IPython/lib/inputhook.py               |  4 ++--
 IPython/lib/inputhookglut.py           |  4 ++--
 IPython/lib/latextools.py              |  4 ++--
 IPython/paths.py                       |  4 ++--
 IPython/sphinxext/custom_doctests.py   |  4 ++--
 IPython/terminal/magics.py             |  4 ++--
 IPython/terminal/pt_inputhooks/glut.py |  4 ++--
 IPython/testing/tools.py               |  4 ++--
 IPython/utils/_process_win32.py        |  4 ++--
 IPython/utils/coloransi.py             |  4 ++--
 IPython/utils/importstring.py          |  4 ++--
 IPython/utils/ipstruct.py              |  6 +++---
 IPython/utils/path.py                  |  4 ++--
 IPython/utils/shimmodule.py            |  4 ++--
 docs/sphinxext/github.py               |  4 ++--
 tools/gh_api.py                        |  4 ++--
 25 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 18bfaa6046d..490435a3cbb 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -987,9 +987,9 @@ def _data_and_metadata(self, always_both=False):
         """shortcut for returning metadata with shape information, if defined"""
         try:
             b64_data = b2a_base64(self.data).decode('ascii')
-        except TypeError:
+        except TypeError as e:
             raise FileNotFoundError(
-                "No such file or directory: '%s'" % (self.data))
+                "No such file or directory: '%s'" % (self.data)) from e
         md = {}
         if self.metadata:
             md.update(self.metadata)
diff --git a/IPython/core/page.py b/IPython/core/page.py
index 8a8f14fec5b..d039925b5ef 100644
--- a/IPython/core/page.py
+++ b/IPython/core/page.py
@@ -106,7 +106,7 @@ def _detect_screen_size(screen_lines_def):
         term_flags = termios.tcgetattr(sys.stdout)
     except termios.error as err:
         # can fail on Linux 2.6, pager_page will catch the TypeError
-        raise TypeError('termios error: {0}'.format(err))
+        raise TypeError('termios error: {0}'.format(err)) from err
 
     try:
         scr = curses.initscr()
diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index ef1539a4a42..3af899e46da 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -200,8 +200,8 @@ def _reshow_nbagg_figure(fig):
     """reshow an nbagg figure"""
     try:
         reshow = fig.canvas.manager.reshow
-    except AttributeError:
-        raise NotImplementedError()
+    except AttributeError as e:
+        raise NotImplementedError() from e
     else:
         reshow()
 
diff --git a/IPython/core/tests/test_pylabtools.py b/IPython/core/tests/test_pylabtools.py
index 7b64aab111a..75b103f27a6 100644
--- a/IPython/core/tests/test_pylabtools.py
+++ b/IPython/core/tests/test_pylabtools.py
@@ -51,7 +51,7 @@ def _check_pil_jpeg_bytes():
         img.save(buf, 'jpeg')
     except Exception as e:
         ename = e.__class__.__name__
-        raise SkipTest("PIL can't write JPEG to BytesIO: %s: %s" % (ename, e))
+        raise SkipTest("PIL can't write JPEG to BytesIO: %s: %s" % (ename, e)) from e
 
 @dec.skip_without("PIL.Image")
 def test_figure_to_jpeg():
diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index 2974da40194..9634913ba76 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -241,8 +241,8 @@ def test_obj_del(self):
         if sys.platform == 'win32':
             try:
                 import win32api
-            except ImportError:
-                raise SkipTest("Test requires pywin32")
+            except ImportError as e:
+                raise SkipTest("Test requires pywin32") from e
         src = ("class A(object):\n"
                "    def __del__(self):\n"
                "        print('object A deleted')\n"
diff --git a/IPython/extensions/storemagic.py b/IPython/extensions/storemagic.py
index 51b79ad314e..9102ea1c20c 100644
--- a/IPython/extensions/storemagic.py
+++ b/IPython/extensions/storemagic.py
@@ -126,13 +126,13 @@ def store(self, parameter_s=''):
         if 'd' in opts:
             try:
                 todel = args[0]
-            except IndexError:
-                raise UsageError('You must provide the variable to forget')
+            except IndexError as e:
+                raise UsageError('You must provide the variable to forget') from e
             else:
                 try:
                     del db['autorestore/' + todel]
-                except:
-                    raise UsageError("Can't delete variable '%s'" % todel)
+                except BaseException as e:
+                    raise UsageError("Can't delete variable '%s'" % todel) from e
         # reset
         elif 'z' in opts:
             for k in db.keys('autorestore/*'):
@@ -203,8 +203,8 @@ def store(self, parameter_s=''):
                     name = arg
                     try:
                         cmd = ip.alias_manager.retrieve_alias(name)
-                    except ValueError:
-                        raise UsageError("Unknown variable '%s'" % name)
+                    except ValueError as e:
+                        raise UsageError("Unknown variable '%s'" % name) from e
 
                     staliases = db.get('stored_aliases',{})
                     staliases[name] = cmd
diff --git a/IPython/lib/clipboard.py b/IPython/lib/clipboard.py
index 316a8ab1f8a..95a6b0a0a34 100644
--- a/IPython/lib/clipboard.py
+++ b/IPython/lib/clipboard.py
@@ -16,9 +16,9 @@ def win32_clipboard_get():
     """
     try:
         import win32clipboard
-    except ImportError:
+    except ImportError as e:
         raise TryNext("Getting text from the clipboard requires the pywin32 "
-                      "extensions: http://sourceforge.net/projects/pywin32/")
+                      "extensions: http://sourceforge.net/projects/pywin32/") from e
     win32clipboard.OpenClipboard()
     try:
         text = win32clipboard.GetClipboardData(win32clipboard.CF_UNICODETEXT)
@@ -26,8 +26,8 @@ def win32_clipboard_get():
         try:
             text = win32clipboard.GetClipboardData(win32clipboard.CF_TEXT)
             text = py3compat.cast_unicode(text, py3compat.DEFAULT_ENCODING)
-        except (TypeError, win32clipboard.error):
-            raise ClipboardEmpty
+        except (TypeError, win32clipboard.error) as e:
+            raise ClipboardEmpty from e
     finally:
         win32clipboard.CloseClipboard()
     return text
@@ -52,15 +52,15 @@ def tkinter_clipboard_get():
     """
     try:
         from tkinter import Tk, TclError 
-    except ImportError:
-        raise TryNext("Getting text from the clipboard on this platform requires tkinter.")
+    except ImportError as e:
+        raise TryNext("Getting text from the clipboard on this platform requires tkinter.") from e
         
     root = Tk()
     root.withdraw()
     try:
         text = root.clipboard_get()
-    except TclError:
-        raise ClipboardEmpty
+    except TclError as e:
+        raise ClipboardEmpty from e
     finally:
         root.destroy()
     text = py3compat.cast_unicode(text, py3compat.DEFAULT_ENCODING)
diff --git a/IPython/lib/deepreload.py b/IPython/lib/deepreload.py
index bd8c01b2a75..ddfa1bc603d 100644
--- a/IPython/lib/deepreload.py
+++ b/IPython/lib/deepreload.py
@@ -97,21 +97,21 @@ def get_parent(globals, level):
     for x in range(level, 1, -1):
         try:
             dot = name.rindex('.', 0, dot)
-        except ValueError:
+        except ValueError as e:
             raise ValueError("attempted relative import beyond top-level "
-                             "package")
+                             "package") from e
     name = name[:dot]
 
     try:
         parent = sys.modules[name]
-    except:
+    except BaseException as e:
         if orig_level < 1:
             warn("Parent module '%.200s' not found while handling absolute "
                  "import" % name)
             parent = None
         else:
             raise SystemError("Parent module '%.200s' not loaded, cannot "
-                              "perform relative import" % name)
+                              "perform relative import" % name) from e
 
     # We expect, but can't guarantee, if parent != None, that:
     # - parent.__name__ == name
@@ -292,9 +292,9 @@ def deep_reload_hook(m):
     else:
         try:
             parent = sys.modules[name[:dot]]
-        except KeyError:
+        except KeyError as e:
             modules_reloading.clear()
-            raise ImportError("reload(): parent %.200s not in sys.modules" % name[:dot])
+            raise ImportError("reload(): parent %.200s not in sys.modules" % name[:dot]) from e
         subname = name[dot+1:]
         path = getattr(parent, "__path__", None)
 
diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index d24f455d782..4f28010fbd0 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -182,9 +182,9 @@ def _validate_and_normalize_without_numpy(data, normalize):
 
         try:
             max_abs_value = float(max([abs(x) for x in data]))
-        except TypeError:
+        except TypeError as e:
             raise TypeError('Only lists of mono audio are '
-                'supported if numpy is not installed')
+                'supported if numpy is not installed') from e
 
         normalization_factor = Audio._get_normalization_factor(max_abs_value, normalize)
         scaled = array.array('h', [int(x / normalization_factor * 32767) for x in data])
diff --git a/IPython/lib/inputhook.py b/IPython/lib/inputhook.py
index 62f840d23f2..86077d069df 100644
--- a/IPython/lib/inputhook.py
+++ b/IPython/lib/inputhook.py
@@ -281,9 +281,9 @@ def enable_gui(self, gui=None, app=None):
         
         try:
             gui_hook = self.guihooks[gui]
-        except KeyError:
+        except KeyError as e:
             e = "Invalid GUI request {!r}, valid ones are: {}"
-            raise ValueError(e.format(gui, ', '.join(self.guihooks)))
+            raise ValueError(e.format(gui, ', '.join(self.guihooks))) from e
         self._current_gui = gui
 
         app = gui_hook.enable(app)
diff --git a/IPython/lib/inputhookglut.py b/IPython/lib/inputhookglut.py
index 9fc29bdfc79..e866ebdb82c 100644
--- a/IPython/lib/inputhookglut.py
+++ b/IPython/lib/inputhookglut.py
@@ -61,10 +61,10 @@
             doc='glutCheckLoop(  ) -> None',
             argNames=(),
             )
-    except AttributeError:
+    except AttributeError as e:
         raise RuntimeError(
             '''Your glut implementation does not allow interactive sessions. '''
-            '''Consider installing freeglut.''')
+            '''Consider installing freeglut.''') from e
     glutMainLoopEvent = glutCheckLoop
 elif glut.HAVE_FREEGLUT:
     glutMainLoopEvent = glut.glutMainLoopEvent
diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py
index cbcc7d9639e..9561bd7967c 100644
--- a/IPython/lib/latextools.py
+++ b/IPython/lib/latextools.py
@@ -95,8 +95,8 @@ def latex_to_png(s, encode=False, backend=None, wrap=False, color='Black',
                 try:
                     color = "RGB {}".format(" ".join([str(int(x, 16)) for x in
                                                       textwrap.wrap(color[1:], 2)]))
-                except ValueError:
-                    raise ValueError('Invalid color specification {}.'.format(color))
+                except ValueError as e:
+                    raise ValueError('Invalid color specification {}.'.format(color)) from e
             else:
                 raise ValueError('Invalid color specification {}.'.format(color))
     else:
diff --git a/IPython/paths.py b/IPython/paths.py
index bbe3d5c7cad..53344296e7d 100644
--- a/IPython/paths.py
+++ b/IPython/paths.py
@@ -113,7 +113,7 @@ def locate_profile(profile='default'):
     from IPython.core.profiledir import ProfileDir, ProfileDirError
     try:
         pd = ProfileDir.find_profile_dir_by_name(get_ipython_dir(), profile)
-    except ProfileDirError:
+    except ProfileDirError as e:
         # IOError makes more sense when people are expecting a path
-        raise IOError("Couldn't find profile %r" % profile)
+        raise IOError("Couldn't find profile %r" % profile) from e
     return pd.location
diff --git a/IPython/sphinxext/custom_doctests.py b/IPython/sphinxext/custom_doctests.py
index 7678fd6801a..75c2a25ccb7 100644
--- a/IPython/sphinxext/custom_doctests.py
+++ b/IPython/sphinxext/custom_doctests.py
@@ -107,10 +107,10 @@ def float_doctest(sphinx_shell, args, input_lines, found, submitted):
         try:
             rtol = float(args[2])
             atol = float(args[3])
-        except IndexError:
+        except IndexError as e:
             e = ("Both `rtol` and `atol` must be specified "
                  "if either are specified: {0}".format(args))
-            raise IndexError(e)
+            raise IndexError(e) from e
 
     try:
         submitted = str_to_array(submitted)
diff --git a/IPython/terminal/magics.py b/IPython/terminal/magics.py
index 3c7e82b45e5..9e6f6472303 100644
--- a/IPython/terminal/magics.py
+++ b/IPython/terminal/magics.py
@@ -181,8 +181,8 @@ def paste(self, parameter_s=''):
             else:
                 error('Could not get text from the clipboard.')
             return
-        except ClipboardEmpty:
-            raise UsageError("The clipboard appears to be empty")
+        except ClipboardEmpty as e:
+            raise UsageError("The clipboard appears to be empty") from e
 
         # By default, echo back to terminal unless quiet mode is requested
         if 'q' not in opts:
diff --git a/IPython/terminal/pt_inputhooks/glut.py b/IPython/terminal/pt_inputhooks/glut.py
index d26f91c5c1d..835aadfc971 100644
--- a/IPython/terminal/pt_inputhooks/glut.py
+++ b/IPython/terminal/pt_inputhooks/glut.py
@@ -44,10 +44,10 @@
             doc='glutCheckLoop(  ) -> None',
             argNames=(),
             )
-    except AttributeError:
+    except AttributeError as e:
         raise RuntimeError(
             '''Your glut implementation does not allow interactive sessions. '''
-            '''Consider installing freeglut.''')
+            '''Consider installing freeglut.''') from e
     glutMainLoopEvent = glutCheckLoop
 elif glut.HAVE_FREEGLUT:
     glutMainLoopEvent = glut.glutMainLoopEvent
diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py
index 0db926ab243..75a9525df0a 100644
--- a/IPython/testing/tools.py
+++ b/IPython/testing/tools.py
@@ -443,8 +443,8 @@ def fake_input(inputs):
     def mock_input(prompt=''):
         try:
             return next(it)
-        except StopIteration:
-            raise EOFError('No more inputs given')
+        except StopIteration as e:
+            raise EOFError('No more inputs given') from e
 
     return patch('builtins.input', mock_input)
 
diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py
index 6d05bdaa12e..86d8100a639 100644
--- a/IPython/utils/_process_win32.py
+++ b/IPython/utils/_process_win32.py
@@ -75,8 +75,8 @@ def _find_cmd(cmd):
     """Find the full path to a .bat or .exe using the win32api module."""
     try:
         from win32api import SearchPath
-    except ImportError:
-        raise ImportError('you need to have pywin32 installed for this to work')
+    except ImportError as e:
+        raise ImportError('you need to have pywin32 installed for this to work') from e
     else:
         PATH = os.environ['PATH']
         extensions = ['.exe', '.com', '.bat', '.py']
diff --git a/IPython/utils/coloransi.py b/IPython/utils/coloransi.py
index bc8e8377f79..e3314218025 100644
--- a/IPython/utils/coloransi.py
+++ b/IPython/utils/coloransi.py
@@ -176,9 +176,9 @@ def set_active_scheme(self,scheme,case_sensitive=0):
             scheme_test = scheme.lower()
         try:
             scheme_idx = valid_schemes.index(scheme_test)
-        except ValueError:
+        except ValueError as e:
             raise ValueError('Unrecognized color scheme: ' + scheme + \
-                  '\nValid schemes: '+str(scheme_names).replace("'', ",''))
+                  '\nValid schemes: '+str(scheme_names).replace("'', ",'')) from e
         else:
             active = scheme_names[scheme_idx]
             self.active_scheme_name = active
diff --git a/IPython/utils/importstring.py b/IPython/utils/importstring.py
index c8e1840eb37..c7a9ccedc0b 100644
--- a/IPython/utils/importstring.py
+++ b/IPython/utils/importstring.py
@@ -31,8 +31,8 @@ def import_item(name):
         module = __import__(package, fromlist=[obj])
         try:
             pak = getattr(module, obj)
-        except AttributeError:
-            raise ImportError('No module named %s' % obj)
+        except AttributeError as e:
+            raise ImportError('No module named %s' % obj) from e
         return pak
     else:
         # called with un-dotted string
diff --git a/IPython/utils/ipstruct.py b/IPython/utils/ipstruct.py
index e2b3e8fa4c5..376fbbefb69 100644
--- a/IPython/utils/ipstruct.py
+++ b/IPython/utils/ipstruct.py
@@ -120,7 +120,7 @@ def __setattr__(self, key, value):
         try:
             self.__setitem__(key, value)
         except KeyError as e:
-            raise AttributeError(e)
+            raise AttributeError(e) from e
 
     def __getattr__(self, key):
         """Get an attr by calling :meth:`dict.__getitem__`.
@@ -145,8 +145,8 @@ def __getattr__(self, key):
         """
         try:
             result = self[key]
-        except KeyError:
-            raise AttributeError(key)
+        except KeyError as e:
+            raise AttributeError(key) from e
         else:
             return result
 
diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index 0fb6144e19f..3f0e217048a 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -39,8 +39,8 @@ def _get_long_path_name(path):
         """
         try:
             import ctypes
-        except ImportError:
-            raise ImportError('you need to have ctypes installed for this to work')
+        except ImportError as e: 
+            raise ImportError('you need to have ctypes installed for this to work') from e
         _GetLongPathName = ctypes.windll.kernel32.GetLongPathNameW
         _GetLongPathName.argtypes = [ctypes.c_wchar_p, ctypes.c_wchar_p,
             ctypes.c_uint ]
diff --git a/IPython/utils/shimmodule.py b/IPython/utils/shimmodule.py
index b70ac135bf8..cc05503e825 100644
--- a/IPython/utils/shimmodule.py
+++ b/IPython/utils/shimmodule.py
@@ -90,5 +90,5 @@ def __getattr__(self, key):
         name = "%s.%s" % (self._mirror, key)
         try:
             return import_item(name)
-        except ImportError:
-            raise AttributeError(key)
+        except ImportError as e:
+            raise AttributeError(key) from e
diff --git a/docs/sphinxext/github.py b/docs/sphinxext/github.py
index dcc025006db..a24b5a62e47 100644
--- a/docs/sphinxext/github.py
+++ b/docs/sphinxext/github.py
@@ -40,7 +40,7 @@ def make_link_node(rawtext, app, type, slug, options):
         if not base.endswith('/'):
             base += '/'
     except AttributeError as err:
-        raise ValueError('github_project_url configuration value is not set (%s)' % str(err))
+        raise ValueError('github_project_url configuration value is not set (%s)' % str(err)) from err
 
     ref = base + type + '/' + slug + '/'
     set_classes(options)
@@ -137,7 +137,7 @@ def ghcommit_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
         if not base.endswith('/'):
             base += '/'
     except AttributeError as err:
-        raise ValueError('github_project_url configuration value is not set (%s)' % str(err))
+        raise ValueError('github_project_url configuration value is not set (%s)' % str(err)) from err
 
     ref = base + text
     node = nodes.reference(rawtext, text[:6], refuri=ref, **options)
diff --git a/tools/gh_api.py b/tools/gh_api.py
index 094562d939e..d03495b4f54 100644
--- a/tools/gh_api.py
+++ b/tools/gh_api.py
@@ -30,8 +30,8 @@ class Obj(dict):
     def __getattr__(self, name):
         try:
             return self[name]
-        except KeyError:
-            raise AttributeError(name)
+        except KeyError as e:
+            raise AttributeError(name) from e
 
     def __setattr__(self, name, val):
         self[name] = val

From e9bfc9fd3276f40deae35e89e173b9b17549190e Mon Sep 17 00:00:00 2001
From: Corentin Cadiou <contact@cphyc.me>
Date: Sat, 13 Jun 2020 12:12:34 +0100
Subject: [PATCH 0173/1407] Catpure tuple-formed dict accesses

---
 IPython/core/completer.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 526aed64338..fdbfc8bfb0e 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1641,6 +1641,14 @@ def dict_key_matches(self, text:str) -> List[str]:
             )
             \[   # open bracket
             \s*  # and optional whitespace
+            ((?:[uUbB]?  # string prefix (r not handled)
+                (?:
+                    '(?:[^']|(?<!\\)\\')*'
+                |
+                    "(?:[^"]|(?<!\\)\\")*"
+                )
+                \s*,\s*
+            )*)
             ([uUbB]?  # string prefix (r not handled)
                 (?:   # unclosed string
                     '(?:[^']|(?<!\\)\\')*

From 5b71b724be4f9927ccfc06d398ba0a6d37177b64 Mon Sep 17 00:00:00 2001
From: Frank Tobia <frank.tobia@gmail.com>
Date: Mon, 15 Jun 2020 11:59:40 -0400
Subject: [PATCH 0174/1407] Minor: typos, grammar

---
 docs/source/interactive/autoawait.rst | 28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/source/interactive/autoawait.rst b/docs/source/interactive/autoawait.rst
index f87379d2ca0..e4ed965a13e 100644
--- a/docs/source/interactive/autoawait.rst
+++ b/docs/source/interactive/autoawait.rst
@@ -8,7 +8,7 @@ Asynchronous in REPL: Autoawait
    This feature is experimental and behavior can change between python and
    IPython version without prior deprecation.
 
-Starting with IPython 7.0, and when user Python 3.6 and above, IPython offer the
+Starting with IPython 7.0, and when using Python 3.6 and above, IPython offer the
 ability to run asynchronous code from the REPL. Constructs which are
 :exc:`SyntaxError` s in the Python REPL can be used seamlessly in IPython.
 
@@ -19,7 +19,7 @@ will differ between IPython, IPykernel and their versions.
 
 When a supported library is used, IPython will automatically allow Futures and
 Coroutines in the REPL to be ``await`` ed. This will happen if an :ref:`await
-<await>` (or any other async constructs like async-with, async-for) is use at
+<await>` (or any other async constructs like async-with, async-for) is used at
 top level scope, or if any structure valid only in `async def
 <https://docs.python.org/3/reference/compound_stmts.html#async-def>`_ function
 context are present. For example, the following being a syntax error in the
@@ -73,7 +73,7 @@ By default IPython will assume integration with Python's provided
 :mod:`asyncio`, but integration with other libraries is provided. In particular
 we provide experimental integration with the ``curio`` and ``trio`` library.
 
-You can switch current integration by using the
+You can switch the current integration by using the
 ``c.InteractiveShell.loop_runner`` option or the ``autoawait <name
 integration>`` magic.
 
@@ -118,7 +118,7 @@ to your code.
 
 When using command line IPython, the default loop (or runner) does not process
 in the background, so top level asynchronous code must finish for the REPL to
-allow you to enter more code. As with usual Python semantic, the awaitables are
+allow you to enter more code. As with usual Python semantics, the awaitables are
 started only when awaited for the first time. That is to say, in first example,
 no network request is done between ``In[1]`` and ``In[2]``.
 
@@ -131,8 +131,8 @@ a loop to run. By default IPython will use a fake coroutine runner which should
 allow ``IPython.embed()`` to be nested. Though this will prevent usage of the
 :magic:`%autoawait` feature when using IPython embed. 
 
-You can set explicitly a coroutine runner for ``embed()`` if you desire to run
-asynchronous code, the exact behavior is though undefined.
+You can set a coroutine runner explicitly for ``embed()`` if you want to run
+asynchronous code, though the exact behavior is undefined.
 
 Effects on Magics
 -----------------
@@ -140,14 +140,14 @@ Effects on Magics
 A couple of magics (``%%timeit``, ``%timeit``, ``%%time``, ``%%prun``) have not
 yet been updated to work with asynchronous code and will raise syntax errors
 when trying to use top-level ``await``. We welcome any contribution to help fix
-those, and extra cases we haven't caught yet. We hope for better support in Cor
+those, and extra cases we haven't caught yet. We hope for better support in Core
 Python for top-level Async code.
 
 Internals
 ---------
 
 As running asynchronous code is not supported in interactive REPL (as of Python
-3.7) we have to rely to a number of complex workaround and heuristic to allow
+3.7) we have to rely to a number of complex workarounds and heuristics to allow
 this to happen. It is interesting to understand how this works in order to
 comprehend potential bugs, or provide a custom runner.
 
@@ -179,16 +179,16 @@ significant overhead to this kind of code.
 By default the generated coroutine function will be consumed by Asyncio's
 ``loop_runner = asyncio.get_evenloop().run_until_complete()`` method if
 ``async`` mode is deemed necessary, otherwise the coroutine will just be
-exhausted in a simple runner. It is though possible to change the default
+exhausted in a simple runner. It is possible, though, to change the default
 runner.
 
 A loop runner is a *synchronous*  function responsible from running a coroutine
 object.
 
-The runner is responsible from ensuring that ``coroutine`` run to completion,
-and should return the result of executing the coroutine. Let's write a
+The runner is responsible for ensuring that ``coroutine`` runs to completion,
+and it should return the result of executing the coroutine. Let's write a
 runner for ``trio`` that print a message when used as an exercise, ``trio`` is
-special as it usually prefer to run a function object and make a coroutine by
+special as it usually prefers to run a function object and make a coroutine by
 itself, we can get around this limitation by wrapping it in an async-def without
 parameters and passing this value to ``trio``::
 
@@ -246,8 +246,8 @@ Difference between terminal IPython and IPykernel
 The exact asynchronous code running behavior varies between Terminal IPython and
 IPykernel. The root cause of this behavior is due to IPykernel having a
 *persistent* `asyncio` loop running, while Terminal IPython starts and stops a
-loop for each code block. This can lead to surprising behavior in some case if
-you are used to manipulate asyncio loop yourself, see for example
+loop for each code block. This can lead to surprising behavior in some cases if
+you are used to manipulating asyncio loop yourself, see for example
 :ghissue:`11303` for a longer discussion but here are some of the astonishing
 cases.
 

From 98bb6cc00402a835c85a57333826b8c4d8a9efd9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 1 Jun 2020 13:28:08 -0700
Subject: [PATCH 0175/1407] Implement understanding on __tracebackhide__

__tracebackhide__ is an attribute that when set to a true value mean the
frame need to be skipped/hidden.

Implement this in both ultratb and un ipdb so that by default frames are
hidden, add switches to toggle the behavior.

We reimplement do_up/down but skipping hidden frames when enabled.
This also uses the special value `_ipython_bottom_` to hide all of the
ipython frames.

This also add completion to the debugger
---
 IPython/core/debugger.py                      | 155 ++++++++++++++++--
 IPython/core/interactiveshell.py              |  16 +-
 IPython/core/magics/basic.py                  |  14 +-
 IPython/core/tests/test_debugger.py           |  78 ++++++++-
 IPython/core/ultratb.py                       |  21 ++-
 IPython/terminal/debugger.py                  |  10 ++
 appveyor.yml                                  |   7 -
 .../source/whatsnew/pr/skip_tracebackhide.rst |  11 ++
 8 files changed, 286 insertions(+), 26 deletions(-)
 create mode 100644 docs/source/whatsnew/pr/skip_tracebackhide.rst

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index b7dff187c60..c122441d83f 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -280,26 +280,31 @@ def __init__(self, color_scheme=None, completekey=None,
 
         # Set the prompt - the default prompt is '(Pdb)'
         self.prompt = prompt
+        self.skip_hidden = True
 
     def set_colors(self, scheme):
         """Shorthand access to the color table scheme selector method."""
         self.color_scheme_table.set_active_scheme(scheme)
         self.parser.style = scheme
 
+
+    def hidden_frames(self, stack):
+        """
+        Given an index in the stack return wether it should be skipped.
+
+        This is used in up/down and where to skip frames.
+        """
+        ip_hide = [s[0].f_locals.get("__tracebackhide__", False) for s in stack]
+        ip_start = [i for i, s in enumerate(ip_hide) if s == "__ipython_bottom__"]
+        if ip_start:
+            ip_hide = [h if i > ip_start[0] else True for (i, h) in enumerate(ip_hide)]
+        return ip_hide
+
     def interaction(self, frame, traceback):
         try:
             OldPdb.interaction(self, frame, traceback)
         except KeyboardInterrupt:
-            self.stdout.write('\n' + self.shell.get_exception_only())
-
-    def new_do_up(self, arg):
-        OldPdb.do_up(self, arg)
-    do_u = do_up = decorate_fn_with_doc(new_do_up, OldPdb.do_up)
-
-    def new_do_down(self, arg):
-        OldPdb.do_down(self, arg)
-
-    do_d = do_down = decorate_fn_with_doc(new_do_down, OldPdb.do_down)
+            self.stdout.write("\n" + self.shell.get_exception_only())
 
     def new_do_frame(self, arg):
         OldPdb.do_frame(self, arg)
@@ -320,6 +325,8 @@ def new_do_restart(self, arg):
         return self.do_quit(arg)
 
     def print_stack_trace(self, context=None):
+        Colors = self.color_scheme_table.active_colors
+        ColorsNormal = Colors.Normal
         if context is None:
             context = self.context
         try:
@@ -329,8 +336,21 @@ def print_stack_trace(self, context=None):
         except (TypeError, ValueError) as e:
                 raise ValueError("Context must be a positive integer") from e
         try:
-            for frame_lineno in self.stack:
+            skipped = 0
+            for hidden, frame_lineno in zip(self.hidden_frames(self.stack), self.stack):
+                if hidden and self.skip_hidden:
+                    skipped += 1
+                    continue
+                if skipped:
+                    print(
+                        f"{Colors.excName}    [... skipping {skipped} hidden frame(s)]{ColorsNormal}\n"
+                    )
+                    skipped = 0
                 self.print_stack_entry(frame_lineno, context=context)
+            if skipped:
+                print(
+                    f"{Colors.excName}    [... skipping {skipped} hidden frame(s)]{ColorsNormal}\n"
+                )
         except KeyboardInterrupt:
             pass
 
@@ -485,6 +505,16 @@ def print_list_lines(self, filename, first, last):
         except KeyboardInterrupt:
             pass
 
+    def do_skip_hidden(self, arg):
+        """
+        Change whether or not we should skip frames with the
+        __tracebackhide__ attribute.
+        """
+        if arg.strip().lower() in ("true", "yes"):
+            self.skip_hidden = True
+        elif arg.strip().lower() in ("false", "no"):
+            self.skip_hidden = False
+
     def do_list(self, arg):
         """Print lines of code from the current stack frame
         """
@@ -631,6 +661,109 @@ def do_where(self, arg):
 
     do_w = do_where
 
+    def stop_here(self, frame):
+        hidden = False
+        if self.skip_hidden:
+            hidden = frame.f_locals.get("__tracebackhide__", False)
+        if hidden:
+            Colors = self.color_scheme_table.active_colors
+            ColorsNormal = Colors.Normal
+            print(f"{Colors.excName}    [... skipped 1 hidden frame]{ColorsNormal}\n")
+
+        return super().stop_here(frame)
+
+    def do_up(self, arg):
+        """u(p) [count]
+        Move the current frame count (default one) levels up in the
+        stack trace (to an older frame).
+
+        Will skip hidden frames.
+        """
+        ## modified version of upstream that skips
+        # frames with __tracebackide__
+        if self.curindex == 0:
+            self.error("Oldest frame")
+            return
+        try:
+            count = int(arg or 1)
+        except ValueError:
+            self.error("Invalid frame count (%s)" % arg)
+            return
+        skipped = 0
+        if count < 0:
+            _newframe = 0
+        else:
+            _newindex = self.curindex
+            counter = 0
+            hidden_frames = self.hidden_frames(self.stack)
+            for i in range(self.curindex - 1, -1, -1):
+                frame = self.stack[i][0]
+                if hidden_frames[i] and self.skip_hidden:
+                    skipped += 1
+                    continue
+                counter += 1
+                if counter >= count:
+                    break
+            else:
+                # if no break occured.
+                self.error("all frames above hidden")
+                return
+
+            Colors = self.color_scheme_table.active_colors
+            ColorsNormal = Colors.Normal
+            _newframe = i
+        self._select_frame(_newframe)
+        if skipped:
+            print(
+                f"{Colors.excName}    [... skipped {skipped} hidden frame(s)]{ColorsNormal}\n"
+            )
+
+    def do_down(self, arg):
+        """d(own) [count]
+        Move the current frame count (default one) levels down in the
+        stack trace (to a newer frame).
+
+        Will skip hidden frames.
+        """
+        if self.curindex + 1 == len(self.stack):
+            self.error("Newest frame")
+            return
+        try:
+            count = int(arg or 1)
+        except ValueError:
+            self.error("Invalid frame count (%s)" % arg)
+            return
+        if count < 0:
+            _newframe = len(self.stack) - 1
+        else:
+            _newindex = self.curindex
+            counter = 0
+            skipped = 0
+            hidden_frames = self.hidden_frames(self.stack)
+            for i in range(self.curindex + 1, len(self.stack)):
+                frame = self.stack[i][0]
+                if hidden_frames[i] and self.skip_hidden:
+                    skipped += 1
+                    continue
+                counter += 1
+                if counter >= count:
+                    break
+            else:
+                self.error("all frames bellow hidden")
+                return
+
+            Colors = self.color_scheme_table.active_colors
+            ColorsNormal = Colors.Normal
+            if skipped:
+                print(
+                    f"{Colors.excName}    [... skipped {skipped} hidden frame(s)]{ColorsNormal}\n"
+                )
+            _newframe = i
+
+        self._select_frame(_newframe)
+
+    do_d = do_down
+    do_u = do_up
 
 class InterruptiblePdb(Pdb):
     """Version of debugger where KeyboardInterrupt exits the debugger altogether."""
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index e52b4191a57..acda0c9f0e0 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2211,11 +2211,20 @@ def complete(self, text, line=None, cursor_pos=None):
         with self.builtin_trap:
             return self.Completer.complete(text, line, cursor_pos)
 
-    def set_custom_completer(self, completer, pos=0):
+    def set_custom_completer(self, completer, pos=0) -> None:
         """Adds a new custom completer function.
 
         The position argument (defaults to 0) is the index in the completers
-        list where you want the completer to be inserted."""
+        list where you want the completer to be inserted.
+
+        `completer` should have the following signature::
+
+            def completion(self: Completer, text: string) -> List[str]:
+                raise NotImplementedError
+
+        It will be bound to the current Completer instance and pass some text
+        and return a list with current completions to suggest to the user.
+        """
 
         newcomp = types.MethodType(completer, self.Completer)
         self.Completer.custom_matchers.insert(pos,newcomp)
@@ -3310,6 +3319,9 @@ async def run_code(self, code_obj, result=None, *, async_=False):
         False : successful execution.
         True : an error occurred.
         """
+        # special value to say that anything above is IPython and should be
+        # hidden.
+        __tracebackhide__ = "__ipython_bottom__"
         # Set our own excepthook in case the user code tries to call it
         # directly, so that the IPython crash handler doesn't get triggered
         old_excepthook, sys.excepthook = sys.excepthook, self.excepthook
diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py
index 5c8649b5408..a8feb755386 100644
--- a/IPython/core/magics/basic.py
+++ b/IPython/core/magics/basic.py
@@ -364,13 +364,25 @@ def xmode(self, parameter_s=''):
 
         Valid modes: Plain, Context, Verbose, and Minimal.
 
-        If called without arguments, acts as a toggle."""
+        If called without arguments, acts as a toggle.
+
+        When in verbose mode the value --show (and --hide) 
+        will respectively show (or hide) frames with ``__tracebackhide__ =
+        True`` value set.
+        """
 
         def xmode_switch_err(name):
             warn('Error changing %s exception modes.\n%s' %
                  (name,sys.exc_info()[1]))
 
         shell = self.shell
+        if parameter_s.strip() == "--show":
+            shell.InteractiveTB.skip_hidden = False
+            return
+        if parameter_s.strip() == "--hide":
+            shell.InteractiveTB.skip_hidden = True
+            return
+
         new_mode = parameter_s.strip().capitalize()
         try:
             shell.InteractiveTB.set_mode(mode=new_mode)
diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 69506800b2b..2525e658a86 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -4,20 +4,24 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+import bdb
+import builtins
+import os
 import signal
+import subprocess
 import sys
 import time
 import warnings
+from subprocess import PIPE, CalledProcessError, check_output
 from tempfile import NamedTemporaryFile
-from subprocess import check_output, CalledProcessError, PIPE
-import subprocess
+from textwrap import dedent
 from unittest.mock import patch
-import builtins
-import bdb
 
 import nose.tools as nt
 
 from IPython.core import debugger
+from IPython.testing import IPYTHON_TESTING_TIMEOUT_SCALE
+from IPython.testing.decorators import skip_win32
 
 #-----------------------------------------------------------------------------
 # Helper classes, from CPython's Pdb test suite
@@ -251,3 +255,69 @@ def raising_input(msg="", called=[0]):
         # implementation would involve a subprocess, but that adds issues with
         # interrupting subprocesses that are rather complex, so it's simpler
         # just to do it this way.
+
+@skip_win32
+def test_xmode_skip():
+    """that xmode skip frames
+
+    Not as a doctest as pytest does not run doctests.
+    """
+    import pexpect
+    env = os.environ.copy()
+    env["IPY_TEST_SIMPLE_PROMPT"] = "1"
+
+    child = pexpect.spawn(
+        sys.executable, ["-m", "IPython", "--colors=nocolor"], env=env
+    )
+    child.timeout = 15 * IPYTHON_TESTING_TIMEOUT_SCALE
+
+    child.expect("IPython")
+    child.expect("\n")
+    child.expect_exact("In [1]")
+
+    block = dedent(
+        """
+def f():
+    __tracebackhide__ = True
+    g()
+
+def g():
+    raise ValueError
+
+f()
+    """
+    )
+
+    for line in block.splitlines():
+        child.sendline(line)
+        child.expect_exact(line)
+    child.expect_exact("skipping")
+
+    block = dedent(
+        """
+def f():
+    __tracebackhide__ = True
+    g()
+
+def g():
+    from IPython.core.debugger import set_trace
+    set_trace()
+
+f()
+    """
+    )
+
+    for line in block.splitlines():
+        child.sendline(line)
+        child.expect_exact(line)
+
+    child.expect("ipdb>")
+    child.sendline("w")
+    child.expect("hidden")
+    child.expect("ipdb>")
+    child.sendline("skip_hidden false")
+    child.sendline("w")
+    child.expect("__traceba")
+    child.expect("ipdb>")
+
+    child.close()
diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index bea9a518033..35b0e7b8b2f 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -579,12 +579,15 @@ def __init__(self, color_scheme='Linux', call_pdb=False, ostream=None,
         self.check_cache = check_cache
 
         self.debugger_cls = debugger_cls or debugger.Pdb
+        self.skip_hidden = True
 
     def format_record(self, frame_info):
         """Format a single stack frame"""
         Colors = self.Colors  # just a shorthand + quicker name lookup
         ColorsNormal = Colors.Normal  # used a lot
 
+
+
         if isinstance(frame_info, stack_data.RepeatedFrames):
             return '    %s[... skipping similar frames: %s]%s\n' % (
                 Colors.excName, frame_info.description, ColorsNormal)
@@ -699,7 +702,23 @@ def format_exception_as_a_whole(self, etype, evalue, etb, number_of_lines_of_con
         head = self.prepare_header(etype, self.long_header)
         records = self.get_records(etb, number_of_lines_of_context, tb_offset)
 
-        frames = list(map(self.format_record, records))
+        frames = []
+        skipped = 0
+        for r in records:
+            if not isinstance(r, stack_data.RepeatedFrames) and self.skip_hidden:
+                if r.frame.f_locals.get("__tracebackhide__", 0):
+                    skipped += 1
+                    continue
+            if skipped:
+                Colors = self.Colors  # just a shorthand + quicker name lookup
+                ColorsNormal = Colors.Normal  # used a lot
+                frames.append(
+                    "    %s[... skipping hidden %s frame]%s\n"
+                    % (Colors.excName, skipped, ColorsNormal)
+                )
+                skipped = 0
+            frames.append(self.format_record(r))
+
 
         formatted_exception = self.format_exception(etype, evalue)
         if records:
diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index f3268e70bd6..ffd53c65e78 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -41,6 +41,16 @@ def get_prompt_tokens():
                                         global_namespace={},
                                         parent=self.shell,
                                        )
+            # add a completer for all the do_ methods
+            methods_names = [m[3:] for m in dir(self) if m.startswith("do_")]
+
+            def gen_comp(self, text):
+                return [m for m in methods_names if m.startswith(text)]
+            import types
+            newcomp = types.MethodType(gen_comp, compl)
+            compl.custom_matchers.insert(0, newcomp)
+            # end add completer.
+
             self._ptcomp = IPythonPTCompleter(compl)
 
         options = dict(
diff --git a/appveyor.yml b/appveyor.yml
index b79c7f26ff4..d20effdf815 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,13 +4,6 @@ matrix:
 
 environment:
   matrix:
-   - PYTHON: "C:\\Python36"
-     PYTHON_VERSION: "3.6.x"
-     PYTHON_ARCH: "32"
-
-   - PYTHON: "C:\\Python36-x64"
-     PYTHON_VERSION: "3.6.x"
-     PYTHON_ARCH: "64"
 
    - PYTHON: "C:\\Python37-x64"
      PYTHON_VERSION: "3.7.x"
diff --git a/docs/source/whatsnew/pr/skip_tracebackhide.rst b/docs/source/whatsnew/pr/skip_tracebackhide.rst
new file mode 100644
index 00000000000..0acfecf127d
--- /dev/null
+++ b/docs/source/whatsnew/pr/skip_tracebackhide.rst
@@ -0,0 +1,11 @@
+The default tracebackmode will now skip frames that are marked with
+``__tracebackhide__ = True`` and show how many traceback frames have been
+skipped. This can be toggled by using :magic:`xmode` with the ``--show`` or
+``--hide`` attribute. It will have no effect on non verbose traceback modes. 
+
+The ipython debugger also now understand ``__tracebackhide__`` as well and will
+skip hidden frames when displaying. Movement up and down the stack will skip the
+hidden frames and will show how many frames were hidden. Internal IPython frames
+are also now hidden by default. The behavior can be changed with the
+``skip_hidden`` command and accepts "yes", "no", "true" and "false" case
+insensitive parameters.

From b1401f76f9cdd9814d9830e329f676e1b4325fe9 Mon Sep 17 00:00:00 2001
From: Brendan Gerrity <bgerrity@fb.com>
Date: Mon, 15 Jun 2020 22:13:59 -0400
Subject: [PATCH 0176/1407] [interactiveshell] add type annotation to run cell

---
 IPython/core/interactiveshell.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index e52b4191a57..14f824889a6 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2862,7 +2862,7 @@ def run_cell(self, raw_cell, store_history=False, silent=False, shell_futures=Tr
                 self.events.trigger('post_run_cell', result)
         return result
 
-    def _run_cell(self, raw_cell:str, store_history:bool, silent:bool, shell_futures:bool):
+    def _run_cell(self, raw_cell:str, store_history:bool, silent:bool, shell_futures:bool) -> ExecutionResult:
         """Internal method to run a complete IPython cell."""
         coro = self.run_cell_async(
             raw_cell,
@@ -2890,7 +2890,6 @@ def _run_cell(self, raw_cell:str, store_history:bool, silent:bool, shell_futures
             result.error_in_exec = e
             self.showtraceback(running_compiled_code=True)
             return result
-        return
 
     def should_run_async(self, raw_cell: str) -> bool:
         """Return whether a cell should be run asynchronously via a coroutine runner

From 212705716aa24ecc1c68b7e788295e58a34b3995 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 16 Jun 2020 15:20:54 -0700
Subject: [PATCH 0177/1407] Show make sure to flush hidden exception to screen.

This is really unlikely but can happen if the exception is raised from
within a stack of hidden frame, in which case we do want to say there
were some hidden frames.

I guess in that case we actually really want to not hide that last one,
but this might really be a rare case.

This is already fixed in the backport to 7.x
---
 IPython/core/ultratb.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 35b0e7b8b2f..e59e61ed4f6 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -718,7 +718,13 @@ def format_exception_as_a_whole(self, etype, evalue, etb, number_of_lines_of_con
                 )
                 skipped = 0
             frames.append(self.format_record(r))
-
+        if skipped:
+            Colors = self.Colors  # just a shorthand + quicker name lookup
+            ColorsNormal = Colors.Normal  # used a lot
+            frames.append(
+                "    %s[... skipping hidden %s frame]%s\n"
+                % (Colors.excName, skipped, ColorsNormal)
+            )
 
         formatted_exception = self.format_exception(etype, evalue)
         if records:

From 046657853308d279e654ae1035a7c9c7e84b27e9 Mon Sep 17 00:00:00 2001
From: Corentin Cadiou <contact@cphyc.me>
Date: Wed, 17 Jun 2020 16:02:39 +0100
Subject: [PATCH 0178/1407] Add docstring

---
 IPython/core/completer.py | 42 ++++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index fdbfc8bfb0e..804ae8fe06d 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -753,7 +753,8 @@ def get__all__entries(obj):
     return [w for w in words if isinstance(w, str)]
 
 
-def match_dict_keys(keys: List[Union[str, bytes]], prefix: str, delims: str) -> Tuple[str, int, List[str]]:
+def match_dict_keys(keys: List[Union[str, bytes, Tuple[Union[str, bytes]]]], prefix: str, delims: str,
+                    prefix_tuple: Tuple[str, bytes]=()) -> Tuple[str, int, List[str]]:
     """Used by dict_key_matches, matching the prefix to a list of keys
 
     Parameters
@@ -761,9 +762,12 @@ def match_dict_keys(keys: List[Union[str, bytes]], prefix: str, delims: str) ->
     keys:
         list of keys in dictionary currently being completed.
     prefix:
-        Part of the text already typed by the user. e.g. `mydict[b'fo`
+        Part of the text already typed by the user. E.g. `mydict[b'fo`
     delims:
         String of delimiters to consider when finding the current key.
+    prefix_tuple: optional
+        Part of the text already typed in multi-key index cases. E.g. for 
+        `mydict['foo', "bar", 'b`, this would be `('foo', 'bar')`.
 
     Returns
     =======
@@ -774,7 +778,23 @@ def match_dict_keys(keys: List[Union[str, bytes]], prefix: str, delims: str) ->
     ``matches`` a list of replacement/completion
 
     """
-    keys = [k for k in keys if isinstance(k, (str, bytes))]
+    Nprefix = len(prefix_tuple)
+    def filter_by_prefix_tuple(key):
+        if len(key) < Nprefix:
+            return False
+        for k, pt in zip(key, prefix_tuple):
+            if k != pt:
+                return False
+        return True
+
+    new_keys = []
+    for k in keys:
+        if isinstance(k, (str, bytes)):
+            new_keys.append(k)
+        elif isinstance(k, tuple) and filter_by_prefix_tuple(k):
+            new_keys.append(k[Nprefix])
+
+    keys = new_keys
     if not prefix:
         return '', 0, [repr(k) for k in keys
                       if isinstance(k, (str, bytes))]
@@ -1641,6 +1661,7 @@ def dict_key_matches(self, text:str) -> List[str]:
             )
             \[   # open bracket
             \s*  # and optional whitespace
+            # Capture any number of str-like objects (e.g. "a", "b", 'c')
             ((?:[uUbB]?  # string prefix (r not handled)
                 (?:
                     '(?:[^']|(?<!\\)\\')*'
@@ -1670,10 +1691,11 @@ def dict_key_matches(self, text:str) -> List[str]:
             }
 
         match = regexps[self.greedy].search(self.text_until_cursor)
+
         if match is None:
             return []
 
-        expr, prefix = match.groups()
+        expr, prefix0, prefix = match.groups()
         try:
             obj = eval(expr, self.namespace)
         except Exception:
@@ -1685,7 +1707,13 @@ def dict_key_matches(self, text:str) -> List[str]:
         keys = self._get_keys(obj)
         if not keys:
             return keys
-        closing_quote, token_offset, matches = match_dict_keys(keys, prefix, self.splitter.delims)
+
+        if prefix0 != '':
+            tuple_prefix = eval(prefix0)
+        else:
+            tuple_prefix = tuple()
+
+        closing_quote, token_offset, matches = match_dict_keys(keys, tuple_prefix, prefix, self.splitter.delims)
         if not matches:
             return matches
 
@@ -1695,7 +1723,7 @@ def dict_key_matches(self, text:str) -> List[str]:
         # - the start of the completion
         text_start = len(self.text_until_cursor) - len(text)
         if prefix:
-            key_start = match.start(2)
+            key_start = match.start(3)
             completion_start = key_start + token_offset
         else:
             key_start = completion_start = match.end()
@@ -2097,7 +2125,7 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
 
         # Start with a clean slate of completions
         matches = []
-        
+
         # FIXME: we should extend our api to return a dict with completions for
         # different types of objects.  The rlcomplete() method could then
         # simply collapse the dict into a list for readline, but we'd have

From 1d92da2460724b7524e64bf72382ccd94da70c58 Mon Sep 17 00:00:00 2001
From: Corentin Cadiou <contact@cphyc.me>
Date: Wed, 17 Jun 2020 16:07:04 +0100
Subject: [PATCH 0179/1407] Neater naming

This also make mypy happy
---
 IPython/core/completer.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 804ae8fe06d..a3a318cae5d 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -754,7 +754,7 @@ def get__all__entries(obj):
 
 
 def match_dict_keys(keys: List[Union[str, bytes, Tuple[Union[str, bytes]]]], prefix: str, delims: str,
-                    prefix_tuple: Tuple[str, bytes]=()) -> Tuple[str, int, List[str]]:
+                    extra_prefix: Optional[Tuple[str, bytes]]=None) -> Tuple[str, int, List[str]]:
     """Used by dict_key_matches, matching the prefix to a list of keys
 
     Parameters
@@ -765,7 +765,7 @@ def match_dict_keys(keys: List[Union[str, bytes, Tuple[Union[str, bytes]]]], pre
         Part of the text already typed by the user. E.g. `mydict[b'fo`
     delims:
         String of delimiters to consider when finding the current key.
-    prefix_tuple: optional
+    extra_prefix: optional
         Part of the text already typed in multi-key index cases. E.g. for 
         `mydict['foo', "bar", 'b`, this would be `('foo', 'bar')`.
 
@@ -778,6 +778,7 @@ def match_dict_keys(keys: List[Union[str, bytes, Tuple[Union[str, bytes]]]], pre
     ``matches`` a list of replacement/completion
 
     """
+    prefix_tuple = extra_prefix if extra_prefix else ()
     Nprefix = len(prefix_tuple)
     def filter_by_prefix_tuple(key):
         if len(key) < Nprefix:
@@ -1708,12 +1709,9 @@ def dict_key_matches(self, text:str) -> List[str]:
         if not keys:
             return keys
 
-        if prefix0 != '':
-            tuple_prefix = eval(prefix0)
-        else:
-            tuple_prefix = tuple()
+        extra_prefix = eval(prefix0) if prefix0 != '' else None
 
-        closing_quote, token_offset, matches = match_dict_keys(keys, tuple_prefix, prefix, self.splitter.delims)
+        closing_quote, token_offset, matches = match_dict_keys(keys, prefix, self.splitter.delims, extra_prefix=extra_prefix)
         if not matches:
             return matches
 

From f99a8b177609a942cfa69e82d8aaac1a39563587 Mon Sep 17 00:00:00 2001
From: Corentin Cadiou <contact@cphyc.me>
Date: Thu, 18 Jun 2020 09:42:36 +0100
Subject: [PATCH 0180/1407] Fix Mypy

---
 IPython/core/completer.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index a3a318cae5d..9a001e33f0b 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -786,19 +786,23 @@ def filter_by_prefix_tuple(key):
         for k, pt in zip(key, prefix_tuple):
             if k != pt:
                 return False
-        return True
+        else:
+            return True
+
+    filtered_keys:List[Union[str,bytes]] = []
+    def _add_to_filtered_keys(key):
+        if isinstance(key, (str, bytes)):
+            filtered_keys.append(key)
 
-    new_keys = []
     for k in keys:
-        if isinstance(k, (str, bytes)):
-            new_keys.append(k)
-        elif isinstance(k, tuple) and filter_by_prefix_tuple(k):
-            new_keys.append(k[Nprefix])
+        if isinstance(k, tuple):
+            if filter_by_prefix_tuple(k):
+                _add_to_filtered_keys(k[Nprefix])
+        else:
+            _add_to_filtered_keys(k)
 
-    keys = new_keys
     if not prefix:
-        return '', 0, [repr(k) for k in keys
-                      if isinstance(k, (str, bytes))]
+        return '', 0, [repr(k) for k in filtered_keys]
     quote_match = re.search('["\']', prefix)
     assert quote_match is not None # silence mypy
     quote = quote_match.group()
@@ -814,7 +818,7 @@ def filter_by_prefix_tuple(key):
     token_prefix = token_match.group()
 
     matched:List[str] = []
-    for key in keys:
+    for key in filtered_keys:
         try:
             if not key.startswith(prefix_str):
                 continue

From 6e8548b44f4383b84f2fd7eadf7fe1a181e84244 Mon Sep 17 00:00:00 2001
From: Corentin Cadiou <contact@cphyc.me>
Date: Fri, 19 Jun 2020 10:40:04 +0100
Subject: [PATCH 0181/1407] Add test for test_match_dict

Also fix a mistake spotted using the tests.
---
 IPython/core/completer.py            |  2 +-
 IPython/core/tests/test_completer.py | 29 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 9a001e33f0b..e442cb2b904 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -781,7 +781,7 @@ def match_dict_keys(keys: List[Union[str, bytes, Tuple[Union[str, bytes]]]], pre
     prefix_tuple = extra_prefix if extra_prefix else ()
     Nprefix = len(prefix_tuple)
     def filter_by_prefix_tuple(key):
-        if len(key) < Nprefix:
+        if len(key) <= Nprefix:
             return False
         for k, pt in zip(key, prefix_tuple):
             if k != pt:
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 80f479f156b..45e85d4b8ce 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -846,6 +846,35 @@ def test_match_dict_keys(self):
 
         match_dict_keys
 
+    def test_match_dict_keys_tuple(self):
+        """
+        Test that match_dict_keys called with extra prefix works on a couple of use case,
+        does return what expected, and does not crash.
+        """
+        delims = " \t\n`!@#$^&*()=+[{]}\\|;:'\",<>?"
+        
+        keys = [("foo", "bar"), ("foo", "oof"), ("foo", b"bar"), ('other', 'test')]
+
+        # Completion on first key == "foo"
+        assert match_dict_keys(keys, "'", delims=delims, extra_prefix=("foo",)) == ("'", 1, ["bar", "oof"])
+        assert match_dict_keys(keys, "\"", delims=delims, extra_prefix=("foo",)) == ("\"", 1, ["bar", "oof"])
+        assert match_dict_keys(keys, "'o", delims=delims, extra_prefix=("foo",)) == ("'", 1, ["oof"])
+        assert match_dict_keys(keys, "\"o", delims=delims, extra_prefix=("foo",)) == ("\"", 1, ["oof"])
+        assert match_dict_keys(keys, "b'", delims=delims, extra_prefix=("foo",)) == ("'", 2, ["bar"])
+        assert match_dict_keys(keys, "b\"", delims=delims, extra_prefix=("foo",)) == ("\"", 2, ["bar"])
+        assert match_dict_keys(keys, "b'b", delims=delims, extra_prefix=("foo",)) == ("'", 2, ["bar"])
+        assert match_dict_keys(keys, "b\"b", delims=delims, extra_prefix=("foo",)) == ("\"", 2, ["bar"])
+
+        # No Completion
+        assert match_dict_keys(keys, "'", delims=delims, extra_prefix=("no_foo",)) == ("'", 1, [])
+        assert match_dict_keys(keys, "'", delims=delims, extra_prefix=("fo",)) == ("'", 1, [])
+
+        keys = [('foo1', 'foo2', 'foo3', 'foo4'), ('foo1', 'foo2', 'bar', 'foo4')]
+        assert match_dict_keys(keys, "'foo", delims=delims, extra_prefix=('foo1',)) == ("'", 1, ["foo2", "foo2"])
+        assert match_dict_keys(keys, "'foo", delims=delims, extra_prefix=('foo1', 'foo2')) == ("'", 1, ["foo3"])
+        assert match_dict_keys(keys, "'foo", delims=delims, extra_prefix=('foo1', 'foo2', 'foo3')) == ("'", 1, ["foo4"])
+        assert match_dict_keys(keys, "'foo", delims=delims, extra_prefix=('foo1', 'foo2', 'foo3', 'foo4')) == ("'", 1, [])
+
     def test_dict_key_completion_string(self):
         """Test dictionary key completion for string keys"""
         ip = get_ipython()

From ae49ed9da5e7203f1921625d06a59e63da5a7f03 Mon Sep 17 00:00:00 2001
From: Corentin Cadiou <contact@cphyc.me>
Date: Fri, 19 Jun 2020 11:09:20 +0100
Subject: [PATCH 0182/1407] Prevent completion on keys with garbage in it

---
 IPython/core/completer.py            | 14 ++++++++++----
 IPython/core/tests/test_completer.py |  4 ++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index e442cb2b904..dcee838127a 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -780,14 +780,20 @@ def match_dict_keys(keys: List[Union[str, bytes, Tuple[Union[str, bytes]]]], pre
     """
     prefix_tuple = extra_prefix if extra_prefix else ()
     Nprefix = len(prefix_tuple)
-    def filter_by_prefix_tuple(key):
+    def filter_prefix_tuple(key):
+        # Reject too short keys
         if len(key) <= Nprefix:
             return False
+        # Reject keys with non str/bytes in it
+        for k in key:
+            if not isinstance(k, (str, bytes)):
+                return False
+        # Reject keys that do not match the prefix
         for k, pt in zip(key, prefix_tuple):
             if k != pt:
                 return False
-        else:
-            return True
+        # All checks passed!
+        return True
 
     filtered_keys:List[Union[str,bytes]] = []
     def _add_to_filtered_keys(key):
@@ -796,7 +802,7 @@ def _add_to_filtered_keys(key):
 
     for k in keys:
         if isinstance(k, tuple):
-            if filter_by_prefix_tuple(k):
+            if filter_prefix_tuple(k):
                 _add_to_filtered_keys(k[Nprefix])
         else:
             _add_to_filtered_keys(k)
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 45e85d4b8ce..e9d8b51f91d 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -920,12 +920,16 @@ def test_dict_key_completion_string(self):
             "bad": None,
             object(): None,
             5: None,
+            ("abe", None): None,
+            (None, "abf"): None
         }
 
         _, matches = complete(line_buffer="d['a")
         nt.assert_in("abc", matches)
         nt.assert_in("abd", matches)
         nt.assert_not_in("bad", matches)
+        nt.assert_not_in("abe", matches)
+        nt.assert_not_in("abf", matches)
         assert not any(m.endswith(("]", '"', "'")) for m in matches), matches
 
         # check escaping and whitespace

From 6f42c1f7a007fc075b7e3509a485e54a736a9501 Mon Sep 17 00:00:00 2001
From: Corentin Cadiou <contact@cphyc.me>
Date: Fri, 19 Jun 2020 11:09:27 +0100
Subject: [PATCH 0183/1407] Add many tests

---
 IPython/core/tests/test_completer.py | 68 ++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index e9d8b51f91d..ad5a080ec9d 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -963,6 +963,74 @@ def test_dict_key_completion_string(self):
             _, matches = complete(line_buffer="d['before-af")
             nt.assert_in("before-after", matches)
 
+        # check completion on tuple-of-string keys at different stage - on first key
+        ip.user_ns["d"] = {('foo', 'bar'): None}
+        _, matches = complete(line_buffer="d[")
+        nt.assert_in("'foo'", matches)
+        nt.assert_not_in("'foo']", matches)
+        nt.assert_not_in("'bar'", matches)
+        nt.assert_not_in("foo", matches)
+        nt.assert_not_in("bar", matches)
+
+        # - match the prefix
+        _, matches = complete(line_buffer="d['f")
+        nt.assert_in("foo", matches)
+        nt.assert_not_in("foo']", matches)
+        nt.assert_not_in("foo\"]", matches)
+        _, matches = complete(line_buffer="d['foo")
+        nt.assert_in("foo", matches)
+
+        # - can complete on second key
+        _, matches = complete(line_buffer="d['foo', ")
+        nt.assert_in("'bar'", matches)
+        _, matches = complete(line_buffer="d['foo', 'b")
+        nt.assert_in("bar", matches)
+        nt.assert_not_in("foo", matches)
+
+        # - does not propose missing keys
+        _, matches = complete(line_buffer="d['foo', 'f")
+        nt.assert_not_in("bar", matches)
+        nt.assert_not_in("foo", matches)
+
+        # check sensitivity to following context
+        _, matches = complete(line_buffer="d['foo',]", cursor_pos=8)
+        nt.assert_in("'bar'", matches)
+        nt.assert_not_in("bar", matches)
+        nt.assert_not_in("'foo'", matches)
+        nt.assert_not_in("foo", matches)
+
+        _, matches = complete(line_buffer="d['']", cursor_pos=3)
+        nt.assert_in("foo", matches)
+        assert not any(m.endswith(("]", '"', "'")) for m in matches), matches
+
+        _, matches = complete(line_buffer='d[""]', cursor_pos=3)
+        nt.assert_in("foo", matches)
+        assert not any(m.endswith(("]", '"', "'")) for m in matches), matches
+
+        _, matches = complete(line_buffer='d["foo","]', cursor_pos=9)
+        nt.assert_in("bar", matches)
+        assert not any(m.endswith(("]", '"', "'")) for m in matches), matches
+
+        _, matches = complete(line_buffer='d["foo",]', cursor_pos=8)
+        nt.assert_in("'bar'", matches)
+        nt.assert_not_in("bar", matches)
+
+        # Can complete with longer tuple keys
+        ip.user_ns["d"] = {('foo', 'bar', 'foobar'): None}
+
+        # - can complete second key
+        _, matches = complete(line_buffer="d['foo', 'b")
+        nt.assert_in('bar', matches)
+        nt.assert_not_in('foo', matches)
+        nt.assert_not_in('foobar', matches)
+
+        # - can complete third key
+        _, matches = complete(line_buffer="d['foo', 'bar', 'fo")
+        nt.assert_in('foobar', matches)
+        nt.assert_not_in('foo', matches)
+        nt.assert_not_in('bar', matches)
+
+
     def test_dict_key_completion_contexts(self):
         """Test expression contexts in which dict key completion occurs"""
         ip = get_ipython()

From 45062151f985459cc1749fe93759d31f6a428b76 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Jun 2020 14:03:28 -0700
Subject: [PATCH 0184/1407] update what's new

---
 docs/source/whatsnew/development.rst          |  1 +
 .../source/whatsnew/pr/skip_tracebackhide.rst | 11 ------
 docs/source/whatsnew/version7.rst             | 37 +++++++++++++++++++
 3 files changed, 38 insertions(+), 11 deletions(-)
 delete mode 100644 docs/source/whatsnew/pr/skip_tracebackhide.rst

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index f2bde112f66..9e9b2984c6c 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -23,6 +23,7 @@ Need to be updated:
    pr/*
 
 
+
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 
 As a reminder, IPython master has diverged from the 7.x branch, thus master may
diff --git a/docs/source/whatsnew/pr/skip_tracebackhide.rst b/docs/source/whatsnew/pr/skip_tracebackhide.rst
deleted file mode 100644
index 0acfecf127d..00000000000
--- a/docs/source/whatsnew/pr/skip_tracebackhide.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-The default tracebackmode will now skip frames that are marked with
-``__tracebackhide__ = True`` and show how many traceback frames have been
-skipped. This can be toggled by using :magic:`xmode` with the ``--show`` or
-``--hide`` attribute. It will have no effect on non verbose traceback modes. 
-
-The ipython debugger also now understand ``__tracebackhide__`` as well and will
-skip hidden frames when displaying. Movement up and down the stack will skip the
-hidden frames and will show how many frames were hidden. Internal IPython frames
-are also now hidden by default. The behavior can be changed with the
-``skip_hidden`` command and accepts "yes", "no", "true" and "false" case
-insensitive parameters.
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 3d9abc96f6f..763be7caad9 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,43 @@
  7.x Series
 ============
 
+.. _version 716:
+
+IPython 7.16
+============
+
+
+The default traceback mode will now skip frames that are marked with
+``__tracebackhide__ = True`` and show how many traceback frames have been
+skipped. This can be toggled by using :magic:`xmode` with the ``--show`` or
+``--hide`` attribute. It will have no effect on non verbose traceback modes.
+
+The ipython debugger also now understands ``__tracebackhide__`` as well and will
+skip hidden frames when displaying. Movement up and down the stack will skip the
+hidden frames and will show how many frames were hidden. Internal IPython frames
+are also now hidden by default. The behavior can be changed with the
+``skip_hidden`` while in the debugger, command and accepts "yes", "no", "true"
+and "false" case insensitive parameters.
+
+
+Misc Noticeable changes:
+------------------------
+
+- Exceptions are now (re)raised when running notebooks via the :magic:`%run`, helping to catch issues in workflows and
+  pipelines. :ghpull:`12301`
+- Fix inputhook for qt 5.15.0 :ghpull:`12355`
+- Fix wx inputhook :ghpull:`12375`
+- Add handling for malformed pathext env var (Windows) :ghpull:`12367`
+- use $SHELL in system_piped :ghpull:`12360` for uniform behavior with
+  ipykernel.
+
+Reproducible Build
+------------------
+
+IPython 7.15 reproducible build did not work, so we try again this month
+:ghpull:`12358`.
+
+
 .. _version 715:
 
 IPython 7.15

From 4777fb89de59bce6c91c7b978dd7013321a6ea77 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Jun 2020 14:11:43 -0700
Subject: [PATCH 0185/1407] stats

---
 docs/source/whatsnew/github-stats-7.rst | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index a1025969b00..41077b5d6fe 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -1,6 +1,28 @@
 Issues closed in the 7.x development cycle
 ==========================================
 
+
+Issues closed in 7.16
+---------------------
+
+GitHub stats for 2020/05/29 - 2020/06/26 (tag: 7.15.0)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 0 issues and merged 18 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A7.16>`__
+
+The following 7 authors contributed 22 commits.
+
+* Benjamin Ragan-Kelley
+* dalthviz
+* Frank Tobia
+* Matthias Bussonnier
+* palewire
+* Paul McCarthy
+* Talley Lambert
+
+
 Issues closed in 7.15
 ---------------------
 

From a633eea03a02ff526bd6e3f9a88f724403addd43 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Jun 2020 14:17:58 -0700
Subject: [PATCH 0186/1407] Use frappuccino to generate API diffs.

---
 docs/source/whatsnew/version7.rst | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 763be7caad9..286f16fb9f4 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -39,6 +39,30 @@ IPython 7.15 reproducible build did not work, so we try again this month
 :ghpull:`12358`.
 
 
+API Changes
+-----------
+
+Change of API and exposed objects automatically detected using `frappuccino
+<https://pypi.org/project/frappuccino/>`_ (still in beta):
+
+
+The following items are new and mostly related to understanding ``__tracebackbhide__``::
+
+    + IPython.core.debugger.Pdb.do_down(self, arg)
+    + IPython.core.debugger.Pdb.do_skip_hidden(self, arg)
+    + IPython.core.debugger.Pdb.do_up(self, arg)
+    + IPython.core.debugger.Pdb.hidden_frames(self, stack)
+    + IPython.core.debugger.Pdb.stop_here(self, frame)
+
+
+The following items have been removed::
+
+    - IPython.core.debugger.Pdb.new_do_down
+    - IPython.core.debugger.Pdb.new_do_up
+
+Those were implementation details.
+
+
 .. _version 715:
 
 IPython 7.15

From f380b53e7231d57a316ae6b2fbdabdb6f3c6447b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Jun 2020 15:31:39 -0700
Subject: [PATCH 0187/1407] fix conda build

---
 tools/retar.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/retar.py b/tools/retar.py
index 9b5e73c6baa..efd8c0c6bbd 100644
--- a/tools/retar.py
+++ b/tools/retar.py
@@ -46,6 +46,7 @@
     m2.size = m.size
     m2.type = m.type
     m2.linkname = m.linkname
+    m2.mode = m.mode
     if m.isdir():
         new.addfile(m2)
     else:

From cc9da29abf59e877e7a9aff2558ddc15604c324b Mon Sep 17 00:00:00 2001
From: Maor Kleinberger <kmaork@gmail.com>
Date: Sat, 27 Jun 2020 15:52:22 +0300
Subject: [PATCH 0188/1407] Allow passing extra options to TerminalPdb.pt_init

Currently, subclasses of TerminalPdb (like in https://github.com/kmaork/madbg/blob/master/madbg/debugger.py#L55) will have to duplicate the entire pt_init method in order to add additional arguments for the prompt session (which accepts about 40 of them). An example would be a subclass that wants to write the prompts to a different output stream than the default. After this change it would just have to override the call to pt_init with `pt_init(dict(input=input, output=output))`
---
 IPython/terminal/debugger.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index ffd53c65e78..9ec246697d4 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -26,12 +26,21 @@
 class TerminalPdb(Pdb):
     """Standalone IPython debugger."""
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, pt_session_options=None, **kwargs):
         Pdb.__init__(self, *args, **kwargs)
         self._ptcomp = None
-        self.pt_init()
-
-    def pt_init(self):
+        self.pt_init(pt_session_options)
+
+    def pt_init(self, pt_session_options=None):
+        """Initialize the prompt session and the prompt loop
+        and store them in self.pt_app and self.pt_loop.
+        
+        Additional keyword arguments for the PromptSession class
+        can be specified in pt_session_options.
+        """
+        if pt_session_options is None:
+            pt_session_options = {}
+        
         def get_prompt_tokens():
             return [(Token.Prompt, self.prompt)]
 
@@ -68,6 +77,7 @@ def gen_comp(self, text):
 
         if not PTK3:
             options['inputhook'] = self.shell.inputhook
+        options.update(pt_session_options)
         self.pt_loop = asyncio.new_event_loop()
         self.pt_app = PromptSession(**options)
 

From 30e3d9f89e44c46310642680319333f0065fae78 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 30 Jun 2020 13:13:10 -0700
Subject: [PATCH 0189/1407] catch unrecoverable error

Switch to print_exception
---
 IPython/terminal/ptutils.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/IPython/terminal/ptutils.py b/IPython/terminal/ptutils.py
index ed7ad45eb45..3cf3c11215b 100644
--- a/IPython/terminal/ptutils.py
+++ b/IPython/terminal/ptutils.py
@@ -112,8 +112,11 @@ def get_completions(self, document, complete_event):
             try:
                 yield from self._get_completions(body, offset, cursor_position, self.ipy_completer)
             except Exception as e:
-                from traceback import print_tb
-                print_tb(e)
+                try:
+                    exc_type, exc_value, exc_tb = sys.exc_info()
+                    traceback.print_exception(exc_type, exc_value, exc_tb)
+                except AttributeError:
+                    print('Unrecoverable Error in completions')
 
     @staticmethod
     def _get_completions(body, offset, cursor_position, ipyc):

From 07e9a62f720fc6a25e80138441792a55f406717f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 30 Jun 2020 13:55:19 -0700
Subject: [PATCH 0190/1407] forgotten sys

---
 IPython/terminal/ptutils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/terminal/ptutils.py b/IPython/terminal/ptutils.py
index 3cf3c11215b..7679b4a6ba2 100644
--- a/IPython/terminal/ptutils.py
+++ b/IPython/terminal/ptutils.py
@@ -20,6 +20,7 @@
 
 import pygments.lexers as pygments_lexers
 import os
+import sys
 
 _completion_sentinel = object()
 

From ba11b22ef9f8c94d1ead775dc0ef69043ba9605c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 30 Jun 2020 13:59:42 -0700
Subject: [PATCH 0191/1407] forgotten traceback

---
 IPython/terminal/ptutils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/terminal/ptutils.py b/IPython/terminal/ptutils.py
index 7679b4a6ba2..c390d4972a7 100644
--- a/IPython/terminal/ptutils.py
+++ b/IPython/terminal/ptutils.py
@@ -21,6 +21,7 @@
 import pygments.lexers as pygments_lexers
 import os
 import sys
+import traceback
 
 _completion_sentinel = object()
 

From a3844f58cdab51f3b0581b9638efcb4c0e6f2d05 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 28 Jun 2020 18:07:41 -0700
Subject: [PATCH 0192/1407] NEP 29 stop support for 3.6

---
 setup.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 29d7260b04b..c8b75da0590 100755
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@
 #
 # This check is also made in IPython/__init__, don't forget to update both when
 # changing Python version requirements.
-if sys.version_info < (3, 6):
+if sys.version_info < (3, 7):
     pip_message = 'This may be due to an out of date pip. Make sure you have pip >= 9.0.1.'
     try:
         import pip
@@ -40,10 +40,11 @@
 
 
     error = """
-IPython 7.10+ supports Python 3.6 and above, following NEP 29.
+IPython 7.17+ supports Python 3.7 and above, following NEP 29.
 When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
 Python 3.3 and 3.4 were supported up to IPython 6.x.
 Python 3.5 was supported with IPython 7.0 to 7.9.
+Python 3.6 was supported with IPython up to 7.16.
 
 See IPython `README.rst` file for more information:
 
@@ -227,7 +228,7 @@
 extras_require['all'] = list(sorted(everything))
 
 if 'setuptools' in sys.modules:
-    setuptools_extra_args['python_requires'] = '>=3.6'
+    setuptools_extra_args['python_requires'] = '>=3.7'
     setuptools_extra_args['zip_safe'] = False
     setuptools_extra_args['entry_points'] = {
         'console_scripts': find_entry_points(),

From 7a5eb2cb0d4aa5a95a8798cce9e6008afebfc35f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 2 Jul 2020 13:36:18 -0700
Subject: [PATCH 0193/1407] =?UTF-8?q?Still=20test=20on=203.6=20=E2=80=93?=
 =?UTF-8?q?=C2=A0Release=20is=203.7+?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Just in case we still test on 3.6 but won't make efforts to write 3.6
compatible code.
---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4c46bbc6bbc..909b77af7ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,11 @@ before_install:
 install:
   - pip install pip --upgrade
   - pip install setuptools --upgrade
+  - if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
+      echo "for the tiem being still test on 3.6";
+      sed -i bkp s/7/6/g setup.py;
+      git diff;
+    fi
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
   - pip install trio curio --upgrade --upgrade-strategy eager
   - pip install pytest 'matplotlib !=3.2.0' mypy

From 19203b1974612476912def65ab948c9b388c079b Mon Sep 17 00:00:00 2001
From: Sylvain Corlay <sylvain.corlay@gmail.com>
Date: Wed, 1 Jul 2020 23:29:47 +0200
Subject: [PATCH 0194/1407] Test Python 3.6

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 909b77af7ae..aa45db220db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,6 +76,9 @@ after_success:
 
 matrix:
   include:
+    - arch: amd64
+      python: "3.6"
+      dist: xenial
     - arch: amd64
       python: "3.7"
       dist: xenial

From 9a6ccdcab99de0f7a388fad0f2006886bb4ee792 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 6 Jul 2020 11:52:47 -0700
Subject: [PATCH 0195/1407] sed is weird

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index aa45db220db..3f894e55a36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ install:
   - pip install setuptools --upgrade
   - if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
       echo "for the tiem being still test on 3.6";
-      sed -i bkp s/7/6/g setup.py;
+      sed -ibkp s/7/6/g setup.py;
       git diff;
     fi
   - pip install -e file://$PWD#egg=ipython[test] --upgrade

From 2c78df7c3a856bf877dbd05cea919fe52cd27de2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 11 Jul 2020 11:20:06 -0700
Subject: [PATCH 0196/1407] Reformat some of the IPython docstrings.

---
 IPython/core/async_helpers.py    |  1 -
 IPython/core/interactiveshell.py | 49 ++++++++++++++++----------------
 setupbase.py                     |  6 ++--
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/IPython/core/async_helpers.py b/IPython/core/async_helpers.py
index fb4cc193250..67ff169c774 100644
--- a/IPython/core/async_helpers.py
+++ b/IPython/core/async_helpers.py
@@ -62,7 +62,6 @@ def _pseudo_sync_runner(coro):
     See discussion in https://github.com/python-trio/trio/issues/608,
 
     Credit to Nathaniel Smith
-
     """
     try:
         coro.send(None)
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index ab2dbaa508b..0bbc18afeea 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -173,8 +173,8 @@ def _ast_asyncify(cell:str, wrapper_name:str) -> ast.Module:
     """
     Parse a cell with top-level await and modify the AST to be able to run it later.
 
-    Parameter
-    ---------
+    Parameters
+    ----------
 
     cell: str
         The code cell to asyncronify
@@ -183,28 +183,29 @@ def _ast_asyncify(cell:str, wrapper_name:str) -> ast.Module:
         advised to **not** use a python identifier in order to not pollute the
         global namespace in which the function will be ran.
 
-    Return
-    ------
-
-    A module object AST containing **one** function named `wrapper_name`.
-
-    The given code is wrapped in a async-def function, parsed into an AST, and
-    the resulting function definition AST is modified to return the last
-    expression.
-
-    The last expression or await node is moved into a return statement at the
-    end of the function, and removed from its original location. If the last
-    node is not Expr or Await nothing is done.
-
-    The function `__code__` will need to be later modified  (by
-    ``removed_co_newlocals``) in a subsequent step to not create new `locals()`
-    meaning that the local and global scope are the same, ie as if the body of
-    the function was at module level.
-
-    Lastly a call to `locals()` is made just before the last expression of the
-    function, or just after the last assignment or statement to make sure the
-    global dict is updated as python function work with a local fast cache which
-    is updated only on `local()` calls.
+    Returns
+    -------
+    
+    ModuleType:
+        A module object AST containing **one** function named `wrapper_name`.
+
+        The given code is wrapped in a async-def function, parsed into an AST, and
+        the resulting function definition AST is modified to return the last
+        expression.
+
+        The last expression or await node is moved into a return statement at the
+        end of the function, and removed from its original location. If the last
+        node is not Expr or Await nothing is done.
+
+        The function `__code__` will need to be later modified  (by
+        ``removed_co_newlocals``) in a subsequent step to not create new `locals()`
+        meaning that the local and global scope are the same, ie as if the body of
+        the function was at module level.
+
+        Lastly a call to `locals()` is made just before the last expression of the
+        function, or just after the last assignment or statement to make sure the
+        global dict is updated as python function work with a local fast cache which
+        is updated only on `local()` calls.
     """
 
     from ast import Expr, Await, Return
diff --git a/setupbase.py b/setupbase.py
index 084c341aa19..fa05bb7ea5d 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -141,7 +141,7 @@ def check_package_data(package_data):
 
 def check_package_data_first(command):
     """decorator for checking package_data before running a given command
-    
+
     Probably only needs to wrap build_py
     """
     class DecoratedCommand(command):
@@ -351,9 +351,9 @@ def finalize_options(self):
 
 def git_prebuild(pkg_dir, build_cmd=build_py):
     """Return extended build or sdist command class for recording commit
-    
+
     records git commit in IPython.utils._sysinfo.commit
-    
+
     for use in IPython.utils.sysinfo.sys_info() calls after installation.
     """
     

From f12b9485fc16db7afe1d47489adb8cea1b7efa8e Mon Sep 17 00:00:00 2001
From: Quentin Peter <impact27@users.noreply.github.com>
Date: Mon, 13 Jul 2020 17:21:52 +0200
Subject: [PATCH 0197/1407] Move Extraction of local scope to a method

When calling ipython magic from pdb, the locals need to be set from the pdb locals, which is different from the frame locals. Moving this call to a method enables a subclass to change the behaviour of `get_local_scope` to make this possible. This would enable using `%timeit` while debugging in Spyder for example
---
 IPython/core/interactiveshell.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 0bbc18afeea..9171f2458f4 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2322,11 +2322,21 @@ def run_line_magic(self, magic_name, line, _stack_depth=1):
             kwargs = {}
             # Grab local namespace if we need it:
             if getattr(fn, "needs_local_scope", False):
-                kwargs['local_ns'] = sys._getframe(stack_depth).f_locals
+                kwargs['local_ns'] = self.get_local_scope(stack_depth)
             with self.builtin_trap:
                 result = fn(*args, **kwargs)
             return result
 
+    def get_local_scope(self, stack_depth):
+        """Get local scope at given stack depth.
+
+        Parameters
+        ----------
+        stack_depth : int
+          Depth relative to calling frame
+        """
+        return sys._getframe(stack_depth + 1).f_locals
+
     def run_cell_magic(self, magic_name, line, cell):
         """Execute the given cell magic.
 

From 3643472436ffb541225b19e540e5ceb671266606 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 14 Jul 2020 10:44:37 -0700
Subject: [PATCH 0198/1407] manual fixes to docs

---
 IPython/core/completer.py | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index dcee838127a..807a5e4d020 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -476,7 +476,8 @@ def rectify_completions(text: str, completions: _IC, *, _debug=False)->_IC:
     completions: Iterator[Completion]
         iterator over the completions to rectify
 
-
+    Notes
+    -----
     :any:`jedi.api.classes.Completion` s returned by Jedi may not have the same start and end, though
     the Jupyter Protocol requires them to behave like so. This will readjust
     the completion to have the same ``start`` and ``end`` by padding both
@@ -1422,8 +1423,8 @@ def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str) -> Iterabl
         text : str
             text to complete
 
-        Debugging
-        ---------
+        Notes
+        -----
 
         If ``IPCompleter.debug`` is ``True`` may return a :any:`_FakeJediCompletion`
         object containing a string with the Jedi debug information attached.
@@ -1874,8 +1875,11 @@ def completions(self, text: str, offset: int)->Iterator[Completion]:
 
         Yields
         ------
-            :any:`Completion` object
+        Completion
 
+        
+        Notes
+        -----
 
         The cursor on a text can either be seen as being "in between"
         characters or "On" a character depending on the interface visible to
@@ -2024,19 +2028,19 @@ def complete(self, text=None, line_buffer=None, cursor_pos=None) -> Tuple[str, S
 
         Parameters
         ----------
-          text : string, optional
-            Text to perform the completion on.  If not given, the line buffer
-            is split using the instance's CompletionSplitter object.
+        text : string, optional
+          Text to perform the completion on.  If not given, the line buffer
+          is split using the instance's CompletionSplitter object.
 
-          line_buffer : string, optional
-            If not given, the completer attempts to obtain the current line
-            buffer via readline.  This keyword allows clients which are
-            requesting for text completions in non-readline contexts to inform
-            the completer of the entire text.
+        line_buffer : string, optional
+          If not given, the completer attempts to obtain the current line
+          buffer via readline.  This keyword allows clients which are
+          requesting for text completions in non-readline contexts to inform
+          the completer of the entire text.
 
-          cursor_pos : int, optional
-            Index of the cursor in the full line buffer.  Should be provided by
-            remote frontends where kernel has no access to frontend state.
+        cursor_pos : int, optional
+          Index of the cursor in the full line buffer.  Should be provided by
+          remote frontends where kernel has no access to frontend state.
 
         Returns
         -------
@@ -2047,7 +2051,8 @@ def complete(self, text=None, line_buffer=None, cursor_pos=None) -> Tuple[str, S
           A list of completion matches.
 
 
-        .. note::
+        Notes
+        -----
 
             This API is likely to be deprecated and replaced by
             :any:`IPCompleter.completions` in the future.

From ed567acd22a13154b7d808980732c0a79d91e7ec Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 14 Jul 2020 10:45:20 -0700
Subject: [PATCH 0199/1407] autoformatting of doc

---
 IPython/core/completer.py | 106 ++++++++++++--------------------------
 1 file changed, 34 insertions(+), 72 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 807a5e4d020..0100bfcc459 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -193,8 +193,6 @@ class ProvisionalCompleterWarning(FutureWarning):
 @contextmanager
 def provisionalcompleter(action='ignore'):
     """
-
-
     This context manager has to be used in any place where unstable completer
     behavior and API may be called.
 
@@ -262,17 +260,17 @@ def expand_user(path:str) -> Tuple[str, bool, str]:
     Parameters
     ----------
     path : str
-      String to be expanded.  If no ~ is present, the output is the same as the
-      input.
+        String to be expanded.  If no ~ is present, the output is the same as the
+        input.
 
     Returns
     -------
     newpath : str
-      Result of ~ expansion in the input path.
+        Result of ~ expansion in the input path.
     tilde_expand : bool
-      Whether any expansion was performed or not.
+        Whether any expansion was performed or not.
     tilde_val : str
-      The value that ~ was replaced with.
+        The value that ~ was replaced with.
     """
     # Default values
     tilde_expand = False
@@ -435,12 +433,9 @@ def _deduplicate_completions(text: str, completions: _IC)-> _IC:
     Yields
     ------
     `Completions` objects
-
-
     Completions coming from multiple sources, may be different but end up having
     the same effect when applied to ``text``. If this is the case, this will
     consider completions as equal and only emit the first encountered.
-
     Not folded in `completions()` yet for debugging purpose, and to detect when
     the IPython completer does return things that Jedi does not, but should be
     at some point.
@@ -759,7 +754,7 @@ def match_dict_keys(keys: List[Union[str, bytes, Tuple[Union[str, bytes]]]], pre
     """Used by dict_key_matches, matching the prefix to a list of keys
 
     Parameters
-    ==========
+    ----------
     keys:
         list of keys in dictionary currently being completed.
     prefix:
@@ -767,12 +762,11 @@ def match_dict_keys(keys: List[Union[str, bytes, Tuple[Union[str, bytes]]]], pre
     delims:
         String of delimiters to consider when finding the current key.
     extra_prefix: optional
-        Part of the text already typed in multi-key index cases. E.g. for 
+        Part of the text already typed in multi-key index cases. E.g. for
         `mydict['foo', "bar", 'b`, this would be `('foo', 'bar')`.
 
     Returns
-    =======
-
+    -------
     A tuple of three elements: ``quote``, ``token_start``, ``matched``, with
     ``quote`` being the quote that need to be used to close current string.
     ``token_start`` the position where the replacement should start occurring,
@@ -851,13 +845,11 @@ def _add_to_filtered_keys(key):
 
 def cursor_to_position(text:str, line:int, column:int)->int:
     """
-
     Convert the (line,column) position of the cursor in text to an offset in a
     string.
 
     Parameters
     ----------
-
     text : str
         The text in which to calculate the cursor offset
     line : int
@@ -865,13 +857,13 @@ def cursor_to_position(text:str, line:int, column:int)->int:
     column : int
         Column of the cursor 0-indexed
 
-    Return
-    ------
-        Position of the cursor in ``text``, 0-indexed.
+    Returns
+    -------
+    Position of the cursor in ``text``, 0-indexed.
 
     See Also
     --------
-    position_to_cursor: reciprocal of this function
+    position_to_cursor : reciprocal of this function
 
     """
     lines = text.split('\n')
@@ -888,23 +880,20 @@ def position_to_cursor(text:str, offset:int)->Tuple[int, int]:
 
     Parameters
     ----------
-
     text : str
         The text in which to calculate the cursor offset
     offset : int
         Position of the cursor in ``text``, 0-indexed.
 
-    Return
-    ------
+    Returns
+    -------
     (line, column) : (int, int)
         Line of the cursor; 0-indexed, column of the cursor 0-indexed
 
-
     See Also
     --------
     cursor_to_position : reciprocal of this function
 
-
     """
 
     assert 0 <= offset <= len(text) , "0 <= %s <= %s" % (offset , len(text))
@@ -994,18 +983,15 @@ def _formatparamchildren(parameter) -> str:
 
     Jedi does not expose a simple way to get `param=value` from its API.
 
-    Parameter
-    =========
-
+    Parameters
+    ----------
     parameter:
         Jedi's function `Param`
 
     Returns
-    =======
-
+    -------
     A string like 'a', 'b=1', '*args', '**kwargs'
 
-
     """
     description = parameter.description
     if not description.startswith('param '):
@@ -1017,15 +1003,13 @@ def _make_signature(completion)-> str:
     """
     Make the signature from a jedi completion
 
-    Parameter
-    =========
-
+    Parameters
+    ----------
     completion: jedi.Completion
         object does not complete a function type
 
     Returns
-    =======
-
+    -------
     a string consisting of the function signature, with the parenthesis but
     without the function name. example:
     `(a, *args, b=1, **kwargs)`
@@ -1126,20 +1110,16 @@ def __init__(self, shell=None, namespace=None, global_namespace=None,
 
         Parameters
         ----------
-
         shell
             a pointer to the ipython shell itself.  This is needed
             because this completer knows about magic functions, and those can
             only be accessed via the ipython instance.
-
         namespace : dict, optional
             an optional dict where completions are performed.
-
         global_namespace : dict, optional
             secondary optional dict for completions, to
             handle cases (such as IPython embedded inside functions) where
             both Python scopes are visible.
-
         use_readline : bool, optional
             DEPRECATED, ignored since IPython 6.0, will have no effects
         """
@@ -1410,7 +1390,6 @@ def magic_color_matches(self, text:str) -> List[str] :
 
     def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str) -> Iterable[Any]:
         """
-
         Return a list of :any:`jedi.api.Completions` object from a ``text`` and
         cursor position.
 
@@ -1425,7 +1404,6 @@ def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str) -> Iterabl
 
         Notes
         -----
-
         If ``IPCompleter.debug`` is ``True`` may return a :any:`_FakeJediCompletion`
         object containing a string with the Jedi debug information attached.
         """
@@ -1866,7 +1844,6 @@ def completions(self, text: str, offset: int)->Iterator[Completion]:
 
         Parameters
         ----------
-
         text:str
             Full text of the current input, multi line string.
         offset:int
@@ -1877,10 +1854,8 @@ def completions(self, text: str, offset: int)->Iterator[Completion]:
         ------
         Completion
 
-        
         Notes
         -----
-
         The cursor on a text can either be seen as being "in between"
         characters or "On" a character depending on the interface visible to
         the user. For consistency the cursor being on "in between" characters X
@@ -1890,7 +1865,6 @@ def completions(self, text: str, offset: int)->Iterator[Completion]:
         Combining characters may span more that one position in the
         text.
 
-
         .. note::
 
             If ``IPCompleter.debug`` is :any:`True` will yield a ``--jedi/ipython--``
@@ -1940,7 +1914,6 @@ def _completions(self, full_text: str, offset: int, *, _timeout) -> Iterator[Com
         Core completion module.Same signature as :any:`completions`, with the
         extra `timeout` parameter (in seconds).
 
-
         Computing jedi's completion ``.type`` can be quite expensive (it is a
         lazy property) and can require some warm-up, more warm up than just
         computing the ``name`` of a completion. The warm-up can be :
@@ -2029,35 +2002,30 @@ def complete(self, text=None, line_buffer=None, cursor_pos=None) -> Tuple[str, S
         Parameters
         ----------
         text : string, optional
-          Text to perform the completion on.  If not given, the line buffer
-          is split using the instance's CompletionSplitter object.
-
+            Text to perform the completion on.  If not given, the line buffer
+            is split using the instance's CompletionSplitter object.
         line_buffer : string, optional
-          If not given, the completer attempts to obtain the current line
-          buffer via readline.  This keyword allows clients which are
-          requesting for text completions in non-readline contexts to inform
-          the completer of the entire text.
-
+            If not given, the completer attempts to obtain the current line
+            buffer via readline.  This keyword allows clients which are
+            requesting for text completions in non-readline contexts to inform
+            the completer of the entire text.
         cursor_pos : int, optional
-          Index of the cursor in the full line buffer.  Should be provided by
-          remote frontends where kernel has no access to frontend state.
+            Index of the cursor in the full line buffer.  Should be provided by
+            remote frontends where kernel has no access to frontend state.
 
         Returns
         -------
         Tuple of two items:
         text : str
-          Text that was actually used in the completion.
+            Text that was actually used in the completion.
         matches : list
-          A list of completion matches.
-
+            A list of completion matches.
 
         Notes
         -----
-
             This API is likely to be deprecated and replaced by
             :any:`IPCompleter.completions` in the future.
 
-
         """
         warnings.warn('`Completer.complete` is pending deprecation since '
                 'IPython 6.0 and will be replaced by `Completer.completions`.',
@@ -2069,23 +2037,19 @@ def complete(self, text=None, line_buffer=None, cursor_pos=None) -> Tuple[str, S
     def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
                   full_text=None) -> _CompleteResult:
         """
-
         Like complete but can also returns raw jedi completions as well as the
         origin of the completion text. This could (and should) be made much
         cleaner but that will be simpler once we drop the old (and stateful)
         :any:`complete` API.
 
-
         With current provisional API, cursor_pos act both (depending on the
         caller) as the offset in the ``text`` or ``line_buffer``, or as the
         ``column`` when passing multiline strings this could/should be renamed
         but would add extra noise.
 
-        Return
-        ======
-
+        Returns
+        -------
         A tuple of N elements which are (likely):
-
             matched_text: ? the text that the complete matched
             matches: list of completions ?
             matches_origin: ? list same lenght as matches, and where each completion came from
@@ -2191,15 +2155,13 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
         
     def fwd_unicode_match(self, text:str) -> Tuple[str, Sequence[str]]:
         """
-
         Forward match a string starting with a backslash with a list of
         potential Unicode completions.
 
         Will compute list list of Unicode character names on first call and cache it.
 
-        Return
-        ======
-
+        Returns
+        -------
         At tuple with:
             - matched text (empty if no matches)
             - list of potential completions, empty tuple  otherwise)

From d5a8359c6fa0e5cacd412e876ac2bb132972de69 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 14 Jul 2020 11:28:54 -0700
Subject: [PATCH 0200/1407] Avoid calling the input transformer twice in the
 execution stack.

This should allow to register input transformers that have side effects,
at least in Notebooks. Right now there are sill multiple calls which
may happen in the terminal on execution requests.
---
 IPython/core/interactiveshell.py | 102 +++++++++++++++++++++++++------
 1 file changed, 83 insertions(+), 19 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 9171f2458f4..8582cae50fc 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -81,7 +81,7 @@
 from logging import error
 import IPython.core.hooks
 
-from typing import List as ListType, Tuple
+from typing import List as ListType, Tuple, Optional
 from ast import AST
 
 # NoOpContext is deprecated, but ipykernel imports it from here.
@@ -2884,11 +2884,24 @@ def run_cell(self, raw_cell, store_history=False, silent=False, shell_futures=Tr
 
     def _run_cell(self, raw_cell:str, store_history:bool, silent:bool, shell_futures:bool) -> ExecutionResult:
         """Internal method to run a complete IPython cell."""
+
+        # we need to avoid calling self.transform_cell multiple time on the same thing
+        # so we need to store some results:
+        preprocessing_exc_tuple = None
+        try:
+            transformed_cell = self.transform_cell(raw_cell)
+        except Exception:
+            transformed_cell = raw_cell
+            preprocessing_exc_tuple = sys.exc_info()
+
+        assert transformed_cell is not None
         coro = self.run_cell_async(
             raw_cell,
             store_history=store_history,
             silent=silent,
             shell_futures=shell_futures,
+            transformed_cell=transformed_cell,
+            preprocessing_exc_tuple=preprocessing_exc_tuple,
         )
 
         # run_cell_async is async, but may not actually need an eventloop.
@@ -2897,7 +2910,11 @@ def _run_cell(self, raw_cell:str, store_history:bool, silent:bool, shell_futures
         # `%paste` magic.
         if self.trio_runner:
             runner = self.trio_runner
-        elif self.should_run_async(raw_cell):
+        elif self.should_run_async(
+            raw_cell,
+            transformed_cell=transformed_cell,
+            preprocessing_exc_tuple=preprocessing_exc_tuple,
+        ):
             runner = self.loop_runner
         else:
             runner = _pseudo_sync_runner
@@ -2911,7 +2928,9 @@ def _run_cell(self, raw_cell:str, store_history:bool, silent:bool, shell_futures
             self.showtraceback(running_compiled_code=True)
             return result
 
-    def should_run_async(self, raw_cell: str) -> bool:
+    def should_run_async(
+        self, raw_cell: str, *, transformed_cell=None, preprocessing_exc_tuple=None
+    ) -> bool:
         """Return whether a cell should be run asynchronously via a coroutine runner
 
         Parameters
@@ -2928,15 +2947,40 @@ def should_run_async(self, raw_cell: str) -> bool:
         """
         if not self.autoawait:
             return False
-        try:
-            cell = self.transform_cell(raw_cell)
-        except Exception:
-            # any exception during transform will be raised
-            # prior to execution
+        if preprocessing_exc_tuple is not None:
             return False
+        assert preprocessing_exc_tuple is None
+        if transformed_cell is None:
+            warnings.warn(
+                "`should_run_async` will not call `transform_cell`"
+                " automatically in the future. Please pass the result to"
+                " `transformed_cell` argument and any exception that happen"
+                " during the"
+                "transform in `preprocessing_exc_tuple` in"
+                " IPython 7.17 and above.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            try:
+                cell = self.transform_cell(raw_cell)
+            except Exception:
+                # any exception during transform will be raised
+                # prior to execution
+                return False
+        else:
+            cell = transformed_cell
         return _should_be_async(cell)
 
-    async def run_cell_async(self, raw_cell: str, store_history=False, silent=False, shell_futures=True) -> ExecutionResult:
+    async def run_cell_async(
+        self,
+        raw_cell: str,
+        store_history=False,
+        silent=False,
+        shell_futures=True,
+        *,
+        transformed_cell: Optional[str] = None,
+        preprocessing_exc_tuple: Optional[Any] = None
+    ) -> ExecutionResult:
         """Run a complete IPython cell asynchronously.
 
         Parameters
@@ -2955,6 +2999,10 @@ async def run_cell_async(self, raw_cell: str, store_history=False, silent=False,
           shell. It will both be affected by previous __future__ imports, and
           any __future__ imports in the code will affect the shell. If False,
           __future__ imports are not shared in either direction.
+        transformed_cell: str
+          cell that was passed through transformers
+        preprocessing_exc_tuple:
+          trace if the transformation failed.
 
         Returns
         -------
@@ -2989,17 +3037,33 @@ def error_before_exec(value):
         if not silent:
             self.events.trigger('pre_run_cell', info)
 
-        # If any of our input transformation (input_transformer_manager or
-        # prefilter_manager) raises an exception, we store it in this variable
-        # so that we can display the error after logging the input and storing
-        # it in the history.
-        try:
-            cell = self.transform_cell(raw_cell)
-        except Exception:
-            preprocessing_exc_tuple = sys.exc_info()
-            cell = raw_cell  # cell has to exist so it can be stored/logged
+        if transformed_cell is None:
+            warnings.warn(
+                "`run_cell_async` will not call `transform_cell`"
+                " automatically in the future. Please pass the result to"
+                " `transformed_cell` argument and any exception that happen"
+                " during the"
+                "transform in `preprocessing_exc_tuple` in"
+                " IPython 7.17 and above.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            # If any of our input transformation (input_transformer_manager or
+            # prefilter_manager) raises an exception, we store it in this variable
+            # so that we can display the error after logging the input and storing
+            # it in the history.
+            try:
+                cell = self.transform_cell(raw_cell)
+            except Exception:
+                preprocessing_exc_tuple = sys.exc_info()
+                cell = raw_cell  # cell has to exist so it can be stored/logged
+            else:
+                preprocessing_exc_tuple = None
         else:
-            preprocessing_exc_tuple = None
+            if preprocessing_exc_tuple is None:
+                cell = transformed_cell
+            else:
+                cell = raw_cell
 
         # Store raw and processed history
         if store_history:

From 221fdd81c2a648d285351a81f13f0ca6c7f98678 Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <tobias.bengfort@posteo.de>
Date: Wed, 15 Jul 2020 08:07:16 +0200
Subject: [PATCH 0201/1407] replace hardcoded colors by ANSI colors

fixes #12442
---
 IPython/terminal/interactiveshell.py | 34 ++++++++++++++--------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index b3bb5777450..360d88574d6 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -48,17 +48,17 @@ class _NoStyle(Style): pass
 
 
 _style_overrides_light_bg = {
-            Token.Prompt: '#0000ff',
-            Token.PromptNum: '#0000ee bold',
-            Token.OutPrompt: '#cc0000',
-            Token.OutPromptNum: '#bb0000 bold',
+            Token.Prompt: '#ansibrightblue',
+            Token.PromptNum: '#ansiblue bold',
+            Token.OutPrompt: '#ansibrightred',
+            Token.OutPromptNum: '#ansired bold',
 }
 
 _style_overrides_linux = {
-            Token.Prompt: '#00cc00',
-            Token.PromptNum: '#00bb00 bold',
-            Token.OutPrompt: '#cc0000',
-            Token.OutPromptNum: '#bb0000 bold',
+            Token.Prompt: '#ansibrightgreen',
+            Token.PromptNum: '#ansigreen bold',
+            Token.OutPrompt: '#ansibrightred',
+            Token.OutPromptNum: '#ansired bold',
 }
 
 def get_default_editor():
@@ -350,15 +350,15 @@ def _make_style_from_name_or_cls(self, name_or_cls):
                 # looks like. These tweaks to the default theme help with that.
                 style_cls = get_style_by_name('default')
                 style_overrides.update({
-                    Token.Number: '#007700',
+                    Token.Number: '#ansigreen',
                     Token.Operator: 'noinherit',
-                    Token.String: '#BB6622',
-                    Token.Name.Function: '#2080D0',
-                    Token.Name.Class: 'bold #2080D0',
-                    Token.Name.Namespace: 'bold #2080D0',
-                    Token.Prompt: '#009900',
+                    Token.String: '#ansiyellow',
+                    Token.Name.Function: '#ansiblue',
+                    Token.Name.Class: 'bold #ansiblue',
+                    Token.Name.Namespace: 'bold #ansiblue',
+                    Token.Prompt: '#ansigreen',
                     Token.PromptNum: '#ansibrightgreen bold',
-                    Token.OutPrompt: '#990000',
+                    Token.OutPrompt: '#ansired',
                     Token.OutPromptNum: '#ansibrightred bold',
                 })
 
@@ -382,9 +382,9 @@ def _make_style_from_name_or_cls(self, name_or_cls):
             else:
                 style_cls = name_or_cls
             style_overrides = {
-                Token.Prompt: '#009900',
+                Token.Prompt: '#ansigreen',
                 Token.PromptNum: '#ansibrightgreen bold',
-                Token.OutPrompt: '#990000',
+                Token.OutPrompt: '#ansired',
                 Token.OutPromptNum: '#ansibrightred bold',
             }
         style_overrides.update(self.highlighting_style_overrides)

From db15b48d00d30c121e0c0a6e913e7047dfa95695 Mon Sep 17 00:00:00 2001
From: Quentin Peter <impact27@users.noreply.github.com>
Date: Wed, 15 Jul 2020 15:11:35 +0200
Subject: [PATCH 0202/1407] avoid calling .f_locals on the current frame

Calling `.f_locals` on the current frame has the side effect of resetting `self.curframe_locals`.
---
 IPython/core/debugger.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index c122441d83f..e3834fc8299 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -294,7 +294,14 @@ def hidden_frames(self, stack):
 
         This is used in up/down and where to skip frames.
         """
-        ip_hide = [s[0].f_locals.get("__tracebackhide__", False) for s in stack]
+        # The f_locals dictionary is updated from the actual frame
+        # locals whenever the .f_locals accessor is called, so we
+        # avoid calling it here to preserve self.curframe_locals.
+        # Futhermore, there is no good reason to hide the current frame.
+        ip_hide = [
+            False if s[0] is self.curframe else s[0].f_locals.get(
+                "__tracebackhide__", False)
+            for s in stack]
         ip_start = [i for i, s in enumerate(ip_hide) if s == "__ipython_bottom__"]
         if ip_start:
             ip_hide = [h if i > ip_start[0] else True for (i, h) in enumerate(ip_hide)]

From 1cd48ee2892a3a3949f76ef9d3264378cc5d227a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 16 Jul 2020 08:18:52 -0700
Subject: [PATCH 0203/1407] Make `x.__doc__` a reasonable default color.

---
 IPython/terminal/interactiveshell.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index b3bb5777450..c6812a23461 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -356,6 +356,7 @@ def _make_style_from_name_or_cls(self, name_or_cls):
                     Token.Name.Function: '#2080D0',
                     Token.Name.Class: 'bold #2080D0',
                     Token.Name.Namespace: 'bold #2080D0',
+                    Token.Name.Variable.Magic: '#ansiblue',
                     Token.Prompt: '#009900',
                     Token.PromptNum: '#ansibrightgreen bold',
                     Token.OutPrompt: '#990000',

From 444938721da2cb56df56a0fc37040ed7347d6d95 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 16 Jul 2020 11:11:14 -0700
Subject: [PATCH 0204/1407] DOC: Update Audio widget docs to be numpydoc
 compliant

This allow better integrattion into tools whic understand numpydoc
formats.
---
 IPython/lib/display.py | 44 +++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index 4f28010fbd0..2ac05c4b3dd 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -63,33 +63,41 @@ class Audio(DisplayObject):
 
     Examples
     --------
-    ::
 
-        # Generate a sound
-        import numpy as np
-        framerate = 44100
-        t = np.linspace(0,5,framerate*5)
-        data = np.sin(2*np.pi*220*t) + np.sin(2*np.pi*224*t)
-        Audio(data,rate=framerate)
+    Generate a sound
+
+    >>> import numpy as np
+    ... framerate = 44100
+    ... t = np.linspace(0,5,framerate*5)
+    ... data = np.sin(2*np.pi*220*t) + np.sin(2*np.pi*224*t)
+    ... Audio(data,rate=framerate)
+
+    Can also do stereo or more channels
+
+    >>> dataleft = np.sin(2*np.pi*220*t)
+    ... dataright = np.sin(2*np.pi*224*t)
+    ... Audio([dataleft, dataright],rate=framerate)
+
+    From URL:
+
+    >>> Audio("http://www.nch.com.au/acm/8k16bitpcm.wav")
+    >>> Audio(url="http://www.w3schools.com/html/horse.ogg")
 
-        # Can also do stereo or more channels
-        dataleft = np.sin(2*np.pi*220*t)
-        dataright = np.sin(2*np.pi*224*t)
-        Audio([dataleft, dataright],rate=framerate)
+    From a File:
 
-        Audio("http://www.nch.com.au/acm/8k16bitpcm.wav")  # From URL
-        Audio(url="http://www.w3schools.com/html/horse.ogg")
+    >>> Audio('/path/to/sound.wav')
+    >>> Audio(filename='/path/to/sound.ogg')
 
-        Audio('/path/to/sound.wav')  # From file
-        Audio(filename='/path/to/sound.ogg')
+    From Bytes:
 
-        Audio(b'RAW_WAV_DATA..)  # From bytes
-        Audio(data=b'RAW_WAV_DATA..)
+    >>> Audio(b'RAW_WAV_DATA..')
+    >>> Audio(data=b'RAW_WAV_DATA..')
 
     See Also
     --------
+    ipywidget.Audio
     
-    See also the ``Audio`` widgets form the ``ipywidget`` package for more flexibility and options.
+         AUdio widget with more more flexibility and options.
     
     """
     _read_flags = 'rb'

From cb87bb3245f45b71db6bfe8655bb54c2759f2e25 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 16 Jul 2020 19:03:27 -0700
Subject: [PATCH 0205/1407] DOC: more docstrign formatting

---
 IPython/core/interactiveshell.py | 55 ++++++++++++++------------------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 9171f2458f4..c664198e078 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -128,11 +128,11 @@ class ProvisionalWarning(DeprecationWarning):
 #-----------------------------------------------------------------------------
 
 def removed_co_newlocals(function:types.FunctionType) -> types.FunctionType:
-    """Return a function that do not create a new local scope. 
+    """Return a function that do not create a new local scope.
 
     Given a function, create a clone of this function where the co_newlocal flag
     has been removed, making this function code actually run in the sourounding
-    scope. 
+    scope.
 
     We need this in order to run asynchronous code in user level namespace.
     """
@@ -175,7 +175,6 @@ def _ast_asyncify(cell:str, wrapper_name:str) -> ast.Module:
 
     Parameters
     ----------
-
     cell: str
         The code cell to asyncronify
     wrapper_name: str
@@ -185,7 +184,6 @@ def _ast_asyncify(cell:str, wrapper_name:str) -> ast.Module:
 
     Returns
     -------
-    
     ModuleType:
         A module object AST containing **one** function named `wrapper_name`.
 
@@ -896,9 +894,9 @@ def init_virtualenv(self):
         virtualenv was built, and it ignores the --no-site-packages option. A
         warning will appear suggesting the user installs IPython in the
         virtualenv, but for many cases, it probably works well enough.
-        
+
         Adapted from code snippets online.
-        
+
         http://blog.ufsoft.org/2009/1/29/ipython-and-virtualenv
         """
         if 'VIRTUAL_ENV' not in os.environ:
@@ -1067,7 +1065,7 @@ def init_events(self):
 
     def register_post_execute(self, func):
         """DEPRECATED: Use ip.events.register('post_run_cell', func)
-        
+
         Register a function for calling after code execution.
         """
         warn("ip.register_post_execute is deprecated, use "
@@ -1087,14 +1085,14 @@ def _clear_warning_registry(self):
 
     def new_main_mod(self, filename, modname):
         """Return a new 'main' module object for user code execution.
-        
+
         ``filename`` should be the path of the script which will be run in the
         module. Requests with the same filename will get the same module, with
         its namespace cleared.
-        
+
         ``modname`` should be the module name - normally either '__main__' or
         the basename of the file without the extension.
-        
+
         When scripts are executed via %run, we must keep a reference to their
         __main__ module around so that Python doesn't
         clear it, rendering references to module globals useless.
@@ -1130,7 +1128,6 @@ def clear_main_mod_cache(self):
 
         Examples
         --------
-
         In [15]: import IPython
 
         In [16]: m = _ip.new_main_mod(IPython.__file__, 'IPython')
@@ -1280,10 +1277,10 @@ def user_global_ns(self):
 
     def prepare_user_module(self, user_module=None, user_ns=None):
         """Prepare the module and namespace in which user code will be run.
-        
+
         When IPython is started normally, both parameters are None: a new module
         is created automatically, and its __dict__ used as the namespace.
-        
+
         If only user_module is provided, its __dict__ is used as the namespace.
         If only user_ns is provided, a dummy module is created, and user_ns
         becomes the global namespace. If both are provided (as they may be
@@ -1404,7 +1401,7 @@ def init_user_ns(self):
     def all_ns_refs(self):
         """Get a list of references to all the namespace dictionaries in which
         IPython might store a user-created object.
-        
+
         Note that this does not include the displayhook, which also caches
         objects from the output."""
         return [self.user_ns, self.user_global_ns, self.user_ns_hidden] + \
@@ -1582,15 +1579,15 @@ def push(self, variables, interactive=True):
     def drop_by_id(self, variables):
         """Remove a dict of variables from the user namespace, if they are the
         same as the values in the dictionary.
-        
+
         This is intended for use by extensions: variables that they've added can
         be taken back out if they are unloaded, without removing any that the
         user has overwritten.
-        
+
         Parameters
         ----------
         variables : dict
-          A dictionary mapping object names (as strings) to the objects.
+            A dictionary mapping object names (as strings) to the objects.
         """
         for name, obj in variables.items():
             if name in self.user_ns and self.user_ns[name] is obj:
@@ -1884,10 +1881,10 @@ def dummy_handler(self, etype, value, tb, tb_offset=None):
         
         def validate_stb(stb):
             """validate structured traceback return type
-            
+
             return type of CustomTB *should* be a list of strings, but allow
             single strings or None, which are harmless.
-            
+
             This function will *always* return a list of strings,
             and will raise a TypeError if stb is inappropriate.
             """
@@ -2289,14 +2286,12 @@ def run_line_magic(self, magic_name, line, _stack_depth=1):
         Parameters
         ----------
         magic_name : str
-          Name of the desired magic function, without '%' prefix.
-
+            Name of the desired magic function, without '%' prefix.
         line : str
-          The rest of the input line as a single string.
-          
+            The rest of the input line as a single string.
         _stack_depth : int
-          If run_line_magic() is called from magic() then _stack_depth=2.
-          This is added to ensure backward compatibility for use of 'get_ipython().magic()'
+            If run_line_magic() is called from magic() then _stack_depth=2.
+            This is added to ensure backward compatibility for use of 'get_ipython().magic()'
         """
         fn = self.find_line_magic(magic_name)
         if fn is None:
@@ -2333,7 +2328,7 @@ def get_local_scope(self, stack_depth):
         Parameters
         ----------
         stack_depth : int
-          Depth relative to calling frame
+            Depth relative to calling frame
         """
         return sys._getframe(stack_depth + 1).f_locals
 
@@ -2343,13 +2338,11 @@ def run_cell_magic(self, magic_name, line, cell):
         Parameters
         ----------
         magic_name : str
-          Name of the desired magic function, without '%' prefix.
-
+            Name of the desired magic function, without '%' prefix.
         line : str
-          The rest of the first input line as a single string.
-
+            The rest of the first input line as a single string.
         cell : str
-          The body of the cell as a (possibly multiline) string.
+            The body of the cell as a (possibly multiline) string.
         """
         fn = self.find_cell_magic(magic_name)
         if fn is None:

From 15b571ed9882aee75666ad37b406cc3ed6d9aa34 Mon Sep 17 00:00:00 2001
From: Quentin Peter <impact27@users.noreply.github.com>
Date: Fri, 17 Jul 2020 13:48:36 +0200
Subject: [PATCH 0206/1407] Fix 11931 partially

This fixes #11931 if no arguments are given
---
 IPython/core/magics/execution.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index effedbd3482..c6cf0822376 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -451,7 +451,13 @@ def debug(self, line='', cell=None):
 
         if not (args.breakpoint or args.statement or cell):
             self._debug_post_mortem()
+        elif not (args.breakpoint or cell):
+            # If there is no breakpoints, the line is just code to execute
+            self._debug_exec(line, None)
         else:
+            # Here we try to reconstruct the code from the output of
+            # parse_argstring. This might not work if the code has spaces
+            # For example this fails for `print("a b")`
             code = "\n".join(args.statement)
             if cell:
                 code += "\n" + cell

From 7cf67b0426611923c40735036bd94de84b760881 Mon Sep 17 00:00:00 2001
From: Quentin Peter <impact27@users.noreply.github.com>
Date: Fri, 17 Jul 2020 16:03:47 +0200
Subject: [PATCH 0207/1407] add test

---
 IPython/core/tests/test_magic.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 56feb82af71..819231e0d43 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -599,6 +599,19 @@ def doctest_precision():
     Out[5]: '3.141593e+00'
     """
 
+def test_debug_magic():
+    """Test debugging a small code with %debug
+    
+    In [1]: %debug print("a b")
+    NOTE: Enter 'c' at the ipdb>  prompt to continue execution.
+    > <string>(1)<module>()
+
+    ipdb> c
+    a b
+
+    In [2]:
+    """
+
 def test_psearch():
     with tt.AssertPrints("dict.fromkeys"):
         _ip.run_cell("dict.fr*?")

From 6d9525a7ac0fed18c3577a9e82dfa356af38fd59 Mon Sep 17 00:00:00 2001
From: Quentin Peter <impact27@users.noreply.github.com>
Date: Fri, 17 Jul 2020 16:40:34 +0200
Subject: [PATCH 0208/1407] Fix test

---
 IPython/core/tests/test_magic.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 819231e0d43..5c1d536fb2d 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -32,6 +32,7 @@
 from IPython.utils.tempdir import (TemporaryDirectory,
                                     TemporaryWorkingDirectory)
 from IPython.utils.process import find_cmd
+from .test_debugger import PdbTestInput
 
 
 @magic.magics_class
@@ -602,13 +603,13 @@ def doctest_precision():
 def test_debug_magic():
     """Test debugging a small code with %debug
     
-    In [1]: %debug print("a b")
+    In [1]: with PdbTestInput(['c']):
+       ...:     %debug print("a b")
+       ...:
     NOTE: Enter 'c' at the ipdb>  prompt to continue execution.
     > <string>(1)<module>()
-
     ipdb> c
     a b
-
     In [2]:
     """
 

From 0ca267d167d5a739ad86ec263413d947cf07c5ad Mon Sep 17 00:00:00 2001
From: Quentin Peter <impact27@users.noreply.github.com>
Date: Sat, 18 Jul 2020 07:49:55 +0200
Subject: [PATCH 0209/1407] Update test_magic.py

---
 IPython/core/tests/test_magic.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 5c1d536fb2d..1a8c70c52e2 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -607,7 +607,6 @@ def test_debug_magic():
        ...:     %debug print("a b")
        ...:
     NOTE: Enter 'c' at the ipdb>  prompt to continue execution.
-    > <string>(1)<module>()
     ipdb> c
     a b
     In [2]:

From 19215efb5ae0f698fad875e2238e45383aaef066 Mon Sep 17 00:00:00 2001
From: Quentin Peter <impact27@users.noreply.github.com>
Date: Sat, 18 Jul 2020 07:59:33 +0200
Subject: [PATCH 0210/1407] Update test_magic.py

---
 IPython/core/tests/test_magic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 1a8c70c52e2..afbdd5d3354 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -606,7 +606,7 @@ def test_debug_magic():
     In [1]: with PdbTestInput(['c']):
        ...:     %debug print("a b")
        ...:
-    NOTE: Enter 'c' at the ipdb>  prompt to continue execution.
+    ...
     ipdb> c
     a b
     In [2]:

From c48d26437d07ab83c573ca89164e4adb211ffeed Mon Sep 17 00:00:00 2001
From: Quentin Peter <impact27@users.noreply.github.com>
Date: Sat, 18 Jul 2020 08:01:19 +0200
Subject: [PATCH 0211/1407] Update test_magic.py

---
 IPython/core/tests/test_magic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index afbdd5d3354..a52ab025fb9 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -604,7 +604,7 @@ def test_debug_magic():
     """Test debugging a small code with %debug
     
     In [1]: with PdbTestInput(['c']):
-       ...:     %debug print("a b")
+       ...:     %debug print("a b") #doctest: +ELLIPSIS
        ...:
     ...
     ipdb> c

From 65d8e78c5f412f624cbc49db8aece156c4701798 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 21 Jul 2020 10:14:15 -0700
Subject: [PATCH 0212/1407] add WN

---
 docs/source/whatsnew/pr/transformer-call.rst | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/transformer-call.rst

diff --git a/docs/source/whatsnew/pr/transformer-call.rst b/docs/source/whatsnew/pr/transformer-call.rst
new file mode 100644
index 00000000000..5e8d9ef47fe
--- /dev/null
+++ b/docs/source/whatsnew/pr/transformer-call.rst
@@ -0,0 +1,5 @@
+Input transformers are now called only once in the execution path of `InteractiveShell`, allowing to register
+transformer that potentially have side effects (note that this is not recommended). `should_run_async`, and
+`run_cell_async` now take a recommended optional `transformed_cell`, and `preprocessing_exc_tuple` parameters that will
+become mandatory at some point in the future; that is to say cells need to be explicitly transformed to be valid Python
+syntax ahead of trying to run them. :ghpull:`12440`

From 229917c44b4a0bebfb7e0b27c878b89b30a5fe17 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 23 Jul 2020 15:07:36 -0700
Subject: [PATCH 0213/1407] typo

---
 IPython/lib/display.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index 2ac05c4b3dd..09268ad8981 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -95,7 +95,7 @@ class Audio(DisplayObject):
 
     See Also
     --------
-    ipywidget.Audio
+    ipywidgets.Audio
     
          AUdio widget with more more flexibility and options.
     

From b9bfb192d1335fa619d1bf89e64e89443ebaa01a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 20 Jul 2020 16:39:02 -0700
Subject: [PATCH 0214/1407] Allow to mark transformers as having side effects

We then unly run them when actually running the code.
---
 IPython/core/inputtransformer2.py            |  6 ++--
 IPython/core/tests/test_inputtransformer2.py | 36 +++++++++++++++++++-
 IPython/core/tests/test_interactiveshell.py  | 24 +++++++++++++
 3 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index 097dd88920f..afbce231193 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -637,7 +637,8 @@ def check_complete(self, cell: str):
 
         try:
             for transform in self.cleanup_transforms:
-                lines = transform(lines)
+                if not getattr(transform, 'has_side_effects', False):
+                    lines = transform(lines)
         except SyntaxError:
             return 'invalid', None
 
@@ -650,7 +651,8 @@ def check_complete(self, cell: str):
 
         try:
             for transform in self.line_transforms:
-                lines = transform(lines)
+                if not getattr(transform, 'has_side_effects', False):
+                    lines = transform(lines)
             lines = self.do_token_transforms(lines)
         except SyntaxError:
             return 'invalid', None
diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index b29a0196d3f..1ff0fd810c0 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -289,4 +289,38 @@ def test_check_complete_II():
 def test_null_cleanup_transformer():
     manager = ipt2.TransformerManager()
     manager.cleanup_transforms.insert(0, null_cleanup_transformer)
-    nt.assert_is(manager.transform_cell(""), "")
+    assert  manager.transform_cell("") == ""
+
+
+
+
+def test_side_effects_I():
+    count = 0
+    def counter(lines):
+        nonlocal count
+        count += 1
+        return lines
+
+    counter.has_side_effects = True
+
+    manager = ipt2.TransformerManager()
+    manager.cleanup_transforms.insert(0, counter)
+    assert manager.check_complete("a=1\n") == ('complete', None)
+    assert count == 0
+
+
+
+
+def test_side_effects_II():
+    count = 0
+    def counter(lines):
+        nonlocal count
+        count += 1
+        return lines
+
+    counter.has_side_effects = True
+
+    manager = ipt2.TransformerManager()
+    manager.line_transforms.insert(0, counter)
+    assert manager.check_complete("b=1\n") == ('complete', None)
+    assert count == 0
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 496e3bd02bc..951b843e1e0 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -689,6 +689,30 @@ def test_macro(self):
         with tt.AssertPrints("8"):
             ip.run_cell("amacro")
 
+class TestMiscTransform(unittest.TestCase):
+
+
+    def test_transform_only_once(self):
+        cleanup = 0
+        line_t = 0
+        def count_cleanup(lines):
+            nonlocal cleanup
+            cleanup += 1
+            return lines
+
+        def count_line_t(lines):
+            nonlocal line_t
+            line_t += 1
+            return lines
+
+        ip.input_transformer_manager.cleanup_transforms.append(count_cleanup)
+        ip.input_transformer_manager.line_transforms.append(count_line_t)
+
+        ip.run_cell('1')
+
+        assert cleanup == 1
+        assert line_t == 1
+
 class IntegerWrapper(ast.NodeTransformer):
     """Wraps all integers in a call to Integer()"""
 

From 8e4636a4cc91ab400f10480b38919acd1e7112da Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 23 Jul 2020 16:13:06 -0700
Subject: [PATCH 0215/1407] document

---
 docs/source/config/inputtransforms.rst      | 8 ++++++++
 docs/source/whatsnew/pr/side-effects-tr.rst | 2 ++
 2 files changed, 10 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/side-effects-tr.rst

diff --git a/docs/source/config/inputtransforms.rst b/docs/source/config/inputtransforms.rst
index 9e4170714f7..6b7943bbfe7 100644
--- a/docs/source/config/inputtransforms.rst
+++ b/docs/source/config/inputtransforms.rst
@@ -62,6 +62,14 @@ To start using this::
     ip = get_ipython()
     ip.input_transformers_cleanup.append(reverse_line_chars)
 
+.. versionadded:: 7.17
+
+    input_transformers can now have an attribute ``has_side_effects`` set to
+    `True`, which will prevent the transformers from being ran when IPython is
+    trying to guess whether the user input is complete. 
+
+
+
 AST transformations
 ===================
 
diff --git a/docs/source/whatsnew/pr/side-effects-tr.rst b/docs/source/whatsnew/pr/side-effects-tr.rst
new file mode 100644
index 00000000000..439a6657ee0
--- /dev/null
+++ b/docs/source/whatsnew/pr/side-effects-tr.rst
@@ -0,0 +1,2 @@
+input_transformers can now have an attribute ``has_side_effects`` set to `True`, which will prevent the
+transformers from being ran when IPython is trying to guess whether the user input is complete.

From 8e3847fef5743f18663711b624d510d44e867d9d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 29 Jul 2020 11:58:27 -0700
Subject: [PATCH 0216/1407] Compatibility with traitlets 5.0.

This now uses argparse which parses things a bit differently, and in
particular needs -- to execure a file and not assume that --profile get
a list of items.
---
 .travis.yml                | 2 +-
 IPython/core/formatters.py | 2 +-
 IPython/testing/tools.py   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3f894e55a36..0703e956069 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,7 @@ install:
     fi
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
   - pip install trio curio --upgrade --upgrade-strategy eager
-  - pip install pytest 'matplotlib !=3.2.0' mypy
+  - pip install 'pytest<6' 'matplotlib !=3.2.0' mypy
   - pip install codecov check-manifest --upgrade
   - pip install mypy
   - |
diff --git a/IPython/core/formatters.py b/IPython/core/formatters.py
index 839ef93ec10..4970960ad0b 100644
--- a/IPython/core/formatters.py
+++ b/IPython/core/formatters.py
@@ -432,7 +432,7 @@ def for_type(self, typ, func=None):
         """Add a format function for a given type.
         
         Parameters
-        -----------
+        ----------
         typ : type or '__module__.__name__' string for a type
             The class of the object that will be formatted using `func`.
         func : callable
diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py
index 75a9525df0a..498ae488917 100644
--- a/IPython/testing/tools.py
+++ b/IPython/testing/tools.py
@@ -198,7 +198,7 @@ def ipexec(fname, options=None, commands=()):
     ipython_cmd = get_ipython_cmd()
     # Absolute path for filename
     full_fname = os.path.join(test_dir, fname)
-    full_cmd = ipython_cmd + cmdargs + [full_fname]
+    full_cmd = ipython_cmd + cmdargs + ['--', full_fname]
     env = os.environ.copy()
     # FIXME: ignore all warnings in ipexec while we have shims
     # should we keep suppressing warnings here, even after removing shims?

From e972089e19091ce5a8596be2b627dea347a0c1f3 Mon Sep 17 00:00:00 2001
From: Kyle Cutler <kycutler@microsoft.com>
Date: Fri, 31 Jul 2020 17:24:50 -0700
Subject: [PATCH 0217/1407] Support CRLF line endings in magic transforms

---
 IPython/core/inputtransformer2.py                 |  6 +++---
 IPython/core/tests/test_inputtransformer2.py      | 11 +++++++++++
 IPython/core/tests/test_inputtransformer2_line.py | 10 ++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index afbce231193..67be409cf87 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -94,7 +94,7 @@ def cell_magic(lines):
     if re.match(r'%%\w+\?', lines[0]):
         # This case will be handled by help_end
         return lines
-    magic_name, _, first_line = lines[0][2:-1].partition(' ')
+    magic_name, _, first_line = lines[0][2:].rstrip().partition(' ')
     body = ''.join(lines[1:])
     return ['get_ipython().run_cell_magic(%r, %r, %r)\n'
             % (magic_name, first_line, body)]
@@ -153,8 +153,8 @@ def assemble_continued_line(lines, start: Tuple[int, int], end_line: int):
     multiple lines.
     """
     parts = [lines[start[0]][start[1]:]] + lines[start[0]+1:end_line+1]
-    return ' '.join([p[:-2] for p in parts[:-1]]  # Strip backslash+newline
-                    + [parts[-1][:-1]])         # Strip newline from last line
+    return ' '.join([p.rstrip()[:-1] for p in parts[:-1]]  # Strip backslash+newline
+                    + [parts[-1].rstrip()])         # Strip newline from last line
 
 class TokenTransformBase:
     """Base class for transformations which examine tokens.
diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index 1ff0fd810c0..61f183cb571 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -31,6 +31,16 @@
     get_ipython().run_line_magic('ls', '')
 """.splitlines(keepends=True))
 
+CRLF_MAGIC = ([
+    "a = f()\n",
+    "%ls\r\n",
+    "g()\n"
+], (2, 0), [
+    "a = f()\n",
+    "get_ipython().run_line_magic('ls', '')\n",
+    "g()\n"
+])
+
 MULTILINE_MAGIC_ASSIGN = ("""\
 a = f()
 b = %foo \\
@@ -190,6 +200,7 @@ def test_find_magic_escape():
 def test_transform_magic_escape():
     check_transform(ipt2.EscapedCommand, MULTILINE_MAGIC)
     check_transform(ipt2.EscapedCommand, INDENTED_MAGIC)
+    check_transform(ipt2.EscapedCommand, CRLF_MAGIC)
 
 def test_find_autocalls():
     for case in [AUTOCALL_QUOTE, AUTOCALL_QUOTE2, AUTOCALL_PAREN]:
diff --git a/IPython/core/tests/test_inputtransformer2_line.py b/IPython/core/tests/test_inputtransformer2_line.py
index 41b6ed2935c..263bbd9ee08 100644
--- a/IPython/core/tests/test_inputtransformer2_line.py
+++ b/IPython/core/tests/test_inputtransformer2_line.py
@@ -114,3 +114,13 @@ def test_leading_empty_lines():
         nt.assert_equal(
                 ipt2.leading_empty_lines(sample.splitlines(keepends=True)),
                 expected.splitlines(keepends=True))
+
+CRLF_MAGIC = ([
+    "%%ls\r\n"
+], [
+    "get_ipython().run_cell_magic('ls', '', '')\n"
+])
+
+def test_crlf_magic():
+    for sample, expected in [CRLF_MAGIC]:
+        nt.assert_equal(ipt2.cell_magic(sample), expected)
\ No newline at end of file

From 2a03a7e22ee9cdc2f4edbf1d2fa9ca0603583426 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 31 Jul 2020 17:48:15 -0700
Subject: [PATCH 0218/1407] Update waht's new 7.17

---
 docs/source/whatsnew/pr/side-effects-tr.rst  |  2 -
 docs/source/whatsnew/pr/transformer-call.rst |  5 --
 docs/source/whatsnew/version7.rst            | 49 ++++++++++++++++++++
 3 files changed, 49 insertions(+), 7 deletions(-)
 delete mode 100644 docs/source/whatsnew/pr/side-effects-tr.rst
 delete mode 100644 docs/source/whatsnew/pr/transformer-call.rst

diff --git a/docs/source/whatsnew/pr/side-effects-tr.rst b/docs/source/whatsnew/pr/side-effects-tr.rst
deleted file mode 100644
index 439a6657ee0..00000000000
--- a/docs/source/whatsnew/pr/side-effects-tr.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-input_transformers can now have an attribute ``has_side_effects`` set to `True`, which will prevent the
-transformers from being ran when IPython is trying to guess whether the user input is complete.
diff --git a/docs/source/whatsnew/pr/transformer-call.rst b/docs/source/whatsnew/pr/transformer-call.rst
deleted file mode 100644
index 5e8d9ef47fe..00000000000
--- a/docs/source/whatsnew/pr/transformer-call.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Input transformers are now called only once in the execution path of `InteractiveShell`, allowing to register
-transformer that potentially have side effects (note that this is not recommended). `should_run_async`, and
-`run_cell_async` now take a recommended optional `transformed_cell`, and `preprocessing_exc_tuple` parameters that will
-become mandatory at some point in the future; that is to say cells need to be explicitly transformed to be valid Python
-syntax ahead of trying to run them. :ghpull:`12440`
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 286f16fb9f4..9dea93a6b7f 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,55 @@
  7.x Series
 ============
 
+.. _version 717:
+
+IPython 7.17
+============
+
+IPython 7.17 brings a couple of new improvements to API and a couple of user
+facing changes to make the terminal experience more user friendly. 
+
+:ghpull:`12407` introduces the ability to pass extra argument to the IPython
+debugger class; this is to help a new project from ``kmaork``
+(https://github.com/kmaork/madbg) to feature a fully remote debugger.
+
+:ghpull:`12410` finally remove support for 3.6, while the codebase is still
+technically compatible; IPython will not install on Python 3.6.
+
+lots of work on the debugger and hidden frames from ``@impact27`` in
+:ghpull:`12437`, :ghpull:`12445`, :ghpull:`12460` and in particular
+:ghpull:`12453` which make the debug magic more robust at handling spaces.
+
+Biggest API addition is code transformation which is done before code execution; 
+IPython allows a number of hooks to catch non-valid Python syntax (magic, prompt
+stripping...etc). Transformers are usually called many time; typically:
+
+ - When trying to figure out whether the code is complete and valid (should we
+   insert a new line or execute ?)
+ - During actual code execution pass before giving the code to Python's
+   ``exec``.
+
+This lead to issues when transformer might have had side effects; or do external
+queries. Starting with IPython 7.17 you can expect your transformer to be called
+less time. 
+
+Input transformers are now called only once in the execution path of
+`InteractiveShell`, allowing to register transformer that potentially have side
+effects (note that this is not recommended). Internal methods `should_run_async`, and
+`run_cell_async` now take a recommended optional `transformed_cell`, and
+`preprocessing_exc_tuple` parameters that will become mandatory at some point in
+the future; that is to say cells need to be explicitly transformed to be valid
+Python syntax ahead of trying to run them. :ghpull:`12440`; 
+
+``input_transformers`` can now also have an attribute ``has_side_effects`` set
+to `True`, when this attribute is present; this  will prevent the transformers
+from being ran when IPython is trying to guess whether the user input is
+complete. Note that this may means you will need to explicitly execute in some
+case where your transformations are now not ran; but will not affect users with
+no custom extensions.
+
+
+
 .. _version 716:
 
 IPython 7.16

From e1e7d733e9ad7967816500ee4a5010c19a952a24 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 31 Jul 2020 18:27:02 -0700
Subject: [PATCH 0219/1407] autogen API

---
 docs/source/whatsnew/version7.rst | 37 ++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 9dea93a6b7f..68a1c5df64e 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -21,7 +21,7 @@ lots of work on the debugger and hidden frames from ``@impact27`` in
 :ghpull:`12437`, :ghpull:`12445`, :ghpull:`12460` and in particular
 :ghpull:`12453` which make the debug magic more robust at handling spaces.
 
-Biggest API addition is code transformation which is done before code execution; 
+Biggest API addition is code transformation which is done before code execution;
 IPython allows a number of hooks to catch non-valid Python syntax (magic, prompt
 stripping...etc). Transformers are usually called many time; typically:
 
@@ -32,7 +32,7 @@ stripping...etc). Transformers are usually called many time; typically:
 
 This lead to issues when transformer might have had side effects; or do external
 queries. Starting with IPython 7.17 you can expect your transformer to be called
-less time. 
+less time.
 
 Input transformers are now called only once in the execution path of
 `InteractiveShell`, allowing to register transformer that potentially have side
@@ -40,7 +40,7 @@ effects (note that this is not recommended). Internal methods `should_run_async`
 `run_cell_async` now take a recommended optional `transformed_cell`, and
 `preprocessing_exc_tuple` parameters that will become mandatory at some point in
 the future; that is to say cells need to be explicitly transformed to be valid
-Python syntax ahead of trying to run them. :ghpull:`12440`; 
+Python syntax ahead of trying to run them. :ghpull:`12440`;
 
 ``input_transformers`` can now also have an attribute ``has_side_effects`` set
 to `True`, when this attribute is present; this  will prevent the transformers
@@ -50,6 +50,37 @@ case where your transformations are now not ran; but will not affect users with
 no custom extensions.
 
 
+API Changes
+-----------
+
+Change of API and exposed objects automatically detected using `frappuccino
+<https://pypi.org/project/frappuccino/>`_
+
+
+ The following items are new since 7.16.0::
+
+     + IPython.core.interactiveshell.InteractiveShell.get_local_scope(self, stack_depth)
+
+ The following signatures differ since 7.16.0::
+
+     - IPython.core.interactiveshell.InteractiveShell.run_cell_async(self, raw_cell, store_history=False, silent=False, shell_futures=True)
+     + IPython.core.interactiveshell.InteractiveShell.run_cell_async(self, raw_cell, store_history=False, silent=False, shell_futures=True, *, transformed_cell=None, preprocessing_exc_tuple=None)
+
+     - IPython.core.interactiveshell.InteractiveShell.should_run_async(self, raw_cell)
+     + IPython.core.interactiveshell.InteractiveShell.should_run_async(self, raw_cell, *, transformed_cell=None, preprocessing_exc_tuple=None)
+
+     - IPython.terminal.debugger.TerminalPdb.pt_init(self)
+     + IPython.terminal.debugger.TerminalPdb.pt_init(self, pt_session_options=None)
+
+This method was added::
+
+     + IPython.core.interactiveshell.InteractiveShell.get_local_scope
+
+Which is now also present on subclasses::
+
+     + IPython.terminal.embed.InteractiveShellEmbed.get_local_scope
+     + IPython.terminal.interactiveshell.TerminalInteractiveShell.get_local_scope
+
 
 .. _version 716:
 

From 66180bc7ab8ea497cde1b170f0e6a72da35c51a2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 31 Jul 2020 18:31:19 -0700
Subject: [PATCH 0220/1407] stats

---
 docs/source/whatsnew/github-stats-7.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index 41077b5d6fe..3c8deb3dc75 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -1,6 +1,23 @@
 Issues closed in the 7.x development cycle
 ==========================================
 
+Issues closed in 7.17
+---------------------
+
+GitHub stats for 2020/06/26 - 2020/07/31 (tag: 7.16.1)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 2 issues and merged 19 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A7.17>`__
+
+The following 3 authors contributed 31 commits.
+
+* Maor Kleinberger
+* Matthias Bussonnier
+* Quentin Peter
+
+
 
 Issues closed in 7.16
 ---------------------

From 13bdcaf9d7f2b3038982ef3cf168a3b5981cd882 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 31 Jul 2020 19:15:07 -0700
Subject: [PATCH 0221/1407] try to auto comment ''/.dev

---
 tools/release_helper.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index dd700b56329..317ef5eb4e9 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -100,6 +100,10 @@ echo "Cleaning repository"
 git clean -xfdi
 
 echo $GREEN"please update version number in ${RED}IPython/core/release.py${NOR} , Do not commit yet – we'll do it later."$NOR
+echo $GREEN"I tried ${RED}sed -i bkp -e '/Uncomment/s/^# //g' IPython/core/release.py${NOR}"
+sed -i bkp -e '/Uncomment/s/^# //g' IPython/core/release.py
+rm IPython/core/release.pybkp
+git diff
 
 echo $GREEN"Press enter to continue"$NOR
 read
@@ -142,7 +146,13 @@ then
    
    
    echo $GREEN"please update version number and back to .dev in ${RED}IPython/core/release.py"
+   echo $GREEN"I tried ${RED}sed -i bkp -e '/Uncomment/s/^/# /g' IPython/core/release.py${NOR}"
+   sed -i bkp -e '/Uncomment/s/^/# /g' IPython/core/release.py
+   rm IPython/core/release.pybkp
+   git diff
+   echo $GREEN"Please bump ${RED}the minor version number${NOR}"
    echo ${BLUE}"Do not commit yet – we'll do it later."$NOR
+
    
    echo $GREEN"Press enter to continue"$NOR
    read

From 85e50bb5778853e7cf9ef1745088ae12a8ef00b3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 6 Aug 2020 16:07:07 -0700
Subject: [PATCH 0222/1407] autoformat docstrings in ultratb

---
 IPython/core/ultratb.py | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index e59e61ed4f6..2832c4e4641 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -135,12 +135,11 @@ def _format_traceback_lines(lines, Colors, has_colors, lvals):
     Format tracebacks lines with pointing arrow, leading numbers...
 
     Parameters
-    ==========
-
-    lines: list[Line]
-    Colors:
+    ----------
+    lines : list[Line]
+    Colors
         ColorScheme used.
-    lvals: str
+    lvals : str
         Values of local variables, already colored, to inject just after the error line.
     """
     numbers_width = INDENT_SIZE - 1
@@ -337,21 +336,17 @@ def structured_traceback(self, etype, evalue, etb=None, tb_offset=None,
         Parameters
         ----------
         etype : exception type
-          Type of the exception raised.
-
+            Type of the exception raised.
         evalue : object
-          Data stored in the exception
-
+            Data stored in the exception
         etb : object
-          If list: List of frames, see class docstring for details.
-          If Traceback: Traceback of the exception.
-
+            If list: List of frames, see class docstring for details.
+            If Traceback: Traceback of the exception.
         tb_offset : int, optional
-          Number of frames in the traceback to skip.  If not given, the
-          instance evalue is used (set in constructor).
-
+            Number of frames in the traceback to skip.  If not given, the
+            instance evalue is used (set in constructor).
         context : int, optional
-          Number of lines of context information to print.
+            Number of lines of context information to print.
 
         Returns
         -------
@@ -518,7 +513,7 @@ def get_exception_only(self, etype, value):
         Parameters
         ----------
         etype : exception type
-        value : exception value
+        evalue : exception value
         """
         return ListTB.structured_traceback(self, etype, value)
 
@@ -528,7 +523,7 @@ def show_exception_only(self, etype, evalue):
         Parameters
         ----------
         etype : exception type
-        value : exception value
+        evalue : exception value
         """
         # This method needs to use __call__ from *this* class, not the one from
         # a subclass whose signature or behavior may be different
@@ -975,7 +970,7 @@ def __call__(self, etype=None, evalue=None, etb=None,
 
           - tb_offset: the number of frames to skip over in the stack, on a
           per-call basis (this overrides temporarily the instance's tb_offset
-          given at initialization time.  """
+          given at initialization time."""
 
         if out is None:
             out = self.ostream

From b0863b63e7c9000471a5beadc1d0bf41948541a2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 7 Aug 2020 15:18:26 -0700
Subject: [PATCH 0223/1407] Pylab deprecate

---
 IPython/core/magics/pylab.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/core/magics/pylab.py b/IPython/core/magics/pylab.py
index 376d891f578..231a14f6205 100644
--- a/IPython/core/magics/pylab.py
+++ b/IPython/core/magics/pylab.py
@@ -154,6 +154,7 @@ def pylab(self, line=''):
 
         gui, backend, clobbered = self.shell.enable_pylab(args.gui, import_all=import_all)
         self._show_matplotlib_backend(args.gui, backend)
+        print ("%pylab is deprecated, use %matpltolib inline and import the required libraries.")
         print ("Populating the interactive namespace from numpy and matplotlib")
         if clobbered:
             warn("pylab import has clobbered these variables: %s"  % clobbered +

From 1306fdd3ecd5700b9578e919552a69f05a5cba5b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 20 Aug 2020 10:52:42 -0700
Subject: [PATCH 0224/1407] Enforce black code style on _new_ code

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0703e956069..fc683e11366 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ install:
   - pip install trio curio --upgrade --upgrade-strategy eager
   - pip install 'pytest<6' 'matplotlib !=3.2.0' mypy
   - pip install codecov check-manifest --upgrade
-  - pip install mypy
+  - pip install mypy darker
   - |
     if [[ "$MASTER_DEPENDENCIES" == "True" ]]; then
        pip install git+https://github.com/ipython/traitlets#egg=traitlets --force
@@ -61,6 +61,7 @@ script:
   - pytest IPython
   - mypy IPython/terminal/ptutils.py
   - mypy IPython/core/c*.py
+  - darker -r 60625f241f298b5039cb2debc365db38aa7bb522 .
   # On the latest Python (on Linux) only, make sure that the docs build.
   - |
     if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then

From a8e7767fdff31a988b0217b970257b62bcbd173a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 20 Aug 2020 11:33:51 -0700
Subject: [PATCH 0225/1407] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fc683e11366..e69e84f4188 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,7 @@ script:
   - pytest IPython
   - mypy IPython/terminal/ptutils.py
   - mypy IPython/core/c*.py
-  - darker -r 60625f241f298b5039cb2debc365db38aa7bb522 .
+  - darker -r 60625f241f298b5039cb2debc365db38aa7bb522 --check .
   # On the latest Python (on Linux) only, make sure that the docs build.
   - |
     if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then

From e869c77998c3b184f93e466704a0115b6d87e33e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 20 Aug 2020 11:41:03 -0700
Subject: [PATCH 0226/1407] try to fix doc build

---
 IPython/core/inputtransformer2.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index 67be409cf87..44b44de71fd 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -61,6 +61,9 @@ class PromptStripper:
         Used mainly for plain Python prompts (``>>>``), where the continuation prompt
         ``...`` is a valid Python expression in Python 3, so shouldn't be stripped.
 
+    Notes
+    -----
+
     If initial_re and prompt_re differ,
     only initial_re will be tested against the first line.
     If any prompt is found on the first two lines,

From f34ded1de50c8194b2aa5753a8ad93c1e25200e6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 20 Aug 2020 14:06:57 -0700
Subject: [PATCH 0227/1407] print what has changed

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e69e84f4188..33984174a01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,7 @@ script:
   - pytest IPython
   - mypy IPython/terminal/ptutils.py
   - mypy IPython/core/c*.py
-  - darker -r 60625f241f298b5039cb2debc365db38aa7bb522 --check .
+  - darker -r 60625f241f298b5039cb2debc365db38aa7bb522 --check --diff .
   # On the latest Python (on Linux) only, make sure that the docs build.
   - |
     if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then

From 102ca4f841368eb718fe34cababba247ed2e26ee Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 20 Aug 2020 14:32:00 -0700
Subject: [PATCH 0228/1407] darker only on 3.8

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 33984174a01..122f280e200 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,10 @@ script:
   - pytest IPython
   - mypy IPython/terminal/ptutils.py
   - mypy IPython/core/c*.py
-  - darker -r 60625f241f298b5039cb2debc365db38aa7bb522 --check --diff .
+  - |
+    if [[ "$TRAVIS_PYTHON_VERSION" == "3.8" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+      darker -r 60625f241f298b5039cb2debc365db38aa7bb522 --check --diff .
+    fi
   # On the latest Python (on Linux) only, make sure that the docs build.
   - |
     if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then

From 9787b4db7b8573c38f882aace13af7aff6cab271 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 25 Aug 2020 11:17:51 -0700
Subject: [PATCH 0229/1407] Required Pexpect >=4.3

Async was used as a keywor in previous versions.
Closes #12507
---
 setup.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index c8b75da0590..eb42e5fa072 100755
--- a/setup.py
+++ b/setup.py
@@ -199,19 +199,21 @@
 # This is the correct way to specify these,
 # but requires pip >= 6. pip < 6 ignores these.
 
-extras_require.update({
-    ':sys_platform != "win32"': ['pexpect'],
-    ':sys_platform == "darwin"': ['appnope'],
-    ':sys_platform == "win32"': ['colorama'],
-})
+extras_require.update(
+    {
+        ':sys_platform != "win32"': ["pexpect>4.3"],
+        ':sys_platform == "darwin"': ["appnope"],
+        ':sys_platform == "win32"': ["colorama"],
+    }
+)
 # FIXME: re-specify above platform dependencies for pip < 6
 # These would result in non-portable bdists.
 if not any(arg.startswith('bdist') for arg in sys.argv):
     if sys.platform == 'darwin':
         install_requires.extend(['appnope'])
 
-    if not sys.platform.startswith('win'):
-        install_requires.append('pexpect')
+    if not sys.platform.startswith("win"):
+        install_requires.append("pexpect>4.3")
 
     # workaround pypa/setuptools#147, where setuptools misspells
     # platform_python_implementation as python_implementation

From 05462871642f741b602150a2625b9fe2c89afd85 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 26 Aug 2020 14:38:13 -0700
Subject: [PATCH 0230/1407] Use Pathlib here and there.

This make code a little bit more compact and readable.
---
 IPython/core/application.py | 30 ++++++++++++++++--------------
 IPython/core/profiledir.py  | 10 ++++++----
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/IPython/core/application.py b/IPython/core/application.py
index 93639d88e2c..a823dbac0c2 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -20,6 +20,8 @@
 import shutil
 import sys
 
+from pathlib import Path
+
 from traitlets.config.application import Application, catch_config_error
 from traitlets.config.loader import ConfigFileNotFound, PyFileConfigLoader
 from IPython.core import release, crashhandler
@@ -31,10 +33,10 @@
     default, observe,
 )
 
-if os.name == 'nt':
-    programdata = os.environ.get('PROGRAMDATA', None)
+if os.name == "nt":
+    programdata = Path(os.environ.get("PROGRAMDATA", None))
     if programdata:
-        SYSTEM_CONFIG_DIRS = [os.path.join(programdata, 'ipython')]
+        SYSTEM_CONFIG_DIRS = [programdata / "ipython"]
     else:  # PROGRAMDATA is not defined by default on XP.
         SYSTEM_CONFIG_DIRS = []
 else:
@@ -409,14 +411,15 @@ def init_config_files(self):
         self.config_file_paths.extend(ENV_CONFIG_DIRS)
         self.config_file_paths.extend(SYSTEM_CONFIG_DIRS)
         # copy config files
-        path = self.builtin_profile_dir
+        path = Path(self.builtin_profile_dir)
         if self.copy_config_files:
             src = self.profile
 
             cfg = self.config_file_name
-            if path and os.path.exists(os.path.join(path, cfg)):
-                self.log.warning("Staging %r from %s into %r [overwrite=%s]"%(
-                        cfg, src, self.profile_dir.location, self.overwrite)
+            if path and (path / cfg).exists():
+                self.log.warning(
+                    "Staging %r from %s into %r [overwrite=%s]"
+                    % (cfg, src, self.profile_dir.location, self.overwrite)
                 )
                 self.profile_dir.copy_config_file(cfg, path=path, overwrite=self.overwrite)
             else:
@@ -425,9 +428,9 @@ def init_config_files(self):
             # Still stage *bundled* config files, but not generated ones
             # This is necessary for `ipython profile=sympy` to load the profile
             # on the first go
-            files = glob.glob(os.path.join(path, '*.py'))
+            files = path.glob("*.py")
             for fullpath in files:
-                cfg = os.path.basename(fullpath)
+                cfg = fullpath.name
                 if self.profile_dir.copy_config_file(cfg, path=path, overwrite=False):
                     # file was copied
                     self.log.warning("Staging bundled %s from %s into %r"%(
@@ -438,11 +441,10 @@ def init_config_files(self):
     def stage_default_config_file(self):
         """auto generate default config file, and stage it into the profile."""
         s = self.generate_config_file()
-        fname = os.path.join(self.profile_dir.location, self.config_file_name)
-        if self.overwrite or not os.path.exists(fname):
-            self.log.warning("Generating default config file: %r"%(fname))
-            with open(fname, 'w') as f:
-                f.write(s)
+        config_file = Path(self.profile_dir.location) / self.config_file_name
+        if self.overwrite or not config_file.exists():
+            self.log.warning("Generating default config file: %r" % (config_file))
+            config_file.write_text(s)
 
     @catch_config_error
     def initialize(self, argv=None):
diff --git a/IPython/core/profiledir.py b/IPython/core/profiledir.py
index 3199dfd5d64..756595adbfe 100644
--- a/IPython/core/profiledir.py
+++ b/IPython/core/profiledir.py
@@ -7,6 +7,7 @@
 import os
 import shutil
 import errno
+from pathlib import Path
 
 from traitlets.config.configurable import LoggingConfigurable
 from ..paths import get_ipython_package_dir
@@ -133,19 +134,20 @@ def check_dirs(self):
         self.check_pid_dir()
         self.check_startup_dir()
 
-    def copy_config_file(self, config_file, path=None, overwrite=False):
+    def copy_config_file(self, config_file: str, path: Path, overwrite=False) -> bool:
         """Copy a default config file into the active profile directory.
 
         Default configuration files are kept in :mod:`IPython.core.profile`.
         This function moves these from that location to the working profile
         directory.
         """
-        dst = os.path.join(self.location, config_file)
-        if os.path.isfile(dst) and not overwrite:
+        dst = Path(os.path.join(self.location, config_file))
+        if dst.exists() and not overwrite:
             return False
         if path is None:
             path = os.path.join(get_ipython_package_dir(), u'core', u'profile', u'default')
-        src = os.path.join(path, config_file)
+        assert isinstance(path, Path)
+        src = path / config_file
         shutil.copy(src, dst)
         return True
 

From 18bd308c2c4eb428f1718510d165b22a26b9f757 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 27 Aug 2020 12:14:32 -0700
Subject: [PATCH 0231/1407] Also reformat with black as there is a new release
 of black.

---
 IPython/core/magics/pylab.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magics/pylab.py b/IPython/core/magics/pylab.py
index 231a14f6205..0e9688e2ab7 100644
--- a/IPython/core/magics/pylab.py
+++ b/IPython/core/magics/pylab.py
@@ -154,8 +154,10 @@ def pylab(self, line=''):
 
         gui, backend, clobbered = self.shell.enable_pylab(args.gui, import_all=import_all)
         self._show_matplotlib_backend(args.gui, backend)
-        print ("%pylab is deprecated, use %matpltolib inline and import the required libraries.")
-        print ("Populating the interactive namespace from numpy and matplotlib")
+        print(
+            "%pylab is deprecated, use %matpltolib inline and import the required libraries."
+        )
+        print("Populating the interactive namespace from numpy and matplotlib")
         if clobbered:
             warn("pylab import has clobbered these variables: %s"  % clobbered +
             "\n`%matplotlib` prevents importing * from pylab and numpy"

From c37688b8c4f14616833e021acfde0dbce3396ce3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 27 Aug 2020 14:23:16 -0700
Subject: [PATCH 0232/1407] prepare release notes

---
 .travis.yml                       |  2 +-
 README.rst                        |  2 ++
 docs/source/whatsnew/version7.rst | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 122f280e200..ff4f46ad069 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ install:
   - pip install pip --upgrade
   - pip install setuptools --upgrade
   - if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
-      echo "for the tiem being still test on 3.6";
+      echo "for the time being still test on 3.6";
       sed -ibkp s/7/6/g setup.py;
       git diff;
     fi
diff --git a/README.rst b/README.rst
index 9c0c89ec8e0..940047656f2 100644
--- a/README.rst
+++ b/README.rst
@@ -29,6 +29,8 @@ contribute to the project.
 
 Starting with IPython 7.10, IPython follows `NEP 29 <https://numpy.org/neps/nep-0029-deprecation_policy.html>`_
 
+**IPython 7.17+** requires Python version 3.7 and above.
+
 **IPython 7.10+** requires Python version 3.6 and above.
 
 **IPython 7.0** requires Python version 3.5 and above.
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 68a1c5df64e..88961136796 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,21 @@
  7.x Series
 ============
 
+.. _version 718:
+
+IPython 7.18
+============
+
+IPython 7.18 is a minor release that mostly contains bugfixes.
+
+ - ``CRLF`` is now handled by magics my default; solving some issues due to copy
+   pasting on windows. :ghpull:`12475`
+
+ - Requirin pexpect ``>=4.3`` as we are Python 3.7+ only and earlier version of
+   pexpect will be incompatible. :ghpull:`12510`
+
+
+
 .. _version 717:
 
 IPython 7.17

From bc4b1fbfccc1e00e3adcecebd4355a21eb6b6709 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 27 Aug 2020 14:32:42 -0700
Subject: [PATCH 0233/1407] fix windows

---
 IPython/core/application.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/application.py b/IPython/core/application.py
index a823dbac0c2..2aae062419a 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -36,7 +36,7 @@
 if os.name == "nt":
     programdata = Path(os.environ.get("PROGRAMDATA", None))
     if programdata:
-        SYSTEM_CONFIG_DIRS = [programdata / "ipython"]
+        SYSTEM_CONFIG_DIRS = [str(programdata / "ipython")]
     else:  # PROGRAMDATA is not defined by default on XP.
         SYSTEM_CONFIG_DIRS = []
 else:

From 0d268ede183efac0b7a97f21a1ed292f1b40b4ec Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 27 Aug 2020 14:51:48 -0700
Subject: [PATCH 0234/1407] reformat because of new versionof black

---
 IPython/core/magics/pylab.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magics/pylab.py b/IPython/core/magics/pylab.py
index 231a14f6205..0e9688e2ab7 100644
--- a/IPython/core/magics/pylab.py
+++ b/IPython/core/magics/pylab.py
@@ -154,8 +154,10 @@ def pylab(self, line=''):
 
         gui, backend, clobbered = self.shell.enable_pylab(args.gui, import_all=import_all)
         self._show_matplotlib_backend(args.gui, backend)
-        print ("%pylab is deprecated, use %matpltolib inline and import the required libraries.")
-        print ("Populating the interactive namespace from numpy and matplotlib")
+        print(
+            "%pylab is deprecated, use %matpltolib inline and import the required libraries."
+        )
+        print("Populating the interactive namespace from numpy and matplotlib")
         if clobbered:
             warn("pylab import has clobbered these variables: %s"  % clobbered +
             "\n`%matplotlib` prevents importing * from pylab and numpy"

From 26c1a61ade9f8346cb318fd94cd35456c67b8208 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 27 Aug 2020 16:43:42 -0700
Subject: [PATCH 0235/1407] replace one nightly by 3.9

---
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ff4f46ad069..3804d4ec56b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -92,10 +92,8 @@ matrix:
     - arch: amd64
       python: "nightly"
       dist: xenial
-    - arch: arm64
-      python: "nightly"
-      dist: bionic
-      env: ARM64=True
+    - arch: amd64
+      python: "3.9-dev"
     - os: osx
       language: generic
       python: 3.6

From 5ef9a8e5450ce553c40167e662a249b4980b9071 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 28 Aug 2020 11:39:23 -0700
Subject: [PATCH 0236/1407] Finish What's new for 7.18

---
 docs/source/whatsnew/github-stats-7.rst | 2 ++
 docs/source/whatsnew/version7.rst       | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index 3c8deb3dc75..76a2c236a1e 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -1,6 +1,8 @@
 Issues closed in the 7.x development cycle
 ==========================================
 
+Stats are not collected after version 7.17, all contribution will show up as part of the 8.0 release.
+
 Issues closed in 7.17
 ---------------------
 
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 88961136796..2aeef66be21 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -12,9 +12,11 @@ IPython 7.18 is a minor release that mostly contains bugfixes.
  - ``CRLF`` is now handled by magics my default; solving some issues due to copy
    pasting on windows. :ghpull:`12475`
 
- - Requirin pexpect ``>=4.3`` as we are Python 3.7+ only and earlier version of
+ - Requiring pexpect ``>=4.3`` as we are Python 3.7+ only and earlier version of
    pexpect will be incompatible. :ghpull:`12510`
 
+ - Minimum jedi version is now 0.16. :ghpull:`12488`
+
 
 
 .. _version 717:

From ab99d8b50dcd034b4cfc994124b76985c9c56250 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 28 Aug 2020 11:43:18 -0700
Subject: [PATCH 0237/1407] stop testing 3.6/osx

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3804d4ec56b..b52bcaf9e4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,10 +94,6 @@ matrix:
       dist: xenial
     - arch: amd64
       python: "3.9-dev"
-    - os: osx
-      language: generic
-      python: 3.6
-      env: TRAVIS_PYTHON_VERSION=3.6
     - os: osx
       language: generic
       python: 3.7

From 90b788488ec0b718205c71091deb6421a53a4d85 Mon Sep 17 00:00:00 2001
From: rushabh-v <vasanirushabh24@gmail.com>
Date: Fri, 4 Sep 2020 11:21:13 +0530
Subject: [PATCH 0238/1407] use pathlib.Path in retar.py

---
 tools/retar.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/retar.py b/tools/retar.py
index efd8c0c6bbd..3615e7410fc 100644
--- a/tools/retar.py
+++ b/tools/retar.py
@@ -22,14 +22,17 @@
 import gzip
 import io
 
+from pathlib import Path
+
 if len(sys.argv) > 2:
     raise ValueError("Too many arguments")
 
 
 timestamp = int(os.environ["SOURCE_DATE_EPOCH"])
 
+path = Path(sys.argv[1])
 old_buf = io.BytesIO()
-with open(sys.argv[1], "rb") as f:
+with open(path, "rb") as f:
     old_buf.write(f.read())
 old_buf.seek(0)
 old = tarfile.open(fileobj=old_buf, mode="r:gz")
@@ -56,10 +59,10 @@
 old.close()
 
 buf.seek(0)
-with open(sys.argv[1], "wb") as f:
+with open(path, "wb") as f:
     with gzip.GzipFile('', "wb", fileobj=f, mtime=timestamp) as gzf:
         gzf.write(buf.read())
 
 # checks the archive is valid.
-archive = tarfile.open(sys.argv[1])
+archive = tarfile.open(path)
 names = archive.getnames()

From 85c8fd573db666b82c3cb866f178145fc69e28e1 Mon Sep 17 00:00:00 2001
From: rushabh-v <vasanirushabh24@gmail.com>
Date: Fri, 4 Sep 2020 11:33:09 +0530
Subject: [PATCH 0239/1407] fix grammatical error in CONTRIBUTING.md

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3aecb233319..1c7922cce33 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -74,7 +74,7 @@ For more detailed information, see our [GitHub Workflow](https://github.com/ipyt
 
 ## Running Tests
 
-All the tests can by running
+All the tests can be run by using
 ```shell
 iptest
 ```

From 182b8f994074233b33b51d8cef3973226c33276a Mon Sep 17 00:00:00 2001
From: rchiodo <rchiodo@users.noreply.github.com>
Date: Fri, 4 Sep 2020 15:36:13 -0700
Subject: [PATCH 0240/1407] Use pathlib in edit magic

---
 IPython/core/magics/code.py      | 20 ++++++++++++--------
 IPython/core/tests/test_magic.py |  5 +++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index f1289b5a4d1..571340690e8 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -22,6 +22,7 @@
 from itertools import chain
 from urllib.request import urlopen
 from urllib.parse import urlencode
+from pathlib import Path
 
 # Our own packages
 from IPython.core.error import TryNext, StdinNotImplementedError, UsageError
@@ -688,11 +689,14 @@ def edit(self, parameter_s='',last_call=['','']):
         # do actual editing here
         print('Editing...', end=' ')
         sys.stdout.flush()
+        filepath = Path(filename)
         try:
-            # Quote filenames that may have spaces in them
-            if ' ' in filename:
-                filename = "'%s'" % filename
-            self.shell.hooks.editor(filename,lineno)
+            # Quote filenames that may have spaces in them when opening
+            # the editor
+            quoted = filename = str(filepath.absolute())
+            if ' ' in quoted:
+                quoted = "'%s'" % quoted
+            self.shell.hooks.editor(quoted,lineno)
         except TryNext:
             warn('Could not open editor')
             return
@@ -700,7 +704,7 @@ def edit(self, parameter_s='',last_call=['','']):
         # XXX TODO: should this be generalized for all string vars?
         # For now, this is special-cased to blocks created by cpaste
         if args.strip() == 'pasted_block':
-            with open(filename, 'r') as f:
+            with filepath.open('r') as f:
                 self.shell.user_ns['pasted_block'] = f.read()
 
         if 'x' in opts:  # -x prevents actual execution
@@ -711,7 +715,7 @@ def edit(self, parameter_s='',last_call=['','']):
                 if not is_temp:
                     self.shell.user_ns['__file__'] = filename
                 if 'r' in opts:    # Untranslated IPython code
-                    with open(filename, 'r') as f:
+                    with filepath.open('r') as f:
                         source = f.read()
                     self.shell.run_cell(source, store_history=False)
                 else:
@@ -720,10 +724,10 @@ def edit(self, parameter_s='',last_call=['','']):
 
         if is_temp:
             try:
-                with open(filename) as f:
+                with filepath.open() as f:
                     return f.read()
             except IOError as msg:
-                if msg.filename == filename:
+                if Path(msg.filename) == filepath:
                     warn('File not found. Did you forget to save?')
                     return
                 else:
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index a52ab025fb9..5021fa1ed40 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -1138,6 +1138,11 @@ def test_edit_cell():
     # test
     _run_edit_test("1", exp_contents=ip.user_ns['In'][1], exp_is_temp=True)
 
+def test_edit_fname():
+    """%edit file"""
+    # test
+    _run_edit_test("test file.py", exp_filename="test file.py")
+
 def test_bookmark():
     ip = get_ipython()
     ip.run_line_magic('bookmark', 'bmname')

From caee8a40f937e550f9b2e6f52b5c3349d740644a Mon Sep 17 00:00:00 2001
From: rchiodo <rchiodo@users.noreply.github.com>
Date: Fri, 4 Sep 2020 15:40:04 -0700
Subject: [PATCH 0241/1407] Missed a spot

---
 IPython/core/magics/code.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index 571340690e8..095c91e7df0 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -513,7 +513,7 @@ def _edit_macro(self,mname,macro):
         self.shell.hooks.editor(filename)
 
         # and make a new macro object, to replace the old one
-        with open(filename) as mfile:
+        with Path(filename).open() as mfile:
             mvalue = mfile.read()
         self.shell.user_ns[mname] = Macro(mvalue)
 

From a3463533c5c7a9dd218039f2ff259f39c841fffd Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Fri, 4 Sep 2020 14:59:10 +0200
Subject: [PATCH 0242/1407] allow specifying multiple extensions with traitlets
 5

for backward-compatibility, add new `extra_extensions` list

Use new list only with traitlets 5, keep old singleton behavior with traitlets 4
---
 IPython/core/shellapp.py | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py
index 9e8bfbfbb81..ee65d3af6c8 100644
--- a/IPython/core/shellapp.py
+++ b/IPython/core/shellapp.py
@@ -19,8 +19,10 @@
 from IPython.core import pylabtools
 from IPython.utils.contexts import preserve_keys
 from IPython.utils.path import filefind
+import traitlets
 from traitlets import (
     Unicode, Instance, List, Bool, CaselessStrEnum, observe,
+    DottedObjectName,
 )
 from IPython.terminal import pt_inputhooks
 
@@ -89,13 +91,18 @@
     logappend='InteractiveShell.logappend',
     c='InteractiveShellApp.code_to_run',
     m='InteractiveShellApp.module_to_run',
-    ext='InteractiveShellApp.extra_extension',
+    ext="InteractiveShellApp.extra_extensions",
     gui='InteractiveShellApp.gui',
     pylab='InteractiveShellApp.pylab',
     matplotlib='InteractiveShellApp.matplotlib',
 )
 shell_aliases['cache-size'] = 'InteractiveShell.cache_size'
 
+if traitlets.version_info < (5, 0):
+    # traitlets 4 doesn't handle lists on CLI
+    shell_aliases["ext"] = "InteractiveShellApp.extra_extension"
+
+
 #-----------------------------------------------------------------------------
 # Main classes and functions
 #-----------------------------------------------------------------------------
@@ -118,8 +125,27 @@ class InteractiveShellApp(Configurable):
     extensions = List(Unicode(),
         help="A list of dotted module names of IPython extensions to load."
     ).tag(config=True)
-    extra_extension = Unicode('',
-        help="dotted module name of an IPython extension to load."
+
+    extra_extension = Unicode(
+        "",
+        help="""
+        DEPRECATED. Dotted module name of a single extra IPython extension to load.
+
+        Only one extension can be added this way.
+
+        Only used with traitlets < 5.0, plural extra_extensions list is used in traitlets 5.
+        """,
+    ).tag(config=True)
+
+    extra_extensions = List(
+        DottedObjectName(),
+        help="""
+        Dotted module name(s) of one or more IPython extensions to load.
+
+        For specifying extra extensions to load on the command-line.
+
+        .. versionadded:: 7.10
+        """,
     ).tag(config=True)
 
     reraise_ipython_extension_failures = Bool(False,
@@ -264,7 +290,9 @@ def init_extensions(self):
         """
         try:
             self.log.debug("Loading IPython extensions...")
-            extensions = self.default_extensions + self.extensions
+            extensions = (
+                self.default_extensions + self.extensions + self.extra_extensions
+            )
             if self.extra_extension:
                 extensions.append(self.extra_extension)
             for ext in extensions:

From 1d0656e601ef45335c8196cc035130ca54ead7ca Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Mon, 7 Sep 2020 10:58:33 +0200
Subject: [PATCH 0243/1407] more useful feedback on style checker

- give copy-pasteable command to fix formatting with `darker`
- use $TRAVIS_COMMIT_RANGE to limit to PR, instead of hardcoded ref
- only run on pull requests
- run style check before tests, for quicker feedback
---
 .travis.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3804d4ec56b..a73d173b608 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,14 +57,24 @@ script:
        # on nightly fake parso known the grammar
        cp /home/travis/virtualenv/python3.9-dev/lib/python3.9/site-packages/parso/python/grammar38.txt /home/travis/virtualenv/python3.9-dev/lib/python3.9/site-packages/parso/python/grammar39.txt
     fi
+  - |
+    # check style on changes
+    # run `darker -r master` and commit changes to fix
+    if [[ "${TRAVIS_PULL_REQUEST:-false}" != "false" ]] \
+    && [[ "$TRAVIS_PYTHON_VERSION" == "3.8" ]] \
+    && [[ "$TRAVIS_OS_NAME" == "linux" ]];
+    then
+      darker -r ${TRAVIS_COMMIT_RANGE%%.*} --check --diff . || (
+        echo "Changes need auto-formatting. Run:"
+        echo "    darker -r ${TRAVIS_COMMIT_RANGE%%.*}"
+        echo "then commit and push changes to fix."
+        exit 1
+      )
+    fi
   - cd /tmp && iptest --coverage xml && cd -
   - pytest IPython
   - mypy IPython/terminal/ptutils.py
   - mypy IPython/core/c*.py
-  - |
-    if [[ "$TRAVIS_PYTHON_VERSION" == "3.8" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      darker -r 60625f241f298b5039cb2debc365db38aa7bb522 --check --diff .
-    fi
   # On the latest Python (on Linux) only, make sure that the docs build.
   - |
     if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then

From 3427d65d2010932e4b9d85fea80c215dfa2daa4e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 7 Sep 2020 09:41:06 -0700
Subject: [PATCH 0244/1407] Apply suggestions from code review

Co-authored-by: Ashwin Vishnu <9155111+ashwinvis@users.noreply.github.com>
---
 IPython/core/magics/code.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index 095c91e7df0..e2f570cab05 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -513,8 +513,7 @@ def _edit_macro(self,mname,macro):
         self.shell.hooks.editor(filename)
 
         # and make a new macro object, to replace the old one
-        with Path(filename).open() as mfile:
-            mvalue = mfile.read()
+        mvalue = Path(filename).read_text()
         self.shell.user_ns[mname] = Macro(mvalue)
 
     @skip_doctest
@@ -704,8 +703,7 @@ def edit(self, parameter_s='',last_call=['','']):
         # XXX TODO: should this be generalized for all string vars?
         # For now, this is special-cased to blocks created by cpaste
         if args.strip() == 'pasted_block':
-            with filepath.open('r') as f:
-                self.shell.user_ns['pasted_block'] = f.read()
+            self.shell.user_ns['pasted_block'] = filepath.read_text()
 
         if 'x' in opts:  # -x prevents actual execution
             print()

From 5a7a2178870860136583bd6ff76ebd5fc9a007ea Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 7 Sep 2020 09:44:41 -0700
Subject: [PATCH 0245/1407] Fix 2 more occurences of Path to use Pathlib,

and run darker
---
 IPython/core/magics/code.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index e2f570cab05..8e231a5fa7e 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -693,17 +693,17 @@ def edit(self, parameter_s='',last_call=['','']):
             # Quote filenames that may have spaces in them when opening
             # the editor
             quoted = filename = str(filepath.absolute())
-            if ' ' in quoted:
+            if " " in quoted:
                 quoted = "'%s'" % quoted
-            self.shell.hooks.editor(quoted,lineno)
+            self.shell.hooks.editor(quoted, lineno)
         except TryNext:
             warn('Could not open editor')
             return
 
         # XXX TODO: should this be generalized for all string vars?
         # For now, this is special-cased to blocks created by cpaste
-        if args.strip() == 'pasted_block':
-            self.shell.user_ns['pasted_block'] = filepath.read_text()
+        if args.strip() == "pasted_block":
+            self.shell.user_ns["pasted_block"] = filepath.read_text()
 
         if 'x' in opts:  # -x prevents actual execution
             print()
@@ -713,8 +713,7 @@ def edit(self, parameter_s='',last_call=['','']):
                 if not is_temp:
                     self.shell.user_ns['__file__'] = filename
                 if 'r' in opts:    # Untranslated IPython code
-                    with filepath.open('r') as f:
-                        source = f.read()
+                    source = filepath.read_text()
                     self.shell.run_cell(source, store_history=False)
                 else:
                     self.shell.safe_execfile(filename, self.shell.user_ns,
@@ -722,8 +721,7 @@ def edit(self, parameter_s='',last_call=['','']):
 
         if is_temp:
             try:
-                with filepath.open() as f:
-                    return f.read()
+                return filepath.read_text()
             except IOError as msg:
                 if Path(msg.filename) == filepath:
                     warn('File not found. Did you forget to save?')

From a1f433a1aa343a29279dce3dcc8f349437b290d6 Mon Sep 17 00:00:00 2001
From: Gabriel Simonetto <gabrielfranksimonetto@gmail.com>
Date: Wed, 9 Sep 2020 17:39:29 -0300
Subject: [PATCH 0246/1407] Introduce pathlib on init_virtualenv.

---
 IPython/core/interactiveshell.py | 42 +++++++++++++++++---------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 30acf3a4484..b30853a4c71 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -28,6 +28,7 @@
 import warnings
 from io import open as io_open
 
+from pathlib import Path
 from pickleshare import PickleShareDB
 
 from traitlets.config.configurable import SingletonConfigurable
@@ -889,7 +890,7 @@ def init_displayhook(self):
         self.display_trap = DisplayTrap(hook=self.displayhook)
 
     def init_virtualenv(self):
-        """Add a virtualenv to sys.path so the user can import modules from it.
+        """Add the current virtualenv to sys.path so the user can import modules from it.
         This isn't perfect: it doesn't use the Python interpreter with which the
         virtualenv was built, and it ignores the --no-site-packages option. A
         warning will appear suggesting the user installs IPython in the
@@ -902,42 +903,45 @@ def init_virtualenv(self):
         if 'VIRTUAL_ENV' not in os.environ:
             # Not in a virtualenv
             return
-        
-        p = os.path.normcase(sys.executable)
-        p_venv = os.path.normcase(os.environ['VIRTUAL_ENV'])
-
-        # executable path should end like /bin/python or \\scripts\\python.exe
-        p_exe_up2 = os.path.dirname(os.path.dirname(p))
-        if p_exe_up2 and os.path.exists(p_venv) and os.path.samefile(p_exe_up2, p_venv):
-            # Our exe is inside the virtualenv, don't need to do anything.
+        elif os.environ['VIRTUAL_ENV'] == '':
+            warn("Virtual env path set to '', please check if this is intended.")
             return
 
+        p = Path(sys.executable)
+        p_venv = Path(os.environ['VIRTUAL_ENV'])
+
         # fallback venv detection:
         # stdlib venv may symlink sys.executable, so we can't use realpath.
         # but others can symlink *to* the venv Python, so we can't just use sys.executable.
         # So we just check every item in the symlink tree (generally <= 3)
         paths = [p]
-        while os.path.islink(p):
-            p = os.path.normcase(os.path.join(os.path.dirname(p), os.readlink(p)))
-            paths.append(p)
-        
+        while p.is_symlink():
+            p = Path(os.readlink(p))
+            paths.append(p.resolve())
+
         # In Cygwin paths like "c:\..." and '\cygdrive\c\...' are possible
         if p_venv.startswith('\\cygdrive'):
             p_venv = p_venv[11:]
         elif len(p_venv) >= 2 and p_venv[1] == ':':
             p_venv = p_venv[2:]
 
-        if any(p_venv in p for p in paths):
-            # Running properly in the virtualenv, don't need to do anything
+        if any(os.fspath(p_venv) in os.fspath(p) for p in paths):
+            # Our exe is inside or has access to the virtualenv, don't need to do anything.
             return
-        
+
         warn("Attempting to work in a virtualenv. If you encounter problems, please "
              "install IPython inside the virtualenv.")
         if sys.platform == "win32":
-            virtual_env = os.path.join(os.environ['VIRTUAL_ENV'], 'Lib', 'site-packages') 
+            virtual_env = Path(os.environ['VIRTUAL_ENV']).joinpath(
+                'Lib',
+                'site-packages'
+            )
         else:
-            virtual_env = os.path.join(os.environ['VIRTUAL_ENV'], 'lib',
-                       'python%d.%d' % sys.version_info[:2], 'site-packages')
+            virtual_env = Path(os.environ['VIRTUAL_ENV']).joinpath(
+                'lib',
+                "python{}.{}".format(*sys.version_info[:2]),
+                'site-packages'
+            )
         
         import site
         sys.path.insert(0, virtual_env)

From ac99f8722f42c68b1f29d3bf92b1e9957c1cc186 Mon Sep 17 00:00:00 2001
From: rushabh-v <vasanirushabh24@gmail.com>
Date: Sat, 12 Sep 2020 13:51:55 +0530
Subject: [PATCH 0247/1407] use pathlib in fixup_whats_new_pr.py

---
 tools/fixup_whats_new_pr.py | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/tools/fixup_whats_new_pr.py b/tools/fixup_whats_new_pr.py
index 057b2e48cbb..f64d1b3ce82 100644
--- a/tools/fixup_whats_new_pr.py
+++ b/tools/fixup_whats_new_pr.py
@@ -11,28 +11,25 @@
 notes.
 """
 
-import glob
-
+from pathlib import Path
 
 def main():
-    folder = 'docs/source/whatsnew/pr/'
-    assert folder.endswith('/')
-    files = glob.glob(folder+'*.rst')
+    folder = Path('docs/source/whatsnew/pr/')
+    files = list(folder.glob('*.rst'))
     print(files)
 
-    for filename in files:
-        print('Adding pseudo-title to:', filename)
-        title = filename[:-4].split('/')[-1].replace('-', ' ').capitalize()
+    for filepath in files:
+        print('Adding pseudo-title to:', filepath.name)
+        title = filepath.name[:-4].split('/')[-1].replace('-', ' ').capitalize()
 
-        with open(filename) as f:
-            data = f.read()
+        data = filepath.read_text()
         try:
             if data and data.splitlines()[1].startswith('='):
                 continue
         except IndexError:
             pass
 
-        with open(filename, 'w') as f:
+        with filepath.open('w') as f:
             f.write(title+'\n')
             f.write('='* len(title)+'\n\n')
             f.write(data)
@@ -40,7 +37,3 @@ def main():
 if __name__ == '__main__':
     main()
 
-
-
-
-

From 50a8bd8a84b2c822886246b6686ab8479ca2fc94 Mon Sep 17 00:00:00 2001
From: rushabh-v <vasanirushabh24@gmail.com>
Date: Sat, 12 Sep 2020 14:34:43 +0530
Subject: [PATCH 0248/1407] run darker

---
 tools/fixup_whats_new_pr.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/fixup_whats_new_pr.py b/tools/fixup_whats_new_pr.py
index f64d1b3ce82..a2741ef9ebf 100644
--- a/tools/fixup_whats_new_pr.py
+++ b/tools/fixup_whats_new_pr.py
@@ -14,13 +14,13 @@
 from pathlib import Path
 
 def main():
-    folder = Path('docs/source/whatsnew/pr/')
-    files = list(folder.glob('*.rst'))
+    folder = Path("docs/source/whatsnew/pr/")
+    files = list(folder.glob("*.rst"))
     print(files)
 
     for filepath in files:
-        print('Adding pseudo-title to:', filepath.name)
-        title = filepath.name[:-4].split('/')[-1].replace('-', ' ').capitalize()
+        print("Adding pseudo-title to:", filepath.name)
+        title = filepath.name[:-4].split("/")[-1].replace("-", " ").capitalize()
 
         data = filepath.read_text()
         try:
@@ -29,9 +29,9 @@ def main():
         except IndexError:
             pass
 
-        with filepath.open('w') as f:
-            f.write(title+'\n')
-            f.write('='* len(title)+'\n\n')
+        with filepath.open("w") as f:
+            f.write(title + "\n")
+            f.write("=" * len(title) + "\n\n")
             f.write(data)
 
 if __name__ == '__main__':

From 3a3104109beddde0876eb4dc108b5ca5aba811ce Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 14 Sep 2020 15:24:26 -0700
Subject: [PATCH 0249/1407] Update IPython/core/interactiveshell.py

---
 IPython/core/interactiveshell.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index b30853a4c71..d35f5cbf92b 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -920,10 +920,10 @@ def init_virtualenv(self):
             paths.append(p.resolve())
 
         # In Cygwin paths like "c:\..." and '\cygdrive\c\...' are possible
-        if p_venv.startswith('\\cygdrive'):
-            p_venv = p_venv[11:]
-        elif len(p_venv) >= 2 and p_venv[1] == ':':
-            p_venv = p_venv[2:]
+        if str(p_venv).startswith('\\cygdrive'):
+            p_venv = Path(str(p_venv)[11:])
+        elif len(str(p_venv)) >= 2 and str(p_venv)[1] == ':':
+            p_venv = Path(str(p_venv)[2:])
 
         if any(os.fspath(p_venv) in os.fspath(p) for p in paths):
             # Our exe is inside or has access to the virtualenv, don't need to do anything.

From 410c70c47a297b4cc74dde43595e95b8621246b4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 17 Sep 2020 11:48:38 -0700
Subject: [PATCH 0250/1407] reformat modified code

---
 IPython/core/interactiveshell.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index d35f5cbf92b..de3c263a251 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -903,12 +903,12 @@ def init_virtualenv(self):
         if 'VIRTUAL_ENV' not in os.environ:
             # Not in a virtualenv
             return
-        elif os.environ['VIRTUAL_ENV'] == '':
+        elif os.environ["VIRTUAL_ENV"] == "":
             warn("Virtual env path set to '', please check if this is intended.")
             return
 
         p = Path(sys.executable)
-        p_venv = Path(os.environ['VIRTUAL_ENV'])
+        p_venv = Path(os.environ["VIRTUAL_ENV"])
 
         # fallback venv detection:
         # stdlib venv may symlink sys.executable, so we can't use realpath.
@@ -920,9 +920,9 @@ def init_virtualenv(self):
             paths.append(p.resolve())
 
         # In Cygwin paths like "c:\..." and '\cygdrive\c\...' are possible
-        if str(p_venv).startswith('\\cygdrive'):
+        if str(p_venv).startswith("\\cygdrive"):
             p_venv = Path(str(p_venv)[11:])
-        elif len(str(p_venv)) >= 2 and str(p_venv)[1] == ':':
+        elif len(str(p_venv)) >= 2 and str(p_venv)[1] == ":":
             p_venv = Path(str(p_venv)[2:])
 
         if any(os.fspath(p_venv) in os.fspath(p) for p in paths):
@@ -932,15 +932,12 @@ def init_virtualenv(self):
         warn("Attempting to work in a virtualenv. If you encounter problems, please "
              "install IPython inside the virtualenv.")
         if sys.platform == "win32":
-            virtual_env = Path(os.environ['VIRTUAL_ENV']).joinpath(
-                'Lib',
-                'site-packages'
+            virtual_env = Path(os.environ["VIRTUAL_ENV"]).joinpath(
+                "Lib", "site-packages"
             )
         else:
-            virtual_env = Path(os.environ['VIRTUAL_ENV']).joinpath(
-                'lib',
-                "python{}.{}".format(*sys.version_info[:2]),
-                'site-packages'
+            virtual_env = Path(os.environ["VIRTUAL_ENV"]).joinpath(
+                "lib", "python{}.{}".format(*sys.version_info[:2]), "site-packages"
             )
         
         import site

From 59cbf86e9790eab46d8e3780724cecec42b80fe8 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 19 Sep 2020 12:30:51 -0700
Subject: [PATCH 0251/1407] Update issue templates

---
 .../bug-report---question---feature.md        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug-report---question---feature.md

diff --git a/.github/ISSUE_TEMPLATE/bug-report---question---feature.md b/.github/ISSUE_TEMPLATE/bug-report---question---feature.md
new file mode 100644
index 00000000000..49ccc267998
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report---question---feature.md
@@ -0,0 +1,19 @@
+---
+name: Bug report / Question / Feature
+about: Anything related to IPython itsel
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- This is the repository for IPython command line, if you can try to make sure this question/bug/feature belong here and not on one of the Jupyter repositories. 
+
+If it's a generic Python/Jupyter question, try other forums or discourse.jupyter.org.
+
+If you are unsure, it's ok to post here, though, there are few maintainer so you might not get a fast response. 
+
+Ability of maintainers to spend time and resources on project like IPython is heavily influenced by US politics, and the current government policies have been harmful to the IPython Maintainers and Community. 
+
+If you are on the fence on who to vote for or wether to vote, please cast your vote in for the democrat party in the US.
+-->

From d0a0447a4baf31d8a558b72f1840895f1376f8c0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 19 Sep 2020 12:33:55 -0700
Subject: [PATCH 0252/1407] make default

---
 .../bug-report---question---feature.md => ISSUE_TEMPLATE.md}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/{ISSUE_TEMPLATE/bug-report---question---feature.md => ISSUE_TEMPLATE.md} (100%)

diff --git a/.github/ISSUE_TEMPLATE/bug-report---question---feature.md b/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug-report---question---feature.md
rename to .github/ISSUE_TEMPLATE.md

From 47588dcf89afb4bdbc71e9a7352172c6d6794cac Mon Sep 17 00:00:00 2001
From: Inception95 <yangyiheng@inspur.com>
Date: Mon, 21 Sep 2020 21:08:21 -0700
Subject: [PATCH 0253/1407] Use Pathlib on page.py

---
 IPython/core/page.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/core/page.py b/IPython/core/page.py
index d039925b5ef..0752909a651 100644
--- a/IPython/core/page.py
+++ b/IPython/core/page.py
@@ -22,6 +22,7 @@
 import subprocess
 
 from io import UnsupportedOperation
+from pathlib import Path
 
 from IPython import get_ipython
 from IPython.display import display
@@ -195,6 +196,7 @@ def pager_page(strng, start=0, screen_lines=0, pager_cmd=None):
                 retval = 1
             else:
                 fd, tmpname = tempfile.mkstemp('.txt')
+                tmppath = 
                 try:
                     os.close(fd)
                     with open(tmpname, 'wt') as tmpfile:

From 2e0519cfa9230ab05d383195624379e6668c7553 Mon Sep 17 00:00:00 2001
From: Inception95 <yangyiheng@inspur.com>
Date: Mon, 21 Sep 2020 21:10:25 -0700
Subject: [PATCH 0254/1407] Use pathlib in page.py

---
 IPython/core/page.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/core/page.py b/IPython/core/page.py
index 0752909a651..3db9c602a43 100644
--- a/IPython/core/page.py
+++ b/IPython/core/page.py
@@ -196,19 +196,19 @@ def pager_page(strng, start=0, screen_lines=0, pager_cmd=None):
                 retval = 1
             else:
                 fd, tmpname = tempfile.mkstemp('.txt')
-                tmppath = 
+                tmppath = Path(tmpname)
                 try:
                     os.close(fd)
-                    with open(tmpname, 'wt') as tmpfile:
+                    with tmppath.open('wt') as tmpfile:
                         tmpfile.write(strng)
-                        cmd = "%s < %s" % (pager_cmd, tmpname)
+                        cmd = "%s < %s" % (pager_cmd, tmppath)
                     # tmpfile needs to be closed for windows
                     if os.system(cmd):
                         retval = 1
                     else:
                         retval = None
                 finally:
-                    os.remove(tmpname)
+                    Path.unlink(tmppath)
         else:
             try:
                 retval = None

From 8c1ad7b93b10e0a8aba70e1eb6bbfd7c61395eac Mon Sep 17 00:00:00 2001
From: Inception95 <yangyiheng@inspur.com>
Date: Mon, 21 Sep 2020 21:30:54 -0700
Subject: [PATCH 0255/1407] run darker

---
 IPython/core/page.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/page.py b/IPython/core/page.py
index 3db9c602a43..44903255ec2 100644
--- a/IPython/core/page.py
+++ b/IPython/core/page.py
@@ -199,7 +199,7 @@ def pager_page(strng, start=0, screen_lines=0, pager_cmd=None):
                 tmppath = Path(tmpname)
                 try:
                     os.close(fd)
-                    with tmppath.open('wt') as tmpfile:
+                    with tmppath.open("wt") as tmpfile:
                         tmpfile.write(strng)
                         cmd = "%s < %s" % (pager_cmd, tmppath)
                     # tmpfile needs to be closed for windows

From 79eb6e33d009799f708086ffbaf7e251d6892de9 Mon Sep 17 00:00:00 2001
From: rushabh-v <vasanirushabh24@gmail.com>
Date: Wed, 23 Sep 2020 22:24:10 +0530
Subject: [PATCH 0256/1407] use pathlib in utils/openpy.py

---
 IPython/utils/openpy.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/IPython/utils/openpy.py b/IPython/utils/openpy.py
index c90d2b53a30..d57f877b78b 100644
--- a/IPython/utils/openpy.py
+++ b/IPython/utils/openpy.py
@@ -7,6 +7,7 @@
 
 import io
 from io import TextIOWrapper, BytesIO
+from pathlib import Path
 import re
 from tokenize import open, detect_encoding
 
@@ -72,11 +73,12 @@ def read_py_file(filename, skip_encoding_cookie=True):
     -------
     A unicode string containing the contents of the file.
     """
-    with open(filename) as f:   # the open function defined in this module.
+    filepath = Path(filename)
+    with filepath.open() as f:   # the open function defined in this module.
         if skip_encoding_cookie:
             return "".join(strip_encoding_cookie(f))
         else:
-            return f.read()
+            return filepath.read_text()
 
 def read_py_url(url, errors='replace', skip_encoding_cookie=True):
     """Read a Python file from a URL, using the encoding declared inside the file.

From 68f6b828179fb86226b3b77122538b30baeaf310 Mon Sep 17 00:00:00 2001
From: Albert Zhang <alchzh@gmail.com>
Date: Thu, 24 Sep 2020 11:18:12 -0400
Subject: [PATCH 0257/1407] Small typo in pylab deprecation message

---
 IPython/core/magics/pylab.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/pylab.py b/IPython/core/magics/pylab.py
index 0e9688e2ab7..9a46442349b 100644
--- a/IPython/core/magics/pylab.py
+++ b/IPython/core/magics/pylab.py
@@ -155,7 +155,7 @@ def pylab(self, line=''):
         gui, backend, clobbered = self.shell.enable_pylab(args.gui, import_all=import_all)
         self._show_matplotlib_backend(args.gui, backend)
         print(
-            "%pylab is deprecated, use %matpltolib inline and import the required libraries."
+            "%pylab is deprecated, use %matplotlib inline and import the required libraries."
         )
         print("Populating the interactive namespace from numpy and matplotlib")
         if clobbered:

From 454a75fe0d418b0a9a47e39adabf6ace113d2e11 Mon Sep 17 00:00:00 2001
From: Shao Yang Hong <shaoyang.hong@ninjavan.co>
Date: Fri, 25 Sep 2020 23:28:46 +0800
Subject: [PATCH 0258/1407] [Fix] Improve installing docs if on zsh

- zsh uses square brackets for globbing (see https://stackoverflow.com/a/30539963).
- installation would be confusing for zsh users who will get a 'no matches found' error without the quotes
---
 docs/source/install/install.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/install/install.rst b/docs/source/install/install.rst
index 9888a8d3d95..5804fa83d52 100644
--- a/docs/source/install/install.rst
+++ b/docs/source/install/install.rst
@@ -90,7 +90,7 @@ grab the latest stable tarball of IPython `from PyPI
     tar -xzf ipython-5.1.0.tar.gz
     cd ipython-5.1.0
     # The [test] extra ensures test dependencies are installed too:
-    pip install .[test]
+    pip install '.[test]'
 
 Do not invoke ``setup.py`` directly as this can have undesirable consequences
 for further upgrades. We do not recommend using ``easy_install`` either.
@@ -123,7 +123,7 @@ Then do:
 
     $ git clone https://github.com/ipython/ipython.git
     $ cd ipython
-    $ pip install -e .[test]
+    $ pip install -e '.[test]'
 
 The :command:`pip install -e .` command allows users and developers to follow
 the development branch as it changes by creating links in the right places and

From 6be815c137f6d3b69937c9c099b16580381b142c Mon Sep 17 00:00:00 2001
From: rushabh-v <vasanirushabh24@gmail.com>
Date: Tue, 29 Sep 2020 10:55:50 +0530
Subject: [PATCH 0259/1407] use file.read instead of filepath.read_text

---
 IPython/utils/openpy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/utils/openpy.py b/IPython/utils/openpy.py
index d57f877b78b..af568114165 100644
--- a/IPython/utils/openpy.py
+++ b/IPython/utils/openpy.py
@@ -78,7 +78,7 @@ def read_py_file(filename, skip_encoding_cookie=True):
         if skip_encoding_cookie:
             return "".join(strip_encoding_cookie(f))
         else:
-            return filepath.read_text()
+            return f.read()
 
 def read_py_url(url, errors='replace', skip_encoding_cookie=True):
     """Read a Python file from a URL, using the encoding declared inside the file.

From 1fb848e931d1c6be6d57d393335c9c340d089593 Mon Sep 17 00:00:00 2001
From: farisachugthai <farischugthai@gmail.com>
Date: Tue, 29 Sep 2020 16:59:43 -0400
Subject: [PATCH 0260/1407] Remove latex_paper_size, it's no longer recognized

---
 docs/source/conf.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 5012da2694e..7ed40a95aed 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -125,7 +125,7 @@ def is_stable(extra):
 
 class ConfigtraitFilter(logging.Filter):
     """
-    This is a filter to remove in sphinx 3+ the error about config traits being duplicated. 
+    This is a filter to remove in sphinx 3+ the error about config traits being duplicated.
 
     As we autogenerate configuration traits from, subclasses have lots of
     duplication and we want to silence them. Indeed we build on travis with
@@ -261,9 +261,6 @@ def filter(self, record):
 # Options for LaTeX output
 # ------------------------
 
-# The paper size ('letter' or 'a4').
-latex_paper_size = 'letter'
-
 # The font size ('10pt', '11pt' or '12pt').
 latex_font_size = '11pt'
 

From dc5001adc98beeaa3399d01137985f89e38a064a Mon Sep 17 00:00:00 2001
From: Ankitsingh6299 <45270160+Ankitsingh6299@users.noreply.github.com>
Date: Wed, 30 Sep 2020 19:09:21 +0530
Subject: [PATCH 0261/1407] Updated document

Updated readme,added about ipython
---
 README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.rst b/README.rst
index 940047656f2..196139c7a6b 100644
--- a/README.rst
+++ b/README.rst
@@ -24,6 +24,7 @@ Overview
 Welcome to IPython.  Our full documentation is available on `ipython.readthedocs.io
 <https://ipython.readthedocs.io/en/stable/>`_ and contains information on how to install, use, and
 contribute to the project.
+IPython (Interactive Python) is a command shell for interactive computing in multiple programming languages, originally developed for the Python programming language, that offers introspection, rich media, shell syntax, tab completion, and history.
 
 **IPython versions and Python Support**
 

From 4920c37a6080b10a9403cc2c447590149c73cf1f Mon Sep 17 00:00:00 2001
From: farisachugthai <farischugthai@gmail.com>
Date: Thu, 1 Oct 2020 00:12:08 -0400
Subject: [PATCH 0262/1407] Fix broken link in documentation

---
 docs/source/development/pycompat.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/source/development/pycompat.rst b/docs/source/development/pycompat.rst
index 6062d1ae3c6..6023e379bb6 100644
--- a/docs/source/development/pycompat.rst
+++ b/docs/source/development/pycompat.rst
@@ -10,7 +10,7 @@ Writing code for Python 2 and 3
 IPython 6 requires Python 3, so our compatibility module
 ``IPython.utils.py3compat`` is deprecated and will be removed in a future
 version. In most cases, we recommend you use the `six module
-<https://pythonhosted.org/six/>`__ to support compatible code. This is widely
+<https://six.readthedocs.io/>`__ to support compatible code. This is widely
 used by other projects, so it is familiar to many developers and thoroughly
 battle-tested.
 
@@ -24,9 +24,9 @@ be removed in the future.
    `Porting Python 2 code to Python 3 <https://docs.python.org/3/howto/pyporting.html>`_
      Official information in the Python docs.
 
-   `Python-Modernize <http://python-modernize.readthedocs.io/en/latest/>`_
+   `Python-Modernize <https://python-modernize.readthedocs.io/en/latest/>`_
      A tool which helps make code compatible with Python 3.
 
-   `Python-Future <http://python-future.org/>`_
+   `Python-Future <https://python-future.org/>`_
      Another compatibility tool, which focuses on writing code for Python 3 and
      making it work on Python 2.

From 757b4d1a769700ef5e9266215f0018be6d0e75ad Mon Sep 17 00:00:00 2001
From: Ashwin Vishnu <9155111+ashwinvis@users.noreply.github.com>
Date: Thu, 1 Oct 2020 11:46:35 +0200
Subject: [PATCH 0263/1407] Use pathlib in interactiveshell.py

---
 IPython/core/interactiveshell.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index de3c263a251..c242ce7669f 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2713,11 +2713,11 @@ def safe_execfile(self, fname, *where, exit_ignore=False, raise_exceptions=False
             __future__ imports are not shared in either direction.
 
         """
-        fname = os.path.abspath(os.path.expanduser(fname))
+        fname = Path(fname).expanduser().resolve()
 
         # Make sure we can open the file
         try:
-            with open(fname):
+            with fname.open():
                 pass
         except:
             warn('Could not open file <%s> for safe execution.' % fname)
@@ -2726,7 +2726,7 @@ def safe_execfile(self, fname, *where, exit_ignore=False, raise_exceptions=False
         # Find things also in current directory.  This is needed to mimic the
         # behavior of running a script from the system command line, where
         # Python inserts the script's directory into sys.path
-        dname = os.path.dirname(fname)
+        dname = str(fname.parent)
 
         with prepended_to_syspath(dname), self.builtin_trap:
             try:
@@ -2771,11 +2771,11 @@ def safe_execfile_ipy(self, fname, shell_futures=False, raise_exceptions=False):
         raise_exceptions : bool (False)
             If True raise exceptions everywhere.  Meant for testing.
         """
-        fname = os.path.abspath(os.path.expanduser(fname))
+        fname = Path(fname).expanduser().resolve()
 
         # Make sure we can open the file
         try:
-            with open(fname):
+            with fname.open():
                 pass
         except:
             warn('Could not open file <%s> for safe execution.' % fname)
@@ -2784,8 +2784,8 @@ def safe_execfile_ipy(self, fname, shell_futures=False, raise_exceptions=False):
         # Find things also in current directory.  This is needed to mimic the
         # behavior of running a script from the system command line, where
         # Python inserts the script's directory into sys.path
-        dname = os.path.dirname(fname)
-        
+        dname = str(fname.parent)
+
         def get_cells():
             """generator for sequence of code blocks to run"""
             if fname.endswith('.ipynb'):
@@ -2797,8 +2797,7 @@ def get_cells():
                     if cell.cell_type == 'code':
                         yield cell.source
             else:
-                with open(fname) as f:
-                    yield f.read()
+                yield fname.read_text()
 
         with prepended_to_syspath(dname):
             try:

From f189fafe8a9f5252de7073aab996dd2f897fafbe Mon Sep 17 00:00:00 2001
From: Ashwin Vishnu <9155111+ashwinvis@users.noreply.github.com>
Date: Thu, 1 Oct 2020 11:55:46 +0200
Subject: [PATCH 0264/1407] Fix bug detecting .ipynb while switching to pathib

---
 IPython/core/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index c242ce7669f..f86ebd7619e 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2788,7 +2788,7 @@ def safe_execfile_ipy(self, fname, shell_futures=False, raise_exceptions=False):
 
         def get_cells():
             """generator for sequence of code blocks to run"""
-            if fname.endswith('.ipynb'):
+            if fname.suffix == '.ipynb':
                 from nbformat import read
                 nb = read(fname, as_version=4)
                 if not nb.cells:

From 1deaa84fed932bd7da2e05721b01ed2a8ec01f54 Mon Sep 17 00:00:00 2001
From: Ashwin Vishnu <9155111+ashwinvis@users.noreply.github.com>
Date: Thu, 1 Oct 2020 12:02:54 +0200
Subject: [PATCH 0265/1407] Run darker

---
 IPython/core/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index f86ebd7619e..7753dc0b2ae 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2788,7 +2788,7 @@ def safe_execfile_ipy(self, fname, shell_futures=False, raise_exceptions=False):
 
         def get_cells():
             """generator for sequence of code blocks to run"""
-            if fname.suffix == '.ipynb':
+            if fname.suffix == ".ipynb":
                 from nbformat import read
                 nb = read(fname, as_version=4)
                 if not nb.cells:

From 5afbf7163a22ec6be0ec4ea7c5713d1f336b18be Mon Sep 17 00:00:00 2001
From: farisachugthai <farischugthai@gmail.com>
Date: Thu, 1 Oct 2020 21:25:35 -0400
Subject: [PATCH 0266/1407] DOC: Define ipy directive as such in docs.

By utilizing the directive `rst:directive::`, one can now link to the
documentation on the sphinx directive using an inline reference as well
as now being able to link to any of the options.

Put this early in the documentation as it's useful to quickly summarize
the options and decorators available to the user immediately.

The currently provided examples are phenomenal but having a thorough
reference and all of the options in one place and having them be easy to
create a hyperlink to is also very important.
---
 docs/source/sphinxext.rst | 59 +++++++++++++++++++++++++++++++++++----
 1 file changed, 53 insertions(+), 6 deletions(-)

diff --git a/docs/source/sphinxext.rst b/docs/source/sphinxext.rst
index 5b4371e5686..a3818141621 100644
--- a/docs/source/sphinxext.rst
+++ b/docs/source/sphinxext.rst
@@ -10,12 +10,15 @@ IPython Sphinx Directive
    The IPython Sphinx Directive is in 'beta' and currently under
    active development. Improvements to the code or documentation are welcome!
 
-The ipython directive is a stateful ipython shell for embedding in
-sphinx documents.  It knows about standard ipython prompts, and
-extracts the input and output lines.  These prompts will be renumbered
-starting at ``1``.  The inputs will be fed to an embedded ipython
-interpreter and the outputs from that interpreter will be inserted as
-well.  For example, code blocks like the following::
+.. |rst| replace:: reStructured text
+
+The :rst:dir:`ipython` directive is a stateful shell that can be used
+in |rst| files.
+
+It knows about standard ipython prompts, and extracts the input and output
+lines.  These prompts will be renumbered starting at ``1``.  The inputs will be
+fed to an embedded ipython interpreter and the outputs from that interpreter
+will be inserted as well.  For example, code blocks like the following::
 
   .. ipython::
 
@@ -42,6 +45,48 @@ will be rendered as
    document that generates the rendered output.
 
 
+Directive and options
+=====================
+
+The IPython directive takes a number of options detailed here.
+
+.. rst:directive:: ipython
+
+   Create an IPython directive.
+
+   .. rst:directive:option:: doctest
+
+      Run a doctest on IPython code blocks in rst.
+
+   .. rst:directive:option:: python
+
+      Used to indicate that the relevant code block does not have IPython prompts.
+
+   .. rst:directive:option:: okexcept
+
+      Allow the code block to raise an exception.
+
+   .. rst:directive:option:: okwarning
+
+      Allow the code block to emit an warning.
+
+   .. rst:directive:option:: suppress
+
+      Silence any warnings or expected errors.
+
+   .. rst:directive:option:: verbatim
+
+      A noop that allows for any text to be syntax highlighted as valid IPython code.
+
+   .. rst:directive:option:: savefig: OUTFILE [IMAGE_OPTIONS]
+
+      Save output from matplotlib to *outfile*.
+
+It's important to note that all of these options can be used for the entire
+directive block or they can decorate individual lines of code as explained
+in :ref:`pseudo-decorators`.
+
+
 Persisting the Python session across IPython directive blocks
 =============================================================
 
@@ -393,6 +438,8 @@ Pretty much anything you can do with the ipython code, you can do with
 with a simple python script. Obviously, though it doesn't make sense
 to use the doctest option.
 
+.. _pseudo-decorators:
+
 Pseudo-Decorators
 =================
 

From c1c2b60fce9716d4904d253b30edcb6699e3d13c Mon Sep 17 00:00:00 2001
From: farisachugthai <farischugthai@gmail.com>
Date: Thu, 1 Oct 2020 22:10:58 -0400
Subject: [PATCH 0267/1407] BUG: Fix mypy error

Define ip only if we're type checking.
---
 IPython/core/tests/test_async_helpers.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/IPython/core/tests/test_async_helpers.py b/IPython/core/tests/test_async_helpers.py
index 11c475874d7..d23d9f1e6e1 100644
--- a/IPython/core/tests/test_async_helpers.py
+++ b/IPython/core/tests/test_async_helpers.py
@@ -1,5 +1,5 @@
 """
-Test for async helpers. 
+Test for async helpers.
 
 Should only trigger on python 3.5+ or will have syntax errors.
 """
@@ -9,6 +9,12 @@
 from unittest import TestCase
 from IPython.testing.decorators import skip_without
 import sys
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from IPython import get_ipython
+    ip = get_ipython()
+
 
 iprc = lambda x: ip.run_cell(dedent(x)).raise_error()
 iprc_nr = lambda x: ip.run_cell(dedent(x))
@@ -275,7 +281,7 @@ def test_autoawait(self):
         await sleep(0.1)
         """
         )
-    
+
     if sys.version_info < (3,9):
         # new pgen parser in 3.9 does not raise MemoryError on too many nested
         # parens anymore

From 307b24fcd5a778f8e5736920d539a21c16c7eb86 Mon Sep 17 00:00:00 2001
From: Augusto <augusto@britecore.com>
Date: Fri, 2 Oct 2020 21:45:58 -0300
Subject: [PATCH 0268/1407] Remove Release Notes Workflow

The release-notes.yml workflow did not take off and the base GitHub action
for generating the notes doesn't seem to be maintained anymore.

Removing these files until we figure out a better alternative.
---
 .github/workflows/release-notes.yml | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 .github/workflows/release-notes.yml

diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
deleted file mode 100644
index d895f2d924c..00000000000
--- a/.github/workflows/release-notes.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Trigger the workflow on milestone events
-on: 
-  milestone:
-    types: [closed]
-name: New Release
-jobs:
-  create-release-notes:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@master
-    - name: Create Release Notes
-      uses: docker://decathlon/release-notes-generator-action:2.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.RELEASE_NOTES_TOKEN }}
-        OUTPUT_FOLDER: temp_release_notes
-        USE_MILESTONE_TITLE: "true"

From afbfaaa2e68307f330e94d74ac31e5b9895b1e01 Mon Sep 17 00:00:00 2001
From: dswij <dharmasw@outlook.com>
Date: Mon, 5 Oct 2020 03:27:36 +0700
Subject: [PATCH 0269/1407] use pathlib on test_deepreload

---
 IPython/lib/tests/test_deepreload.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/IPython/lib/tests/test_deepreload.py b/IPython/lib/tests/test_deepreload.py
index abc57a38fb2..c2d7fe1d073 100644
--- a/IPython/lib/tests/test_deepreload.py
+++ b/IPython/lib/tests/test_deepreload.py
@@ -4,7 +4,7 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-import os
+from pathlib import Path
 
 import nose.tools as nt
 
@@ -16,9 +16,10 @@ def test_deepreload():
     "Test that dreload does deep reloads and skips excluded modules."
     with TemporaryDirectory() as tmpdir:
         with prepended_to_syspath(tmpdir):
-            with open(os.path.join(tmpdir, 'A.py'), 'w') as f:
+            tmpdirpath = Path(tmpdir)
+            with open( tmpdirpath / 'A.py' , 'w') as f:
                 f.write("class Object(object):\n    pass\n")
-            with open(os.path.join(tmpdir, 'B.py'), 'w') as f:
+            with open( tmpdirpath / 'B.py' , 'w') as f:
                 f.write("import A\n")
             import A
             import B

From df8a993a39909d41ef5837f5d466cfb542c01265 Mon Sep 17 00:00:00 2001
From: dswij <dharmasw@outlook.com>
Date: Mon, 5 Oct 2020 04:39:34 +0700
Subject: [PATCH 0270/1407] run black

---
 IPython/lib/tests/test_deepreload.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/IPython/lib/tests/test_deepreload.py b/IPython/lib/tests/test_deepreload.py
index c2d7fe1d073..992ebab73ac 100644
--- a/IPython/lib/tests/test_deepreload.py
+++ b/IPython/lib/tests/test_deepreload.py
@@ -12,21 +12,22 @@
 from IPython.utils.tempdir import TemporaryDirectory
 from IPython.lib.deepreload import reload as dreload
 
+
 def test_deepreload():
     "Test that dreload does deep reloads and skips excluded modules."
     with TemporaryDirectory() as tmpdir:
         with prepended_to_syspath(tmpdir):
             tmpdirpath = Path(tmpdir)
-            with open( tmpdirpath / 'A.py' , 'w') as f:
+            with open(tmpdirpath / "A.py", "w") as f:
                 f.write("class Object(object):\n    pass\n")
-            with open( tmpdirpath / 'B.py' , 'w') as f:
+            with open(tmpdirpath / "B.py", "w") as f:
                 f.write("import A\n")
             import A
             import B
 
             # Test that A is not reloaded.
             obj = A.Object()
-            dreload(B, exclude=['A'])
+            dreload(B, exclude=["A"])
             nt.assert_true(isinstance(obj, A.Object))
 
             # Test that A is reloaded.

From 383e7dac0f945f05b83bd4aab854d9c722fc805b Mon Sep 17 00:00:00 2001
From: dswij <dharmasw@outlook.com>
Date: Mon, 5 Oct 2020 05:07:34 +0700
Subject: [PATCH 0271/1407] using pathlib on update_whatsnew.py

---
 tools/update_whatsnew.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/tools/update_whatsnew.py b/tools/update_whatsnew.py
index f3156c52a15..7b62ef814fe 100755
--- a/tools/update_whatsnew.py
+++ b/tools/update_whatsnew.py
@@ -7,23 +7,22 @@
 
 import io
 import sys
-from glob import glob
-from os.path import dirname, basename, abspath, join as pjoin
+from pathlib import Path 
 from subprocess import check_call, check_output
 
-repo_root = dirname(dirname(abspath(__file__)))
-whatsnew_dir = pjoin(repo_root, 'docs', 'source', 'whatsnew')
-pr_dir = pjoin(whatsnew_dir, 'pr')
-target = pjoin(whatsnew_dir, 'development.rst')
+repo_root = Path(__file__).resolve().parent.parent
+whatsnew_dir = repo_root / 'docs' / 'source' / 'whatsnew'
+pr_dir = whatsnew_dir / 'pr'
+target = whatsnew_dir / 'development.rst'
 
 FEATURE_MARK = ".. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT."
 INCOMPAT_MARK = ".. DO NOT EDIT THIS LINE BEFORE RELEASE. INCOMPAT INSERTION POINT."
 
 # 1. Collect the whatsnew snippet files ---------------------------------------
 
-files = set(glob(pjoin(pr_dir, '*.rst')))
+files = set(pr_dir.glob('*.rst'))
 # Ignore explanatory and example files
-files.difference_update({pjoin(pr_dir, f) for f in {
+files.difference_update({pr_dir / f for f in {
                          'incompat-switching-to-perl.rst',
                          'antigravity-feature.rst'}
                          })
@@ -46,7 +45,7 @@ def getmtime(f):
         except Exception as e:
             raise Exception('Error reading "{}"'.format(f)) from e
 
-    if basename(path).startswith('incompat-'):
+    if path.name.startswith('incompat-'):
         incompats.append(content)
     else:
         features.append(content)

From 9b33f2c3751e2f7dc6dfcfd30c411f409cef7497 Mon Sep 17 00:00:00 2001
From: dswij <dharmasw@outlook.com>
Date: Mon, 5 Oct 2020 12:26:12 +0700
Subject: [PATCH 0272/1407] run darker

---
 tools/update_whatsnew.py | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/tools/update_whatsnew.py b/tools/update_whatsnew.py
index 7b62ef814fe..f5870758bc3 100755
--- a/tools/update_whatsnew.py
+++ b/tools/update_whatsnew.py
@@ -7,25 +7,24 @@
 
 import io
 import sys
-from pathlib import Path 
+from pathlib import Path
 from subprocess import check_call, check_output
 
 repo_root = Path(__file__).resolve().parent.parent
-whatsnew_dir = repo_root / 'docs' / 'source' / 'whatsnew'
-pr_dir = whatsnew_dir / 'pr'
-target = whatsnew_dir / 'development.rst'
+whatsnew_dir = repo_root / "docs" / "source" / "whatsnew"
+pr_dir = whatsnew_dir / "pr"
+target = whatsnew_dir / "development.rst"
 
 FEATURE_MARK = ".. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT."
 INCOMPAT_MARK = ".. DO NOT EDIT THIS LINE BEFORE RELEASE. INCOMPAT INSERTION POINT."
 
 # 1. Collect the whatsnew snippet files ---------------------------------------
 
-files = set(pr_dir.glob('*.rst'))
+files = set(pr_dir.glob("*.rst"))
 # Ignore explanatory and example files
-files.difference_update({pr_dir / f for f in {
-                         'incompat-switching-to-perl.rst',
-                         'antigravity-feature.rst'}
-                         })
+files.difference_update(
+    {pr_dir / f for f in {"incompat-switching-to-perl.rst", "antigravity-feature.rst"}}
+)
 
 if not files:
     print("No automatic update available for what's new")
@@ -33,30 +32,31 @@
 
 
 def getmtime(f):
-    return check_output(['git', 'log', '-1', '--format="%ai"', '--', f])
+    return check_output(["git", "log", "-1", '--format="%ai"', "--", f])
+
 
 files = sorted(files, key=getmtime)
 
 features, incompats = [], []
 for path in files:
-    with io.open(path, encoding='utf-8') as f:
+    with io.open(path, encoding="utf-8") as f:
         try:
             content = f.read().rstrip()
         except Exception as e:
             raise Exception('Error reading "{}"'.format(f)) from e
 
-    if path.name.startswith('incompat-'):
+    if path.name.startswith("incompat-"):
         incompats.append(content)
     else:
         features.append(content)
 
 # Put the insertion markers back on the end, so they're ready for next time.
-feature_block = '\n\n'.join(features + [FEATURE_MARK])
-incompat_block = '\n\n'.join(incompats + [INCOMPAT_MARK])
+feature_block = "\n\n".join(features + [FEATURE_MARK])
+incompat_block = "\n\n".join(incompats + [INCOMPAT_MARK])
 
 # 2. Update the target file ---------------------------------------------------
 
-with io.open(target, encoding='utf-8') as f:
+with io.open(target, encoding="utf-8") as f:
     content = f.read()
 
 assert content.count(FEATURE_MARK) == 1
@@ -66,16 +66,16 @@ def getmtime(f):
 content = content.replace(INCOMPAT_MARK, incompat_block)
 
 # Clean trailing whitespace
-content = '\n'.join(l.rstrip() for l in content.splitlines())
+content = "\n".join(l.rstrip() for l in content.splitlines())
 
-with io.open(target, 'w', encoding='utf-8') as f:
+with io.open(target, "w", encoding="utf-8") as f:
     f.write(content)
 
 # 3. Stage the changes in git -------------------------------------------------
 
 for file in files:
-    check_call(['git', 'rm', file])
+    check_call(["git", "rm", file])
 
-check_call(['git', 'add', target])
+check_call(["git", "add", target])
 
 print("Merged what's new changes. Check the diff and commit the change.")

From bdf42864b4ca53832a7635cd3f92bf7ee68d6263 Mon Sep 17 00:00:00 2001
From: Daniel Mietchen <daniel.mietchen@googlemail.com>
Date: Tue, 6 Oct 2020 18:31:51 -0400
Subject: [PATCH 0273/1407] copyedits

---
 docs/README.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/README.rst b/docs/README.rst
index c91290efa30..0051809eabc 100644
--- a/docs/README.rst
+++ b/docs/README.rst
@@ -16,7 +16,7 @@ Requirements
 
 The documentation must be built using Python 3.
 
-In additions to :ref:`devinstall`,
+In addition to :ref:``devinstall``,
 the following tools are needed to build the documentation:
 
  - sphinx
@@ -40,7 +40,7 @@ html``.
 
 ``make html_noapi`` - same as above, but without running the auto-generated API
 docs. When you are working on the narrative documentation, the most time
-consuming portion  of the build process is the processing and rending of the
+consuming portion  of the build process is the processing and rendering of the
 API documentation. This build target skips that.
 
 ``make pdf`` will compile a pdf from the documentation.
@@ -53,7 +53,7 @@ previous docs build.
 To remove the previous docs build you can use ``make clean``.
 You can also combine ``clean`` with other `make` commands;
 for example,
-``make clean html`` will do a complete rebuild of the docs or `make clean pdf` will do a complete build of the pdf.
+``make clean html`` will do a complete rebuild of the docs or ``make clean pdf`` will do a complete build of the pdf.
 
 
 Continuous Integration

From 7a937c90ad2238647694c3bdff2e545ffc5932c5 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 6 Oct 2020 15:38:48 -0700
Subject: [PATCH 0274/1407] Always display last frame when show tracebacks with
 hidden frames.

Partial toward #12565,

This is slightly more complicated when we start the debugger as we would
need to track which frame we started on.
---
 IPython/core/debugger.py | 10 +++++++---
 IPython/core/ultratb.py  |  5 +++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index e3834fc8299..54074ca5a48 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -290,7 +290,7 @@ def set_colors(self, scheme):
 
     def hidden_frames(self, stack):
         """
-        Given an index in the stack return wether it should be skipped.
+        Given an index in the stack return whether it should be skipped.
 
         This is used in up/down and where to skip frames.
         """
@@ -713,7 +713,9 @@ def do_up(self, arg):
                     break
             else:
                 # if no break occured.
-                self.error("all frames above hidden")
+                self.error(
+                    "all frames above hidden, use `skip_hidden False` to get get into those."
+                )
                 return
 
             Colors = self.color_scheme_table.active_colors
@@ -756,7 +758,9 @@ def do_down(self, arg):
                 if counter >= count:
                     break
             else:
-                self.error("all frames bellow hidden")
+                self.error(
+                    "all frames bellow hidden, use `skip_hidden False` to get get into those."
+                )
                 return
 
             Colors = self.color_scheme_table.active_colors
diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 2832c4e4641..beed8c07642 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -699,9 +699,10 @@ def format_exception_as_a_whole(self, etype, evalue, etb, number_of_lines_of_con
 
         frames = []
         skipped = 0
-        for r in records:
+        lastrecord = len(records) - 1
+        for i, r in enumerate(records):
             if not isinstance(r, stack_data.RepeatedFrames) and self.skip_hidden:
-                if r.frame.f_locals.get("__tracebackhide__", 0):
+                if r.frame.f_locals.get("__tracebackhide__", 0) and i != lastrecord:
                     skipped += 1
                     continue
             if skipped:

From 41c649ba8fe29b77c0fe1c4a79db1996c4e9ea8e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 6 Oct 2020 17:28:58 -0700
Subject: [PATCH 0275/1407] Update docs/README.rst

---
 docs/README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/README.rst b/docs/README.rst
index 0051809eabc..ebdb17107e0 100644
--- a/docs/README.rst
+++ b/docs/README.rst
@@ -16,7 +16,7 @@ Requirements
 
 The documentation must be built using Python 3.
 
-In addition to :ref:``devinstall``,
+In addition to :ref:`devinstall`,
 the following tools are needed to build the documentation:
 
  - sphinx

From 638df3d65d04349a033a0b83f1a6435510872882 Mon Sep 17 00:00:00 2001
From: digitalvirtuoso <fearchaos@gmail.com>
Date: Tue, 6 Oct 2020 22:15:05 -0400
Subject: [PATCH 0276/1407] Updated to Pathlib Path from os

---
 docs/autogen_magics.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/autogen_magics.py b/docs/autogen_magics.py
index b1662c6bf29..d119e2b6f80 100644
--- a/docs/autogen_magics.py
+++ b/docs/autogen_magics.py
@@ -1,5 +1,4 @@
-import os
-
+from pathlib import Path
 from IPython.core.alias import Alias
 from IPython.core.interactiveshell import InteractiveShell
 from IPython.core.magic import MagicAlias
@@ -62,7 +61,7 @@ def sortkey(s): return s[0].lower()
                    format_docstring(func),
                    ""])
 
-here = os.path.dirname(__file__)
-dest = os.path.join(here, 'source', 'interactive', 'magics-generated.txt')
+src_path = Path(__file__).parent
+dest = src_path.joinpath('source', 'interactive', 'magics-generated.txt')
 with open(dest, "w") as f:
     f.write("\n".join(output))

From 2bc1ebd0bf8e954f4ad0ee21a8dcba16ab7b4cd7 Mon Sep 17 00:00:00 2001
From: Romulo Filho <romulo_freire_filho@hotmail.com>
Date: Thu, 8 Oct 2020 15:57:18 -0300
Subject: [PATCH 0277/1407] Use pathlib in latextools.py

---
 IPython/lib/latextools.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py
index 9561bd7967c..aa1504af5c7 100644
--- a/IPython/lib/latextools.py
+++ b/IPython/lib/latextools.py
@@ -12,6 +12,8 @@
 from base64 import encodebytes
 import textwrap
 
+from pathlib import Path, PurePath
+
 from IPython.utils.process import find_cmd, FindCmdError
 from traitlets.config import get_config
 from traitlets.config.configurable import SingletonConfigurable
@@ -136,12 +138,12 @@ def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):
     except FindCmdError:
         return None
     try:
-        workdir = tempfile.mkdtemp()
-        tmpfile = os.path.join(workdir, "tmp.tex")
-        dvifile = os.path.join(workdir, "tmp.dvi")
-        outfile = os.path.join(workdir, "tmp.png")
+        workdir = PurePath(tempfile.mkdtemp())
+        tmpfile = workdir.joinpath("tmp.tex")
+        dvifile = workdir.joinpath("tmp.dvi")
+        outfile = workdir.joinpath("tmp.png")
 
-        with open(tmpfile, "w", encoding='utf8') as f:
+        with tmpfile.open("w", encoding='utf8') as f:
             f.writelines(genelatex(s, wrap))
 
         with open(os.devnull, 'wb') as devnull:
@@ -155,7 +157,7 @@ def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):
                  "-bg", "transparent", "-o", outfile, dvifile, "-fg", color],
                  cwd=workdir, stdout=devnull, stderr=devnull)
 
-        with open(outfile, "rb") as f:
+        with outfile.open("rb") as f:
             return f.read()
     except subprocess.CalledProcessError:
         return None

From fb01f0abbac89d6edc5d90dbd67b69241c475e45 Mon Sep 17 00:00:00 2001
From: juacrumar <juacrumar@gmail.com>
Date: Fri, 9 Oct 2020 10:33:35 +0200
Subject: [PATCH 0278/1407] skip if data is None

---
 IPython/core/display.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 490435a3cbb..2920b842494 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -1086,7 +1086,7 @@ def __init__(self, data=None, url=None, filename=None, embed=False,
         if url is None and isinstance(data, str) and data.startswith(('http:', 'https:')):
             url = data
             data = None
-        elif os.path.exists(data):
+        elif data is not None and os.path.exists(data):
             filename = data
             data = None
 

From 05fbcc12a89f35d974eb5fc714410b5d52d2d73d Mon Sep 17 00:00:00 2001
From: bar-hen <bar.hen.kro@gmail.com>
Date: Fri, 9 Oct 2020 17:20:09 +0300
Subject: [PATCH 0279/1407] Chaged tempfiles and tempdire to be Path from
 Pathlib

---
 IPython/core/interactiveshell.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 7753dc0b2ae..8625d0548e7 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -757,6 +757,7 @@ def init_instance_attrs(self):
         self.meta = Struct()
 
         # Temporary files used for various purposes.  Deleted at exit.
+        # The files here are stored with Path from Pathlib
         self.tempfiles = []
         self.tempdirs = []
 
@@ -3595,16 +3596,17 @@ def mktempfile(self, data=None, prefix='ipython_edit_'):
           - data(None): if data is given, it gets written out to the temp file
             immediately, and the file is closed again."""
 
-        dirname = tempfile.mkdtemp(prefix=prefix)
-        self.tempdirs.append(dirname)
+        dir_path = Path(tempfile.mkdtemp(prefix=prefix))
+        self.tempdirs.append(dir_path)
 
-        handle, filename = tempfile.mkstemp('.py', prefix, dir=dirname)
+        handle, filename = tempfile.mkstemp('.py', prefix, dir=str(dir_path))
         os.close(handle)  # On Windows, there can only be one open handle on a file
-        self.tempfiles.append(filename)
+        
+        file_path = Path(filename)
+        self.tempfiles.append(file_path)
 
         if data:
-            with open(filename, 'w') as tmp_file:
-                tmp_file.write(data)
+            file_path.write_text(data)
         return filename
 
     @undoc
@@ -3761,14 +3763,14 @@ def atexit_operations(self):
         # Cleanup all tempfiles and folders left around
         for tfile in self.tempfiles:
             try:
-                os.unlink(tfile)
-            except OSError:
+                tfile.unlink()
+            except FileNotFoundError:
                 pass
 
         for tdir in self.tempdirs:
             try:
-                os.rmdir(tdir)
-            except OSError:
+                tdir.rmdir()
+            except FileNotFoundError:
                 pass
 
         # Clear all user namespaces to release all references cleanly.

From 27b9a7caec33d5341aa6040bca4f665c46657d36 Mon Sep 17 00:00:00 2001
From: bar-hen <bar.hen.kro@gmail.com>
Date: Fri, 9 Oct 2020 18:03:38 +0300
Subject: [PATCH 0280/1407] Run darker to fix formatting problems

---
 IPython/core/interactiveshell.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 8625d0548e7..7f7486b2cae 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3599,9 +3599,9 @@ def mktempfile(self, data=None, prefix='ipython_edit_'):
         dir_path = Path(tempfile.mkdtemp(prefix=prefix))
         self.tempdirs.append(dir_path)
 
-        handle, filename = tempfile.mkstemp('.py', prefix, dir=str(dir_path))
+        handle, filename = tempfile.mkstemp(".py", prefix, dir=str(dir_path))
         os.close(handle)  # On Windows, there can only be one open handle on a file
-        
+
         file_path = Path(filename)
         self.tempfiles.append(file_path)
 

From cb2338c9056c229c81026b15f9b4aa1f082f9831 Mon Sep 17 00:00:00 2001
From: Joyce Er <huer@microsoft.com>
Date: Fri, 9 Oct 2020 23:44:28 -0700
Subject: [PATCH 0281/1407] Use pathlib

---
 IPython/core/tests/test_magic.py | 39 ++++++++++++--------------------
 docs/autogen_config.py           |  5 ++--
 docs/autogen_magics.py           |  7 +++---
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 5021fa1ed40..9eab3a8f541 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -14,6 +14,7 @@
 from unittest import mock
 from importlib import invalidate_caches
 from io import StringIO
+from pathlib import Path
 
 import nose.tools as nt
 
@@ -831,8 +832,7 @@ def test_file():
             'line1',
             'line2',
         ]))
-        with open(fname) as f:
-            s = f.read()
+        s = Path(fname).read_text()
         nt.assert_in('line1\n', s)
         nt.assert_in('line2', s)
 
@@ -846,8 +846,7 @@ def test_file_single_quote():
             'line1',
             'line2',
         ]))
-        with open(fname) as f:
-            s = f.read()
+        s = Path(fname).read_text()
         nt.assert_in('line1\n', s)
         nt.assert_in('line2', s)
 
@@ -861,8 +860,7 @@ def test_file_double_quote():
             'line1',
             'line2',
         ]))
-        with open(fname) as f:
-            s = f.read()
+        s = Path(fname).read_text()
         nt.assert_in('line1\n', s)
         nt.assert_in('line2', s)
 
@@ -876,8 +874,7 @@ def test_file_var_expand():
             'line1',
             'line2',
         ]))
-        with open(fname) as f:
-            s = f.read()
+        s = Path(fname).read_text()
         nt.assert_in('line1\n', s)
         nt.assert_in('line2', s)
 
@@ -908,8 +905,7 @@ def test_file_amend():
             'line3',
             'line4',
         ]))
-        with open(fname) as f:
-            s = f.read()
+        s = Path(fname).read_text()
         nt.assert_in('line1\n', s)
         nt.assert_in('line3\n', s)
 
@@ -922,8 +918,7 @@ def test_file_spaces():
             'line1',
             'line2',
         ]))
-        with open(fname) as f:
-            s = f.read()
+        s = Path(fname).read_text()
         nt.assert_in('line1\n', s)
         nt.assert_in('line2', s)
     
@@ -1063,15 +1058,13 @@ def test_save():
     with TemporaryDirectory() as tmpdir:
         file = os.path.join(tmpdir, "testsave.py")
         ip.run_line_magic("save", "%s 1-10" % file)
-        with open(file) as f:
-            content = f.read()
-            nt.assert_equal(content.count(cmds[0]), 1)
-            nt.assert_in('coding: utf-8', content)
+        content = Path(file).read_text()
+        nt.assert_equal(content.count(cmds[0]), 1)
+        nt.assert_in('coding: utf-8', content)
         ip.run_line_magic("save", "-a %s 1-10" % file)
-        with open(file) as f:
-            content = f.read()
-            nt.assert_equal(content.count(cmds[0]), 2)
-            nt.assert_in('coding: utf-8', content)
+        content = Path(file).read_text()
+        nt.assert_equal(content.count(cmds[0]), 2)
+        nt.assert_in('coding: utf-8', content)
 
 
 def test_store():
@@ -1231,8 +1224,7 @@ def test_run_module_from_import_hook():
     "Test that a module can be loaded via an import hook"
     with TemporaryDirectory() as tmpdir:
         fullpath = os.path.join(tmpdir, 'my_tmp.py')
-        with open(fullpath, 'w') as f:
-            f.write(TEST_MODULE)
+        Path(fullpath).write_text(TEST_MODULE)
 
         class MyTempImporter(object):
             def __init__(self):
@@ -1248,8 +1240,7 @@ def load_module(self, name):
                 return imp.load_source('my_tmp', fullpath)
 
             def get_code(self, fullname):
-                with open(fullpath, 'r') as f:
-                    return compile(f.read(), 'foo', 'exec')
+                return compile(Path(fullpath).read_text(), 'foo', 'exec')
 
             def is_package(self, __):
                 return False
diff --git a/docs/autogen_config.py b/docs/autogen_config.py
index 515e0922f62..0330b6dbdf5 100755
--- a/docs/autogen_config.py
+++ b/docs/autogen_config.py
@@ -2,7 +2,7 @@
 
 from os.path import join, dirname, abspath
 import inspect
-
+from pathlib import Path
 from IPython.terminal.ipapp import TerminalIPythonApp
 from ipykernel.kernelapp import IPKernelApp
 from traitlets import Undefined
@@ -118,8 +118,7 @@ def write_doc(name, title, app, preamble=None):
 
 if __name__ == '__main__':
     # Touch this file for the make target
-    with open(generated, 'w'):
-        pass
+    Path(generated).write_text('')
 
     write_doc('terminal', 'Terminal IPython options', TerminalIPythonApp())
     write_doc('kernel', 'IPython kernel options', IPKernelApp(),
diff --git a/docs/autogen_magics.py b/docs/autogen_magics.py
index b1662c6bf29..ca4a69f4f1e 100644
--- a/docs/autogen_magics.py
+++ b/docs/autogen_magics.py
@@ -1,5 +1,5 @@
 import os
-
+from pathlib import Path
 from IPython.core.alias import Alias
 from IPython.core.interactiveshell import InteractiveShell
 from IPython.core.magic import MagicAlias
@@ -63,6 +63,5 @@ def sortkey(s): return s[0].lower()
                    ""])
 
 here = os.path.dirname(__file__)
-dest = os.path.join(here, 'source', 'interactive', 'magics-generated.txt')
-with open(dest, "w") as f:
-    f.write("\n".join(output))
+dest = Path(os.path.join(here, 'source', 'interactive', 'magics-generated.txt'))
+dest.write_text("\n".join(output))

From 967118d6932af895f7baa8858594f3fb2227f633 Mon Sep 17 00:00:00 2001
From: Joyce Er <huer@microsoft.com>
Date: Sat, 10 Oct 2020 14:07:57 -0700
Subject: [PATCH 0282/1407] Fix style

---
 IPython/core/tests/test_magic.py | 6 +++---
 docs/autogen_config.py           | 2 +-
 docs/autogen_magics.py           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 9eab3a8f541..10dd8ce9ac3 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -1060,11 +1060,11 @@ def test_save():
         ip.run_line_magic("save", "%s 1-10" % file)
         content = Path(file).read_text()
         nt.assert_equal(content.count(cmds[0]), 1)
-        nt.assert_in('coding: utf-8', content)
+        nt.assert_in("coding: utf-8", content)
         ip.run_line_magic("save", "-a %s 1-10" % file)
         content = Path(file).read_text()
         nt.assert_equal(content.count(cmds[0]), 2)
-        nt.assert_in('coding: utf-8', content)
+        nt.assert_in("coding: utf-8", content)
 
 
 def test_store():
@@ -1240,7 +1240,7 @@ def load_module(self, name):
                 return imp.load_source('my_tmp', fullpath)
 
             def get_code(self, fullname):
-                return compile(Path(fullpath).read_text(), 'foo', 'exec')
+                return compile(Path(fullpath).read_text(), "foo", "exec")
 
             def is_package(self, __):
                 return False
diff --git a/docs/autogen_config.py b/docs/autogen_config.py
index 0330b6dbdf5..ec243925511 100755
--- a/docs/autogen_config.py
+++ b/docs/autogen_config.py
@@ -118,7 +118,7 @@ def write_doc(name, title, app, preamble=None):
 
 if __name__ == '__main__':
     # Touch this file for the make target
-    Path(generated).write_text('')
+    Path(generated).write_text("")
 
     write_doc('terminal', 'Terminal IPython options', TerminalIPythonApp())
     write_doc('kernel', 'IPython kernel options', IPKernelApp(),
diff --git a/docs/autogen_magics.py b/docs/autogen_magics.py
index ca4a69f4f1e..14adfa20d6a 100644
--- a/docs/autogen_magics.py
+++ b/docs/autogen_magics.py
@@ -63,5 +63,5 @@ def sortkey(s): return s[0].lower()
                    ""])
 
 here = os.path.dirname(__file__)
-dest = Path(os.path.join(here, 'source', 'interactive', 'magics-generated.txt'))
+dest = Path(os.path.join(here, "source", "interactive", "magics-generated.txt"))
 dest.write_text("\n".join(output))

From 70f5698fd2a33c72488ae518583de09e21265f95 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 11 Oct 2020 02:42:45 +0200
Subject: [PATCH 0283/1407] core.magics.packaging: use pathlib

---
 IPython/core/magics/packaging.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index cfee7865f5d..7ecdbb3badd 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -8,33 +8,32 @@
 #  The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
-import os
 import re
 import shlex
 import sys
 
+from pathlib import Path
 from IPython.core.magic import Magics, magics_class, line_magic
 
 
 def _is_conda_environment():
     """Return True if the current Python executable is in a conda env"""
     # TODO: does this need to change on windows?
-    conda_history = os.path.join(sys.prefix, 'conda-meta', 'history')
-    return os.path.exists(conda_history)
+    return Path(sys.prefix, 'conda-meta', 'history').exists()
 
 
 def _get_conda_executable():
     """Find the path to the conda executable"""
     # Check if there is a conda executable in the same directory as the Python executable.
     # This is the case within conda's root environment.
-    conda = os.path.join(os.path.dirname(sys.executable), 'conda')
-    if os.path.isfile(conda):
-        return conda
+    conda = Path(sys.executable).parent / 'conda'
+    if conda.isfile():
+        return str(conda)
 
     # Otherwise, attempt to extract the executable from conda history.
     # This applies in any conda environment.
     R = re.compile(r"^#\s*cmd:\s*(?P<command>.*conda)\s[create|install]")
-    with open(os.path.join(sys.prefix, 'conda-meta', 'history')) as f:
+    with open(Path(sys.prefix, 'conda-meta', 'history')) as f:
         for line in f:
             match = R.match(line)
             if match:

From eba2b69434f469dacfacc3b96349d5192b139496 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 11 Oct 2020 01:28:34 +0200
Subject: [PATCH 0284/1407] core.magics.execution: use pathlib

---
 IPython/core/magics/execution.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index c6cf0822376..9f1cda3e7b8 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -40,6 +40,7 @@
 from warnings import warn
 from logging import error
 from io import StringIO
+from pathlib import Path
 
 if sys.version_info > (3,8):
     from ast import Module
@@ -362,8 +363,7 @@ def _run_with_profiler(self, code, opts, namespace):
             print('\n*** Profile stats marshalled to file',\
                   repr(dump_file)+'.',sys_exit)
         if text_file:
-            with open(text_file, 'w') as pfile:
-                pfile.write(output)
+            Path(text_file).write_text(output)
             print('\n*** Profile printout saved to text file',\
                   repr(text_file)+'.',sys_exit)
 
@@ -724,7 +724,7 @@ def run(self, parameter_s='', runner=None,
         sys.argv = [filename] + args  # put in the proper filename
 
         if 'n' in opts:
-            name = os.path.splitext(os.path.basename(filename))[0]
+            name = Path(filename).stem
         else:
             name = '__main__'
 

From 9178de03b65102c8bd22e804b1e77207f709e228 Mon Sep 17 00:00:00 2001
From: Martin Skarzynski <marskar@gmail.com>
Date: Tue, 6 Oct 2020 23:35:39 -0400
Subject: [PATCH 0285/1407] add emacs keybindings to vi insert mode

---
 IPython/terminal/interactiveshell.py |  4 ++
 IPython/terminal/shortcuts.py        | 69 ++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index ed34228a9e1..1320f716981 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -137,6 +137,10 @@ def debugger_cls(self):
         help="Shortcut style to use at the prompt. 'vi' or 'emacs'.",
     ).tag(config=True)
 
+    emacs_bindings_in_vi_insert_mode = Bool(True,
+        help="Add shortcuts from 'emacs' insert mode to 'vi' insert mode.",
+    ).tag(config=True)
+
     autoformatter = Unicode(None,
         help="Autoformatter to reformat Terminal code. Can be `'black'` or `None`",
         allow_none=True
diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index a23fa091a0e..2fd5732effe 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -18,6 +18,7 @@
     vi_insert_mode, emacs_insert_mode, has_completions, vi_mode)
 from prompt_toolkit.key_binding.bindings.completion import display_completions_like_readline
 from prompt_toolkit.key_binding import KeyBindings
+from prompt_toolkit.key_binding.bindings import named_commands as nc
 
 from IPython.utils.decorators import undoc
 
@@ -92,6 +93,74 @@ def reformat_and_execute(event):
     if sys.platform == 'win32':
         kb.add('c-v', filter=(has_focus(DEFAULT_BUFFER) & ~vi_mode))(win_paste)
 
+
+    @Condition
+    def ebivim():
+        return shell.emacs_bindings_in_vi_insert_mode
+
+    focused_insert = has_focus(DEFAULT_BUFFER) & vi_insert_mode
+
+    # Needed for to accept autosuggestions in vi insert mode
+    @kb.add("c-e", filter=focused_insert & ebivim)
+    def _(event):
+        b = event.current_buffer
+        suggestion = b.suggestion
+        if suggestion:
+            b.insert_text(suggestion.text)
+        else:
+            nc.end_of_line(event)
+
+    @kb.add("c-f", filter=focused_insert & ebivim)
+    def _(event):
+        b = event.current_buffer
+        suggestion = b.suggestion
+        if suggestion:
+            b.insert_text(suggestion.text)
+        else:
+            nc.forward_char(event)
+
+    @kb.add("escape", "f", filter=focused_insert & ebivim)
+    def _(event):
+        b = event.current_buffer
+        suggestion = b.suggestion
+        if suggestion:
+            t = re.split(r"(\S+\s+)", suggestion.text)
+            b.insert_text(next((x for x in t if x), ""))
+        else:
+            nc.forward_word(event)
+
+    # Simple Control keybindings
+    key_cmd_dict = {
+        "c-a": nc.beginning_of_line,
+        "c-b": nc.backward_char,
+        "c-k": nc.kill_line,
+        "c-w": nc.backward_kill_word,
+        "c-y": nc.yank,
+        "c-_": nc.undo,
+    }
+
+    for key, cmd in key_cmd_dict.items():
+        kb.add(key, filter=focused_insert & ebivim)(cmd)
+
+    # Alt and Combo Control keybindings
+    keys_cmd_dict = {
+        # Control Combos
+        ("c-x", "c-e"): nc.edit_and_execute,
+        ("c-x", "e"): nc.edit_and_execute,
+        # Alt
+        ("escape", "b"): nc.backward_word,
+        ("escape", "c"): nc.capitalize_word,
+        ("escape", "d"): nc.kill_word,
+        ("escape", "h"): nc.backward_kill_word,
+        ("escape", "l"): nc.downcase_word,
+        ("escape", "u"): nc.uppercase_word,
+        ("escape", "y"): nc.yank_pop,
+        ("escape", "."): nc.yank_last_arg,
+    }
+
+    for keys, cmd in keys_cmd_dict.items():
+        kb.add(*keys, filter=focused_insert & ebivim)(cmd)
+
     return kb
 
 

From bdbecf8ab2d216952afec770a661c353ff6a4586 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 11 Oct 2020 14:08:57 +0200
Subject: [PATCH 0286/1407] core.magics.packaging: improve style

---
 IPython/core/magics/packaging.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index 7ecdbb3badd..f0723b7220c 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -19,21 +19,21 @@
 def _is_conda_environment():
     """Return True if the current Python executable is in a conda env"""
     # TODO: does this need to change on windows?
-    return Path(sys.prefix, 'conda-meta', 'history').exists()
+    return Path(sys.prefix, "conda-meta", "history").exists()
 
 
 def _get_conda_executable():
     """Find the path to the conda executable"""
     # Check if there is a conda executable in the same directory as the Python executable.
     # This is the case within conda's root environment.
-    conda = Path(sys.executable).parent / 'conda'
+    conda = Path(sys.executable).parent / "conda"
     if conda.isfile():
         return str(conda)
 
     # Otherwise, attempt to extract the executable from conda history.
     # This applies in any conda environment.
     R = re.compile(r"^#\s*cmd:\s*(?P<command>.*conda)\s[create|install]")
-    with open(Path(sys.prefix, 'conda-meta', 'history')) as f:
+    with open(Path(sys.prefix, "conda-meta", "history")) as f:
         for line in f:
             match = R.match(line)
             if match:

From 3af8cfa40a6770e6940ec7140c92ad51532a4e73 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 11 Oct 2020 14:16:39 +0200
Subject: [PATCH 0287/1407] core.magics.packaging: improve re usage

---
 IPython/core/magics/packaging.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index f0723b7220c..aa5dfa654fe 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -32,12 +32,14 @@ def _get_conda_executable():
 
     # Otherwise, attempt to extract the executable from conda history.
     # This applies in any conda environment.
-    R = re.compile(r"^#\s*cmd:\s*(?P<command>.*conda)\s[create|install]")
-    with open(Path(sys.prefix, "conda-meta", "history")) as f:
-        for line in f:
-            match = R.match(line)
-            if match:
-                return match.groupdict()['command']
+    history = Path(sys.prefix, "conda-meta", "history").read_text()
+    match = re.search(
+        r"^#\s*cmd:\s*(?P<command>.*conda)\s[create|install]",
+        history,
+        flags=re.MULTILINE,
+    )
+    if match:
+        return match.groupdict()["command"]
     
     # Fallback: assume conda is available on the system path.
     return "conda"

From 84dcaaab2e0ef23ef833ce4f870974ab96f627ce Mon Sep 17 00:00:00 2001
From: Adam Hackbarth <fearchaos@gmail.com>
Date: Mon, 12 Oct 2020 01:18:31 -0400
Subject: [PATCH 0288/1407] Updated Text Quote formatting

---
 docs/autogen_magics.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/autogen_magics.py b/docs/autogen_magics.py
index d119e2b6f80..1b94fd62fd9 100644
--- a/docs/autogen_magics.py
+++ b/docs/autogen_magics.py
@@ -9,7 +9,7 @@
 
 def _strip_underline(line):
     chars = set(line.strip())
-    if len(chars) == 1 and ('-' in chars or '=' in chars):
+    if len(chars) == 1 and ("-" in chars or "=" in chars):
         return ""
     else:
         return line
@@ -31,7 +31,7 @@ def format_docstring(func):
 # Case insensitive sort by name
 def sortkey(s): return s[0].lower()
 
-for name, func in sorted(magics['line'].items(), key=sortkey):
+for name, func in sorted(magics["line"].items(), key=sortkey):
     if isinstance(func, Alias) or isinstance(func, MagicAlias):
         # Aliases are magics, but shouldn't be documented here
         # Also skip aliases to other magics
@@ -47,11 +47,11 @@ def sortkey(s): return s[0].lower()
 "",
 ])
 
-for name, func in sorted(magics['cell'].items(), key=sortkey):
+for name, func in sorted(magics["cell"].items(), key=sortkey):
     if name == "!":
         # Special case - don't encourage people to use %%!
         continue
-    if func == magics['line'].get(name, 'QQQP'):
+    if func == magics["line"].get(name, "QQQP"):
         # Don't redocument line magics that double as cell magics
         continue
     if isinstance(func, MagicAlias):
@@ -62,6 +62,6 @@ def sortkey(s): return s[0].lower()
                    ""])
 
 src_path = Path(__file__).parent
-dest = src_path.joinpath('source', 'interactive', 'magics-generated.txt')
+dest = src_path.joinpath("source", "interactive", "magics-generated.txt")
 with open(dest, "w") as f:
     f.write("\n".join(output))

From 11dc92bc192dbb818a2d148f85d3b132c2ed548e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 12 Oct 2020 11:00:23 -0700
Subject: [PATCH 0289/1407] skip test if ipykernel not there.

This is in particular useful for publishing on conda-forge when bumping
Python version, as ipykernel and ipython have circular dependencies when
running the full test suite.
---
 .travis.yml                        | 2 +-
 IPython/core/tests/test_display.py | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3564178676b..02d77f2bc50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -103,7 +103,7 @@ matrix:
       python: "nightly"
       dist: xenial
     - arch: amd64
-      python: "3.9-dev"
+      python: "3.9"
     - os: osx
       language: generic
       python: 3.7
diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index 375adf27b45..be0f85c1b84 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -138,7 +138,9 @@ def _get_inline_config():
     from ipykernel.pylab.config import InlineBackend
     return InlineBackend.instance()
 
-@dec.skip_without('matplotlib')
+
+@dec.skip_without("ipykernel")
+@dec.skip_without("matplotlib")
 def test_set_matplotlib_close():
     cfg = _get_inline_config()
     cfg.close_figures = False
@@ -173,7 +175,9 @@ def test_set_matplotlib_formats():
             else:
                 nt.assert_not_in(Figure, f)
 
-@dec.skip_without('matplotlib')
+
+@dec.skip_without("ipykernel")
+@dec.skip_without("matplotlib")
 def test_set_matplotlib_formats_kwargs():
     from matplotlib.figure import Figure
     ip = get_ipython()

From a2fcab88f979928b19741c7b2af00e723a6f6004 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 12 Oct 2020 13:35:38 -0700
Subject: [PATCH 0290/1407] Update IPython/utils/openpy.py

---
 IPython/utils/openpy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/utils/openpy.py b/IPython/utils/openpy.py
index af568114165..b5a6a3962d3 100644
--- a/IPython/utils/openpy.py
+++ b/IPython/utils/openpy.py
@@ -74,7 +74,7 @@ def read_py_file(filename, skip_encoding_cookie=True):
     A unicode string containing the contents of the file.
     """
     filepath = Path(filename)
-    with filepath.open() as f:   # the open function defined in this module.
+    with open(filepath) as f:   # the open function defined in this module.
         if skip_encoding_cookie:
             return "".join(strip_encoding_cookie(f))
         else:

From bdd8c0873b53c32e9020dba73fe07ba5cf3d0a01 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 12 Oct 2020 13:37:06 -0700
Subject: [PATCH 0291/1407] Update IPython/core/tests/test_async_helpers.py

---
 IPython/core/tests/test_async_helpers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/core/tests/test_async_helpers.py b/IPython/core/tests/test_async_helpers.py
index d23d9f1e6e1..5dc43ca7fd2 100644
--- a/IPython/core/tests/test_async_helpers.py
+++ b/IPython/core/tests/test_async_helpers.py
@@ -13,6 +13,7 @@
 
 if TYPE_CHECKING:
     from IPython import get_ipython
+
     ip = get_ipython()
 
 

From 284471796cbfda6070f33f91138e99b0f04b33e3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 12 Oct 2020 14:07:04 -0700
Subject: [PATCH 0292/1407] 3.9-dev 3.9 does nto exist yet

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 02d77f2bc50..3564178676b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -103,7 +103,7 @@ matrix:
       python: "nightly"
       dist: xenial
     - arch: amd64
-      python: "3.9"
+      python: "3.9-dev"
     - os: osx
       language: generic
       python: 3.7

From 7eded0e24c3fc8663ed3865f9d243969963f8b09 Mon Sep 17 00:00:00 2001
From: Adam Hackbarth <digitalvirtuoso@users.noreply.github.com>
Date: Mon, 12 Oct 2020 23:08:53 -0400
Subject: [PATCH 0293/1407] tidy space

---
 docs/autogen_magics.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/autogen_magics.py b/docs/autogen_magics.py
index 4148b29ad46..1f8a47ef506 100644
--- a/docs/autogen_magics.py
+++ b/docs/autogen_magics.py
@@ -1,4 +1,3 @@
-
 from pathlib import Path
 from IPython.core.alias import Alias
 from IPython.core.interactiveshell import InteractiveShell
@@ -62,7 +61,6 @@ def sortkey(s): return s[0].lower()
                    format_docstring(func),
                    ""])
 
-
 src_path = Path(__file__).parent
 dest = src_path.joinpath("source", "interactive", "magics-generated.txt")
 dest.write_text("\n".join(output))

From ed4f31901c18a52bc6e261b996ebbbea7754a1f4 Mon Sep 17 00:00:00 2001
From: farisachugthai <farischugthai@gmail.com>
Date: Tue, 13 Oct 2020 01:53:53 -0400
Subject: [PATCH 0294/1407] Cleanup: Remove distutils

- Remove easily replaceable distutils imports with setuptools

- Sort the imports alphabetically

- Remove trailing whitespace
---
 setupbase.py | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/setupbase.py b/setupbase.py
index fa05bb7ea5d..9b304290f08 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -12,18 +12,18 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-
-import re
 import os
+import re
 import sys
+from glob import glob
+from logging import log
 
-from distutils import log
-from distutils.command.build_py import build_py
+from setuptools import Command
+from setuptools.command.build_py import build_py
+# TODO: Replacement for this?
 from distutils.command.build_scripts import build_scripts
-from distutils.command.install import install
-from distutils.command.install_scripts import install_scripts
-from distutils.cmd import Command
-from glob import glob
+from setuptools.command.install import install
+from setuptools.command.install_scripts import install_scripts
 
 from setupext import install_data_ext
 
@@ -115,14 +115,14 @@ def find_package_data():
     """
     # This is not enough for these things to appear in an sdist.
     # We need to muck with the MANIFEST to get this to work
-    
+
     package_data = {
         'IPython.core' : ['profile/README*'],
         'IPython.core.tests' : ['*.png', '*.jpg', 'daft_extension/*.py'],
         'IPython.lib.tests' : ['*.wav'],
         'IPython.testing.plugin' : ['*.txt'],
     }
-    
+
     return package_data
 
 
@@ -229,7 +229,7 @@ def find_entry_points():
     command line scripts.
 
     Each of our entry points gets both a plain name, e.g. ipython, and one
-    suffixed with the Python major version number, e.g. ipython3. 
+    suffixed with the Python major version number, e.g. ipython3.
     """
     ep = [
             'ipython%s = IPython:start_ipython',
@@ -247,10 +247,10 @@ def find_entry_points():
 
 class build_scripts_entrypt(build_scripts):
     """Build the command line scripts
-    
+
     Parse setuptools style entry points and write simple scripts to run the
     target functions.
-    
+
     On Windows, this also creates .cmd wrappers for the scripts so that you can
     easily launch them from a command line.
     """
@@ -269,7 +269,7 @@ def run(self):
             with open(outfile, 'w') as f:
                 f.write(script_src.format(executable=sys.executable,
                                           mod=mod, func=func))
-            
+
             if sys.platform == 'win32':
                 # Write .cmd wrappers for Windows so 'ipython' etc. work at the
                 # command line
@@ -323,7 +323,7 @@ def run(self):
         # Run all sub-commands (at least those that need to be run)
         for cmd_name in self.get_sub_commands():
             self.run_command(cmd_name)
-    
+
     # 'sub_commands': a list of commands this command might have to run to
     # get its work done.  See cmd.py for more info.
     sub_commands = [('install_lib_symlink', lambda self:True),
@@ -332,7 +332,7 @@ def run(self):
 
 class install_scripts_for_symlink(install_scripts):
     """Redefined to get options from 'symlink' instead of 'install'.
-    
+
     I love distutils almost as much as I love setuptools.
     """
     def finalize_options(self):
@@ -356,7 +356,7 @@ def git_prebuild(pkg_dir, build_cmd=build_py):
 
     for use in IPython.utils.sysinfo.sys_info() calls after installation.
     """
-    
+
     class MyBuildPy(build_cmd):
         ''' Subclass to write commit data into installation tree '''
         def run(self):
@@ -371,12 +371,12 @@ def run(self):
             # this one will only fire for build commands
             if hasattr(self, 'build_lib'):
                 self._record_commit(self.build_lib)
-        
+
         def make_release_tree(self, base_dir, files):
             # this one will fire for sdist
             build_cmd.make_release_tree(self, base_dir, files)
             self._record_commit(base_dir)
-        
+
         def _record_commit(self, base_dir):
             import subprocess
             proc = subprocess.Popen('git rev-parse --short HEAD',
@@ -385,14 +385,14 @@ def _record_commit(self, base_dir):
                                     shell=True)
             repo_commit, _ = proc.communicate()
             repo_commit = repo_commit.strip().decode("ascii")
-            
+
             out_pth = pjoin(base_dir, pkg_dir, 'utils', '_sysinfo.py')
             if os.path.isfile(out_pth) and not repo_commit:
                 # nothing to write, don't clobber
                 return
-            
+
             print("writing git commit '%s' to %s" % (repo_commit, out_pth))
-            
+
             # remove to avoid overwriting original via hard link
             try:
                 os.remove(out_pth)

From 4ec6c7106f1ac3ce0bdd767793806e446f48a755 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 13 Oct 2020 06:17:40 -0700
Subject: [PATCH 0295/1407] reformat with darker

---
 IPython/terminal/interactiveshell.py | 3 ++-
 IPython/terminal/shortcuts.py        | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 1320f716981..0ed9e83b1b2 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -137,7 +137,8 @@ def debugger_cls(self):
         help="Shortcut style to use at the prompt. 'vi' or 'emacs'.",
     ).tag(config=True)
 
-    emacs_bindings_in_vi_insert_mode = Bool(True,
+    emacs_bindings_in_vi_insert_mode = Bool(
+        True,
         help="Add shortcuts from 'emacs' insert mode to 'vi' insert mode.",
     ).tag(config=True)
 
diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 2fd5732effe..ed35b2ac8ad 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -90,9 +90,8 @@ def reformat_and_execute(event):
                               & ~cursor_in_leading_ws
                         ))(display_completions_like_readline)
 
-    if sys.platform == 'win32':
-        kb.add('c-v', filter=(has_focus(DEFAULT_BUFFER) & ~vi_mode))(win_paste)
-
+    if sys.platform == "win32":
+        kb.add("c-v", filter=(has_focus(DEFAULT_BUFFER) & ~vi_mode))(win_paste)
 
     @Condition
     def ebivim():

From e1b43af078c4a5dd6b9b425084ba5f69fdaab0a8 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 13 Oct 2020 06:33:18 -0700
Subject: [PATCH 0296/1407] autoreformat with darker

---
 IPython/utils/openpy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/utils/openpy.py b/IPython/utils/openpy.py
index b5a6a3962d3..aca2cf0360d 100644
--- a/IPython/utils/openpy.py
+++ b/IPython/utils/openpy.py
@@ -74,7 +74,7 @@ def read_py_file(filename, skip_encoding_cookie=True):
     A unicode string containing the contents of the file.
     """
     filepath = Path(filename)
-    with open(filepath) as f:   # the open function defined in this module.
+    with open(filepath) as f:  # the open function defined in this module.
         if skip_encoding_cookie:
             return "".join(strip_encoding_cookie(f))
         else:

From b9586ff78eae21c22322c01efecf86d12012b6d5 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 13 Oct 2020 06:35:35 -0700
Subject: [PATCH 0297/1407] autoreformat with darker

---
 IPython/lib/latextools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py
index aa1504af5c7..2dfec65cc40 100644
--- a/IPython/lib/latextools.py
+++ b/IPython/lib/latextools.py
@@ -143,7 +143,7 @@ def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):
         dvifile = workdir.joinpath("tmp.dvi")
         outfile = workdir.joinpath("tmp.png")
 
-        with tmpfile.open("w", encoding='utf8') as f:
+        with tmpfile.open("w", encoding="utf8") as f:
             f.writelines(genelatex(s, wrap))
 
         with open(os.devnull, 'wb') as devnull:

From b1d1f282270494fa06c6347f6fd8a2d45280154c Mon Sep 17 00:00:00 2001
From: Nick Muoh <nickspirit3+github@gmail.com>
Date: Mon, 12 Oct 2020 17:52:56 -0400
Subject: [PATCH 0298/1407] Removed redundant else block for func return

---
 IPython/core/magics/execution.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 9f1cda3e7b8..d06096b2579 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -369,8 +369,8 @@ def _run_with_profiler(self, code, opts, namespace):
 
         if 'r' in opts:
             return stats
-        else:
-            return None
+
+        return None
 
     @line_magic
     def pdb(self, parameter_s=''):

From 136898e523af8280d1416e2ba385a2a2107e9ce1 Mon Sep 17 00:00:00 2001
From: Nick Muoh <nickspirit3+github@gmail.com>
Date: Mon, 12 Oct 2020 17:53:26 -0400
Subject: [PATCH 0299/1407] Use f-strings for str concatination

---
 IPython/core/magics/execution.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index d06096b2579..8a9e9cb7ca7 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -360,12 +360,14 @@ def _run_with_profiler(self, code, opts, namespace):
         text_file = opts.T[0]
         if dump_file:
             prof.dump_stats(dump_file)
-            print('\n*** Profile stats marshalled to file',\
-                  repr(dump_file)+'.',sys_exit)
+            print(
+                f"\n*** Profile stats marshalled to file {repr(dump_file)}.{sys_exit}"
+            )
         if text_file:
             Path(text_file).write_text(output)
-            print('\n*** Profile printout saved to text file',\
-                  repr(text_file)+'.',sys_exit)
+            print(
+                f"\n*** Profile printout saved to text file {repr(text_file)}.{sys_exit}"
+            )
 
         if 'r' in opts:
             return stats

From 9225195845bdd4e4fadf03286d8f55108941f307 Mon Sep 17 00:00:00 2001
From: Nick Muoh <nickspirit3+github@gmail.com>
Date: Mon, 12 Oct 2020 17:55:50 -0400
Subject: [PATCH 0300/1407] Use pathlib in magics module's execution.py

---
 IPython/core/magics/execution.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 8a9e9cb7ca7..e2d550e7212 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -39,6 +39,7 @@
 from IPython.utils.timing import clock, clock2
 from warnings import warn
 from logging import error
+from pathlib import Path
 from io import StringIO
 from pathlib import Path
 
@@ -364,7 +365,10 @@ def _run_with_profiler(self, code, opts, namespace):
                 f"\n*** Profile stats marshalled to file {repr(dump_file)}.{sys_exit}"
             )
         if text_file:
-            Path(text_file).write_text(output)
+            pfile = Path(text_file)
+            pfile.touch(exist_ok=True)
+            pfile.write_text(output)
+
             print(
                 f"\n*** Profile printout saved to text file {repr(text_file)}.{sys_exit}"
             )

From 5e35cbcb976be543745762cde46470fec9caa6eb Mon Sep 17 00:00:00 2001
From: Martin Skarzynski <marskar@gmail.com>
Date: Wed, 30 Sep 2020 10:31:42 -0400
Subject: [PATCH 0301/1407] enable autosuggestion

---
 IPython/terminal/interactiveshell.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 0ed9e83b1b2..b00d66f7003 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -16,6 +16,7 @@
     Any, validate
 )
 
+from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
 from prompt_toolkit.enums import DEFAULT_BUFFER, EditingMode
 from prompt_toolkit.filters import (HasFocus, Condition, IsDone)
 from prompt_toolkit.formatted_text import PygmentsTokens
@@ -321,6 +322,7 @@ def prompt():
 
         self.pt_loop = asyncio.new_event_loop()
         self.pt_app = PromptSession(
+                            auto_suggest=AutoSuggestFromHistory(),
                             editing_mode=editing_mode,
                             key_bindings=key_bindings,
                             history=history,

From 045fe6de76eb7052975801ccea24f34a0a1d2ec4 Mon Sep 17 00:00:00 2001
From: Martin Skarzynski <marskar@gmail.com>
Date: Thu, 1 Oct 2020 12:12:54 -0400
Subject: [PATCH 0302/1407] add rst and md docs describing the auto_suggest
 feature

---
 docs/source/whatsnew/pr/auto_suggest.md  | 66 +++++++++++++++++++
 docs/source/whatsnew/pr/auto_suggest.rst | 81 ++++++++++++++++++++++++
 2 files changed, 147 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/auto_suggest.md
 create mode 100644 docs/source/whatsnew/pr/auto_suggest.rst

diff --git a/docs/source/whatsnew/pr/auto_suggest.md b/docs/source/whatsnew/pr/auto_suggest.md
new file mode 100644
index 00000000000..cbad518cd98
--- /dev/null
+++ b/docs/source/whatsnew/pr/auto_suggest.md
@@ -0,0 +1,66 @@
+Autosuggestion is a very useful feature available in [fish](https://fishshell.com/), [zsh](https://en.wikipedia.org/wiki/Z_shell), and [prompt-toolkit](https://python-prompt-toolkit.readthedocs.io/en/master/pages/asking_for_input.html#auto-suggestion).
+
+[Ptpython](https://github.com/prompt-toolkit/ptpython#ptpython) allows users to enable this feature in
+[ptpython/config.py](https://github.com/prompt-toolkit/ptpython/blob/master/examples/ptpython_config/config.py#L90>).
+
+This feature allows users to accept autosuggestions with ctrl e, ctrl f, or right arrow as described below.
+
+1. Start ipython
+
+![image](https://user-images.githubusercontent.com/13444106/94700432-76580100-0309-11eb-8798-040d47d1a540.png)
+
+2. Run `print("hello")`
+
+![image](https://user-images.githubusercontent.com/13444106/94700528-91c30c00-0309-11eb-920d-4ef8aa79d79a.png)
+
+3. Press p to see the autosuggestion
+
+![image](https://user-images.githubusercontent.com/13444106/94700681-bf0fba00-0309-11eb-94bd-bbddf4805da2.png)
+
+4. Press ctrl f, or ctrl e, or right arrow to accept the suggestion
+
+![image](https://user-images.githubusercontent.com/13444106/94700883-fd0cde00-0309-11eb-9aa8-17270951f021.png)
+
+You can also complete word by word:
+
+1. Run `def say_hello(): print("hello")`
+
+![image](https://user-images.githubusercontent.com/13444106/94704474-f54f3880-030d-11eb-9d73-fa10ced850be.png)
+
+2. Press d to see the autosuggestion
+
+![image](https://user-images.githubusercontent.com/13444106/94704519-fe400a00-030d-11eb-8b73-3c35ffaf1a9d.png)
+
+3. Press alt f to accept to accept the first word of the suggestion
+
+![image](https://user-images.githubusercontent.com/13444106/94704602-14e66100-030e-11eb-90fc-d930463f52de.png)
+
+Importantly, this feature does not interfere with tab completion:
+
+1. After running `def say_hello(): print("hello")`, press d
+
+![image](https://user-images.githubusercontent.com/13444106/94704519-fe400a00-030d-11eb-8b73-3c35ffaf1a9d.png)
+
+2. Press Tab to start tab completion
+
+![image](https://user-images.githubusercontent.com/13444106/94704969-80303300-030e-11eb-8379-6bff94582849.png)
+
+3A. Press Tab again to select the first option
+
+![image](https://user-images.githubusercontent.com/13444106/94705023-90481280-030e-11eb-9cf7-76170d1004b9.png)
+
+3B. Press alt f to accept to accept the first word of the suggestion
+
+![image](https://user-images.githubusercontent.com/13444106/94704602-14e66100-030e-11eb-90fc-d930463f52de.png)
+
+3C. Press ctrl f or ctrl e to accept the entire suggestion
+
+![image](https://user-images.githubusercontent.com/13444106/94705115-ab1a8700-030e-11eb-9dee-da98fccca0a6.png)
+
+To install a version of ipython with autosuggestions enabled, run:
+
+`pip install git+https://github.com/mskar/ipython@auto_suggest`
+
+Currently, autosuggestions are only shown in the emacs or vi insert editing modes:
+- The ctrl e, ctrl f, and alt f shortcuts work by default in emacs mode.
+- To use these shortcuts in vi insert mode, you will have to create [custom keybindings in your config.py](https://github.com/mskar/setup/commit/2892fcee46f9f80ef7788f0749edc99daccc52f4/).
diff --git a/docs/source/whatsnew/pr/auto_suggest.rst b/docs/source/whatsnew/pr/auto_suggest.rst
new file mode 100644
index 00000000000..b7e5a920f00
--- /dev/null
+++ b/docs/source/whatsnew/pr/auto_suggest.rst
@@ -0,0 +1,81 @@
+Autosuggestion is a very useful feature available in `fish <https://fishshell.com/>`__, `zsh <https://en.wikipedia.org/wiki/Z_shell>`__, and `prompt-toolkit <https://python-prompt-toolkit.readthedocs.io/en/master/pages/asking_for_input.html#auto-suggestion>`__.
+
+`Ptpython <https://github.com/prompt-toolkit/ptpython#ptpython>`__ allows users to enable this feature in
+`ptpython/config.py <https://github.com/prompt-toolkit/ptpython/blob/master/examples/ptpython_config/config.py#L90>`__.
+
+This feature allows users to accept autosuggestions with ctrl e, ctrl f,
+or right arrow as described below.
+
+1. Start ipython
+
+|image|
+
+2. Run ``print("hello")``
+
+|image1|
+
+3. Press p to see the autosuggestion
+
+|image2|
+
+4. Press ctrl f, or ctrl e, or right arrow to accept the suggestion
+
+|image3|
+
+You can also complete word by word:
+
+1. Run ``def say_hello(): print("hello")``
+
+|image4|
+
+2. Press d to see the autosuggestion
+
+|image5|
+
+3. Press alt f to accept to accept the first word of the suggestion
+
+|image6|
+
+Importantly, this feature does not interfere with tab completion:
+
+1. After running ``def say_hello(): print("hello")``, press d
+
+|image7|
+
+2. Press Tab to start tab completion
+
+|image8|
+
+3A. Press Tab again to select the first option
+
+|image9|
+
+3B. Press alt f to accept to accept the first word of the suggestion
+
+|image10|
+
+3C. Press ctrl f or ctrl e to accept the entire suggestion
+
+|image11|
+
+To install a version of ipython with autosuggestions enabled, run:
+
+``pip install git+https://github.com/mskar/ipython@auto_suggest``
+
+Currently, autosuggestions are only shown in the emacs or vi insert editing modes:
+
+- The ctrl e, ctrl f, and alt f shortcuts work by default in emacs mode.
+- To use these shortcuts in vi insert mode, you will have to create `custom keybindings in your config.py <https://github.com/mskar/setup/commit/2892fcee46f9f80ef7788f0749edc99daccc52f4/>`__.
+
+.. |image| image:: https://user-images.githubusercontent.com/13444106/94700432-76580100-0309-11eb-8798-040d47d1a540.png
+.. |image1| image:: https://user-images.githubusercontent.com/13444106/94700528-91c30c00-0309-11eb-920d-4ef8aa79d79a.png
+.. |image2| image:: https://user-images.githubusercontent.com/13444106/94700681-bf0fba00-0309-11eb-94bd-bbddf4805da2.png
+.. |image3| image:: https://user-images.githubusercontent.com/13444106/94700883-fd0cde00-0309-11eb-9aa8-17270951f021.png
+.. |image4| image:: https://user-images.githubusercontent.com/13444106/94704474-f54f3880-030d-11eb-9d73-fa10ced850be.png
+.. |image5| image:: https://user-images.githubusercontent.com/13444106/94704519-fe400a00-030d-11eb-8b73-3c35ffaf1a9d.png
+.. |image6| image:: https://user-images.githubusercontent.com/13444106/94704602-14e66100-030e-11eb-90fc-d930463f52de.png
+.. |image7| image:: https://user-images.githubusercontent.com/13444106/94704519-fe400a00-030d-11eb-8b73-3c35ffaf1a9d.png
+.. |image8| image:: https://user-images.githubusercontent.com/13444106/94704969-80303300-030e-11eb-8379-6bff94582849.png
+.. |image9| image:: https://user-images.githubusercontent.com/13444106/94705023-90481280-030e-11eb-9cf7-76170d1004b9.png
+.. |image10| image:: https://user-images.githubusercontent.com/13444106/94704602-14e66100-030e-11eb-90fc-d930463f52de.png
+.. |image11| image:: https://user-images.githubusercontent.com/13444106/94705115-ab1a8700-030e-11eb-9dee-da98fccca0a6.png

From 09b6e47071b501c12f6ce259c878de4754913c4f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 13 Oct 2020 09:40:54 -0700
Subject: [PATCH 0303/1407] autoreformat with darker

---
 IPython/terminal/interactiveshell.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index b00d66f7003..4e8297244cc 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -322,19 +322,20 @@ def prompt():
 
         self.pt_loop = asyncio.new_event_loop()
         self.pt_app = PromptSession(
-                            auto_suggest=AutoSuggestFromHistory(),
-                            editing_mode=editing_mode,
-                            key_bindings=key_bindings,
-                            history=history,
-                            completer=IPythonPTCompleter(shell=self),
-                            enable_history_search = self.enable_history_search,
-                            style=self.style,
-                            include_default_pygments_style=False,
-                            mouse_support=self.mouse_support,
-                            enable_open_in_editor=self.extra_open_editor_shortcuts,
-                            color_depth=self.color_depth,
-                            tempfile_suffix=".py",
-                            **self._extra_prompt_options())
+            auto_suggest=AutoSuggestFromHistory(),
+            editing_mode=editing_mode,
+            key_bindings=key_bindings,
+            history=history,
+            completer=IPythonPTCompleter(shell=self),
+            enable_history_search=self.enable_history_search,
+            style=self.style,
+            include_default_pygments_style=False,
+            mouse_support=self.mouse_support,
+            enable_open_in_editor=self.extra_open_editor_shortcuts,
+            color_depth=self.color_depth,
+            tempfile_suffix=".py",
+            **self._extra_prompt_options()
+        )
 
     def _make_style_from_name_or_cls(self, name_or_cls):
         """

From d869b8ef7e9f74bdc8b786704e96735eccdb41fc Mon Sep 17 00:00:00 2001
From: Nick Muoh <nickspirit3+github@gmail.com>
Date: Mon, 12 Oct 2020 18:21:23 -0400
Subject: [PATCH 0304/1407] Use pathlib in testing module's iptestcontroller.py

---
 IPython/testing/iptestcontroller.py | 50 +++++++++++++++--------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py
index b522f60f376..da6313a1853 100644
--- a/IPython/testing/iptestcontroller.py
+++ b/IPython/testing/iptestcontroller.py
@@ -27,6 +27,7 @@
 from IPython.utils.py3compat import decode
 from IPython.utils.sysinfo import get_sys_info
 from IPython.utils.tempdir import TemporaryDirectory
+from pathlib import Path
 
 class TestController:
     """Run tests in a subprocess
@@ -138,13 +139,14 @@ def setup(self):
         self.env['TMPDIR'] = workingdir.name
 
         # Add a non-accessible directory to PATH (see gh-7053)
-        noaccess = os.path.join(self.workingdir.name, "_no_access_")
-        self.noaccess = noaccess
-        os.mkdir(noaccess, 0)
+        noaccess = Path(self.workingdir.name) / "_no_access_"
+        self.noaccess = noaccess.resolve()
+
+        noaccess.mkdir(0, exist_ok=True)
 
         PATH = os.environ.get('PATH', '')
         if PATH:
-            PATH = noaccess + os.pathsep + PATH
+            PATH = noaccess / PATH
         else:
             PATH = noaccess
         self.env['PATH'] = PATH
@@ -162,7 +164,7 @@ def cleanup(self):
         Make the non-accessible directory created in setup() accessible
         again, otherwise deleting the workingdir will fail.
         """
-        os.chmod(self.noaccess, stat.S_IRWXU)
+        self.noaccess.chmod(stat.S_IRWXU)
         TestController.cleanup(self)
 
     @property
@@ -173,26 +175,26 @@ def will_run(self):
             return True
 
     def add_xunit(self):
-        xunit_file = os.path.abspath(self.section + '.xunit.xml')
-        self.cmd.extend(['--with-xunit', '--xunit-file', xunit_file])
+        xunit_file = Path(f"{self.section}.xunit.xml")
+        self.cmd.extend(["--with-xunit", "--xunit-file", xunit_file.absolute()])
 
     def add_coverage(self):
         try:
             sources = test_sections[self.section].includes
         except KeyError:
-            sources = ['IPython']
-
-        coverage_rc = ("[run]\n"
-                       "data_file = {data_file}\n"
-                       "source =\n"
-                       "  {source}\n"
-                      ).format(data_file=os.path.abspath('.coverage.'+self.section),
-                               source="\n  ".join(sources))
-        config_file = os.path.join(self.workingdir.name, '.coveragerc')
-        with open(config_file, 'w') as f:
-            f.write(coverage_rc)
-
-        self.env['COVERAGE_PROCESS_START'] = config_file
+            sources = ["IPython"]
+
+        coverage_rc = (
+            "[run]\n" "data_file = {data_file}\n" "source =\n" "  {source}\n"
+        ).format(
+            data_file=Path(f".coverage.{self.section}").absolute(),
+            source="\n  ".join(sources),
+        )
+        config_file = Path(self.workingdir.name) / ".coveragerc"
+        config_file.touch(exist_ok=True)
+        config_file.write_text(coverage_rc)
+
+        self.env["COVERAGE_PROCESS_START"] = config_file.resolve()
         self.pycmd = "import coverage; coverage.process_startup(); " + self.pycmd
 
     def launch(self, buffer_output=False):
@@ -464,10 +466,10 @@ def main():
     # iptest doesn't work correctly if the working directory is the
     # root of the IPython source tree. Tell the user to avoid
     # frustration.
-    if os.path.exists(os.path.join(os.getcwd(),
-                                   'IPython', 'testing', '__main__.py')):
-        print("Don't run iptest from the IPython source directory",
-              file=sys.stderr)
+    main_file = Path.cwd() / Path("IPython/testing/__main__.py")
+
+    if main_file.exists():
+        print("Don't run iptest from the IPython source directory", file=sys.stderr)
         sys.exit(1)
     # Arguments after -- should be passed through to nose. Argparse treats
     # everything after -- as regular positional arguments, so we separate them

From 7775943f20f8ac91519f5ca9dc3a446c0786c4d3 Mon Sep 17 00:00:00 2001
From: Justin Palmer <jpavlav@gmail.com>
Date: Fri, 9 Oct 2020 16:28:29 -0500
Subject: [PATCH 0305/1407] Use pathlib in packaging.py, io.py, and
 gen_latex_symbols.py

* Added pathlib in a few places where it makes sense to.
---
 IPython/core/magics/packaging.py | 1 +
 IPython/utils/io.py              | 5 +++--
 tools/gen_latex_symbols.py       | 9 ++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index aa5dfa654fe..bddb587457d 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -11,6 +11,7 @@
 import re
 import shlex
 import sys
+from Pathlib import Path
 
 from pathlib import Path
 from IPython.core.magic import Magics, magics_class, line_magic
diff --git a/IPython/utils/io.py b/IPython/utils/io.py
index fab9bae7971..f591603f601 100644
--- a/IPython/utils/io.py
+++ b/IPython/utils/io.py
@@ -14,6 +14,7 @@
 import tempfile
 import warnings
 from warnings import warn
+from pathlib import Path
 
 from IPython.utils.decorators import undoc
 from .capture import CapturedIO, capture_output
@@ -204,8 +205,8 @@ def temp_pyfile(src, ext='.py'):
     (filename, open filehandle)
       It is the caller's responsibility to close the open file and unlink it.
     """
-    fname = tempfile.mkstemp(ext)[1]
-    with open(fname,'w') as f:
+    fname = Path(tempfile.mkstemp(ext)[1])
+    with fname.open('w') as f:
         f.write(src)
         f.flush()
     return fname
diff --git a/tools/gen_latex_symbols.py b/tools/gen_latex_symbols.py
index c3fed125109..0574c70f72f 100644
--- a/tools/gen_latex_symbols.py
+++ b/tools/gen_latex_symbols.py
@@ -9,7 +9,7 @@
 # 
 # The original mapping of latex symbols to unicode comes from the `latex_symbols.jl` files from Julia.
 
-import os, sys
+from pathlib import Path
 
 # Import the Julia LaTeX symbols
 print('Importing latex_symbols.js from Julia...')
@@ -80,9 +80,8 @@ def test_ident(i):
 reverse_latex_symbol = { v:k for k,v in latex_symbols.items()}
 """
 
-fn = os.path.join('..','IPython','core','latex_symbols.py')
-print("Writing the file: %s" % fn)
-with open(fn, 'w', encoding='utf-8') as f:
-    f.write(s)
+fn = Path('..', 'IPython', 'core', 'latex_symbols.py')
+print("Writing the file: %s" % str(fn))
+fn.write_text(s, encoding='utf-8')
 
 

From 95db5c4e9727fafa503b678ac59da1e3dd833cf6 Mon Sep 17 00:00:00 2001
From: Justin Palmer <jpavlav@gmail.com>
Date: Fri, 9 Oct 2020 16:35:57 -0500
Subject: [PATCH 0306/1407] Fix capitalization on pathlib import

---
 IPython/core/magics/packaging.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index bddb587457d..a32b7b1fd70 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -11,7 +11,7 @@
 import re
 import shlex
 import sys
-from Pathlib import Path
+from pathlib import Path
 
 from pathlib import Path
 from IPython.core.magic import Magics, magics_class, line_magic

From 5b31996297fc071e9b135e9f79e00259e465ca4d Mon Sep 17 00:00:00 2001
From: Justin Palmer <jpavlav@gmail.com>
Date: Fri, 9 Oct 2020 18:55:17 -0500
Subject: [PATCH 0307/1407] Fix return on temp_pyfile() function in utils

---
 IPython/utils/io.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/utils/io.py b/IPython/utils/io.py
index f591603f601..39163d7635e 100644
--- a/IPython/utils/io.py
+++ b/IPython/utils/io.py
@@ -209,7 +209,7 @@ def temp_pyfile(src, ext='.py'):
     with fname.open('w') as f:
         f.write(src)
         f.flush()
-    return fname
+    return str(fname)
 
 @undoc
 def atomic_writing(*args, **kwargs):

From de772524a08a72aca74e8f66fc4713fb8ea670af Mon Sep 17 00:00:00 2001
From: Justin Palmer <jpavlav@gmail.com>
Date: Mon, 12 Oct 2020 08:39:55 -0500
Subject: [PATCH 0308/1407] Ran black, reverted changes on utils/io.py.

---
 IPython/utils/io.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/IPython/utils/io.py b/IPython/utils/io.py
index 39163d7635e..fab9bae7971 100644
--- a/IPython/utils/io.py
+++ b/IPython/utils/io.py
@@ -14,7 +14,6 @@
 import tempfile
 import warnings
 from warnings import warn
-from pathlib import Path
 
 from IPython.utils.decorators import undoc
 from .capture import CapturedIO, capture_output
@@ -205,11 +204,11 @@ def temp_pyfile(src, ext='.py'):
     (filename, open filehandle)
       It is the caller's responsibility to close the open file and unlink it.
     """
-    fname = Path(tempfile.mkstemp(ext)[1])
-    with fname.open('w') as f:
+    fname = tempfile.mkstemp(ext)[1]
+    with open(fname,'w') as f:
         f.write(src)
         f.flush()
-    return str(fname)
+    return fname
 
 @undoc
 def atomic_writing(*args, **kwargs):

From c9e5a32d5a28d15e1676f9e82e2fa2720cdbb550 Mon Sep 17 00:00:00 2001
From: Justin Palmer <jpavlav@gmail.com>
Date: Mon, 12 Oct 2020 08:51:00 -0500
Subject: [PATCH 0309/1407] More formatting stuff darker didn't catch.

---
 tools/gen_latex_symbols.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/gen_latex_symbols.py b/tools/gen_latex_symbols.py
index 0574c70f72f..fabc6968d3a 100644
--- a/tools/gen_latex_symbols.py
+++ b/tools/gen_latex_symbols.py
@@ -82,6 +82,6 @@ def test_ident(i):
 
 fn = Path('..', 'IPython', 'core', 'latex_symbols.py')
 print("Writing the file: %s" % str(fn))
-fn.write_text(s, encoding='utf-8')
+fn.write_text(s, encoding="utf-8")
 
 

From 53b46b45747646db3aecb258655041724f84d5a9 Mon Sep 17 00:00:00 2001
From: Justin Palmer <jpavlav@gmail.com>
Date: Mon, 12 Oct 2020 08:57:42 -0500
Subject: [PATCH 0310/1407] Something my local darker missed again.

---
 tools/gen_latex_symbols.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/gen_latex_symbols.py b/tools/gen_latex_symbols.py
index fabc6968d3a..e1b441054ac 100644
--- a/tools/gen_latex_symbols.py
+++ b/tools/gen_latex_symbols.py
@@ -80,7 +80,7 @@ def test_ident(i):
 reverse_latex_symbol = { v:k for k,v in latex_symbols.items()}
 """
 
-fn = Path('..', 'IPython', 'core', 'latex_symbols.py')
+fn = Path("..", "IPython", "core", "latex_symbols.py")
 print("Writing the file: %s" % str(fn))
 fn.write_text(s, encoding="utf-8")
 

From 3999ad86fcdb325f34b6e0a25c13237368c59079 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 13 Oct 2020 10:23:05 -0700
Subject: [PATCH 0311/1407] autoreformat with darker

---
 setupbase.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setupbase.py b/setupbase.py
index 9b304290f08..7befb88bf33 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -20,6 +20,7 @@
 
 from setuptools import Command
 from setuptools.command.build_py import build_py
+
 # TODO: Replacement for this?
 from distutils.command.build_scripts import build_scripts
 from setuptools.command.install import install

From c5b6cbc9bbaa6cd57e35d0f6584c22dc4e5563c3 Mon Sep 17 00:00:00 2001
From: Martin Skarzynski <marskar@gmail.com>
Date: Sat, 10 Oct 2020 20:20:20 -0400
Subject: [PATCH 0312/1407] cursor shape changes with vi editing mode

---
 IPython/terminal/interactiveshell.py | 34 ++++++++++++++++++++++++++--
 IPython/terminal/shortcuts.py        | 29 +++++++++++++++++++++++-
 2 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 0ed9e83b1b2..c4be945bd36 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -12,8 +12,19 @@
 from IPython.utils.terminal import toggle_set_term_title, set_term_title, restore_term_title
 from IPython.utils.process import abbrev_cwd
 from traitlets import (
-    Bool, Unicode, Dict, Integer, observe, Instance, Type, default, Enum, Union,
-    Any, validate
+    Bool,
+    Unicode,
+    Dict,
+    Integer,
+    observe,
+    Instance,
+    Type,
+    default,
+    Enum,
+    Union,
+    Any,
+    validate,
+    Float,
 )
 
 from prompt_toolkit.enums import DEFAULT_BUFFER, EditingMode
@@ -142,6 +153,25 @@ def debugger_cls(self):
         help="Add shortcuts from 'emacs' insert mode to 'vi' insert mode.",
     ).tag(config=True)
 
+    modal_cursor = Bool(
+        True,
+        help="""
+       Cursor shape changes depending on vi mode: beam in vi insert mode,
+       block in nav mode, underscore in replace mode.""",
+    ).tag(config=True)
+
+    ttimeoutlen = Float(
+        0.01,
+        help="""The time in milliseconds that is waited for a key code
+       to complete.""",
+    ).tag(config=True)
+
+    timeoutlen = Float(
+        0.5,
+        help="""The time in milliseconds that is waited for a mapped key
+       sequence to complete.""",
+    ).tag(config=True)
+
     autoformatter = Unicode(None,
         help="Autoformatter to reformat Terminal code. Can be `'black'` or `None`",
         allow_none=True
diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index ed35b2ac8ad..f92babd2df3 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -19,6 +19,7 @@
 from prompt_toolkit.key_binding.bindings.completion import display_completions_like_readline
 from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.key_binding.bindings import named_commands as nc
+from prompt_toolkit.key_binding.vi_state import InputMode, ViState
 
 from IPython.utils.decorators import undoc
 
@@ -160,6 +161,32 @@ def _(event):
     for keys, cmd in keys_cmd_dict.items():
         kb.add(*keys, filter=focused_insert & ebivim)(cmd)
 
+    def get_input_mode(self):
+        if sys.version_info[0] == 3:
+            app = get_app()
+            app.ttimeoutlen = shell.ttimeoutlen
+            app.timeoutlen = shell.timeoutlen
+
+        return self._input_mode
+
+    def set_input_mode(self, mode):
+        shape = {InputMode.NAVIGATION: 2, InputMode.REPLACE: 4}.get(mode, 6)
+        cursor = "\x1b[{} q".format(shape)
+
+        if hasattr(sys.stdout, "_cli"):
+            write = sys.stdout._cli.output.write_raw
+        else:
+            write = sys.stdout.write
+
+        write(cursor)
+        sys.stdout.flush()
+
+        self._input_mode = mode
+
+    if shell.editing_mode == "vi" and shell.modal_cursor:
+        ViState._input_mode = InputMode.INSERT
+        ViState.input_mode = property(get_input_mode, set_input_mode)
+
     return kb
 
 
@@ -341,4 +368,4 @@ def win_paste(event):
                 return
         except ClipboardEmpty:
             return
-        event.current_buffer.insert_text(text.replace('\t', ' ' * 4))
+        event.current_buffer.insert_text(text.replace("\t", " " * 4))

From 73ca78ca593848a28f247b081d5a0c94652bce91 Mon Sep 17 00:00:00 2001
From: Quentin Peter <impact27@users.noreply.github.com>
Date: Wed, 14 Oct 2020 11:23:41 +0200
Subject: [PATCH 0313/1407] Don't register the same callabck multiple times

Using the %matplotlib magics would not always work without this fix:
For `%matplotlib qt5` to work, `flush_figures` should not be in `get_ipython().events.callbacks['post_execute']`. Yet without this fix:
```python
Python 3.7.6 (default, Jan  8 2020, 20:23:39) [MSC v.1916 64 bit (AMD64)]
Type "copyright", "credits" or "license" for more information.

IPython 7.18.1 -- An enhanced Interactive Python.

In [1]: %matplotlib inline

In [2]: %matplotlib inline

In [3]: %matplotlib inline

In [4]: %matplotlib inline

In [5]: get_ipython().events.callbacks['post_execute']
Out[5]:
[<bound method AutoreloadMagics.post_execute_hook of <autoreload.AutoreloadMagics object at 0x00000199BFE73888>>,
 <function ipykernel.pylab.backend_inline.flush_figures()>,
 <function matplotlib.pyplot.install_repl_displayhook.<locals>.post_execute()>,
 <function ipykernel.pylab.backend_inline.flush_figures()>,
 <function ipykernel.pylab.backend_inline.flush_figures()>,
 <function ipykernel.pylab.backend_inline.flush_figures()>,
 <function ipykernel.pylab.backend_inline.flush_figures()>]

In [6]: %matplotlib qt5

In [7]: get_ipython().events.callbacks['post_execute']
Out[7]:
[<bound method AutoreloadMagics.post_execute_hook of <autoreload.AutoreloadMagics object at 0x00000199BFE73888>>,
 <function matplotlib.pyplot.install_repl_displayhook.<locals>.post_execute()>,
 <function ipykernel.pylab.backend_inline.flush_figures()>,
 <function ipykernel.pylab.backend_inline.flush_figures()>,
 <function ipykernel.pylab.backend_inline.flush_figures()>,
 <function ipykernel.pylab.backend_inline.flush_figures()>]

In [8]:
```
---
 IPython/core/events.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/core/events.py b/IPython/core/events.py
index 6ebd790d4de..1af13ca406f 100644
--- a/IPython/core/events.py
+++ b/IPython/core/events.py
@@ -60,7 +60,8 @@ def register(self, event, function):
         if not callable(function):
             raise TypeError('Need a callable, got %r' % function)
         callback_proto = available_events.get(event)
-        self.callbacks[event].append(callback_proto.adapt(function))
+        if function not in self.callbacks[event]:
+            self.callbacks[event].append(callback_proto.adapt(function))
     
     def unregister(self, event, function):
         """Remove a callback from the given event."""

From ca27916550d51fc1b8ec00d59c70b4d4b1dfedda Mon Sep 17 00:00:00 2001
From: Quentin Peter <impact27@users.noreply.github.com>
Date: Wed, 14 Oct 2020 14:42:36 +0200
Subject: [PATCH 0314/1407] Don't call curframe.f_locals

See https://github.com/ipython/ipython/pull/12445
---
 IPython/core/debugger.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 54074ca5a48..398354c5c8f 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -605,7 +605,7 @@ def do_pdef(self, arg):
         """Print the call signature for any callable object.
 
         The debugger interface to %pdef"""
-        namespaces = [('Locals', self.curframe.f_locals),
+        namespaces = [('Locals', self.curframe_locals),
                       ('Globals', self.curframe.f_globals)]
         self.shell.find_line_magic('pdef')(arg, namespaces=namespaces)
 
@@ -613,7 +613,7 @@ def do_pdoc(self, arg):
         """Print the docstring for an object.
 
         The debugger interface to %pdoc."""
-        namespaces = [('Locals', self.curframe.f_locals),
+        namespaces = [('Locals', self.curframe_locals),
                       ('Globals', self.curframe.f_globals)]
         self.shell.find_line_magic('pdoc')(arg, namespaces=namespaces)
 
@@ -622,7 +622,7 @@ def do_pfile(self, arg):
 
         The debugger interface to %pfile.
         """
-        namespaces = [('Locals', self.curframe.f_locals),
+        namespaces = [('Locals', self.curframe_locals),
                       ('Globals', self.curframe.f_globals)]
         self.shell.find_line_magic('pfile')(arg, namespaces=namespaces)
 
@@ -630,7 +630,7 @@ def do_pinfo(self, arg):
         """Provide detailed information about an object.
 
         The debugger interface to %pinfo, i.e., obj?."""
-        namespaces = [('Locals', self.curframe.f_locals),
+        namespaces = [('Locals', self.curframe_locals),
                       ('Globals', self.curframe.f_globals)]
         self.shell.find_line_magic('pinfo')(arg, namespaces=namespaces)
 
@@ -638,13 +638,13 @@ def do_pinfo2(self, arg):
         """Provide extra detailed information about an object.
 
         The debugger interface to %pinfo2, i.e., obj??."""
-        namespaces = [('Locals', self.curframe.f_locals),
+        namespaces = [('Locals', self.curframe_locals),
                       ('Globals', self.curframe.f_globals)]
         self.shell.find_line_magic('pinfo2')(arg, namespaces=namespaces)
 
     def do_psource(self, arg):
         """Print (or run through pager) the source code for an object."""
-        namespaces = [('Locals', self.curframe.f_locals),
+        namespaces = [('Locals', self.curframe_locals),
                       ('Globals', self.curframe.f_globals)]
         self.shell.find_line_magic('psource')(arg, namespaces=namespaces)
 

From 5d2ae89bbf1be6113ec07b06f01baacf2d6c6d24 Mon Sep 17 00:00:00 2001
From: Hussaina Begum Nandyala <hexxdump@gmail.com>
Date: Thu, 15 Oct 2020 00:54:03 +0530
Subject: [PATCH 0315/1407] Change os.path functions to pathlib.Path functions
 in gh_api.py

Signed-off-by: Hussaina Begum Nandyala <hexxdump@gmail.com>
---
 tools/gh_api.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/gh_api.py b/tools/gh_api.py
index d03495b4f54..cb14a4ce8ac 100644
--- a/tools/gh_api.py
+++ b/tools/gh_api.py
@@ -12,6 +12,7 @@
 import requests
 import getpass
 import json
+from pathlib import Path
 
 try:
     import requests_cache
@@ -274,7 +275,7 @@ def encode_multipart_formdata(fields, boundary=None):
 def post_download(project, filename, name=None, description=""):
     """Upload a file to the GitHub downloads area"""
     if name is None:
-        name = os.path.basename(filename)
+        name = Path(filename).name
     with open(filename, 'rb') as f:
         filedata = f.read()
 

From 9664fa423f2855a6d50977fc94c3da91348430dc Mon Sep 17 00:00:00 2001
From: Sanjana-03 <66235278+Sanjana-03@users.noreply.github.com>
Date: Thu, 15 Oct 2020 11:21:16 +0530
Subject: [PATCH 0316/1407] Adding Features Of IPython

---
 README.rst | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/README.rst b/README.rst
index 196139c7a6b..788629bf58a 100644
--- a/README.rst
+++ b/README.rst
@@ -47,7 +47,29 @@ The Notebook, Qt console and a number of other pieces are now parts of *Jupyter*
 See the `Jupyter installation docs <https://jupyter.readthedocs.io/en/latest/install.html>`__
 if you want to use these.
 
+Main features of IPython
+========================
+Comprehensive object introspection.
 
+Input history, persistent across sessions.
+
+Caching of output results during a session with automatically generated references.
+
+Extensible tab completion, with support by default for completion of python variables and keywords, filenames and function keywords.
+
+Extensible system of ‘magic’ commands for controlling the environment and performing many tasks related to IPython or the operating system.
+
+A rich configuration system with easy switching between different setups (simpler than changing $PYTHONSTARTUP environment variables every time).
+
+Session logging and reloading.
+
+Extensible syntax processing for special purpose situations.
+
+Access to the system shell with user-extensible alias system.
+
+Easily embeddable in other Python programs and GUIs.
+
+Integrated access to the pdb debugger and the Python profiler.
 
 
 Development and Instant running

From ad30d577e0059f53959c3a9e07011a77655c2786 Mon Sep 17 00:00:00 2001
From: Timur Kushukov <timqsh@gmail.com>
Date: Fri, 16 Oct 2020 23:00:51 +0500
Subject: [PATCH 0317/1407] removed old python 2 cast unicode

---
 IPython/paths.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/IPython/paths.py b/IPython/paths.py
index 53344296e7d..43146b0bb75 100644
--- a/IPython/paths.py
+++ b/IPython/paths.py
@@ -8,9 +8,14 @@
 import IPython
 from IPython.utils.importstring import import_item
 from IPython.utils.path import (
-    get_home_dir, get_xdg_dir, get_xdg_cache_dir, compress_user, _writable_dir,
-    ensure_dir_exists, fs_encoding)
-from IPython.utils import py3compat
+    get_home_dir,
+    get_xdg_dir,
+    get_xdg_cache_dir,
+    compress_user,
+    _writable_dir,
+    ensure_dir_exists,
+)
+
 
 def get_ipython_dir() -> str:
     """Get the IPython directory for this platform and user.
@@ -103,7 +108,8 @@ def get_ipython_module_path(module_str):
     mod = import_item(module_str)
     the_path = mod.__file__.replace('.pyc', '.py')
     the_path = the_path.replace('.pyo', '.py')
-    return py3compat.cast_unicode(the_path, fs_encoding)
+    return the_path
+
 
 def locate_profile(profile='default'):
     """Find the path to the folder associated with a given profile.

From d49eece03553c030c2ef79e3ee0fa083263cecc7 Mon Sep 17 00:00:00 2001
From: NotWearingPants <snir@broshi.net>
Date: Fri, 16 Oct 2020 21:08:18 +0300
Subject: [PATCH 0318/1407] use pathlib in docs/autogen_shortcuts.py + minor
 refactor

---
 docs/autogen_shortcuts.py | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/docs/autogen_shortcuts.py b/docs/autogen_shortcuts.py
index 2cd901970b9..e75238457eb 100755
--- a/docs/autogen_shortcuts.py
+++ b/docs/autogen_shortcuts.py
@@ -1,4 +1,4 @@
-from os.path import abspath, dirname, join
+from pathlib import Path
 
 from IPython.terminal.shortcuts import create_ipython_shortcuts
 
@@ -75,16 +75,10 @@ class _DummyTerminal(object):
 
 
 if __name__ == '__main__':
+    here = Path(__file__).parent
+    dest = here / 'source' / 'config' / 'shortcuts'
 
-    sort_key = lambda k:(str(k[0][1]),str(k[0][0]))
-
-    here = abspath(dirname(__file__))
-    dest = join(here, 'source', 'config', 'shortcuts')
-
-    with open(join(dest, 'single_filtered.csv'), 'w') as csv:
-        for k, v in sorted(single_filter.items(), key=sort_key):
-            csv.write(':kbd:`{}`\t{}\t{}\n'.format(k[0], k[1], v))
-
-    with open(join(dest, 'multi_filtered.csv'), 'w') as csv:
-        for k, v in sorted(multi_filter.items(), key=sort_key):
-            csv.write(':kbd:`{}`\t{}\t{}\n'.format(k[0], k[1], v))
+    for filters, output_filename in [(single_filter, 'single_filtered'), (multi_filter, 'multi_filtered')]:
+        with (dest / '{}.csv'.format(output_filename)).open('w') as csv:
+            for (shortcut, flt), v in sorted(filters.items(), key=lambda ((shortcut, flt), v): (str(shortcut), str(flt))):
+                csv.write(':kbd:`{}`\t{}\t{}\n'.format(shortcut, flt, v))

From 275fcced78fe1d904442591585389dd3fed84c0c Mon Sep 17 00:00:00 2001
From: dswij <dharmasw@outlook.com>
Date: Sat, 17 Oct 2020 01:50:39 +0700
Subject: [PATCH 0319/1407] os.path replaced with pathlib on test_profile.py

---
 IPython/core/tests/test_profile.py | 53 +++++++++++++++++-------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/IPython/core/tests/test_profile.py b/IPython/core/tests/test_profile.py
index e63fb3ef047..f18a064154a 100644
--- a/IPython/core/tests/test_profile.py
+++ b/IPython/core/tests/test_profile.py
@@ -20,11 +20,11 @@
 # Imports
 #-----------------------------------------------------------------------------
 
-import os
 import shutil
 import sys
 import tempfile
 
+from pathlib import Path
 from unittest import TestCase
 
 import nose.tools as nt
@@ -40,9 +40,9 @@
 #-----------------------------------------------------------------------------
 # Globals
 #-----------------------------------------------------------------------------
-TMP_TEST_DIR = tempfile.mkdtemp()
-HOME_TEST_DIR = os.path.join(TMP_TEST_DIR, "home_test_dir")
-IP_TEST_DIR = os.path.join(HOME_TEST_DIR,'.ipython')
+TMP_TEST_DIR = Path(tempfile.mkdtemp())
+HOME_TEST_DIR = TMP_TEST_DIR / "home_test_dir"
+IP_TEST_DIR = HOME_TEST_DIR / ".ipython"
 
 #
 # Setup/teardown functions/decorators
@@ -55,7 +55,7 @@ def setup_module():
     """
     # Do not mask exceptions here.  In particular, catching WindowsError is a
     # problem because that exception is only defined on Windows...
-    os.makedirs(IP_TEST_DIR)
+    (Path.cwd() / IP_TEST_DIR).mkdir(parents=True)
 
 
 def teardown_module():
@@ -84,10 +84,10 @@ def win32_without_pywin32():
 class ProfileStartupTest(TestCase):
     def setUp(self):
         # create profile dir
-        self.pd = ProfileDir.create_profile_dir_by_name(IP_TEST_DIR, 'test')
-        self.options = ['--ipython-dir', IP_TEST_DIR, '--profile', 'test']
-        self.fname = os.path.join(TMP_TEST_DIR, 'test.py')
-        
+        self.pd = ProfileDir.create_profile_dir_by_name(IP_TEST_DIR, "test")
+        self.options = ["--ipython-dir", IP_TEST_DIR, "--profile", "test"]
+        self.fname = TMP_TEST_DIR / "test.py"
+
     def tearDown(self):
         # We must remove this profile right away so its presence doesn't
         # confuse other tests.
@@ -95,7 +95,7 @@ def tearDown(self):
 
     def init(self, startup_file, startup, test):
         # write startup python file
-        with open(os.path.join(self.pd.startup_dir, startup_file), 'w') as f:
+        with open(Path(self.pd.startup_dir) / startup_file, "w") as f:
             f.write(startup)
         # write simple test file, to check that the startup file was run
         with open(self.fname, 'w') as f:
@@ -118,13 +118,13 @@ def test_startup_ipy(self):
 def test_list_profiles_in():
     # No need to remove these directories and files, as they will get nuked in
     # the module-level teardown.
-    td = tempfile.mkdtemp(dir=TMP_TEST_DIR)
-    for name in ('profile_foo', 'profile_hello', 'not_a_profile'):
-        os.mkdir(os.path.join(td, name))
+    td = Path(tempfile.mkdtemp(dir=TMP_TEST_DIR))
+    for name in ("profile_foo", "profile_hello", "not_a_profile"):
+        Path(td / name).mkdir(parents=True)
     if dec.unicode_paths:
-        os.mkdir(os.path.join(td, u'profile_ünicode'))
-    
-    with open(os.path.join(td, 'profile_file'), 'w') as f:
+        Path(td / u"profile_ünicode").mkdir(parents=True)
+
+    with open(td / "profile_file", "w") as f:
         f.write("I am not a profile directory")
     profiles = list_profiles_in(td)
     
@@ -152,10 +152,19 @@ def test_list_bundled_profiles():
 def test_profile_create_ipython_dir():
     """ipython profile create respects --ipython-dir"""
     with TemporaryDirectory() as td:
-        getoutput([sys.executable, '-m', 'IPython', 'profile', 'create',
-             'foo', '--ipython-dir=%s' % td])
-        profile_dir = os.path.join(td, 'profile_foo')
-        assert os.path.exists(profile_dir)
-        ipython_config = os.path.join(profile_dir, 'ipython_config.py')
-        assert os.path.exists(ipython_config)
+        getoutput(
+            [
+                sys.executable,
+                "-m",
+                "IPython",
+                "profile",
+                "create",
+                "foo",
+                "--ipython-dir=%s" % td,
+            ]
+        )
+        profile_dir = Path(td) / "profile_foo"
+        assert Path(profile_dir).exists()
+        ipython_config = profile_dir / "ipython_config.py"
+        assert Path(ipython_config).exists()
         

From 6ea80da079ceebd6e2441fa586ad5f704269a1b3 Mon Sep 17 00:00:00 2001
From: LeafyLi <lifanfzeng@gmail.com>
Date: Sat, 17 Oct 2020 14:34:56 -0400
Subject: [PATCH 0320/1407]  Simplify assignment in test_async_helpers

Closes https://github.com/ipython/ipython/issues/11954
---
 IPython/core/tests/test_async_helpers.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/IPython/core/tests/test_async_helpers.py b/IPython/core/tests/test_async_helpers.py
index 5dc43ca7fd2..6722fed73fb 100644
--- a/IPython/core/tests/test_async_helpers.py
+++ b/IPython/core/tests/test_async_helpers.py
@@ -220,8 +220,7 @@ def nest_case(context, case):
                 nested_case = nest_case(context, test_case)
 
                 for val, async_safe in vals:
-                    val_should_fail = (should_fail or
-                                        (async_func and not async_safe))
+                    val_should_fail = should_fail
 
                     test_id = (context_name, test_name, val)
                     cell = nested_case.format(val=val)

From 29a2ef26569e05c430c585226056276f5c1f85de Mon Sep 17 00:00:00 2001
From: Reilly Tucker Siemens <reilly@tuckersiemens.com>
Date: Sat, 17 Oct 2020 14:34:06 -0700
Subject: [PATCH 0321/1407] Fix TerminalInteractiveShell.true_color docs

---
 IPython/terminal/interactiveshell.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 0ed9e83b1b2..0953d325f20 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -201,10 +201,12 @@ def refresh_style(self):
     ).tag(config=True)
 
     true_color = Bool(False,
-        help=("Use 24bit colors instead of 256 colors in prompt highlighting. "
-              "If your terminal supports true color, the following command "
-              "should print 'TRUECOLOR' in orange: "
-              "printf \"\\x1b[38;2;255;100;0mTRUECOLOR\\x1b[0m\\n\"")
+        help="""Use 24bit colors instead of 256 colors in prompt highlighting.
+        If your terminal supports true color, the following command should
+        print ``TRUECOLOR`` in orange::
+
+            printf \"\\x1b[38;2;255;100;0mTRUECOLOR\\x1b[0m\\n\"
+        """,
     ).tag(config=True)
 
     editor = Unicode(get_default_editor(),

From 9c7acdb00da830b9ee065abb26a9380f322faad2 Mon Sep 17 00:00:00 2001
From: Snir Broshi <snir@broshi.net>
Date: Sun, 18 Oct 2020 03:12:41 +0300
Subject: [PATCH 0322/1407] fix unpacking in docs/autogen_shortcuts.py

---
 docs/autogen_shortcuts.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/autogen_shortcuts.py b/docs/autogen_shortcuts.py
index e75238457eb..27eb3351da7 100755
--- a/docs/autogen_shortcuts.py
+++ b/docs/autogen_shortcuts.py
@@ -78,7 +78,12 @@ class _DummyTerminal(object):
     here = Path(__file__).parent
     dest = here / 'source' / 'config' / 'shortcuts'
 
+    def sort_key(item):
+        k, v = item
+        shortcut, flt = k
+        return (str(shortcut), str(flt))
+
     for filters, output_filename in [(single_filter, 'single_filtered'), (multi_filter, 'multi_filtered')]:
         with (dest / '{}.csv'.format(output_filename)).open('w') as csv:
-            for (shortcut, flt), v in sorted(filters.items(), key=lambda ((shortcut, flt), v): (str(shortcut), str(flt))):
+            for (shortcut, flt), v in sorted(filters.items(), key=sort_key):
                 csv.write(':kbd:`{}`\t{}\t{}\n'.format(shortcut, flt, v))

From 1c698f5cffd70c5db99f6a50bce7a7a29426b972 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 19 Oct 2020 08:05:33 -0700
Subject: [PATCH 0323/1407] Fix mistake where str is inserted into a list of
 Path.

---
 IPython/testing/globalipapp.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/testing/globalipapp.py b/IPython/testing/globalipapp.py
index c435f9d0873..c58d575a73b 100644
--- a/IPython/testing/globalipapp.py
+++ b/IPython/testing/globalipapp.py
@@ -14,6 +14,8 @@
 import types
 import warnings
 
+from pathlib import Path
+
 from . import tools
 
 from IPython.core import page
@@ -95,7 +97,7 @@ def start_ipython():
     # A few more tweaks needed for playing nicely with doctests...
 
     # remove history file
-    shell.tempfiles.append(config.HistoryManager.hist_file)
+    shell.tempfiles.append(Path(config.HistoryManager.hist_file))
 
     # These traps are normally only active for interactive use, set them
     # permanently since we'll be mocking interactive sessions.

From ffd16d9f984741fcc198e59b3c7430431217075e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 19 Oct 2020 09:10:51 -0700
Subject: [PATCH 0324/1407] Remove darker now that it's on github actions.

---
 .travis.yml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3564178676b..632725ad924 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ install:
   - pip install trio curio --upgrade --upgrade-strategy eager
   - pip install 'pytest<6' 'matplotlib !=3.2.0' mypy
   - pip install codecov check-manifest --upgrade
-  - pip install mypy darker
+  - pip install mypy
   - |
     if [[ "$MASTER_DEPENDENCIES" == "True" ]]; then
        pip install git+https://github.com/ipython/traitlets#egg=traitlets --force
@@ -57,20 +57,6 @@ script:
        # on nightly fake parso known the grammar
        cp /home/travis/virtualenv/python3.9-dev/lib/python3.9/site-packages/parso/python/grammar38.txt /home/travis/virtualenv/python3.9-dev/lib/python3.9/site-packages/parso/python/grammar39.txt
     fi
-  - |
-    # check style on changes
-    # run `darker -r master` and commit changes to fix
-    if [[ "${TRAVIS_PULL_REQUEST:-false}" != "false" ]] \
-    && [[ "$TRAVIS_PYTHON_VERSION" == "3.8" ]] \
-    && [[ "$TRAVIS_OS_NAME" == "linux" ]];
-    then
-      darker -r ${TRAVIS_COMMIT_RANGE%%.*} --check --diff . || (
-        echo "Changes need auto-formatting. Run:"
-        echo "    darker -r ${TRAVIS_COMMIT_RANGE%%.*}"
-        echo "then commit and push changes to fix."
-        exit 1
-      )
-    fi
   - cd /tmp && iptest --coverage xml && cd -
   - pytest IPython
   - mypy IPython/terminal/ptutils.py

From 948a79c2f63b8c2974216380ebcdad87dfd9559b Mon Sep 17 00:00:00 2001
From: Jakub Klus <jakub.klus@innovatrics.com>
Date: Mon, 19 Oct 2020 13:06:42 +0200
Subject: [PATCH 0325/1407] Update history.py to use pathlib

Tests were returning exeption in atexit_operations
AttributeError: 'str' object has no attribute 'unlink'

This commit embraces usage of pathlib in history.py and related
tests, fixing aforementioned problem.
---
 IPython/core/history.py            | 126 +++++++++++++++--------------
 IPython/core/tests/test_history.py |  25 +++---
 IPython/testing/tools.py           |   3 +-
 3 files changed, 80 insertions(+), 74 deletions(-)

diff --git a/IPython/core/history.py b/IPython/core/history.py
index 82d4d6e334b..ed0f4a44839 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -6,7 +6,7 @@
 
 import atexit
 import datetime
-import os
+from pathlib import Path
 import re
 import sqlite3
 import threading
@@ -16,8 +16,8 @@
 from IPython.utils.decorators import undoc
 from IPython.paths import locate_profile
 from traitlets import (
-    Any, Bool, Dict, Instance, Integer, List, Unicode, TraitError,
-    default, observe,
+    Any, Bool, Dict, Instance, Integer, List, Unicode, Union, TraitError,
+    default, observe
 )
 
 #-----------------------------------------------------------------------------
@@ -27,17 +27,17 @@
 @undoc
 class DummyDB(object):
     """Dummy DB that will act as a black hole for history.
-    
+
     Only used in the absence of sqlite"""
     def execute(*args, **kwargs):
         return []
-    
+
     def commit(self, *args, **kwargs):
         pass
-    
+
     def __enter__(self, *args, **kwargs):
         pass
-    
+
     def __exit__(self, *args, **kwargs):
         pass
 
@@ -73,17 +73,18 @@ def catch_corrupt_db(f, self, *a, **kw):
             if self._corrupt_db_counter > self._corrupt_db_limit:
                 self.hist_file = ':memory:'
                 self.log.error("Failed to load history too many times, history will not be saved.")
-            elif os.path.isfile(self.hist_file):
+            elif self.hist_file.is_file():
                 # move the file out of the way
-                base, ext = os.path.splitext(self.hist_file)
-                size = os.stat(self.hist_file).st_size
+                base = str(self.hist_file.parent / self.hist_file.stem)
+                ext = self.hist_file.suffix
+                size = self.hist_file.stat().st_size
                 if size >= _SAVE_DB_SIZE:
                     # if there's significant content, avoid clobbering
                     now = datetime.datetime.now().isoformat().replace(':', '.')
                     newpath = base + '-corrupt-' + now + ext
                     # don't clobber previous corrupt backups
                     for i in range(100):
-                        if not os.path.isfile(newpath):
+                        if not Path(newpath).exists():
                             break
                         else:
                             newpath = base + '-corrupt-' + now + (u'-%i' % i) + ext
@@ -91,14 +92,14 @@ def catch_corrupt_db(f, self, *a, **kw):
                     # not much content, possibly empty; don't worry about clobbering
                     # maybe we should just delete it?
                     newpath = base + '-corrupt' + ext
-                os.rename(self.hist_file, newpath)
+                self.hist_file.rename(newpath)
                 self.log.error("History file was moved to %s and a new file created.", newpath)
             self.init_db()
             return []
         else:
             # Failed with :memory:, something serious is wrong
             raise
-        
+
 class HistoryAccessorBase(LoggingConfigurable):
     """An abstract class for History Accessors """
 
@@ -118,7 +119,7 @@ def get_range_by_str(self, rangestr, raw=True, output=False):
 
 class HistoryAccessor(HistoryAccessorBase):
     """Access the history database without adding to it.
-    
+
     This is intended for use by standalone history tools. IPython shells use
     HistoryManager, below, which is a subclass of this."""
 
@@ -128,37 +129,38 @@ class HistoryAccessor(HistoryAccessorBase):
     _corrupt_db_limit = 2
 
     # String holding the path to the history file
-    hist_file = Unicode(
+    hist_file = Union([Instance(Path), Unicode()],
         help="""Path to file to use for SQLite history database.
-        
+
         By default, IPython will put the history database in the IPython
         profile directory.  If you would rather share one history among
         profiles, you can set this value in each, so that they are consistent.
-        
+
         Due to an issue with fcntl, SQLite is known to misbehave on some NFS
         mounts.  If you see IPython hanging, try setting this to something on a
         local disk, e.g::
-        
+
             ipython --HistoryManager.hist_file=/tmp/ipython_hist.sqlite
 
         you can also use the specific value `:memory:` (including the colon
         at both end but not the back ticks), to avoid creating an history file.
-        
-        """).tag(config=True)
-    
+
+        """
+    ).tag(config=True)
+
     enabled = Bool(True,
         help="""enable the SQLite history
-        
+
         set enabled=False to disable the SQLite history,
         in which case there will be no stored history, no SQLite connection,
         and no background saving thread.  This may be necessary in some
         threaded environments where IPython is embedded.
         """
     ).tag(config=True)
-    
+
     connection_options = Dict(
         help="""Options for configuring the SQLite connection
-        
+
         These options are passed as keyword args to sqlite3.connect
         when establishing database connections.
         """
@@ -175,10 +177,10 @@ def _db_changed(self, change):
             msg = "%s.db must be sqlite3 Connection or DummyDB, not %r" % \
                     (self.__class__.__name__, new)
             raise TraitError(msg)
-    
-    def __init__(self, profile='default', hist_file=u'', **traits):
+
+    def __init__(self, profile='default', hist_file="", **traits):
         """Create a new history accessor.
-        
+
         Parameters
         ----------
         profile : str
@@ -196,33 +198,35 @@ def __init__(self, profile='default', hist_file=u'', **traits):
         # set by config
         if hist_file:
             self.hist_file = hist_file
-        
-        if self.hist_file == u'':
+
+        try:
+            self.hist_file 
+        except TraitError:
             # No one has set the hist_file, yet.
             self.hist_file = self._get_hist_file_name(profile)
-        
+
         self.init_db()
-    
+
     def _get_hist_file_name(self, profile='default'):
         """Find the history file for the given profile name.
-        
+
         This is overridden by the HistoryManager subclass, to use the shell's
         active profile.
-        
+
         Parameters
         ----------
         profile : str
           The name of a profile which has a history file.
         """
-        return os.path.join(locate_profile(profile), 'history.sqlite')
-    
+        return Path(locate_profile(profile)) / 'history.sqlite'
+
     @catch_corrupt_db
     def init_db(self):
         """Connect to the database, and create tables if necessary."""
         if not self.enabled:
             self.db = DummyDB()
             return
-        
+
         # use detect_types so that timestamps return datetime objects
         kwargs = dict(detect_types=sqlite3.PARSE_DECLTYPES|sqlite3.PARSE_COLNAMES)
         kwargs.update(self.connection_options)
@@ -290,7 +294,7 @@ def get_session_info(self, session):
 
         Returns
         -------
-        
+
         session_id : int
            Session ID number
         start : datetime
@@ -308,7 +312,7 @@ def get_session_info(self, session):
     @catch_corrupt_db
     def get_last_session_id(self):
         """Get the last session ID currently in the database.
-        
+
         Within IPython, this should be the same as the value stored in
         :attr:`HistoryManager.session_number`.
         """
@@ -384,7 +388,7 @@ def search(self, pattern="*", raw=True, search_raw=True,
         if n is not None:
             return reversed(list(cur))
         return cur
-    
+
     @catch_corrupt_db
     def get_range(self, session, start=1, stop=None, raw=True,output=False):
         """Retrieve input by session.
@@ -461,7 +465,7 @@ class HistoryManager(HistoryAccessor):
     @default('dir_hist')
     def _dir_hist_default(self):
         try:
-            return [os.getcwd()]
+            return [Path.cwd()]
         except OSError:
             return []
 
@@ -473,7 +477,7 @@ def _dir_hist_default(self):
 
     # The number of the current session in the history database
     session_number = Integer()
-    
+
     db_log_output = Bool(False,
         help="Should the history database include output? (default: no)"
     ).tag(config=True)
@@ -484,12 +488,12 @@ def _dir_hist_default(self):
     # The input and output caches
     db_input_cache = List()
     db_output_cache = List()
-    
+
     # History saving in separate thread
     save_thread = Instance('IPython.core.history.HistorySavingThread',
                            allow_none=True)
     save_flag = Instance(threading.Event, allow_none=True)
-    
+
     # Private interface
     # Variables used to store the three last inputs from the user.  On each new
     # history update, we populate the user's namespace with these, shifted as
@@ -513,37 +517,37 @@ def __init__(self, shell=None, config=None, **traits):
         self.save_flag = threading.Event()
         self.db_input_cache_lock = threading.Lock()
         self.db_output_cache_lock = threading.Lock()
-        
+
         try:
             self.new_session()
         except sqlite3.OperationalError:
             self.log.error("Failed to create history session in %s. History will not be saved.",
                 self.hist_file, exc_info=True)
             self.hist_file = ':memory:'
-        
+
         if self.enabled and self.hist_file != ':memory:':
             self.save_thread = HistorySavingThread(self)
             self.save_thread.start()
 
     def _get_hist_file_name(self, profile=None):
         """Get default history file name based on the Shell's profile.
-        
+
         The profile parameter is ignored, but must exist for compatibility with
         the parent class."""
         profile_dir = self.shell.profile_dir.location
-        return os.path.join(profile_dir, 'history.sqlite')
-    
+        return Path(profile_dir)/'history.sqlite'
+
     @only_when_enabled
     def new_session(self, conn=None):
         """Get a new session number."""
         if conn is None:
             conn = self.db
-        
+
         with conn:
             cur = conn.execute("""INSERT INTO sessions VALUES (NULL, ?, NULL,
                             NULL, "") """, (datetime.datetime.now(),))
             self.session_number = cur.lastrowid
-            
+
     def end_session(self):
         """Close the database session, filling in the end time and line count."""
         self.writeout_cache()
@@ -552,20 +556,20 @@ def end_session(self):
                             session==?""", (datetime.datetime.now(),
                             len(self.input_hist_parsed)-1, self.session_number))
         self.session_number = 0
-                            
+
     def name_session(self, name):
         """Give the current session a name in the history database."""
         with self.db:
             self.db.execute("UPDATE sessions SET remark=? WHERE session==?",
                             (name, self.session_number))
-                            
+
     def reset(self, new_session=True):
         """Clear the session history, releasing all object references, and
         optionally open a new session."""
         self.output_hist.clear()
         # The directory history can't be completely empty
-        self.dir_hist[:] = [os.getcwd()]
-        
+        self.dir_hist[:] = [Path.cwd()]
+
         if new_session:
             if self.session_number:
                 self.end_session()
@@ -588,7 +592,7 @@ def get_session_info(self, session=0):
 
         Returns
         -------
-        
+
         session_id : int
            Session ID number
         start : datetime
@@ -609,7 +613,7 @@ def _get_range_session(self, start=1, stop=None, raw=True, output=False):
         """Get input and output history from the current session. Called by
         get_range, and takes similar parameters."""
         input_hist = self.input_hist_raw if raw else self.input_hist_parsed
-            
+
         n = len(input_hist)
         if start < 0:
             start += n
@@ -617,17 +621,17 @@ def _get_range_session(self, start=1, stop=None, raw=True, output=False):
             stop = n
         elif stop < 0:
             stop += n
-        
+
         for i in range(start, stop):
             if output:
                 line = (input_hist[i], self.output_hist_reprs.get(i))
             else:
                 line = input_hist[i]
             yield (0, i, line)
-    
+
     def get_range(self, session=0, start=1, stop=None, raw=True,output=False):
         """Retrieve input by session.
-        
+
         Parameters
         ----------
         session : int
@@ -645,7 +649,7 @@ def get_range(self, session=0, start=1, stop=None, raw=True,output=False):
             objects for the current session, or text reprs from previous
             sessions if db_log_output was enabled at the time. Where no output
             is found, None is used.
-            
+
         Returns
         -------
         entries
@@ -709,7 +713,7 @@ def store_inputs(self, line_num, source, source_raw=None):
                    '_ii': self._ii,
                    '_iii': self._iii,
                    new_i : self._i00 }
-        
+
         if self.shell is not None:
             self.shell.push(to_main, interactive=False)
 
diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
index f4f080dc83f..03ba7683d2b 100644
--- a/IPython/core/tests/test_history.py
+++ b/IPython/core/tests/test_history.py
@@ -7,7 +7,7 @@
 
 # stdlib
 import io
-import os
+from pathlib import Path
 import sys
 import tempfile
 from datetime import datetime
@@ -29,8 +29,9 @@ def test_proper_default_encoding():
 def test_history():
     ip = get_ipython()
     with TemporaryDirectory() as tmpdir:
+        tmp_path = Path(tmpdir)
         hist_manager_ori = ip.history_manager
-        hist_file = os.path.join(tmpdir, 'history.sqlite')
+        hist_file = tmp_path / 'history.sqlite'
         try:
             ip.history_manager = HistoryManager(shell=ip, hist_file=hist_file)
             hist = [u'a=1', u'def f():\n    test = 1\n    return test', u"b='€Æ¾÷ß'"]
@@ -55,10 +56,10 @@ def test_history():
             ip.magic('%hist 2-500')
 
             # Check that we can write non-ascii characters to a file
-            ip.magic("%%hist -f %s" % os.path.join(tmpdir, "test1"))
-            ip.magic("%%hist -pf %s" % os.path.join(tmpdir, "test2"))
-            ip.magic("%%hist -nf %s" % os.path.join(tmpdir, "test3"))
-            ip.magic("%%save %s 1-10" % os.path.join(tmpdir, "test4"))
+            ip.magic("%%hist -f %s" % (tmp_path / "test1"))
+            ip.magic("%%hist -pf %s" % (tmp_path / "test2"))
+            ip.magic("%%hist -nf %s" % (tmp_path / "test3"))
+            ip.magic("%%save %s 1-10" % (tmp_path / "test4"))
 
             # New session
             ip.history_manager.reset()
@@ -126,8 +127,8 @@ def test_history():
             nt.assert_equal(list(gothist), [(1,3,(hist[2],"spam"))] )
 
             # Cross testing: check that magic %save can get previous session.
-            testfilename = os.path.realpath(os.path.join(tmpdir, "test.py"))
-            ip.magic("save " + testfilename + " ~1/1-3")
+            testfilename = (tmp_path /"test.py").resolve()
+            ip.magic("save " + str(testfilename) + " ~1/1-3")
             with io.open(testfilename, encoding='utf-8') as testfile:
                 nt.assert_equal(testfile.read(),
                                         u"# coding: utf-8\n" + u"\n".join(hist)+u"\n")
@@ -176,13 +177,13 @@ def test_timestamp_type():
 def test_hist_file_config():
     cfg = Config()
     tfile = tempfile.NamedTemporaryFile(delete=False)
-    cfg.HistoryManager.hist_file = tfile.name
+    cfg.HistoryManager.hist_file = Path(tfile.name)
     try:
         hm = HistoryManager(shell=get_ipython(), config=cfg)
         nt.assert_equal(hm.hist_file, cfg.HistoryManager.hist_file)
     finally:
         try:
-            os.remove(tfile.name)
+            Path(tfile.name).unlink()
         except OSError:
             # same catch as in testing.tools.TempFileMixin
             # On Windows, even though we close the file, we still can't
@@ -197,7 +198,7 @@ def test_histmanager_disabled():
     ip = get_ipython()
     with TemporaryDirectory() as tmpdir:
         hist_manager_ori = ip.history_manager
-        hist_file = os.path.join(tmpdir, 'history.sqlite')
+        hist_file = Path(tmpdir) / 'history.sqlite'
         cfg.HistoryManager.hist_file = hist_file
         try:
             ip.history_manager = HistoryManager(shell=ip, config=cfg)
@@ -211,4 +212,4 @@ def test_histmanager_disabled():
             ip.history_manager = hist_manager_ori
 
     # hist_file should not be created
-    nt.assert_false(os.path.exists(hist_file))
+    nt.assert_false(hist_file.exists())
diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py
index 498ae488917..b4301f83af1 100644
--- a/IPython/testing/tools.py
+++ b/IPython/testing/tools.py
@@ -10,6 +10,7 @@
 # Distributed under the terms of the Modified BSD License.
 
 import os
+from pathlib import Path
 import re
 import sys
 import tempfile
@@ -142,7 +143,7 @@ def default_config():
     config.TerminalTerminalInteractiveShell.term_title = False,
     config.TerminalInteractiveShell.autocall = 0
     f = tempfile.NamedTemporaryFile(suffix=u'test_hist.sqlite', delete=False)
-    config.HistoryManager.hist_file = f.name
+    config.HistoryManager.hist_file = Path(f.name)
     f.close()
     config.HistoryManager.db_cache_size = 10000
     return config

From e53e576c651860c7c024c39d387130dfb43c9a44 Mon Sep 17 00:00:00 2001
From: Jakub Klus <jakub.klus@innovatrics.com>
Date: Mon, 19 Oct 2020 13:42:37 +0200
Subject: [PATCH 0326/1407] Use explicit `str` in `sqlite3.connect`.

---
 IPython/core/history.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/history.py b/IPython/core/history.py
index ed0f4a44839..f7930515e9e 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -230,7 +230,7 @@ def init_db(self):
         # use detect_types so that timestamps return datetime objects
         kwargs = dict(detect_types=sqlite3.PARSE_DECLTYPES|sqlite3.PARSE_COLNAMES)
         kwargs.update(self.connection_options)
-        self.db = sqlite3.connect(self.hist_file, **kwargs)
+        self.db = sqlite3.connect(str(self.hist_file), **kwargs)
         self.db.execute("""CREATE TABLE IF NOT EXISTS sessions (session integer
                         primary key autoincrement, start timestamp,
                         end timestamp, num_cmds integer, remark text)""")
@@ -801,7 +801,7 @@ def __init__(self, history_manager):
     def run(self):
         # We need a separate db connection per thread:
         try:
-            self.db = sqlite3.connect(self.history_manager.hist_file,
+            self.db = sqlite3.connect(str(self.history_manager.hist_file),
                             **self.history_manager.connection_options
             )
             while True:

From 22fa8515ad605442bd325c90d2d2197f4c07f077 Mon Sep 17 00:00:00 2001
From: Jakub Klus <jakub.klus@innovatrics.com>
Date: Mon, 19 Oct 2020 20:29:26 +0200
Subject: [PATCH 0327/1407] Apply darker formatting

---
 IPython/core/history.py            | 32 ++++++++++++++++++++----------
 IPython/core/tests/test_history.py |  6 +++---
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/IPython/core/history.py b/IPython/core/history.py
index f7930515e9e..08db18f7a5b 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -16,8 +16,17 @@
 from IPython.utils.decorators import undoc
 from IPython.paths import locate_profile
 from traitlets import (
-    Any, Bool, Dict, Instance, Integer, List, Unicode, Union, TraitError,
-    default, observe
+    Any,
+    Bool,
+    Dict,
+    Instance,
+    Integer,
+    List,
+    Unicode,
+    Union,
+    TraitError,
+    default,
+    observe,
 )
 
 #-----------------------------------------------------------------------------
@@ -100,6 +109,7 @@ def catch_corrupt_db(f, self, *a, **kw):
             # Failed with :memory:, something serious is wrong
             raise
 
+
 class HistoryAccessorBase(LoggingConfigurable):
     """An abstract class for History Accessors """
 
@@ -129,7 +139,8 @@ class HistoryAccessor(HistoryAccessorBase):
     _corrupt_db_limit = 2
 
     # String holding the path to the history file
-    hist_file = Union([Instance(Path), Unicode()],
+    hist_file = Union(
+        [Instance(Path), Unicode()],
         help="""Path to file to use for SQLite history database.
 
         By default, IPython will put the history database in the IPython
@@ -145,7 +156,7 @@ class HistoryAccessor(HistoryAccessorBase):
         you can also use the specific value `:memory:` (including the colon
         at both end but not the back ticks), to avoid creating an history file.
 
-        """
+        """,
     ).tag(config=True)
 
     enabled = Bool(True,
@@ -178,7 +189,7 @@ def _db_changed(self, change):
                     (self.__class__.__name__, new)
             raise TraitError(msg)
 
-    def __init__(self, profile='default', hist_file="", **traits):
+    def __init__(self, profile="default", hist_file="", **traits):
         """Create a new history accessor.
 
         Parameters
@@ -200,7 +211,7 @@ def __init__(self, profile='default', hist_file="", **traits):
             self.hist_file = hist_file
 
         try:
-            self.hist_file 
+            self.hist_file
         except TraitError:
             # No one has set the hist_file, yet.
             self.hist_file = self._get_hist_file_name(profile)
@@ -218,7 +229,7 @@ def _get_hist_file_name(self, profile='default'):
         profile : str
           The name of a profile which has a history file.
         """
-        return Path(locate_profile(profile)) / 'history.sqlite'
+        return Path(locate_profile(profile)) / "history.sqlite"
 
     @catch_corrupt_db
     def init_db(self):
@@ -535,7 +546,7 @@ def _get_hist_file_name(self, profile=None):
         The profile parameter is ignored, but must exist for compatibility with
         the parent class."""
         profile_dir = self.shell.profile_dir.location
-        return Path(profile_dir)/'history.sqlite'
+        return Path(profile_dir) / "history.sqlite"
 
     @only_when_enabled
     def new_session(self, conn=None):
@@ -801,8 +812,9 @@ def __init__(self, history_manager):
     def run(self):
         # We need a separate db connection per thread:
         try:
-            self.db = sqlite3.connect(str(self.history_manager.hist_file),
-                            **self.history_manager.connection_options
+            self.db = sqlite3.connect(
+                str(self.history_manager.hist_file),
+                **self.history_manager.connection_options
             )
             while True:
                 self.history_manager.save_flag.wait()
diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
index 03ba7683d2b..57266e5752b 100644
--- a/IPython/core/tests/test_history.py
+++ b/IPython/core/tests/test_history.py
@@ -31,7 +31,7 @@ def test_history():
     with TemporaryDirectory() as tmpdir:
         tmp_path = Path(tmpdir)
         hist_manager_ori = ip.history_manager
-        hist_file = tmp_path / 'history.sqlite'
+        hist_file = tmp_path / "history.sqlite"
         try:
             ip.history_manager = HistoryManager(shell=ip, hist_file=hist_file)
             hist = [u'a=1', u'def f():\n    test = 1\n    return test', u"b='€Æ¾÷ß'"]
@@ -127,7 +127,7 @@ def test_history():
             nt.assert_equal(list(gothist), [(1,3,(hist[2],"spam"))] )
 
             # Cross testing: check that magic %save can get previous session.
-            testfilename = (tmp_path /"test.py").resolve()
+            testfilename = (tmp_path / "test.py").resolve()
             ip.magic("save " + str(testfilename) + " ~1/1-3")
             with io.open(testfilename, encoding='utf-8') as testfile:
                 nt.assert_equal(testfile.read(),
@@ -198,7 +198,7 @@ def test_histmanager_disabled():
     ip = get_ipython()
     with TemporaryDirectory() as tmpdir:
         hist_manager_ori = ip.history_manager
-        hist_file = Path(tmpdir) / 'history.sqlite'
+        hist_file = Path(tmpdir) / "history.sqlite"
         cfg.HistoryManager.hist_file = hist_file
         try:
             ip.history_manager = HistoryManager(shell=ip, config=cfg)

From da3b7f5764e537cdb8d986cba5aedafc93b46208 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 19 Oct 2020 08:28:18 -0700
Subject: [PATCH 0328/1407] Test formatting on GHaction.

---
 .github/workflows/python-package.yml | 38 ++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 .github/workflows/python-package.yml

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
new file mode 100644
index 00000000000..8765b496043
--- /dev/null
+++ b/.github/workflows/python-package.yml
@@ -0,0 +1,38 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python package
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.8]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install darker
+    - name: Lint with darker
+      run: |
+        git fetch
+        darker -r 60625f241f298b5039cb2debc365db38aa7bb522 --check --diff . || (
+        echo "Changes need auto-formatting. Run:"
+        echo "    darker -r 60625f241f298b5039cb2debc365db38aa7bb522"
+        echo "then commit and push changes to fix."
+        exit 1
+        )

From 7b7f47081688b3c9ad8ca8f9f24bee036e2a9e53 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 15 Oct 2020 20:38:17 -0700
Subject: [PATCH 0329/1407] Mark initial frame as not hidden.

---
 IPython/core/debugger.py         | 13 ++++++++++---
 IPython/core/interactiveshell.py |  5 +++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 54074ca5a48..928a898545e 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -287,6 +287,11 @@ def set_colors(self, scheme):
         self.color_scheme_table.set_active_scheme(scheme)
         self.parser.style = scheme
 
+    def set_trace(self, frame=None):
+        if frame is None:
+            frame = sys._getframe().f_back
+        self.initial_frame = frame
+        return super().set_trace(frame)
 
     def hidden_frames(self, stack):
         """
@@ -299,9 +304,11 @@ def hidden_frames(self, stack):
         # avoid calling it here to preserve self.curframe_locals.
         # Futhermore, there is no good reason to hide the current frame.
         ip_hide = [
-            False if s[0] is self.curframe else s[0].f_locals.get(
-                "__tracebackhide__", False)
-            for s in stack]
+            False
+            if s[0] in (self.curframe, getattr(self, "initial_frame", None))
+            else s[0].f_locals.get("__tracebackhide__", False)
+            for s in stack
+        ]
         ip_start = [i for i, s in enumerate(ip_hide) if s == "__ipython_bottom__"]
         if ip_start:
             ip_hide = [h if i > ip_start[0] else True for (i, h) in enumerate(ip_hide)]
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 7f7486b2cae..e1eb17dcecc 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -740,8 +740,9 @@ def init_profile_dir(self, profile_dir):
         if profile_dir is not None:
             self.profile_dir = profile_dir
             return
-        self.profile_dir =\
-            ProfileDir.create_profile_dir_by_name(self.ipython_dir, 'default')
+        self.profile_dir = ProfileDir.create_profile_dir_by_name(
+            self.ipython_dir, "default"
+        )
 
     def init_instance_attrs(self):
         self.more = False

From 88aa7fd8f253e2b25a8fe5e7dd7e93ddcf950779 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 19 Oct 2020 13:01:18 -0700
Subject: [PATCH 0330/1407] Decrease testing using iptest, coverage using
 pytest.

iptest will be deprecated soon as Node will not run on Python 3.10 as
far as I understood.
---
 .travis.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 632725ad924..7deb84d66d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ install:
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
   - pip install trio curio --upgrade --upgrade-strategy eager
   - pip install 'pytest<6' 'matplotlib !=3.2.0' mypy
-  - pip install codecov check-manifest --upgrade
+  - pip install codecov check-manifest pytest-cov --upgrade
   - pip install mypy
   - |
     if [[ "$MASTER_DEPENDENCIES" == "True" ]]; then
@@ -57,7 +57,10 @@ script:
        # on nightly fake parso known the grammar
        cp /home/travis/virtualenv/python3.9-dev/lib/python3.9/site-packages/parso/python/grammar38.txt /home/travis/virtualenv/python3.9-dev/lib/python3.9/site-packages/parso/python/grammar39.txt
     fi
-  - cd /tmp && iptest --coverage xml && cd -
+  - |
+    if [[ "$TRAVIS_PYTHON_VERSION" == "3.8" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+      cd /tmp && iptest --coverage xml && cd -
+    fi
   - pytest IPython
   - mypy IPython/terminal/ptutils.py
   - mypy IPython/core/c*.py

From 3c2c1857268fba1833b324d8b4e4ce53b0220b83 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 19 Oct 2020 13:39:39 -0700
Subject: [PATCH 0331/1407] try to fix build

---
 .github/workflows/python-package.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 8765b496043..80497bb9ec6 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -19,6 +19,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+      with: 
+        fetch-depth: 0
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
@@ -29,7 +31,6 @@ jobs:
         pip install darker
     - name: Lint with darker
       run: |
-        git fetch
         darker -r 60625f241f298b5039cb2debc365db38aa7bb522 --check --diff . || (
         echo "Changes need auto-formatting. Run:"
         echo "    darker -r 60625f241f298b5039cb2debc365db38aa7bb522"

From b346a8a3a74d5f8cc1347ae8d600fd578edb3b7b Mon Sep 17 00:00:00 2001
From: dswij <dharmasw@outlook.com>
Date: Sat, 17 Oct 2020 04:42:23 +0700
Subject: [PATCH 0332/1407] pathlib on test_module_paths.py

---
 IPython/utils/tests/test_module_paths.py | 39 ++++++++++++------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/IPython/utils/tests/test_module_paths.py b/IPython/utils/tests/test_module_paths.py
index acdb770fa32..eed2d4cadb5 100644
--- a/IPython/utils/tests/test_module_paths.py
+++ b/IPython/utils/tests/test_module_paths.py
@@ -12,13 +12,12 @@
 # Imports
 #-----------------------------------------------------------------------------
 
-
 import os
 import shutil
 import sys
 import tempfile
 
-from os.path import join, abspath, split
+from pathlib import Path
 
 from IPython.testing.tools import make_tempfile
 
@@ -27,9 +26,9 @@
 import nose.tools as nt
 
 env = os.environ
-TEST_FILE_PATH = split(abspath(__file__))[0]
+TEST_FILE_PATH = Path(__file__).resolve().parent
 
-TMP_TEST_DIR = tempfile.mkdtemp(suffix='with.dot')
+TMP_TEST_DIR = Path(tempfile.mkdtemp(suffix="with.dot"))
 #
 # Setup/teardown functions/decorators
 #
@@ -46,13 +45,13 @@ def setup_module():
     """
     # Do not mask exceptions here.  In particular, catching WindowsError is a
     # problem because that exception is only defined on Windows...
-    os.makedirs(join(TMP_TEST_DIR, "xmod"))
-    os.makedirs(join(TMP_TEST_DIR, "nomod"))
-    make_empty_file(join(TMP_TEST_DIR, "xmod/__init__.py"))
-    make_empty_file(join(TMP_TEST_DIR, "xmod/sub.py"))
-    make_empty_file(join(TMP_TEST_DIR, "pack.py"))
-    make_empty_file(join(TMP_TEST_DIR, "packpyc.pyc"))
-    sys.path = [TMP_TEST_DIR]
+    Path(TMP_TEST_DIR / "xmod").mkdir(parents=True)
+    Path(TMP_TEST_DIR / "nomod").mkdir(parents=True)
+    make_empty_file(TMP_TEST_DIR / "xmod/__init__.py")
+    make_empty_file(TMP_TEST_DIR / "xmod/sub.py")
+    make_empty_file(TMP_TEST_DIR / "pack.py")
+    make_empty_file(TMP_TEST_DIR / "packpyc.pyc")
+    sys.path = [str(TMP_TEST_DIR)]
 
 def teardown_module():
     """Teardown testenvironment for the module:
@@ -70,7 +69,7 @@ def test_tempdir():
     """
     Ensure the test are done with a temporary file that have a dot somewhere.
     """
-    nt.assert_in('.',TMP_TEST_DIR)
+    nt.assert_in(".", str(TMP_TEST_DIR))
 
 
 def test_find_mod_1():
@@ -78,8 +77,8 @@ def test_find_mod_1():
     Search for a directory's file path.
     Expected output: a path to that directory's __init__.py file.
     """
-    modpath = join(TMP_TEST_DIR, "xmod", "__init__.py")
-    nt.assert_equal(mp.find_mod("xmod"), modpath)
+    modpath = TMP_TEST_DIR / "xmod" / "__init__.py"
+    nt.assert_equal(Path(mp.find_mod("xmod")), modpath)
 
 def test_find_mod_2():
     """
@@ -87,24 +86,24 @@ def test_find_mod_2():
     Expected output: a path to that directory's __init__.py file.
     TODO: Confirm why this is a duplicate test.
     """
-    modpath = join(TMP_TEST_DIR, "xmod", "__init__.py")
-    nt.assert_equal(mp.find_mod("xmod"), modpath)
+    modpath = TMP_TEST_DIR / "xmod" / "__init__.py"
+    nt.assert_equal(Path(mp.find_mod("xmod")), modpath)
 
 def test_find_mod_3():
     """
     Search for a directory + a filename without its .py extension
     Expected output: full path with .py extension.
     """
-    modpath = join(TMP_TEST_DIR, "xmod", "sub.py")
-    nt.assert_equal(mp.find_mod("xmod.sub"), modpath)
+    modpath = TMP_TEST_DIR / "xmod" / "sub.py"
+    nt.assert_equal(Path(mp.find_mod("xmod.sub")), modpath)
 
 def test_find_mod_4():
     """
     Search for a filename without its .py extension
     Expected output: full path with .py extension
     """
-    modpath = join(TMP_TEST_DIR, "pack.py")
-    nt.assert_equal(mp.find_mod("pack"), modpath)
+    modpath = TMP_TEST_DIR / "pack.py"
+    nt.assert_equal(Path(mp.find_mod("pack")), modpath)
 
 def test_find_mod_5():
     """

From 103a38efe0a79690f58ebcd3426555f3e9706a6b Mon Sep 17 00:00:00 2001
From: dswij <dharmasw@outlook.com>
Date: Wed, 21 Oct 2020 00:47:05 +0800
Subject: [PATCH 0333/1407] remove unnecessary old codes

---
 IPython/utils/tests/test_module_paths.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/IPython/utils/tests/test_module_paths.py b/IPython/utils/tests/test_module_paths.py
index eed2d4cadb5..01694a2dc15 100644
--- a/IPython/utils/tests/test_module_paths.py
+++ b/IPython/utils/tests/test_module_paths.py
@@ -12,7 +12,6 @@
 # Imports
 #-----------------------------------------------------------------------------
 
-import os
 import shutil
 import sys
 import tempfile
@@ -25,7 +24,6 @@
 
 import nose.tools as nt
 
-env = os.environ
 TEST_FILE_PATH = Path(__file__).resolve().parent
 
 TMP_TEST_DIR = Path(tempfile.mkdtemp(suffix="with.dot"))

From fd49737a00655983480a00d282430f9acb90d784 Mon Sep 17 00:00:00 2001
From: rushabh-v <vasanirushabh24@gmail.com>
Date: Wed, 21 Oct 2020 11:57:55 +0530
Subject: [PATCH 0334/1407] use pathlib in ipython-get-history.py

---
 examples/IPython Kernel/ipython-get-history.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/examples/IPython Kernel/ipython-get-history.py b/examples/IPython Kernel/ipython-get-history.py
index 5e68bf5c041..b99fa3adaa6 100755
--- a/examples/IPython Kernel/ipython-get-history.py	
+++ b/examples/IPython Kernel/ipython-get-history.py	
@@ -17,13 +17,15 @@
 history database.
 """
 import sys
+from pathlib import Path
 
 from IPython.core.history import HistoryAccessor
 
 session_number = int(sys.argv[1])
 if len(sys.argv) > 2:
-    dest = open(sys.argv[2], "w")
-    raw = not sys.argv[2].endswith('.py')
+    filepath = Path(sys.argv[2])
+    dest = open(filepath, "w")
+    raw = not filepath.name.endswith('.py')
 else:
     dest = sys.stdout
     raw = True

From e2c7cc5463c4e587eb72a106a544e44c2040ff2b Mon Sep 17 00:00:00 2001
From: rushabh-v <vasanirushabh24@gmail.com>
Date: Wed, 21 Oct 2020 12:23:16 +0530
Subject: [PATCH 0335/1407] use pathlib in docs/source/conf.py

---
 docs/source/conf.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 7ed40a95aed..82c2beb7429 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -16,6 +16,7 @@
 # serve to show the default value.
 
 import sys, os
+from pathlib import Path
 
 # http://read-the-docs.readthedocs.io/en/latest/faq.html
 ON_RTD = os.environ.get('READTHEDOCS', None) == 'True'
@@ -25,8 +26,8 @@
 
     # RTD doesn't use the Makefile, so re-run autogen_{things}.py here.
     for name in ('config', 'api', 'magics', 'shortcuts'):
-        fname = 'autogen_{}.py'.format(name)
-        fpath = os.path.abspath(os.path.join('..', fname))
+        fname = Path('autogen_{}.py'.format(name))
+        fpath = (Path(__file__).parent).joinpath('..', fname)
         with open(fpath) as f:
             exec(compile(f.read(), fname, 'exec'), {
                 '__file__': fpath,

From 4eda6629fe0e38648197a255c97f2b6df6b06571 Mon Sep 17 00:00:00 2001
From: rushabh-v <vasanirushabh24@gmail.com>
Date: Wed, 21 Oct 2020 12:28:27 +0530
Subject: [PATCH 0336/1407] run darker

---
 examples/IPython Kernel/ipython-get-history.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/IPython Kernel/ipython-get-history.py b/examples/IPython Kernel/ipython-get-history.py
index b99fa3adaa6..a2d2ab7b0ab 100755
--- a/examples/IPython Kernel/ipython-get-history.py	
+++ b/examples/IPython Kernel/ipython-get-history.py	
@@ -25,7 +25,7 @@
 if len(sys.argv) > 2:
     filepath = Path(sys.argv[2])
     dest = open(filepath, "w")
-    raw = not filepath.name.endswith('.py')
+    raw = not filepath.name.endswith(".py")
 else:
     dest = sys.stdout
     raw = True

From da1cfc16764a27195b98b692dbb68ecd2ee1987e Mon Sep 17 00:00:00 2001
From: rushabh-v <vasanirushabh24@gmail.com>
Date: Wed, 21 Oct 2020 12:30:48 +0530
Subject: [PATCH 0337/1407] run darker

---
 docs/source/conf.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 82c2beb7429..eb5b39eacb0 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -25,9 +25,9 @@
     tags.add('rtd')
 
     # RTD doesn't use the Makefile, so re-run autogen_{things}.py here.
-    for name in ('config', 'api', 'magics', 'shortcuts'):
-        fname = Path('autogen_{}.py'.format(name))
-        fpath = (Path(__file__).parent).joinpath('..', fname)
+    for name in ("config", "api", "magics", "shortcuts"):
+        fname = Path("autogen_{}.py".format(name))
+        fpath = (Path(__file__).parent).joinpath("..", fname)
         with open(fpath) as f:
             exec(compile(f.read(), fname, 'exec'), {
                 '__file__': fpath,

From d19f59df7b55770c7a6c322f77d86467023e6fa6 Mon Sep 17 00:00:00 2001
From: Quentin Peter <impact27@users.noreply.github.com>
Date: Wed, 21 Oct 2020 16:29:48 +0200
Subject: [PATCH 0338/1407] Fix settrace for recursive debugger

---
 IPython/core/debugger.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 54074ca5a48..ff9e2b5645c 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -588,6 +588,7 @@ def do_debug(self, arg):
         argument (which is an arbitrary expression or statement to be
         executed in the current environment).
         """
+        trace_function = sys.gettrace()
         sys.settrace(None)
         globals = self.curframe.f_globals
         locals = self.curframe_locals
@@ -598,7 +599,7 @@ def do_debug(self, arg):
         self.message("ENTERING RECURSIVE DEBUGGER")
         sys.call_tracing(p.run, (arg, globals, locals))
         self.message("LEAVING RECURSIVE DEBUGGER")
-        sys.settrace(self.trace_dispatch)
+        sys.settrace(trace_function)
         self.lastcmd = p.lastcmd
 
     def do_pdef(self, arg):

From e891355ea17b08dcbc435c8f96fb124598d2078a Mon Sep 17 00:00:00 2001
From: rushabh-v <vasanirushabh24@gmail.com>
Date: Thu, 22 Oct 2020 21:47:52 +0530
Subject: [PATCH 0339/1407] use pathlib in docs/autogen_config.py

---
 docs/autogen_config.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/docs/autogen_config.py b/docs/autogen_config.py
index ec243925511..e037069c613 100755
--- a/docs/autogen_config.py
+++ b/docs/autogen_config.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from os.path import join, dirname, abspath
 import inspect
 from pathlib import Path
 from IPython.terminal.ipapp import TerminalIPythonApp
@@ -8,9 +7,9 @@
 from traitlets import Undefined
 from collections import defaultdict
 
-here = abspath(dirname(__file__))
-options = join(here, 'source', 'config', 'options')
-generated = join(options, 'config-generated.txt')
+here = (Path(__file__)).parent
+options = here / "source" / "config" / "options"
+generated = options / "config-generated.txt"
 
 import textwrap
 indent = lambda text,n: textwrap.indent(text,n*' ')
@@ -102,11 +101,11 @@ def reverse_aliases(app):
 
 def write_doc(name, title, app, preamble=None):
     trait_aliases = reverse_aliases(app)
-    filename = join(options, name+'.rst')
-    with open(filename, 'w') as f:
-        f.write(title + '\n')
-        f.write(('=' * len(title)) + '\n')
-        f.write('\n')
+    filename = options / name + ".rst"
+    with open(filename, "w") as f:
+        f.write(title + "\n")
+        f.write(("=" * len(title)) + "\n")
+        f.write("\n")
         if preamble is not None:
             f.write(preamble + '\n\n')
         #f.write(app.document_config_options())

From 74844174fdd256c523dd003ddb7c95eff5026246 Mon Sep 17 00:00:00 2001
From: Samreen Zarroug <samreen.zarroug@hpe.com>
Date: Thu, 22 Oct 2020 16:06:18 -0400
Subject: [PATCH 0340/1407] use pathlib.Path in demo.py

---
 IPython/lib/demo.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IPython/lib/demo.py b/IPython/lib/demo.py
index 0b19c413c37..bfef82fc7dc 100644
--- a/IPython/lib/demo.py
+++ b/IPython/lib/demo.py
@@ -184,6 +184,7 @@
 import shlex
 import sys
 import pygments
+from pathlib import Path
 
 from IPython.utils.text import marquee
 from IPython.utils import openpy
@@ -403,8 +404,8 @@ def edit(self,index=None):
             index -= 1
 
         filename = self.shell.mktempfile(self.src_blocks[index])
-        self.shell.hooks.editor(filename,1)
-        with open(filename, 'r') as f:
+        self.shell.hooks.editor(filename, 1)
+        with open(Path(filename), "r") as f:
             new_block = f.read()
         # update the source and colored block
         self.src_blocks[index] = new_block

From d69fd70311a25704e803e51d0506c4927f63b554 Mon Sep 17 00:00:00 2001
From: Samreen Zarroug <samreen.zarroug@hpe.com>
Date: Thu, 22 Oct 2020 16:03:54 -0400
Subject: [PATCH 0341/1407] use pathlib.Path in io.py

---
 IPython/utils/io.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/utils/io.py b/IPython/utils/io.py
index fab9bae7971..7dc89868fb9 100644
--- a/IPython/utils/io.py
+++ b/IPython/utils/io.py
@@ -13,6 +13,7 @@
 import sys
 import tempfile
 import warnings
+from pathlib import Path
 from warnings import warn
 
 from IPython.utils.decorators import undoc
@@ -205,7 +206,7 @@ def temp_pyfile(src, ext='.py'):
       It is the caller's responsibility to close the open file and unlink it.
     """
     fname = tempfile.mkstemp(ext)[1]
-    with open(fname,'w') as f:
+    with open(Path(fname), "w") as f:
         f.write(src)
         f.flush()
     return fname

From 80119a23c961294e239cb8d9c1bfcebb7f05b11c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 22 Oct 2020 21:02:07 -0700
Subject: [PATCH 0342/1407] run mypy on github action

Travis is getting too slow to start, so migrating away some small steps to regain some CI time.
---
 .github/workflows/mypy.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/workflows/mypy.yml

diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
new file mode 100644
index 00000000000..1dc6d84acc9
--- /dev/null
+++ b/.github/workflows/mypy.yml
@@ -0,0 +1,30 @@
+name: Run MyPy
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.8]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install mypy
+    - name: Lint with mypy
+      run: |
+        mypy IPython/terminal/ptutils.py
+        mypy IPython/core/c*.py

From cf60f9de61a730aae6ab780c3def1aceb39342e2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 23 Oct 2020 08:56:18 -0700
Subject: [PATCH 0343/1407] try to fix test/building-docs

---
 docs/autogen_shortcuts.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/autogen_shortcuts.py b/docs/autogen_shortcuts.py
index 2cd901970b9..38af9b1d103 100755
--- a/docs/autogen_shortcuts.py
+++ b/docs/autogen_shortcuts.py
@@ -41,12 +41,14 @@ def multi_filter_str(flt):
 log_filters = {'_AndList': 'And', '_OrList': 'Or'}
 log_invert =  {'_Invert'}
 
-class _DummyTerminal(object):
+class _DummyTerminal:
     """Used as a buffer to get prompt_toolkit bindings
     """
     handle_return = None
     input_transformer_manager = None
     display_completions = None
+    editing_mode = "emacs"
+
 
 ipy_bindings = create_ipython_shortcuts(_DummyTerminal()).bindings
 

From 9a504bd26433ab5d39e1611877362728b360ec03 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 23 Oct 2020 09:25:41 -0700
Subject: [PATCH 0344/1407] try to fix str issue with nv onwindows

---
 IPython/testing/iptestcontroller.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py
index da6313a1853..e50ab862ff3 100644
--- a/IPython/testing/iptestcontroller.py
+++ b/IPython/testing/iptestcontroller.py
@@ -28,6 +28,7 @@
 from IPython.utils.sysinfo import get_sys_info
 from IPython.utils.tempdir import TemporaryDirectory
 from pathlib import Path
+from typing import Dict
 
 class TestController:
     """Run tests in a subprocess
@@ -37,7 +38,7 @@ class TestController:
     #: list, command line arguments to be executed
     cmd = None
     #: dict, extra environment variables to set for the subprocess
-    env = None
+    env: Dict[str, str] = {}
     #: list, TemporaryDirectory instances to clear up when the process finishes
     dirs = None
     #: subprocess.Popen instance
@@ -69,6 +70,8 @@ def launch(self, buffer_output=False, capture_output=False):
         c.start()
         stdout = c.writefd if capture_output else None
         stderr = subprocess.STDOUT if capture_output else None
+        for k, v in env.items():
+            assert isinstance(v, str), f"env[{repr(k)}] is not a str: {v}"
         self.process = subprocess.Popen(self.cmd, stdout=stdout,
                 stderr=stderr, env=env)
 
@@ -149,7 +152,7 @@ def setup(self):
             PATH = noaccess / PATH
         else:
             PATH = noaccess
-        self.env['PATH'] = PATH
+        self.env["PATH"] = str(PATH)
 
         # From options:
         if self.options.xunit:
@@ -190,11 +193,11 @@ def add_coverage(self):
             data_file=Path(f".coverage.{self.section}").absolute(),
             source="\n  ".join(sources),
         )
-        config_file = Path(self.workingdir.name) / ".coveragerc"
+        config_file: Path = Path(self.workingdir.name) / ".coveragerc"
         config_file.touch(exist_ok=True)
         config_file.write_text(coverage_rc)
 
-        self.env["COVERAGE_PROCESS_START"] = config_file.resolve()
+        self.env["COVERAGE_PROCESS_START"] = str(config_file.resolve())
         self.pycmd = "import coverage; coverage.process_startup(); " + self.pycmd
 
     def launch(self, buffer_output=False):

From 0c0de25ccc937c88fc373e5f05171ec43b9372fd Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 23 Oct 2020 19:17:18 -0700
Subject: [PATCH 0345/1407] Reduce travis testing.

Travis seem to now have a lower limit on open-source builds; so reduce
dependency on Travis to get faster turnaround.

Will also limit the number of failures to 10, so that if there are many
test failing we don't spend too many cycles.
---
 .travis.yml | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7deb84d66d1..4af10f27cad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ addons:
       - graphviz
 
 python:
-    - 3.6
+    - 3.8
 
 env:
   global:
@@ -41,13 +41,8 @@ install:
     fi
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
   - pip install trio curio --upgrade --upgrade-strategy eager
-  - pip install 'pytest<6' 'matplotlib !=3.2.0' mypy
+  - pip install 'pytest<6' 'matplotlib !=3.2.0'
   - pip install codecov check-manifest pytest-cov --upgrade
-  - pip install mypy
-  - |
-    if [[ "$MASTER_DEPENDENCIES" == "True" ]]; then
-       pip install git+https://github.com/ipython/traitlets#egg=traitlets --force
-    fi
 
 
 script:
@@ -61,12 +56,10 @@ script:
     if [[ "$TRAVIS_PYTHON_VERSION" == "3.8" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       cd /tmp && iptest --coverage xml && cd -
     fi
-  - pytest IPython
-  - mypy IPython/terminal/ptutils.py
-  - mypy IPython/core/c*.py
+  - pytest --maxfail=10 IPython
   # On the latest Python (on Linux) only, make sure that the docs build.
   - |
-    if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+    if [[ "$TRAVIS_PYTHON_VERSION" == "3.8" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       pip install -r docs/requirements.txt
       python tools/fixup_whats_new_pr.py
       make -C docs/ html SPHINXOPTS="-W"
@@ -97,9 +90,6 @@ matrix:
       language: generic
       python: 3.7
       env: TRAVIS_PYTHON_VERSION=3.7
-    - arch: amd64
-      python: "3.8"
-      env: MASTER_DEPENDENCIES=True
   allow_failures:
     - python: nightly
 

From 9e5bae672da3c024e07b40ffbd122095a8a7c858 Mon Sep 17 00:00:00 2001
From: rushabh-v <vasanirushabh24@gmail.com>
Date: Sat, 24 Oct 2020 15:08:12 +0530
Subject: [PATCH 0346/1407] fix error of Path / str

---
 docs/autogen_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/autogen_config.py b/docs/autogen_config.py
index e037069c613..98d13d3b0cb 100755
--- a/docs/autogen_config.py
+++ b/docs/autogen_config.py
@@ -101,7 +101,7 @@ def reverse_aliases(app):
 
 def write_doc(name, title, app, preamble=None):
     trait_aliases = reverse_aliases(app)
-    filename = options / name + ".rst"
+    filename = options / (name + ".rst")
     with open(filename, "w") as f:
         f.write(title + "\n")
         f.write(("=" * len(title)) + "\n")

From ccc71c661de3338023c50a135c2bfbf4f9fdfe9a Mon Sep 17 00:00:00 2001
From: BaoGiang HoangVu <hoangvubaogiang@gmail.com>
Date: Sat, 24 Oct 2020 18:35:42 +0700
Subject: [PATCH 0347/1407] `async_safe` cleanup

---
 IPython/core/tests/test_async_helpers.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/IPython/core/tests/test_async_helpers.py b/IPython/core/tests/test_async_helpers.py
index 6722fed73fb..3498b06be5f 100644
--- a/IPython/core/tests/test_async_helpers.py
+++ b/IPython/core/tests/test_async_helpers.py
@@ -205,10 +205,6 @@ def nest_case(context, case):
         # yield is allowed in async functions, starting in Python 3.6,
         # and yield from is not allowed in any version
         vals = ('return', 'yield', 'yield from (_ for _ in range(3))')
-        async_safe = (True,
-                        True,
-                        False)
-        vals = tuple(zip(vals, async_safe))
 
         success_tests = zip(self._get_top_level_cases(), repeat(False))
         failure_tests = zip(self._get_ry_syntax_errors(), repeat(True))
@@ -219,14 +215,12 @@ def nest_case(context, case):
             for (test_name, test_case), should_fail in tests:
                 nested_case = nest_case(context, test_case)
 
-                for val, async_safe in vals:
-                    val_should_fail = should_fail
-
+                for val in vals:
                     test_id = (context_name, test_name, val)
                     cell = nested_case.format(val=val)
 
                     with self.subTest(test_id):
-                        if val_should_fail:
+                        if should_fail:
                             msg = ("SyntaxError not raised for %s" %
                                     str(test_id))
                             with self.assertRaises(SyntaxError, msg=msg):

From 781f97f044dca67cc0ef5c4fad9ec463caf4192f Mon Sep 17 00:00:00 2001
From: BaoGiang HoangVu <hoangvubaogiang@gmail.com>
Date: Sun, 25 Oct 2020 08:12:50 +0700
Subject: [PATCH 0348/1407] use `pathlib.Path`, remove unused aliases

---
 setup.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index eb42e5fa072..a353555068a 100755
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,7 @@
 
 import os
 import sys
+from pathlib import Path
 
 # **Python version check**
 #
@@ -61,7 +62,8 @@
 
 # BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
 # update it when the contents of directories change.
-if os.path.exists('MANIFEST'): os.remove('MANIFEST')
+if Path("MANIFEST").exists():
+    Path("MANIFEST").unlink()
 
 from distutils.core import setup
 
@@ -83,9 +85,6 @@
     unsymlink,
 )
 
-isfile = os.path.isfile
-pjoin = os.path.join
-
 #-------------------------------------------------------------------------------
 # Handle OS specific things
 #-------------------------------------------------------------------------------

From abf462a01748c7e2f70bee9e06a68f73113688ee Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 26 Oct 2020 07:50:44 -0700
Subject: [PATCH 0349/1407] reformat with darker

---
 IPython/core/debugger.py | 48 +++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 398354c5c8f..ad7c9cf7caf 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -605,48 +605,60 @@ def do_pdef(self, arg):
         """Print the call signature for any callable object.
 
         The debugger interface to %pdef"""
-        namespaces = [('Locals', self.curframe_locals),
-                      ('Globals', self.curframe.f_globals)]
-        self.shell.find_line_magic('pdef')(arg, namespaces=namespaces)
+        namespaces = [
+            ("Locals", self.curframe_locals),
+            ("Globals", self.curframe.f_globals),
+        ]
+        self.shell.find_line_magic("pdef")(arg, namespaces=namespaces)
 
     def do_pdoc(self, arg):
         """Print the docstring for an object.
 
         The debugger interface to %pdoc."""
-        namespaces = [('Locals', self.curframe_locals),
-                      ('Globals', self.curframe.f_globals)]
-        self.shell.find_line_magic('pdoc')(arg, namespaces=namespaces)
+        namespaces = [
+            ("Locals", self.curframe_locals),
+            ("Globals", self.curframe.f_globals),
+        ]
+        self.shell.find_line_magic("pdoc")(arg, namespaces=namespaces)
 
     def do_pfile(self, arg):
         """Print (or run through pager) the file where an object is defined.
 
         The debugger interface to %pfile.
         """
-        namespaces = [('Locals', self.curframe_locals),
-                      ('Globals', self.curframe.f_globals)]
-        self.shell.find_line_magic('pfile')(arg, namespaces=namespaces)
+        namespaces = [
+            ("Locals", self.curframe_locals),
+            ("Globals", self.curframe.f_globals),
+        ]
+        self.shell.find_line_magic("pfile")(arg, namespaces=namespaces)
 
     def do_pinfo(self, arg):
         """Provide detailed information about an object.
 
         The debugger interface to %pinfo, i.e., obj?."""
-        namespaces = [('Locals', self.curframe_locals),
-                      ('Globals', self.curframe.f_globals)]
-        self.shell.find_line_magic('pinfo')(arg, namespaces=namespaces)
+        namespaces = [
+            ("Locals", self.curframe_locals),
+            ("Globals", self.curframe.f_globals),
+        ]
+        self.shell.find_line_magic("pinfo")(arg, namespaces=namespaces)
 
     def do_pinfo2(self, arg):
         """Provide extra detailed information about an object.
 
         The debugger interface to %pinfo2, i.e., obj??."""
-        namespaces = [('Locals', self.curframe_locals),
-                      ('Globals', self.curframe.f_globals)]
-        self.shell.find_line_magic('pinfo2')(arg, namespaces=namespaces)
+        namespaces = [
+            ("Locals", self.curframe_locals),
+            ("Globals", self.curframe.f_globals),
+        ]
+        self.shell.find_line_magic("pinfo2")(arg, namespaces=namespaces)
 
     def do_psource(self, arg):
         """Print (or run through pager) the source code for an object."""
-        namespaces = [('Locals', self.curframe_locals),
-                      ('Globals', self.curframe.f_globals)]
-        self.shell.find_line_magic('psource')(arg, namespaces=namespaces)
+        namespaces = [
+            ("Locals", self.curframe_locals),
+            ("Globals", self.curframe.f_globals),
+        ]
+        self.shell.find_line_magic("psource")(arg, namespaces=namespaces)
 
     def do_where(self, arg):
         """w(here)

From be2a3ec1012a5273f90ecceab4fc72d3439e77cb Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 26 Oct 2020 08:30:01 -0700
Subject: [PATCH 0350/1407] reformat with darker

---
 docs/autogen_shortcuts.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/autogen_shortcuts.py b/docs/autogen_shortcuts.py
index 27eb3351da7..8782876705a 100755
--- a/docs/autogen_shortcuts.py
+++ b/docs/autogen_shortcuts.py
@@ -76,14 +76,17 @@ class _DummyTerminal(object):
 
 if __name__ == '__main__':
     here = Path(__file__).parent
-    dest = here / 'source' / 'config' / 'shortcuts'
+    dest = here / "source" / "config" / "shortcuts"
 
     def sort_key(item):
         k, v = item
         shortcut, flt = k
         return (str(shortcut), str(flt))
 
-    for filters, output_filename in [(single_filter, 'single_filtered'), (multi_filter, 'multi_filtered')]:
-        with (dest / '{}.csv'.format(output_filename)).open('w') as csv:
+    for filters, output_filename in [
+        (single_filter, "single_filtered"),
+        (multi_filter, "multi_filtered"),
+    ]:
+        with (dest / "{}.csv".format(output_filename)).open("w") as csv:
             for (shortcut, flt), v in sorted(filters.items(), key=sort_key):
-                csv.write(':kbd:`{}`\t{}\t{}\n'.format(shortcut, flt, v))
+                csv.write(":kbd:`{}`\t{}\t{}\n".format(shortcut, flt, v))

From 61376395f9a68aba38934df8335818b3c2fcec4f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 22 Oct 2020 16:13:35 -0700
Subject: [PATCH 0351/1407] Remove yield test that are not support by pytest
 anymore

And remove comparison of str/unicode as it is not relevant anymore as
both are the same.

We can now unpin pytest as well, which we should make sure is in release
notes and in the conda-forge recipe

As nose does not understand `@parametrize`, and the nose `@skip`
decorator messes with that as well, we mark tests with parametrize as
not-tests for iptests
---
 .travis.yml                            |  2 +-
 IPython/lib/latextools.py              |  2 +-
 IPython/lib/tests/test_latextools.py   | 48 +++++++++--------
 IPython/lib/tests/test_pretty.py       | 38 ++++++++++----
 IPython/testing/decorators.py          | 11 ++++
 IPython/utils/tests/test_capture.py    | 71 +++++++++++++++-----------
 IPython/utils/tests/test_pycolorize.py | 50 +++++++++---------
 IPython/utils/tests/test_tokenutil.py  | 18 +++++--
 appveyor.yml                           |  2 +-
 9 files changed, 150 insertions(+), 92 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4af10f27cad..a207e9ee9f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,7 @@ install:
     fi
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
   - pip install trio curio --upgrade --upgrade-strategy eager
-  - pip install 'pytest<6' 'matplotlib !=3.2.0'
+  - pip install 'pytest' 'matplotlib !=3.2.0'
   - pip install codecov check-manifest pytest-cov --upgrade
 
 
diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py
index 2dfec65cc40..920b04596ff 100644
--- a/IPython/lib/latextools.py
+++ b/IPython/lib/latextools.py
@@ -138,7 +138,7 @@ def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):
     except FindCmdError:
         return None
     try:
-        workdir = PurePath(tempfile.mkdtemp())
+        workdir = Path(tempfile.mkdtemp())
         tmpfile = workdir.joinpath("tmp.tex")
         dvifile = workdir.joinpath("tmp.dvi")
         outfile = workdir.joinpath("tmp.png")
diff --git a/IPython/lib/tests/test_latextools.py b/IPython/lib/tests/test_latextools.py
index 419db421aa9..75d1468e832 100644
--- a/IPython/lib/tests/test_latextools.py
+++ b/IPython/lib/tests/test_latextools.py
@@ -9,11 +9,16 @@
 import pytest
 
 from IPython.lib import latextools
-from IPython.testing.decorators import onlyif_cmds_exist, skipif_not_matplotlib
+from IPython.testing.decorators import (
+    onlyif_cmds_exist,
+    skipif_not_matplotlib,
+    skip_iptest_but_not_pytest,
+)
 from IPython.utils.process import FindCmdError
 
 
 @pytest.mark.parametrize('command', ['latex', 'dvipng'])
+@skip_iptest_but_not_pytest
 def test_check_latex_to_png_dvipng_fails_when_no_cmd(command):
     def mock_find_cmd(arg):
         if arg == command:
@@ -23,8 +28,15 @@ def mock_find_cmd(arg):
         assert latextools.latex_to_png_dvipng("whatever", True) == None
 
 
-@onlyif_cmds_exist('latex', 'dvipng')
-def test_latex_to_png_dvipng_runs():
+@contextmanager
+def no_op(*args, **kwargs):
+    yield
+
+
+@onlyif_cmds_exist("latex", "dvipng")
+@pytest.mark.parametrize("s, wrap", [(u"$$x^2$$", False), (u"x^2", True)])
+@skip_iptest_but_not_pytest
+def test_latex_to_png_dvipng_runs(s, wrap):
     """
     Test that latex_to_png_dvipng just runs without error.
     """
@@ -32,36 +44,32 @@ def mock_kpsewhich(filename):
         assert filename == "breqn.sty"
         return None
 
-    for (s, wrap) in [(u"$$x^2$$", False), (u"x^2", True)]:
-        yield (latextools.latex_to_png_dvipng, s, wrap)
+    latextools.latex_to_png_dvipng(s, wrap)
 
-        with patch.object(latextools, "kpsewhich", mock_kpsewhich):
-            yield (latextools.latex_to_png_dvipng, s, wrap)
+    with patch_latextool(mock_kpsewhich):
+        latextools.latex_to_png_dvipng(s, wrap)
 
 
-@contextmanager
-def no_op(*args, **kwargs):
-    yield
-
 def mock_kpsewhich(filename):
-        assert filename == "breqn.sty"
-        return None
+    assert filename == "breqn.sty"
+    return None
 
 @contextmanager
-def patch_latextool():
-    with patch.object(latextools, "kpsewhich", mock_kpsewhich):
+def patch_latextool(mock=mock_kpsewhich):
+    with patch.object(latextools, "kpsewhich", mock):
         yield
 
 @pytest.mark.parametrize('context', [no_op, patch_latextool])
 @pytest.mark.parametrize('s_wrap', [("$x^2$", False), ("x^2", True)])
+@skip_iptest_but_not_pytest
 def test_latex_to_png_mpl_runs(s_wrap, context):
     """
     Test that latex_to_png_mpl just runs without error.
     """
     try:
-        import matplotbli
+        import matplotlib
     except ImportError:
-        pytest.skip("This needs matplotlib to be availlable")
+        pytest.skip("This needs matplotlib to be available")
         return
     s, wrap = s_wrap
     with context():
@@ -81,7 +89,7 @@ def mock_kpsewhich(filename):
         assert False, ("kpsewhich should not be called "
                        "(called with {0})".format(filename))
 
-    with patch.object(latextools, "kpsewhich", mock_kpsewhich):
+    with patch_latextool(mock_kpsewhich):
         assert '\n'.join(latextools.genelatex("body text", False)) == r'''\documentclass{article}
 \usepackage{amsmath}
 \usepackage{amsthm}
@@ -101,7 +109,7 @@ def mock_kpsewhich(filename):
         assert filename == "breqn.sty"
         return "path/to/breqn.sty"
 
-    with patch.object(latextools, "kpsewhich", mock_kpsewhich):
+    with patch_latextool(mock_kpsewhich):
         assert '\n'.join(latextools.genelatex("x^2", True)) == r'''\documentclass{article}
 \usepackage{amsmath}
 \usepackage{amsthm}
@@ -124,7 +132,7 @@ def mock_kpsewhich(filename):
         assert filename == "breqn.sty"
         return None
 
-    with patch.object(latextools, "kpsewhich", mock_kpsewhich):
+    with patch_latextool(mock_kpsewhich):
         assert '\n'.join(latextools.genelatex("x^2", True)) == r'''\documentclass{article}
 \usepackage{amsmath}
 \usepackage{amsthm}
diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py
index ba4c3296694..36cc5d2ae48 100644
--- a/IPython/lib/tests/test_pretty.py
+++ b/IPython/lib/tests/test_pretty.py
@@ -12,9 +12,10 @@
 import unittest
 
 import nose.tools as nt
+import pytest
 
 from IPython.lib import pretty
-from IPython.testing.decorators import skip_without
+from IPython.testing.decorators import skip_without, skip_iptest_but_not_pytest
 
 from io import StringIO
 
@@ -105,17 +106,36 @@ def test_callability_checking():
     nt.assert_equal(gotoutput, expectedoutput)
 
 
-def test_sets():
+@pytest.mark.parametrize(
+    "obj,expected_output",
+    zip(
+        [
+            set(),
+            frozenset(),
+            set([1]),
+            frozenset([1]),
+            set([1, 2]),
+            frozenset([1, 2]),
+            set([-1, -2, -3]),
+        ],
+        [
+            "set()",
+            "frozenset()",
+            "{1}",
+            "frozenset({1})",
+            "{1, 2}",
+            "frozenset({1, 2})",
+            "{-3, -2, -1}",
+        ],
+    ),
+)
+@skip_iptest_but_not_pytest
+def test_sets(obj, expected_output):
     """
     Test that set and frozenset use Python 3 formatting.
     """
-    objects = [set(), frozenset(), set([1]), frozenset([1]), set([1, 2]),
-        frozenset([1, 2]), set([-1, -2, -3])]
-    expected = ['set()', 'frozenset()', '{1}', 'frozenset({1})', '{1, 2}',
-        'frozenset({1, 2})', '{-3, -2, -1}']
-    for obj, expected_output in zip(objects, expected):
-        got_output = pretty.pretty(obj)
-        yield nt.assert_equal, got_output, expected_output
+    got_output = pretty.pretty(obj)
+    nt.assert_equal(got_output, expected_output)
 
 
 @skip_without('xxlimited')
diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
index 4539a72a8ca..5c88ff5a416 100644
--- a/IPython/testing/decorators.py
+++ b/IPython/testing/decorators.py
@@ -154,6 +154,17 @@ def decor(f):
     return decor
 
 
+def skip_iptest_but_not_pytest(f):
+    """
+    Warnign this will make the test invisible to iptest.
+    """
+    import os
+
+    if os.environ.get("IPTEST_WORKING_DIR", None) is not None:
+        f.__test__ = False
+    return f
+
+
 # Inspired by numpy's skipif, but uses the full apply_wrapper utility to
 # preserve function metadata better and allows the skip condition to be a
 # callable.
diff --git a/IPython/utils/tests/test_capture.py b/IPython/utils/tests/test_capture.py
index 4794a80bbf1..60b63d3b645 100644
--- a/IPython/utils/tests/test_capture.py
+++ b/IPython/utils/tests/test_capture.py
@@ -16,6 +16,9 @@
 import sys
 
 import nose.tools as nt
+import pytest
+
+from IPython.testing.decorators import skip_iptest_but_not_pytest
 
 from IPython.utils import capture
 
@@ -66,38 +69,45 @@
 #-----------------------------------------------------------------------------
 # Test Functions
 #-----------------------------------------------------------------------------
-
-def test_rich_output_empty():
+@pytest.mark.parametrize("method_mime", _mime_map.items())
+@skip_iptest_but_not_pytest
+def test_rich_output_empty(method_mime):
     """RichOutput with no args"""
     rich = capture.RichOutput()
-    for method, mime in _mime_map.items():
-        yield nt.assert_equal, getattr(rich, method)(), None
+    method, mime = method_mime
+    nt.assert_equal(getattr(rich, method)(), None)
     
 def test_rich_output():
     """test RichOutput basics"""
     data = basic_data
     metadata = basic_metadata
     rich = capture.RichOutput(data=data, metadata=metadata)
-    yield nt.assert_equal, rich._repr_html_(), data['text/html']
-    yield nt.assert_equal, rich._repr_png_(), (data['image/png'], metadata['image/png'])
-    yield nt.assert_equal, rich._repr_latex_(), None
-    yield nt.assert_equal, rich._repr_javascript_(), None
-    yield nt.assert_equal, rich._repr_svg_(), None
+    nt.assert_equal(rich._repr_html_(), data["text/html"])
+    nt.assert_equal(rich._repr_png_(), (data["image/png"], metadata["image/png"]))
+    nt.assert_equal(rich._repr_latex_(), None)
+    nt.assert_equal(rich._repr_javascript_(), None)
+    nt.assert_equal(rich._repr_svg_(), None)
 
-def test_rich_output_no_metadata():
+
+@skip_iptest_but_not_pytest
+@pytest.mark.parametrize("method_mime", _mime_map.items())
+def test_rich_output_no_metadata(method_mime):
     """test RichOutput with no metadata"""
     data = full_data
     rich = capture.RichOutput(data=data)
-    for method, mime in _mime_map.items():
-        yield nt.assert_equal, getattr(rich, method)(), data[mime]
+    method, mime = method_mime
+    nt.assert_equal(getattr(rich, method)(), data[mime])
+
 
-def test_rich_output_metadata():
+@skip_iptest_but_not_pytest
+@pytest.mark.parametrize("method_mime", _mime_map.items())
+def test_rich_output_metadata(method_mime):
     """test RichOutput with metadata"""
     data = full_data
     metadata = full_metadata
     rich = capture.RichOutput(data=data, metadata=metadata)
-    for method, mime in _mime_map.items():
-        yield nt.assert_equal, getattr(rich, method)(), (data[mime], metadata[mime])
+    method, mime = method_mime
+    nt.assert_equal(getattr(rich, method)(), (data[mime], metadata[mime]))
 
 def test_rich_output_display():
     """test RichOutput.display
@@ -109,10 +119,10 @@ def test_rich_output_display():
     rich = capture.RichOutput(data=data)
     with capture.capture_output() as cap:
         rich.display()
-    yield nt.assert_equal, len(cap.outputs), 1
+    nt.assert_equal(len(cap.outputs), 1)
     rich2 = cap.outputs[0]
-    yield nt.assert_equal, rich2.data, rich.data
-    yield nt.assert_equal, rich2.metadata, rich.metadata
+    nt.assert_equal(rich2.data, rich.data)
+    nt.assert_equal(rich2.metadata, rich.metadata)
 
 def test_capture_output():
     """capture_output works"""
@@ -121,8 +131,9 @@ def test_capture_output():
         print(hello_stdout, end="")
         print(hello_stderr, end="", file=sys.stderr)
         rich.display()
-    yield nt.assert_equal, hello_stdout, cap.stdout
-    yield nt.assert_equal, hello_stderr, cap.stderr
+    nt.assert_equal(hello_stdout, cap.stdout)
+    nt.assert_equal(hello_stderr, cap.stderr)
+
 
 def test_capture_output_no_stdout():
     """test capture_output(stdout=False)"""
@@ -131,9 +142,10 @@ def test_capture_output_no_stdout():
         print(hello_stdout, end="")
         print(hello_stderr, end="", file=sys.stderr)
         rich.display()
-    yield nt.assert_equal, "", cap.stdout
-    yield nt.assert_equal, hello_stderr, cap.stderr
-    yield nt.assert_equal, len(cap.outputs), 1
+    nt.assert_equal("", cap.stdout)
+    nt.assert_equal(hello_stderr, cap.stderr)
+    nt.assert_equal(len(cap.outputs), 1)
+
 
 def test_capture_output_no_stderr():
     """test capture_output(stderr=False)"""
@@ -143,9 +155,10 @@ def test_capture_output_no_stderr():
         print(hello_stdout, end="")
         print(hello_stderr, end="", file=sys.stderr)
         rich.display()
-    yield nt.assert_equal, hello_stdout, cap.stdout
-    yield nt.assert_equal, "", cap.stderr
-    yield nt.assert_equal, len(cap.outputs), 1
+    nt.assert_equal(hello_stdout, cap.stdout)
+    nt.assert_equal("", cap.stderr)
+    nt.assert_equal(len(cap.outputs), 1)
+
 
 def test_capture_output_no_display():
     """test capture_output(display=False)"""
@@ -154,6 +167,6 @@ def test_capture_output_no_display():
         print(hello_stdout, end="")
         print(hello_stderr, end="", file=sys.stderr)
         rich.display()
-    yield nt.assert_equal, hello_stdout, cap.stdout
-    yield nt.assert_equal, hello_stderr, cap.stderr
-    yield nt.assert_equal, cap.outputs, []
\ No newline at end of file
+    nt.assert_equal(hello_stdout, cap.stdout)
+    nt.assert_equal(hello_stderr, cap.stderr)
+    nt.assert_equal(cap.outputs, [])
diff --git a/IPython/utils/tests/test_pycolorize.py b/IPython/utils/tests/test_pycolorize.py
index 57d4bfddec0..c3502f32a49 100644
--- a/IPython/utils/tests/test_pycolorize.py
+++ b/IPython/utils/tests/test_pycolorize.py
@@ -20,15 +20,23 @@
 # third party
 import nose.tools as nt
 
+from IPython.testing.decorators import skip_iptest_but_not_pytest
+
 # our own
 from IPython.utils.PyColorize import Parser
 import io
+import pytest
+
+
+@pytest.fixture(scope="module", params=("Linux", "NoColor", "LightBG", "Neutral"))
+def style(request):
+    yield request.param
 
 #-----------------------------------------------------------------------------
 # Test functions
 #-----------------------------------------------------------------------------
 
-sample = u"""
+sample = """
 def function(arg, *args, kwarg=True, **kwargs):
     '''
     this is docs
@@ -47,32 +55,22 @@ def __init__(self):
         super(Bar, self).__init__(1**2, 3^4, 5 or 6)
 """
 
-def test_loop_colors():
-
-    for style in ('Linux', 'NoColor','LightBG', 'Neutral'):
-
-        def test_unicode_colorize():
-            p = Parser(style=style)
-            f1 = p.format('1/0', 'str')
-            f2 = p.format(u'1/0', 'str')
-            nt.assert_equal(f1, f2)
 
-        def test_parse_sample():
-            """and test writing to a buffer"""
-            buf = io.StringIO()
-            p = Parser(style=style)
-            p.format(sample, buf)
-            buf.seek(0)
-            f1 = buf.read()
+@skip_iptest_but_not_pytest
+def test_parse_sample(style):
+    """and test writing to a buffer"""
+    buf = io.StringIO()
+    p = Parser(style=style)
+    p.format(sample, buf)
+    buf.seek(0)
+    f1 = buf.read()
 
-            nt.assert_not_in('ERROR', f1)
+    nt.assert_not_in("ERROR", f1)
 
-        def test_parse_error():
-            p = Parser(style=style)
-            f1 = p.format(')', 'str')
-            if style != 'NoColor':
-                nt.assert_in('ERROR', f1)
 
-        yield test_unicode_colorize
-        yield test_parse_sample
-        yield test_parse_error
+@skip_iptest_but_not_pytest
+def test_parse_error(style):
+    p = Parser(style=style)
+    f1 = p.format(")", "str")
+    if style != "NoColor":
+        nt.assert_in("ERROR", f1)
diff --git a/IPython/utils/tests/test_tokenutil.py b/IPython/utils/tests/test_tokenutil.py
index 0e69d5f6cb9..46b6631da9c 100644
--- a/IPython/utils/tests/test_tokenutil.py
+++ b/IPython/utils/tests/test_tokenutil.py
@@ -3,6 +3,8 @@
 # Distributed under the terms of the Modified BSD License.
 
 import nose.tools as nt
+import pytest
+from IPython.testing.decorators import skip_iptest_but_not_pytest
 
 from IPython.utils.tokenutil import token_at_cursor, line_at_cursor
 
@@ -120,14 +122,20 @@ def test_line_at_cursor():
     nt.assert_equal(line, "pri")
     nt.assert_equal(offset, 4)
 
-def test_multiline_statement():
+
+@pytest.mark.parametrize(
+    "c, token",
+    zip(
+        list(range(16, 22)) + list(range(22, 28)),
+        ["int"] * (22 - 16) + ["map"] * (28 - 22),
+    ),
+)
+@skip_iptest_but_not_pytest
+def test_multiline_statement(c, token):
     cell = """a = (1,
     3)
 
 int()
 map()
 """
-    for c in range(16, 22):
-        yield lambda cell, c: expect_token("int", cell, c), cell, c
-    for c in range(22, 28):
-        yield lambda cell, c: expect_token("map", cell, c), cell, c
+    expect_token(token, cell, c)
diff --git a/appveyor.yml b/appveyor.yml
index d20effdf815..fb5e59500a4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,7 +23,7 @@ init:
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "%CMD_IN_ENV%  python -m pip install --upgrade setuptools pip"
-  - "%CMD_IN_ENV%  pip install nose coverage"
+  - "%CMD_IN_ENV%  pip install nose coverage pytest"
   - "%CMD_IN_ENV%  pip install .[test]"
   - "%CMD_IN_ENV%  mkdir results"
   - "%CMD_IN_ENV%  cd results"

From ba8924bfbcbe147897999aab7bc9b842a771bdc0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 23 Oct 2020 17:08:55 -0700
Subject: [PATCH 0352/1407] reorder decorators

---
 IPython/lib/tests/test_latextools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/lib/tests/test_latextools.py b/IPython/lib/tests/test_latextools.py
index 75d1468e832..794688c103f 100644
--- a/IPython/lib/tests/test_latextools.py
+++ b/IPython/lib/tests/test_latextools.py
@@ -33,9 +33,9 @@ def no_op(*args, **kwargs):
     yield
 
 
+@skip_iptest_but_not_pytest
 @onlyif_cmds_exist("latex", "dvipng")
 @pytest.mark.parametrize("s, wrap", [(u"$$x^2$$", False), (u"x^2", True)])
-@skip_iptest_but_not_pytest
 def test_latex_to_png_dvipng_runs(s, wrap):
     """
     Test that latex_to_png_dvipng just runs without error.

From 935cd31ceca7b20de5382c68680be5e66f675ed4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 23 Oct 2020 20:48:34 -0700
Subject: [PATCH 0353/1407] make skip also skip with pytest

---
 IPython/testing/decorators.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
index 5c88ff5a416..e31a47b1b88 100644
--- a/IPython/testing/decorators.py
+++ b/IPython/testing/decorators.py
@@ -376,9 +376,14 @@ def onlyif_cmds_exist(*commands):
     Decorator to skip test when at least one of `commands` is not found.
     """
     for cmd in commands:
+        reason = "This test runs only if command '{cmd}' is installed"
         if not shutil.which(cmd):
-            return skip("This test runs only if command '{0}' "
-                        "is installed".format(cmd))
+            if os.environ.get("IPTEST_WORKING_DIR", None) is not None:
+                return skip(reason)
+            else:
+                import pytest
+
+                return pytest.mark.skip(reason=reason)
     return null_deco
 
 def onlyif_any_cmd_exists(*commands):

From a42464a7a6ad670bad85e0b5b609c5ed0bafd5b7 Mon Sep 17 00:00:00 2001
From: rushabh-v <vasanirushabh24@gmail.com>
Date: Tue, 27 Oct 2020 17:58:03 +0530
Subject: [PATCH 0354/1407] use pathlib in testing/plugin/ipdoctest.py

---
 IPython/testing/plugin/ipdoctest.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/IPython/testing/plugin/ipdoctest.py b/IPython/testing/plugin/ipdoctest.py
index 3b8667e72ff..407aeb6f4f4 100644
--- a/IPython/testing/plugin/ipdoctest.py
+++ b/IPython/testing/plugin/ipdoctest.py
@@ -33,6 +33,8 @@
 
 from inspect import getmodule
 
+from pathlib import Path, PurePath
+
 # We are overriding the default doctest runner, so we need to import a few
 # things from doctest directly
 from doctest import (REPORTING_FLAGS, REPORT_ONLY_FIRST_FAILURE,
@@ -687,9 +689,8 @@ def loadTestsFromFile(self, filename):
                 yield t
         else:
             if self.extension and anyp(filename.endswith, self.extension):
-                name = os.path.basename(filename)
-                with open(filename) as dh:
-                    doc = dh.read()
+                name = PurePath(filename).name
+                doc = Path(filename).read_text()
                 test = self.parser.get_doctest(
                     doc, globs={'__file__': filename}, name=name,
                     filename=filename, lineno=0)

From abfaafd712c817ff7d32a46ae555860f0758099e Mon Sep 17 00:00:00 2001
From: Jakub Klus <jakub.klus@innovatrics.com>
Date: Tue, 27 Oct 2020 14:37:04 +0100
Subject: [PATCH 0355/1407] Use pathlib in utils/tempdir.

---
 IPython/utils/tempdir.py            |  5 +++--
 IPython/utils/tests/test_tempdir.py | 17 +++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/IPython/utils/tempdir.py b/IPython/utils/tempdir.py
index 98f6aeb3c6b..bbfffe9c923 100644
--- a/IPython/utils/tempdir.py
+++ b/IPython/utils/tempdir.py
@@ -5,6 +5,7 @@
 """
 
 import os as _os
+from pathlib import Path
 from tempfile import TemporaryDirectory
 
 
@@ -22,7 +23,7 @@ def __init__(self, filename, mode='w+b', bufsize=-1, **kwds):
 
         """
         self._tmpdir = TemporaryDirectory(**kwds)
-        path = _os.path.join(self._tmpdir.name, filename)
+        path = Path(self._tmpdir.name) / filename
         self.file = open(path, mode, bufsize)
 
     def cleanup(self):
@@ -48,7 +49,7 @@ class TemporaryWorkingDirectory(TemporaryDirectory):
             ...
     """
     def __enter__(self):
-        self.old_wd = _os.getcwd()
+        self.old_wd = Path.cwd()
         _os.chdir(self.name)
         return super(TemporaryWorkingDirectory, self).__enter__()
 
diff --git a/IPython/utils/tests/test_tempdir.py b/IPython/utils/tests/test_tempdir.py
index 18e94da34e5..68a3e036a75 100644
--- a/IPython/utils/tests/test_tempdir.py
+++ b/IPython/utils/tests/test_tempdir.py
@@ -5,7 +5,7 @@
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
-import os
+from pathlib import Path
 
 from IPython.utils.tempdir import NamedFileInTemporaryDirectory
 from IPython.utils.tempdir import TemporaryWorkingDirectory
@@ -15,14 +15,15 @@ def test_named_file_in_temporary_directory():
     with NamedFileInTemporaryDirectory('filename') as file:
         name = file.name
         assert not file.closed
-        assert os.path.exists(name)
+        assert Path(name).exists()
         file.write(b'test')
     assert file.closed
-    assert not os.path.exists(name)
+    assert not Path(name).exists()
 
 def test_temporary_working_directory():
-    with TemporaryWorkingDirectory() as dir:
-        assert os.path.exists(dir)
-        assert os.path.realpath(os.curdir) == os.path.realpath(dir)
-    assert not os.path.exists(dir)
-    assert os.path.abspath(os.curdir) != dir
+    with TemporaryWorkingDirectory() as directory:
+        directory_path = Path(directory)
+        assert directory_path.exists()
+        assert Path.cwd() == directory_path.resolve()
+    assert not directory_path.exists()
+    assert Path.cwd() != directory_path.resolve()

From 6550edfc022c314edd9643d53b9aa0d820ab9129 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 27 Oct 2020 10:07:02 -0700
Subject: [PATCH 0356/1407] try local images

---
 .../source/_images/audo_suggest_d_phantom.png | Bin 0 -> 4731 bytes
 .../_images/auto_suggest_d_completions.png    | Bin 0 -> 14362 bytes
 .../_images/auto_suggest_def_completions.png  | Bin 0 -> 17497 bytes
 .../_images/auto_suggest_def_phantom.png      | Bin 0 -> 4947 bytes
 .../_images/auto_suggest_match_parens.png     | Bin 0 -> 6603 bytes
 .../_images/auto_suggest_print_hello.png      | Bin 0 -> 3667 bytes
 .../auto_suggest_print_hello_suggest.png      | Bin 0 -> 4171 bytes
 .../_images/auto_suggest_prompt_no_text.png   | Bin 0 -> 853 bytes
 .../_images/auto_suggest_second_prompt.png    | Bin 0 -> 7602 bytes
 docs/source/whatsnew/pr/auto_suggest.rst      |  36 ++++++------------
 10 files changed, 12 insertions(+), 24 deletions(-)
 create mode 100644 docs/source/_images/audo_suggest_d_phantom.png
 create mode 100644 docs/source/_images/auto_suggest_d_completions.png
 create mode 100644 docs/source/_images/auto_suggest_def_completions.png
 create mode 100644 docs/source/_images/auto_suggest_def_phantom.png
 create mode 100644 docs/source/_images/auto_suggest_match_parens.png
 create mode 100644 docs/source/_images/auto_suggest_print_hello.png
 create mode 100644 docs/source/_images/auto_suggest_print_hello_suggest.png
 create mode 100644 docs/source/_images/auto_suggest_prompt_no_text.png
 create mode 100644 docs/source/_images/auto_suggest_second_prompt.png

diff --git a/docs/source/_images/audo_suggest_d_phantom.png b/docs/source/_images/audo_suggest_d_phantom.png
new file mode 100644
index 0000000000000000000000000000000000000000..14aa013cbc35e97be8faffbc123b1760e43fba71
GIT binary patch
literal 4731
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

literal 0
HcmV?d00001

diff --git a/docs/source/_images/auto_suggest_d_completions.png b/docs/source/_images/auto_suggest_d_completions.png
new file mode 100644
index 0000000000000000000000000000000000000000..332111bd0d8d78a936c23a8d930b03ecd0d65d18
GIT binary patch
literal 14362
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

literal 0
HcmV?d00001

diff --git a/docs/source/_images/auto_suggest_def_completions.png b/docs/source/_images/auto_suggest_def_completions.png
new file mode 100644
index 0000000000000000000000000000000000000000..a37218dc4da8642365d58e7e48a76fdef4cd5771
GIT binary patch
literal 17497
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

literal 0
HcmV?d00001

diff --git a/docs/source/_images/auto_suggest_def_phantom.png b/docs/source/_images/auto_suggest_def_phantom.png
new file mode 100644
index 0000000000000000000000000000000000000000..d63f220e1f754a88cec177c7d52f0a5014a9ab50
GIT binary patch
literal 4947
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

literal 0
HcmV?d00001

diff --git a/docs/source/_images/auto_suggest_match_parens.png b/docs/source/_images/auto_suggest_match_parens.png
new file mode 100644
index 0000000000000000000000000000000000000000..22259a428a9ed381717497ca66c89346b38bd291
GIT binary patch
literal 6603
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

literal 0
HcmV?d00001

diff --git a/docs/source/_images/auto_suggest_print_hello.png b/docs/source/_images/auto_suggest_print_hello.png
new file mode 100644
index 0000000000000000000000000000000000000000..c98cf267ed8801c2ba7f7ce4127f5aa81770f192
GIT binary patch
literal 3667
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

literal 0
HcmV?d00001

diff --git a/docs/source/_images/auto_suggest_print_hello_suggest.png b/docs/source/_images/auto_suggest_print_hello_suggest.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e1a2dd7d1bdb163efdd5aab5d04b1c2018b9518
GIT binary patch
literal 4171
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
PBmfxQG)2ABb;kV%(1Xub

literal 0
HcmV?d00001

diff --git a/docs/source/_images/auto_suggest_prompt_no_text.png b/docs/source/_images/auto_suggest_prompt_no_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..a75ee1f8ea5af69e90e587e77abed563089ad47f
GIT binary patch
literal 853
zcmV-b1FHOqP)<h;3K|Lk000e1NJLTq0046U001Tk1^@s6_W-1#0009VNkl<ZcmeI1
zziSmi5XZm9Kr}=#m?9DU1u6;(CW@6Niip3(LPgX@iy&!2L<k6K6A&yUy;dUl6FV&=
zprY_pv=l2_!T&)S8E==jZ+&;{d2{dGk12-Rw|AM{na|Gb>;?cxr7}LKj3K%xH7YB$
zm@8#W-J?@sRwz3uOogdca1m3wMrIKrv(acsERGVu+yufNPqqlod$*^X$Lbf<ACSfB
z1M?;bUp%=j=<E-kZXRnwP`|=-oM~a+17XU@F6VumvwA?VvMAyE%Z}bB25jkJt_R_9
zg4{`PNSs3@`Yp@@f#WalCCqOp{5nOTGm*@04%?IFsseKugar`Zfbh{6_1XO9zNdlC
zlmO`JNCWfiYQm4>O^CIH={j($f%&RS0NuHSz#Ql$EKK|hF)x_=L3j?reGt}U_fftD
zPzcObAlw4sBnbTd4HLbOK)3?J((Fe5JvM~E?CT+XKhlKx`*gF-K&8_x+h~ijtJ&@B
zKFl#=&|47NRfHF^8yO6fBl+-f1n~7<!q|$=!917U&f>u270Q+724mDE1DX5WbosyS
zkjS*UcMe8l_AkyCCKrpdAe;wbNp?Gn1M`KKQr8)n@3R}3Dl#ole&!9+9ZR5H9GDM0
zXhRA!ZAL0C%t3{zFyqoynmyC%$UDuBgTNK-T@aRenaR!}#Zx0Q$ys^BbdM&J3NyUY
z4UNq4A;Q;#k$gMUTFw4E5%s^@mppFhb)LP$<w~9_+N6aQ@J>E5`6h#p6D$wSzQ^ZB
z+jq^Iv^{6~1yHy4%%dZ%0PXFM`{c`nB<F_0+z7&T5H5O^e3I^jck(dT8i4j@!+*Z?
zU~V(t^S<FubO3};Aawd@(n*-Ey#j4{m;#e(fhwiXrrCKAW{e#37EqS4I89C)d1e-9
z>Hh_m#UXkAt%d1k3ceGT8nfM1q{0+*unUUQ{|--93XV1E>E>FXPf)*WOH8{yX*R|I
zVv$(@{R*=H5Tq8A!c>@k-O$;+L24zdp0?cDcKXEicR8|v!mLn~D@=u1j<i#^?Li|`
fBU2-@a8dsUkOogVgtLLV00000NkvXXu0mjff&7*y

literal 0
HcmV?d00001

diff --git a/docs/source/_images/auto_suggest_second_prompt.png b/docs/source/_images/auto_suggest_second_prompt.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3cd2490884183ec0eac9d8f5439bb0452c0bbe6
GIT binary patch
literal 7602
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

literal 0
HcmV?d00001

diff --git a/docs/source/whatsnew/pr/auto_suggest.rst b/docs/source/whatsnew/pr/auto_suggest.rst
index b7e5a920f00..18c545b1f87 100644
--- a/docs/source/whatsnew/pr/auto_suggest.rst
+++ b/docs/source/whatsnew/pr/auto_suggest.rst
@@ -8,55 +8,55 @@ or right arrow as described below.
 
 1. Start ipython
 
-|image|
+.. image:: ../_images/auto_suggest_prompt_no_text.png
 
 2. Run ``print("hello")``
 
-|image1|
+.. image:: ../_images/auto_suggest_print_hello_suggest.png
 
 3. Press p to see the autosuggestion
 
-|image2|
+.. image:: ../_images/auto_suggest_print_hello_suggest.png
 
 4. Press ctrl f, or ctrl e, or right arrow to accept the suggestion
 
-|image3|
+.. image:: ../_images/auto_suggest_print_hello.png
 
 You can also complete word by word:
 
 1. Run ``def say_hello(): print("hello")``
 
-|image4|
+.. image:: ../_images/auto_suggest_second_prompt.png
 
 2. Press d to see the autosuggestion
 
-|image5|
+.. image:: ../_images/audo_suggest_d_phantom.png
 
 3. Press alt f to accept to accept the first word of the suggestion
 
-|image6|
+.. image:: ../_images/auto_suggest_def_phantom.png
 
 Importantly, this feature does not interfere with tab completion:
 
 1. After running ``def say_hello(): print("hello")``, press d
 
-|image7|
+.. image:: ../_images/audo_suggest_d_phantom.png
 
 2. Press Tab to start tab completion
 
-|image8|
+.. image:: ../_images/auto_suggest_d_completions.png
 
 3A. Press Tab again to select the first option
 
-|image9|
+.. image:: ../_images/auto_suggest_def_completions.png
 
 3B. Press alt f to accept to accept the first word of the suggestion
 
-|image10|
+.. image:: ../_images/auto_suggest_def_phantom.png
 
 3C. Press ctrl f or ctrl e to accept the entire suggestion
 
-|image11|
+.. image:: ../_images/auto_suggest_match_parens.png
 
 To install a version of ipython with autosuggestions enabled, run:
 
@@ -67,15 +67,3 @@ Currently, autosuggestions are only shown in the emacs or vi insert editing mode
 - The ctrl e, ctrl f, and alt f shortcuts work by default in emacs mode.
 - To use these shortcuts in vi insert mode, you will have to create `custom keybindings in your config.py <https://github.com/mskar/setup/commit/2892fcee46f9f80ef7788f0749edc99daccc52f4/>`__.
 
-.. |image| image:: https://user-images.githubusercontent.com/13444106/94700432-76580100-0309-11eb-8798-040d47d1a540.png
-.. |image1| image:: https://user-images.githubusercontent.com/13444106/94700528-91c30c00-0309-11eb-920d-4ef8aa79d79a.png
-.. |image2| image:: https://user-images.githubusercontent.com/13444106/94700681-bf0fba00-0309-11eb-94bd-bbddf4805da2.png
-.. |image3| image:: https://user-images.githubusercontent.com/13444106/94700883-fd0cde00-0309-11eb-9aa8-17270951f021.png
-.. |image4| image:: https://user-images.githubusercontent.com/13444106/94704474-f54f3880-030d-11eb-9d73-fa10ced850be.png
-.. |image5| image:: https://user-images.githubusercontent.com/13444106/94704519-fe400a00-030d-11eb-8b73-3c35ffaf1a9d.png
-.. |image6| image:: https://user-images.githubusercontent.com/13444106/94704602-14e66100-030e-11eb-90fc-d930463f52de.png
-.. |image7| image:: https://user-images.githubusercontent.com/13444106/94704519-fe400a00-030d-11eb-8b73-3c35ffaf1a9d.png
-.. |image8| image:: https://user-images.githubusercontent.com/13444106/94704969-80303300-030e-11eb-8379-6bff94582849.png
-.. |image9| image:: https://user-images.githubusercontent.com/13444106/94705023-90481280-030e-11eb-9cf7-76170d1004b9.png
-.. |image10| image:: https://user-images.githubusercontent.com/13444106/94704602-14e66100-030e-11eb-90fc-d930463f52de.png
-.. |image11| image:: https://user-images.githubusercontent.com/13444106/94705115-ab1a8700-030e-11eb-9dee-da98fccca0a6.png

From 1a700aa2639cce1cbcdfa579410461ebbc247428 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 27 Oct 2020 10:53:21 -0700
Subject: [PATCH 0357/1407] Start working on whatsnew notes for 7.19.

---
 docs/source/whatsnew/version7.rst | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 2aeef66be21..f73728a4648 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,36 @@
  7.x Series
 ============
 
+.. _version 719:
+
+IPython 7.19
+============
+
+IPython 7.19 accumulative two month of works, bug fixes and improvements, there
+was exceptionally no release last month.
+
+  - Fix to restore the ability to specify more than one extension using command
+    line flags when using traitlets 5.0 :ghpull:`12543`
+  - Docs docs formatting that make the install commands work on zsh
+    :ghpull:`12587`
+  - Always display the last frame in tracebacks even if hidden with
+    ``__traceback_hide__`` :ghpull:`12601`
+  - Avoid an issue where a callback can be registered multiple times.
+    :ghpull:`12625`
+  - Avoid an issue in debugger mode where frames changes could be lost.
+    :ghpull:`12627`
+
+  - Never hide the frames that invoke a debugger, even if marked as hidden by
+    ``__traceback_hide__`` :ghpull:`12631`
+  - Fix calling the debugger in a recursive manner :ghpull:`12659`
+
+
+A number of code changes have landed on master and we are getting close to
+enough new features and codebase improvement that a 8.0 start to make sens.
+For downstream packages, please start working on migrating downstream testing
+away from iptest and using pytest, as nose will not work on Python 3.10 and we
+will likely start removing it as a dependency for testing.
+
 .. _version 718:
 
 IPython 7.18

From ce820924d81ff15f711a5ad1ce2d6e2868d22039 Mon Sep 17 00:00:00 2001
From: Ethan Madden <maddene@madden.ninja>
Date: Sat, 17 Oct 2020 16:53:39 -0700
Subject: [PATCH 0358/1407] Line-buffered output for %%magic scripts

---
 IPython/core/magics/script.py    | 70 +++++++++++++++++++++-----------
 IPython/core/tests/test_magic.py | 14 +++----
 2 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index 8b7f6f94e09..d45d3d3578e 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -8,7 +8,7 @@
 import sys
 import signal
 import time
-from subprocess import Popen, PIPE, CalledProcessError
+import asyncio
 import atexit
 
 from IPython.core import magic_arguments
@@ -175,11 +175,44 @@ def shebang(self, line, cell):
             2
             3
         """
-        argv = arg_split(line, posix = not sys.platform.startswith('win'))
+
+        async def _handle_stream(stream, stream_arg, file_object):
+            while True:
+                line = (await stream.readline()).decode("utf8")
+                if not line:
+                    break
+                if stream_arg:
+                    self.shell.user_ns[stream_arg] = line
+                else:
+                    file_object.write(line)
+                    file_object.flush()
+
+        async def _stream_communicate(process, cell):
+            process.stdin.write(cell)
+            process.stdin.close()
+            stdout_task = asyncio.create_task(
+                _handle_stream(process.stdout, args.out, sys.stdout)
+            )
+            stderr_task = asyncio.create_task(
+                _handle_stream(process.stderr, args.err, sys.stderr)
+            )
+            await asyncio.wait([stdout_task, stderr_task])
+
+        if sys.platform.startswith("win"):
+            asyncio.set_event_loop_policy(asyncio.WindowsProactorEventLoopPolicy())
+        loop = asyncio.get_event_loop()
+
+        argv = arg_split(line, posix=not sys.platform.startswith('win'))
         args, cmd = self.shebang.parser.parse_known_args(argv)
-        
         try:
-            p = Popen(cmd, stdout=PIPE, stderr=PIPE, stdin=PIPE)
+            p = loop.run_until_complete(
+                asyncio.create_subprocess_exec(
+                    *cmd,
+                    stdout=asyncio.subprocess.PIPE,
+                    stderr=asyncio.subprocess.PIPE,
+                    stdin=asyncio.subprocess.PIPE
+                )
+            )
         except OSError as e:
             if e.errno == errno.ENOENT:
                 print("Couldn't find program: %r" % cmd[0])
@@ -208,17 +241,17 @@ def shebang(self, line, cell):
             return
         
         try:
-            out, err = p.communicate(cell)
+            loop.run_until_complete(_stream_communicate(p, cell))
         except KeyboardInterrupt:
             try:
                 p.send_signal(signal.SIGINT)
                 time.sleep(0.1)
-                if p.poll() is not None:
+                if p.returncode is not None:
                     print("Process is interrupted.")
                     return
                 p.terminate()
                 time.sleep(0.1)
-                if p.poll() is not None:
+                if p.returncode is not None:
                     print("Process is terminated.")
                     return
                 p.kill()
@@ -229,20 +262,9 @@ def shebang(self, line, cell):
                 print("Error while terminating subprocess (pid=%i): %s" \
                     % (p.pid, e))
             return
-        out = py3compat.decode(out)
-        err = py3compat.decode(err)
-        if args.out:
-            self.shell.user_ns[args.out] = out
-        else:
-            sys.stdout.write(out)
-            sys.stdout.flush()
-        if args.err:
-            self.shell.user_ns[args.err] = err
-        else:
-            sys.stderr.write(err)
-            sys.stderr.flush()
         if args.raise_error and p.returncode!=0:
-            raise CalledProcessError(p.returncode, cell, output=out, stderr=err)
+            print(p.returncode)
+            raise CalledProcessError(p.returncode, cell)
     
     def _run_script(self, p, cell, to_close):
         """callback for running the script in the background"""
@@ -263,7 +285,7 @@ def kill_bg_processes(self):
         if not self.bg_processes:
             return
         for p in self.bg_processes:
-            if p.poll() is None:
+            if p.returncode is None:
                 try:
                     p.send_signal(signal.SIGINT)
                 except:
@@ -273,7 +295,7 @@ def kill_bg_processes(self):
         if not self.bg_processes:
             return
         for p in self.bg_processes:
-            if p.poll() is None:
+            if p.returncode is None:
                 try:
                     p.terminate()
                 except:
@@ -283,7 +305,7 @@ def kill_bg_processes(self):
         if not self.bg_processes:
             return
         for p in self.bg_processes:
-            if p.poll() is None:
+            if p.returncode is None:
                 try:
                     p.kill()
                 except:
@@ -291,4 +313,4 @@ def kill_bg_processes(self):
         self._gc_bg_processes()
 
     def _gc_bg_processes(self):
-        self.bg_processes = [p for p in self.bg_processes if p.poll() is None]
+        self.bg_processes = [p for p in self.bg_processes if p.returncode is None]
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 10dd8ce9ac3..35f04cca68a 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -948,26 +948,26 @@ def test_script_out_err():
     nt.assert_equal(ip.user_ns['error'], 'hello\n')
 
 @dec.skip_win32
-def test_script_bg_out():
+async def test_script_bg_out():
     ip = get_ipython()
     ip.run_cell_magic("script", "--bg --out output sh", "echo 'hi'")
 
-    nt.assert_equal(ip.user_ns['output'].read(), b'hi\n')
+    nt.assert_equal((await ip.user_ns['output'].read()), b'hi\n')
     ip.user_ns['output'].close()
 
 @dec.skip_win32
-def test_script_bg_err():
+async def test_script_bg_err():
     ip = get_ipython()
     ip.run_cell_magic("script", "--bg --err error sh", "echo 'hello' >&2")
-    nt.assert_equal(ip.user_ns['error'].read(), b'hello\n')
+    nt.assert_equal((await ip.user_ns['error'].read()), b'hello\n')
     ip.user_ns['error'].close()
 
 @dec.skip_win32
-def test_script_bg_out_err():
+async def test_script_bg_out_err():
     ip = get_ipython()
     ip.run_cell_magic("script", "--bg --out output --err error sh", "echo 'hi'\necho 'hello' >&2")
-    nt.assert_equal(ip.user_ns['output'].read(), b'hi\n')
-    nt.assert_equal(ip.user_ns['error'].read(), b'hello\n')
+    nt.assert_equal((await ip.user_ns['output'].read()), b'hi\n')
+    nt.assert_equal((await ip.user_ns['error'].read()), b'hello\n')
     ip.user_ns['output'].close()
     ip.user_ns['error'].close()
 

From 346181ebbfd05179663a690f8170fd4bff1a35ea Mon Sep 17 00:00:00 2001
From: Ethan Madden <maddene@madden.ninja>
Date: Tue, 20 Oct 2020 09:40:14 -0700
Subject: [PATCH 0359/1407] Linting fixes

---
 IPython/core/magics/script.py    |  3 +--
 IPython/core/tests/test_magic.py | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index d45d3d3578e..7148b00f7ef 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -202,7 +202,7 @@ async def _stream_communicate(process, cell):
             asyncio.set_event_loop_policy(asyncio.WindowsProactorEventLoopPolicy())
         loop = asyncio.get_event_loop()
 
-        argv = arg_split(line, posix=not sys.platform.startswith('win'))
+        argv = arg_split(line, posix=not sys.platform.startswith("win"))
         args, cmd = self.shebang.parser.parse_known_args(argv)
         try:
             p = loop.run_until_complete(
@@ -263,7 +263,6 @@ async def _stream_communicate(process, cell):
                     % (p.pid, e))
             return
         if args.raise_error and p.returncode!=0:
-            print(p.returncode)
             raise CalledProcessError(p.returncode, cell)
     
     def _run_script(self, p, cell, to_close):
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 35f04cca68a..3ce4ddfa69e 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -951,25 +951,29 @@ def test_script_out_err():
 async def test_script_bg_out():
     ip = get_ipython()
     ip.run_cell_magic("script", "--bg --out output sh", "echo 'hi'")
-
-    nt.assert_equal((await ip.user_ns['output'].read()), b'hi\n')
+    nt.assert_equal((await ip.user_ns["output"].read()), b"hi\n")
     ip.user_ns['output'].close()
 
+
 @dec.skip_win32
 async def test_script_bg_err():
     ip = get_ipython()
     ip.run_cell_magic("script", "--bg --err error sh", "echo 'hello' >&2")
-    nt.assert_equal((await ip.user_ns['error'].read()), b'hello\n')
-    ip.user_ns['error'].close()
+    nt.assert_equal((await ip.user_ns["error"].read()), b"hello\n")
+    ip.user_ns["error"].close()
+
 
 @dec.skip_win32
 async def test_script_bg_out_err():
     ip = get_ipython()
-    ip.run_cell_magic("script", "--bg --out output --err error sh", "echo 'hi'\necho 'hello' >&2")
-    nt.assert_equal((await ip.user_ns['output'].read()), b'hi\n')
-    nt.assert_equal((await ip.user_ns['error'].read()), b'hello\n')
-    ip.user_ns['output'].close()
-    ip.user_ns['error'].close()
+    ip.run_cell_magic(
+        "script", "--bg --out output --err error sh", "echo 'hi'\necho 'hello' >&2"
+    )
+    nt.assert_equal((await ip.user_ns["output"].read()), b"hi\n")
+    nt.assert_equal((await ip.user_ns["error"].read()), b"hello\n")
+    ip.user_ns["output"].close()
+    ip.user_ns["error"].close()
+
 
 def test_script_defaults():
     ip = get_ipython()

From 958d1d1b9431bbf733a25457ffbab1fd18a553e3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 26 Oct 2020 13:57:01 -0700
Subject: [PATCH 0360/1407] remove testing on 3.6

---
 .travis.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a207e9ee9f3..889e1ad3bb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,11 +34,6 @@ before_install:
 install:
   - pip install pip --upgrade
   - pip install setuptools --upgrade
-  - if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
-      echo "for the time being still test on 3.6";
-      sed -ibkp s/7/6/g setup.py;
-      git diff;
-    fi
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
   - pip install trio curio --upgrade --upgrade-strategy eager
   - pip install 'pytest' 'matplotlib !=3.2.0'
@@ -72,9 +67,6 @@ after_success:
 
 matrix:
   include:
-    - arch: amd64
-      python: "3.6"
-      dist: xenial
     - arch: amd64
       python: "3.7"
       dist: xenial

From 2b21502ebb0e0267e9d750ed9a3c8a094b2147fe Mon Sep 17 00:00:00 2001
From: farisachugthai <farischugthai@gmail.com>
Date: Wed, 28 Oct 2020 13:01:35 -0400
Subject: [PATCH 0361/1407] DOC: Remove sphinxext errors

The doc for the sphinx extension says the sentence "list directives
here" but the directives are now listed in full above.

In addition, the word "with" was repeated twice in a row but probably
went unnoticed since it happens at a line break.
---
 docs/source/sphinxext.rst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/source/sphinxext.rst b/docs/source/sphinxext.rst
index a3818141621..b2012fa62f6 100644
--- a/docs/source/sphinxext.rst
+++ b/docs/source/sphinxext.rst
@@ -163,9 +163,8 @@ Testing directive outputs
 =========================
 
 The IPython Sphinx Directive makes it possible to test the outputs that you provide with your code. To do this,
-decorate the contents in your directive block with one of the following:
-
-  * list directives here
+decorate the contents in your directive block with one of the options listed
+above.
 
 If an IPython doctest decorator is found, it will take these steps when your documentation is built:
 
@@ -435,7 +434,7 @@ And persist across sessions
    print(square(-2))
 
 Pretty much anything you can do with the ipython code, you can do with
-with a simple python script. Obviously, though it doesn't make sense
+a simple python script. Obviously, though it doesn't make sense
 to use the doctest option.
 
 .. _pseudo-decorators:

From d17814023bfe3068b3a07865ea79041a0a84794f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 28 Oct 2020 10:44:46 -0700
Subject: [PATCH 0362/1407] Forgot import in #12639

---
 IPython/core/magics/script.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index 7148b00f7ef..02b028649f3 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -11,6 +11,8 @@
 import asyncio
 import atexit
 
+from subprocess import CalledProcessError
+
 from IPython.core import magic_arguments
 from IPython.core.magic import  (
     Magics, magics_class, line_magic, cell_magic
@@ -20,6 +22,7 @@
 from IPython.utils.process import arg_split
 from traitlets import List, Dict, default
 
+
 #-----------------------------------------------------------------------------
 # Magic implementation classes
 #-----------------------------------------------------------------------------

From 778dac1039cabb50b27a9a9b5115e54e67f0c88f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 28 Oct 2020 10:54:59 -0700
Subject: [PATCH 0363/1407] pyflakes to avoid missing imports

---
 .flake8                       | 5 +++++
 .github/workflows/mypy.yml    | 5 ++++-
 IPython/core/magics/script.py | 6 ++----
 MANIFEST.in                   | 1 +
 4 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 .flake8

diff --git a/.flake8 b/.flake8
new file mode 100644
index 00000000000..ec083d68034
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,5 @@
+[flake8]
+ignore = W293,E301,E271,E265,W291,E722,E302,C901,E225,E128,E122,E226,E231
+max-line-length = 160
+exclude = tests/*
+max-complexity = 10
diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index 1dc6d84acc9..2778805a679 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -23,8 +23,11 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install mypy
+        pip install mypy pyflakes flake8
     - name: Lint with mypy
       run: |
         mypy IPython/terminal/ptutils.py
         mypy IPython/core/c*.py
+    - name: Lint with pyflakes
+      run: |
+        flake8  IPython/core/magics/script.py
diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index 02b028649f3..a885e3ff037 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -18,7 +18,6 @@
     Magics, magics_class, line_magic, cell_magic
 )
 from IPython.lib.backgroundjobs import BackgroundJobManager
-from IPython.utils import py3compat
 from IPython.utils.process import arg_split
 from traitlets import List, Dict, default
 
@@ -139,7 +138,7 @@ def _make_script_magic(self, name):
         def named_script_magic(line, cell):
             # if line, add it as cl-flags
             if line:
-                 line = "%s %s" % (script, line)
+                line = "%s %s" % (script, line)
             else:
                 line = script
             return self.shebang(line, cell)
@@ -262,8 +261,7 @@ async def _stream_communicate(process, cell):
             except OSError:
                 pass
             except Exception as e:
-                print("Error while terminating subprocess (pid=%i): %s" \
-                    % (p.pid, e))
+                print("Error while terminating subprocess (pid=%i): %s" % (p.pid, e))
             return
         if args.raise_error and p.returncode!=0:
             raise CalledProcessError(p.returncode, cell)
diff --git a/MANIFEST.in b/MANIFEST.in
index 5bc59b9661b..ec33beb19f0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,6 +7,7 @@ include MANIFEST.in
 include pytest.ini
 include mypy.ini
 include .mailmap
+include .flake8
 
 recursive-exclude tools *
 exclude tools

From 2255db868c25580c0d494072d5f6170aa78d2add Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 28 Oct 2020 14:16:38 -0700
Subject: [PATCH 0364/1407] Python3 compat layer cleanup

---
 IPython/core/interactiveshell.py            |  8 +--
 IPython/core/magics/script.py               |  1 -
 IPython/core/tests/test_inputtransformer.py |  1 -
 IPython/utils/py3compat.py                  | 77 ---------------------
 IPython/utils/text.py                       |  1 -
 5 files changed, 4 insertions(+), 84 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index e1eb17dcecc..a1c15bfcdde 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2623,10 +2623,10 @@ def _user_obj_error(self):
         stb = self.InteractiveTB.get_exception_only(etype, evalue)
         
         exc_info = {
-            u'status' : 'error',
-            u'traceback' : stb,
-            u'ename' : etype.__name__,
-            u'evalue' : py3compat.safe_unicode(evalue),
+            "status": "error",
+            "traceback": stb,
+            "ename": etype.__name__,
+            "evalue": py3compat.safe_unicode(evalue),
         }
 
         return exc_info
diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index 7148b00f7ef..15b6362fc44 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -16,7 +16,6 @@
     Magics, magics_class, line_magic, cell_magic
 )
 from IPython.lib.backgroundjobs import BackgroundJobManager
-from IPython.utils import py3compat
 from IPython.utils.process import arg_split
 from traitlets import List, Dict, default
 
diff --git a/IPython/core/tests/test_inputtransformer.py b/IPython/core/tests/test_inputtransformer.py
index 147a8e42e8d..be8209e6d02 100644
--- a/IPython/core/tests/test_inputtransformer.py
+++ b/IPython/core/tests/test_inputtransformer.py
@@ -2,7 +2,6 @@
 import nose.tools as nt
 
 from IPython.testing import tools as tt
-from IPython.utils import py3compat
 
 from IPython.core import inputtransformer as ipt
 
diff --git a/IPython/utils/py3compat.py b/IPython/utils/py3compat.py
index 62bcc917b05..654195e6c84 100644
--- a/IPython/utils/py3compat.py
+++ b/IPython/utils/py3compat.py
@@ -55,72 +55,6 @@ def safe_unicode(e):
 
     return u'Unrecoverably corrupt evalue'
 
-# shutil.which from Python 3.4
-def _shutil_which(cmd, mode=os.F_OK | os.X_OK, path=None):
-    """Given a command, mode, and a PATH string, return the path which
-    conforms to the given mode on the PATH, or None if there is no such
-    file.
-
-    `mode` defaults to os.F_OK | os.X_OK. `path` defaults to the result
-    of os.environ.get("PATH"), or can be overridden with a custom search
-    path.
-
-    This is a backport of shutil.which from Python 3.4
-    """
-    # Check that a given file can be accessed with the correct mode.
-    # Additionally check that `file` is not a directory, as on Windows
-    # directories pass the os.access check.
-    def _access_check(fn, mode):
-        return (os.path.exists(fn) and os.access(fn, mode)
-                and not os.path.isdir(fn))
-
-    # If we're given a path with a directory part, look it up directly rather
-    # than referring to PATH directories. This includes checking relative to the
-    # current directory, e.g. ./script
-    if os.path.dirname(cmd):
-        if _access_check(cmd, mode):
-            return cmd
-        return None
-
-    if path is None:
-        path = os.environ.get("PATH", os.defpath)
-    if not path:
-        return None
-    path = path.split(os.pathsep)
-
-    if sys.platform == "win32":
-        # The current directory takes precedence on Windows.
-        if not os.curdir in path:
-            path.insert(0, os.curdir)
-
-        # PATHEXT is necessary to check on Windows.
-        pathext = os.environ.get("PATHEXT", "").split(os.pathsep)
-        # See if the given file matches any of the expected path extensions.
-        # This will allow us to short circuit when given "python.exe".
-        # If it does match, only test that one, otherwise we have to try
-        # others.
-        if any(cmd.lower().endswith(ext.lower()) for ext in pathext):
-            files = [cmd]
-        else:
-            files = [cmd + ext for ext in pathext]
-    else:
-        # On other platforms you don't have things like PATHEXT to tell you
-        # what file suffixes are executable, so just pass on cmd as-is.
-        files = [cmd]
-
-    seen = set()
-    for dir in path:
-        normdir = os.path.normcase(dir)
-        if not normdir in seen:
-            seen.add(normdir)
-            for thefile in files:
-                name = os.path.join(dir, thefile)
-                if _access_check(name, mode):
-                    return name
-    return None
-
-PY3 = True
-
 # keep reference to builtin_mod because the kernel overrides that value
 # to forward requests to a frontend.
 def input(prompt=''):
@@ -129,16 +63,6 @@ def input(prompt=''):
 builtin_mod_name = "builtins"
 import builtins as builtin_mod
 
-
-which = shutil.which
-
-def isidentifier(s, dotted=False):
-    if dotted:
-        return all(isidentifier(a) for a in s.split("."))
-    return s.isidentifier()
-
-getcwd = os.getcwd
-
 MethodType = types.MethodType
 
 def execfile(fname, glob, loc=None, compiler=None):
@@ -147,7 +71,6 @@ def execfile(fname, glob, loc=None, compiler=None):
         compiler = compiler or compile
         exec(compiler(f.read(), fname, 'exec'), glob, loc)
 
-PY2 = not PY3
 PYPY = platform.python_implementation() == "PyPy"
 
 # Cython still rely on that as a Dec 28 2019
diff --git a/IPython/utils/text.py b/IPython/utils/text.py
index 14405ede1f7..194107a884c 100644
--- a/IPython/utils/text.py
+++ b/IPython/utils/text.py
@@ -15,7 +15,6 @@
 from string import Formatter
 from pathlib import Path
 
-from IPython.utils import py3compat
 
 # datetime.strftime date format for ipython
 if sys.platform == 'win32':

From ce56b9109ca895db329585c7e82f83d2ab34b489 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 28 Oct 2020 14:23:30 -0700
Subject: [PATCH 0365/1407] less warnigns try to fix tests

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 889e1ad3bb0..3702df2829b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ install:
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
   - pip install trio curio --upgrade --upgrade-strategy eager
   - pip install 'pytest' 'matplotlib !=3.2.0'
-  - pip install codecov check-manifest pytest-cov --upgrade
+  - pip install codecov check-manifest pytest-cov --upgrade anyio pytest-asyncio
 
 
 script:

From a5f1b68d6e06554f7faa0607317b9fe5a4fff247 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 2 Nov 2020 10:35:45 -0800
Subject: [PATCH 0366/1407] duplicate

---
 docs/source/whatsnew/development.rst     | 69 ++++++++++++++++++++++++
 docs/source/whatsnew/pr/auto_suggest.md  | 66 -----------------------
 docs/source/whatsnew/pr/auto_suggest.rst | 69 ------------------------
 3 files changed, 69 insertions(+), 135 deletions(-)
 delete mode 100644 docs/source/whatsnew/pr/auto_suggest.md
 delete mode 100644 docs/source/whatsnew/pr/auto_suggest.rst

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 9e9b2984c6c..e6c933071ec 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -24,6 +24,75 @@ Need to be updated:
 
 
 
+Autosuggestion is a very useful feature available in `fish <https://fishshell.com/>`__, `zsh <https://en.wikipedia.org/wiki/Z_shell>`__, and `prompt-toolkit <https://python-prompt-toolkit.readthedocs.io/en/master/pages/asking_for_input.html#auto-suggestion>`__.
+
+`Ptpython <https://github.com/prompt-toolkit/ptpython#ptpython>`__ allows users to enable this feature in
+`ptpython/config.py <https://github.com/prompt-toolkit/ptpython/blob/master/examples/ptpython_config/config.py#L90>`__.
+
+This feature allows users to accept autosuggestions with ctrl e, ctrl f,
+or right arrow as described below.
+
+1. Start ipython
+
+.. image:: ../_images/auto_suggest_prompt_no_text.png
+
+2. Run ``print("hello")``
+
+.. image:: ../_images/auto_suggest_print_hello_suggest.png
+
+3. Press p to see the autosuggestion
+
+.. image:: ../_images/auto_suggest_print_hello_suggest.png
+
+4. Press ctrl f, or ctrl e, or right arrow to accept the suggestion
+
+.. image:: ../_images/auto_suggest_print_hello.png
+
+You can also complete word by word:
+
+1. Run ``def say_hello(): print("hello")``
+
+.. image:: ../_images/auto_suggest_second_prompt.png
+
+2. Press d to see the autosuggestion
+
+.. image:: ../_images/audo_suggest_d_phantom.png
+
+3. Press alt f to accept the first word of the suggestion
+
+.. image:: ../_images/auto_suggest_def_phantom.png
+
+Importantly, this feature does not interfere with tab completion:
+
+1. After running ``def say_hello(): print("hello")``, press d
+
+.. image:: ../_images/audo_suggest_d_phantom.png
+
+2. Press Tab to start tab completion
+
+.. image:: ../_images/auto_suggest_d_completions.png
+
+3A. Press Tab again to select the first option
+
+.. image:: ../_images/auto_suggest_def_completions.png
+
+3B. Press alt f to accept to accept the first word of the suggestion
+
+.. image:: ../_images/auto_suggest_def_phantom.png
+
+3C. Press ctrl f or ctrl e to accept the entire suggestion
+
+.. image:: ../_images/auto_suggest_match_parens.png
+
+To install a version of ipython with autosuggestions enabled, run:
+
+``pip install git+https://github.com/mskar/ipython@auto_suggest``
+
+Currently, autosuggestions are only shown in the emacs or vi insert editing modes:
+
+- The ctrl e, ctrl f, and alt f shortcuts work by default in emacs mode.
+- To use these shortcuts in vi insert mode, you will have to create `custom keybindings in your config.py <https://github.com/mskar/setup/commit/2892fcee46f9f80ef7788f0749edc99daccc52f4/>`__.
+
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 
 As a reminder, IPython master has diverged from the 7.x branch, thus master may
diff --git a/docs/source/whatsnew/pr/auto_suggest.md b/docs/source/whatsnew/pr/auto_suggest.md
deleted file mode 100644
index cbad518cd98..00000000000
--- a/docs/source/whatsnew/pr/auto_suggest.md
+++ /dev/null
@@ -1,66 +0,0 @@
-Autosuggestion is a very useful feature available in [fish](https://fishshell.com/), [zsh](https://en.wikipedia.org/wiki/Z_shell), and [prompt-toolkit](https://python-prompt-toolkit.readthedocs.io/en/master/pages/asking_for_input.html#auto-suggestion).
-
-[Ptpython](https://github.com/prompt-toolkit/ptpython#ptpython) allows users to enable this feature in
-[ptpython/config.py](https://github.com/prompt-toolkit/ptpython/blob/master/examples/ptpython_config/config.py#L90>).
-
-This feature allows users to accept autosuggestions with ctrl e, ctrl f, or right arrow as described below.
-
-1. Start ipython
-
-![image](https://user-images.githubusercontent.com/13444106/94700432-76580100-0309-11eb-8798-040d47d1a540.png)
-
-2. Run `print("hello")`
-
-![image](https://user-images.githubusercontent.com/13444106/94700528-91c30c00-0309-11eb-920d-4ef8aa79d79a.png)
-
-3. Press p to see the autosuggestion
-
-![image](https://user-images.githubusercontent.com/13444106/94700681-bf0fba00-0309-11eb-94bd-bbddf4805da2.png)
-
-4. Press ctrl f, or ctrl e, or right arrow to accept the suggestion
-
-![image](https://user-images.githubusercontent.com/13444106/94700883-fd0cde00-0309-11eb-9aa8-17270951f021.png)
-
-You can also complete word by word:
-
-1. Run `def say_hello(): print("hello")`
-
-![image](https://user-images.githubusercontent.com/13444106/94704474-f54f3880-030d-11eb-9d73-fa10ced850be.png)
-
-2. Press d to see the autosuggestion
-
-![image](https://user-images.githubusercontent.com/13444106/94704519-fe400a00-030d-11eb-8b73-3c35ffaf1a9d.png)
-
-3. Press alt f to accept to accept the first word of the suggestion
-
-![image](https://user-images.githubusercontent.com/13444106/94704602-14e66100-030e-11eb-90fc-d930463f52de.png)
-
-Importantly, this feature does not interfere with tab completion:
-
-1. After running `def say_hello(): print("hello")`, press d
-
-![image](https://user-images.githubusercontent.com/13444106/94704519-fe400a00-030d-11eb-8b73-3c35ffaf1a9d.png)
-
-2. Press Tab to start tab completion
-
-![image](https://user-images.githubusercontent.com/13444106/94704969-80303300-030e-11eb-8379-6bff94582849.png)
-
-3A. Press Tab again to select the first option
-
-![image](https://user-images.githubusercontent.com/13444106/94705023-90481280-030e-11eb-9cf7-76170d1004b9.png)
-
-3B. Press alt f to accept to accept the first word of the suggestion
-
-![image](https://user-images.githubusercontent.com/13444106/94704602-14e66100-030e-11eb-90fc-d930463f52de.png)
-
-3C. Press ctrl f or ctrl e to accept the entire suggestion
-
-![image](https://user-images.githubusercontent.com/13444106/94705115-ab1a8700-030e-11eb-9dee-da98fccca0a6.png)
-
-To install a version of ipython with autosuggestions enabled, run:
-
-`pip install git+https://github.com/mskar/ipython@auto_suggest`
-
-Currently, autosuggestions are only shown in the emacs or vi insert editing modes:
-- The ctrl e, ctrl f, and alt f shortcuts work by default in emacs mode.
-- To use these shortcuts in vi insert mode, you will have to create [custom keybindings in your config.py](https://github.com/mskar/setup/commit/2892fcee46f9f80ef7788f0749edc99daccc52f4/).
diff --git a/docs/source/whatsnew/pr/auto_suggest.rst b/docs/source/whatsnew/pr/auto_suggest.rst
deleted file mode 100644
index 18c545b1f87..00000000000
--- a/docs/source/whatsnew/pr/auto_suggest.rst
+++ /dev/null
@@ -1,69 +0,0 @@
-Autosuggestion is a very useful feature available in `fish <https://fishshell.com/>`__, `zsh <https://en.wikipedia.org/wiki/Z_shell>`__, and `prompt-toolkit <https://python-prompt-toolkit.readthedocs.io/en/master/pages/asking_for_input.html#auto-suggestion>`__.
-
-`Ptpython <https://github.com/prompt-toolkit/ptpython#ptpython>`__ allows users to enable this feature in
-`ptpython/config.py <https://github.com/prompt-toolkit/ptpython/blob/master/examples/ptpython_config/config.py#L90>`__.
-
-This feature allows users to accept autosuggestions with ctrl e, ctrl f,
-or right arrow as described below.
-
-1. Start ipython
-
-.. image:: ../_images/auto_suggest_prompt_no_text.png
-
-2. Run ``print("hello")``
-
-.. image:: ../_images/auto_suggest_print_hello_suggest.png
-
-3. Press p to see the autosuggestion
-
-.. image:: ../_images/auto_suggest_print_hello_suggest.png
-
-4. Press ctrl f, or ctrl e, or right arrow to accept the suggestion
-
-.. image:: ../_images/auto_suggest_print_hello.png
-
-You can also complete word by word:
-
-1. Run ``def say_hello(): print("hello")``
-
-.. image:: ../_images/auto_suggest_second_prompt.png
-
-2. Press d to see the autosuggestion
-
-.. image:: ../_images/audo_suggest_d_phantom.png
-
-3. Press alt f to accept to accept the first word of the suggestion
-
-.. image:: ../_images/auto_suggest_def_phantom.png
-
-Importantly, this feature does not interfere with tab completion:
-
-1. After running ``def say_hello(): print("hello")``, press d
-
-.. image:: ../_images/audo_suggest_d_phantom.png
-
-2. Press Tab to start tab completion
-
-.. image:: ../_images/auto_suggest_d_completions.png
-
-3A. Press Tab again to select the first option
-
-.. image:: ../_images/auto_suggest_def_completions.png
-
-3B. Press alt f to accept to accept the first word of the suggestion
-
-.. image:: ../_images/auto_suggest_def_phantom.png
-
-3C. Press ctrl f or ctrl e to accept the entire suggestion
-
-.. image:: ../_images/auto_suggest_match_parens.png
-
-To install a version of ipython with autosuggestions enabled, run:
-
-``pip install git+https://github.com/mskar/ipython@auto_suggest``
-
-Currently, autosuggestions are only shown in the emacs or vi insert editing modes:
-
-- The ctrl e, ctrl f, and alt f shortcuts work by default in emacs mode.
-- To use these shortcuts in vi insert mode, you will have to create `custom keybindings in your config.py <https://github.com/mskar/setup/commit/2892fcee46f9f80ef7788f0749edc99daccc52f4/>`__.
-

From 8d129ed2587ce474329cbe1e5b9b726f81aab9b2 Mon Sep 17 00:00:00 2001
From: Daniel Mietchen <daniel.mietchen@googlemail.com>
Date: Sun, 8 Nov 2020 23:50:29 -0500
Subject: [PATCH 0367/1407] grammar, plus styling of LaTeX

---
 IPython/core/magics/display.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magics/display.py b/IPython/core/magics/display.py
index d159f89aece..2e6d4ba4103 100644
--- a/IPython/core/magics/display.py
+++ b/IPython/core/magics/display.py
@@ -47,9 +47,9 @@ def javascript(self, line, cell):
 
     @cell_magic
     def latex(self, line, cell):
-        """Render the cell as a block of latex
+        """Render the cell as a block of LaTeX
 
-        The subset of latex which is support depends on the implementation in
+        The subset of LaTeX which is supported depends on the implementation in
         the client.  In the Jupyter Notebook, this magic only renders the subset
         of latex defined by MathJax
         [here](https://docs.mathjax.org/en/v2.5-latest/tex.html)."""

From 331269c05da22dbea39ff082fe7edb3d82b88fb3 Mon Sep 17 00:00:00 2001
From: Daniel Mietchen <daniel.mietchen@googlemail.com>
Date: Sun, 8 Nov 2020 23:56:09 -0500
Subject: [PATCH 0368/1407] another LaTeX

---
 IPython/core/magics/display.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/display.py b/IPython/core/magics/display.py
index 2e6d4ba4103..c4350e404d2 100644
--- a/IPython/core/magics/display.py
+++ b/IPython/core/magics/display.py
@@ -51,7 +51,7 @@ def latex(self, line, cell):
 
         The subset of LaTeX which is supported depends on the implementation in
         the client.  In the Jupyter Notebook, this magic only renders the subset
-        of latex defined by MathJax
+        of LaTeX defined by MathJax
         [here](https://docs.mathjax.org/en/v2.5-latest/tex.html)."""
         display(Latex(cell))
 

From b85391cc88c60721e177796535998df2f42a5ba6 Mon Sep 17 00:00:00 2001
From: Aditya Sathe <satheaditya2014@gmail.com>
Date: Sat, 21 Nov 2020 11:37:54 +0530
Subject: [PATCH 0369/1407] bug: additional spaces while parsing timeit-magic
 options

---
 IPython/core/magic.py            | 15 +++++++++++++--
 IPython/core/magics/execution.py |  4 ++--
 IPython/core/tests/test_magic.py | 15 +++++++++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index e64d3aa2afc..d7f30dc376f 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -618,6 +618,9 @@ def parse_options(self, arg_str, opt_str, *long_opts, **kw):
         posix = kw.get('posix', os.name == 'posix')
         strict = kw.get('strict', True)
 
+        preserve_non_opts = kw.get('preserve_non_opts', False)
+        remainder_arg_str = arg_str
+        
         # Check if we have more than one argument to warrant extra processing:
         odict = {}  # Dictionary with options
         args = arg_str.split()
@@ -630,8 +633,13 @@ def parse_options(self, arg_str, opt_str, *long_opts, **kw):
                 opts,args = getopt(argv, opt_str, long_opts)
             except GetoptError as e:
                 raise UsageError('%s ( allowed: "%s" %s)' % (e.msg,opt_str,
-                                        " ".join(long_opts))) from e
+                                                             " ".join(long_opts))) from e
             for o,a in opts:
+                if mode is 'string' and preserve_non_opts:
+                    # remove option-parts from the original args-string and preserve remaining-part.
+                    # This relies on the arg_split(...) and getopt(...)'s impl spec, that the parsed options are 
+                    # returned in the original order. 
+                    remainder_arg_str = remainder_arg_str.replace(o, '', 1).replace(a, '', 1)
                 if o.startswith('--'):
                     o = o[2:]
                 else:
@@ -649,7 +657,10 @@ def parse_options(self, arg_str, opt_str, *long_opts, **kw):
         # Prepare opts,args for return
         opts = Struct(odict)
         if mode == 'string':
-            args = ' '.join(args)
+            if preserve_non_opts:
+                args = remainder_arg_str.lstrip()
+            else:
+                args = ' '.join(args)
 
         return opts,args
 
diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index e2d550e7212..32a84763269 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -1073,8 +1073,8 @@ def timeit(self, line='', cell=None, local_ns=None):
         does not matter as long as results from timeit.py are not mixed with
         those from %timeit."""
 
-        opts, stmt = self.parse_options(line,'n:r:tcp:qo',
-                                        posix=False, strict=False)
+        opts, stmt = self.parse_options(line, 'n:r:tcp:qo',
+                                        posix=False, strict=False, preserve_non_opts=True)
         if stmt == "" and cell is None:
             return
         
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 3ce4ddfa69e..b4bd12f3f24 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -470,6 +470,21 @@ def test_parse_options():
     nt.assert_equal(m.parse_options(u'foo', '')[1], u'foo')
 
 
+def test_parse_options_preserve_non_option_string():
+    """Test to assert preservation of non-option part of magic-block, while parsing magic options."""
+    m = DummyMagics(_ip)
+    opts, stmt = m.parse_options(' -n1  -r 13 _ = 314 + foo', 'n:r:', preserve_non_opts= True)
+    nt.assert_equal(opts, {'n': '1', 'r': '13'})
+    nt.assert_equal(stmt, '_ = 314 + foo')
+
+
+def test_run_magic_preserve_code_block():
+    """Test to assert preservation of non-option part of magic-block, while running magic."""
+    _ip.user_ns['spaces'] = []
+    _ip.magic("timeit -n1 -r1 spaces.append([s.count(' ') for s in ['document']])")
+    assert _ip.user_ns['spaces'] == [[0]]
+    
+
 def test_dirops():
     """Test various directory handling operations."""
     # curpath = lambda :os.path.splitdrive(os.getcwd())[1].replace('\\','/')

From 3259a67813e209b598e30341e0be4f7ba327e580 Mon Sep 17 00:00:00 2001
From: Aditya Sathe <satheaditya2014@gmail.com>
Date: Sat, 21 Nov 2020 12:07:43 +0530
Subject: [PATCH 0370/1407] addressing linting issues

---
 IPython/core/magic.py            | 23 +++++++++++++----------
 IPython/core/magics/execution.py |  5 +++--
 IPython/core/tests/test_magic.py | 14 ++++++++------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index d7f30dc376f..43d606a65fc 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -618,9 +618,9 @@ def parse_options(self, arg_str, opt_str, *long_opts, **kw):
         posix = kw.get('posix', os.name == 'posix')
         strict = kw.get('strict', True)
 
-        preserve_non_opts = kw.get('preserve_non_opts', False)
+        preserve_non_opts = kw.get("preserve_non_opts", False)
         remainder_arg_str = arg_str
-        
+
         # Check if we have more than one argument to warrant extra processing:
         odict = {}  # Dictionary with options
         args = arg_str.split()
@@ -632,15 +632,18 @@ def parse_options(self, arg_str, opt_str, *long_opts, **kw):
             try:
                 opts,args = getopt(argv, opt_str, long_opts)
             except GetoptError as e:
-                raise UsageError('%s ( allowed: "%s" %s)' % (e.msg,opt_str,
-                                                             " ".join(long_opts))) from e
-            for o,a in opts:
-                if mode is 'string' and preserve_non_opts:
+                raise UsageError(
+                    '%s ( allowed: "%s" %s)' % (e.msg, opt_str, " ".join(long_opts))
+                ) from e
+            for o, a in opts:
+                if mode is "string" and preserve_non_opts:
                     # remove option-parts from the original args-string and preserve remaining-part.
-                    # This relies on the arg_split(...) and getopt(...)'s impl spec, that the parsed options are 
-                    # returned in the original order. 
-                    remainder_arg_str = remainder_arg_str.replace(o, '', 1).replace(a, '', 1)
-                if o.startswith('--'):
+                    # This relies on the arg_split(...) and getopt(...)'s impl spec, that the parsed options are
+                    # returned in the original order.
+                    remainder_arg_str = remainder_arg_str.replace(o, "", 1).replace(
+                        a, "", 1
+                    )
+                if o.startswith("--"):
                     o = o[2:]
                 else:
                     o = o[1:]
diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 32a84763269..9b49d798d16 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -1073,8 +1073,9 @@ def timeit(self, line='', cell=None, local_ns=None):
         does not matter as long as results from timeit.py are not mixed with
         those from %timeit."""
 
-        opts, stmt = self.parse_options(line, 'n:r:tcp:qo',
-                                        posix=False, strict=False, preserve_non_opts=True)
+        opts, stmt = self.parse_options(
+            line, "n:r:tcp:qo", posix=False, strict=False, preserve_non_opts=True
+        )
         if stmt == "" and cell is None:
             return
         
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index b4bd12f3f24..63c48d0bb1f 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -473,17 +473,19 @@ def test_parse_options():
 def test_parse_options_preserve_non_option_string():
     """Test to assert preservation of non-option part of magic-block, while parsing magic options."""
     m = DummyMagics(_ip)
-    opts, stmt = m.parse_options(' -n1  -r 13 _ = 314 + foo', 'n:r:', preserve_non_opts= True)
-    nt.assert_equal(opts, {'n': '1', 'r': '13'})
-    nt.assert_equal(stmt, '_ = 314 + foo')
+    opts, stmt = m.parse_options(
+        " -n1  -r 13 _ = 314 + foo", "n:r:", preserve_non_opts=True
+    )
+    nt.assert_equal(opts, {"n": "1", "r": "13"})
+    nt.assert_equal(stmt, "_ = 314 + foo")
 
 
 def test_run_magic_preserve_code_block():
     """Test to assert preservation of non-option part of magic-block, while running magic."""
-    _ip.user_ns['spaces'] = []
+    _ip.user_ns["spaces"] = []
     _ip.magic("timeit -n1 -r1 spaces.append([s.count(' ') for s in ['document']])")
-    assert _ip.user_ns['spaces'] == [[0]]
-    
+    assert _ip.user_ns["spaces"] == [[0]]
+
 
 def test_dirops():
     """Test various directory handling operations."""

From e6fa312e53b278b02ebb0fe0ea15ca24ba7ef3b4 Mon Sep 17 00:00:00 2001
From: Aditya Sathe <satheaditya2014@gmail.com>
Date: Sat, 21 Nov 2020 12:10:36 +0530
Subject: [PATCH 0371/1407] +1 linting issues

---
 IPython/core/magic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 43d606a65fc..03b76cb5c2e 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -663,7 +663,7 @@ def parse_options(self, arg_str, opt_str, *long_opts, **kw):
             if preserve_non_opts:
                 args = remainder_arg_str.lstrip()
             else:
-                args = ' '.join(args)
+                args = " ".join(args)
 
         return opts,args
 

From 0f6185a3e0d5b5d21c0989f5256d442ff01eee35 Mon Sep 17 00:00:00 2001
From: Gordon Ball <gordon@chronitis.net>
Date: Tue, 1 Dec 2020 15:29:09 +0100
Subject: [PATCH 0372/1407] qt: sip changes for PyQt5 >= 5.11

The former top-level module sip becomes PyQt5.sip, as per
https://www.riverbankcomputing.com/static/Docs/PyQt5/incompatibilities.html

This adds a fallback to the logic for checking the Qt string API
---
 IPython/external/qt_loaders.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/IPython/external/qt_loaders.py b/IPython/external/qt_loaders.py
index 46cd9c35cb9..ca7483ec1c9 100644
--- a/IPython/external/qt_loaders.py
+++ b/IPython/external/qt_loaders.py
@@ -155,7 +155,12 @@ def qtapi_version():
     try:
         import sip
     except ImportError:
-        return
+        # as of PyQt5 5.11, sip is no longer available as a top-level
+        # module and needs to be imported from the PyQt5 namespace
+        try:
+            from PyQt5 import sip
+        except ImportError:
+            return
     try:
         return sip.getapi('QString')
     except ValueError:

From 143c5fd180e4c8e146d7abaf04e9e688e8b36620 Mon Sep 17 00:00:00 2001
From: Michael T <bravmech@gmail.com>
Date: Thu, 3 Dec 2020 13:47:13 +0500
Subject: [PATCH 0373/1407] fix typo

---
 docs/source/interactive/python-ipython-diff.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/interactive/python-ipython-diff.rst b/docs/source/interactive/python-ipython-diff.rst
index 242429bac30..46e61752961 100644
--- a/docs/source/interactive/python-ipython-diff.rst
+++ b/docs/source/interactive/python-ipython-diff.rst
@@ -9,7 +9,7 @@ Unless expressed otherwise all of the construct you will see here will raise a
 ``SyntaxError`` if run in a pure Python shell, or if executing in a Python
 script.
 
-Each of these features are describe more in details in further part of the documentation.
+Each of these features are described more in detail in further part of the documentation.
 
 
 Quick overview:

From 30a9d43266adde68f65778831a85d679a174172b Mon Sep 17 00:00:00 2001
From: Michael T <bravmech@gmail.com>
Date: Thu, 3 Dec 2020 13:57:43 +0500
Subject: [PATCH 0374/1407] fix typo

---
 docs/source/interactive/python-ipython-diff.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/interactive/python-ipython-diff.rst b/docs/source/interactive/python-ipython-diff.rst
index 46e61752961..183d3efda56 100644
--- a/docs/source/interactive/python-ipython-diff.rst
+++ b/docs/source/interactive/python-ipython-diff.rst
@@ -58,7 +58,7 @@ All the following construct are valid IPython syntax:
        ...: print $months[0];
 
 
-Each of these construct is compile by IPython into valid python code and will
+Each of these construct is compiled by IPython into valid python code and will
 do most of the time what you expect it will do. Let see each of these example
 in more detail.
 

From 76306a40ad56050c68041b9beacc4fc7223afd8e Mon Sep 17 00:00:00 2001
From: Michael T <bravmech@gmail.com>
Date: Thu, 3 Dec 2020 14:10:03 +0500
Subject: [PATCH 0375/1407] fix typo

---
 docs/source/interactive/python-ipython-diff.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/interactive/python-ipython-diff.rst b/docs/source/interactive/python-ipython-diff.rst
index 183d3efda56..fd2e27a8bd1 100644
--- a/docs/source/interactive/python-ipython-diff.rst
+++ b/docs/source/interactive/python-ipython-diff.rst
@@ -207,7 +207,7 @@ under the hood python function. The syntax and assignment possibility are
 similar to the one with the bang (``!``) syntax, but with more flexibility and
 power. Magic function start with a percent sign (``%``) or double percent (``%%``).
 
-A magic call with a sign percent will act only one line:
+A magic call with a sign percent will act only on one line:
 
 .. code-block:: ipython
 

From 9aedf003a8f01d7349dd837d8f573cd208d27aa6 Mon Sep 17 00:00:00 2001
From: Michael T <bravmech@gmail.com>
Date: Thu, 3 Dec 2020 14:11:28 +0500
Subject: [PATCH 0376/1407] fix typo

---
 docs/source/interactive/python-ipython-diff.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/interactive/python-ipython-diff.rst b/docs/source/interactive/python-ipython-diff.rst
index fd2e27a8bd1..525475d01af 100644
--- a/docs/source/interactive/python-ipython-diff.rst
+++ b/docs/source/interactive/python-ipython-diff.rst
@@ -224,7 +224,7 @@ And support assignment:
     In [2]: results
     Out[2]: <TimeitResult : 1 loops, best of 1: 21.1 µs per loop>
 
-Magic with two percent sign can spread over multiple lines, but do not support assignment:
+Magic with two percent sign can spread over multiple lines, but does not support assignment:
 
 .. code-block:: ipython
 

From b1ef396fb6d9faf946cf52a392390d09ad9c49f0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 4 Dec 2020 10:40:43 -0800
Subject: [PATCH 0377/1407] Mare reset -f more agressive and cull sys.modules;

This _should_ allow soft restart of sessions w/o killing the process
---
 IPython/core/interactiveshell.py | 11 ++++++++++-
 IPython/core/magics/namespace.py | 10 +++++++---
 IPython/core/shellapp.py         |  1 +
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index a1c15bfcdde..decdd0732ca 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1410,7 +1410,7 @@ def all_ns_refs(self):
         return [self.user_ns, self.user_global_ns, self.user_ns_hidden] + \
                [m.__dict__ for m in self._main_mod_cache.values()]
 
-    def reset(self, new_session=True):
+    def reset(self, new_session=True, aggressive=False):
         """Clear all internal namespaces, and attempt to release references to
         user objects.
 
@@ -1447,6 +1447,15 @@ def reset(self, new_session=True):
 
         # Restore the user namespaces to minimal usability
         self.init_user_ns()
+        if aggressive and not hasattr(self, "_sys_modules_keys"):
+            print("Cannot restore sys.module, no snapshot")
+        elif aggressive:
+            print("culling sys module...")
+            current_keys = set(sys.modules.keys())
+            for k in current_keys - self._sys_modules_keys:
+                if k.startswith("multiprocessing"):
+                    continue
+                del sys.modules[k]
 
         # Restore the default and user aliases
         self.alias_manager.clear_aliases()
diff --git a/IPython/core/magics/namespace.py b/IPython/core/magics/namespace.py
index 0f232a72625..2118d8f77cc 100644
--- a/IPython/core/magics/namespace.py
+++ b/IPython/core/magics/namespace.py
@@ -491,6 +491,10 @@ def reset(self, parameter_s=''):
             we do a 'hard' reset, giving you a new session and removing all
             references to objects from the current session.
 
+        --aggressive: Try to aggressively remove modules from sys.modules ; this
+            may allow you to reimport Python modules that have been updated and
+            pick up changes, but can have unattended consequences.
+
         in : reset input history
 
         out : reset output history
@@ -533,8 +537,8 @@ def reset(self, parameter_s=''):
         such as the ipython notebook interface, will reset the namespace
         without confirmation.
         """
-        opts, args = self.parse_options(parameter_s,'sf', mode='list')
-        if 'f' in opts:
+        opts, args = self.parse_options(parameter_s, "sf", "aggressive", mode="list")
+        if "f" in opts:
             ans = True
         else:
             try:
@@ -552,7 +556,7 @@ def reset(self, parameter_s=''):
             for i in self.who_ls():
                 del(user_ns[i])
         elif len(args) == 0:                # Hard reset
-            self.shell.reset(new_session = False)
+            self.shell.reset(new_session=False, aggressive=("aggressive" in opts))
 
         # reset in/out/dhist/array: previously extensinions/clearcmd.py
         ip = self.shell
diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py
index ee65d3af6c8..c442658ae70 100644
--- a/IPython/core/shellapp.py
+++ b/IPython/core/shellapp.py
@@ -331,6 +331,7 @@ def init_code(self):
         # flush output, so itwon't be attached to the first cell
         sys.stdout.flush()
         sys.stderr.flush()
+        self.shell._sys_modules_keys = set(sys.modules.keys())
 
     def _run_exec_lines(self):
         """Run lines of code in IPythonApp.exec_lines in the user's namespace."""

From 1d3018a93e98ad55f41d4419f835b738de80e1b7 Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 13:23:15 +0000
Subject: [PATCH 0378/1407] Add new '%autoreload 3' option

Example: When an IPython session is ran with the 'autoreload' extension,
you will now have the option '3' to select which means the following:

    1. replicate all functionality from option 2
    2. autoload all new funcs/classes/enums/globals from the module
        when they're added
    3. autoload all newly imported funcs/classes/enums/globals
        from external modules

Try ``%autoreload 3`` in an IPython session
after running ``%load_ext autoreload``

For more information please see unit test -
extensions/tests/test_autoreload.py : 'test_autoload_newly_added_objects'
---
 IPython/extensions/autoreload.py              | 57 +++++++++++--
 IPython/extensions/tests/test_autoreload.py   | 83 +++++++++++++++++++
 .../pr/autoreload-option-3-feature.rst        | 14 ++++
 3 files changed, 148 insertions(+), 6 deletions(-)
 create mode 100644 docs/source/whatsnew/pr/autoreload-option-3-feature.rst

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index ada680fcf08..1b86e0cc35e 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -48,6 +48,12 @@
     Reload all modules (except those excluded by ``%aimport``) every
     time before executing the Python code typed.
 
+``%autoreload 3``
+
+    Reload all modules AND autoload newly added objects
+        (except those excluded by ``%aimport``)
+    every time before executing the Python code typed.
+
 ``%aimport``
 
     List modules which are to be automatically imported or not to be imported.
@@ -131,7 +137,10 @@ class ModuleReloader(object):
     check_all = True
     """Autoreload all modules, not just those listed in 'modules'"""
 
-    def __init__(self):
+    autoload_obj = False
+    """Autoreload all modules AND autoload all new objects"""
+
+    def __init__(self, shell=None):
         # Modules that failed to reload: {module: mtime-on-failed-reload, ...}
         self.failed = {}
         # Modules specially marked as autoreloadable.
@@ -142,6 +151,7 @@ def __init__(self):
         self.old_objects = {}
         # Module modification timestamps
         self.modules_mtimes = {}
+        self.shell = shell
 
         # Cache module modification times
         self.check(check_all=True, do_reload=False)
@@ -242,7 +252,10 @@ def check(self, check_all=False, do_reload=True):
             # If we've reached this point, we should try to reload the module
             if do_reload:
                 try:
-                    superreload(m, reload, self.old_objects)
+                    if self.autoload_obj:
+                        superreload(m, reload, self.old_objects, self.shell)
+                    else:
+                        superreload(m, reload, self.old_objects)
                     if py_filename in self.failed:
                         del self.failed[py_filename]
                 except:
@@ -356,7 +369,25 @@ def __call__(self):
         return self.obj
 
 
-def superreload(module, reload=reload, old_objects=None):
+def append_obj(module, d, name, obj, autoload=False):
+    not_in_mod = not hasattr(obj, '__module__') or obj.__module__ != module.__name__
+    if autoload:
+        # check needed for module global built-ins (int, str, dict,..)
+        if name.startswith('__') and not_in_mod:
+            return False
+    else:
+        if not_in_mod:
+            return False
+
+    key = (module.__name__, name)
+    try:
+        d.setdefault(key, []).append(weakref.ref(obj))
+    except TypeError:
+        pass
+    return True
+
+
+def superreload(module, reload=reload, old_objects=None, shell=None):
     """Enhanced version of the builtin reload function.
 
     superreload remembers objects previously in the module, and
@@ -371,7 +402,7 @@ def superreload(module, reload=reload, old_objects=None):
 
     # collect old objects in the module
     for name, obj in list(module.__dict__.items()):
-        if not hasattr(obj, '__module__') or obj.__module__ != module.__name__:
+        if not append_obj(module, old_objects, name, obj):
             continue
         key = (module.__name__, name)
         try:
@@ -400,7 +431,15 @@ def superreload(module, reload=reload, old_objects=None):
     # iterate over all objects and update functions & classes
     for name, new_obj in list(module.__dict__.items()):
         key = (module.__name__, name)
-        if key not in old_objects: continue
+        if key not in old_objects:
+            # here 'shell' acts both as a flag and as an output var
+            if (
+                shell is None or
+                name == 'Enum' or
+                not append_obj(module, old_objects, name, new_obj, True)
+            ):
+                continue
+            shell.user_ns[name] = new_obj
 
         new_refs = []
         for old_ref in old_objects[key]:
@@ -426,8 +465,9 @@ def superreload(module, reload=reload, old_objects=None):
 class AutoreloadMagics(Magics):
     def __init__(self, *a, **kw):
         super(AutoreloadMagics, self).__init__(*a, **kw)
-        self._reloader = ModuleReloader()
+        self._reloader = ModuleReloader(self.shell)
         self._reloader.check_all = False
+        self._reloader.autoload_obj = False
         self.loaded_modules = set(sys.modules)
 
     @line_magic
@@ -485,6 +525,11 @@ def autoreload(self, parameter_s=''):
         elif parameter_s == '2':
             self._reloader.check_all = True
             self._reloader.enabled = True
+            self._reloader.enabled = True
+        elif parameter_s == '3':
+            self._reloader.check_all = True
+            self._reloader.enabled = True
+            self._reloader.autoload_obj = True
 
     @line_magic
     def aimport(self, parameter_s='', stream=None):
diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index e81bf221515..141307cb507 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -252,6 +252,89 @@ def power(self, p):
             with nt.assert_raises(AttributeError):
                 self.shell.run_code("{object_name}.toto".format(object_name=object_name))
 
+    def test_autoload_newly_added_objects(self):
+        self.shell.magic_autoreload("3")
+        mod_code = """
+        def func1(): pass
+        """
+        mod_name, mod_fn = self.new_module(textwrap.dedent(mod_code))
+        self.shell.run_code(f"from {mod_name} import *")
+        self.shell.run_code("func1()")
+        with nt.assert_raises(NameError):
+            self.shell.run_code('func2()')
+        with nt.assert_raises(NameError):
+            self.shell.run_code('t = Test()')
+        with nt.assert_raises(NameError):
+            self.shell.run_code('number')
+
+        # ----------- TEST NEW OBJ LOADED --------------------------
+
+        new_code = """
+        def func1(): pass
+        def func2(): pass
+        class Test: pass
+        number = 0
+        from enum import Enum
+        class TestEnum(Enum):
+            A = 'a'
+        """
+        self.write_file(mod_fn, textwrap.dedent(new_code))
+
+        # test function now exists in shell's namespace namespace
+        self.shell.run_code("func2()")
+        # test function now exists in module's dict
+        self.shell.run_code(f"import sys; sys.modules['{mod_name}'].func2()")
+        # test class now exists
+        self.shell.run_code("t = Test()")
+        # test global built-in var now exists
+        self.shell.run_code('number')
+        # test the enumerations gets loaded succesfully
+        self.shell.run_code("TestEnum.A")
+
+        # ----------- TEST NEW OBJ CAN BE CHANGED --------------------
+
+        new_code = """
+        def func1(): return 'changed'
+        def func2(): return 'changed'
+        class Test:
+            def new_func(self):
+                return 'changed'
+        number = 1
+        from enum import Enum
+        class TestEnum(Enum):
+            A = 'a'
+            B = 'added'
+        """
+        self.write_file(mod_fn, textwrap.dedent(new_code))
+        self.shell.run_code("assert func1() == 'changed'")
+        self.shell.run_code("assert func2() == 'changed'")
+        self.shell.run_code("t = Test(); assert t.new_func() == 'changed'")
+        self.shell.run_code("assert number == 1")
+        self.shell.run_code("assert TestEnum.B.value == 'added'")
+
+        # ----------- TEST IMPORT FROM MODULE --------------------------
+
+        new_mod_code = '''
+        from enum import Enum
+        class Ext(Enum):
+            A = 'ext'
+        def ext_func():
+            return 'ext'
+        class ExtTest:
+            def meth(self):
+                return 'ext'
+        ext_int = 2
+        '''
+        new_mod_name, new_mod_fn = self.new_module(textwrap.dedent(new_mod_code))
+        current_mod_code = f'''
+        from {new_mod_name} import *
+        '''
+        self.write_file(mod_fn, textwrap.dedent(current_mod_code))
+        self.shell.run_code("assert Ext.A.value == 'ext'")
+        self.shell.run_code("assert ext_func() == 'ext'")
+        self.shell.run_code("t = ExtTest(); assert t.meth() == 'ext'")
+        self.shell.run_code("assert ext_int == 2")
+
     def _check_smoketest(self, use_aimport=True):
         """
         Functional test for the automatic reloader using either
diff --git a/docs/source/whatsnew/pr/autoreload-option-3-feature.rst b/docs/source/whatsnew/pr/autoreload-option-3-feature.rst
new file mode 100644
index 00000000000..1adc4444858
--- /dev/null
+++ b/docs/source/whatsnew/pr/autoreload-option-3-feature.rst
@@ -0,0 +1,14 @@
+Autoreload 3 feature
+====================
+
+Example: When an IPython session is ran with the 'autoreload' extension loaded,
+you will now have the option '3' to select which means the following:
+
+    1. replicate all functionality from option 2
+    2. autoload all new funcs/classes/enums/globals from the module when they're added
+    3. autoload all newly imported funcs/classes/enums/globals from external modules
+
+Try ``%autoreload 3`` in an IPython session after running ``%load_ext autoreload``
+
+For more information please see unit test - 
+    extensions/tests/test_autoreload.py : 'test_autoload_newly_added_objects'

From d80f7dbb44ec79346da6c4d21a8cc7a4e5a45c15 Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 13:26:06 +0000
Subject: [PATCH 0379/1407] updated whatsnew

---
 docs/source/whatsnew/development.rst            | 17 ++++++++++++++++-
 .../whatsnew/pr/autoreload-option-3-feature.rst | 14 --------------
 2 files changed, 16 insertions(+), 15 deletions(-)
 delete mode 100644 docs/source/whatsnew/pr/autoreload-option-3-feature.rst

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index e6c933071ec..e7a867d8126 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -93,6 +93,21 @@ Currently, autosuggestions are only shown in the emacs or vi insert editing mode
 - The ctrl e, ctrl f, and alt f shortcuts work by default in emacs mode.
 - To use these shortcuts in vi insert mode, you will have to create `custom keybindings in your config.py <https://github.com/mskar/setup/commit/2892fcee46f9f80ef7788f0749edc99daccc52f4/>`__.
 
+Autoreload 3 feature
+====================
+
+Example: When an IPython session is ran with the 'autoreload' extension loaded,
+you will now have the option '3' to select which means the following:
+
+    1. replicate all functionality from option 2
+    2. autoload all new funcs/classes/enums/globals from the module when they're added
+    3. autoload all newly imported funcs/classes/enums/globals from external modules
+
+Try ``%autoreload 3`` in an IPython session after running ``%load_ext autoreload``
+
+For more information please see unit test -
+    extensions/tests/test_autoreload.py : 'test_autoload_newly_added_objects'
+
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 
 As a reminder, IPython master has diverged from the 7.x branch, thus master may
@@ -101,4 +116,4 @@ have more feature and API changes.
 Backwards incompatible changes
 ------------------------------
 
-.. DO NOT EDIT THIS LINE BEFORE RELEASE. INCOMPAT INSERTION POINT.
+.. DO NOT EDIT THIS LINE BEFORE RELEASE. INCOMPAT INSERTION POINT.
\ No newline at end of file
diff --git a/docs/source/whatsnew/pr/autoreload-option-3-feature.rst b/docs/source/whatsnew/pr/autoreload-option-3-feature.rst
deleted file mode 100644
index 1adc4444858..00000000000
--- a/docs/source/whatsnew/pr/autoreload-option-3-feature.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-Autoreload 3 feature
-====================
-
-Example: When an IPython session is ran with the 'autoreload' extension loaded,
-you will now have the option '3' to select which means the following:
-
-    1. replicate all functionality from option 2
-    2. autoload all new funcs/classes/enums/globals from the module when they're added
-    3. autoload all newly imported funcs/classes/enums/globals from external modules
-
-Try ``%autoreload 3`` in an IPython session after running ``%load_ext autoreload``
-
-For more information please see unit test - 
-    extensions/tests/test_autoreload.py : 'test_autoload_newly_added_objects'

From 0233e65d8086d0ec34acb8685b7a5411633f0899 Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 13:26:33 +0000
Subject: [PATCH 0380/1407] Apply pyupgrade to
 IPython/extensions/tests/test_autoreload.py

    pyupgrade --py36-plus IPython/extensions/tests/test_autoreload.py

To ignore those changes when using git blame see the content of
.git-blame-ignore-revs
---
 IPython/extensions/tests/test_autoreload.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index 141307cb507..7c61ba90fe8 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -242,15 +242,15 @@ def power(self, p):
         self.shell.run_code("second = MyClass(5)")
 
         for object_name in {'first', 'second'}:
-            self.shell.run_code("{object_name}.power(5)".format(object_name=object_name))
+            self.shell.run_code(f"{object_name}.power(5)")
             with nt.assert_raises(AttributeError):
-                self.shell.run_code("{object_name}.cube()".format(object_name=object_name))
+                self.shell.run_code(f"{object_name}.cube()")
             with nt.assert_raises(AttributeError):
-                self.shell.run_code("{object_name}.square()".format(object_name=object_name))
-            self.shell.run_code("{object_name}.b".format(object_name=object_name))
-            self.shell.run_code("{object_name}.a".format(object_name=object_name))
+                self.shell.run_code(f"{object_name}.square()")
+            self.shell.run_code(f"{object_name}.b")
+            self.shell.run_code(f"{object_name}.a")
             with nt.assert_raises(AttributeError):
-                self.shell.run_code("{object_name}.toto".format(object_name=object_name))
+                self.shell.run_code(f"{object_name}.toto")
 
     def test_autoload_newly_added_objects(self):
         self.shell.magic_autoreload("3")

From 3261f668f09ccf790b16ae868089e4a8a03e8d39 Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 13:26:33 +0000
Subject: [PATCH 0381/1407] Update .git-blame-ignore-revs with previous commit

---
 .git-blame-ignore-revs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index fbe0daac737..3cb31094108 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -13,3 +13,4 @@
 # <full commit hash>  # initial black-format 
 # <full commit hash>  # rename something internal
 6e748726282d1acb9a4f9f264ee679c474c4b8f5  # Apply pygrade --36plus on IPython/core/tests/test_inputtransformer.py.
+0233e65d8086d0ec34acb8685b7a5411633f0899 # apply pyupgrade to IPython/extensions/tests/test_autoreload.py

From a6a7e4dd7e51b892147895006d3a2a6c34b79ae6 Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 13:26:34 +0000
Subject: [PATCH 0382/1407] Apply black to
 IPython/extensions/tests/test_autoreload.py

    black --target-version py36 IPython/extensions/tests/test_autoreload.py

To ignore those changes when using git blame see the content of
.git-blame-ignore-revs
---
 IPython/extensions/tests/test_autoreload.py | 147 ++++++++++++--------
 1 file changed, 86 insertions(+), 61 deletions(-)

diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index 7c61ba90fe8..a84c8c9fe96 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -1,16 +1,16 @@
 """Tests for autoreload extension.
 """
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 #  Copyright (c) 2012 IPython Development Team.
 #
 #  Distributed under the terms of the Modified BSD License.
 #
 #  The full license is in the file COPYING.txt, distributed with this software.
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 # Imports
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
 import os
 import sys
@@ -29,26 +29,26 @@
 from IPython.extensions.autoreload import AutoreloadMagics
 from IPython.core.events import EventManager, pre_run_cell
 
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 # Test fixture
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
 noop = lambda *a, **kw: None
 
-class FakeShell:
 
+class FakeShell:
     def __init__(self):
         self.ns = {}
         self.user_ns = self.ns
         self.user_ns_hidden = {}
-        self.events = EventManager(self, {'pre_run_cell', pre_run_cell})
+        self.events = EventManager(self, {"pre_run_cell", pre_run_cell})
         self.auto_magics = AutoreloadMagics(shell=self)
-        self.events.register('pre_run_cell', self.auto_magics.pre_run_cell)
+        self.events.register("pre_run_cell", self.auto_magics.pre_run_cell)
 
     register_magics = set_hook = noop
 
     def run_code(self, code):
-        self.events.trigger('pre_run_cell')
+        self.events.trigger("pre_run_cell")
         exec(code, self.user_ns)
         self.auto_magics.post_execute_hook()
 
@@ -85,7 +85,7 @@ def tearDown(self):
         self.shell = None
 
     def get_module(self):
-        module_name = "tmpmod_" + "".join(random.sample(self.filename_chars,20))
+        module_name = "tmpmod_" + "".join(random.sample(self.filename_chars, 20))
         if module_name in sys.modules:
             del sys.modules[module_name]
         file_name = os.path.join(self.test_dir, module_name + ".py")
@@ -111,19 +111,21 @@ def write_file(self, filename, content):
         time.sleep(1.05)
 
         # Write
-        with open(filename, 'w') as f:
+        with open(filename, "w") as f:
             f.write(content)
 
     def new_module(self, code):
         code = textwrap.dedent(code)
         mod_name, mod_fn = self.get_module()
-        with open(mod_fn, 'w') as f:
+        with open(mod_fn, "w") as f:
             f.write(code)
         return mod_name, mod_fn
 
-#-----------------------------------------------------------------------------
+
+# -----------------------------------------------------------------------------
 # Test automatic reloading
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
+
 
 def pickle_get_current_class(obj):
     """
@@ -136,25 +138,36 @@ def pickle_get_current_class(obj):
         obj2 = getattr(obj2, subpath)
     return obj2
 
-class TestAutoreload(Fixture):
 
+class TestAutoreload(Fixture):
     def test_reload_enums(self):
-        mod_name, mod_fn = self.new_module(textwrap.dedent("""
+        mod_name, mod_fn = self.new_module(
+            textwrap.dedent(
+                """
                                 from enum import Enum
                                 class MyEnum(Enum):
                                     A = 'A'
                                     B = 'B'
-                            """))
+                            """
+            )
+        )
         self.shell.magic_autoreload("2")
         self.shell.magic_aimport(mod_name)
-        self.write_file(mod_fn, textwrap.dedent("""
+        self.write_file(
+            mod_fn,
+            textwrap.dedent(
+                """
                                 from enum import Enum
                                 class MyEnum(Enum):
                                     A = 'A'
                                     B = 'B'
                                     C = 'C'
-                            """))
-        with tt.AssertNotPrints(('[autoreload of %s failed:' % mod_name), channel='stderr'):
+                            """
+            ),
+        )
+        with tt.AssertNotPrints(
+            ("[autoreload of %s failed:" % mod_name), channel="stderr"
+        ):
             self.shell.run_code("pass")  # trigger another reload
 
     def test_reload_class_type(self):
@@ -195,7 +208,9 @@ def meth(self):
 
     def test_reload_class_attributes(self):
         self.shell.magic_autoreload("2")
-        mod_name, mod_fn = self.new_module(textwrap.dedent("""
+        mod_name, mod_fn = self.new_module(
+            textwrap.dedent(
+                """
                                 class MyClass:
 
                                     def __init__(self, a=10):
@@ -241,7 +256,7 @@ def power(self, p):
 
         self.shell.run_code("second = MyClass(5)")
 
-        for object_name in {'first', 'second'}:
+        for object_name in {"first", "second"}:
             self.shell.run_code(f"{object_name}.power(5)")
             with nt.assert_raises(AttributeError):
                 self.shell.run_code(f"{object_name}.cube()")
@@ -261,11 +276,11 @@ def func1(): pass
         self.shell.run_code(f"from {mod_name} import *")
         self.shell.run_code("func1()")
         with nt.assert_raises(NameError):
-            self.shell.run_code('func2()')
+            self.shell.run_code("func2()")
         with nt.assert_raises(NameError):
-            self.shell.run_code('t = Test()')
+            self.shell.run_code("t = Test()")
         with nt.assert_raises(NameError):
-            self.shell.run_code('number')
+            self.shell.run_code("number")
 
         # ----------- TEST NEW OBJ LOADED --------------------------
 
@@ -287,7 +302,7 @@ class TestEnum(Enum):
         # test class now exists
         self.shell.run_code("t = Test()")
         # test global built-in var now exists
-        self.shell.run_code('number')
+        self.shell.run_code("number")
         # test the enumerations gets loaded succesfully
         self.shell.run_code("TestEnum.A")
 
@@ -314,7 +329,7 @@ class TestEnum(Enum):
 
         # ----------- TEST IMPORT FROM MODULE --------------------------
 
-        new_mod_code = '''
+        new_mod_code = """
         from enum import Enum
         class Ext(Enum):
             A = 'ext'
@@ -324,11 +339,11 @@ class ExtTest:
             def meth(self):
                 return 'ext'
         ext_int = 2
-        '''
+        """
         new_mod_name, new_mod_fn = self.new_module(textwrap.dedent(new_mod_code))
-        current_mod_code = f'''
+        current_mod_code = f"""
         from {new_mod_name} import *
-        '''
+        """
         self.write_file(mod_fn, textwrap.dedent(current_mod_code))
         self.shell.run_code("assert Ext.A.value == 'ext'")
         self.shell.run_code("assert ext_func() == 'ext'")
@@ -341,7 +356,8 @@ def _check_smoketest(self, use_aimport=True):
         '%autoreload 1' or '%autoreload 2'
         """
 
-        mod_name, mod_fn = self.new_module("""
+        mod_name, mod_fn = self.new_module(
+            """
 x = 9
 
 z = 123  # this item will be deleted
@@ -364,7 +380,8 @@ def zzz(self):
 class Bar:    # old-style class: weakref doesn't work for it on Python < 2.7
     def foo(self):
         return 1
-""")
+"""
+        )
 
         #
         # Import module, and mark for reloading
@@ -383,8 +400,9 @@ def foo(self):
             self.shell.run_code("import %s" % mod_name)
             stream = StringIO()
             self.shell.magic_aimport("", stream=stream)
-            nt.assert_true("Modules to reload:\nall-except-skipped" in
-                           stream.getvalue())
+            nt.assert_true(
+                "Modules to reload:\nall-except-skipped" in stream.getvalue()
+            )
         nt.assert_in(mod_name, self.shell.ns)
 
         mod = sys.modules[mod_name]
@@ -419,20 +437,29 @@ def check_module_contents():
         # Simulate a failed reload: no reload should occur and exactly
         # one error message should be printed
         #
-        self.write_file(mod_fn, """
+        self.write_file(
+            mod_fn,
+            """
 a syntax error
-""")
+""",
+        )
 
-        with tt.AssertPrints(('[autoreload of %s failed:' % mod_name), channel='stderr'):
-            self.shell.run_code("pass") # trigger reload
-        with tt.AssertNotPrints(('[autoreload of %s failed:' % mod_name), channel='stderr'):
-            self.shell.run_code("pass") # trigger another reload
+        with tt.AssertPrints(
+            ("[autoreload of %s failed:" % mod_name), channel="stderr"
+        ):
+            self.shell.run_code("pass")  # trigger reload
+        with tt.AssertNotPrints(
+            ("[autoreload of %s failed:" % mod_name), channel="stderr"
+        ):
+            self.shell.run_code("pass")  # trigger another reload
         check_module_contents()
 
         #
         # Rewrite module (this time reload should succeed)
         #
-        self.write_file(mod_fn, """
+        self.write_file(
+            mod_fn,
+            """
 x = 10
 
 def foo(y):
@@ -450,30 +477,31 @@ def quux(self):
 class Bar:    # old-style class
     def foo(self):
         return 2
-""")
+""",
+        )
 
         def check_module_contents():
             nt.assert_equal(mod.x, 10)
-            nt.assert_false(hasattr(mod, 'z'))
+            nt.assert_false(hasattr(mod, "z"))
 
-            nt.assert_equal(old_foo(0), 4) # superreload magic!
+            nt.assert_equal(old_foo(0), 4)  # superreload magic!
             nt.assert_equal(mod.foo(0), 4)
 
             obj = mod.Baz(9)
-            nt.assert_equal(old_obj.bar(1), 11) # superreload magic!
+            nt.assert_equal(old_obj.bar(1), 11)  # superreload magic!
             nt.assert_equal(obj.bar(1), 11)
 
             nt.assert_equal(old_obj.quux, 43)
             nt.assert_equal(obj.quux, 43)
 
-            nt.assert_false(hasattr(old_obj, 'zzz'))
-            nt.assert_false(hasattr(obj, 'zzz'))
+            nt.assert_false(hasattr(old_obj, "zzz"))
+            nt.assert_false(hasattr(obj, "zzz"))
 
             obj2 = mod.Bar()
             nt.assert_equal(old_obj2.foo(), 2)
             nt.assert_equal(obj2.foo(), 2)
 
-        self.shell.run_code("pass") # trigger reload
+        self.shell.run_code("pass")  # trigger reload
         check_module_contents()
 
         #
@@ -481,7 +509,7 @@ def check_module_contents():
         #
         os.unlink(mod_fn)
 
-        self.shell.run_code("pass") # trigger reload
+        self.shell.run_code("pass")  # trigger reload
         check_module_contents()
 
         #
@@ -491,19 +519,21 @@ def check_module_contents():
             self.shell.magic_aimport("-" + mod_name)
             stream = StringIO()
             self.shell.magic_aimport("", stream=stream)
-            nt.assert_true(("Modules to skip:\n%s" % mod_name) in
-                           stream.getvalue())
+            nt.assert_true(("Modules to skip:\n%s" % mod_name) in stream.getvalue())
 
             # This should succeed, although no such module exists
             self.shell.magic_aimport("-tmpmod_as318989e89ds")
         else:
             self.shell.magic_autoreload("0")
 
-        self.write_file(mod_fn, """
+        self.write_file(
+            mod_fn,
+            """
 x = -99
-""")
+""",
+        )
 
-        self.shell.run_code("pass") # trigger reload
+        self.shell.run_code("pass")  # trigger reload
         self.shell.run_code("pass")
         check_module_contents()
 
@@ -515,7 +545,7 @@ def check_module_contents():
         else:
             self.shell.magic_autoreload("")
 
-        self.shell.run_code("pass") # trigger reload
+        self.shell.run_code("pass")  # trigger reload
         nt.assert_equal(mod.x, -99)
 
     def test_smoketest_aimport(self):
@@ -523,8 +553,3 @@ def test_smoketest_aimport(self):
 
     def test_smoketest_autoreload(self):
         self._check_smoketest(use_aimport=False)
-
-
-
-
-

From 16edee41656279b68ecdbb7e80652e804269b5e8 Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 13:26:34 +0000
Subject: [PATCH 0383/1407] Update .git-blame-ignore-revs with previous commit

---
 .git-blame-ignore-revs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 3cb31094108..c2cea058094 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -14,3 +14,4 @@
 # <full commit hash>  # rename something internal
 6e748726282d1acb9a4f9f264ee679c474c4b8f5  # Apply pygrade --36plus on IPython/core/tests/test_inputtransformer.py.
 0233e65d8086d0ec34acb8685b7a5411633f0899 # apply pyupgrade to IPython/extensions/tests/test_autoreload.py
+a6a7e4dd7e51b892147895006d3a2a6c34b79ae6 # apply black to IPython/extensions/tests/test_autoreload.py

From c5ca5a8f25432dfd6b9eccbbe446a8348bf37cfa Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 13:26:46 +0000
Subject: [PATCH 0384/1407] Apply pyupgrade to IPython/extensions/autoreload.py

    pyupgrade --py36-plus IPython/extensions/autoreload.py

To ignore those changes when using git blame see the content of
.git-blame-ignore-revs
---
 IPython/extensions/autoreload.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index 1b86e0cc35e..547b47fa5ca 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -130,7 +130,7 @@
 # Autoreload functionality
 #------------------------------------------------------------------------------
 
-class ModuleReloader(object):
+class ModuleReloader:
     enabled = False
     """Whether this reloader is enabled"""
 
@@ -259,7 +259,7 @@ def check(self, check_all=False, do_reload=True):
                     if py_filename in self.failed:
                         del self.failed[py_filename]
                 except:
-                    print("[autoreload of %s failed: %s]" % (
+                    print("[autoreload of {} failed: {}]".format(
                             modname, traceback.format_exc(10)), file=sys.stderr)
                     self.failed[py_filename] = pymtime
 
@@ -362,7 +362,7 @@ def update_generic(a, b):
     return False
 
 
-class StrongRef(object):
+class StrongRef:
     def __init__(self, obj):
         self.obj = obj
     def __call__(self):
@@ -464,7 +464,7 @@ def superreload(module, reload=reload, old_objects=None, shell=None):
 @magics_class
 class AutoreloadMagics(Magics):
     def __init__(self, *a, **kw):
-        super(AutoreloadMagics, self).__init__(*a, **kw)
+        super().__init__(*a, **kw)
         self._reloader = ModuleReloader(self.shell)
         self._reloader.check_all = False
         self._reloader.autoload_obj = False

From ebc242387ea9a9b31c998ceb0ae8b7d99eda0bc0 Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 13:26:46 +0000
Subject: [PATCH 0385/1407] Update .git-blame-ignore-revs with previous commit

---
 .git-blame-ignore-revs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index c2cea058094..e2f4f934e8e 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -15,3 +15,4 @@
 6e748726282d1acb9a4f9f264ee679c474c4b8f5  # Apply pygrade --36plus on IPython/core/tests/test_inputtransformer.py.
 0233e65d8086d0ec34acb8685b7a5411633f0899 # apply pyupgrade to IPython/extensions/tests/test_autoreload.py
 a6a7e4dd7e51b892147895006d3a2a6c34b79ae6 # apply black to IPython/extensions/tests/test_autoreload.py
+c5ca5a8f25432dfd6b9eccbbe446a8348bf37cfa # apply pyupgrade to IPython/extensions/autoreload.py

From 50624b84ccdece781750f5eb635a9efbf2fe30d6 Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 13:26:47 +0000
Subject: [PATCH 0386/1407] Apply black to IPython/extensions/autoreload.py

    black --target-version py36 IPython/extensions/autoreload.py

To ignore those changes when using git blame see the content of
.git-blame-ignore-revs
---
 IPython/extensions/autoreload.py | 126 ++++++++++++++++++-------------
 1 file changed, 72 insertions(+), 54 deletions(-)

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index 547b47fa5ca..66881128149 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -100,21 +100,21 @@
 
 skip_doctest = True
 
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 #  Copyright (C) 2000 Thomas Heller
 #  Copyright (C) 2008 Pauli Virtanen <pav@iki.fi>
 #  Copyright (C) 2012  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.
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 #
 # This IPython module is written by Pauli Virtanen, based on the autoreload
 # code by Thomas Heller.
 
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 # Imports
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
 import os
 import sys
@@ -126,9 +126,10 @@
 from importlib.util import source_from_cache
 from imp import reload
 
-#------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 # Autoreload functionality
-#------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
+
 
 class ModuleReloader:
     enabled = False
@@ -186,22 +187,22 @@ def aimport_module(self, module_name):
         self.mark_module_reloadable(module_name)
 
         import_module(module_name)
-        top_name = module_name.split('.')[0]
+        top_name = module_name.split(".")[0]
         top_module = sys.modules[top_name]
         return top_module, top_name
 
     def filename_and_mtime(self, module):
-        if not hasattr(module, '__file__') or module.__file__ is None:
+        if not hasattr(module, "__file__") or module.__file__ is None:
             return None, None
 
-        if getattr(module, '__name__', None) in [None, '__mp_main__', '__main__']:
+        if getattr(module, "__name__", None) in [None, "__mp_main__", "__main__"]:
             # we cannot reload(__main__) or reload(__mp_main__)
             return None, None
 
         filename = module.__file__
         path, ext = os.path.splitext(filename)
 
-        if ext.lower() == '.py':
+        if ext.lower() == ".py":
             py_filename = filename
         else:
             try:
@@ -259,17 +260,28 @@ def check(self, check_all=False, do_reload=True):
                     if py_filename in self.failed:
                         del self.failed[py_filename]
                 except:
-                    print("[autoreload of {} failed: {}]".format(
-                            modname, traceback.format_exc(10)), file=sys.stderr)
+                    print(
+                        "[autoreload of {} failed: {}]".format(
+                            modname, traceback.format_exc(10)
+                        ),
+                        file=sys.stderr,
+                    )
                     self.failed[py_filename] = pymtime
 
-#------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
 # superreload
-#------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 
 
-func_attrs = ['__code__', '__defaults__', '__doc__',
-              '__closure__', '__globals__', '__dict__']
+func_attrs = [
+    "__code__",
+    "__defaults__",
+    "__doc__",
+    "__closure__",
+    "__globals__",
+    "__dict__",
+]
 
 
 def update_function(old, new):
@@ -285,7 +297,7 @@ def update_instances(old, new):
     """Use garbage collector to find all instances that refer to the old
     class definition and update their __class__ to point to the new class
     definition"""
-    
+
     refs = gc.get_referrers(old)
 
     for ref in refs:
@@ -312,19 +324,20 @@ def update_class(old, new):
                 pass
             continue
 
-        if update_generic(old_obj, new_obj): continue
+        if update_generic(old_obj, new_obj):
+            continue
 
         try:
             setattr(old, key, getattr(new, key))
         except (AttributeError, TypeError):
-            pass # skip non-writable attributes
+            pass  # skip non-writable attributes
 
     for key in list(new.__dict__.keys()):
         if key not in list(old.__dict__.keys()):
             try:
                 setattr(old, key, getattr(new, key))
             except (AttributeError, TypeError):
-                pass # skip non-writable attributes
+                pass  # skip non-writable attributes
 
     # update all instances of class
     update_instances(old, new)
@@ -342,16 +355,18 @@ def isinstance2(a, b, typ):
 
 
 UPDATE_RULES = [
-    (lambda a, b: isinstance2(a, b, type),
-     update_class),
-    (lambda a, b: isinstance2(a, b, types.FunctionType),
-     update_function),
-    (lambda a, b: isinstance2(a, b, property),
-     update_property),
+    (lambda a, b: isinstance2(a, b, type), update_class),
+    (lambda a, b: isinstance2(a, b, types.FunctionType), update_function),
+    (lambda a, b: isinstance2(a, b, property), update_property),
 ]
-UPDATE_RULES.extend([(lambda a, b: isinstance2(a, b, types.MethodType),
-                      lambda a, b: update_function(a.__func__, b.__func__)),
-])
+UPDATE_RULES.extend(
+    [
+        (
+            lambda a, b: isinstance2(a, b, types.MethodType),
+            lambda a, b: update_function(a.__func__, b.__func__),
+        ),
+    ]
+)
 
 
 def update_generic(a, b):
@@ -365,15 +380,16 @@ def update_generic(a, b):
 class StrongRef:
     def __init__(self, obj):
         self.obj = obj
+
     def __call__(self):
         return self.obj
 
 
 def append_obj(module, d, name, obj, autoload=False):
-    not_in_mod = not hasattr(obj, '__module__') or obj.__module__ != module.__name__
+    not_in_mod = not hasattr(obj, "__module__") or obj.__module__ != module.__name__
     if autoload:
         # check needed for module global built-ins (int, str, dict,..)
-        if name.startswith('__') and not_in_mod:
+        if name.startswith("__") and not_in_mod:
             return False
     else:
         if not_in_mod:
@@ -416,8 +432,8 @@ def superreload(module, reload=reload, old_objects=None, shell=None):
         old_dict = module.__dict__.copy()
         old_name = module.__name__
         module.__dict__.clear()
-        module.__dict__['__name__'] = old_name
-        module.__dict__['__loader__'] = old_dict['__loader__']
+        module.__dict__["__name__"] = old_name
+        module.__dict__["__loader__"] = old_dict["__loader__"]
     except (TypeError, AttributeError, KeyError):
         pass
 
@@ -434,9 +450,9 @@ def superreload(module, reload=reload, old_objects=None, shell=None):
         if key not in old_objects:
             # here 'shell' acts both as a flag and as an output var
             if (
-                shell is None or
-                name == 'Enum' or
-                not append_obj(module, old_objects, name, new_obj, True)
+                shell is None
+                or name == "Enum"
+                or not append_obj(module, old_objects, name, new_obj, True)
             ):
                 continue
             shell.user_ns[name] = new_obj
@@ -444,7 +460,8 @@ def superreload(module, reload=reload, old_objects=None, shell=None):
         new_refs = []
         for old_ref in old_objects[key]:
             old_obj = old_ref()
-            if old_obj is None: continue
+            if old_obj is None:
+                continue
             new_refs.append(old_ref)
             update_generic(old_obj, new_obj)
 
@@ -455,12 +472,14 @@ def superreload(module, reload=reload, old_objects=None, shell=None):
 
     return module
 
-#------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
 # IPython connectivity
-#------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 
 from IPython.core.magic import Magics, magics_class, line_magic
 
+
 @magics_class
 class AutoreloadMagics(Magics):
     def __init__(self, *a, **kw):
@@ -471,7 +490,7 @@ def __init__(self, *a, **kw):
         self.loaded_modules = set(sys.modules)
 
     @line_magic
-    def autoreload(self, parameter_s=''):
+    def autoreload(self, parameter_s=""):
         r"""%autoreload => Reload modules automatically
 
         %autoreload
@@ -515,24 +534,24 @@ def autoreload(self, parameter_s=''):
           autoreloaded.
 
         """
-        if parameter_s == '':
+        if parameter_s == "":
             self._reloader.check(True)
-        elif parameter_s == '0':
+        elif parameter_s == "0":
             self._reloader.enabled = False
-        elif parameter_s == '1':
+        elif parameter_s == "1":
             self._reloader.check_all = False
             self._reloader.enabled = True
-        elif parameter_s == '2':
+        elif parameter_s == "2":
             self._reloader.check_all = True
             self._reloader.enabled = True
             self._reloader.enabled = True
-        elif parameter_s == '3':
+        elif parameter_s == "3":
             self._reloader.check_all = True
             self._reloader.enabled = True
             self._reloader.autoload_obj = True
 
     @line_magic
-    def aimport(self, parameter_s='', stream=None):
+    def aimport(self, parameter_s="", stream=None):
         """%aimport => Import modules for automatic reloading.
 
         %aimport
@@ -556,13 +575,13 @@ def aimport(self, parameter_s='', stream=None):
             if self._reloader.check_all:
                 stream.write("Modules to reload:\nall-except-skipped\n")
             else:
-                stream.write("Modules to reload:\n%s\n" % ' '.join(to_reload))
-            stream.write("\nModules to skip:\n%s\n" % ' '.join(to_skip))
-        elif modname.startswith('-'):
+                stream.write("Modules to reload:\n%s\n" % " ".join(to_reload))
+            stream.write("\nModules to skip:\n%s\n" % " ".join(to_skip))
+        elif modname.startswith("-"):
             modname = modname[1:]
             self._reloader.mark_module_skipped(modname)
         else:
-            for _module in ([_.strip() for _ in modname.split(',')]):
+            for _module in [_.strip() for _ in modname.split(",")]:
                 top_module, top_name = self._reloader.aimport_module(_module)
 
                 # Inject module to user namespace
@@ -576,8 +595,7 @@ def pre_run_cell(self):
                 pass
 
     def post_execute_hook(self):
-        """Cache the modification times of any modules imported in this execution
-        """
+        """Cache the modification times of any modules imported in this execution"""
         newly_loaded_modules = set(sys.modules) - self.loaded_modules
         for modname in newly_loaded_modules:
             _, pymtime = self._reloader.filename_and_mtime(sys.modules[modname])
@@ -591,5 +609,5 @@ def load_ipython_extension(ip):
     """Load the extension in IPython."""
     auto_reload = AutoreloadMagics(ip)
     ip.register_magics(auto_reload)
-    ip.events.register('pre_run_cell', auto_reload.pre_run_cell)
-    ip.events.register('post_execute', auto_reload.post_execute_hook)
+    ip.events.register("pre_run_cell", auto_reload.pre_run_cell)
+    ip.events.register("post_execute", auto_reload.post_execute_hook)

From 3ddc569a6eb5019f7be8f7b6b852b1394177807e Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 13:26:47 +0000
Subject: [PATCH 0387/1407] Update .git-blame-ignore-revs with previous commit

---
 .git-blame-ignore-revs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index e2f4f934e8e..3172494d492 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -16,3 +16,4 @@
 0233e65d8086d0ec34acb8685b7a5411633f0899 # apply pyupgrade to IPython/extensions/tests/test_autoreload.py
 a6a7e4dd7e51b892147895006d3a2a6c34b79ae6 # apply black to IPython/extensions/tests/test_autoreload.py
 c5ca5a8f25432dfd6b9eccbbe446a8348bf37cfa # apply pyupgrade to IPython/extensions/autoreload.py
+50624b84ccdece781750f5eb635a9efbf2fe30d6 # apply black to IPython/extensions/autoreload.py

From 92fe3883fe26f7d1dcad2f975299d1cc84d73c7f Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 14:06:36 +0000
Subject: [PATCH 0388/1407] fixed unindent issue in autoreload.py

---
 IPython/extensions/autoreload.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index 66881128149..3715d2635d4 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -51,7 +51,6 @@
 ``%autoreload 3``
 
     Reload all modules AND autoload newly added objects
-        (except those excluded by ``%aimport``)
     every time before executing the Python code typed.
 
 ``%aimport``

From b7aaa47412b96379198705955004930c57f9d74a Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 14:31:31 +0000
Subject: [PATCH 0389/1407] Apply pyupgrade to IPython/extensions/autoreload.py

    pyupgrade --py36-plus IPython/extensions/autoreload.py

To ignore those changes when using git blame see the content of
.git-blame-ignore-revs
---
 IPython/extensions/autoreload.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index 3715d2635d4..198f84fe68f 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -384,11 +384,23 @@ def __call__(self):
         return self.obj
 
 
+mod_attrs = [
+    "__name__",
+    "__doc__",
+    "__package__",
+    "__loader__",
+    "__spec__",
+    "__file__",
+    "__cached__",
+    "__builtins__"
+]
+
+
 def append_obj(module, d, name, obj, autoload=False):
     not_in_mod = not hasattr(obj, "__module__") or obj.__module__ != module.__name__
     if autoload:
-        # check needed for module global built-ins (int, str, dict,..)
-        if name.startswith("__") and not_in_mod:
+        # check needed for module global built-ins
+        if not_in_mod and name in mod_attrs:
             return False
     else:
         if not_in_mod:

From 7d9d9eec61eca2d4ea7741e654faf3d0f0370a06 Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 14:31:31 +0000
Subject: [PATCH 0390/1407] Update .git-blame-ignore-revs with previous commit

---
 .git-blame-ignore-revs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 3172494d492..afbbfc875e0 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -17,3 +17,4 @@
 a6a7e4dd7e51b892147895006d3a2a6c34b79ae6 # apply black to IPython/extensions/tests/test_autoreload.py
 c5ca5a8f25432dfd6b9eccbbe446a8348bf37cfa # apply pyupgrade to IPython/extensions/autoreload.py
 50624b84ccdece781750f5eb635a9efbf2fe30d6 # apply black to IPython/extensions/autoreload.py
+b7aaa47412b96379198705955004930c57f9d74a # apply pyupgrade to IPython/extensions/autoreload.py

From 9c7476a88af3e567426b412f1b3c778401d8f6aa Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 14:31:32 +0000
Subject: [PATCH 0391/1407] Apply black to IPython/extensions/autoreload.py

    black --target-version py36 IPython/extensions/autoreload.py

To ignore those changes when using git blame see the content of
.git-blame-ignore-revs
---
 IPython/extensions/autoreload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index 198f84fe68f..cfd19776d14 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -392,7 +392,7 @@ def __call__(self):
     "__spec__",
     "__file__",
     "__cached__",
-    "__builtins__"
+    "__builtins__",
 ]
 
 

From 00c09cca80ac4fdc53e08edd10408e17fbb37174 Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 14:31:32 +0000
Subject: [PATCH 0392/1407] Update .git-blame-ignore-revs with previous commit

---
 .git-blame-ignore-revs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index afbbfc875e0..d5be139ad02 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -18,3 +18,4 @@ a6a7e4dd7e51b892147895006d3a2a6c34b79ae6 # apply black to IPython/extensions/tes
 c5ca5a8f25432dfd6b9eccbbe446a8348bf37cfa # apply pyupgrade to IPython/extensions/autoreload.py
 50624b84ccdece781750f5eb635a9efbf2fe30d6 # apply black to IPython/extensions/autoreload.py
 b7aaa47412b96379198705955004930c57f9d74a # apply pyupgrade to IPython/extensions/autoreload.py
+9c7476a88af3e567426b412f1b3c778401d8f6aa # apply black to IPython/extensions/autoreload.py

From c2183e815e101efc8113bb38fb4ac111dc1abef2 Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Thu, 17 Dec 2020 14:51:20 +0000
Subject: [PATCH 0393/1407] remove unnecessary negation from var name

---
 IPython/extensions/autoreload.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index cfd19776d14..f481520a4c5 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -397,13 +397,13 @@ def __call__(self):
 
 
 def append_obj(module, d, name, obj, autoload=False):
-    not_in_mod = not hasattr(obj, "__module__") or obj.__module__ != module.__name__
+    in_module = hasattr(obj, "__module__") and obj.__module__ == module.__name__
     if autoload:
         # check needed for module global built-ins
-        if not_in_mod and name in mod_attrs:
+        if not in_module and name in mod_attrs:
             return False
     else:
-        if not_in_mod:
+        if not in_module:
             return False
 
     key = (module.__name__, name)

From 3de3ca108446292c31e2b6eeafc932c249c639e8 Mon Sep 17 00:00:00 2001
From: farisachugthai <farischugthai@gmail.com>
Date: Fri, 25 Dec 2020 01:50:41 -0500
Subject: [PATCH 0394/1407] BUG: `isfile` is not a method on Path objects

This exists when using `os.path.isfile` but is the wrong method call
for `pathlib.Path` objects.

Remove duplicated import and trailing whitespace as well.
---
 IPython/core/magics/packaging.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index a32b7b1fd70..9f76088102b 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -13,7 +13,6 @@
 import sys
 from pathlib import Path
 
-from pathlib import Path
 from IPython.core.magic import Magics, magics_class, line_magic
 
 
@@ -28,7 +27,7 @@ def _get_conda_executable():
     # Check if there is a conda executable in the same directory as the Python executable.
     # This is the case within conda's root environment.
     conda = Path(sys.executable).parent / "conda"
-    if conda.isfile():
+    if conda.is_file():
         return str(conda)
 
     # Otherwise, attempt to extract the executable from conda history.
@@ -41,7 +40,7 @@ def _get_conda_executable():
     )
     if match:
         return match.groupdict()["command"]
-    
+
     # Fallback: assume conda is available on the system path.
     return "conda"
 
@@ -73,14 +72,14 @@ def pip(self, line):
     @line_magic
     def conda(self, line):
         """Run the conda package manager within the current kernel.
-        
+
         Usage:
           %conda install [pkgs]
         """
         if not _is_conda_environment():
             raise ValueError("The python kernel does not appear to be a conda environment.  "
                              "Please use ``%pip install`` instead.")
-        
+
         conda = _get_conda_executable()
         args = shlex.split(line)
         command = args[0]

From c2f7a62dbc0fbcb6f9676313adcd37db20af1840 Mon Sep 17 00:00:00 2001
From: farisachugthai <farischugthai@gmail.com>
Date: Fri, 25 Dec 2020 02:02:58 -0500
Subject: [PATCH 0395/1407] BUG: Don't index args unless we know we can

Otherwise we get an `IndexError` on any command that didn't require
more arguments. For example running a bare `%conda` raises currently.

In addition, `%conda list` raises as there aren't enough args for
-        args = args[1:]
---
 IPython/core/magics/packaging.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index 9f76088102b..e5e6877f15b 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -82,8 +82,9 @@ def conda(self, line):
 
         conda = _get_conda_executable()
         args = shlex.split(line)
-        command = args[0]
-        args = args[1:]
+        command = args[0] if len(args) > 0 else ""
+        args = args[1:] if len(args) > 1 else [""]
+
         extra_args = []
 
         # When the subprocess does not allow us to respond "yes" during the installation,

From 2704824e6dd90c3f30006e29930d95816c17ce34 Mon Sep 17 00:00:00 2001
From: Bart Skowron <233652+bxsx@users.noreply.github.com>
Date: Fri, 1 Jan 2021 18:37:17 +0100
Subject: [PATCH 0396/1407] Predict the Python version based on $VIRTUAL_ENV

Try to make prediction of the Python's site-package version used by
virtualenv. If predicted path doesn't exist, continue with previous
behaviour.

This can be useful while working with different Python versions in
virtual environments other than system-used (previously provided via
`sys.version_info`). Note that this *only* updates $PYTHONPATH, so
3rd-libraries installed in virtualenv will be avialable. However the
Python interpreter contiunues to be other than the bundled in the
virtualenv  (see `init_virtualenv()` docstring).
---
 IPython/core/interactiveshell.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index decdd0732ca..114c62ec27a 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -938,10 +938,22 @@ def init_virtualenv(self):
                 "Lib", "site-packages"
             )
         else:
-            virtual_env = Path(os.environ["VIRTUAL_ENV"]).joinpath(
-                "lib", "python{}.{}".format(*sys.version_info[:2]), "site-packages"
+            venv_path = os.path.join(
+                os.environ["VIRTUAL_ENV"], "lib", "python{}.{}", "site-packages"
             )
-        
+
+            # Predict version from py[thon]-x.x in the $VIRTUAL_ENV
+            if m := re.search(
+                r"\bpy(?:thon)?([23])\.(\d+)\b", os.environ["VIRTUAL_ENV"]
+            ):
+                p_ver = [int(num) for num in m.groups()]
+                if not os.path.exists(venv_path.format(*p_ver)):
+                    p_ver = sys.version_info[:2]
+            else:
+                p_ver = sys.version_info[:2]
+
+            virtual_env = venv_path.format(*p_ver)
+
         import site
         sys.path.insert(0, virtual_env)
         site.addsitedir(virtual_env)

From a8c2951457cce875cebc68e3a55809223ea40481 Mon Sep 17 00:00:00 2001
From: Bart Skowron <233652+bxsx@users.noreply.github.com>
Date: Fri, 1 Jan 2021 19:15:09 +0100
Subject: [PATCH 0397/1407] Use os.path.join to keep the code consistency

---
 IPython/core/interactiveshell.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 114c62ec27a..64acd13edba 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -934,8 +934,8 @@ def init_virtualenv(self):
         warn("Attempting to work in a virtualenv. If you encounter problems, please "
              "install IPython inside the virtualenv.")
         if sys.platform == "win32":
-            virtual_env = Path(os.environ["VIRTUAL_ENV"]).joinpath(
-                "Lib", "site-packages"
+            virtual_env = os.path.join(
+                os.environ["VIRTUAL_ENV"], "Lib", "site-packages"
             )
         else:
             venv_path = os.path.join(

From 6d1d6ded81ff05b340201bb2af1e9b1fae0c86da Mon Sep 17 00:00:00 2001
From: Bart Skowron <233652+bxsx@users.noreply.github.com>
Date: Fri, 1 Jan 2021 19:17:14 +0100
Subject: [PATCH 0398/1407] Move warning to the last stage

---
 IPython/core/interactiveshell.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 64acd13edba..8c278fbbcb8 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -931,8 +931,6 @@ def init_virtualenv(self):
             # Our exe is inside or has access to the virtualenv, don't need to do anything.
             return
 
-        warn("Attempting to work in a virtualenv. If you encounter problems, please "
-             "install IPython inside the virtualenv.")
         if sys.platform == "win32":
             virtual_env = os.path.join(
                 os.environ["VIRTUAL_ENV"], "Lib", "site-packages"
@@ -954,6 +952,8 @@ def init_virtualenv(self):
 
             virtual_env = venv_path.format(*p_ver)
 
+        warn("Attempting to work in a virtualenv. If you encounter problems, "
+             "please install IPython inside the virtualenv.")
         import site
         sys.path.insert(0, virtual_env)
         site.addsitedir(virtual_env)

From ecfcd6c2cebf3877a5784b41b05524d371e142fe Mon Sep 17 00:00:00 2001
From: Bart Skowron <233652+bxsx@users.noreply.github.com>
Date: Fri, 1 Jan 2021 20:25:32 +0100
Subject: [PATCH 0399/1407] Refactor after darker checks

---
 IPython/core/interactiveshell.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 8c278fbbcb8..1f5b369c6e2 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -952,8 +952,10 @@ def init_virtualenv(self):
 
             virtual_env = venv_path.format(*p_ver)
 
-        warn("Attempting to work in a virtualenv. If you encounter problems, "
-             "please install IPython inside the virtualenv.")
+        warn(
+            "Attempting to work in a virtualenv. If you encounter problems, "
+            "please install IPython inside the virtualenv."
+        )
         import site
         sys.path.insert(0, virtual_env)
         site.addsitedir(virtual_env)

From 8f76ecf8e275211e7fd85d88310342b190b81069 Mon Sep 17 00:00:00 2001
From: Bart Skowron <233652+bxsx@users.noreply.github.com>
Date: Fri, 1 Jan 2021 20:28:28 +0100
Subject: [PATCH 0400/1407] Drop using `:=` expression for Py3.7 compatibility

---
 IPython/core/interactiveshell.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 1f5b369c6e2..6675d1ab8ac 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -941,9 +941,10 @@ def init_virtualenv(self):
             )
 
             # Predict version from py[thon]-x.x in the $VIRTUAL_ENV
-            if m := re.search(
+            re_m = re.search(
                 r"\bpy(?:thon)?([23])\.(\d+)\b", os.environ["VIRTUAL_ENV"]
-            ):
+            )
+            if re_m:
                 p_ver = [int(num) for num in m.groups()]
                 if not os.path.exists(venv_path.format(*p_ver)):
                     p_ver = sys.version_info[:2]

From ca1f818ffc36f7b96436f96b22e926124a3ca907 Mon Sep 17 00:00:00 2001
From: Bart Skowron <233652+bxsx@users.noreply.github.com>
Date: Fri, 1 Jan 2021 20:31:53 +0100
Subject: [PATCH 0401/1407] Refactor after darker checks

---
 IPython/core/interactiveshell.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 6675d1ab8ac..1167c013c52 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -941,9 +941,7 @@ def init_virtualenv(self):
             )
 
             # Predict version from py[thon]-x.x in the $VIRTUAL_ENV
-            re_m = re.search(
-                r"\bpy(?:thon)?([23])\.(\d+)\b", os.environ["VIRTUAL_ENV"]
-            )
+            re_m = re.search(r"\bpy(?:thon)?([23])\.(\d+)\b", os.environ["VIRTUAL_ENV"])
             if re_m:
                 p_ver = [int(num) for num in m.groups()]
                 if not os.path.exists(venv_path.format(*p_ver)):

From 40f947ecded157be56a72dd3f54a34800a62080c Mon Sep 17 00:00:00 2001
From: Bart Skowron <233652+bxsx@users.noreply.github.com>
Date: Fri, 1 Jan 2021 20:53:26 +0100
Subject: [PATCH 0402/1407] Fix: update identifier name

---
 IPython/core/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 1167c013c52..8ef849cd51d 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -943,7 +943,7 @@ def init_virtualenv(self):
             # Predict version from py[thon]-x.x in the $VIRTUAL_ENV
             re_m = re.search(r"\bpy(?:thon)?([23])\.(\d+)\b", os.environ["VIRTUAL_ENV"])
             if re_m:
-                p_ver = [int(num) for num in m.groups()]
+                p_ver = [int(num) for num in re_m.groups()]
                 if not os.path.exists(venv_path.format(*p_ver)):
                     p_ver = sys.version_info[:2]
             else:

From 74d495a8d2a1100a0426d434ba80d3eb62e6e0cd Mon Sep 17 00:00:00 2001
From: Bart Skowron <233652+bxsx@users.noreply.github.com>
Date: Fri, 1 Jan 2021 21:31:39 +0100
Subject: [PATCH 0403/1407] Refactor path-objets: os.path -> pathlib.Path

---
 IPython/core/interactiveshell.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 8ef849cd51d..b1796a8f431 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -932,24 +932,22 @@ def init_virtualenv(self):
             return
 
         if sys.platform == "win32":
-            virtual_env = os.path.join(
-                os.environ["VIRTUAL_ENV"], "Lib", "site-packages"
-            )
+            virtual_env = Path(os.environ["VIRTUAL_ENV"], "Lib", "site-packages")
         else:
-            venv_path = os.path.join(
-                os.environ["VIRTUAL_ENV"], "lib", "python{}.{}", "site-packages"
-            )
+            venv_path_prefix = Path(os.environ["VIRTUAL_ENV"], "lib")
+            venv_path_suffix = Path("site-packages")
 
             # Predict version from py[thon]-x.x in the $VIRTUAL_ENV
             re_m = re.search(r"\bpy(?:thon)?([23])\.(\d+)\b", os.environ["VIRTUAL_ENV"])
             if re_m:
                 p_ver = [int(num) for num in re_m.groups()]
-                if not os.path.exists(venv_path.format(*p_ver)):
+                predicted_path = venv_path_prefix / "python{}.{}".format(*p_ver) / venv_path_suffix
+                if not predicted_path.exists():
                     p_ver = sys.version_info[:2]
             else:
                 p_ver = sys.version_info[:2]
 
-            virtual_env = venv_path.format(*p_ver)
+            virtual_env = venv_path_prefix / "python{}.{}".format(*p_ver) / venv_path_suffix
 
         warn(
             "Attempting to work in a virtualenv. If you encounter problems, "

From fb3d34c3ce346d1916c512deca32f2ed575a7fdc Mon Sep 17 00:00:00 2001
From: Bart Skowron <233652+bxsx@users.noreply.github.com>
Date: Fri, 1 Jan 2021 21:35:47 +0100
Subject: [PATCH 0404/1407] Refactor after darker checks

---
 IPython/core/interactiveshell.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index b1796a8f431..65b30d91fe5 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -941,13 +941,17 @@ def init_virtualenv(self):
             re_m = re.search(r"\bpy(?:thon)?([23])\.(\d+)\b", os.environ["VIRTUAL_ENV"])
             if re_m:
                 p_ver = [int(num) for num in re_m.groups()]
-                predicted_path = venv_path_prefix / "python{}.{}".format(*p_ver) / venv_path_suffix
+                predicted_path = (
+                    venv_path_prefix / "python{}.{}".format(*p_ver) / venv_path_suffix
+                )
                 if not predicted_path.exists():
                     p_ver = sys.version_info[:2]
             else:
                 p_ver = sys.version_info[:2]
 
-            virtual_env = venv_path_prefix / "python{}.{}".format(*p_ver) / venv_path_suffix
+            virtual_env = (
+                venv_path_prefix / "python{}.{}".format(*p_ver) / venv_path_suffix
+            )
 
         warn(
             "Attempting to work in a virtualenv. If you encounter problems, "

From 62e6c27d2097235a5b165269f7624e9ceabb8091 Mon Sep 17 00:00:00 2001
From: Bart Skowron <233652+bxsx@users.noreply.github.com>
Date: Fri, 1 Jan 2021 22:12:46 +0100
Subject: [PATCH 0405/1407] Fix: convert Path object to str

---
 IPython/core/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 65b30d91fe5..1770b4f67ae 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -949,7 +949,7 @@ def init_virtualenv(self):
             else:
                 p_ver = sys.version_info[:2]
 
-            virtual_env = (
+            virtual_env = str(
                 venv_path_prefix / "python{}.{}".format(*p_ver) / venv_path_suffix
             )
 

From fe7ff0924392387e20fd344129683434e9895dc2 Mon Sep 17 00:00:00 2001
From: Bart Skowron <233652+bxsx@users.noreply.github.com>
Date: Fri, 1 Jan 2021 22:40:09 +0100
Subject: [PATCH 0406/1407] Refactor virtualenv Python version prediction

---
 IPython/core/interactiveshell.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 1770b4f67ae..417890dbe9a 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -936,18 +936,17 @@ def init_virtualenv(self):
         else:
             venv_path_prefix = Path(os.environ["VIRTUAL_ENV"], "lib")
             venv_path_suffix = Path("site-packages")
+            p_ver = sys.version_info[:2]
 
             # Predict version from py[thon]-x.x in the $VIRTUAL_ENV
             re_m = re.search(r"\bpy(?:thon)?([23])\.(\d+)\b", os.environ["VIRTUAL_ENV"])
             if re_m:
-                p_ver = [int(num) for num in re_m.groups()]
+                predicted_p_ver = [int(num) for num in re_m.groups()]
                 predicted_path = (
-                    venv_path_prefix / "python{}.{}".format(*p_ver) / venv_path_suffix
+                    venv_path_prefix / "python{}.{}".format(*predicted_p_ver) / venv_path_suffix
                 )
-                if not predicted_path.exists():
-                    p_ver = sys.version_info[:2]
-            else:
-                p_ver = sys.version_info[:2]
+                if predicted_path.exists():
+                    p_ver = predicted_p_ver
 
             virtual_env = str(
                 venv_path_prefix / "python{}.{}".format(*p_ver) / venv_path_suffix

From 36ec251951327038a30c2b621f9cc9e4a6ae4826 Mon Sep 17 00:00:00 2001
From: Bart Skowron <233652+bxsx@users.noreply.github.com>
Date: Fri, 1 Jan 2021 22:51:31 +0100
Subject: [PATCH 0407/1407] Refactor virtualenv Python version prediction

---
 IPython/core/interactiveshell.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 417890dbe9a..1a8ff002986 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -934,23 +934,18 @@ def init_virtualenv(self):
         if sys.platform == "win32":
             virtual_env = Path(os.environ["VIRTUAL_ENV"], "Lib", "site-packages")
         else:
-            venv_path_prefix = Path(os.environ["VIRTUAL_ENV"], "lib")
-            venv_path_suffix = Path("site-packages")
+            virtual_env_path = Path(os.environ["VIRTUAL_ENV"], "lib", "python{}.{}", "site-packages")
             p_ver = sys.version_info[:2]
 
             # Predict version from py[thon]-x.x in the $VIRTUAL_ENV
             re_m = re.search(r"\bpy(?:thon)?([23])\.(\d+)\b", os.environ["VIRTUAL_ENV"])
             if re_m:
                 predicted_p_ver = [int(num) for num in re_m.groups()]
-                predicted_path = (
-                    venv_path_prefix / "python{}.{}".format(*predicted_p_ver) / venv_path_suffix
-                )
+                predicted_path = Path(str(virtual_env_path).format(*predicted_p_ver))
                 if predicted_path.exists():
                     p_ver = predicted_p_ver
 
-            virtual_env = str(
-                venv_path_prefix / "python{}.{}".format(*p_ver) / venv_path_suffix
-            )
+            virtual_env = str(virtual_env_path).format(*p_ver)
 
         warn(
             "Attempting to work in a virtualenv. If you encounter problems, "

From ae48b87c7c66664febc21c2c63dc0af487a1bc57 Mon Sep 17 00:00:00 2001
From: Bart Skowron <233652+bxsx@users.noreply.github.com>
Date: Fri, 1 Jan 2021 22:54:07 +0100
Subject: [PATCH 0408/1407] Refactor after darker checks

---
 IPython/core/interactiveshell.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 1a8ff002986..8da53088edb 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -934,7 +934,9 @@ def init_virtualenv(self):
         if sys.platform == "win32":
             virtual_env = Path(os.environ["VIRTUAL_ENV"], "Lib", "site-packages")
         else:
-            virtual_env_path = Path(os.environ["VIRTUAL_ENV"], "lib", "python{}.{}", "site-packages")
+            virtual_env_path = Path(
+                os.environ["VIRTUAL_ENV"], "lib", "python{}.{}", "site-packages"
+            )
             p_ver = sys.version_info[:2]
 
             # Predict version from py[thon]-x.x in the $VIRTUAL_ENV

From 028fcb4af5cba38fb7b9274b06335f5cba1701fa Mon Sep 17 00:00:00 2001
From: Bart Skowron <233652+bxsx@users.noreply.github.com>
Date: Fri, 1 Jan 2021 23:32:16 +0100
Subject: [PATCH 0409/1407] Remove unnecessary casting to int()

---
 IPython/core/interactiveshell.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 8da53088edb..7300b03f050 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -940,12 +940,11 @@ def init_virtualenv(self):
             p_ver = sys.version_info[:2]
 
             # Predict version from py[thon]-x.x in the $VIRTUAL_ENV
-            re_m = re.search(r"\bpy(?:thon)?([23])\.(\d+)\b", os.environ["VIRTUAL_ENV"])
-            if re_m:
-                predicted_p_ver = [int(num) for num in re_m.groups()]
-                predicted_path = Path(str(virtual_env_path).format(*predicted_p_ver))
+            predicted_p_ver = re.search(r"\bpy(?:thon)?([23])\.(\d+)\b", os.environ["VIRTUAL_ENV"])
+            if predicted_p_ver:
+                predicted_path = Path(str(virtual_env_path).format(*predicted_p_ver.groups()))
                 if predicted_path.exists():
-                    p_ver = predicted_p_ver
+                    p_ver = predicted_p_ver.groups()
 
             virtual_env = str(virtual_env_path).format(*p_ver)
 

From 2fa64737cb2d341db454f686d32f95590a1ea7b9 Mon Sep 17 00:00:00 2001
From: Bart Skowron <233652+bxsx@users.noreply.github.com>
Date: Fri, 1 Jan 2021 23:39:13 +0100
Subject: [PATCH 0410/1407] Shorten identifier name to pass darker checks

---
 IPython/core/interactiveshell.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 7300b03f050..df1fe07bf29 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -940,11 +940,11 @@ def init_virtualenv(self):
             p_ver = sys.version_info[:2]
 
             # Predict version from py[thon]-x.x in the $VIRTUAL_ENV
-            predicted_p_ver = re.search(r"\bpy(?:thon)?([23])\.(\d+)\b", os.environ["VIRTUAL_ENV"])
-            if predicted_p_ver:
-                predicted_path = Path(str(virtual_env_path).format(*predicted_p_ver.groups()))
+            re_m = re.search(r"\bpy(?:thon)?([23])\.(\d+)\b", os.environ["VIRTUAL_ENV"])
+            if re_m:
+                predicted_path = Path(str(virtual_env_path).format(*re_m.groups()))
                 if predicted_path.exists():
-                    p_ver = predicted_p_ver.groups()
+                    p_ver = re_m.groups()
 
             virtual_env = str(virtual_env_path).format(*p_ver)
 

From 1e4e27c45bb619bff0cfed292d0db85439f22627 Mon Sep 17 00:00:00 2001
From: takuya fujiwara <mobilefujitaku@gmail.com>
Date: Wed, 6 Jan 2021 15:15:53 +0900
Subject: [PATCH 0411/1407] Fix issue #11615

---
 IPython/core/interactiveshell.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index decdd0732ca..d87918a8cbd 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2068,13 +2068,17 @@ def showtraceback(self, exc_tuple=None, filename=None, tb_offset=None,
         except KeyboardInterrupt:
             print('\n' + self.get_exception_only(), file=sys.stderr)
 
-    def _showtraceback(self, etype, evalue, stb):
+    def _showtraceback(self, etype, evalue, stb: str):
         """Actually show a traceback.
 
         Subclasses may override this method to put the traceback on a different
         place, like a side channel.
         """
-        print(self.InteractiveTB.stb2text(stb))
+        val = self.InteractiveTB.stb2text(stb)
+        try:
+           print(val)
+        except UnicodeEncodeError:
+           print(val.encode('utf-8', 'backslashreplace').decode())
 
     def showsyntaxerror(self, filename=None, running_compiled_code=False):
         """Display the syntax error that just occurred.

From 90fb12b53e52314979167098de1c47f75f8fb14e Mon Sep 17 00:00:00 2001
From: Dan Green <dangreen.tlv@gmail.com>
Date: Wed, 6 Jan 2021 10:42:51 -0500
Subject: [PATCH 0412/1407] Don't allow Jedi to go to v1.18.0

This addresses issue https://github.com/ipython/ipython/issues/12740, where autocomplete breaks with the latest version of Jedi (1.18.0)
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index a353555068a..d3cd425ef53 100755
--- a/setup.py
+++ b/setup.py
@@ -184,7 +184,7 @@
 
 install_requires = [
     'setuptools>=18.5',
-    'jedi>=0.16',
+    'jedi>=0.16,<0.18.0',
     'decorator',
     'pickleshare',
     'traitlets>=4.2',

From bbaaedaddaf79dabee84f1c304648075ecebd72d Mon Sep 17 00:00:00 2001
From: Dan Green-Leipciger <dangreen.tlv@gmail.com>
Date: Wed, 6 Jan 2021 10:52:16 -0500
Subject: [PATCH 0413/1407] Run autoformatter

---
 setup.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/setup.py b/setup.py
index d3cd425ef53..6b972f71a54 100755
--- a/setup.py
+++ b/setup.py
@@ -183,15 +183,15 @@
 )
 
 install_requires = [
-    'setuptools>=18.5',
-    'jedi>=0.16,<0.18.0',
-    'decorator',
-    'pickleshare',
-    'traitlets>=4.2',
-    'prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1',
-    'pygments',
-    'backcall',
-    'stack_data',
+    "setuptools>=18.5",
+    "jedi>=0.16,<0.18.0",
+    "decorator",
+    "pickleshare",
+    "traitlets>=4.2",
+    "prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1",
+    "pygments",
+    "backcall",
+    "stack_data",
 ]
 
 # Platform-specific dependencies:

From 21d657f0d06ecab3187f98e99b1264f5058d5265 Mon Sep 17 00:00:00 2001
From: takuya fujiwara <mobilefujitaku@gmail.com>
Date: Thu, 7 Jan 2021 09:44:20 +0900
Subject: [PATCH 0414/1407] Add test for issue #11615

---
 IPython/core/tests/test_interactiveshell.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 951b843e1e0..d1dec20f6c1 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -449,6 +449,24 @@ def my_handler(shell, etype, value, tb, tb_offset=None):
             # Reset the custom exception hook
             ip.set_custom_exc((), None)
     
+    @mock.patch('builtins.print')
+    def test_showtraceback_with_surrogates(self, mocked_print):
+        values = []
+        def mock_print_func(value, sep=' ', end='\n', file=sys.stdout, flush=False):
+            values.append(value)
+            if value == chr(0xd8ff):
+                raise UnicodeEncodeError("utf-8", chr(0xd8ff), 0, 1, "")
+
+        # mock builtins.print
+        mocked_print.side_effect = mock_print_func
+
+        # ip._showtraceback() is replaced in globalipapp.py. 
+        # Call original method to test.
+        interactiveshell.InteractiveShell._showtraceback(ip, None, None, chr(0xd8ff))
+        
+        self.assertEqual(mocked_print.call_count, 2)
+        self.assertEqual(values, [chr(0xd8ff), '\\ud8ff'])
+
     def test_mktempfile(self):
         filename = ip.mktempfile()
         # Check that we can open the file again on Windows

From 651e9e552ceb302e8ff4d4db081a5f7b4d63f6a3 Mon Sep 17 00:00:00 2001
From: takuya fujiwara <mobilefujitaku@gmail.com>
Date: Thu, 7 Jan 2021 10:27:03 +0900
Subject: [PATCH 0415/1407] Fix lint warnings

---
 IPython/core/interactiveshell.py            |  4 ++--
 IPython/core/tests/test_interactiveshell.py | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index d87918a8cbd..b8c7cd2f45a 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2076,9 +2076,9 @@ def _showtraceback(self, etype, evalue, stb: str):
         """
         val = self.InteractiveTB.stb2text(stb)
         try:
-           print(val)
+            print(val)
         except UnicodeEncodeError:
-           print(val.encode('utf-8', 'backslashreplace').decode())
+            print(val.encode('utf-8', 'backslashreplace').decode())
 
     def showsyntaxerror(self, filename=None, running_compiled_code=False):
         """Display the syntax error that just occurred.
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index d1dec20f6c1..324599f5b7d 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -449,23 +449,23 @@ def my_handler(shell, etype, value, tb, tb_offset=None):
             # Reset the custom exception hook
             ip.set_custom_exc((), None)
     
-    @mock.patch('builtins.print')
+    @mock.patch("builtins.print")
     def test_showtraceback_with_surrogates(self, mocked_print):
         values = []
-        def mock_print_func(value, sep=' ', end='\n', file=sys.stdout, flush=False):
+        def mock_print_func(value, sep=" ", end="\n", file=sys.stdout, flush=False):
             values.append(value)
-            if value == chr(0xd8ff):
-                raise UnicodeEncodeError("utf-8", chr(0xd8ff), 0, 1, "")
+            if value == chr(0xD8FF):
+                raise UnicodeEncodeError("utf-8", chr(0xD8FF), 0, 1, "")
 
         # mock builtins.print
         mocked_print.side_effect = mock_print_func
 
-        # ip._showtraceback() is replaced in globalipapp.py. 
+        # ip._showtraceback() is replaced in globalipapp.py.
         # Call original method to test.
-        interactiveshell.InteractiveShell._showtraceback(ip, None, None, chr(0xd8ff))
+        interactiveshell.InteractiveShell._showtraceback(ip, None, None, chr(0xD8FF))
         
         self.assertEqual(mocked_print.call_count, 2)
-        self.assertEqual(values, [chr(0xd8ff), '\\ud8ff'])
+        self.assertEqual(values, [chr(0xD8FF), "\\ud8ff"])
 
     def test_mktempfile(self):
         filename = ip.mktempfile()

From e3ff6681e7fd6f2ee9c6e01f78b0f109b0626022 Mon Sep 17 00:00:00 2001
From: takuya fujiwara <mobilefujitaku@gmail.com>
Date: Thu, 7 Jan 2021 10:38:06 +0900
Subject: [PATCH 0416/1407] Fix lint warnings

---
 IPython/core/interactiveshell.py            | 2 +-
 IPython/core/tests/test_interactiveshell.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index b8c7cd2f45a..a880c29f88a 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2078,7 +2078,7 @@ def _showtraceback(self, etype, evalue, stb: str):
         try:
             print(val)
         except UnicodeEncodeError:
-            print(val.encode('utf-8', 'backslashreplace').decode())
+            print(val.encode("utf-8", "backslashreplace").decode())
 
     def showsyntaxerror(self, filename=None, running_compiled_code=False):
         """Display the syntax error that just occurred.
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 324599f5b7d..84bea9cd457 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -452,6 +452,7 @@ def my_handler(shell, etype, value, tb, tb_offset=None):
     @mock.patch("builtins.print")
     def test_showtraceback_with_surrogates(self, mocked_print):
         values = []
+
         def mock_print_func(value, sep=" ", end="\n", file=sys.stdout, flush=False):
             values.append(value)
             if value == chr(0xD8FF):
@@ -463,7 +464,7 @@ def mock_print_func(value, sep=" ", end="\n", file=sys.stdout, flush=False):
         # ip._showtraceback() is replaced in globalipapp.py.
         # Call original method to test.
         interactiveshell.InteractiveShell._showtraceback(ip, None, None, chr(0xD8FF))
-        
+
         self.assertEqual(mocked_print.call_count, 2)
         self.assertEqual(values, [chr(0xD8FF), "\\ud8ff"])
 

From 33908b81f17278c5e9a4576a8aab01d51a9e5d02 Mon Sep 17 00:00:00 2001
From: Faris A Chugthai <20028782+farisachugthai@users.noreply.github.com>
Date: Sat, 9 Jan 2021 05:44:23 -0500
Subject: [PATCH 0417/1407] Update index.rst

Add periods to the end of all sentences for consistency
---
 docs/source/index.rst | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/source/index.rst b/docs/source/index.rst
index 090fb8865f7..7e84c61efb8 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -9,12 +9,12 @@ IPython Documentation
    :Release: |release|
    :Date: |today|
 
-Welcome to the official IPython documentation
+Welcome to the official IPython documentation.
 
 IPython provides a rich toolkit to help you make the most of using Python
 interactively.  Its main components are:
 
-* A powerful interactive Python shell
+* A powerful interactive Python shell.
 
 
 .. image:: /_images/ipython-6-screenshot.png
@@ -59,7 +59,7 @@ The Command line interface inherits the above functionality and adds
  
 * real multi-line editing thanks to `prompt_toolkit <http://python-prompt-toolkit.readthedocs.io/en/stable/>`_.
  
-* syntax highlighting as you type
+* syntax highlighting as you type.
 
 * integration with command line editor for a better workflow.
 
@@ -84,8 +84,6 @@ The latest development version is always available from IPython's `GitHub
 repository <http://github.com/ipython/ipython>`_.
 
 
-
-
 .. toctree::
    :maxdepth: 1
    :hidden:

From 4c30bc0d157945714c95b134184adb7cd65d8f31 Mon Sep 17 00:00:00 2001
From: Faris A Chugthai <20028782+farisachugthai@users.noreply.github.com>
Date: Sat, 9 Jan 2021 05:46:46 -0500
Subject: [PATCH 0418/1407] Fix broken link in documentation

The link to the screenshot didn't work
---
 docs/source/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/index.rst b/docs/source/index.rst
index 090fb8865f7..39481bd2ba8 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -17,7 +17,7 @@ interactively.  Its main components are:
 * A powerful interactive Python shell
 
 
-.. image:: /_images/ipython-6-screenshot.png
+.. image:: ./_images/ipython-6-screenshot.png
     :alt: Screenshot of IPython 6.0
     :align: center
 

From 65fdb8febabe48695e07de64577af46b77cc12ee Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Jan 2021 15:06:37 -0800
Subject: [PATCH 0419/1407] Revert "Merge pull request #12757 from
 dangreenisrael/patch-1"

This reverts commit b8f8280802fe3b53ece56b3cd1e8d47730836106, reversing
changes made to 3587f5bb6c8570e7bbb06cf5f7e3bc9b9467355a.

IPython master is compatible with jedi 0.18, it's the 7.x branch which
is not
---
 setup.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/setup.py b/setup.py
index 6b972f71a54..a353555068a 100755
--- a/setup.py
+++ b/setup.py
@@ -183,15 +183,15 @@
 )
 
 install_requires = [
-    "setuptools>=18.5",
-    "jedi>=0.16,<0.18.0",
-    "decorator",
-    "pickleshare",
-    "traitlets>=4.2",
-    "prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1",
-    "pygments",
-    "backcall",
-    "stack_data",
+    'setuptools>=18.5',
+    'jedi>=0.16',
+    'decorator',
+    'pickleshare',
+    'traitlets>=4.2',
+    'prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1',
+    'pygments',
+    'backcall',
+    'stack_data',
 ]
 
 # Platform-specific dependencies:

From 6d4fced2f1c56d709042ac35e8523b57cc57f454 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 13 Dec 2020 16:32:30 -0800
Subject: [PATCH 0420/1407] Update some docstring to conform to numpy docstring
 format

---
 IPython/core/display.py | 32 ++++++++++++++++++++------------
 IPython/lib/display.py  |  4 ++--
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 2920b842494..d2c13e39f98 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -851,18 +851,26 @@ def __init__(self, data=None, url=None, filename=None, format=None,
 
         Examples
         --------
-        # embedded image data, works in qtconsole and notebook
-        # when passed positionally, the first arg can be any of raw image data,
-        # a URL, or a filename from which to load image data.
-        # The result is always embedding image data for inline images.
-        Image('http://www.google.fr/images/srpr/logo3w.png')
-        Image('/path/to/image.jpg')
-        Image(b'RAW_PNG_DATA...')
-
-        # Specifying Image(url=...) does not embed the image data,
-        # it only generates `<img>` tag with a link to the source.
-        # This will not work in the qtconsole or offline.
-        Image(url='http://www.google.fr/images/srpr/logo3w.png')
+
+        embedded image data, works in qtconsole and notebook
+        when passed positionally, the first arg can be any of raw image data,
+        a URL, or a filename from which to load image data.
+        The result is always embedding image data for inline images.
+
+        >>> Image('http://www.google.fr/images/srpr/logo3w.png')
+        <IPython.core.display.Image object>
+
+        >>> Image('/path/to/image.jpg')
+        <IPython.core.display.Image object>
+
+        >>> Image(b'RAW_PNG_DATA...')
+        <IPython.core.display.Image object>
+
+        Specifying Image(url=...) does not embed the image data,
+        it only generates ``<img>`` tag with a link to the source.
+        This will not work in the qtconsole or offline.
+
+        >>> Image(url='http://www.google.fr/images/srpr/logo3w.png')
 
         """
         if isinstance(data, (Path, PurePath)):
diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index 09268ad8981..e8b8a445e26 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -70,13 +70,13 @@ class Audio(DisplayObject):
     ... framerate = 44100
     ... t = np.linspace(0,5,framerate*5)
     ... data = np.sin(2*np.pi*220*t) + np.sin(2*np.pi*224*t)
-    ... Audio(data,rate=framerate)
+    ... Audio(data, rate=framerate)
 
     Can also do stereo or more channels
 
     >>> dataleft = np.sin(2*np.pi*220*t)
     ... dataright = np.sin(2*np.pi*224*t)
-    ... Audio([dataleft, dataright],rate=framerate)
+    ... Audio([dataleft, dataright], rate=framerate)
 
     From URL:
 

From d45f2292bed62b6f932703817fb0ef5482305f2c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Jan 2021 15:35:12 -0800
Subject: [PATCH 0421/1407] Docstring autoformatting.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

run vélin on IPython.core.display while we are fixing things there.
---
 IPython/core/display.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index d2c13e39f98..ff59576cc93 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -567,7 +567,7 @@ def __init__(self, data=None, url=None, filename=None, expanded=False, metadata=
             Path to a local file to load the data from.
         expanded : boolean
             Metadata to control whether a JSON display component is expanded.
-        metadata: dict
+        metadata : dict
             Specify extra metadata to attach to the json display object.
         root : str
             The name of the root element of the JSON tree
@@ -651,12 +651,11 @@ def __init__(self, *args, **kwargs):
             A URL to download the data from.
         filename : unicode
             Path to a local file to load the data from.
-        metadata: dict
+        metadata : dict
             Specify extra metadata to attach to the json display object.
 
         Examples
         --------
-
         The following will display an interactive map of Mars with a point of
         interest on frontend that do support GeoJSON display.
 
@@ -723,7 +722,7 @@ def __init__(self, data=None, url=None, filename=None, lib=None, css=None):
             running the source code. The full URLs of the libraries should
             be given. A single Javascript library URL can also be given as a
             string.
-        css: : list or str
+        css : list or str
             A sequence of css files to load before running the source code.
             The full URLs of the css files should be given. A single css URL
             can also be given as a string.
@@ -844,14 +843,13 @@ def __init__(self, data=None, url=None, filename=None, format=None,
             from image data.
             For non-embedded images, you can just set the desired display width
             and height directly.
-        unconfined: bool
+        unconfined : bool
             Set unconfined=True to disable max-width confinement of the image.
-        metadata: dict
+        metadata : dict
             Specify extra metadata to attach to the image.
 
         Examples
         --------
-
         embedded image data, works in qtconsole and notebook
         when passed positionally, the first arg can be any of raw image data,
         a URL, or a filename from which to load image data.
@@ -871,6 +869,7 @@ def __init__(self, data=None, url=None, filename=None, format=None,
         This will not work in the qtconsole or offline.
 
         >>> Image(url='http://www.google.fr/images/srpr/logo3w.png')
+        <IPython.core.display.Image object>
 
         """
         if isinstance(data, (Path, PurePath)):
@@ -1061,8 +1060,7 @@ def __init__(self, data=None, url=None, filename=None, embed=False,
             Local files can be displayed with URLs without embedding the content, via::
 
                 Video('./video.mp4')
-
-        mimetype: unicode
+        mimetype : unicode
             Specify the mimetype for embedded videos.
             Default will be guessed from file extension, if available.
         width : int
@@ -1079,7 +1077,6 @@ def __init__(self, data=None, url=None, filename=None, embed=False,
 
         Examples
         --------
-
         ::
 
             Video('https://archive.org/download/Sita_Sings_the_Blues/Sita_Sings_the_Blues_small.mp4')
@@ -1173,7 +1170,7 @@ def set_matplotlib_formats(*formats, **kwargs):
     ----------
     *formats : strs
         One or more figure formats to enable: 'png', 'retina', 'jpeg', 'svg', 'pdf'.
-    **kwargs :
+    **kwargs
         Keyword args will be relayed to ``figure.canvas.print_figure``.
     """
     from IPython.core.interactiveshell import InteractiveShell

From 645983388fc925278854b03b2bdbf9f0a4810bc9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Jan 2021 15:53:30 -0800
Subject: [PATCH 0422/1407] forgotten import

---
 IPython/terminal/shortcuts.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index f92babd2df3..26e1883fd61 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -9,6 +9,7 @@
 import warnings
 import signal
 import sys
+import re
 from typing import Callable
 
 

From 50c6440256fa066de6d49afd975af43c57bedc8a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Jan 2021 17:55:56 -0800
Subject: [PATCH 0423/1407] Try to fix async tests.

us trio instead of asyncio as we can't run nested loops.
---
 .travis.yml                      | 2 +-
 IPython/core/tests/test_magic.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3702df2829b..db02c507500 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ install:
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
   - pip install trio curio --upgrade --upgrade-strategy eager
   - pip install 'pytest' 'matplotlib !=3.2.0'
-  - pip install codecov check-manifest pytest-cov --upgrade anyio pytest-asyncio
+  - pip install codecov check-manifest pytest-cov --upgrade anyio pytest-trio
 
 
 script:
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 3ce4ddfa69e..66ba3092905 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -35,6 +35,8 @@
 from IPython.utils.process import find_cmd
 from .test_debugger import PdbTestInput
 
+import pytest
+
 
 @magic.magics_class
 class DummyMagics(magic.Magics): pass
@@ -954,7 +956,6 @@ async def test_script_bg_out():
     nt.assert_equal((await ip.user_ns["output"].read()), b"hi\n")
     ip.user_ns['output'].close()
 
-
 @dec.skip_win32
 async def test_script_bg_err():
     ip = get_ipython()

From 40f6692834bb6de62611cf959496b96c5efd2960 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 30 Jan 2021 15:39:10 -0800
Subject: [PATCH 0424/1407] Whats new 7.20

---
 docs/source/whatsnew/version7.rst | 35 ++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index f73728a4648..0b16acfcb63 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,39 @@
  7.x Series
 ============
 
+.. _version 720:
+
+IPython 7.20
+============
+
+IPython 7.20 is the accumulation of 3 month of work on IPython, spacing between
+IPython release have been increased from the usual once a month for various
+reason.
+
+   - Mainly as I'm too busy and the effectively sole maintainer, and
+   - Second because not much changes happened before mid December.
+
+The main driver for this release was the new version of Jedi 0.18 breaking API;
+which was taken care of in the master branch early in 2020 but not in 7.x as I
+though that by now 8.0 would be out.
+
+The inclusion of a resolver in pip did not help and actually made things worse.
+If usually I would have simply pinned Jedi to ``<0.18``; this is not a solution
+anymore as now pip is free to install Jedi 0.18, and downgrade IPython.
+
+I'll do my best to keep the regular release, but as the 8.0-dev branch and 7.x
+are starting to diverge this is becoming difficult in particular with my limited
+time, so if you have any cycles to spare I'll appreciate your help to respond to
+issues and pushing 8.0 forward.
+
+Here are thus some of the changes for IPython 7.20.
+
+  - Support for PyQt5 >= 5.11 :ghpull:`12715`
+  - ``%reset`` remove imports more agressively :ghpull:`12718`
+  - fix the ``%conda`` magic :ghull:`12739`
+  - compatibility with Jedi 0.18, and bump minimum Jedi version. :ghpull:`12793`
+
+
 .. _version 719:
 
 IPython 7.19
@@ -55,7 +88,7 @@ IPython 7.17
 ============
 
 IPython 7.17 brings a couple of new improvements to API and a couple of user
-facing changes to make the terminal experience more user friendly. 
+facing changes to make the terminal experience more user friendly.
 
 :ghpull:`12407` introduces the ability to pass extra argument to the IPython
 debugger class; this is to help a new project from ``kmaork``

From 02689cbc034ff66093d26ff804b03c787ef29b82 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 1 Feb 2021 10:26:36 -0800
Subject: [PATCH 0425/1407] Update docs/source/whatsnew/version7.rst

Co-authored-by: Blazej Michalik <MrMino@users.noreply.github.com>
---
 docs/source/whatsnew/version7.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 0b16acfcb63..3bad5272d2c 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -31,7 +31,7 @@ Here are thus some of the changes for IPython 7.20.
 
   - Support for PyQt5 >= 5.11 :ghpull:`12715`
   - ``%reset`` remove imports more agressively :ghpull:`12718`
-  - fix the ``%conda`` magic :ghull:`12739`
+  - fix the ``%conda`` magic :ghpull:`12739`
   - compatibility with Jedi 0.18, and bump minimum Jedi version. :ghpull:`12793`
 
 

From 23f31bb904a793e8239b7ec25410821a9c273fad Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 1 Feb 2021 11:03:36 -0800
Subject: [PATCH 0426/1407] some updates on 8.0

---
 docs/source/whatsnew/development.rst | 41 ++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index e6c933071ec..97ec2f83f88 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -22,6 +22,47 @@ Need to be updated:
 
    pr/*
 
+IPython 8.0 is bringing a number of new features and improvements to both the
+user of the terminal and of the kernel via Jupyter. The removal of compatibility
+with older version of Python is also the opportunity to do a couple of
+performance improvement in particular with respect to startup time.
+
+The main change in IPython 8.0 is the integration of the ``stack_data`` package;
+which provide smarter information in traceback; in particular it will highlight
+the AST node where an error occurs which can help to quickly narrow down errors.
+
+For example in the following snippet::
+
+    def foo(i):
+        x = [[[0]]]
+        return x[0][i][0]
+
+
+    def bar():
+        return foo(0) + foo(
+            1
+        ) + foo(2)
+
+
+Calling ``bar()`` would raise an ``IndexError`` on the return line of ``foo``,
+IPython 8.0 is capable of telling you, where the index error occurs::
+
+    return x[0][i][0]
+                ^
+
+To prepare for Python 3.10 we have also started working on removing reliance and
+any dependency that is not Python 3.10 compatible; that include migrating our
+test suite to Pytest, and starting to remove nose.
+
+We are also removing support for Python 3.6 allowing internal code to use more
+efficient ``pathlib``, and make better use of type annotations.
+
+The completer has also seen significant updates and make use of newer Jedi API
+offering faster and more reliable tab completion.
+
+For the terminal users this also enable the auto-suggestion feature, described
+below, which show "ghost text" ahead of your cursor you can accept without
+having to press the tab key or ask the completer to suggest completions.
 
 
 Autosuggestion is a very useful feature available in `fish <https://fishshell.com/>`__, `zsh <https://en.wikipedia.org/wiki/Z_shell>`__, and `prompt-toolkit <https://python-prompt-toolkit.readthedocs.io/en/master/pages/asking_for_input.html#auto-suggestion>`__.

From 31a796a479fcda7b390133d8e5da25d022a2d7bd Mon Sep 17 00:00:00 2001
From: Eli Rykoff <erykoff@stanford.edu>
Date: Tue, 2 Feb 2021 09:13:40 -0800
Subject: [PATCH 0427/1407] Add explicit argtype counting, required for
 osx-arm64.

---
 IPython/terminal/pt_inputhooks/osx.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/IPython/terminal/pt_inputhooks/osx.py b/IPython/terminal/pt_inputhooks/osx.py
index 53f4e3838b8..bcaf3615783 100644
--- a/IPython/terminal/pt_inputhooks/osx.py
+++ b/IPython/terminal/pt_inputhooks/osx.py
@@ -77,11 +77,14 @@ def C(classname):
 
 def _NSApp():
     """Return the global NSApplication instance (NSApp)"""
+    objc.objc_msgSend.argtypes = [void_p, void_p]
     return msg(C('NSApplication'), n('sharedApplication'))
 
 
 def _wake(NSApp):
     """Wake the Application"""
+    objc.objc_msgSend.argtypes = [void_p, void_p, void_p, void_p, void_p, void_p,
+                                  void_p, void_p, void_p, void_p, void_p]
     event = msg(C('NSEvent'),
         n('otherEventWithType:location:modifierFlags:'
           'timestamp:windowNumber:context:subtype:data1:data2:'),
@@ -95,6 +98,7 @@ def _wake(NSApp):
         0, # data1
         0, # data2
     )
+    objc.objc_msgSend.argtypes = [void_p, void_p, void_p, void_p]
     msg(NSApp, n('postEvent:atStart:'), void_p(event), True)
 
 
@@ -106,6 +110,7 @@ def _input_callback(fdref, flags, info):
     CFFileDescriptorInvalidate(fdref)
     CFRelease(fdref)
     NSApp = _NSApp()
+    objc.objc_msgSend.argtypes = [void_p, void_p, void_p]
     msg(NSApp, n('stop:'), NSApp)
     _wake(NSApp)
 
@@ -128,6 +133,7 @@ def inputhook(context):
     """Inputhook for Cocoa (NSApp)"""
     NSApp = _NSApp()
     _stop_on_read(context.fileno())
+    objc.objc_msgSend.argtypes = [void_p, void_p]
     msg(NSApp, n('run'))
     if not _triggered.is_set():
         # app closed without firing callback,

From 613b37a2817e76406874ca85ed0696d9420eda49 Mon Sep 17 00:00:00 2001
From: Eli Rykoff <erykoff@stanford.edu>
Date: Tue, 2 Feb 2021 09:24:52 -0800
Subject: [PATCH 0428/1407] Fix formatting.

---
 IPython/terminal/pt_inputhooks/osx.py | 41 ++++++++++++++++++---------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/IPython/terminal/pt_inputhooks/osx.py b/IPython/terminal/pt_inputhooks/osx.py
index bcaf3615783..d0fc861b884 100644
--- a/IPython/terminal/pt_inputhooks/osx.py
+++ b/IPython/terminal/pt_inputhooks/osx.py
@@ -83,20 +83,33 @@ def _NSApp():
 
 def _wake(NSApp):
     """Wake the Application"""
-    objc.objc_msgSend.argtypes = [void_p, void_p, void_p, void_p, void_p, void_p,
-                                  void_p, void_p, void_p, void_p, void_p]
-    event = msg(C('NSEvent'),
-        n('otherEventWithType:location:modifierFlags:'
-          'timestamp:windowNumber:context:subtype:data1:data2:'),
-        15, # Type
-        0, # location
-        0, # flags
-        0, # timestamp
-        0, # window
-        None, # context
-        0, # subtype
-        0, # data1
-        0, # data2
+    objc.objc_msgSend.argtypes = [
+        void_p,
+        void_p,
+        void_p,
+        void_p,
+        void_p,
+        void_p,
+        void_p,
+        void_p,
+        void_p,
+        void_p,
+        void_p]
+    event = msg(
+        C("NSEvent"),
+        n(
+            "otherEventWithType:location:modifierFlags:"
+            "timestamp:windowNumber:context:subtype:data1:data2:"
+        ),
+        15,  # Type
+        0,  # location
+        0,  # flags
+        0,  # timestamp
+        0,  # window
+        None,  # context
+        0,  # subtype
+        0,  # data1
+        0,  # data2
     )
     objc.objc_msgSend.argtypes = [void_p, void_p, void_p, void_p]
     msg(NSApp, n('postEvent:atStart:'), void_p(event), True)

From 2b87e1eba3769e2c2f782dafa394e29682b1c1a5 Mon Sep 17 00:00:00 2001
From: Eli Rykoff <erykoff@stanford.edu>
Date: Tue, 2 Feb 2021 09:27:02 -0800
Subject: [PATCH 0429/1407] Fix formatting.

---
 IPython/terminal/pt_inputhooks/osx.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/terminal/pt_inputhooks/osx.py b/IPython/terminal/pt_inputhooks/osx.py
index d0fc861b884..a3131ee4683 100644
--- a/IPython/terminal/pt_inputhooks/osx.py
+++ b/IPython/terminal/pt_inputhooks/osx.py
@@ -94,7 +94,8 @@ def _wake(NSApp):
         void_p,
         void_p,
         void_p,
-        void_p]
+        void_p,
+    ]
     event = msg(
         C("NSEvent"),
         n(

From c837b30d66f410f15aedd3da04b4abb5ad4d95e4 Mon Sep 17 00:00:00 2001
From: Eli Rykoff <erykoff@stanford.edu>
Date: Wed, 3 Feb 2021 13:10:35 -0800
Subject: [PATCH 0430/1407] Fix CFFileDescriptorCreate argtypes.

---
 IPython/terminal/pt_inputhooks/osx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/terminal/pt_inputhooks/osx.py b/IPython/terminal/pt_inputhooks/osx.py
index a3131ee4683..80440196fb4 100644
--- a/IPython/terminal/pt_inputhooks/osx.py
+++ b/IPython/terminal/pt_inputhooks/osx.py
@@ -41,7 +41,7 @@ def C(classname):
 
 CFFileDescriptorCreate = CoreFoundation.CFFileDescriptorCreate
 CFFileDescriptorCreate.restype = void_p
-CFFileDescriptorCreate.argtypes = [void_p, ctypes.c_int, ctypes.c_bool, void_p]
+CFFileDescriptorCreate.argtypes = [void_p, ctypes.c_int, ctypes.c_bool, void_p, void_p]
 
 CFFileDescriptorGetNativeDescriptor = CoreFoundation.CFFileDescriptorGetNativeDescriptor
 CFFileDescriptorGetNativeDescriptor.restype = ctypes.c_int

From bf653e2cdb399311aaec7f44faeb3e78259affe9 Mon Sep 17 00:00:00 2001
From: PhanatosZou <tongzou@uw.edu>
Date: Wed, 3 Feb 2021 15:02:02 -0800
Subject: [PATCH 0431/1407] use pathlib in crashhandler

---
 IPython/core/crashhandler.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/IPython/core/crashhandler.py b/IPython/core/crashhandler.py
index 1e0b429d09a..2cfe85ce2db 100644
--- a/IPython/core/crashhandler.py
+++ b/IPython/core/crashhandler.py
@@ -23,6 +23,7 @@
 import sys
 import traceback
 from pprint import pformat
+from pathlib import Path
 
 from IPython.core import ultratb
 from IPython.core.release import author_email
@@ -151,10 +152,10 @@ def __call__(self, etype, evalue, etb):
         try:
             rptdir = self.app.ipython_dir
         except:
-            rptdir = os.getcwd()
-        if rptdir is None or not os.path.isdir(rptdir):
-            rptdir = os.getcwd()
-        report_name = os.path.join(rptdir,self.crash_report_fname)
+            rptdir = Path.cwd()
+        if rptdir is None or not Path.is_dir(rptdir):
+            rptdir = Path.cwd()
+        report_name = rptdir / self.crash_report_fname
         # write the report filename into the instance dict so it can get
         # properly expanded out in the user message template
         self.crash_report_fname = report_name

From 6f1ddf800f881586a81ec92981b55424e0814290 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 7 Feb 2021 21:33:47 +0100
Subject: [PATCH 0432/1407] ipdb: remove unused imports

---
 IPython/terminal/debugger.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index 9ec246697d4..0d504c83933 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -1,5 +1,4 @@
 import asyncio
-import signal
 import sys
 import threading
 
@@ -7,13 +6,8 @@
 
 from IPython.core.completer import IPCompleter
 from .ptutils import IPythonPTCompleter
-from .shortcuts import create_ipython_shortcuts, suspend_to_bg, cursor_in_leading_ws
+from .shortcuts import create_ipython_shortcuts
 
-from prompt_toolkit.enums import DEFAULT_BUFFER
-from prompt_toolkit.filters import (Condition, has_focus, has_selection,
-    vi_insert_mode, emacs_insert_mode)
-from prompt_toolkit.key_binding import KeyBindings
-from prompt_toolkit.key_binding.bindings.completion import display_completions_like_readline
 from pygments.token import Token
 from prompt_toolkit.shortcuts.prompt import PromptSession
 from prompt_toolkit.enums import EditingMode

From 372a10b5baab0111f9360e0187b1864521b08e50 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 7 Feb 2021 21:57:22 +0100
Subject: [PATCH 0433/1407] ipdb: fix formatting in terminal.debugger

---
 IPython/terminal/debugger.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index 0d504c83933..a4a5419564f 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -28,22 +28,21 @@ def __init__(self, *args, pt_session_options=None, **kwargs):
     def pt_init(self, pt_session_options=None):
         """Initialize the prompt session and the prompt loop
         and store them in self.pt_app and self.pt_loop.
-        
+
         Additional keyword arguments for the PromptSession class
         can be specified in pt_session_options.
         """
         if pt_session_options is None:
             pt_session_options = {}
-        
+
         def get_prompt_tokens():
             return [(Token.Prompt, self.prompt)]
 
         if self._ptcomp is None:
             compl = IPCompleter(shell=self.shell,
-                                        namespace={},
-                                        global_namespace={},
-                                        parent=self.shell,
-                                       )
+                                namespace={},
+                                global_namespace={},
+                                parent=self.shell)
             # add a completer for all the do_ methods
             methods_names = [m[3:] for m in dir(self) if m.startswith("do_")]
 

From 11fc6b7d5b40c707c84d5fa8f34db7d2a9ab0d00 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 7 Feb 2021 21:57:46 +0100
Subject: [PATCH 0434/1407] ipdb: fix formatting in core.debugger

---
 IPython/core/debugger.py | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index dde84924cfd..a168a07ef53 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -43,13 +43,14 @@
 
 prompt = 'ipdb> '
 
-#We have to check this directly from sys.argv, config struct not yet available
+# We have to check this directly from sys.argv, config struct not yet available
 from pdb import Pdb as OldPdb
 
 # Allow the set_trace code to operate outside of an ipython instance, even if
 # it does so with some limitations.  The rest of this support is implemented in
 # the Tracer constructor.
 
+
 def make_arrow(pad):
     """generate the leading arrow in front of traceback or debugger"""
     if pad >= 2:
@@ -67,16 +68,16 @@ def BdbQuit_excepthook(et, ev, tb, excepthook=None):
     """
     warnings.warn("`BdbQuit_excepthook` is deprecated since version 5.1",
                   DeprecationWarning, stacklevel=2)
-    if et==bdb.BdbQuit:
+    if et == bdb.BdbQuit:
         print('Exiting Debugger.')
     elif excepthook is not None:
         excepthook(et, ev, tb)
     else:
         # Backwards compatibility. Raise deprecation warning?
-        BdbQuit_excepthook.excepthook_ori(et,ev,tb)
+        BdbQuit_excepthook.excepthook_ori(et, ev, tb)
 
 
-def BdbQuit_IPython_excepthook(self,et,ev,tb,tb_offset=None):
+def BdbQuit_IPython_excepthook(self, et, ev, tb, tb_offset=None):
     warnings.warn(
         "`BdbQuit_IPython_excepthook` is deprecated since version 5.1",
         DeprecationWarning, stacklevel=2)
@@ -203,7 +204,7 @@ class Pdb(OldPdb):
     def __init__(self, color_scheme=None, completekey=None,
                  stdin=None, stdout=None, context=5, **kwargs):
         """Create a new IPython debugger.
-        
+
         :param color_scheme: Deprecated, do not use.
         :param completekey: Passed to pdb.Pdb.
         :param stdin: Passed to pdb.Pdb.
@@ -237,7 +238,7 @@ def __init__(self, color_scheme=None, completekey=None,
             self.shell = TerminalInteractiveShell.instance()
             # needed by any code which calls __import__("__main__") after
             # the debugger was entered. See also #9941.
-            sys.modules['__main__'] = save_main 
+            sys.modules['__main__'] = save_main
 
         if color_scheme is not None:
             warnings.warn(
@@ -272,7 +273,6 @@ def __init__(self, color_scheme=None, completekey=None,
         cst['Neutral'].colors.breakpoint_enabled = C.LightRed
         cst['Neutral'].colors.breakpoint_disabled = C.Red
 
-
         # Add a python parser so we can syntax highlight source while
         # debugging.
         self.parser = PyColorize.Parser(style=color_scheme)
@@ -326,7 +326,7 @@ def new_do_frame(self, arg):
     def new_do_quit(self, arg):
 
         if hasattr(self, 'old_all_completions'):
-            self.shell.Completer.all_completions=self.old_all_completions
+            self.shell.Completer.all_completions = self.old_all_completions
 
         return OldPdb.do_quit(self, arg)
 
@@ -344,7 +344,7 @@ def print_stack_trace(self, context=None):
         if context is None:
             context = self.context
         try:
-            context=int(context)
+            context = int(context)
             if context <= 0:
                 raise ValueError("Context must be a positive integer")
         except (TypeError, ValueError) as e:
@@ -373,7 +373,7 @@ def print_stack_entry(self, frame_lineno, prompt_prefix='\n-> ',
         if context is None:
             context = self.context
         try:
-            context=int(context)
+            context = int(context)
             if context <= 0:
                 raise ValueError("Context must be a positive integer")
         except (TypeError, ValueError) as e:
@@ -390,7 +390,7 @@ def format_stack_entry(self, frame_lineno, lprefix=': ', context=None):
         if context is None:
             context = self.context
         try:
-            context=int(context)
+            context = int(context)
             if context <= 0:
                 print("Context must be a positive integer", file=self.stdout)
         except (TypeError, ValueError):
@@ -406,7 +406,7 @@ def format_stack_entry(self, frame_lineno, lprefix=': ', context=None):
         tpl_call = u'%s%%s%s%%s%s' % (Colors.vName, Colors.valEm, ColorsNormal)
         tpl_line = u'%%s%s%%s %s%%s' % (Colors.lineno, ColorsNormal)
         tpl_line_em = u'%%s%s%%s %s%%s%s' % (Colors.linenoEm, Colors.line,
-                                            ColorsNormal)
+                                             ColorsNormal)
 
         frame, lineno = frame_lineno
 
@@ -440,7 +440,7 @@ def format_stack_entry(self, frame_lineno, lprefix=': ', context=None):
             ret.append('> ')
         else:
             ret.append('  ')
-        ret.append(u'%s(%s)%s\n' % (link,lineno,call))
+        ret.append(u'%s(%s)%s\n' % (link, lineno, call))
 
         start = lineno - 1 - context//2
         lines = linecache.getlines(filename)
@@ -448,17 +448,17 @@ def format_stack_entry(self, frame_lineno, lprefix=': ', context=None):
         start = max(start, 0)
         lines = lines[start : start + context]
 
-        for i,line in enumerate(lines):
+        for i, line in enumerate(lines):
             show_arrow = (start + 1 + i == lineno)
             linetpl = (frame is self.curframe or show_arrow) \
                       and tpl_line_em \
                       or tpl_line
             ret.append(self.__format_line(linetpl, filename,
                                           start + 1 + i, line,
-                                          arrow = show_arrow) )
+                                          arrow=show_arrow))
         return ''.join(ret)
 
-    def __format_line(self, tpl_line, filename, lineno, line, arrow = False):
+    def __format_line(self, tpl_line, filename, lineno, line, arrow=False):
         bp_mark = ""
         bp_mark_color = ""
 
@@ -488,7 +488,6 @@ def __format_line(self, tpl_line, filename, lineno, line, arrow = False):
 
         return tpl_line % (bp_mark_color + bp_mark, num, line)
 
-
     def print_list_lines(self, filename, first, last):
         """The printing (as opposed to the parsing part of a 'list'
         command."""
@@ -507,9 +506,9 @@ def print_list_lines(self, filename, first, last):
                     break
 
                 if lineno == self.curframe.f_lineno:
-                    line = self.__format_line(tpl_line_em, filename, lineno, line, arrow = True)
+                    line = self.__format_line(tpl_line_em, filename, lineno, line, arrow=True)
                 else:
-                    line = self.__format_line(tpl_line, filename, lineno, line, arrow = False)
+                    line = self.__format_line(tpl_line, filename, lineno, line, arrow=False)
 
                 src.append(line)
                 self.lineno = lineno
@@ -706,7 +705,7 @@ def do_up(self, arg):
 
         Will skip hidden frames.
         """
-        ## modified version of upstream that skips
+        # modified version of upstream that skips
         # frames with __tracebackide__
         if self.curindex == 0:
             self.error("Oldest frame")

From 182282d5b9cad4de6b9bcbaded0cf696327da636 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 7 Feb 2021 21:59:09 +0100
Subject: [PATCH 0435/1407] ipdb: remove unused variables in core.debugger

---
 IPython/core/debugger.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index a168a07ef53..2e2318d3816 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -719,11 +719,9 @@ def do_up(self, arg):
         if count < 0:
             _newframe = 0
         else:
-            _newindex = self.curindex
             counter = 0
             hidden_frames = self.hidden_frames(self.stack)
             for i in range(self.curindex - 1, -1, -1):
-                frame = self.stack[i][0]
                 if hidden_frames[i] and self.skip_hidden:
                     skipped += 1
                     continue
@@ -764,12 +762,10 @@ def do_down(self, arg):
         if count < 0:
             _newframe = len(self.stack) - 1
         else:
-            _newindex = self.curindex
             counter = 0
             skipped = 0
             hidden_frames = self.hidden_frames(self.stack)
             for i in range(self.curindex + 1, len(self.stack)):
-                frame = self.stack[i][0]
                 if hidden_frames[i] and self.skip_hidden:
                     skipped += 1
                     continue

From 37fbfcf13d22e86b7288ec2faa241ac9df1d2243 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 7 Feb 2021 22:10:43 +0100
Subject: [PATCH 0436/1407] ipdb: accept question mark(s) suffixes

---
 IPython/core/debugger.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 2e2318d3816..5033966bcf0 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -320,6 +320,18 @@ def interaction(self, frame, traceback):
         except KeyboardInterrupt:
             self.stdout.write("\n" + self.shell.get_exception_only())
 
+    def precmd(self, line):
+        """Perform useful escapes on the command before it is executed."""
+
+        if line.endswith('??'):
+            line = 'pinfo2 ' + line[:-2]
+        elif line.endswith('?'):
+            line = 'pinfo ' + line[:-1]
+
+        line = super().precmd(line)
+
+        return line
+
     def new_do_frame(self, arg):
         OldPdb.do_frame(self, arg)
 

From c312ee0aeeb1388564c4d6ec48f5148a7e2127c3 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 7 Feb 2021 22:55:52 +0100
Subject: [PATCH 0437/1407] Darken terminal.debugger and core.debugger

---
 IPython/core/debugger.py     | 47 +++++++++++++++++++-----------------
 IPython/terminal/debugger.py |  7 +++---
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 5033966bcf0..71a94ed60b7 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -238,7 +238,7 @@ def __init__(self, color_scheme=None, completekey=None,
             self.shell = TerminalInteractiveShell.instance()
             # needed by any code which calls __import__("__main__") after
             # the debugger was entered. See also #9941.
-            sys.modules['__main__'] = save_main
+            sys.modules["__main__"] = save_main
 
         if color_scheme is not None:
             warnings.warn(
@@ -323,10 +323,10 @@ def interaction(self, frame, traceback):
     def precmd(self, line):
         """Perform useful escapes on the command before it is executed."""
 
-        if line.endswith('??'):
-            line = 'pinfo2 ' + line[:-2]
-        elif line.endswith('?'):
-            line = 'pinfo ' + line[:-1]
+        if line.endswith("??"):
+            line = "pinfo2 " + line[:-2]
+        elif line.endswith("?"):
+            line = "pinfo " + line[:-1]
 
         line = super().precmd(line)
 
@@ -414,11 +414,10 @@ def format_stack_entry(self, frame_lineno, lprefix=': ', context=None):
 
         Colors = self.color_scheme_table.active_colors
         ColorsNormal = Colors.Normal
-        tpl_link = u'%s%%s%s' % (Colors.filenameEm, ColorsNormal)
-        tpl_call = u'%s%%s%s%%s%s' % (Colors.vName, Colors.valEm, ColorsNormal)
-        tpl_line = u'%%s%s%%s %s%%s' % (Colors.lineno, ColorsNormal)
-        tpl_line_em = u'%%s%s%%s %s%%s%s' % (Colors.linenoEm, Colors.line,
-                                             ColorsNormal)
+        tpl_link = "%s%%s%s" % (Colors.filenameEm, ColorsNormal)
+        tpl_call = "%s%%s%s%%s%s" % (Colors.vName, Colors.valEm, ColorsNormal)
+        tpl_line = "%%s%s%%s %s%%s" % (Colors.lineno, ColorsNormal)
+        tpl_line_em = "%%s%s%%s %s%%s%s" % (Colors.linenoEm, Colors.line, ColorsNormal)
 
         frame, lineno = frame_lineno
 
@@ -451,8 +450,8 @@ def format_stack_entry(self, frame_lineno, lprefix=': ', context=None):
         if frame is self.curframe:
             ret.append('> ')
         else:
-            ret.append('  ')
-        ret.append(u'%s(%s)%s\n' % (link, lineno, call))
+            ret.append("  ")
+        ret.append("%s(%s)%s\n" % (link, lineno, call))
 
         start = lineno - 1 - context//2
         lines = linecache.getlines(filename)
@@ -461,14 +460,14 @@ def format_stack_entry(self, frame_lineno, lprefix=': ', context=None):
         lines = lines[start : start + context]
 
         for i, line in enumerate(lines):
-            show_arrow = (start + 1 + i == lineno)
-            linetpl = (frame is self.curframe or show_arrow) \
-                      and tpl_line_em \
-                      or tpl_line
-            ret.append(self.__format_line(linetpl, filename,
-                                          start + 1 + i, line,
-                                          arrow=show_arrow))
-        return ''.join(ret)
+            show_arrow = start + 1 + i == lineno
+            linetpl = (frame is self.curframe or show_arrow) and tpl_line_em or tpl_line
+            ret.append(
+                self.__format_line(
+                    linetpl, filename, start + 1 + i, line, arrow=show_arrow
+                )
+            )
+        return "".join(ret)
 
     def __format_line(self, tpl_line, filename, lineno, line, arrow=False):
         bp_mark = ""
@@ -518,9 +517,13 @@ def print_list_lines(self, filename, first, last):
                     break
 
                 if lineno == self.curframe.f_lineno:
-                    line = self.__format_line(tpl_line_em, filename, lineno, line, arrow=True)
+                    line = self.__format_line(
+                        tpl_line_em, filename, lineno, line, arrow=True
+                    )
                 else:
-                    line = self.__format_line(tpl_line, filename, lineno, line, arrow=False)
+                    line = self.__format_line(
+                        tpl_line, filename, lineno, line, arrow=False
+                    )
 
                 src.append(line)
                 self.lineno = lineno
diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index a4a5419564f..dd1ecc1518a 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -39,10 +39,9 @@ def get_prompt_tokens():
             return [(Token.Prompt, self.prompt)]
 
         if self._ptcomp is None:
-            compl = IPCompleter(shell=self.shell,
-                                namespace={},
-                                global_namespace={},
-                                parent=self.shell)
+            compl = IPCompleter(
+                shell=self.shell, namespace={}, global_namespace={}, parent=self.shell
+            )
             # add a completer for all the do_ methods
             methods_names = [m[3:] for m in dir(self) if m.startswith("do_")]
 

From eee922d24ea2e53563ff507be09c988416c77b6a Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@gmail.com>
Date: Thu, 4 Feb 2021 10:04:08 +0100
Subject: [PATCH 0438/1407] Allow passing a custom CachingCompiler to the
 interactive shell

This permits to customize the filename computation prior to
caching/compiling.
---
 IPython/core/compilerop.py       |  44 ++++++++--
 IPython/core/interactiveshell.py | 142 +++++++++++++++++--------------
 2 files changed, 112 insertions(+), 74 deletions(-)

diff --git a/IPython/core/compilerop.py b/IPython/core/compilerop.py
index c4771af7303..50672a19541 100644
--- a/IPython/core/compilerop.py
+++ b/IPython/core/compilerop.py
@@ -99,7 +99,7 @@ def ast_parse(self, source, filename='<unknown>', symbol='exec'):
         Arguments are exactly the same as ast.parse (in the standard library),
         and are passed to the built-in compile function."""
         return compile(source, filename, symbol, self.flags | PyCF_ONLY_AST, 1)
-    
+
     def reset_compiler_flags(self):
         """Reset compiler flags to default state."""
         # This value is copied from codeop.Compile.__init__, so if that ever
@@ -112,25 +112,53 @@ def compiler_flags(self):
         """
         return self.flags
 
-    def cache(self, code, number=0):
+    def get_code_name(self, raw_code, transformed_code, number):
+        """Compute filename given the code, and the cell number.
+
+        Parameters
+        ----------
+        raw_code : str
+          The raw cell code.
+        transformed_code : str
+          The executable Python source code to cache and compile.
+        number : int
+          A number which forms part of the code's name. Used for the execution
+          counter.
+
+        Returns
+        -------
+        The computed filename.
+        """
+        return code_name(transformed_code, number)
+
+    def cache(self, transformed_code, number=0, raw_code=None):
         """Make a name for a block of code, and cache the code.
 
         Parameters
         ----------
-        code : str
-          The Python source code to cache.
+        transformed_code : str
+          The executable Python source code to cache and compile.
         number : int
           A number which forms part of the code's name. Used for the execution
           counter.
+        raw_code : str
+          The raw code before transformation, if None, set to `transformed_code`.
 
         Returns
         -------
         The name of the cached code (as a string). Pass this as the filename
         argument to compilation, so that tracebacks are correctly hooked up.
         """
-        name = code_name(code, number)
-        entry = (len(code), time.time(),
-                 [line+'\n' for line in code.splitlines()], name)
+        if raw_code is None:
+            raw_code = transformed_code
+
+        name = self.get_code_name(raw_code, transformed_code, number)
+        entry = (
+            len(transformed_code),
+            time.time(),
+            [line + "\n" for line in transformed_code.splitlines()],
+            name,
+        )
         linecache.cache[name] = entry
         linecache._ipython_cache[name] = entry
         return name
@@ -146,7 +174,7 @@ def extra_flags(self, flags):
             yield
         finally:
             # turn off only the bits we turned on so that something like
-            # __future__ that set flags stays. 
+            # __future__ that set flags stays.
             self.flags &= ~turn_on_bits
 
 
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index df1fe07bf29..589a3be96cc 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -340,7 +340,7 @@ class InteractiveShell(SingletonConfigurable):
     """An enhanced, interactive shell for Python."""
 
     _instance = None
-    
+
     ast_transformers = List([], help=
         """
         A list of ast.NodeTransformer subclass instances, which will be applied
@@ -407,7 +407,7 @@ def _import_runner(self, proposal):
         Enable magic commands to be called without the leading %.
         """
     ).tag(config=True)
-    
+
     banner1 = Unicode(default_banner,
         help="""The part of the banner to be printed before the profile"""
     ).tag(config=True)
@@ -443,7 +443,8 @@ def _import_runner(self, proposal):
     display_formatter = Instance(DisplayFormatter, allow_none=True)
     displayhook_class = Type(DisplayHook)
     display_pub_class = Type(DisplayPublisher)
-    
+    compiler_class = Type(CachingCompiler)
+
     sphinxify_docstring = Bool(False, help=
         """
         Enables rich html representation of docstrings. (This requires the
@@ -534,7 +535,7 @@ def input_splitter(self):
     ).tag(config=True)
 
     # deprecated prompt traits:
-    
+
     prompt_in1 = Unicode('In [\\#]: ',
         help="Deprecated since IPython 4.0 and ignored since 5.0, set TerminalInteractiveShell.prompts object directly."
     ).tag(config=True)
@@ -547,14 +548,14 @@ def input_splitter(self):
     prompts_pad_left = Bool(True,
         help="Deprecated since IPython 4.0 and ignored since 5.0, set TerminalInteractiveShell.prompts object directly."
     ).tag(config=True)
-    
+
     @observe('prompt_in1', 'prompt_in2', 'prompt_out', 'prompt_pad_left')
     def _prompt_trait_changed(self, change):
         name = change['name']
         warn("InteractiveShell.{name} is deprecated since IPython 4.0"
              " and ignored since 5.0, set TerminalInteractiveShell.prompts"
              " object directly.".format(name=name))
-        
+
         # protect against weird cases where self.config may not exist:
 
     show_rewritten_input = Bool(True,
@@ -638,7 +639,7 @@ def __init__(self, ipython_dir=None, profile_dir=None,
         self.init_profile_dir(profile_dir)
         self.init_instance_attrs()
         self.init_environment()
-        
+
         # Check if we're in a virtualenv, and set up sys.path.
         self.init_virtualenv()
 
@@ -748,7 +749,7 @@ def init_instance_attrs(self):
         self.more = False
 
         # command compiler
-        self.compile = CachingCompiler()
+        self.compile = self.compiler_class()
 
         # Make an empty namespace, which extension writers can rely on both
         # existing and NEVER being used by ipython itself.  This gives them a
@@ -986,7 +987,7 @@ def restore_sys_module_state(self):
     #-------------------------------------------------------------------------
     # Things related to the banner
     #-------------------------------------------------------------------------
-    
+
     @property
     def banner(self):
         banner = self.banner1
@@ -1000,7 +1001,7 @@ def show_banner(self, banner=None):
         if banner is None:
             banner = self.banner
         sys.stdout.write(banner)
-    
+
     #-------------------------------------------------------------------------
     # Things related to hooks
     #-------------------------------------------------------------------------
@@ -1017,10 +1018,10 @@ def init_hooks(self):
             # default hooks have priority 100, i.e. low; user hooks should have
             # 0-100 priority
             self.set_hook(hook_name,getattr(hooks,hook_name), 100, _warn_deprecated=False)
-        
+
         if self.display_page:
             self.set_hook('show_in_pager', page.as_hook(page.display_page), 90)
-    
+
     def set_hook(self,name,hook, priority=50, str_key=None, re_key=None,
                  _warn_deprecated=True):
         """set_hook(name,hook) -> sets an internal IPython hook.
@@ -1084,7 +1085,7 @@ def register_post_execute(self, func):
         warn("ip.register_post_execute is deprecated, use "
              "ip.events.register('post_run_cell', func) instead.", stacklevel=2)
         self.events.register('post_run_cell', func)
-    
+
     def _clear_warning_registry(self):
         # clear the warning registry, so that different code blocks with
         # overlapping line number ranges don't cause spurious suppression of
@@ -1126,12 +1127,12 @@ def new_main_mod(self, filename, modname):
         else:
             main_mod.__dict__.clear()
             main_mod.__name__ = modname
-        
+
         main_mod.__file__ = filename
         # It seems pydoc (and perhaps others) needs any module instance to
         # implement a __nonzero__ method
         main_mod.__nonzero__ = lambda : True
-        
+
         return main_mod
 
     def clear_main_mod_cache(self):
@@ -1283,7 +1284,7 @@ def init_create_namespaces(self, user_module=None, user_ns=None):
                          'user_local':self.user_ns,
                          'builtin':builtin_mod.__dict__
                          }
-    
+
     @property
     def user_global_ns(self):
         return self.user_module.__dict__
@@ -1316,17 +1317,17 @@ def prepare_user_module(self, user_module=None, user_ns=None):
             user_ns.setdefault("__name__", "__main__")
             user_module = DummyMod()
             user_module.__dict__ = user_ns
-            
+
         if user_module is None:
             user_module = types.ModuleType("__main__",
                 doc="Automatically created module for IPython interactive environment")
-        
+
         # We must ensure that __builtin__ (without the final 's') is always
         # available and pointing to the __builtin__ *module*.  For more details:
         # http://mail.python.org/pipermail/python-dev/2001-April/014068.html
         user_module.__dict__.setdefault('__builtin__', builtin_mod)
         user_module.__dict__.setdefault('__builtins__', builtin_mod)
-        
+
         if user_ns is None:
             user_ns = user_module.__dict__
 
@@ -1382,7 +1383,7 @@ def init_user_ns(self):
         # For more details:
         # http://mail.python.org/pipermail/python-dev/2001-April/014068.html
         ns = {}
-        
+
         # make global variables for user access to the histories
         ns['_ih'] = self.history_manager.input_hist_parsed
         ns['_oh'] = self.history_manager.output_hist
@@ -1395,7 +1396,7 @@ def init_user_ns(self):
 
         # Store myself as the public api!!!
         ns['get_ipython'] = self.get_ipython
-        
+
         ns['exit'] = self.exiter
         ns['quit'] = self.exiter
 
@@ -1409,7 +1410,7 @@ def init_user_ns(self):
 
         # Finally, update the real user's namespace
         self.user_ns.update(ns)
-    
+
     @property
     def all_ns_refs(self):
         """Get a list of references to all the namespace dictionaries in which
@@ -1435,7 +1436,7 @@ def reset(self, new_session=True, aggressive=False):
         # Reset last execution result
         self.last_execution_succeeded = True
         self.last_execution_result = None
-        
+
         # Flush cached output items
         if self.displayhook.do_full_cache:
             self.displayhook.flush()
@@ -1500,7 +1501,7 @@ def del_var(self, varname, by_name=False):
             raise ValueError("Refusing to delete %s" % varname)
 
         ns_refs = self.all_ns_refs
-        
+
         if by_name:                    # Delete by name
             for ns in ns_refs:
                 try:
@@ -1775,8 +1776,14 @@ def _inspect(self, meth, oname, namespaces=None, **kw):
             if meth == 'pdoc':
                 pmethod(info.obj, oname, formatter)
             elif meth == 'pinfo':
-                pmethod(info.obj, oname, formatter, info, 
-                        enable_html_pager=self.enable_html_pager, **kw)
+                pmethod(
+                    info.obj,
+                    oname,
+                    formatter,
+                    info,
+                    enable_html_pager=self.enable_html_pager,
+                    **kw
+                )
             else:
                 pmethod(info.obj, oname)
         else:
@@ -1900,7 +1907,7 @@ def dummy_handler(self, etype, value, tb, tb_offset=None):
             print('Exception type :', etype)
             print('Exception value:', value)
             print('Traceback      :', tb)
-        
+
         def validate_stb(stb):
             """validate structured traceback return type
 
@@ -1929,7 +1936,7 @@ def validate_stb(stb):
         else:
             def wrapped(self,etype,value,tb,tb_offset=None):
                 """wrap CustomTB handler, to protect IPython from user code
-                
+
                 This makes it harder (but not impossible) for custom exception
                 handlers to crash IPython.
                 """
@@ -1978,10 +1985,10 @@ def excepthook(self, etype, value, tb):
 
     def _get_exc_info(self, exc_tuple=None):
         """get exc_info from a given tuple, sys.exc_info() or sys.last_type etc.
-        
+
         Ensures sys.last_type,value,traceback hold the exc_info we found,
         from whichever source.
-        
+
         raises ValueError if none of these contain any information
         """
         if exc_tuple is None:
@@ -1993,10 +2000,10 @@ def _get_exc_info(self, exc_tuple=None):
             if hasattr(sys, 'last_type'):
                 etype, value, tb = sys.last_type, sys.last_value, \
                                    sys.last_traceback
-        
+
         if etype is None:
             raise ValueError("No exception to find")
-        
+
         # Now store the exception info in sys.last_type etc.
         # WARNING: these variables are somewhat deprecated and not
         # necessarily safe to use in a threaded environment, but tools
@@ -2005,16 +2012,16 @@ def _get_exc_info(self, exc_tuple=None):
         sys.last_type = etype
         sys.last_value = value
         sys.last_traceback = tb
-        
+
         return etype, value, tb
-    
+
     def show_usage_error(self, exc):
         """Show a short message for UsageErrors
-        
+
         These are special exceptions that shouldn't show a traceback.
         """
         print("UsageError: %s" % exc, file=sys.stderr)
-    
+
     def get_exception_only(self, exc_tuple=None):
         """
         Return as a string (ending with a newline) the exception that
@@ -2128,7 +2135,7 @@ def showindentationerror(self):
 
     def init_readline(self):
         """DEPRECATED
-        
+
         Moved to terminal subclass, here only to simplify the init logic."""
         # Set a number of methods that depend on readline to be no-op
         warnings.warn('`init_readline` is no-op since IPython 5.0 and is Deprecated',
@@ -2295,12 +2302,13 @@ def init_magics(self):
         # should be split into a prompt manager and displayhook. We probably
         # even need a centralize colors management object.
         self.run_line_magic('colors', self.colors)
-    
+
     # Defined here so that it's included in the documentation
     @functools.wraps(magic.MagicsManager.register_function)
     def register_magic_function(self, func, magic_kind='line', magic_name=None):
-        self.magics_manager.register_function(func, 
-                                  magic_kind=magic_kind, magic_name=magic_name)
+        self.magics_manager.register_function(
+            func, magic_kind=magic_kind, magic_name=magic_name
+        )
 
     def run_line_magic(self, magic_name, line, _stack_depth=1):
         """Execute the given line magic.
@@ -2531,7 +2539,7 @@ def system_raw(self, cmd):
                 ec = 130
             if ec > 128:
                 ec = -(ec - 128)
-        
+
         # We explicitly do NOT return the subprocess status code, because
         # a non-None value would trigger :func:`sys.displayhook` calls.
         # Instead, we store the exit_code in user_ns.  Note the semantics
@@ -2594,7 +2602,7 @@ def init_extension_manager(self):
     def init_payload(self):
         self.payload_manager = PayloadManager(parent=self)
         self.configurables.append(self.payload_manager)
-    
+
     #-------------------------------------------------------------------------
     # Things related to the prefilter
     #-------------------------------------------------------------------------
@@ -2634,13 +2642,13 @@ def auto_rewrite_input(self, cmd):
 
     def _user_obj_error(self):
         """return simple exception dict
-        
+
         for use in user_expressions
         """
-        
+
         etype, evalue, tb = self._get_exc_info()
         stb = self.InteractiveTB.get_exception_only(etype, evalue)
-        
+
         exc_info = {
             "status": "error",
             "traceback": stb,
@@ -2649,13 +2657,13 @@ def _user_obj_error(self):
         }
 
         return exc_info
-    
+
     def _format_user_obj(self, obj):
         """format a user object to display dict
-        
+
         for use in user_expressions
         """
-        
+
         data, md = self.display_formatter.format(obj)
         value = {
             'status' : 'ok',
@@ -2663,7 +2671,7 @@ def _format_user_obj(self, obj):
             'metadata' : md,
         }
         return value
-    
+
     def user_expressions(self, expressions):
         """Evaluate a dict of expressions in the user's namespace.
 
@@ -2682,7 +2690,7 @@ def user_expressions(self, expressions):
         out = {}
         user_ns = self.user_ns
         global_ns = self.user_global_ns
-        
+
         for key, expr in expressions.items():
             try:
                 value = self._format_user_obj(eval(expr, global_ns, user_ns))
@@ -3096,12 +3104,14 @@ def error_before_exec(value):
         # Our own compiler remembers the __future__ environment. If we want to
         # run code with a separate __future__ environment, use the default
         # compiler
-        compiler = self.compile if shell_futures else CachingCompiler()
+        compiler = self.compile if shell_futures else self.compiler_class()
 
         _run_async = False
 
         with self.builtin_trap:
-            cell_name = self.compile.cache(cell, self.execution_count)
+            cell_name = self.compile.cache(
+                cell, self.execution_count, raw_code=raw_cell
+            )
 
             with self.display_trap:
                 # Compile to bytecode
@@ -3207,13 +3217,13 @@ def transform_cell(self, raw_cell):
 
     def transform_ast(self, node):
         """Apply the AST transformations from self.ast_transformers
-        
+
         Parameters
         ----------
         node : ast.Node
           The root node to be transformed. Typically called with the ast.Module
           produced by parsing user input.
-        
+
         Returns
         -------
         An ast.Node corresponding to the node it was called with. Note that it
@@ -3260,7 +3270,7 @@ async def run_ast_nodes(self, nodelist:ListType[AST], cell_name:str, interactivi
           Experimental value: 'async' Will try to run top level interactive
           async/await code in default runner, this will not respect the
           interactivity setting and will only run the last node if it is an
-          expression. 
+          expression.
 
         compiler : callable
           A function with the same interface as the built-in compile(), to turn
@@ -3481,17 +3491,17 @@ def check_complete(self, code: str) -> Tuple[str, str]:
 
     def enable_gui(self, gui=None):
         raise NotImplementedError('Implement enable_gui in a subclass')
-    
+
     def enable_matplotlib(self, gui=None):
         """Enable interactive matplotlib and inline figure support.
-        
+
         This takes the following steps:
-        
+
         1. select the appropriate eventloop and matplotlib backend
         2. set up matplotlib for interactive use with that backend
         3. configure formatters for inline figure display
         4. enable the selected gui eventloop
-        
+
         Parameters
         ----------
         gui : optional, string
@@ -3505,7 +3515,7 @@ def enable_matplotlib(self, gui=None):
         """
         from IPython.core import pylabtools as pt
         gui, backend = pt.find_gui_and_backend(gui, self.pylab_gui_select)
-    
+
         if gui != 'inline':
             # If we have our first gui selection, store it
             if self.pylab_gui_select is None:
@@ -3515,16 +3525,16 @@ def enable_matplotlib(self, gui=None):
                 print('Warning: Cannot change to a different GUI toolkit: %s.'
                         ' Using %s instead.' % (gui, self.pylab_gui_select))
                 gui, backend = pt.find_gui_and_backend(self.pylab_gui_select)
-        
+
         pt.activate_matplotlib(backend)
         pt.configure_inline_support(self, backend)
-        
+
         # Now we must activate the gui pylab wants to use, and fix %run to take
         # plot updates into account
         self.enable_gui(gui)
         self.magics_manager.registry['ExecutionMagics'].default_runner = \
             pt.mpl_runner(self.safe_execfile)
-        
+
         return gui, backend
 
     def enable_pylab(self, gui=None, import_all=True, welcome_message=False):
@@ -3534,7 +3544,7 @@ def enable_pylab(self, gui=None, import_all=True, welcome_message=False):
         namespace all of numpy and pylab, and configures IPython to correctly
         interact with the GUI event loop.  The GUI backend to be used can be
         optionally selected with the optional ``gui`` argument.
-        
+
         This method only adds preloading the namespace to InteractiveShell.enable_matplotlib.
 
         Parameters
@@ -3554,9 +3564,9 @@ def enable_pylab(self, gui=None, import_all=True, welcome_message=False):
           This argument is ignored, no welcome message will be displayed.
         """
         from IPython.core.pylabtools import import_pylab
-        
+
         gui, backend = self.enable_matplotlib(gui)
-        
+
         # We want to prevent the loading of pylab to pollute the user's
         # namespace as shown by the %who* magics, so we execute the activation
         # code in an empty namespace, and we update *both* user_ns and

From ab7762f9e5538e402ccde8696701197405026295 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 19 Feb 2021 13:39:31 -0800
Subject: [PATCH 0439/1407] fix doc

---
 IPython/core/completer.py | 20 +++++++++++++++-----
 IPython/core/display.py   | 16 ++++++++--------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 0100bfcc459..78bc57e1262 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -201,7 +201,9 @@ def provisionalcompleter(action='ignore'):
 
     >>> completer.do_experimental_things() # raises.
 
-    .. note:: Unstable
+    .. note::
+
+        Unstable
 
         By using this context manager you agree that the API in use may change
         without warning, and that you won't complain if they do so.
@@ -356,7 +358,9 @@ class Completion:
     """
     Completion object used and return by IPython completers.
 
-    .. warning:: Unstable
+    .. warning::
+
+        Unstable
 
         This function is unstable, API may change without warning.
         It will also raise unless use in proper context manager.
@@ -419,7 +423,9 @@ def _deduplicate_completions(text: str, completions: _IC)-> _IC:
     """
     Deduplicate a set of completions.
 
-    .. warning:: Unstable
+    .. warning::
+
+        Unstable
 
         This function is unstable, API may change without warning.
 
@@ -459,7 +465,9 @@ def rectify_completions(text: str, completions: _IC, *, _debug=False)->_IC:
     """
     Rectify a set of completions to all have the same ``start`` and ``end``
 
-    .. warning:: Unstable
+    .. warning::
+
+        Unstable
 
         This function is unstable, API may change without warning.
         It will also raise unless use in proper context manager.
@@ -1837,7 +1845,9 @@ def completions(self, text: str, offset: int)->Iterator[Completion]:
         """
         Returns an iterator over the possible completions
 
-        .. warning:: Unstable
+        .. warning::
+
+            Unstable
 
             This function is unstable, API may change without warning.
             It will also raise unless use in proper context manager.
diff --git a/IPython/core/display.py b/IPython/core/display.py
index ff59576cc93..bd098e78f99 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -1043,19 +1043,19 @@ def __init__(self, data=None, url=None, filename=None, embed=False,
         ----------
         data : unicode, str or bytes
             The raw video data or a URL or filename to load the data from.
-            Raw data will require passing `embed=True`.
+            Raw data will require passing ``embed=True``.
         url : unicode
-            A URL for the video. If you specify `url=`,
+            A URL for the video. If you specify ``url=``,
             the image data will not be embedded.
         filename : unicode
             Path to a local file containing the video.
-            Will be interpreted as a local URL unless `embed=True`.
+            Will be interpreted as a local URL unless ``embed=True``.
         embed : bool
             Should the video be embedded using a data URI (True) or be
             loaded using a <video> tag (False).
 
             Since videos are large, embedding them should be avoided, if possible.
-            You must confirm embedding as your intention by passing `embed=True`.
+            You must confirm embedding as your intention by passing ``embed=True``.
 
             Local files can be displayed with URLs without embedding the content, via::
 
@@ -1070,10 +1070,10 @@ def __init__(self, data=None, url=None, filename=None, embed=False,
             Height in pixels to which to constrain the video in html.
             If not supplied, defaults to the height of the video.
         html_attributes : str
-            Attributes for the HTML `<video>` block.
-            Default: `"controls"` to get video controls.
-            Other examples: `"controls muted"` for muted video with controls,
-            `"loop autoplay"` for looping autoplaying video without controls.
+            Attributes for the HTML ``<video>`` block.
+            Default: ``"controls"`` to get video controls.
+            Other examples: ``"controls muted"`` for muted video with controls,
+            ``"loop autoplay"`` for looping autoplaying video without controls.
 
         Examples
         --------

From c5850b0bddd563a39ca7bee8ecf0c7bae0c4d355 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 21 Feb 2021 02:39:37 +0100
Subject: [PATCH 0440/1407] Add a WN entry for IPDB question marks feature

---
 docs/source/whatsnew/pr/ipdb-question-marks.rst | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/ipdb-question-marks.rst

diff --git a/docs/source/whatsnew/pr/ipdb-question-marks.rst b/docs/source/whatsnew/pr/ipdb-question-marks.rst
new file mode 100644
index 00000000000..7ccad23b3bb
--- /dev/null
+++ b/docs/source/whatsnew/pr/ipdb-question-marks.rst
@@ -0,0 +1,16 @@
+Show pinfo information in ipdb using "?" and "??"
+-------------------------------------------------
+
+In IPDB, it is now possible to show the information about an object using "?"
+and "??", in much the same way it can be done when using the IPython prompt::
+
+    ipdb> partial?
+    Init signature: partial(self, /, *args, **kwargs)
+    Docstring:     
+    partial(func, *args, **keywords) - new function with partial application
+    of the given arguments and keywords.
+    File:           ~/.pyenv/versions/3.8.6/lib/python3.8/functools.py
+    Type:           type
+    Subclasses:     
+
+Previously, "pinfo" or "pinfo2" command had to be used for this purpose.

From d0d2ec224e970757596d9f8f400cc8878e18cea9 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 21 Feb 2021 02:16:34 +0100
Subject: [PATCH 0441/1407] ipdb: ada "context" command

---
 IPython/core/debugger.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 71a94ed60b7..5d1286b82b1 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -806,6 +806,20 @@ def do_down(self, arg):
     do_d = do_down
     do_u = do_up
 
+    def do_context(self, context):
+        """context number_of_lines
+        Set the number of lines of source code to show when displaying
+        stacktrace information.
+        """
+        try:
+            new_context = int(context)
+            if new_context <= 0:
+                raise ValueError()
+        except ValueError:
+            self.error("The 'context' command requires a positive integer argument.")
+        self.context = new_context
+
+
 class InterruptiblePdb(Pdb):
     """Version of debugger where KeyboardInterrupt exits the debugger altogether."""
 

From a9818559f7627a0d34a6221f17e18598679e4e44 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 21 Feb 2021 02:25:30 +0100
Subject: [PATCH 0442/1407] Add a whats-new entry

---
 docs/source/whatsnew/pr/ipdb-context-command.rst | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/ipdb-context-command.rst

diff --git a/docs/source/whatsnew/pr/ipdb-context-command.rst b/docs/source/whatsnew/pr/ipdb-context-command.rst
new file mode 100644
index 00000000000..80a3bf8a4cd
--- /dev/null
+++ b/docs/source/whatsnew/pr/ipdb-context-command.rst
@@ -0,0 +1,5 @@
+New "context" command in ipdb
+-----------------------------
+
+It is now possible to change the number of lines shown in the backtrace
+information in ipdb using "context" command.

From aa90952524e42943a9f30dc86cfe714b02f462a9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Feb 2021 10:36:48 -0800
Subject: [PATCH 0443/1407] Update whats new for dev and 7.21

---
 docs/source/whatsnew/development.rst          | 18 ++++++++++
 .../whatsnew/pr/ipdb-context-command.rst      |  5 ---
 .../whatsnew/pr/ipdb-question-marks.rst       | 16 ---------
 docs/source/whatsnew/version7.rst             | 34 +++++++++++++++++++
 4 files changed, 52 insertions(+), 21 deletions(-)
 delete mode 100644 docs/source/whatsnew/pr/ipdb-context-command.rst
 delete mode 100644 docs/source/whatsnew/pr/ipdb-question-marks.rst

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 97ec2f83f88..3fb260c0288 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -134,6 +134,24 @@ Currently, autosuggestions are only shown in the emacs or vi insert editing mode
 - The ctrl e, ctrl f, and alt f shortcuts work by default in emacs mode.
 - To use these shortcuts in vi insert mode, you will have to create `custom keybindings in your config.py <https://github.com/mskar/setup/commit/2892fcee46f9f80ef7788f0749edc99daccc52f4/>`__.
 
+
+Show pinfo information in ipdb using "?" and "??"
+-------------------------------------------------
+
+In IPDB, it is now possible to show the information about an object using "?"
+and "??", in much the same way it can be done when using the IPython prompt::
+
+    ipdb> partial?
+    Init signature: partial(self, /, *args, **kwargs)
+    Docstring:
+    partial(func, *args, **keywords) - new function with partial application
+    of the given arguments and keywords.
+    File:           ~/.pyenv/versions/3.8.6/lib/python3.8/functools.py
+    Type:           type
+    Subclasses:
+
+Previously, "pinfo" or "pinfo2" command had to be used for this purpose.
+
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 
 As a reminder, IPython master has diverged from the 7.x branch, thus master may
diff --git a/docs/source/whatsnew/pr/ipdb-context-command.rst b/docs/source/whatsnew/pr/ipdb-context-command.rst
deleted file mode 100644
index 80a3bf8a4cd..00000000000
--- a/docs/source/whatsnew/pr/ipdb-context-command.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-New "context" command in ipdb
------------------------------
-
-It is now possible to change the number of lines shown in the backtrace
-information in ipdb using "context" command.
diff --git a/docs/source/whatsnew/pr/ipdb-question-marks.rst b/docs/source/whatsnew/pr/ipdb-question-marks.rst
deleted file mode 100644
index 7ccad23b3bb..00000000000
--- a/docs/source/whatsnew/pr/ipdb-question-marks.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-Show pinfo information in ipdb using "?" and "??"
--------------------------------------------------
-
-In IPDB, it is now possible to show the information about an object using "?"
-and "??", in much the same way it can be done when using the IPython prompt::
-
-    ipdb> partial?
-    Init signature: partial(self, /, *args, **kwargs)
-    Docstring:     
-    partial(func, *args, **keywords) - new function with partial application
-    of the given arguments and keywords.
-    File:           ~/.pyenv/versions/3.8.6/lib/python3.8/functools.py
-    Type:           type
-    Subclasses:     
-
-Previously, "pinfo" or "pinfo2" command had to be used for this purpose.
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 3bad5272d2c..308d954996e 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,40 @@
  7.x Series
 ============
 
+.. _version 721:
+
+IPython 7.21
+============
+
+IPython 7.21 is the first release we have back on schedule of one release every
+month; it contains a number of minor fixes and improvements, notably, the new
+context command for ipdb
+
+
+New "context" command in ipdb
+-----------------------------
+
+It is now possible to change the number of lines shown in the backtrace
+information in ipdb using "context" command. :ghpull:`12826`
+
+(thanks @MrMino, there are other improvement from them on master).
+
+Other notable changes in IPython 7.21
+-------------------------------------
+
+- Fix some issues on new osx-arm64 :ghpull:`12804`, :ghpull:`12807`. 
+- Compatibility with Xeus-Python for debugger protocol, :ghpull:`12809`
+- Misc docs fixes for compatibility and uniformity with Numpydoc.
+  :ghpull:`12824`
+
+
+Thanks
+------
+
+Many thanks to all the contributors to this release you can find all individual
+contribution to this milestone `on github <https://github.com/ipython/ipython/milestone/83>`_.
+
+
 .. _version 720:
 
 IPython 7.20

From e1eb76bf516564e632d845eb9ca1a8aaff7fe1b5 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Feb 2021 15:41:25 -0800
Subject: [PATCH 0444/1407] NEP29 : Bump numpy testing requirements to 1.16+

---
 setup.py | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/setup.py b/setup.py
index a353555068a..4c769a14c7f 100755
--- a/setup.py
+++ b/setup.py
@@ -171,15 +171,23 @@
 # setuptools requirements
 
 extras_require = dict(
-    parallel = ['ipyparallel'],
-    qtconsole = ['qtconsole'],
-    doc = ['Sphinx>=1.3'],
-    test = ['nose>=0.10.1', 'requests', 'testpath', 'pygments', 'nbformat', 'ipykernel', 'numpy>=1.14'],
-    terminal = [],
-    kernel = ['ipykernel'],
-    nbformat = ['nbformat'],
-    notebook = ['notebook', 'ipywidgets'],
-    nbconvert = ['nbconvert'],
+    parallel=["ipyparallel"],
+    qtconsole=["qtconsole"],
+    doc=["Sphinx>=1.3"],
+    test=[
+        "nose>=0.10.1",
+        "requests",
+        "testpath",
+        "pygments",
+        "nbformat",
+        "ipykernel",
+        "numpy>=1.16",
+    ],
+    terminal=[],
+    kernel=["ipykernel"],
+    nbformat=["nbformat"],
+    notebook=["notebook", "ipywidgets"],
+    nbconvert=["nbconvert"],
 )
 
 install_requires = [

From b7c3508ab118da113aacc7bc7ccc6455adc9cad1 Mon Sep 17 00:00:00 2001
From: Talley Lambert <talley.lambert@gmail.com>
Date: Tue, 2 Mar 2021 19:34:01 -0500
Subject: [PATCH 0445/1407] add patch

---
 IPython/terminal/pt_inputhooks/qt.py | 31 ++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/IPython/terminal/pt_inputhooks/qt.py b/IPython/terminal/pt_inputhooks/qt.py
index cdadfffc811..4040b914525 100644
--- a/IPython/terminal/pt_inputhooks/qt.py
+++ b/IPython/terminal/pt_inputhooks/qt.py
@@ -1,6 +1,7 @@
 import sys
 import os
 from IPython.external.qt_for_kernel import QtCore, QtGui
+from IPython import get_ipython
 
 # If we create a QApplication, keep a reference to it so that it doesn't get
 # garbage collected.
@@ -8,28 +9,41 @@
 _already_warned = False
 
 
+def _reclaim_excepthook():
+    shell = get_ipython()
+    if shell is not None:
+        sys.excepthook = shell.excepthook
+
+
 def inputhook(context):
     global _appref
     app = QtCore.QCoreApplication.instance()
     if not app:
-        if sys.platform == 'linux':
-            if not os.environ.get('DISPLAY') \
-                    and not os.environ.get('WAYLAND_DISPLAY'):
+        if sys.platform == "linux":
+            if not os.environ.get("DISPLAY") and not os.environ.get("WAYLAND_DISPLAY"):
                 import warnings
+
                 global _already_warned
                 if not _already_warned:
                     _already_warned = True
                     warnings.warn(
-                        'The DISPLAY or WAYLAND_DISPLAY environment variable is '
-                        'not set or empty and Qt5 requires this environment '
-                        'variable. Deactivate Qt5 code.'
+                        "The DISPLAY or WAYLAND_DISPLAY environment variable is "
+                        "not set or empty and Qt5 requires this environment "
+                        "variable. Deactivate Qt5 code."
                     )
                 return
         QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)
         _appref = app = QtGui.QApplication([" "])
+
+        # "reclaim" IPython sys.excepthook after event loop starts
+        # without this, it defaults back to BaseIPythonApplication.excepthook
+        # and exceptions in the Qt event loop are rendered without traceback
+        # formatting and look like "bug in IPython".
+        QtCore.QTimer.singleShot(0, _reclaim_excepthook)
+
     event_loop = QtCore.QEventLoop(app)
 
-    if sys.platform == 'win32':
+    if sys.platform == "win32":
         # The QSocketNotifier method doesn't appear to work on Windows.
         # Use polling instead.
         timer = QtCore.QTimer()
@@ -41,8 +55,7 @@ def inputhook(context):
     else:
         # On POSIX platforms, we can use a file descriptor to quit the event
         # loop when there is input ready to read.
-        notifier = QtCore.QSocketNotifier(context.fileno(),
-                                          QtCore.QSocketNotifier.Read)
+        notifier = QtCore.QSocketNotifier(context.fileno(), QtCore.QSocketNotifier.Read)
         try:
             # connect the callback we care about before we turn it on
             # lambda is necessary as PyQT inspect the function signature to know

From e57c06148fb744fadd0dc5b3b0346dd70ecd2147 Mon Sep 17 00:00:00 2001
From: Talley Lambert <talley.lambert@gmail.com>
Date: Tue, 2 Mar 2021 19:37:00 -0500
Subject: [PATCH 0446/1407] formatting

---
 IPython/terminal/pt_inputhooks/qt.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/IPython/terminal/pt_inputhooks/qt.py b/IPython/terminal/pt_inputhooks/qt.py
index 4040b914525..b7683b8f249 100644
--- a/IPython/terminal/pt_inputhooks/qt.py
+++ b/IPython/terminal/pt_inputhooks/qt.py
@@ -19,17 +19,17 @@ def inputhook(context):
     global _appref
     app = QtCore.QCoreApplication.instance()
     if not app:
-        if sys.platform == "linux":
-            if not os.environ.get("DISPLAY") and not os.environ.get("WAYLAND_DISPLAY"):
+        if sys.platform == 'linux':
+            if not os.environ.get('DISPLAY') \
+                    and not os.environ.get('WAYLAND_DISPLAY'):
                 import warnings
-
                 global _already_warned
                 if not _already_warned:
                     _already_warned = True
                     warnings.warn(
-                        "The DISPLAY or WAYLAND_DISPLAY environment variable is "
-                        "not set or empty and Qt5 requires this environment "
-                        "variable. Deactivate Qt5 code."
+                        'The DISPLAY or WAYLAND_DISPLAY environment variable is '
+                        'not set or empty and Qt5 requires this environment '
+                        'variable. Deactivate Qt5 code.'
                     )
                 return
         QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)
@@ -43,7 +43,7 @@ def inputhook(context):
 
     event_loop = QtCore.QEventLoop(app)
 
-    if sys.platform == "win32":
+    if sys.platform == 'win32':
         # The QSocketNotifier method doesn't appear to work on Windows.
         # Use polling instead.
         timer = QtCore.QTimer()
@@ -55,7 +55,8 @@ def inputhook(context):
     else:
         # On POSIX platforms, we can use a file descriptor to quit the event
         # loop when there is input ready to read.
-        notifier = QtCore.QSocketNotifier(context.fileno(), QtCore.QSocketNotifier.Read)
+        notifier = QtCore.QSocketNotifier(context.fileno(),
+                                          QtCore.QSocketNotifier.Read)
         try:
             # connect the callback we care about before we turn it on
             # lambda is necessary as PyQT inspect the function signature to know

From 1f03cd0d3d566aac68084e35c2034cd6256c7b15 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Thu, 4 Mar 2021 12:22:13 +0100
Subject: [PATCH 0447/1407] ipdb: fix ULE when running 'context' without
 argument

---
 IPython/core/debugger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 5d1286b82b1..b0e62cab9c7 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -815,9 +815,9 @@ def do_context(self, context):
             new_context = int(context)
             if new_context <= 0:
                 raise ValueError()
+            self.context = new_context
         except ValueError:
             self.error("The 'context' command requires a positive integer argument.")
-        self.context = new_context
 
 
 class InterruptiblePdb(Pdb):

From e92e044f2427f849f640d533f2e45a21fdf2ca5e Mon Sep 17 00:00:00 2001
From: Daniel Goldfarb <dgoldfarb.github@gmail.com>
Date: Mon, 8 Mar 2021 19:45:42 -0500
Subject: [PATCH 0448/1407] implement range pattern with prints for testing

---
 IPython/core/magics/history.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/IPython/core/magics/history.py b/IPython/core/magics/history.py
index 6f2138f9bfa..145ead32a36 100644
--- a/IPython/core/magics/history.py
+++ b/IPython/core/magics/history.py
@@ -16,6 +16,7 @@
 import os
 import sys
 from io import open as io_open
+import fnmatch
 
 # Our own packages
 from IPython.core.error import StdinNotImplementedError
@@ -170,21 +171,34 @@ def _format_lineno(session, line):
         pattern = None
         limit = None if args.limit is _unspecified else args.limit
 
-        if args.pattern is not None:
+        print('args.pattern=',args.pattern)
+        print('args.limit=',args.limit)
+        print('type(args.limit)=',type(args.limit))
+        print('args.range=',args.range)
+
+        range_pattern = False
+        if args.pattern is not None and not args.range:
             if args.pattern:
                 pattern = "*" + " ".join(args.pattern) + "*"
             else:
                 pattern = "*"
+            print('pattern=',pattern)
             hist = history_manager.search(pattern, raw=raw, output=get_output,
                                           n=limit, unique=args.unique)
+            print('type(hist)=',type(hist))
             print_nums = True
         elif args.limit is not _unspecified:
             n = 10 if limit is None else limit
             hist = history_manager.get_tail(n, raw=raw, output=get_output)
         else:
             if args.range:      # Get history by ranges
+                if args.pattern:
+                    range_pattern = "*" + " ".join(args.pattern) + "*"
+                    print_nums = True
+                    print('range_pattern=',range_pattern)
                 hist = history_manager.get_range_by_str(" ".join(args.range),
                                                         raw, get_output)
+                print('type(hist)=',type(hist))
             else:               # Just get history for the current session
                 hist = history_manager.get_range(raw=raw, output=get_output)
 
@@ -200,6 +214,8 @@ def _format_lineno(session, line):
             # into an editor.
             if get_output:
                 inline, output = inline
+            if range_pattern:
+                if not fnmatch.fnmatch(inline,range_pattern): continue;
             inline = inline.expandtabs(4).rstrip()
 
             multiline = "\n" in inline

From d7604d57e256603d129f4eb34e061951c530193f Mon Sep 17 00:00:00 2001
From: Daniel Goldfarb <dgoldfarb.github@gmail.com>
Date: Mon, 8 Mar 2021 19:48:15 -0500
Subject: [PATCH 0449/1407] remove test prints from range pattern

---
 IPython/core/magics/history.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/IPython/core/magics/history.py b/IPython/core/magics/history.py
index 145ead32a36..ca9a45217f8 100644
--- a/IPython/core/magics/history.py
+++ b/IPython/core/magics/history.py
@@ -171,21 +171,14 @@ def _format_lineno(session, line):
         pattern = None
         limit = None if args.limit is _unspecified else args.limit
 
-        print('args.pattern=',args.pattern)
-        print('args.limit=',args.limit)
-        print('type(args.limit)=',type(args.limit))
-        print('args.range=',args.range)
-
         range_pattern = False
         if args.pattern is not None and not args.range:
             if args.pattern:
                 pattern = "*" + " ".join(args.pattern) + "*"
             else:
                 pattern = "*"
-            print('pattern=',pattern)
             hist = history_manager.search(pattern, raw=raw, output=get_output,
                                           n=limit, unique=args.unique)
-            print('type(hist)=',type(hist))
             print_nums = True
         elif args.limit is not _unspecified:
             n = 10 if limit is None else limit
@@ -195,10 +188,8 @@ def _format_lineno(session, line):
                 if args.pattern:
                     range_pattern = "*" + " ".join(args.pattern) + "*"
                     print_nums = True
-                    print('range_pattern=',range_pattern)
                 hist = history_manager.get_range_by_str(" ".join(args.range),
                                                         raw, get_output)
-                print('type(hist)=',type(hist))
             else:               # Just get history for the current session
                 hist = history_manager.get_range(raw=raw, output=get_output)
 

From 97a9444bdfb661dd57c2fe8ee62f3a2c73e5ab9e Mon Sep 17 00:00:00 2001
From: Daniel Goldfarb <dgoldfarb.github@gmail.com>
Date: Mon, 8 Mar 2021 19:58:13 -0500
Subject: [PATCH 0450/1407] darker -r 60625f241f298b5039cb2debc365db38aa7bb522

---
 IPython/core/magics/history.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/core/magics/history.py b/IPython/core/magics/history.py
index ca9a45217f8..3b95ee7d7d3 100644
--- a/IPython/core/magics/history.py
+++ b/IPython/core/magics/history.py
@@ -206,7 +206,8 @@ def _format_lineno(session, line):
             if get_output:
                 inline, output = inline
             if range_pattern:
-                if not fnmatch.fnmatch(inline,range_pattern): continue;
+                if not fnmatch.fnmatch(inline, range_pattern):
+                    continue
             inline = inline.expandtabs(4).rstrip()
 
             multiline = "\n" in inline

From 00b4c1e1c905b06a0a9a9354f6cd3bc8c0fb30a2 Mon Sep 17 00:00:00 2001
From: Daniel Goldfarb <dgoldfarb.github@gmail.com>
Date: Mon, 8 Mar 2021 20:26:47 -0500
Subject: [PATCH 0451/1407] add whatsnew/pr rst file

---
 .../whatsnew/pr/hist-range-glob-feature.rst    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/hist-range-glob-feature.rst

diff --git a/docs/source/whatsnew/pr/hist-range-glob-feature.rst b/docs/source/whatsnew/pr/hist-range-glob-feature.rst
new file mode 100644
index 00000000000..735ce40c018
--- /dev/null
+++ b/docs/source/whatsnew/pr/hist-range-glob-feature.rst
@@ -0,0 +1,18 @@
+History Range Glob feature
+==========================
+
+Previously, when using ``%history`` users could specify either
+a range of sessions and lines, for example:
+
+``~8/1-~6/5`` see history from the first line of 8 sessions ago,
+              to the fifth line of 6 sessions ago.
+
+Or users could specify ``-g <pattern>`` to glob ALL history for
+the specified pattern.
+
+However users could **\ *not*\ ** specify both.
+If a user did specify both a range, and a glob pattern,
+then the glob pattern would be used *but the range would be ignored*.
+
+With this enhancment, if a user specifies both a range and a glob pattern,
+the glob pattern will be applied to the specified range of history.

From 985924902787fb413816fb94f4a926fabd0e9ec7 Mon Sep 17 00:00:00 2001
From: Daniel Goldfarb <dgoldfarb.github@gmail.com>
Date: Mon, 8 Mar 2021 20:47:47 -0500
Subject: [PATCH 0452/1407] make emphasis rst compliant

---
 docs/source/whatsnew/pr/hist-range-glob-feature.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/whatsnew/pr/hist-range-glob-feature.rst b/docs/source/whatsnew/pr/hist-range-glob-feature.rst
index 735ce40c018..66bdc5ee69d 100644
--- a/docs/source/whatsnew/pr/hist-range-glob-feature.rst
+++ b/docs/source/whatsnew/pr/hist-range-glob-feature.rst
@@ -10,8 +10,8 @@ a range of sessions and lines, for example:
 Or users could specify ``-g <pattern>`` to glob ALL history for
 the specified pattern.
 
-However users could **\ *not*\ ** specify both.
-If a user did specify both a range, and a glob pattern,
+However users could *not* specify both.
+If a user *did* specify both a range, and a glob pattern,
 then the glob pattern would be used *but the range would be ignored*.
 
 With this enhancment, if a user specifies both a range and a glob pattern,

From 0e53bd9d4c8b222956fcf6520e77c6e6cc816b42 Mon Sep 17 00:00:00 2001
From: Daniel Goldfarb <dgoldfarb.github@gmail.com>
Date: Tue, 9 Mar 2021 09:07:34 -0500
Subject: [PATCH 0453/1407] fix some formatting in rst file.

---
 .../whatsnew/pr/hist-range-glob-feature.rst   | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/docs/source/whatsnew/pr/hist-range-glob-feature.rst b/docs/source/whatsnew/pr/hist-range-glob-feature.rst
index 66bdc5ee69d..5c38ea7c5e7 100644
--- a/docs/source/whatsnew/pr/hist-range-glob-feature.rst
+++ b/docs/source/whatsnew/pr/hist-range-glob-feature.rst
@@ -1,18 +1,25 @@
 History Range Glob feature
 ==========================
 
-Previously, when using ``%history`` users could specify either
+Previously, when using ``%history``, users could specify either
 a range of sessions and lines, for example:
 
-``~8/1-~6/5`` see history from the first line of 8 sessions ago,
-              to the fifth line of 6 sessions ago.
+.. code-block:: python
 
-Or users could specify ``-g <pattern>`` to glob ALL history for
-the specified pattern.
+   ~8/1-~6/5   # see history from the first line of 8 sessions ago,
+               # to the fifth line of 6 sessions ago.``
 
-However users could *not* specify both.
-If a user *did* specify both a range, and a glob pattern,
-then the glob pattern would be used *but the range would be ignored*.
+Or users could specify a glob pattern:
 
-With this enhancment, if a user specifies both a range and a glob pattern,
-the glob pattern will be applied to the specified range of history.
+.. code-block:: python
+
+   -g <pattern>  # glob ALL history for the specified pattern.
+
+However users could *not* specify both.  
+
+If a user *did* specify both a range and a glob pattern,
+then the glob pattern would be used (globbing *all* history) *and the range would be ignored*.
+
+---
+
+With this enhancment, if a user specifies both a range and a glob pattern, then the glob pattern will be applied to the specified range of history.

From 7ae7077d6f05dc23e5c94b35899b24d11fd7ce43 Mon Sep 17 00:00:00 2001
From: Jay Qi <2721979+jayqi@users.noreply.github.com>
Date: Thu, 11 Mar 2021 19:34:06 -0800
Subject: [PATCH 0454/1407] Add loading best practice to custom magic docs

---
 docs/source/config/custommagics.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/source/config/custommagics.rst b/docs/source/config/custommagics.rst
index fb8e47ce647..f4daa9a9a4c 100644
--- a/docs/source/config/custommagics.rst
+++ b/docs/source/config/custommagics.rst
@@ -153,6 +153,14 @@ Here is a full example of a magic package. You can distribute magics using
 setuptools, distutils, or any other distribution tools like `flit
 <http://flit.readthedocs.io>`_ for pure Python packages.
 
+When distributing magics as part of a package, recommended best practice is to
+execute the registration inside the `load_ipython_extension` as demonstrated in
+the example below, instead of directly in the module (as in the initial example
+with the ``@register_*`` decorators). This means a user will need to explicitly
+choose to load your magic with ``%load_ext``. instead implicitly getting it when
+importing the module. This is particularly relevant if loading your magic has 
+side effects, if it is slow to load, or if it might override another magic with
+the same name. 
 
 .. sourcecode:: bash
 

From 16c20a2045aa0759088ae57c7d8d3e3671ab5a3d Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 14 Mar 2021 00:46:57 +0100
Subject: [PATCH 0455/1407] Bail on singleline cells with sunken brackets

Sunken bracket is a closing bracket character that is put before its
opening counterpart.

In IPython, this leads to unnecessary annoyances, where a multiline
prompt is opened for seemingly no reason at all, e.g. if a line contains
a ']]' mistyped brackets.
---
 IPython/core/inputtransformer2.py            | 19 +++++++++++++++++++
 IPython/core/tests/test_inputtransformer2.py | 18 ++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index 44b44de71fd..a5229aeecbf 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -508,6 +508,20 @@ def make_tokens_by_line(lines:List[str]):
 
     return tokens_by_line
 
+
+def has_sunken_brackets(tokens: List[tokenize.TokenInfo]):
+    """Check if the depth of brackets in the list of tokens drops below 0"""
+    parenlev = 0
+    for token in tokens:
+        if token.string in {"(", "[", "{"}:
+            parenlev += 1
+        elif token.string in {")", "]", "}"}:
+            parenlev -= 1
+            if parenlev < 0:
+                return True
+    return False
+
+
 def show_linewise_tokens(s: str):
     """For investigation and debugging"""
     if not s.endswith('\n'):
@@ -662,6 +676,11 @@ def check_complete(self, cell: str):
 
         tokens_by_line = make_tokens_by_line(lines)
 
+        # Bail if we got one line and there are more closing parentheses than
+        # the opening ones
+        if len(lines) == 1 and has_sunken_brackets(tokens_by_line[0]):
+            return "invalid", None
+
         if not tokens_by_line:
             return 'incomplete', find_last_indent(lines)
 
diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index 61f183cb571..f5d72b8345e 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -297,6 +297,24 @@ def test_check_complete_II():
     nt.assert_equal(cc('''def foo():\n    """'''), ('incomplete', 4))
 
 
+def test_check_complete_invalidates_sunken_brackets():
+    """
+    Test that a single line with more closing brackets than the opening ones is
+    interpretted as invalid
+    """
+    cc = ipt2.TransformerManager().check_complete
+    nt.assert_equal(cc(")"), ("invalid", None))
+    nt.assert_equal(cc("]"), ("invalid", None))
+    nt.assert_equal(cc("}"), ("invalid", None))
+    nt.assert_equal(cc(")("), ("invalid", None))
+    nt.assert_equal(cc("]["), ("invalid", None))
+    nt.assert_equal(cc("}{"), ("invalid", None))
+    nt.assert_equal(cc("[()("), ("invalid", None))
+    nt.assert_equal(cc("())("), ("invalid", None))
+    nt.assert_equal(cc(")[]("), ("invalid", None))
+    nt.assert_equal(cc("()]("), ("invalid", None))
+
+
 def test_null_cleanup_transformer():
     manager = ipt2.TransformerManager()
     manager.cleanup_transforms.insert(0, null_cleanup_transformer)

From 3783f468756441f2a18ed57f39f37de898f7b3e5 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 14 Mar 2021 01:15:27 +0100
Subject: [PATCH 0456/1407] Add a whats-new entry

---
 docs/source/whatsnew/pr/sunken-brackets.rst | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/sunken-brackets.rst

diff --git a/docs/source/whatsnew/pr/sunken-brackets.rst b/docs/source/whatsnew/pr/sunken-brackets.rst
new file mode 100644
index 00000000000..f64f936ff85
--- /dev/null
+++ b/docs/source/whatsnew/pr/sunken-brackets.rst
@@ -0,0 +1,7 @@
+Don't start a multiline cell with sunken parenthesis
+----------------------------------------------------
+
+From now on IPython will not ask for the next line of input when given a single
+line with more closing than opening brackets. For example, this means that if
+you (mis)type ']]' instead of '[]', a ``SyntaxError`` will show up, instead of
+the ``...:`` prompt continuation.

From 08326396a9d2ae6886cdd30b823ffe9ad0caee61 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 14 Mar 2021 01:27:18 +0100
Subject: [PATCH 0457/1407] Fix misstyped test string bracket

---
 IPython/core/tests/test_inputtransformer2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index f5d72b8345e..8547eacf416 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -309,7 +309,7 @@ def test_check_complete_invalidates_sunken_brackets():
     nt.assert_equal(cc(")("), ("invalid", None))
     nt.assert_equal(cc("]["), ("invalid", None))
     nt.assert_equal(cc("}{"), ("invalid", None))
-    nt.assert_equal(cc("[()("), ("invalid", None))
+    nt.assert_equal(cc("]()("), ("invalid", None))
     nt.assert_equal(cc("())("), ("invalid", None))
     nt.assert_equal(cc(")[]("), ("invalid", None))
     nt.assert_equal(cc("()]("), ("invalid", None))

From 5d246c936a9059586b37f871d093a5a999cd6ca6 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 14 Mar 2021 01:37:38 +0100
Subject: [PATCH 0458/1407] Fix tests treating singular ')' as an incomplete
 line

---
 IPython/core/tests/test_inputtransformer2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index 8547eacf416..6db1528df69 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -260,7 +260,7 @@ def test_check_complete():
     nt.assert_equal(cc("for a in range(5):\n    if a > 0:"), ('incomplete', 8))
     nt.assert_equal(cc("raise = 2"), ('invalid', None))
     nt.assert_equal(cc("a = [1,\n2,"), ('incomplete', 0))
-    nt.assert_equal(cc(")"), ('incomplete', 0))
+    nt.assert_equal(cc("(\n))"), ('incomplete', 0))
     nt.assert_equal(cc("\\\r\n"), ('incomplete', 0))
     nt.assert_equal(cc("a = '''\n   hi"), ('incomplete', 3))
     nt.assert_equal(cc("def a():\n x=1\n global x"), ('invalid', None))

From a8e9e88396722eace52bbeb33e14284e2480e25d Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 14 Mar 2021 01:42:41 +0100
Subject: [PATCH 0459/1407] Darken test_check_complete

---
 IPython/core/tests/test_inputtransformer2.py | 24 ++++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index 6db1528df69..e024d7cc923 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -255,18 +255,18 @@ def __init__(self, s):
 
 def test_check_complete():
     cc = ipt2.TransformerManager().check_complete
-    nt.assert_equal(cc("a = 1"), ('complete', None))
-    nt.assert_equal(cc("for a in range(5):"), ('incomplete', 4))
-    nt.assert_equal(cc("for a in range(5):\n    if a > 0:"), ('incomplete', 8))
-    nt.assert_equal(cc("raise = 2"), ('invalid', None))
-    nt.assert_equal(cc("a = [1,\n2,"), ('incomplete', 0))
-    nt.assert_equal(cc("(\n))"), ('incomplete', 0))
-    nt.assert_equal(cc("\\\r\n"), ('incomplete', 0))
-    nt.assert_equal(cc("a = '''\n   hi"), ('incomplete', 3))
-    nt.assert_equal(cc("def a():\n x=1\n global x"), ('invalid', None))
-    nt.assert_equal(cc("a \\ "), ('invalid', None))  # Nothing allowed after backslash
-    nt.assert_equal(cc("1\\\n+2"), ('complete', None))
-    nt.assert_equal(cc("exit"), ('complete', None))
+    nt.assert_equal(cc("a = 1"), ("complete", None))
+    nt.assert_equal(cc("for a in range(5):"), ("incomplete", 4))
+    nt.assert_equal(cc("for a in range(5):\n    if a > 0:"), ("incomplete", 8))
+    nt.assert_equal(cc("raise = 2"), ("invalid", None))
+    nt.assert_equal(cc("a = [1,\n2,"), ("incomplete", 0))
+    nt.assert_equal(cc("(\n))"), ("incomplete", 0))
+    nt.assert_equal(cc("\\\r\n"), ("incomplete", 0))
+    nt.assert_equal(cc("a = '''\n   hi"), ("incomplete", 3))
+    nt.assert_equal(cc("def a():\n x=1\n global x"), ("invalid", None))
+    nt.assert_equal(cc("a \\ "), ("invalid", None))  # Nothing allowed after backslash
+    nt.assert_equal(cc("1\\\n+2"), ("complete", None))
+    nt.assert_equal(cc("exit"), ("complete", None))
 
     example = dedent("""
         if True:

From c8e8fd0378b3bce66e27144f9bc7c5de517ef2c8 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 14 Mar 2021 01:47:02 +0100
Subject: [PATCH 0460/1407] Fix IndexError on a singular slash input

---
 IPython/core/inputtransformer2.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index a5229aeecbf..c7deab83bae 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -678,7 +678,11 @@ def check_complete(self, cell: str):
 
         # Bail if we got one line and there are more closing parentheses than
         # the opening ones
-        if len(lines) == 1 and has_sunken_brackets(tokens_by_line[0]):
+        if (
+            len(lines) == 1
+            and tokens_by_line
+            and has_sunken_brackets(tokens_by_line[0])
+        ):
             return "invalid", None
 
         if not tokens_by_line:

From 309bd097048217a264815bb2c4d35c5fa5e946fe Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 16 Mar 2021 17:57:59 -0700
Subject: [PATCH 0461/1407] prepare 7.22 release notes

---
 docs/source/whatsnew/version7.rst | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 308d954996e..e8329bbb6bd 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,26 @@
  7.x Series
 ============
 
+.. _version 7.22:
+=================
+
+
+Thanks
+------
+
+We have a new team member that you should see more often on the IPython
+repository, Błażej Michalik (@MrMino) have been doing regular contributions to
+IPython, and spent time replying to many issues and guiding new users to the
+codebase; they now have triage permissions to the IPython repository and we'll
+work toward giving them more permission in the future.
+
+Many thanks to all the contributors to this release you can find all individual
+contributions to this milestone `on github <https://github.com/ipython/ipython/milestone/XX>`_.
+
+Thanks as well to organisations, QuantStack for working on debugger
+compatibility for Xeus_python, and the `D. E. Shaw group
+<https://deshaw.com/>` for sponsoring work on IPython and related libraries.
+
 .. _version 721:
 
 IPython 7.21

From 9b555296e6fd52c3912d2838add1df8c6a81c9ab Mon Sep 17 00:00:00 2001
From: Mark Schmitz <mark.schmitz@mailbox.org>
Date: Thu, 18 Mar 2021 12:39:20 +0000
Subject: [PATCH 0462/1407] fix grammar/typos in docs/interactive

---
 .../interactive/python-ipython-diff.rst       | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/docs/source/interactive/python-ipython-diff.rst b/docs/source/interactive/python-ipython-diff.rst
index 525475d01af..d8d844ee782 100644
--- a/docs/source/interactive/python-ipython-diff.rst
+++ b/docs/source/interactive/python-ipython-diff.rst
@@ -3,20 +3,20 @@ Python vs IPython
 =================
 
 This document is meant to highlight the main differences between the Python
-language and what are the specific construct you can do only in IPython.
+language and what are the specific constructs you can do only in IPython.
 
-Unless expressed otherwise all of the construct you will see here will raise a
+Unless expressed otherwise all of the constructs you will see here will raise a
 ``SyntaxError`` if run in a pure Python shell, or if executing in a Python
 script.
 
-Each of these features are described more in detail in further part of the documentation.
+Each of these features is described more in detail in the further parts of the documentation.
 
 
 Quick overview:
 ===============
 
 
-All the following construct are valid IPython syntax:
+All the following constructs are valid IPython syntax:
 
 .. code-block:: ipython
 
@@ -58,8 +58,8 @@ All the following construct are valid IPython syntax:
        ...: print $months[0];
 
 
-Each of these construct is compiled by IPython into valid python code and will
-do most of the time what you expect it will do. Let see each of these example
+Each of these constructs is compiled by IPython into valid python code and will
+do most of the time what you expect it will do. Let see each of these examples
 in more detail.
 
 
@@ -89,8 +89,8 @@ shortcut to get help. A question mark alone will bring up the IPython help:
     -------------
     ...
 
-A single question mark before, or after an object available in current
-namespace will show help relative to this object:
+A single question mark before or after an object available in the current
+name-space will show help relative to this object:
 
 .. code-block:: ipython
 
@@ -126,8 +126,8 @@ and if possible display the python source code of this object.
 
 
 
-If you are looking for an object, the use of wildcards ``*`` in conjunction
-with question mark will allow you to search current namespace for object with
+If you are looking for an object the use of wildcards ``*`` in conjunction
+with a question mark will allow you to search the current name-space for objects with
 matching names:
 
 .. code-block:: ipython
@@ -142,10 +142,10 @@ Shell Assignment
 ================
 
 
-When doing interactive computing it is common to need to access the underlying shell.
+When doing interactive computing it is a common need is accessing the underlying shell.
 This is doable through the use of the exclamation mark ``!`` (or bang).
 
-This allow to execute simple command when present in beginning of line:
+This allows to execute simple commands when present in beginning of the line:
 
 .. code-block:: ipython
 
@@ -167,7 +167,7 @@ Or edit file:
 
 The line after the bang can call any program installed in the underlying
 shell, and support variable expansion in the form of ``$variable`` or ``{variable}``.
-The later form of expansion supports arbitrary python expression:
+The later form of expansion supports arbitrary python expressions:
 
 .. code-block:: ipython
 
@@ -176,19 +176,19 @@ The later form of expansion supports arbitrary python expression:
     In[2]: !mv $file {file.upper()}
 
 
-The bang can also be present in the right hand side of an assignment, just
-after the equal sign, or separated from it by a white space. In which case the
-standard output of the command after the bang ``!`` will be split out into lines
-in a list-like object and assign to the left hand side.
+The bang (``!``) can also be present on the right hand side of an assignment, just
+after the equal sign, or separated from it by a white space. In this case the
+standard output of the command after the bang will be split out into lines
+in a list-like object and assigned to the left hand side.
 
-This allow you for example to put the list of files of the current working directory in a variable:
+This allows you, for example, to put the list of files of the current working directory in a variable:
 
 .. code-block:: ipython
 
     In[1]: my_files = !ls
 
 
-You can combine the different possibilities in for loops, condition, functions...:
+You can combine the different possibilities in for loops, conditions, functions...:
 
 .. code-block:: ipython
 
@@ -202,19 +202,19 @@ You can combine the different possibilities in for loops, condition, functions..
 Magics
 ------
 
-Magics function are often present in the form of shell-like syntax, but are
-under the hood python function. The syntax and assignment possibility are
+Magics function are often present in the form of shell-like syntax, but they are
+python functions under the hood. The syntax and assignment possibilities are
 similar to the one with the bang (``!``) syntax, but with more flexibility and
-power. Magic function start with a percent sign (``%``) or double percent (``%%``).
+power. Magic functions start with a percent sign (``%``) or double percent (``%%``).
 
-A magic call with a sign percent will act only on one line:
+A magic call with a percent sign will act only on one line:
 
 .. code-block:: ipython
 
     In[1]: %xmode
     Exception reporting mode: Verbose
 
-And support assignment:
+Magics support assignment:
 
 .. code-block:: ipython
 
@@ -224,7 +224,7 @@ And support assignment:
     In [2]: results
     Out[2]: <TimeitResult : 1 loops, best of 1: 21.1 µs per loop>
 
-Magic with two percent sign can spread over multiple lines, but does not support assignment:
+Magics with double percent signs (``%%``) can spread over multiple lines, but they do not support assignments:
 
 .. code-block:: ipython
 

From f5a1755ec0df6477fff9389af2cb6f31ce1aca1d Mon Sep 17 00:00:00 2001
From: Mark Schmitz <mark.schmitz@mailbox.org>
Date: Thu, 18 Mar 2021 18:14:40 +0000
Subject: [PATCH 0463/1407] fix mistakes introduced, and a few additional words

---
 docs/source/interactive/python-ipython-diff.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/source/interactive/python-ipython-diff.rst b/docs/source/interactive/python-ipython-diff.rst
index d8d844ee782..85997575585 100644
--- a/docs/source/interactive/python-ipython-diff.rst
+++ b/docs/source/interactive/python-ipython-diff.rst
@@ -59,7 +59,7 @@ All the following constructs are valid IPython syntax:
 
 
 Each of these constructs is compiled by IPython into valid python code and will
-do most of the time what you expect it will do. Let see each of these examples
+do most of the time what you expect it will do. Let's see each of these examples
 in more detail.
 
 
@@ -90,7 +90,7 @@ shortcut to get help. A question mark alone will bring up the IPython help:
     ...
 
 A single question mark before or after an object available in the current
-name-space will show help relative to this object:
+namespace will show help relative to this object:
 
 .. code-block:: ipython
 
@@ -126,8 +126,8 @@ and if possible display the python source code of this object.
 
 
 
-If you are looking for an object the use of wildcards ``*`` in conjunction
-with a question mark will allow you to search the current name-space for objects with
+If you are looking for an object, the use of wildcards ``*`` in conjunction
+with a question mark will allow you to search the current namespace for objects with
 matching names:
 
 .. code-block:: ipython
@@ -142,7 +142,7 @@ Shell Assignment
 ================
 
 
-When doing interactive computing it is a common need is accessing the underlying shell.
+When doing interactive computing it is a common need to access the underlying shell.
 This is doable through the use of the exclamation mark ``!`` (or bang).
 
 This allows to execute simple commands when present in beginning of the line:
@@ -202,12 +202,12 @@ You can combine the different possibilities in for loops, conditions, functions.
 Magics
 ------
 
-Magics function are often present in the form of shell-like syntax, but they are
+Magic functions (magics) are often present in the form of shell-like syntax, but they are
 python functions under the hood. The syntax and assignment possibilities are
 similar to the one with the bang (``!``) syntax, but with more flexibility and
-power. Magic functions start with a percent sign (``%``) or double percent (``%%``).
+power. Magic functions start with a percent sign (``%``) or double percent signs (``%%``).
 
-A magic call with a percent sign will act only on one line:
+A magic call with a single percent sign will act only on one line:
 
 .. code-block:: ipython
 

From 24aa3931604b1421becdf615d614d5e3ae2aeee6 Mon Sep 17 00:00:00 2001
From: Pete Blois <blois@google.com>
Date: Thu, 18 Mar 2021 13:06:02 -0700
Subject: [PATCH 0464/1407] Add formal support for alt text to
 IPython.display.Image.

For accessibility reasons users should be encouraged to add useful alt
text to images. Currently there is no recommended way to do this using
the standard Image object. Adding this field is a step towards getting
a common way for notebook renderers to support alt text and towards
encouraging libraries creating images to add meaningful alt text.
---
 IPython/core/display.py            | 20 ++++++++++++++++----
 IPython/core/tests/test_display.py | 26 ++++++++++++++++++++++----
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index bd098e78f99..851016fc42a 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -6,6 +6,7 @@
 
 
 from binascii import b2a_base64, hexlify
+import html
 import json
 import mimetypes
 import os
@@ -371,7 +372,7 @@ def reload(self):
                     with gzip.open(BytesIO(data), 'rt', encoding=encoding) as fp:
                         encoding = None
                         data = fp.read()
-                    
+
             # decode data, if an encoding was specified
             # We only touch self.data once since
             # subclasses such as SVG have @data.setter methods
@@ -802,7 +803,7 @@ class Image(DisplayObject):
 
     def __init__(self, data=None, url=None, filename=None, format=None,
                  embed=None, width=None, height=None, retina=False,
-                 unconfined=False, metadata=None):
+                 unconfined=False, metadata=None, alt=None):
         """Create a PNG/JPEG/GIF image object given raw data.
 
         When this object is returned by an input cell or passed to the
@@ -847,6 +848,8 @@ def __init__(self, data=None, url=None, filename=None, format=None,
             Set unconfined=True to disable max-width confinement of the image.
         metadata : dict
             Specify extra metadata to attach to the image.
+        alt : unicode
+            Alternative text for the image, for use by screen readers.
 
         Examples
         --------
@@ -924,6 +927,7 @@ def __init__(self, data=None, url=None, filename=None, format=None,
         self.height = height
         self.retina = retina
         self.unconfined = unconfined
+        self.alt = alt
         super(Image, self).__init__(data=data, url=url, filename=filename,
                 metadata=metadata)
 
@@ -933,6 +937,9 @@ def __init__(self, data=None, url=None, filename=None, format=None,
         if self.height is None and self.metadata.get('height', {}):
             self.height = metadata['height']
 
+        if self.alt is None and self.metadata.get('alt', {}):
+            self.alt = metadata['alt']
+
         if retina:
             self._retina_shape()
 
@@ -962,18 +969,21 @@ def reload(self):
 
     def _repr_html_(self):
         if not self.embed:
-            width = height = klass = ''
+            width = height = klass = alt = ''
             if self.width:
                 width = ' width="%d"' % self.width
             if self.height:
                 height = ' height="%d"' % self.height
             if self.unconfined:
                 klass = ' class="unconfined"'
-            return u'<img src="{url}"{width}{height}{klass}/>'.format(
+            if self.alt:
+                alt = ' alt="%s"' % html.escape(self.alt)
+            return u'<img src="{url}"{width}{height}{klass}{alt}/>'.format(
                 url=self.url,
                 width=width,
                 height=height,
                 klass=klass,
+                alt=alt,
             )
 
     def _repr_mimebundle_(self, include=None, exclude=None):
@@ -1006,6 +1016,8 @@ def _data_and_metadata(self, always_both=False):
             md['height'] = self.height
         if self.unconfined:
             md['unconfined'] = self.unconfined
+        if self.alt:
+            md['alt'] = self.alt
         if md or always_both:
             return b64_data, md
         else:
diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index be0f85c1b84..b7b440098f7 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -77,12 +77,12 @@ def test_embed_svg_url():
     from io import BytesIO
     svg_data = b'<svg><circle x="0" y="0" r="1"/></svg>'
     url = 'http://test.com/circle.svg'
-    
+
     gzip_svg = BytesIO()
     with gzip.open(gzip_svg, 'wb') as fp:
         fp.write(svg_data)
     gzip_svg = gzip_svg.getvalue()
-    
+
     def mocked_urlopen(*args, **kwargs):
         class MockResponse:
             def __init__(self, svg):
@@ -94,7 +94,7 @@ def read(self):
 
         if args[0] == url:
             return MockResponse(svg_data)
-        elif args[0] == url + 'z':          
+        elif args[0] == url + 'z':
             ret= MockResponse(gzip_svg)
             ret.headers['content-encoding']= 'gzip'
             return ret
@@ -105,7 +105,7 @@ def read(self):
         nt.assert_true(svg._repr_svg_().startswith('<svg'))
         svg = display.SVG(url=url + 'z')
         nt.assert_true(svg._repr_svg_().startswith('<svg'))
-    
+
 def test_retina_jpeg():
     here = os.path.dirname(__file__)
     img = display.Image(os.path.join(here, "2x2.jpg"), retina=True)
@@ -457,3 +457,21 @@ def test_display_handle():
         'update': True,
     })
 
+def test_image_alt_tag():
+    """Simple test for display.Image(args, alt=x,)"""
+    thisurl = 'http://example.com/image.png'
+    img = display.Image(url=thisurl, alt='an image')
+    nt.assert_equal(u'<img src="%s" alt="an image"/>' % (thisurl), img._repr_html_())
+    img = display.Image(url=thisurl, unconfined=True, alt='an image')
+    nt.assert_equal(u'<img src="%s" class="unconfined" alt="an image"/>' % (thisurl), img._repr_html_())
+    img = display.Image(url=thisurl, alt='>"& <')
+    nt.assert_equal(u'<img src="%s" alt="&gt;&quot;&amp; &lt;"/>' % (thisurl), img._repr_html_())
+
+    img = display.Image(url=thisurl, metadata={'alt':'an image'})
+    nt.assert_equal(img.alt, 'an image')
+
+    here = os.path.dirname(__file__)
+    img = display.Image(os.path.join(here, "2x2.png"), alt='an image')
+    nt.assert_equal(img.alt, 'an image')
+    _, md = img._repr_png_()
+    nt.assert_equal(md['alt'], 'an image')

From d5cc16a34664d5ba57b0750d98625179c07aa875 Mon Sep 17 00:00:00 2001
From: Piers Titus van der Torren <pierstitus@gmail.com>
Date: Mon, 22 Mar 2021 14:16:38 +0100
Subject: [PATCH 0465/1407] remove sample profiles

sample profiles seem to not be available (anymore?)
---
 docs/source/development/config.rst | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs/source/development/config.rst b/docs/source/development/config.rst
index 7623a7e7d30..0d52a674b00 100644
--- a/docs/source/development/config.rst
+++ b/docs/source/development/config.rst
@@ -119,11 +119,6 @@ which adds a directory called ``profile_<name>`` to your IPython directory. Then
 you can load this profile by adding ``--profile=<name>`` to your command line
 options. Profiles are supported by all IPython applications.
 
-IPython ships with some sample profiles in :file:`IPython/config/profile`. If
-you create profiles with the name of one of our shipped profiles, these config
-files will be copied over instead of starting with the automatically generated
-config files.
-
 IPython extends the config loader for Python files so that you can inherit
 config from another profile. To do this, use a line like this in your Python
 config file:

From a6514bf5646becab3c3390fc92c789dfb6114aa1 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 24 Mar 2021 14:25:55 -0700
Subject: [PATCH 0466/1407] Misc CI warning and error.

---
 IPython/core/tests/test_display.py | 2 +-
 IPython/lib/display.py             | 7 ++++---
 docs/source/whatsnew/version7.rst  | 8 +++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index be0f85c1b84..c5a31d59ea1 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -183,7 +183,7 @@ def test_set_matplotlib_formats_kwargs():
     ip = get_ipython()
     cfg = _get_inline_config()
     cfg.print_figure_kwargs.update(dict(foo='bar'))
-    kwargs = dict(quality=10)
+    kwargs = dict(dpi=150)
     display.set_matplotlib_formats('png', **kwargs)
     formatter = ip.display_formatter.formatters['image/png']
     f = formatter.lookup_by_type(Figure)
diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index e8b8a445e26..012b3ab9f82 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -8,6 +8,8 @@
 
 from IPython.core.display import DisplayObject, TextDisplayObject
 
+from typing import Tuple
+
 __all__ = ['Audio', 'IFrame', 'YouTubeVideo', 'VimeoVideo', 'ScribdDocument',
            'FileLink', 'FileLinks', 'Code']
 
@@ -159,7 +161,7 @@ def _make_wav(data, rate, normalize):
         return val
 
     @staticmethod
-    def _validate_and_normalize_with_numpy(data, normalize):
+    def _validate_and_normalize_with_numpy(data, normalize) -> Tuple[bytes, int]:
         import numpy as np
 
         data = np.array(data, dtype=float)
@@ -178,8 +180,7 @@ def _validate_and_normalize_with_numpy(data, normalize):
         max_abs_value = np.max(np.abs(data))
         normalization_factor = Audio._get_normalization_factor(max_abs_value, normalize)
         scaled = data / normalization_factor * 32767
-        return scaled.astype('<h').tostring(), nchan
-
+        return scaled.astype("<h").tobytes(), nchan
 
     @staticmethod
     def _validate_and_normalize_without_numpy(data, normalize):
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index e8329bbb6bd..02c46af2dfd 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -3,7 +3,9 @@
 ============
 
 .. _version 7.22:
-=================
+
+IPython 7.22
+============
 
 
 Thanks
@@ -16,7 +18,7 @@ codebase; they now have triage permissions to the IPython repository and we'll
 work toward giving them more permission in the future.
 
 Many thanks to all the contributors to this release you can find all individual
-contributions to this milestone `on github <https://github.com/ipython/ipython/milestone/XX>`_.
+contributions to this milestone `on github <https://github.com/ipython/ipython/milestone/XX>`__.
 
 Thanks as well to organisations, QuantStack for working on debugger
 compatibility for Xeus_python, and the `D. E. Shaw group
@@ -53,7 +55,7 @@ Thanks
 ------
 
 Many thanks to all the contributors to this release you can find all individual
-contribution to this milestone `on github <https://github.com/ipython/ipython/milestone/83>`_.
+contribution to this milestone `on github <https://github.com/ipython/ipython/milestone/83>`__.
 
 
 .. _version 720:

From 546a079f855492d9e643730b299459ed739bdaba Mon Sep 17 00:00:00 2001
From: lbennett <coco.bennett@adtran.com>
Date: Thu, 25 Mar 2021 17:57:36 -0500
Subject: [PATCH 0467/1407] try to hide github link when not available

---
 docs/source/_templates/breadcrumbs.html | 83 +++++++++++++++++++++++++
 docs/source/conf.py                     |  6 ++
 2 files changed, 89 insertions(+)
 create mode 100755 docs/source/_templates/breadcrumbs.html

diff --git a/docs/source/_templates/breadcrumbs.html b/docs/source/_templates/breadcrumbs.html
new file mode 100755
index 00000000000..71f03d32b1a
--- /dev/null
+++ b/docs/source/_templates/breadcrumbs.html
@@ -0,0 +1,83 @@
+{#- Support for Sphinx 1.3+ page_source_suffix, but don't break old builds. #}
+
+{%- if page_source_suffix %}
+   {%- set suffix = page_source_suffix %}
+{%- else %}
+   {%- set suffix = source_suffix %}
+{%- endif %}
+
+{%- if meta is defined and meta is not none %}
+   {%- set check_meta = True %}
+{%- else %}
+   {%- set check_meta = False %}
+{%- endif %}
+
+{%- if check_meta and 'github_url' in meta %}
+   {%- set display_github = True %}
+{%- endif %}
+
+{%- if check_meta and 'bitbucket_url' in meta %}
+   {%- set display_bitbucket = True %}
+{%- endif %}
+
+{%- if check_meta and 'gitlab_url' in meta %}
+   {%- set display_gitlab = True %}
+{%- endif %}
+
+{%- set display_vcs_links = display_vcs_links if display_vcs_links is defined else True %}
+
+<div role="navigation" aria-label="{{ _('Breadcrumbs') }}">
+  <ul class="wy-breadcrumbs">
+    {%- block breadcrumbs %}
+      <li><a href="{{ pathto(master_doc) }}" class="icon icon-home"></a> &raquo;</li>
+        {%- for doc in parents %}
+          <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
+        {%- endfor %}
+      <li>{{ title }}</li>
+    {%- endblock %}
+    {%- block breadcrumbs_aside %}
+      <li class="wy-breadcrumbs-aside">
+        {%- if hasdoc(pagename) and display_vcs_links %}
+          {%- if display_github %}
+            {%- if check_meta and 'github_url' in meta %}
+              <!-- User defined GitHub URL -->
+              <a href="{{ meta['github_url'] }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
+            {%- else %}
+              <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/{{ theme_vcs_pageview_mode or "blob" }}/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
+            {%- endif %}
+          {%- elif display_bitbucket %}
+            {%- if check_meta and 'bitbucket_url' in meta %}
+              <!-- User defined Bitbucket URL -->
+              <a href="{{ meta['bitbucket_url'] }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
+            {%- else %}
+              <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ suffix }}?mode={{ theme_vcs_pageview_mode or "view" }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
+            {%- endif %}
+          {%- elif display_gitlab %}
+            {%- if check_meta and 'gitlab_url' in meta %}
+              <!-- User defined GitLab URL -->
+              <a href="{{ meta['gitlab_url'] }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
+            {%- else %}
+              <a href="https://{{ gitlab_host|default("gitlab.com") }}/{{ gitlab_user }}/{{ gitlab_repo }}/{{ theme_vcs_pageview_mode or "blob" }}/{{ gitlab_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
+            {%- endif %}
+          {%- elif show_source and source_url_prefix %}
+            <a href="{{ source_url_prefix }}{{ pagename }}{{ suffix }}">{{ _('View page source') }}</a>
+          {%- elif show_source and has_source and sourcename %}
+            <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> {{ _('View page source') }}</a>
+          {%- endif %}
+        {%- endif %}
+      </li>
+    {%- endblock %}
+  </ul>
+
+  {%- if (theme_prev_next_buttons_location == 'top' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
+  <div class="rst-breadcrumbs-buttons" role="navigation" aria-label="{{ _('Breadcrumbs') }}">
+      {%- if prev %}
+        <a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> {{ _('Previous') }}</a>
+      {%- endif %}
+      {%- if next %}
+        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">{{ _('Next') }} <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
+      {%- endif %}
+  </div>
+  {%- endif %}
+  <hr/>
+</div>
\ No newline at end of file
diff --git a/docs/source/conf.py b/docs/source/conf.py
index eb5b39eacb0..e29e7bf19a8 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -38,6 +38,12 @@
     html_theme = "sphinx_rtd_theme"
     html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
+html_context = {
+    "display_github": False, # Add 'Edit on Github' link instead of 'View page source'
+    "last_updated": True,
+    "commit": False,
+}
+
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
 # absolute, like shown here.

From 54d3529358e8425fc793f78ac9b1e115f79d2e95 Mon Sep 17 00:00:00 2001
From: Paul Bissex <paul@bissex.net>
Date: Sat, 28 Nov 2020 13:17:31 -0500
Subject: [PATCH 0468/1407] Corrected old "python3" syntax key to "python";
 added UA header per dpaste TOS

---
 IPython/core/magics/code.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index 8e231a5fa7e..a87bebeaf38 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -20,7 +20,7 @@
 import sys
 import ast
 from itertools import chain
-from urllib.request import urlopen
+from urllib.request import Request, urlopen
 from urllib.parse import urlencode
 from pathlib import Path
 
@@ -29,6 +29,7 @@
 from IPython.core.macro import Macro
 from IPython.core.magic import Magics, magics_class, line_magic
 from IPython.core.oinspect import find_file, find_source_lines
+from IPython.core.release import version
 from IPython.testing.skipdoctest import skip_doctest
 from IPython.utils.contexts import preserve_keys
 from IPython.utils.path import get_py_filename
@@ -255,7 +256,7 @@ def pastebin(self, parameter_s=''):
 
         Options:
 
-          -d: Pass a custom description for the gist. The default will say
+          -d: Pass a custom description. The default will say
               "Pasted from IPython".
         """
         opts, args = self.parse_options(parameter_s, 'd:')
@@ -268,11 +269,13 @@ def pastebin(self, parameter_s=''):
 
         post_data = urlencode({
           "title": opts.get('d', "Pasted from IPython"),
-          "syntax": "python3",
+          "syntax": "python",
           "content": code
         }).encode('utf-8')
 
-        response = urlopen("http://dpaste.com/api/v2/", post_data)
+        request = Request("http://dpaste.com/api/v2/",
+            headers={"User-Agent": "IPython v{}".format(version)})
+        response = urlopen(request, post_data)
         return response.headers.get('Location')
 
     @line_magic

From 45324f9f91fe9daf2a357a916f8962e44122c742 Mon Sep 17 00:00:00 2001
From: Paul Bissex <paul@bissex.net>
Date: Sat, 28 Nov 2020 13:53:09 -0500
Subject: [PATCH 0469/1407] Disambiguated docstring, since there have been
 other dpastes

---
 IPython/core/magics/code.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index a87bebeaf38..ac2cb933269 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -246,7 +246,7 @@ def save(self, parameter_s=''):
 
     @line_magic
     def pastebin(self, parameter_s=''):
-        """Upload code to dpaste's paste bin, returning the URL.
+        """Upload code to dpaste.com, returning the URL.
 
         Usage:\\
           %pastebin [-d "Custom description"] 1-7

From 9427eb28fac6e713ebcdf36acdaf84675faa20a6 Mon Sep 17 00:00:00 2001
From: Paul Bissex <paul@bissex.net>
Date: Sat, 28 Nov 2020 17:22:29 -0500
Subject: [PATCH 0470/1407] Fixed lint issue

---
 IPython/core/magics/code.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index ac2cb933269..e5b2ce17635 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -267,14 +267,18 @@ def pastebin(self, parameter_s=''):
             print(e.args[0])
             return
 
-        post_data = urlencode({
-          "title": opts.get('d', "Pasted from IPython"),
-          "syntax": "python",
-          "content": code
-        }).encode('utf-8')
-
-        request = Request("http://dpaste.com/api/v2/",
-            headers={"User-Agent": "IPython v{}".format(version)})
+        post_data = urlencode(
+            {
+                "title": opts.get("d", "Pasted from IPython"),
+                "syntax": "python",
+                "content": code,
+            }
+        ).encode("utf-8")
+
+        request = Request(
+            "http://dpaste.com/api/v2/",
+            headers={"User-Agent": "IPython v{}".format(version)},
+        )
         response = urlopen(request, post_data)
         return response.headers.get('Location')
 

From 52d8ed4b197b8d4a52b8f129fe084f7a80e226f7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Mar 2021 16:53:30 -0700
Subject: [PATCH 0471/1407] fixup release note and testing

---
 .github/workflows/mypy.yml           |   4 +-
 .github/workflows/python-package.yml |   4 +-
 IPython/core/tests/test_iplib.py     | 163 ++++++++++++++-------------
 docs/source/whatsnew/version7.rst    |  12 +-
 4 files changed, 100 insertions(+), 83 deletions(-)

diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index 2778805a679..aceca0066d4 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -2,9 +2,9 @@ name: Run MyPy
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, 7.x]
   pull_request:
-    branches: [ master ]
+    branches: [ master, 7.x]
 
 jobs:
   build:
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 80497bb9ec6..db571707ec6 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -5,9 +5,9 @@ name: Python package
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, 7.x ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, 7.x ]
 
 jobs:
   build:
diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index 52fafcae422..7d2b98252d4 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -117,84 +117,91 @@ def doctest_tb_verbose():
 ZeroDivisionError: ...
       """
 
-def doctest_tb_sysexit():
-    """
-In [17]: %xmode plain
-Exception reporting mode: Plain
-
-In [18]: %run simpleerr.py exit
-An exception has occurred, use %tb to see the full traceback.
-SystemExit: (1, 'Mode = exit')
-
-In [19]: %run simpleerr.py exit 2
-An exception has occurred, use %tb to see the full traceback.
-SystemExit: (2, 'Mode = exit')
-
-In [20]: %tb
-Traceback (most recent call last):
-  File ... in <module>
-    bar(mode)
-  File ... line 22, in bar
-    sysexit(stat, mode)
-  File ... line 11, in sysexit
-    raise SystemExit(stat, 'Mode = %s' % mode)
-SystemExit: (2, 'Mode = exit')
-
-In [21]: %xmode context
-Exception reporting mode: Context
-
-In [22]: %tb
----------------------------------------------------------------------------
-SystemExit                                Traceback (most recent call last)
-<BLANKLINE>
-...<module>
-     29     except IndexError:
-     30         mode = 'div'
----> 32     bar(mode)
-<BLANKLINE>
-...bar(mode)
-     20         except:
-     21             stat = 1
----> 22         sysexit(stat, mode)
-     23     else:
-     24         raise ValueError('Unknown mode')
-<BLANKLINE>
-...sysexit(stat, mode)
-     10 def sysexit(stat, mode):
----> 11     raise SystemExit(stat, 'Mode = %s' % mode)
-<BLANKLINE>
-SystemExit: (2, 'Mode = exit')
-
-In [23]: %xmode verbose
-Exception reporting mode: Verbose
-
-In [24]: %tb
----------------------------------------------------------------------------
-SystemExit                                Traceback (most recent call last)
-<BLANKLINE>
-... in <module>
-     29     except IndexError:
-     30         mode = 'div'
----> 32     bar(mode)
-        mode = 'exit'
-<BLANKLINE>
-... in bar(mode='exit')
-     20         except:
-     21             stat = 1
----> 22         sysexit(stat, mode)
-        mode = 'exit'
-        stat = 2
-     23     else:
-     24         raise ValueError('Unknown mode')
-<BLANKLINE>
-... in sysexit(stat=2, mode='exit')
-     10 def sysexit(stat, mode):
----> 11     raise SystemExit(stat, 'Mode = %s' % mode)
-        stat = 2
-        mode = 'exit'
-<BLANKLINE>
-SystemExit: (2, 'Mode = exit')
-    """
+# TODO : Marc 2021 – this seem to fail due
+# to upstream changes in CI for whatever reason.
+# Commenting for now, to revive someday (maybe?)
+# nose won't work in 3.10 anyway and we'll have to disable iptest.
+# thus this likely need to bemigrated to pytest.
+
+
+# def doctest_tb_sysexit():
+#     """
+# In [17]: %xmode plain
+# Exception reporting mode: Plain
+#
+# In [18]: %run simpleerr.py exit
+# An exception has occurred, use %tb to see the full traceback.
+# SystemExit: (1, 'Mode = exit')
+#
+# In [19]: %run simpleerr.py exit 2
+# An exception has occurred, use %tb to see the full traceback.
+# SystemExit: (2, 'Mode = exit')
+#
+# In [20]: %tb
+# Traceback (most recent call last):
+#   File ... in <module>
+#     bar(mode)
+#   File ... line 22, in bar
+#     sysexit(stat, mode)
+#   File ... line 11, in sysexit
+#     raise SystemExit(stat, 'Mode = %s' % mode)
+# SystemExit: (2, 'Mode = exit')
+#
+# In [21]: %xmode context
+# Exception reporting mode: Context
+#
+# In [22]: %tb
+# ---------------------------------------------------------------------------
+# SystemExit                                Traceback (most recent call last)
+# <BLANKLINE>
+# ...<module>
+#      29     except IndexError:
+#      30         mode = 'div'
+# ---> 32     bar(mode)
+# <BLANKLINE>
+# ...bar(mode)
+#      20         except:
+#      21             stat = 1
+# ---> 22         sysexit(stat, mode)
+#      23     else:
+#      24         raise ValueError('Unknown mode')
+# <BLANKLINE>
+# ...sysexit(stat, mode)
+#      10 def sysexit(stat, mode):
+# ---> 11     raise SystemExit(stat, 'Mode = %s' % mode)
+# <BLANKLINE>
+# SystemExit: (2, 'Mode = exit')
+#
+# In [23]: %xmode verbose
+# Exception reporting mode: Verbose
+#
+# In [24]: %tb
+# ---------------------------------------------------------------------------
+# SystemExit                                Traceback (most recent call last)
+# <BLANKLINE>
+# ... in <module>
+#      29     except IndexError:
+#      30         mode = 'div'
+# ---> 32     bar(mode)
+#         mode = 'exit'
+# <BLANKLINE>
+# ... in bar(mode='exit')
+#      20         except:
+#      21             stat = 1
+# ---> 22         sysexit(stat, mode)
+#         mode = 'exit'
+#         stat = 2
+#      23     else:
+#      24         raise ValueError('Unknown mode')
+# <BLANKLINE>
+# ... in sysexit(stat=2, mode='exit')
+#      10 def sysexit(stat, mode):
+# ---> 11     raise SystemExit(stat, 'Mode = %s' % mode)
+#         stat = 2
+#         mode = 'exit'
+# <BLANKLINE>
+# SystemExit: (2, 'Mode = exit')
+#     """
 
 
 def test_run_cell():
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 02c46af2dfd..bb1a131b93f 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -7,6 +7,16 @@
 IPython 7.22
 ============
 
+Second release of IPython for 2021, mostly containing bug fixes. Here is a quick
+rundown of the few changes.
+
+- Fix some ``sys.excepthook`` shenanigan when embedding with qt, recommended if
+  you – for example – use `napari <https://napari.org>`__. :ghpull:`12842`.
+- Fix bug when using the new ipdb ``%context`` magic :ghpull:`12844`
+- Couples of deprecation cleanup :ghpull:`12868`
+- Update for new dpast.com api if you use the ``%pastbin`` magic. :ghpull:`12712`
+- Remove support for numpy before 1.16. :ghpull:`12836`
+
 
 Thanks
 ------
@@ -18,7 +28,7 @@ codebase; they now have triage permissions to the IPython repository and we'll
 work toward giving them more permission in the future.
 
 Many thanks to all the contributors to this release you can find all individual
-contributions to this milestone `on github <https://github.com/ipython/ipython/milestone/XX>`__.
+contributions to this milestone `on github <https://github.com/ipython/ipython/milestone/84>`__.
 
 Thanks as well to organisations, QuantStack for working on debugger
 compatibility for Xeus_python, and the `D. E. Shaw group

From 93a63567e176ad989841c80800d75a899e9afc47 Mon Sep 17 00:00:00 2001
From: Pete Blois <blois@google.com>
Date: Sun, 28 Mar 2021 14:17:10 -0700
Subject: [PATCH 0472/1407] Fix lint errors

---
 IPython/core/display.py            | 27 ++++++++++++++++++--------
 IPython/core/tests/test_display.py | 31 +++++++++++++++++-------------
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 851016fc42a..00fe85eb3a4 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -801,9 +801,20 @@ class Image(DisplayObject):
         _FMT_GIF: 'image/gif',
     }
 
-    def __init__(self, data=None, url=None, filename=None, format=None,
-                 embed=None, width=None, height=None, retina=False,
-                 unconfined=False, metadata=None, alt=None):
+    def __init__(
+        self,
+        data=None,
+        url=None,
+        filename=None,
+        format=None,
+        embed=None,
+        width=None,
+        height=None,
+        retina=False,
+        unconfined=False,
+        metadata=None,
+        alt=None,
+    ):
         """Create a PNG/JPEG/GIF image object given raw data.
 
         When this object is returned by an input cell or passed to the
@@ -937,8 +948,8 @@ def __init__(self, data=None, url=None, filename=None, format=None,
         if self.height is None and self.metadata.get('height', {}):
             self.height = metadata['height']
 
-        if self.alt is None and self.metadata.get('alt', {}):
-            self.alt = metadata['alt']
+        if self.alt is None and self.metadata.get("alt", {}):
+            self.alt = metadata["alt"]
 
         if retina:
             self._retina_shape()
@@ -969,7 +980,7 @@ def reload(self):
 
     def _repr_html_(self):
         if not self.embed:
-            width = height = klass = alt = ''
+            width = height = klass = alt = ""
             if self.width:
                 width = ' width="%d"' % self.width
             if self.height:
@@ -978,7 +989,7 @@ def _repr_html_(self):
                 klass = ' class="unconfined"'
             if self.alt:
                 alt = ' alt="%s"' % html.escape(self.alt)
-            return u'<img src="{url}"{width}{height}{klass}{alt}/>'.format(
+            return '<img src="{url}"{width}{height}{klass}{alt}/>'.format(
                 url=self.url,
                 width=width,
                 height=height,
@@ -1017,7 +1028,7 @@ def _data_and_metadata(self, always_both=False):
         if self.unconfined:
             md['unconfined'] = self.unconfined
         if self.alt:
-            md['alt'] = self.alt
+            md["alt"] = self.alt
         if md or always_both:
             return b64_data, md
         else:
diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index b7b440098f7..8deb11a1647 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -94,9 +94,9 @@ def read(self):
 
         if args[0] == url:
             return MockResponse(svg_data)
-        elif args[0] == url + 'z':
-            ret= MockResponse(gzip_svg)
-            ret.headers['content-encoding']= 'gzip'
+        elif args[0] == url + "z":
+            ret = MockResponse(gzip_svg)
+            ret.headers["content-encoding"] = "gzip"
             return ret
         return MockResponse(None)
 
@@ -459,19 +459,24 @@ def test_display_handle():
 
 def test_image_alt_tag():
     """Simple test for display.Image(args, alt=x,)"""
-    thisurl = 'http://example.com/image.png'
-    img = display.Image(url=thisurl, alt='an image')
+    thisurl = "http://example.com/image.png"
+    img = display.Image(url=thisurl, alt="an image")
     nt.assert_equal(u'<img src="%s" alt="an image"/>' % (thisurl), img._repr_html_())
-    img = display.Image(url=thisurl, unconfined=True, alt='an image')
-    nt.assert_equal(u'<img src="%s" class="unconfined" alt="an image"/>' % (thisurl), img._repr_html_())
+    img = display.Image(url=thisurl, unconfined=True, alt="an image")
+    nt.assert_equal(
+        u'<img src="%s" class="unconfined" alt="an image"/>' % (thisurl),
+        img._repr_html_(),
+    )
     img = display.Image(url=thisurl, alt='>"& <')
-    nt.assert_equal(u'<img src="%s" alt="&gt;&quot;&amp; &lt;"/>' % (thisurl), img._repr_html_())
+    nt.assert_equal(
+        u'<img src="%s" alt="&gt;&quot;&amp; &lt;"/>' % (thisurl), img._repr_html_()
+    )
 
-    img = display.Image(url=thisurl, metadata={'alt':'an image'})
-    nt.assert_equal(img.alt, 'an image')
+    img = display.Image(url=thisurl, metadata={"alt": "an image"})
+    nt.assert_equal(img.alt, "an image")
 
     here = os.path.dirname(__file__)
-    img = display.Image(os.path.join(here, "2x2.png"), alt='an image')
-    nt.assert_equal(img.alt, 'an image')
+    img = display.Image(os.path.join(here, "2x2.png"), alt="an image")
+    nt.assert_equal(img.alt, "an image")
     _, md = img._repr_png_()
-    nt.assert_equal(md['alt'], 'an image')
+    nt.assert_equal(md["alt"], "an image")

From 9f55367e40d229cb0b3e54f007ae595394d01044 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 30 Mar 2021 09:02:09 -0700
Subject: [PATCH 0473/1407] typo

---
 docs/source/whatsnew/version7.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index bb1a131b93f..d4ca97126b6 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -32,7 +32,7 @@ contributions to this milestone `on github <https://github.com/ipython/ipython/m
 
 Thanks as well to organisations, QuantStack for working on debugger
 compatibility for Xeus_python, and the `D. E. Shaw group
-<https://deshaw.com/>` for sponsoring work on IPython and related libraries.
+<https://deshaw.com/>`__ for sponsoring work on IPython and related libraries.
 
 .. _version 721:
 

From 820dbc5b69812df54869d37c5df9f05c9e9ca34f Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sat, 3 Apr 2021 22:45:23 +0200
Subject: [PATCH 0474/1407] Reformat and improve the wording of %cd docstring

---
 IPython/core/magics/osm.py | 41 ++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index a6e3d64e942..dcfa2adf8b6 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -302,33 +302,36 @@ def cd(self, parameter_s=''):
         """Change the current working directory.
 
         This command automatically maintains an internal list of directories
-        you visit during your IPython session, in the variable _dh. The
-        command %dhist shows this history nicely formatted. You can also
-        do 'cd -<tab>' to see directory history conveniently.
-
+        you visit during your IPython session, in the variable ``_dh``. The
+        command :magic:`%dhist` shows this history nicely formatted. You can
+        also do ``cd -<tab>`` to see directory history conveniently.
         Usage:
 
-          cd 'dir': changes to directory 'dir'.
-
-          cd -: changes to the last visited directory.
+          - ``cd 'dir'``: changes to directory 'dir'.
+          - ``cd -``: changes to the last visited directory.
+          - ``cd -<n>``: changes to the n-th directory in the directory history.
+          - ``cd --foo``: change to directory that matches 'foo' in history
+          - ``cd -b <bookmark_name>``: jump to a bookmark set by %bookmark
+          - Hitting a tab key after ``cd -b`` allows you to tab-complete
+            bookmark names.
 
-          cd -<n>: changes to the n-th directory in the directory history.
+          .. note::
+            ``cd <bookmark_name>`` is enough if there is no directory
+            ``<bookmark_name>``, but a bookmark with the name exists.
 
-          cd --foo: change to directory that matches 'foo' in history
-
-          cd -b <bookmark_name>: jump to a bookmark set by %bookmark
-             (note: cd <bookmark_name> is enough if there is no
-              directory <bookmark_name>, but a bookmark with the name exists.)
-              'cd -b <tab>' allows you to tab-complete bookmark names.
 
         Options:
 
-        -q: quiet.  Do not print the working directory after the cd command is
-        executed.  By default IPython's cd command does print this directory,
-        since the default prompts do not display path information.
+        -q               Be quiet. Do not print the working directory after the
+                         cd command is executed. By default IPython's cd
+                         command does print this directory, since the default
+                         prompts do not display path information.
+
+        .. note::
+           Note that ``!cd`` doesn't work for this purpose because the shell
+           where ``!command`` runs is immediately discarded after executing
+           'command'.
 
-        Note that !cd doesn't work for this purpose because the shell where
-        !command runs is immediately discarded after executing 'command'.
 
         Examples
         --------

From 14ea3dadbb65329a28de0e9380e386fd029e809b Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 4 Apr 2021 16:14:13 +0200
Subject: [PATCH 0475/1407] Add a testcase for Image raising on bad filename

---
 IPython/core/tests/test_display.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index c5a31d59ea1..21cc2276fe6 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -457,3 +457,7 @@ def test_display_handle():
         'update': True,
     })
 
+
+@nt.raises(FileNotFoundError)
+def test_image_bad_filename_raises_proper_exception():
+    display.Image('/this/file/does/not/exist/')

From c0e3b8166e3cdce38f845713ca418f59ae670c79 Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Mon, 5 Apr 2021 10:52:21 +0100
Subject: [PATCH 0476/1407] new line in whatsnew

---
 docs/source/whatsnew/development.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 54bdf808269..3e6145d4625 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -169,6 +169,7 @@ For more information please see unit test -
     extensions/tests/test_autoreload.py : 'test_autoload_newly_added_objects'
 =======
 
+
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 
 As a reminder, IPython master has diverged from the 7.x branch, thus master may
@@ -177,4 +178,4 @@ have more feature and API changes.
 Backwards incompatible changes
 ------------------------------
 
-.. DO NOT EDIT THIS LINE BEFORE RELEASE. INCOMPAT INSERTION POINT.
\ No newline at end of file
+.. DO NOT EDIT THIS LINE BEFORE RELEASE. INCOMPAT INSERTION POINT.

From 85df91c7b1f01839ca0b8fe6d3bed9dc60cd85e7 Mon Sep 17 00:00:00 2001
From: Spas Kalaydzhisyki <spas.kalaydzhiyski@gmail.com>
Date: Mon, 5 Apr 2021 11:44:23 +0100
Subject: [PATCH 0477/1407] fixed docs whatsnew

---
 docs/source/whatsnew/development.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 3e6145d4625..c092a6a5533 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -167,8 +167,8 @@ Try ``%autoreload 3`` in an IPython session after running ``%load_ext autoreload
 
 For more information please see unit test -
     extensions/tests/test_autoreload.py : 'test_autoload_newly_added_objects'
-=======
 
+=======
 
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 

From 7663c52180819282e0b9c42afe2ba8b074aa9f55 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 6 Apr 2021 16:42:36 -0700
Subject: [PATCH 0478/1407] reformat docstring in IPython utils

---
 IPython/utils/_process_common.py           | 26 ++++++++++------------
 IPython/utils/_process_posix.py            | 10 ++++-----
 IPython/utils/_process_win32.py            |  6 ++---
 IPython/utils/_process_win32_controller.py |  4 ++--
 IPython/utils/decorators.py                |  2 +-
 IPython/utils/encoding.py                  |  4 ++--
 IPython/utils/frame.py                     |  4 +---
 IPython/utils/generics.py                  |  1 -
 IPython/utils/importstring.py              |  4 ++--
 IPython/utils/io.py                        | 13 +++++------
 IPython/utils/ipstruct.py                  | 20 ++++-------------
 IPython/utils/module_paths.py              |  4 ++--
 IPython/utils/openpy.py                    | 24 ++++++++++----------
 IPython/utils/path.py                      | 10 ++++++---
 IPython/utils/sysinfo.py                   | 12 +++++-----
 IPython/utils/terminal.py                  |  2 +-
 IPython/utils/tests/test_capture.py        |  2 +-
 IPython/utils/tests/test_module_paths.py   |  4 ++--
 IPython/utils/tests/test_path.py           |  4 ++--
 IPython/utils/tests/test_sysinfo.py        |  2 +-
 IPython/utils/text.py                      | 14 ++----------
 IPython/utils/tokenutil.py                 | 19 +++++++---------
 22 files changed, 81 insertions(+), 110 deletions(-)

diff --git a/IPython/utils/_process_common.py b/IPython/utils/_process_common.py
index 2a647dc7fa3..2a0b828839b 100644
--- a/IPython/utils/_process_common.py
+++ b/IPython/utils/_process_common.py
@@ -49,18 +49,16 @@ def process_handler(cmd, callback, stderr=subprocess.PIPE):
     Parameters
     ----------
     cmd : str or list
-      A command to be executed by the system, using :class:`subprocess.Popen`.
-      If a string is passed, it will be run in the system shell. If a list is
-      passed, it will be used directly as arguments.
-
+        A command to be executed by the system, using :class:`subprocess.Popen`.
+        If a string is passed, it will be run in the system shell. If a list is
+        passed, it will be used directly as arguments.
     callback : callable
-      A one-argument function that will be called with the Popen object.
-
+        A one-argument function that will be called with the Popen object.
     stderr : file descriptor number, optional
-      By default this is set to ``subprocess.PIPE``, but you can also pass the
-      value ``subprocess.STDOUT`` to force the subprocess' stderr to go into
-      the same file descriptor as its stdout.  This is useful to read stdout
-      and stderr combined in the order they are generated.
+        By default this is set to ``subprocess.PIPE``, but you can also pass the
+        value ``subprocess.STDOUT`` to force the subprocess' stderr to go into
+        the same file descriptor as its stdout.  This is useful to read stdout
+        and stderr combined in the order they are generated.
 
     Returns
     -------
@@ -117,12 +115,12 @@ def getoutput(cmd):
     Parameters
     ----------
     cmd : str or list
-      A command to be executed in the system shell.
+        A command to be executed in the system shell.
 
     Returns
     -------
     output : str
-      A string containing the combination of stdout and stderr from the
+        A string containing the combination of stdout and stderr from the
     subprocess, in whatever order the subprocess originally wrote to its
     file descriptors (so the order of the information in this string is the
     correct order as would be seen if running the command in a terminal).
@@ -141,7 +139,7 @@ def getoutputerror(cmd):
     Parameters
     ----------
     cmd : str or list
-      A command to be executed in the system shell.
+        A command to be executed in the system shell.
 
     Returns
     -------
@@ -159,7 +157,7 @@ def get_output_error_code(cmd):
     Parameters
     ----------
     cmd : str or list
-      A command to be executed in the system shell.
+        A command to be executed in the system shell.
 
     Returns
     -------
diff --git a/IPython/utils/_process_posix.py b/IPython/utils/_process_posix.py
index a11cad7697c..a9b0e2182c0 100644
--- a/IPython/utils/_process_posix.py
+++ b/IPython/utils/_process_posix.py
@@ -82,12 +82,12 @@ def getoutput(self, cmd):
         Parameters
         ----------
         cmd : str
-          A command to be executed in the system shell.
+            A command to be executed in the system shell.
 
         Returns
         -------
         output : str
-          A string containing the combination of stdout and stderr from the
+            A string containing the combination of stdout and stderr from the
         subprocess, in whatever order the subprocess originally wrote to its
         file descriptors (so the order of the information in this string is the
         correct order as would be seen if running the command in a terminal).
@@ -103,12 +103,12 @@ def getoutput_pexpect(self, cmd):
         Parameters
         ----------
         cmd : str
-          A command to be executed in the system shell.
+            A command to be executed in the system shell.
 
         Returns
         -------
         output : str
-          A string containing the combination of stdout and stderr from the
+            A string containing the combination of stdout and stderr from the
         subprocess, in whatever order the subprocess originally wrote to its
         file descriptors (so the order of the information in this string is the
         correct order as would be seen if running the command in a terminal).
@@ -124,7 +124,7 @@ def system(self, cmd):
         Parameters
         ----------
         cmd : str
-          A command to be executed in the system shell.
+            A command to be executed in the system shell.
 
         Returns
         -------
diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py
index 86d8100a639..2f072a8779e 100644
--- a/IPython/utils/_process_win32.py
+++ b/IPython/utils/_process_win32.py
@@ -128,7 +128,7 @@ def system(cmd):
     Parameters
     ----------
     cmd : str or list
-      A command to be executed in the system shell.
+        A command to be executed in the system shell.
 
     Returns
     -------
@@ -152,7 +152,7 @@ def getoutput(cmd):
     Parameters
     ----------
     cmd : str or list
-      A command to be executed in the system shell.
+        A command to be executed in the system shell.
 
     Returns
     -------
@@ -181,7 +181,7 @@ def arg_split(commandline, posix=False, strict=True):
 
         This is a special version for windows that use a ctypes call to CommandLineToArgvW
         to do the argv splitting. The posix parameter is ignored.
-        
+
         If strict=False, process_common.arg_split(...strict=False) is used instead.
         """
         #CommandLineToArgvW returns path to executable if called with empty string.
diff --git a/IPython/utils/_process_win32_controller.py b/IPython/utils/_process_win32_controller.py
index c2e2329c45b..f8c2a057a83 100644
--- a/IPython/utils/_process_win32_controller.py
+++ b/IPython/utils/_process_win32_controller.py
@@ -551,13 +551,13 @@ def system(cmd):
     Parameters
     ----------
     cmd : str
-      A command to be executed in the system shell.
+        A command to be executed in the system shell.
 
     Returns
     -------
     None : we explicitly do NOT return the subprocess status code, as this
     utility is meant to be used extensively in IPython, where any return value
-    would trigger :func:`sys.displayhook` calls.
+    would trigger : func:`sys.displayhook` calls.
     """
     with AvoidUNCPath() as path:
         if path is not None:
diff --git a/IPython/utils/decorators.py b/IPython/utils/decorators.py
index c26485553c2..47791d7ca65 100644
--- a/IPython/utils/decorators.py
+++ b/IPython/utils/decorators.py
@@ -50,7 +50,7 @@ def wrapper(*args,**kw):
 
 def undoc(func):
     """Mark a function or class as undocumented.
-    
+
     This is found by inspecting the AST, so for now it must be used directly
     as @undoc, not as e.g. @decorators.undoc
     """
diff --git a/IPython/utils/encoding.py b/IPython/utils/encoding.py
index 69a319ef0ef..651ee0c0b58 100644
--- a/IPython/utils/encoding.py
+++ b/IPython/utils/encoding.py
@@ -37,10 +37,10 @@ def get_stream_enc(stream, default=None):
 # won't need to make changes all over IPython.
 def getdefaultencoding(prefer_stream=True):
     """Return IPython's guess for the default encoding for bytes as text.
-    
+
     If prefer_stream is True (default), asks for stdin.encoding first,
     to match the calling Terminal, but that is often None for subprocesses.
-    
+
     Then fall back on locale.getpreferredencoding(),
     which should be a sensible platform default (that respects LANG environment),
     and finally to sys.getdefaultencoding() which is the most conservative option,
diff --git a/IPython/utils/frame.py b/IPython/utils/frame.py
index 74c6d4197f4..808906bda81 100644
--- a/IPython/utils/frame.py
+++ b/IPython/utils/frame.py
@@ -28,12 +28,10 @@ def extract_vars(*names,**kw):
     *names : str
         One or more variable names which will be extracted from the caller's
         frame.
-
-    depth : integer, optional
+    **kw : integer, optional
         How many frames in the stack to walk when looking for your variables.
         The default is 0, which will use the frame where the call was made.
 
-
     Examples
     --------
     ::
diff --git a/IPython/utils/generics.py b/IPython/utils/generics.py
index fcada6f44df..3626ca4cc75 100644
--- a/IPython/utils/generics.py
+++ b/IPython/utils/generics.py
@@ -22,7 +22,6 @@ def complete_object(obj, prev_completions):
         The object to complete.
     prev_completions : list
         List of attributes discovered so far.
-
     This should return the list of attributes in obj. If you only wish to
     add to the attributes already discovered normally, return
     own_attrs + prev_completions.
diff --git a/IPython/utils/importstring.py b/IPython/utils/importstring.py
index c7a9ccedc0b..51bfc7b569a 100644
--- a/IPython/utils/importstring.py
+++ b/IPython/utils/importstring.py
@@ -16,12 +16,12 @@ def import_item(name):
     Parameters
     ----------
     name : string
-      The fully qualified name of the module/package being imported.
+        The fully qualified name of the module/package being imported.
 
     Returns
     -------
     mod : module object
-       The module that was imported.
+        The module that was imported.
     """
     
     parts = name.rsplit('.', 1)
diff --git a/IPython/utils/io.py b/IPython/utils/io.py
index 7dc89868fb9..1600fc32106 100644
--- a/IPython/utils/io.py
+++ b/IPython/utils/io.py
@@ -113,11 +113,9 @@ def __init__(self, file_or_name, mode="w", channel='stdout'):
         Parameters
         ----------
         file_or_name : filename or open filehandle (writable)
-          File that will be duplicated
-
+            File that will be duplicated
         mode : optional, valid mode for open().
-          If a filename was give, open with this mode.
-
+            If a filename was give, open with this mode.
         channel : str, one of ['stdout', 'stderr']
         """
         if channel not in ['stdout', 'stderr']:
@@ -195,15 +193,14 @@ def temp_pyfile(src, ext='.py'):
     Parameters
     ----------
     src : string or list of strings (no need for ending newlines if list)
-      Source code to be written to the file.
-
+        Source code to be written to the file.
     ext : optional, string
-      Extension for the generated file.
+        Extension for the generated file.
 
     Returns
     -------
     (filename, open filehandle)
-      It is the caller's responsibility to close the open file and unlink it.
+        It is the caller's responsibility to close the open file and unlink it.
     """
     fname = tempfile.mkstemp(ext)[1]
     with open(Path(fname), "w") as f:
diff --git a/IPython/utils/ipstruct.py b/IPython/utils/ipstruct.py
index 376fbbefb69..d71a75e22c4 100644
--- a/IPython/utils/ipstruct.py
+++ b/IPython/utils/ipstruct.py
@@ -43,14 +43,13 @@ def __init__(self, *args, **kw):
 
         Parameters
         ----------
-        args : dict, Struct
+        *args : dict, Struct
             Initialize with one dict or Struct
-        kw : dict
+        **kw : dict
             Initialize with key, value pairs.
 
         Examples
         --------
-
         >>> s = Struct(a=10,b=30)
         >>> s.a
         10
@@ -68,7 +67,6 @@ def __setitem__(self, key, value):
 
         Examples
         --------
-
         >>> s = Struct()
         >>> s['a'] = 10
         >>> s.allow_new_attr(False)
@@ -95,7 +93,6 @@ def __setattr__(self, key, value):
 
         Examples
         --------
-
         >>> s = Struct()
         >>> s.a = 10
         >>> s.a
@@ -130,7 +127,6 @@ def __getattr__(self, key):
 
         Examples
         --------
-
         >>> s = Struct(a=10)
         >>> s.a
         10
@@ -155,7 +151,6 @@ def __iadd__(self, other):
 
         Examples
         --------
-
         >>> s = Struct(a=10,b=30)
         >>> s2 = Struct(a=20,c=40)
         >>> s += s2
@@ -170,7 +165,6 @@ def __add__(self,other):
 
         Examples
         --------
-
         >>> s1 = Struct(a=10,b=30)
         >>> s2 = Struct(a=20,c=40)
         >>> s = s1 + s2
@@ -186,7 +180,6 @@ def __sub__(self,other):
 
         Examples
         --------
-
         >>> s1 = Struct(a=10,b=30)
         >>> s2 = Struct(a=40)
         >>> s = s1 - s2
@@ -202,7 +195,6 @@ def __isub__(self,other):
 
         Examples
         --------
-
         >>> s1 = Struct(a=10,b=30)
         >>> s2 = Struct(a=40)
         >>> s1 -= s2
@@ -236,7 +228,6 @@ def copy(self):
 
         Examples
         --------
-
         >>> s = Struct(a=10,b=30)
         >>> s2 = s.copy()
         >>> type(s2) is Struct
@@ -251,7 +242,6 @@ def hasattr(self, key):
 
         Examples
         --------
-
         >>> s = Struct(a=10)
         >>> s.hasattr('a')
         True
@@ -284,7 +274,7 @@ def merge(self, __loc_data__=None, __conflict_solve=None, **kw):
 
         Parameters
         ----------
-        __loc_data : dict, Struct
+        __loc_data__ : dict, Struct
             The data to merge into self
         __conflict_solve : dict
             The conflict policy dict.  The keys are binary functions used to
@@ -292,12 +282,11 @@ def merge(self, __loc_data__=None, __conflict_solve=None, **kw):
             the keys the conflict resolution function applies to.  Instead of
             a list of strings a space separated string can be used, like
             'a b c'.
-        kw : dict
+        **kw : dict
             Additional key, value pairs to merge in
 
         Notes
         -----
-
         The `__conflict_solve` dict is a dictionary of binary functions which will be used to
         solve key conflicts.  Here is an example::
 
@@ -338,7 +327,6 @@ def merge(self, __loc_data__=None, __conflict_solve=None, **kw):
 
         Examples
         --------
-
         This show the default policy:
 
         >>> s = Struct(a=10,b=30)
diff --git a/IPython/utils/module_paths.py b/IPython/utils/module_paths.py
index 32ecab8501d..b5ae60c3322 100644
--- a/IPython/utils/module_paths.py
+++ b/IPython/utils/module_paths.py
@@ -43,7 +43,7 @@ def find_mod(module_name):
     """
     Find module `module_name` on sys.path, and return the path to module `module_name`.
 
-      - If `module_name` refers to a module directory, then return path to __init__ file. 
+      - If `module_name` refers to a module directory, then return path to __init__ file.
         - If `module_name` is a directory without an __init__file, return None.
       - If module is missing or does not have a `.py` or `.pyw` extension, return None.
         - Note that we are not interested in running bytecode.
@@ -52,7 +52,7 @@ def find_mod(module_name):
     Parameters
     ----------
     module_name : str
-    
+
     Returns
     -------
     module_path : str
diff --git a/IPython/utils/openpy.py b/IPython/utils/openpy.py
index aca2cf0360d..297a762c7d2 100644
--- a/IPython/utils/openpy.py
+++ b/IPython/utils/openpy.py
@@ -60,15 +60,15 @@ def strip_encoding_cookie(filelike):
 
 def read_py_file(filename, skip_encoding_cookie=True):
     """Read a Python file, using the encoding declared inside the file.
-    
+
     Parameters
     ----------
     filename : str
-      The path to the file to read.
+        The path to the file to read.
     skip_encoding_cookie : bool
-      If True (the default), and the encoding declaration is found in the first
-      two lines, that line will be excluded from the output.
-    
+        If True (the default), and the encoding declaration is found in the first
+        two lines, that line will be excluded from the output.
+
     Returns
     -------
     A unicode string containing the contents of the file.
@@ -82,18 +82,18 @@ def read_py_file(filename, skip_encoding_cookie=True):
 
 def read_py_url(url, errors='replace', skip_encoding_cookie=True):
     """Read a Python file from a URL, using the encoding declared inside the file.
-    
+
     Parameters
     ----------
     url : str
-      The URL from which to fetch the file.
+        The URL from which to fetch the file.
     errors : str
-      How to handle decoding errors in the file. Options are the same as for
-      bytes.decode(), but here 'replace' is the default.
+        How to handle decoding errors in the file. Options are the same as for
+        bytes.decode(), but here 'replace' is the default.
     skip_encoding_cookie : bool
-      If True (the default), and the encoding declaration is found in the first
-      two lines, that line will be excluded from the output.
-    
+        If True (the default), and the encoding declaration is found in the first
+        two lines, that line will be excluded from the output.
+
     Returns
     -------
     A unicode string containing the contents of the file.
diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index 3f0e217048a..cc10dffd1f0 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -109,7 +109,7 @@ def get_py_filename(name, force_win32=None):
         raise IOError('File `%r` not found.' % name)
 
 
-def filefind(filename, path_dirs=None):
+def filefind(filename: str, path_dirs=None) -> str:
     """Find a file by looking through a sequence of paths.
 
     This iterates through a sequence of paths looking for a file and returns
@@ -139,7 +139,12 @@ def filefind(filename, path_dirs=None):
 
     Returns
     -------
-    Raises :exc:`IOError` or returns absolute path to file.
+    path : str
+        returns absolute path to file.
+
+    Raises
+    ------
+    IOError
     """
 
     # If paths are quoted, abspath gets confused, strip them...
@@ -178,7 +183,6 @@ def get_home_dir(require_writable=False) -> str:
 
     Parameters
     ----------
-
     require_writable : bool [default: False]
         if True:
             guarantees the return value is a writable directory, otherwise
diff --git a/IPython/utils/sysinfo.py b/IPython/utils/sysinfo.py
index 07d14fd8a48..fed82a24537 100644
--- a/IPython/utils/sysinfo.py
+++ b/IPython/utils/sysinfo.py
@@ -40,15 +40,15 @@ def pkg_commit_hash(pkg_path):
     Parameters
     ----------
     pkg_path : str
-       directory containing package
-       only used for getting commit from active repo
+        directory containing package
+        only used for getting commit from active repo
 
     Returns
     -------
     hash_from : str
-       Where we got the hash from - description
+        Where we got the hash from - description
     hash_str : str
-       short form of hash
+        short form of hash
     """
     # Try and get commit from written commit text file
     if _sysinfo.commit:
@@ -71,12 +71,12 @@ def pkg_info(pkg_path):
     Parameters
     ----------
     pkg_path : str
-       path containing __init__.py for package
+        path containing __init__.py for package
 
     Returns
     -------
     context : dict
-       with named parameters of interest
+        with named parameters of interest
     """
     src, hsh = pkg_commit_hash(pkg_path)
     return dict(
diff --git a/IPython/utils/terminal.py b/IPython/utils/terminal.py
index 4e1800208c0..49fd3fe1739 100644
--- a/IPython/utils/terminal.py
+++ b/IPython/utils/terminal.py
@@ -45,7 +45,7 @@ def toggle_set_term_title(val):
 
     Parameters
     ----------
-      val : bool
+    val : bool
         If True, set_term_title() actually writes to the terminal (using the
         appropriate platform-specific module).  If False, it is a no-op.
     """
diff --git a/IPython/utils/tests/test_capture.py b/IPython/utils/tests/test_capture.py
index 60b63d3b645..c02dbaa4ea1 100644
--- a/IPython/utils/tests/test_capture.py
+++ b/IPython/utils/tests/test_capture.py
@@ -111,7 +111,7 @@ def test_rich_output_metadata(method_mime):
 
 def test_rich_output_display():
     """test RichOutput.display
-    
+
     This is a bit circular, because we are actually using the capture code we are testing
     to test itself.
     """
diff --git a/IPython/utils/tests/test_module_paths.py b/IPython/utils/tests/test_module_paths.py
index 01694a2dc15..ef2841bb34d 100644
--- a/IPython/utils/tests/test_module_paths.py
+++ b/IPython/utils/tests/test_module_paths.py
@@ -54,8 +54,8 @@ def setup_module():
 def teardown_module():
     """Teardown testenvironment for the module:
 
-            - Remove tempdir
-            - restore sys.path
+    - Remove tempdir
+    - restore sys.path
     """
     # Note: we remove the parent test dir, which is the root of all test
     # subdirs we may have created.  Use shutil instead of os.removedirs, so
diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index 74f21c3b50a..1358deb688a 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -56,7 +56,7 @@
 def setup_module():
     """Setup testenvironment for the module:
 
-            - Adds dummy home dir tree
+    - Adds dummy home dir tree
     """
     # Do not mask exceptions here.  In particular, catching WindowsError is a
     # problem because that exception is only defined on Windows...
@@ -66,7 +66,7 @@ def setup_module():
 def teardown_module():
     """Teardown testenvironment for the module:
 
-            - Remove dummy home dir tree
+    - Remove dummy home dir tree
     """
     # Note: we remove the parent test dir, which is the root of all test
     # subdirs we may have created.  Use shutil instead of os.removedirs, so
diff --git a/IPython/utils/tests/test_sysinfo.py b/IPython/utils/tests/test_sysinfo.py
index c4f9c3cfa91..c3f879b32f4 100644
--- a/IPython/utils/tests/test_sysinfo.py
+++ b/IPython/utils/tests/test_sysinfo.py
@@ -12,6 +12,6 @@
 
 def test_json_getsysinfo():
     """
-    test that it is easily jsonable and don't return bytes somewhere. 
+    test that it is easily jsonable and don't return bytes somewhere.
     """
     json.dumps(sysinfo.get_sys_info())
diff --git a/IPython/utils/text.py b/IPython/utils/text.py
index 194107a884c..f2131ace598 100644
--- a/IPython/utils/text.py
+++ b/IPython/utils/text.py
@@ -252,7 +252,6 @@ def indent(instr,nspaces=4, ntabs=0, flatten=False):
 
     Parameters
     ----------
-
     instr : basestring
         The string to be indented.
     nspaces : int (default: 4)
@@ -266,7 +265,6 @@ def indent(instr,nspaces=4, ntabs=0, flatten=False):
 
     Returns
     -------
-
     str|unicode : string indented by ntabs and nspaces.
 
     """
@@ -390,7 +388,6 @@ def wrap_paragraphs(text, ncols=80):
 
     Returns
     -------
-
     list of complete paragraphs, wrapped to fill `ncols` columns.
     """
     paragraph_re = re.compile(r'\n(\s*\n)+', re.MULTILINE)
@@ -410,7 +407,7 @@ def wrap_paragraphs(text, ncols=80):
 
 def long_substr(data):
     """Return the longest common substring in a list of strings.
-    
+
     Credit: http://stackoverflow.com/questions/2892931/longest-common-substring-from-more-than-two-strings-python
     """
     substr = ''
@@ -474,7 +471,7 @@ def strip_email_quotes(text):
 def strip_ansi(source):
     """
     Remove ansi escape codes from text.
-    
+
     Parameters
     ----------
     source : str
@@ -651,7 +648,6 @@ def compute_item_matrix(items, row_first=False, empty=None, *args, **kwargs) :
 
     Parameters
     ----------
-
     items
         list of strings to columize
     row_first : (default False)
@@ -666,14 +662,11 @@ def compute_item_matrix(items, row_first=False, empty=None, *args, **kwargs) :
 
     Returns
     -------
-
     strings_matrix
-
         nested list of string, the outer most list contains as many list as
         rows, the innermost lists have each as many element as columns. If the
         total number of elements in `items` does not equal the product of
         rows*columns, the last element of some lists are filled with `None`.
-
     dict_info
         some info to make columnize easier:
 
@@ -713,14 +706,11 @@ def columnize(items, row_first=False, separator='  ', displaywidth=80, spread=Fa
     ----------
     items : sequence of strings
         The strings to process.
-
     row_first : (default False)
         Whether to compute columns for a row-first matrix instead of
         column-first (default).
-
     separator : str, optional [default is two spaces]
         The string that separates columns.
-
     displaywidth : int, optional [default is 80]
         Width of the display in number of characters.
 
diff --git a/IPython/utils/tokenutil.py b/IPython/utils/tokenutil.py
index 28f8b6d5261..697d2b504a1 100644
--- a/IPython/utils/tokenutil.py
+++ b/IPython/utils/tokenutil.py
@@ -23,20 +23,18 @@ def generate_tokens(readline):
 
 def line_at_cursor(cell, cursor_pos=0):
     """Return the line in a cell at a given cursor position
-    
+
     Used for calling line-based APIs that don't support multi-line input, yet.
-    
+
     Parameters
     ----------
-    
-    cell: str
+    cell : str
         multiline block of text
-    cursor_pos: integer
+    cursor_pos : integer
         the cursor position
-    
+
     Returns
     -------
-    
     (line, offset): (string, integer)
         The line with the current cursor, and the character offset of the start of the line.
     """
@@ -58,15 +56,14 @@ def line_at_cursor(cell, cursor_pos=0):
 
 def token_at_cursor(cell, cursor_pos=0):
     """Get the token at a given cursor
-    
+
     Used for introspection.
-    
+
     Function calls are prioritized, so the token for the callable will be returned
     if the cursor is anywhere inside the call.
-    
+
     Parameters
     ----------
-    
     cell : unicode
         A block of Python code
     cursor_pos : int

From fac671053b5aae8c042e34fb32b409f2c3596d4b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 6 Apr 2021 20:17:40 -0700
Subject: [PATCH 0479/1407] Inform user they shoudl use Xonsh instead of system
 shell

---
 docs/source/interactive/shell.rst | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/source/interactive/shell.rst b/docs/source/interactive/shell.rst
index 3c72702eb6e..0ea125cb9ef 100644
--- a/docs/source/interactive/shell.rst
+++ b/docs/source/interactive/shell.rst
@@ -1,5 +1,11 @@
 .. _ipython_as_shell:
 
+.. note::
+
+   This page has been kept for historical reason. You most likely want to use
+   `Xonsh <https://xon.sh/>`__ instead of this.
+
+
 =========================
 IPython as a system shell
 =========================
@@ -44,6 +50,10 @@ so you should be able to type any normal system command and have it executed.
 See ``%alias?``  and ``%unalias?`` for details on the alias facilities. See also
 ``%rehashx?`` for details on the mechanism used to load $PATH.
 
+.. warning::
+
+   See info at the top of the page. You most likely want to use
+   `Xonsh <https://xon.sh/>`__ instead of this.
 
 Directory management
 ====================
@@ -196,3 +206,9 @@ provide a convenient ways to use contained text in different formats:
 * ``.s`` returns string with lines separated by single space (for
   convenient passing to system commands)
 * ``.p`` returns list of "path" objects from detected file names
+
+.. error::
+
+   You went too far scroll back up. You most likely want to use
+   `Xonsh <https://xon.sh/>`__ instead of this.
+

From 4ca215c177ed9b7a04786eaf556a0c6a1a90580c Mon Sep 17 00:00:00 2001
From: Jake VanderPlas <jakevdp@google.com>
Date: Tue, 6 Apr 2021 20:59:17 -0700
Subject: [PATCH 0480/1407] latex_to_png: avoid deprecated matplotlib functions

---
 IPython/lib/latextools.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py
index 920b04596ff..540d3f50475 100644
--- a/IPython/lib/latextools.py
+++ b/IPython/lib/latextools.py
@@ -111,7 +111,8 @@ def latex_to_png(s, encode=False, backend=None, wrap=False, color='Black',
 
 def latex_to_png_mpl(s, wrap, color='Black', scale=1.0):
     try:
-        from matplotlib import mathtext
+        from matplotlib import figure, font_manager, mathtext
+        from matplotlib.backends import backend_agg
         from pyparsing import ParseFatalException
     except ImportError:
         return None
@@ -122,11 +123,18 @@ def latex_to_png_mpl(s, wrap, color='Black', scale=1.0):
         s = u'${0}$'.format(s)
 
     try:
-        mt = mathtext.MathTextParser('bitmap')
-        f = BytesIO()
-        dpi = 120*scale
-        mt.to_png(f, s, fontsize=12, dpi=dpi, color=color)
-        return f.getvalue()
+        prop = font_manager.FontProperties(size=12)
+        dpi = 120 * scale
+        buffer = BytesIO()
+
+        # Adapted from mathtext.math_to_image
+        parser = mathtext.MathTextParser("path")
+        width, height, depth, _, _ = parser.parse(s, dpi=72, prop=prop)
+        fig = figure.Figure(figsize=(width / 72, height / 72))
+        fig.text(0, depth / height, s, fontproperties=prop, color=color)
+        backend_agg.FigureCanvasAgg(fig)
+        fig.savefig(buffer, dpi=dpi, format="png", transparent=True)
+        return buffer.getvalue()
     except (ValueError, RuntimeError, ParseFatalException):
         return None
 

From 2d8bba34de5d44d599be075dd5a8e5b05d9778dd Mon Sep 17 00:00:00 2001
From: Coco Bennett <kittenishkoko@gmail.com>
Date: Wed, 7 Apr 2021 19:46:26 -0500
Subject: [PATCH 0481/1407] Delete breadcrumbs.html

---
 docs/source/_templates/breadcrumbs.html | 83 -------------------------
 1 file changed, 83 deletions(-)
 delete mode 100755 docs/source/_templates/breadcrumbs.html

diff --git a/docs/source/_templates/breadcrumbs.html b/docs/source/_templates/breadcrumbs.html
deleted file mode 100755
index 71f03d32b1a..00000000000
--- a/docs/source/_templates/breadcrumbs.html
+++ /dev/null
@@ -1,83 +0,0 @@
-{#- Support for Sphinx 1.3+ page_source_suffix, but don't break old builds. #}
-
-{%- if page_source_suffix %}
-   {%- set suffix = page_source_suffix %}
-{%- else %}
-   {%- set suffix = source_suffix %}
-{%- endif %}
-
-{%- if meta is defined and meta is not none %}
-   {%- set check_meta = True %}
-{%- else %}
-   {%- set check_meta = False %}
-{%- endif %}
-
-{%- if check_meta and 'github_url' in meta %}
-   {%- set display_github = True %}
-{%- endif %}
-
-{%- if check_meta and 'bitbucket_url' in meta %}
-   {%- set display_bitbucket = True %}
-{%- endif %}
-
-{%- if check_meta and 'gitlab_url' in meta %}
-   {%- set display_gitlab = True %}
-{%- endif %}
-
-{%- set display_vcs_links = display_vcs_links if display_vcs_links is defined else True %}
-
-<div role="navigation" aria-label="{{ _('Breadcrumbs') }}">
-  <ul class="wy-breadcrumbs">
-    {%- block breadcrumbs %}
-      <li><a href="{{ pathto(master_doc) }}" class="icon icon-home"></a> &raquo;</li>
-        {%- for doc in parents %}
-          <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
-        {%- endfor %}
-      <li>{{ title }}</li>
-    {%- endblock %}
-    {%- block breadcrumbs_aside %}
-      <li class="wy-breadcrumbs-aside">
-        {%- if hasdoc(pagename) and display_vcs_links %}
-          {%- if display_github %}
-            {%- if check_meta and 'github_url' in meta %}
-              <!-- User defined GitHub URL -->
-              <a href="{{ meta['github_url'] }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
-            {%- else %}
-              <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/{{ theme_vcs_pageview_mode or "blob" }}/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
-            {%- endif %}
-          {%- elif display_bitbucket %}
-            {%- if check_meta and 'bitbucket_url' in meta %}
-              <!-- User defined Bitbucket URL -->
-              <a href="{{ meta['bitbucket_url'] }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
-            {%- else %}
-              <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ suffix }}?mode={{ theme_vcs_pageview_mode or "view" }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
-            {%- endif %}
-          {%- elif display_gitlab %}
-            {%- if check_meta and 'gitlab_url' in meta %}
-              <!-- User defined GitLab URL -->
-              <a href="{{ meta['gitlab_url'] }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
-            {%- else %}
-              <a href="https://{{ gitlab_host|default("gitlab.com") }}/{{ gitlab_user }}/{{ gitlab_repo }}/{{ theme_vcs_pageview_mode or "blob" }}/{{ gitlab_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
-            {%- endif %}
-          {%- elif show_source and source_url_prefix %}
-            <a href="{{ source_url_prefix }}{{ pagename }}{{ suffix }}">{{ _('View page source') }}</a>
-          {%- elif show_source and has_source and sourcename %}
-            <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> {{ _('View page source') }}</a>
-          {%- endif %}
-        {%- endif %}
-      </li>
-    {%- endblock %}
-  </ul>
-
-  {%- if (theme_prev_next_buttons_location == 'top' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
-  <div class="rst-breadcrumbs-buttons" role="navigation" aria-label="{{ _('Breadcrumbs') }}">
-      {%- if prev %}
-        <a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> {{ _('Previous') }}</a>
-      {%- endif %}
-      {%- if next %}
-        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">{{ _('Next') }} <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
-      {%- endif %}
-  </div>
-  {%- endif %}
-  <hr/>
-</div>
\ No newline at end of file

From bef57aa5c8c44ea8b5dba8681312b2e368abe5a1 Mon Sep 17 00:00:00 2001
From: Coco Bennett <kittenishkoko@gmail.com>
Date: Wed, 7 Apr 2021 19:53:02 -0500
Subject: [PATCH 0482/1407] make linter happy

---
 docs/source/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index e29e7bf19a8..e50e50c50a4 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -39,7 +39,7 @@
     html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 html_context = {
-    "display_github": False, # Add 'Edit on Github' link instead of 'View page source'
+    "display_github": False,  # Add 'Edit on Github' link instead of 'View page source'
     "last_updated": True,
     "commit": False,
 }

From 551078e135b023e094e74abee1f0a75137052204 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 8 Apr 2021 17:14:52 -0700
Subject: [PATCH 0483/1407] Cleaner shutdown

Reset recreate a new history; so ther is no point in calling it after
closing history session.

Unset  class variable to be sure they are not reused.
---
 IPython/core/interactiveshell.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 589a3be96cc..5905ace0aad 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3785,26 +3785,30 @@ def atexit_operations(self):
         code that has the appropriate information, rather than trying to
         clutter
         """
+        # Clear all user namespaces to release all references cleanly.
+        self.reset(new_session=False)
         # Close the history session (this stores the end time and line count)
         # this must be *before* the tempfile cleanup, in case of temporary
         # history db
         self.history_manager.end_session()
+        del self.history_manager
 
         # Cleanup all tempfiles and folders left around
         for tfile in self.tempfiles:
             try:
                 tfile.unlink()
+                self.tempfiles.remove(tfile)
             except FileNotFoundError:
                 pass
-
+        del self.tempfiles
         for tdir in self.tempdirs:
             try:
                 tdir.rmdir()
+                self.tempdirs.remove(tdir)
             except FileNotFoundError:
                 pass
+        del self.tempdirs
 
-        # Clear all user namespaces to release all references cleanly.
-        self.reset(new_session=False)
 
         # Run user hooks
         self.hooks.shutdown_hook()

From 08d54c0e367b535fd88aca5273fd09e5e70d08f8 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 8 Apr 2021 18:34:35 -0700
Subject: [PATCH 0484/1407] Finish fixing the at-exit spurious failures.

Mostly due to concurrent file access, and late calling
---
 IPython/core/interactiveshell.py      | 24 +++++++++++++++++-------
 IPython/core/tests/test_pylabtools.py |  9 +++++++++
 IPython/terminal/interactiveshell.py  |  7 +++++++
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 5905ace0aad..6742a1ce9fa 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3771,6 +3771,22 @@ def find_user_code(self, target, raw=True, py_only=False, skip_encoding_cookie=T
         raise TypeError("%s is neither a string nor a macro." % target,
                         codeobj)
 
+    def _atexit_once(self):
+        """
+        At exist operation that need to be called at most once.
+        Second call to this function per instance will do nothing.
+        """
+
+        if not getattr(self, "_atexit_once_called", False):
+            self._atexit_once_called = True
+            # Clear all user namespaces to release all references cleanly.
+            self.reset(new_session=False)
+            # Close the history session (this stores the end time and line count)
+            # this must be *before* the tempfile cleanup, in case of temporary
+            # history db
+            self.history_manager.end_session()
+            self.history_manager = None
+
     #-------------------------------------------------------------------------
     # Things related to IPython exiting
     #-------------------------------------------------------------------------
@@ -3785,13 +3801,7 @@ def atexit_operations(self):
         code that has the appropriate information, rather than trying to
         clutter
         """
-        # Clear all user namespaces to release all references cleanly.
-        self.reset(new_session=False)
-        # Close the history session (this stores the end time and line count)
-        # this must be *before* the tempfile cleanup, in case of temporary
-        # history db
-        self.history_manager.end_session()
-        del self.history_manager
+        self._atexit_once()
 
         # Cleanup all tempfiles and folders left around
         for tfile in self.tempfiles:
diff --git a/IPython/core/tests/test_pylabtools.py b/IPython/core/tests/test_pylabtools.py
index 75b103f27a6..5a8342322df 100644
--- a/IPython/core/tests/test_pylabtools.py
+++ b/IPython/core/tests/test_pylabtools.py
@@ -146,8 +146,16 @@ def test_import_pylab():
     nt.assert_true('plt' in ns)
     nt.assert_equal(ns['np'], np)
 
+from traitlets.config import Config
+
+
 class TestPylabSwitch(object):
     class Shell(InteractiveShell):
+        def init_history(self):
+            """Sets up the command history, and starts regular autosaves."""
+            self.config.HistoryManager.hist_file = ":memory:"
+            super().init_history()
+
         def enable_gui(self, gui):
             pass
 
@@ -179,6 +187,7 @@ def teardown(self):
         matplotlib.rcParamsOrig = self._saved_rcParamsOrig
 
     def test_qt(self):
+
         s = self.Shell()
         gui, backend = s.enable_matplotlib(None)
         nt.assert_equal(gui, 'qt')
diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 324246a85f6..0fa90281c55 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -615,6 +615,13 @@ def mainloop(self, display_banner=DISPLAY_BANNER_DEPRECATED):
 
                 self.restore_term_title()
 
+        # try to call some at-exit operation optimistically as some things can't
+        # be done during interpreter shutdown. this is technically inaccurate as
+        # this make mainlool not re-callable, but that should be a rare if not
+        # in existent use case.
+
+        self._atexit_once()
+
 
     _inputhook = None
     def inputhook(self, context):

From 36594689090107bf0d66ec676ddd3e06306277bf Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 8 Apr 2021 22:26:56 -0700
Subject: [PATCH 0485/1407] darker

---
 IPython/core/tests/test_display.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index 21cc2276fe6..cee42be61d8 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -460,4 +460,4 @@ def test_display_handle():
 
 @nt.raises(FileNotFoundError)
 def test_image_bad_filename_raises_proper_exception():
-    display.Image('/this/file/does/not/exist/')
+    display.Image("/this/file/does/not/exist/")

From 3726e8c60378b46757ffa825573613d40d140553 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 8 Apr 2021 22:34:15 -0700
Subject: [PATCH 0486/1407] explicitely call method

---
 IPython/core/tests/test_display.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index cee42be61d8..2fc8bf30424 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -460,4 +460,4 @@ def test_display_handle():
 
 @nt.raises(FileNotFoundError)
 def test_image_bad_filename_raises_proper_exception():
-    display.Image("/this/file/does/not/exist/")
+    display.Image("/this/file/does/not/exist/")._repr_png_()

From 67a935ed72e56742545e8d931047bf3ae6a253ca Mon Sep 17 00:00:00 2001
From: Blazej Michalik <code.mrmino@gmail.com>
Date: Sat, 10 Apr 2021 13:13:31 +0200
Subject: [PATCH 0487/1407] Add GHA tests

---
 .github/workflows/test.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000000..989cfa25557
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,35 @@
+name: Run tests
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.7, 3.8, 3.9]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install Graphviz
+      run: |
+        sudo apt-get update 
+        sudo apt-get install graphviz
+    - name: Install and update Python dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install --upgrade setuptools
+        python -m pip install --upgrade -e file://$PWD#egg=ipython[test]
+        python -m pip install --upgrade --upgrade-strategy eager trio curio 
+        python -m pip install --upgrade pytest pytest-trio 'matplotlib!=3.2.0'
+        python -m pip install --upgrade codecov check-manifest pytest-cov anyio
+    - name: iptest
+      run: |
+        cd /tmp && iptest --coverage xml && cd -
+    - name: pytest
+      run: |
+        pytest

From ba355ee63264b4396c9f7747f50eeeb146217d72 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 12:46:36 +0100
Subject: [PATCH 0488/1407] Add docs workflow on Github

---
 .github/workflows/docs.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .github/workflows/docs.yml

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
new file mode 100644
index 00000000000..440bce98c81
--- /dev/null
+++ b/.github/workflows/docs.yml
@@ -0,0 +1,26 @@
+name: Run tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Install Graphviz
+      run: |
+        sudo apt-get update
+        sudo apt-get install graphviz
+    - name: Install Python dependencies
+      run: |
+        python -m pip install --upgrade pip setuptools
+        pip install -r docs/requirements.txt
+    - name: Build docs
+      run: |
+        python tools/fixup_whats_new_pr.py
+        make -C docs/ html SPHINXOPTS="-W"

From 7b68550009ccc4f2b7029fff57469e0bcab21040 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 12:48:27 +0100
Subject: [PATCH 0489/1407] Fix name of workflow

---
 .github/workflows/docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 440bce98c81..1793a25ccae 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -1,4 +1,4 @@
-name: Run tests
+name: Build docs
 
 on: [push, pull_request]
 

From b4c1bee43ae27185fed16e7989e7c327f582e6dc Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 12:50:25 +0100
Subject: [PATCH 0490/1407] pytest seems to be required for building docs

---
 docs/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index b3ff5285cc8..9c6527f2bfb 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -6,3 +6,4 @@ sphinx-rtd-theme
 docrepr
 matplotlib
 stack_data
+pytest

From d54783c42cfa2c245d6aa863b84a6cff19542379 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 12:51:07 +0100
Subject: [PATCH 0491/1407] Names again

---
 .github/workflows/docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 1793a25ccae..38b6ab9ec5d 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -3,7 +3,7 @@ name: Build docs
 on: [push, pull_request]
 
 jobs:
-  test:
+  build:
     runs-on: ubuntu-latest
 
     steps:

From 406b5dda63e032ae5de94df5a25a262069505d0f Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 12:52:13 +0100
Subject: [PATCH 0492/1407] Docs build also requires nose

---
 docs/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 9c6527f2bfb..7c990693e01 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -7,3 +7,4 @@ docrepr
 matplotlib
 stack_data
 pytest
+nose

From d0bfa559e84eeb8a918e0c0b3a6192ffb016096c Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 12:57:56 +0100
Subject: [PATCH 0493/1407] Include all test dependencies when building docs

---
 docs/requirements.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 7c990693e01..93e162f6660 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,4 +1,4 @@
--e .
+-e .[test]
 ipykernel
 setuptools>=18.5
 sphinx
@@ -7,4 +7,3 @@ docrepr
 matplotlib
 stack_data
 pytest
-nose

From 4ca02c92e000ecf952a39a6fb1bcce2588a32d28 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 13:41:41 +0100
Subject: [PATCH 0494/1407] Avoid creating CalledProcessError with return code
 None

---
 IPython/core/magics/script.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index a885e3ff037..d713a7f95f8 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -199,6 +199,7 @@ async def _stream_communicate(process, cell):
                 _handle_stream(process.stderr, args.err, sys.stderr)
             )
             await asyncio.wait([stdout_task, stderr_task])
+            await process.wait()
 
         if sys.platform.startswith("win"):
             asyncio.set_event_loop_policy(asyncio.WindowsProactorEventLoopPolicy())
@@ -264,7 +265,11 @@ async def _stream_communicate(process, cell):
                 print("Error while terminating subprocess (pid=%i): %s" % (p.pid, e))
             return
         if args.raise_error and p.returncode!=0:
-            raise CalledProcessError(p.returncode, cell)
+            # If we get here and p.returncode is still None, we must have
+            # killed it but not yet seen its return code. We don't wait for it,
+            # in case it's stuck in uninterruptible sleep. -9 = SIGKILL
+            rc = p.returncode or -9
+            raise CalledProcessError(rc, cell)
     
     def _run_script(self, p, cell, to_close):
         """callback for running the script in the background"""

From 9fb0ed5a6020e26b3aa6e91332c175387e7dd475 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 13:46:39 +0100
Subject: [PATCH 0495/1407] Graphviz is only needed for docs build

---
 .github/workflows/test.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 989cfa25557..bdaa9a649a0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,10 +15,6 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install Graphviz
-      run: |
-        sudo apt-get update 
-        sudo apt-get install graphviz
     - name: Install and update Python dependencies
       run: |
         python -m pip install --upgrade pip

From 85a95ff6bf884f35e512ef98cc8f04ed8358cfe7 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 13:58:45 +0100
Subject: [PATCH 0496/1407] Add check-manifest command as part of tests job

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bdaa9a649a0..a98c092a605 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,6 +23,8 @@ jobs:
         python -m pip install --upgrade --upgrade-strategy eager trio curio 
         python -m pip install --upgrade pytest pytest-trio 'matplotlib!=3.2.0'
         python -m pip install --upgrade codecov check-manifest pytest-cov anyio
+    - name: Check manifest
+      run: check-manifest
     - name: iptest
       run: |
         cd /tmp && iptest --coverage xml && cd -

From 70965559f5f5e82a0989d664469a6012820e9e24 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 14:04:34 +0100
Subject: [PATCH 0497/1407] Add codecov upload

---
 .github/workflows/test.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a98c092a605..d214633b506 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,12 +22,15 @@ jobs:
         python -m pip install --upgrade -e file://$PWD#egg=ipython[test]
         python -m pip install --upgrade --upgrade-strategy eager trio curio 
         python -m pip install --upgrade pytest pytest-trio 'matplotlib!=3.2.0'
-        python -m pip install --upgrade codecov check-manifest pytest-cov anyio
+        python -m pip install --upgrade check-manifest pytest-cov anyio
     - name: Check manifest
       run: check-manifest
     - name: iptest
       run: |
         cd /tmp && iptest --coverage xml && cd -
+        cp /tmp/ipy_coverage.xml ./
+        cp /tmp/.coverage ./
     - name: pytest
       run: |
         pytest
+    - uses: codecov/codecov-action@v1

From a4d1ca9d7db3f4f7380da1cf7fa7fe7a7d7d284b Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 14:04:57 +0100
Subject: [PATCH 0498/1407] Also install wheel package

---
 .github/workflows/test.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d214633b506..3ffaefe8ee7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,8 +17,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install and update Python dependencies
       run: |
-        python -m pip install --upgrade pip
-        python -m pip install --upgrade setuptools
+        python -m pip install --upgrade pip setuptools wheel
         python -m pip install --upgrade -e file://$PWD#egg=ipython[test]
         python -m pip install --upgrade --upgrade-strategy eager trio curio 
         python -m pip install --upgrade pytest pytest-trio 'matplotlib!=3.2.0'

From 6c4ef0e9a53978eb5cb8361dc611229d02e31aa6 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 14:09:07 +0100
Subject: [PATCH 0499/1407] Name codecov step

---
 .github/workflows/test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3ffaefe8ee7..275d8e2c2b7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,4 +32,5 @@ jobs:
     - name: pytest
       run: |
         pytest
-    - uses: codecov/codecov-action@v1
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v1

From eb0d419bdab2f3c23d1f77982088275313d50266 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 16:02:44 +0100
Subject: [PATCH 0500/1407] Add workflow to make Github release on tags

---
 .github/workflows/release.yml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000000..187a8072dbc
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,31 @@
+name: Github releases
+
+on:
+  push:
+    tags:
+      - '*.*.*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+
+      - name: Make packages
+        run: |
+          pip install --upgrade setuptools wheel
+          rm -rf dist/
+          python setup.py sdist
+          python setup.py bdist_wheel
+
+      - name: Github release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: dist/*
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From c684e0a0628b1dd047a2bf3d48f4bbe4a8af85a9 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 16:13:00 +0100
Subject: [PATCH 0501/1407] Add Github CI on Mac

---
 .github/workflows/test-osx.yml | 23 +++++++++++++++++++++++
 .github/workflows/test.yml     |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/test-osx.yml

diff --git a/.github/workflows/test-osx.yml b/.github/workflows/test-osx.yml
new file mode 100644
index 00000000000..5f743c45cb6
--- /dev/null
+++ b/.github/workflows/test-osx.yml
@@ -0,0 +1,23 @@
+name: Run tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+    - name: Install and update Python dependencies
+      run: |
+        python -m pip install --upgrade pip setuptools wheel
+        python -m pip install --upgrade -e file://$PWD#egg=ipython[test]
+        python -m pip install --upgrade --upgrade-strategy eager trio curio
+        python -m pip install --upgrade pytest pytest-trio 'matplotlib!=3.2.0'
+        python -m pip install --upgrade anyio
+    - name: pytest
+      run: pytest
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 275d8e2c2b7..b9bbae48cf7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,6 +1,6 @@
 name: Run tests
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test:

From 922c79bba7c275fbd30dcbafcf00098900a68f96 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 16:13:41 +0100
Subject: [PATCH 0502/1407] Clearer name

---
 .github/workflows/test-osx.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-osx.yml b/.github/workflows/test-osx.yml
index 5f743c45cb6..c9afbe0a0ea 100644
--- a/.github/workflows/test-osx.yml
+++ b/.github/workflows/test-osx.yml
@@ -1,4 +1,4 @@
-name: Run tests
+name: Run tests on OSX
 
 on: [push, pull_request]
 

From 7a3550423c3c61c085ee5f17cecaac70c5d3325f Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 10 Apr 2021 21:01:29 +0100
Subject: [PATCH 0503/1407] Remove Travis CI configuration

---
 .travis.yml | 105 ----------------------------------------------------
 1 file changed, 105 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index db02c507500..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,105 +0,0 @@
-# http://travis-ci.org/#!/ipython/ipython
-language: python
-os: linux
-
-addons:
-  apt:
-    packages:
-      - graphviz
-
-python:
-    - 3.8
-
-env:
-  global:
-    - PATH=$TRAVIS_BUILD_DIR/pandoc:$PATH
-
-group: edge
-
-before_install:
-  - |
-    # install Python on macOS
-    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      env | sort
-      if ! which python$TRAVIS_PYTHON_VERSION; then
-        HOMEBREW_NO_AUTO_UPDATE=1 brew tap minrk/homebrew-python-frameworks
-        HOMEBREW_NO_AUTO_UPDATE=1 brew cask install python-framework-${TRAVIS_PYTHON_VERSION/./}
-      fi
-      python3 -m pip install virtualenv
-      python3 -m virtualenv -p $(which python$TRAVIS_PYTHON_VERSION) ~/travis-env
-      source ~/travis-env/bin/activate
-    fi
-  - python --version
-
-install:
-  - pip install pip --upgrade
-  - pip install setuptools --upgrade
-  - pip install -e file://$PWD#egg=ipython[test] --upgrade
-  - pip install trio curio --upgrade --upgrade-strategy eager
-  - pip install 'pytest' 'matplotlib !=3.2.0'
-  - pip install codecov check-manifest pytest-cov --upgrade anyio pytest-trio
-
-
-script:
-  - check-manifest
-  - |
-    if [[ "$TRAVIS_PYTHON_VERSION" == "nightly" ]]; then
-       # on nightly fake parso known the grammar
-       cp /home/travis/virtualenv/python3.9-dev/lib/python3.9/site-packages/parso/python/grammar38.txt /home/travis/virtualenv/python3.9-dev/lib/python3.9/site-packages/parso/python/grammar39.txt
-    fi
-  - |
-    if [[ "$TRAVIS_PYTHON_VERSION" == "3.8" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      cd /tmp && iptest --coverage xml && cd -
-    fi
-  - pytest --maxfail=10 IPython
-  # On the latest Python (on Linux) only, make sure that the docs build.
-  - |
-    if [[ "$TRAVIS_PYTHON_VERSION" == "3.8" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      pip install -r docs/requirements.txt
-      python tools/fixup_whats_new_pr.py
-      make -C docs/ html SPHINXOPTS="-W"
-    fi
-
-after_success:
-  - cp /tmp/ipy_coverage.xml ./
-  - cp /tmp/.coverage ./
-  - codecov
-
-matrix:
-  include:
-    - arch: amd64
-      python: "3.7"
-      dist: xenial
-    - arch: amd64
-      python: "3.8"
-      dist: xenial
-    - arch: amd64
-      python: "nightly"
-      dist: xenial
-    - arch: amd64
-      python: "3.9-dev"
-    - os: osx
-      language: generic
-      python: 3.7
-      env: TRAVIS_PYTHON_VERSION=3.7
-  allow_failures:
-    - python: nightly
-
-before_deploy:
-  - rm -rf dist/
-  - python setup.py sdist
-  - python setup.py bdist_wheel
-
-deploy:
-  provider: releases
-  api_key:
-    secure: Y/Ae9tYs5aoBU8bDjN2YrwGG6tCbezj/h3Lcmtx8HQavSbBgXnhnZVRb2snOKD7auqnqjfT/7QMm4ZyKvaOEgyggGktKqEKYHC8KOZ7yp8I5/UMDtk6j9TnXpSqqBxPiud4MDV76SfRYEQiaDoG4tGGvSfPJ9KcNjKrNvSyyxns=
-  file: dist/*
-  file_glob: true
-  cleanup: false
-  on:
-    repo: ipython/ipython
-    all_branches: true  # Backports are released from e.g. 5.x branch
-    tags: true
-    python: 3.6  # Any version should work, but we only need one
-    condition: $TRAVIS_OS_NAME = "linux"

From 199531e8ff3cc55bc8e450d765800dbcf107ca5f Mon Sep 17 00:00:00 2001
From: Peter Corke <peter.i.corke@gmail.com>
Date: Sun, 11 Apr 2021 07:02:47 +1000
Subject: [PATCH 0504/1407] Update formatters.py

Use the float formatter for NumPy's float64 type.
---
 IPython/core/formatters.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/core/formatters.py b/IPython/core/formatters.py
index 4970960ad0b..730b525b5c2 100644
--- a/IPython/core/formatters.py
+++ b/IPython/core/formatters.py
@@ -678,6 +678,8 @@ def _singleton_printers_default(self):
     def _type_printers_default(self):
         d = pretty._type_pprinters.copy()
         d[float] = lambda obj,p,cycle: p.text(self.float_format%obj)
+        if 'numpy' in sys.modules:
+            d[numpy.float64] = lambda obj,p,cycle: p.text(self.float_format%obj)
         return d
 
     @default('deferred_printers')

From d6798bdb2d14c0746cbe3e02bf962fe582492096 Mon Sep 17 00:00:00 2001
From: Peter Corke <peter.i.corke@gmail.com>
Date: Sun, 11 Apr 2021 07:25:11 +1000
Subject: [PATCH 0505/1407] add local numpy import

---
 IPython/core/formatters.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/core/formatters.py b/IPython/core/formatters.py
index 730b525b5c2..33a99f60540 100644
--- a/IPython/core/formatters.py
+++ b/IPython/core/formatters.py
@@ -636,7 +636,6 @@ def _float_precision_changed(self, change):
 
         This parameter can be set via the '%precision' magic.
         """
-
         new = change['new']
         if '%' in new:
             # got explicit format string
@@ -678,7 +677,9 @@ def _singleton_printers_default(self):
     def _type_printers_default(self):
         d = pretty._type_pprinters.copy()
         d[float] = lambda obj,p,cycle: p.text(self.float_format%obj)
+        # if NumPy is used, set precision for its float64 type
         if 'numpy' in sys.modules:
+            import numpy
             d[numpy.float64] = lambda obj,p,cycle: p.text(self.float_format%obj)
         return d
 

From 8c9d5fcb797a7289f2f9f3a74cfde7b2c6bbab06 Mon Sep 17 00:00:00 2001
From: Peter Corke <peter.i.corke@gmail.com>
Date: Sun, 11 Apr 2021 07:39:47 +1000
Subject: [PATCH 0506/1407] update formatting as per PR tests

---
 IPython/core/formatters.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IPython/core/formatters.py b/IPython/core/formatters.py
index 33a99f60540..ab8172e82a8 100644
--- a/IPython/core/formatters.py
+++ b/IPython/core/formatters.py
@@ -678,9 +678,10 @@ def _type_printers_default(self):
         d = pretty._type_pprinters.copy()
         d[float] = lambda obj,p,cycle: p.text(self.float_format%obj)
         # if NumPy is used, set precision for its float64 type
-        if 'numpy' in sys.modules:
+        if "numpy" in sys.modules:
             import numpy
-            d[numpy.float64] = lambda obj,p,cycle: p.text(self.float_format%obj)
+
+            d[numpy.float64] = lambda obj, p, cycle: p.text(self.float_format % obj)
         return d
 
     @default('deferred_printers')

From b8ade5cf639f9042411bf47fe86ebf1c6318e239 Mon Sep 17 00:00:00 2001
From: Coco Mishra <kittenishkoko@gmail.com>
Date: Mon, 12 Apr 2021 13:56:49 -0500
Subject: [PATCH 0507/1407] remove link for all pages

---
 docs/source/conf.py                        |   6 +-----
 docs/source/savefig/hist_simple.png        | Bin 0 -> 10974 bytes
 docs/source/savefig/hist_with_text.png     | Bin 0 -> 15978 bytes
 docs/source/savefig/plot_simple.png        | Bin 0 -> 21029 bytes
 docs/source/savefig/plot_simple_python.png | Bin 0 -> 21029 bytes
 5 files changed, 1 insertion(+), 5 deletions(-)
 create mode 100644 docs/source/savefig/hist_simple.png
 create mode 100644 docs/source/savefig/hist_with_text.png
 create mode 100644 docs/source/savefig/plot_simple.png
 create mode 100644 docs/source/savefig/plot_simple_python.png

diff --git a/docs/source/conf.py b/docs/source/conf.py
index e50e50c50a4..73f7f137312 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -38,11 +38,7 @@
     html_theme = "sphinx_rtd_theme"
     html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
-html_context = {
-    "display_github": False,  # Add 'Edit on Github' link instead of 'View page source'
-    "last_updated": True,
-    "commit": False,
-}
+html_show_sourcelink = False
 
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
diff --git a/docs/source/savefig/hist_simple.png b/docs/source/savefig/hist_simple.png
new file mode 100644
index 0000000000000000000000000000000000000000..59936ac08605a292bfe6fe8ca34adb78f7d851fd
GIT binary patch
literal 10974
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
TQV;YNf+#6mlh3$leE<IdEg8n;

literal 0
HcmV?d00001

diff --git a/docs/source/savefig/hist_with_text.png b/docs/source/savefig/hist_with_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..ade1b6925afce04506f3f89dd87ace68c66467e6
GIT binary patch
literal 15978
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
Yoz2g$juMatcZ1>1tDMU|V{-d{00MO86951J

literal 0
HcmV?d00001

diff --git a/docs/source/savefig/plot_simple.png b/docs/source/savefig/plot_simple.png
new file mode 100644
index 0000000000000000000000000000000000000000..5dd9465b4841d392e4e87a91992194c421cd2e46
GIT binary patch
literal 21029
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

literal 0
HcmV?d00001

diff --git a/docs/source/savefig/plot_simple_python.png b/docs/source/savefig/plot_simple_python.png
new file mode 100644
index 0000000000000000000000000000000000000000..5dd9465b4841d392e4e87a91992194c421cd2e46
GIT binary patch
literal 21029
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

literal 0
HcmV?d00001


From 19325e68936c33dc20557a8ad2afadfefd1496ea Mon Sep 17 00:00:00 2001
From: Carol Willing <carolcode@willingconsulting.com>
Date: Tue, 13 Apr 2021 21:42:24 -0700
Subject: [PATCH 0508/1407] Update README badge to GH-Actions

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 788629bf58a..2db6b81ffc1 100644
--- a/README.rst
+++ b/README.rst
@@ -4,8 +4,8 @@
 .. image:: https://img.shields.io/pypi/v/IPython.svg
     :target: https://pypi.python.org/pypi/ipython
 
-.. image:: https://img.shields.io/travis/ipython/ipython.svg
-    :target: https://travis-ci.org/ipython/ipython
+.. image:: https://github.com/ipython/ipython/actions/workflows/test.yml/badge.svg
+    :target: https://github.com/ipython/ipython/actions/workflows/test.yml)
 
 .. image:: https://www.codetriage.com/ipython/ipython/badges/users.svg
     :target: https://www.codetriage.com/ipython/ipython/

From 4bdae11c02110448f10c62ce2fa47024a3a20100 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 14 Apr 2021 16:38:09 -0700
Subject: [PATCH 0509/1407] Update Issues templates

---
 .github/ISSUE_TEMPLATE.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 49ccc267998..2a6d4877c68 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -13,7 +13,4 @@ If it's a generic Python/Jupyter question, try other forums or discourse.jupyter
 
 If you are unsure, it's ok to post here, though, there are few maintainer so you might not get a fast response. 
 
-Ability of maintainers to spend time and resources on project like IPython is heavily influenced by US politics, and the current government policies have been harmful to the IPython Maintainers and Community. 
-
-If you are on the fence on who to vote for or wether to vote, please cast your vote in for the democrat party in the US.
 -->

From a7d4c74a81181b880932d9b34a5934f9c34a869e Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@gmail.com>
Date: Fri, 12 Feb 2021 15:57:08 +0100
Subject: [PATCH 0510/1407] Use matplotlib-inline instead of ipykernel.pylab

---
 IPython/core/display.py               |  49 ++++++----
 IPython/core/interactiveshell.py      |   3 +-
 IPython/core/pylabtools.py            | 133 ++++++++++----------------
 IPython/core/tests/test_display.py    |   2 +-
 IPython/core/tests/test_pylabtools.py |   9 +-
 setup.py                              |  19 ++--
 6 files changed, 102 insertions(+), 113 deletions(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index bd098e78f99..2149e60e550 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -371,7 +371,7 @@ def reload(self):
                     with gzip.open(BytesIO(data), 'rt', encoding=encoding) as fp:
                         encoding = None
                         data = fp.read()
-                    
+
             # decode data, if an encoding was specified
             # We only touch self.data once since
             # subclasses such as SVG have @data.setter methods
@@ -1155,7 +1155,10 @@ def reload(self):
 
 @skip_doctest
 def set_matplotlib_formats(*formats, **kwargs):
-    """Select figure formats for the inline backend. Optionally pass quality for JPEG.
+    """
+    DEPRECATED
+
+    Select figure formats for the inline backend. Optionally pass quality for JPEG.
 
     For example, this enables PNG and JPEG output with a JPEG quality of 90%::
 
@@ -1173,20 +1176,25 @@ def set_matplotlib_formats(*formats, **kwargs):
     **kwargs
         Keyword args will be relayed to ``figure.canvas.print_figure``.
     """
-    from IPython.core.interactiveshell import InteractiveShell
-    from IPython.core.pylabtools import select_figure_formats
-    # build kwargs, starting with InlineBackend config
-    kw = {}
-    from ipykernel.pylab.config import InlineBackend
-    cfg = InlineBackend.instance()
-    kw.update(cfg.print_figure_kwargs)
-    kw.update(**kwargs)
-    shell = InteractiveShell.instance()
-    select_figure_formats(shell, formats, **kw)
+    warnings.warn(
+        "`set_matplotlib_formats` is deprecated, directly use "
+        "`matplotlib_inline.backend_inline.set_matplotlib_formats()`",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+
+    from matplotlib_inline.backend_inline import (
+        set_matplotlib_formats as set_matplotlib_formats_orig,
+    )
+
+    set_matplotlib_formats_orig(*formats, **kwargs)
 
 @skip_doctest
 def set_matplotlib_close(close=True):
-    """Set whether the inline backend closes all figures automatically or not.
+    """
+    DEPRECATED
+
+    Set whether the inline backend closes all figures automatically or not.
 
     By default, the inline backend used in the IPython Notebook will close all
     matplotlib figures automatically after each cell is run. This means that
@@ -1206,6 +1214,15 @@ def set_matplotlib_close(close=True):
         Should all matplotlib figures be automatically closed after each cell is
         run?
     """
-    from ipykernel.pylab.config import InlineBackend
-    cfg = InlineBackend.instance()
-    cfg.close_figures = close
+    warnings.warn(
+        "`set_matplotlib_close` is deprecated, directly use "
+        "`matplotlib_inline.backend_inline.set_matplotlib_close()`",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+
+    from matplotlib_inline.backend_inline import (
+        set_matplotlib_close as set_matplotlib_close_orig,
+    )
+
+    set_matplotlib_close_orig(close)
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 589a3be96cc..26d070026ef 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3514,6 +3514,7 @@ def enable_matplotlib(self, gui=None):
           display figures inline.
         """
         from IPython.core import pylabtools as pt
+        from matplotlib_inline.backend_inline import configure_inline_support
         gui, backend = pt.find_gui_and_backend(gui, self.pylab_gui_select)
 
         if gui != 'inline':
@@ -3527,7 +3528,7 @@ def enable_matplotlib(self, gui=None):
                 gui, backend = pt.find_gui_and_backend(self.pylab_gui_select)
 
         pt.activate_matplotlib(backend)
-        pt.configure_inline_support(self, backend)
+        configure_inline_support(self, backend)
 
         # Now we must activate the gui pylab wants to use, and fix %run to take
         # plot updates into account
diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index 3af899e46da..2a2087052c9 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -5,30 +5,32 @@
 # Distributed under the terms of the Modified BSD License.
 
 from io import BytesIO
+import warnings
 
 from IPython.core.display import _pngxy
 from IPython.utils.decorators import flag_calls
 
 # If user specifies a GUI, that dictates the backend, otherwise we read the
 # user's mpl default from the mpl rc structure
-backends = {'tk': 'TkAgg',
-            'gtk': 'GTKAgg',
-            'gtk3': 'GTK3Agg',
-            'wx': 'WXAgg',
-            'qt4': 'Qt4Agg',
-            'qt5': 'Qt5Agg',
-            'qt': 'Qt5Agg',
-            'osx': 'MacOSX',
-            'nbagg': 'nbAgg',
-            'notebook': 'nbAgg',
-            'agg': 'agg',
-            'svg': 'svg',
-            'pdf': 'pdf',
-            'ps': 'ps',
-            'inline': 'module://ipykernel.pylab.backend_inline',
-            'ipympl': 'module://ipympl.backend_nbagg',
-            'widget': 'module://ipympl.backend_nbagg',
-            }
+backends = {
+    "tk": "TkAgg",
+    "gtk": "GTKAgg",
+    "gtk3": "GTK3Agg",
+    "wx": "WXAgg",
+    "qt4": "Qt4Agg",
+    "qt5": "Qt5Agg",
+    "qt": "Qt5Agg",
+    "osx": "MacOSX",
+    "nbagg": "nbAgg",
+    "notebook": "nbAgg",
+    "agg": "agg",
+    "svg": "svg",
+    "pdf": "pdf",
+    "ps": "ps",
+    "inline": "module://matplotlib_inline.backend_inline",
+    "ipympl": "module://ipympl.backend_nbagg",
+    "widget": "module://ipympl.backend_nbagg",
+}
 
 # We also need a reverse backends2guis mapping that will properly choose which
 # GUI support to activate based on the desired matplotlib backend.  For the
@@ -44,12 +46,12 @@
 backend2gui['WX'] = 'wx'
 backend2gui['CocoaAgg'] = 'osx'
 # And some backends that don't need GUI integration
-del backend2gui['nbAgg']
-del backend2gui['agg']
-del backend2gui['svg']
-del backend2gui['pdf']
-del backend2gui['ps']
-del backend2gui['module://ipykernel.pylab.backend_inline']
+del backend2gui["nbAgg"]
+del backend2gui["agg"]
+del backend2gui["svg"]
+del backend2gui["pdf"]
+del backend2gui["ps"]
+del backend2gui["module://matplotlib_inline.backend_inline"]
 
 #-----------------------------------------------------------------------------
 # Matplotlib utilities
@@ -96,10 +98,10 @@ def figsize(sizex, sizey):
 
 def print_figure(fig, fmt='png', bbox_inches='tight', **kwargs):
     """Print a figure to an image, and return the resulting file data
-    
+
     Returned data will be bytes unless ``fmt='svg'``,
     in which case it will be unicode.
-    
+
     Any keyword args are passed to fig.canvas.print_figure,
     such as ``quality`` or ``bbox_inches``.
     """
@@ -112,7 +114,7 @@ def print_figure(fig, fmt='png', bbox_inches='tight', **kwargs):
     if fmt == 'retina':
         dpi = dpi * 2
         fmt = 'png'
-    
+
     # build keyword args
     kw = {
         "format":fmt,
@@ -162,7 +164,7 @@ def mpl_runner(safe_execfile):
     A function suitable for use as the ``runner`` argument of the %run magic
     function.
     """
-    
+
     def mpl_execfile(fname,*where,**kw):
         """matplotlib-aware wrapper around safe_execfile.
 
@@ -243,7 +245,7 @@ def select_figure_formats(shell, formats, **kwargs):
         bs = "%s" % ','.join([repr(f) for f in bad])
         gs = "%s" % ','.join([repr(f) for f in supported])
         raise ValueError("supported formats are: %s not %s" % (gs, bs))
-    
+
     if 'png' in formats:
         png_formatter.for_type(Figure, lambda fig: print_figure(fig, 'png', **kwargs))
     if 'retina' in formats or 'png2x' in formats:
@@ -274,7 +276,7 @@ def find_gui_and_backend(gui=None, gui_select=None):
     Returns
     -------
     A tuple of (gui, backend) where backend is one of ('TkAgg','GTKAgg',
-    'WXAgg','Qt4Agg','module://ipykernel.pylab.backend_inline','agg').
+    'WXAgg','Qt4Agg','module://matplotlib_inline.backend_inline','agg').
     """
 
     import matplotlib
@@ -308,7 +310,7 @@ def activate_matplotlib(backend):
 
     import matplotlib
     matplotlib.interactive(True)
-    
+
     # Matplotlib had a bug where even switch_backend could not force
     # the rcParam to update. This needs to be set *before* the module
     # magic of switch_backend().
@@ -329,11 +331,11 @@ def activate_matplotlib(backend):
 
 def import_pylab(user_ns, import_all=True):
     """Populate the namespace with pylab-related values.
-    
+
     Imports matplotlib, pylab, numpy, and everything from pylab and numpy.
-    
+
     Also imports a few names from IPython (figsize, display, getfigs)
-    
+
     """
 
     # Import numpy as np/pyplot as plt are conventions we're trying to
@@ -346,12 +348,12 @@ def import_pylab(user_ns, import_all=True):
           "plt = pyplot\n"
           )
     exec(s, user_ns)
-    
+
     if import_all:
         s = ("from matplotlib.pylab import *\n"
              "from numpy import *\n")
         exec(s, user_ns)
-    
+
     # IPython symbols to add
     user_ns['figsize'] = figsize
     from IPython.display import display
@@ -361,7 +363,10 @@ def import_pylab(user_ns, import_all=True):
 
 
 def configure_inline_support(shell, backend):
-    """Configure an IPython shell object for matplotlib use.
+    """
+    DEPRECATED
+
+    Configure an IPython shell object for matplotlib use.
 
     Parameters
     ----------
@@ -369,51 +374,13 @@ def configure_inline_support(shell, backend):
 
     backend : matplotlib backend
     """
-    # If using our svg payload backend, register the post-execution
-    # function that will pick up the results for display.  This can only be
-    # done with access to the real shell object.
+    warnings.warn(
+        "`configure_inline_support` is deprecated, directly use "
+        "`matplotlib_inline.backend_inline.configure_inline_support()`",
+        DeprecationWarning,
+        stacklevel=2,
+    )
 
-    # Note: if we can't load the inline backend, then there's no point
-    # continuing (such as in terminal-only shells in environments without
-    # zeromq available).
-    try:
-        from ipykernel.pylab.backend_inline import InlineBackend
-    except ImportError:
-        return
-    import matplotlib
+    from matplotlib_inline.backend_inline import configure_inline_support_orig
 
-    cfg = InlineBackend.instance(parent=shell)
-    cfg.shell = shell
-    if cfg not in shell.configurables:
-        shell.configurables.append(cfg)
-
-    if backend == backends['inline']:
-        from ipykernel.pylab.backend_inline import flush_figures
-        shell.events.register('post_execute', flush_figures)
-
-        # Save rcParams that will be overwrittern
-        shell._saved_rcParams = {}
-        for k in cfg.rc:
-            shell._saved_rcParams[k] = matplotlib.rcParams[k]
-        # load inline_rc
-        matplotlib.rcParams.update(cfg.rc)
-        new_backend_name = "inline"
-    else:
-        from ipykernel.pylab.backend_inline import flush_figures
-        try:
-            shell.events.unregister('post_execute', flush_figures)
-        except ValueError:
-            pass
-        if hasattr(shell, '_saved_rcParams'):
-            matplotlib.rcParams.update(shell._saved_rcParams)
-            del shell._saved_rcParams
-        new_backend_name = "other"
-
-    # only enable the formats once -> don't change the enabled formats (which the user may
-    # has changed) when getting another "%matplotlib inline" call.
-    # See https://github.com/ipython/ipykernel/issues/29
-    cur_backend = getattr(configure_inline_support, "current_backend", "unset")
-    if new_backend_name != cur_backend:
-        # Setup the default figure format
-        select_figure_formats(shell, cfg.figure_formats, **cfg.print_figure_kwargs)
-        configure_inline_support.current_backend = new_backend_name
+    configure_inline_support_orig(shell, backend)
diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index c5a31d59ea1..f21dfab9990 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -135,7 +135,7 @@ def test_image_filename_defaults():
     nt.assert_is_none(img._repr_jpeg_())
 
 def _get_inline_config():
-    from ipykernel.pylab.config import InlineBackend
+    from matplotlib_inline.config import InlineBackend
     return InlineBackend.instance()
 
 
diff --git a/IPython/core/tests/test_pylabtools.py b/IPython/core/tests/test_pylabtools.py
index 75b103f27a6..ba59254bffe 100644
--- a/IPython/core/tests/test_pylabtools.py
+++ b/IPython/core/tests/test_pylabtools.py
@@ -15,6 +15,7 @@
 import nose.tools as nt
 
 from matplotlib import pyplot as plt
+import matplotlib_inline
 import numpy as np
 
 from IPython.core.getipython import get_ipython
@@ -167,13 +168,15 @@ def act_mpl(backend):
         pt.activate_matplotlib = act_mpl
         self._save_ip = pt.import_pylab
         pt.import_pylab = lambda *a,**kw:None
-        self._save_cis = pt.configure_inline_support
-        pt.configure_inline_support = lambda *a,**kw:None
+        self._save_cis = matplotlib_inline.backend_inline.configure_inline_support
+        matplotlib_inline.backend_inline.configure_inline_support = (
+            lambda *a, **kw: None
+        )
 
     def teardown(self):
         pt.activate_matplotlib = self._save_am
         pt.import_pylab = self._save_ip
-        pt.configure_inline_support = self._save_cis
+        matplotlib_inline.backend_inline.configure_inline_support = self._save_cis
         import matplotlib
         matplotlib.rcParams = self._saved_rcParams
         matplotlib.rcParamsOrig = self._saved_rcParamsOrig
diff --git a/setup.py b/setup.py
index 4c769a14c7f..f7be18e9641 100755
--- a/setup.py
+++ b/setup.py
@@ -191,15 +191,16 @@
 )
 
 install_requires = [
-    'setuptools>=18.5',
-    'jedi>=0.16',
-    'decorator',
-    'pickleshare',
-    'traitlets>=4.2',
-    'prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1',
-    'pygments',
-    'backcall',
-    'stack_data',
+    "setuptools>=18.5",
+    "jedi>=0.16",
+    "decorator",
+    "pickleshare",
+    "traitlets>=4.2",
+    "prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1",
+    "pygments",
+    "backcall",
+    "stack_data",
+    "matplotlib-inline",
 ]
 
 # Platform-specific dependencies:

From 1bc1ac51931020f17f4542e4f5b96c83f9b0d2a3 Mon Sep 17 00:00:00 2001
From: Iwan Briquemont <tracnar@gmail.com>
Date: Fri, 16 Apr 2021 21:18:04 +0200
Subject: [PATCH 0511/1407] Start embedded IPython shell for ipdb interact,
 #12913

---
 IPython/terminal/debugger.py              | 13 +++++++++++++
 docs/source/whatsnew/pr/ipdb-interact.rst |  4 ++++
 2 files changed, 17 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/ipdb-interact.rst

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index dd1ecc1518a..00ff516741a 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -7,6 +7,7 @@
 from IPython.core.completer import IPCompleter
 from .ptutils import IPythonPTCompleter
 from .shortcuts import create_ipython_shortcuts
+from . import embed
 
 from pygments.token import Token
 from prompt_toolkit.shortcuts.prompt import PromptSession
@@ -131,6 +132,18 @@ def in_thread():
         except Exception:
             raise
 
+    def do_interact(self, arg):
+        ipshell = embed.InteractiveShellEmbed(
+            config=self.shell.config,
+            banner1="*interactive*",
+            exit_msg="now exiting InteractiveConsole...",
+        )
+        global_ns = self.curframe.f_globals
+        ipshell(
+            module=sys.modules.get(global_ns["__name__"], None),
+            local_ns=self.curframe_locals,
+        )
+
 
 def set_trace(frame=None):
     """
diff --git a/docs/source/whatsnew/pr/ipdb-interact.rst b/docs/source/whatsnew/pr/ipdb-interact.rst
new file mode 100644
index 00000000000..8783be6da0a
--- /dev/null
+++ b/docs/source/whatsnew/pr/ipdb-interact.rst
@@ -0,0 +1,4 @@
+IPython shell for ipdb interact
+-------------------------------
+
+The ipdb ``interact`` starts an IPython shell instead of Python's built-in ``code.interact()``.

From db8aa2f05ed79c7a177961f6caf6e8011182d3c8 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 16 Apr 2021 17:25:53 -0700
Subject: [PATCH 0512/1407] Update IPython/terminal/debugger.py

Co-authored-by: Blazej Michalik <6691643+MrMino@users.noreply.github.com>
---
 IPython/terminal/debugger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index 00ff516741a..1ea1a862582 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -136,7 +136,7 @@ def do_interact(self, arg):
         ipshell = embed.InteractiveShellEmbed(
             config=self.shell.config,
             banner1="*interactive*",
-            exit_msg="now exiting InteractiveConsole...",
+            exit_msg="*exiting interactive console...*",
         )
         global_ns = self.curframe.f_globals
         ipshell(

From 995d64176916a611334e368fea4913da9a503981 Mon Sep 17 00:00:00 2001
From: Coco Mishra <kittenishkoko@gmail.com>
Date: Mon, 12 Apr 2021 13:56:49 -0500
Subject: [PATCH 0513/1407] remove link for all pages

---
 .gitignore          | 1 +
 docs/source/conf.py | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1fc0e22a320..2718d10b3dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ docs/man/*.gz
 docs/source/api/generated
 docs/source/config/options
 docs/source/config/shortcuts/*.csv
+docs/source/savefig/
 docs/source/interactive/magics-generated.txt
 docs/gh-pages
 jupyter_notebook/notebook/static/mathjax
diff --git a/docs/source/conf.py b/docs/source/conf.py
index e50e50c50a4..73f7f137312 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -38,11 +38,7 @@
     html_theme = "sphinx_rtd_theme"
     html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
-html_context = {
-    "display_github": False,  # Add 'Edit on Github' link instead of 'View page source'
-    "last_updated": True,
-    "commit": False,
-}
+html_show_sourcelink = False
 
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it

From 154c40b9d377013199bf5d1237ab0b1b0b09d257 Mon Sep 17 00:00:00 2001
From: Douglas Blank <doug.blank@gmail.com>
Date: Fri, 19 Feb 2021 11:45:17 -0800
Subject: [PATCH 0514/1407] Added clear kwarg to display()

---
 IPython/core/display_functions.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/IPython/core/display_functions.py b/IPython/core/display_functions.py
index 5b49faaedd9..9f566b435f6 100644
--- a/IPython/core/display_functions.py
+++ b/IPython/core/display_functions.py
@@ -120,6 +120,9 @@ def display(*objs, include=None, exclude=None, metadata=None, transient=None, di
         Set an id for the display.
         This id can be used for updating this display area later via update_display.
         If given as `True`, generate a new `display_id`
+    clear : bool, optional
+        Should the output area be cleared before displaying anything? If True,
+        this will wait for additional output before clearing. [default: False]
     kwargs: additional keyword-args, optional
         Additional keyword-arguments are passed through to the display publisher.
 
@@ -239,7 +242,8 @@ def display(*objs, include=None, exclude=None, metadata=None, transient=None, di
         print(*objs)
         return
 
-    raw = kwargs.pop('raw', False)
+    raw = kwargs.pop("raw", False)
+    clear = kwargs.pop("clear", False)
     if transient is None:
         transient = {}
     if metadata is None:
@@ -263,6 +267,9 @@ def display(*objs, include=None, exclude=None, metadata=None, transient=None, di
     if not raw:
         format = InteractiveShell.instance().display_formatter.format
 
+    if clear:
+        clear_output(wait=True)
+
     for obj in objs:
         if raw:
             publish_display_data(data=obj, metadata=metadata, **kwargs)

From c4fd963f01a7bb69d01903c1db362d548cfde5af Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 16 Apr 2021 17:57:21 -0700
Subject: [PATCH 0515/1407] better doc

---
 IPython/core/display.py    | 17 +++++++++++------
 IPython/core/pylabtools.py |  8 +++++---
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 2149e60e550..435589150f6 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -1156,7 +1156,9 @@ def reload(self):
 @skip_doctest
 def set_matplotlib_formats(*formats, **kwargs):
     """
-    DEPRECATED
+    .. deprecated:: 7.23
+
+       use `matplotlib_inline.backend_inline.set_matplotlib_formats()`
 
     Select figure formats for the inline backend. Optionally pass quality for JPEG.
 
@@ -1177,8 +1179,8 @@ def set_matplotlib_formats(*formats, **kwargs):
         Keyword args will be relayed to ``figure.canvas.print_figure``.
     """
     warnings.warn(
-        "`set_matplotlib_formats` is deprecated, directly use "
-        "`matplotlib_inline.backend_inline.set_matplotlib_formats()`",
+        "`set_matplotlib_formats` is deprecated since IPython 7.23, directly "
+        "use `matplotlib_inline.backend_inline.set_matplotlib_formats()`",
         DeprecationWarning,
         stacklevel=2,
     )
@@ -1192,7 +1194,10 @@ def set_matplotlib_formats(*formats, **kwargs):
 @skip_doctest
 def set_matplotlib_close(close=True):
     """
-    DEPRECATED
+    .. deprecated:: 7.23
+
+        use `matplotlib_inline.backend_inline.set_matplotlib_close()`
+
 
     Set whether the inline backend closes all figures automatically or not.
 
@@ -1215,8 +1220,8 @@ def set_matplotlib_close(close=True):
         run?
     """
     warnings.warn(
-        "`set_matplotlib_close` is deprecated, directly use "
-        "`matplotlib_inline.backend_inline.set_matplotlib_close()`",
+        "`set_matplotlib_close` is deprecated since IPython 7.23, directly "
+        "use `matplotlib_inline.backend_inline.set_matplotlib_close()`",
         DeprecationWarning,
         stacklevel=2,
     )
diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index 2a2087052c9..c71b0cdb679 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -364,7 +364,9 @@ def import_pylab(user_ns, import_all=True):
 
 def configure_inline_support(shell, backend):
     """
-    DEPRECATED
+    .. deprecated: 7.23
+
+        use `matplotlib_inline.backend_inline.configure_inline_support()`
 
     Configure an IPython shell object for matplotlib use.
 
@@ -375,8 +377,8 @@ def configure_inline_support(shell, backend):
     backend : matplotlib backend
     """
     warnings.warn(
-        "`configure_inline_support` is deprecated, directly use "
-        "`matplotlib_inline.backend_inline.configure_inline_support()`",
+        "`configure_inline_support` is deprecated since IPython 7.23, directly "
+        "use `matplotlib_inline.backend_inline.configure_inline_support()`",
         DeprecationWarning,
         stacklevel=2,
     )

From 6a4a375870b11ed0a2604bb24b8d21cb42e005b0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 16 Apr 2021 18:20:19 -0700
Subject: [PATCH 0516/1407] Minor syntax cleanup and silification.

Remove a syntax warning; and use explicit kwargs instead of kwargs.pop.
---
 IPython/core/display_functions.py | 14 +++++++++++---
 IPython/core/magic.py             |  2 +-
 IPython/terminal/embed.py         |  4 +---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/IPython/core/display_functions.py b/IPython/core/display_functions.py
index 9f566b435f6..ab5777a716f 100644
--- a/IPython/core/display_functions.py
+++ b/IPython/core/display_functions.py
@@ -85,7 +85,17 @@ def _new_id():
     return b2a_hex(os.urandom(16)).decode('ascii')
 
 
-def display(*objs, include=None, exclude=None, metadata=None, transient=None, display_id=None, **kwargs):
+def display(
+    *objs,
+    include=None,
+    exclude=None,
+    metadata=None,
+    transient=None,
+    display_id=None,
+    raw=False,
+    clear=False,
+    **kwargs
+):
     """Display a Python object in all frontends.
 
     By default all representations will be computed and sent to the frontends.
@@ -242,8 +252,6 @@ def display(*objs, include=None, exclude=None, metadata=None, transient=None, di
         print(*objs)
         return
 
-    raw = kwargs.pop("raw", False)
-    clear = kwargs.pop("clear", False)
     if transient is None:
         transient = {}
     if metadata is None:
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 03b76cb5c2e..6dc0ad34dde 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -636,7 +636,7 @@ def parse_options(self, arg_str, opt_str, *long_opts, **kw):
                     '%s ( allowed: "%s" %s)' % (e.msg, opt_str, " ".join(long_opts))
                 ) from e
             for o, a in opts:
-                if mode is "string" and preserve_non_opts:
+                if mode == "string" and preserve_non_opts:
                     # remove option-parts from the original args-string and preserve remaining-part.
                     # This relies on the arg_split(...) and getopt(...)'s impl spec, that the parsed options are
                     # returned in the original order.
diff --git a/IPython/terminal/embed.py b/IPython/terminal/embed.py
index 188844faddb..6c63d33b4c3 100644
--- a/IPython/terminal/embed.py
+++ b/IPython/terminal/embed.py
@@ -334,7 +334,7 @@ def mainloop(self, local_ns=None, module=None, stack_depth=0,
         self.compile.flags = orig_compile_flags
 
 
-def embed(**kwargs):
+def embed(*, header="", compile_flags=None, **kwargs):
     """Call this to embed IPython at the current point in your program.
 
     The first invocation of this will create an :class:`InteractiveShellEmbed`
@@ -360,8 +360,6 @@ def embed(**kwargs):
     config argument.
     """
     config = kwargs.get('config')
-    header = kwargs.pop('header', u'')
-    compile_flags = kwargs.pop('compile_flags', None)
     if config is None:
         config = load_default_config()
         config.InteractiveShellEmbed = config.TerminalInteractiveShell

From 619afecf28459c02bda1f19d11b5ca17e6879cbf Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 16 Apr 2021 18:27:44 -0700
Subject: [PATCH 0517/1407] Fix docstring syntax to be properly parsed by
 numpydoc.

---
 IPython/core/interactiveshell.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 47f1c602fed..d2fbb2351c7 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1896,9 +1896,14 @@ def my_handler(self, etype, value, tb, tb_offset=None):
             exception or returns an invalid result, it will be immediately
             disabled.
 
+        Notes
+        -----
+
         WARNING: by putting in your own exception handler into IPython's main
         execution loop, you run a very good chance of nasty crashes.  This
-        facility should only be used if you really know what you are doing."""
+        facility should only be used if you really know what you are doing.
+        """
+
         if not isinstance(exc_tuple, tuple):
             raise TypeError("The custom exceptions must be given as a tuple.")
 
@@ -2216,12 +2221,15 @@ def complete(self, text, line=None, cursor_pos=None):
 
         Returns
         -------
-          text : string
-            The actual text that was completed.
+        text : string
+          The actual text that was completed.
 
-          matches : list
-            A sorted list with all possible completions.
+        matches : list
+          A sorted list with all possible completions.
 
+
+        Notes
+        -----
         The optional arguments allow the completion to take more context into
         account, and are part of the low-level completion API.
 
@@ -2230,7 +2238,8 @@ def complete(self, text, line=None, cursor_pos=None):
         exposing it as a method, it can be used by other non-readline
         environments (such as GUIs) for text completion.
 
-        Simple usage example:
+        Examples
+        --------
 
         In [1]: x = 'hello'
 

From 80ca5372f6d4c66d9b114f7002946a1d32fa69dc Mon Sep 17 00:00:00 2001
From: Coco Mishra <kittenishkoko@gmail.com>
Date: Fri, 16 Apr 2021 20:52:11 -0500
Subject: [PATCH 0518/1407] trying something else

---
 docs/source/_templates/breadcrumbs.html | 7 +++++++
 docs/source/conf.py                     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 docs/source/_templates/breadcrumbs.html

diff --git a/docs/source/_templates/breadcrumbs.html b/docs/source/_templates/breadcrumbs.html
new file mode 100644
index 00000000000..804ad69e671
--- /dev/null
+++ b/docs/source/_templates/breadcrumbs.html
@@ -0,0 +1,7 @@
+{%- extends "sphinx_rtd_theme/breadcrumbs.html" %}
+
+{% block breadcrumbs_aside %}
+{% if not meta or meta.get('github_url') != 'hide' %}
+{{ super() }}
+{% endif %}
+{% endblock %}
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 73f7f137312..30d05a1c652 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -38,7 +38,7 @@
     html_theme = "sphinx_rtd_theme"
     html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
-html_show_sourcelink = False
+# html_show_sourcelink = False
 
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it

From 382661c3d811a6be1821ab70a4e9bf738fc82e36 Mon Sep 17 00:00:00 2001
From: Coco Mishra <kittenishkoko@gmail.com>
Date: Fri, 16 Apr 2021 21:10:12 -0500
Subject: [PATCH 0519/1407] delete savefig files again

---
 .gitignore                                 |   2 +-
 docs/source/savefig/hist_simple.png        | Bin 10974 -> 0 bytes
 docs/source/savefig/hist_with_text.png     | Bin 15978 -> 0 bytes
 docs/source/savefig/plot_simple.png        | Bin 21029 -> 0 bytes
 docs/source/savefig/plot_simple_python.png | Bin 21029 -> 0 bytes
 5 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 docs/source/savefig/hist_simple.png
 delete mode 100644 docs/source/savefig/hist_with_text.png
 delete mode 100644 docs/source/savefig/plot_simple.png
 delete mode 100644 docs/source/savefig/plot_simple_python.png

diff --git a/.gitignore b/.gitignore
index 2718d10b3dd..0a2a7ef8cb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ docs/man/*.gz
 docs/source/api/generated
 docs/source/config/options
 docs/source/config/shortcuts/*.csv
-docs/source/savefig/
+docs/source/savefig
 docs/source/interactive/magics-generated.txt
 docs/gh-pages
 jupyter_notebook/notebook/static/mathjax
diff --git a/docs/source/savefig/hist_simple.png b/docs/source/savefig/hist_simple.png
deleted file mode 100644
index 59936ac08605a292bfe6fe8ca34adb78f7d851fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10974
zcmeHtc|4VC+xBe;m7zJwR7g}P8A2!|Ny?m=HkoIOXrV!=Ep|&NnaMmPEiwy{IrBV)
z%*#A3Yx&N5xA%Vb{=Gf#v!C~Qf8Y1d_xnk857&L&*L9x9c^t=iKe>KQkzohR4g^6M
zlrGDwAqb@pf=~?7(ZCUrrrr_w>zs>%j*Ggzxr>{LlNq97;^JUq?_y(V%84;^a<;U$
z6BaltaQY;tg^P=WvxK0a?H?Bi*gM@8>}q9-hC#MFT)ydyAWSCcABrTIL`wwWS5}h0
zpy3`q)93A=(ShCC>bP?83?=4?P;>0j-TrK{6edhE6_pu3KfAwXQq}6D%e(KV(0gTc
z$D*nCn$gjSJ<|_gfBDkXA(732sPM^=<<-6I#{SPNXfD`(Vi5`uxfjD_lC|e_xxn%A
z9ZEzJ)dzE5Ax_NdB;k&<IYDQ&Kih4fs+6ES)_Z<x$K!Gn3Ir)-R>B;Fx%#XfMJN%3
z`4K{gAjZs;oN&m5&IissI`aQd{3lDIHZ4$EEg>n{*4i3RK}GX<)TzsW5kWpM3_0i=
z6wtqp!Q|j@b*wwNkbd8Ugkz&4Bb^2iiR1SwD=#syNwgBq*jzvgcT&;N|Kc(#_)E`B
zP96(_I7r_A813Zbl(y=)cQ-OyhPO1z?NLFfky4YZ#n{^Cdk0>N+NybZ74I*+D;<TI
z?YE7HI%D=!UqHJe$D%3L&-(1yvli`XH?OFwYMYxUXr<}ItgNiKyKO@dP6F#WN^zI*
z>qVOjwH|}_X!kKbUjFvlelj^Rvbl=GJI&r}@ii`f+s*^yZ$b^<u?Iy)+L3yjnqqEd
zn^#XQPkxD!lW_j#|E>OYqBM46d`xERPA`!PL3XKTIEb_66!=+u{`~pNiOj;-^~Evk
zniqT?b02B(UZf4X9zuVSo~qRR!?3Wh7s0_iO5KHbvb8ewle2F(@{5Qp=R^uK)7K2o
zAKyhMw2dC|k((pWeBm3Ma&>XBAg;_<+1ds-j%5ef_vEOo_IqYl`X7p0Sa2e(H+ttZ
z!17y6cV=m=1;xk49^Llf0-KDNRK_yQtKv0Rq7TnRXV$HS^}G2l6S$4l+02v_{?XA<
zC0y|qY1X>)tw~KoLwi%4BHn5AN?S+Alvv67Gw$lyRmF!gO6|o1vn3PGk1ihZy?Df0
zhME3Sfga?|>9I~k+-c-;TU#67F1qoK5;FeEl`9$s2I+-`Qm6Dke6bS4OzSWlIwP;1
zc&)8Eh*!k4!jE0%wt|9hdxpW`XA6*>Hp88KgRQL^ecoFn78$QXet!P5cD>@Hh0v1e
z9NP;Q?r~34JlTum&g@A2_U)UWXva#C;jBtjc449ZJ=xN3mcxhRn)X8`e{ixvrc<)B
zg-tzHJX~E}aq&mw9$m&kWCXBDCWM3>NUbl%5=Srv>6Rme_&0BEDmT7e;eaUPSG-0M
z8X9U1OIcH2-{!mXpvKLc$yBtA7PI|D5_cBj`A?h>asGCdf#vLF#X$D9h0)sO@wh;K
z85twoS=;Wju!fd|-aOr0yNFG%60LOIH_gpzZ{ED=>Xn3Pbvpfo*jQRN72a8N`Br!6
zjuiXo*qAkpys?s7k`D1-1ly=v;#H)prxzR)6!-P3X}T`H#^bJ&(>u&e_nS{YAFLf)
zOg1X<;^*Ugq9e8og7*eborDj@nC%FHgg;)LrOu~?qe$-KKjRwf`jK78cw4)B{xt1$
zG8JNXAI`ePS$9$)w8lG_0TqR)W#O*!T?lLfy&R+!B1BIC1O0yDEj_(YMMt07skD09
zQe*%BHwX#Hf*`DB&#DMJkim@8lz#`gb!cc1yGJ}m2={To_{$H^BbQ9Rzi|M)&u@^?
zYnKZ@zr#ieWW*I^Wf6-noXfKVMxQ=?va+)a_;5*1?tyuI*qfy#7c+Bnt4~k&TiM$O
zx@p6*eQkJ7;V}Ls#$$anR8vncHBfrva-a<PL!`$fA7q_A?)}|$r<vY7b^8)hPD*Mj
zij0X-Ufmvd6%`+&W9H<DvPrmHwl7{!$g%57X-n1aY2!h|*wMFq=xv{ZyxgTrj|}gO
z?mxd+C(I({{uZKexlXw8GESN}E&PoAysn6dNSM@}cYu58ypiq~Ra8`JYHD!Yw*7@S
zPiSYfc4glV4h!?pYdl0xGdl0SkB%B*|5m#g;+9-MB(_uA^&PWn<oMuv7;!8o=E^A|
znH_*{Gd;Pfc)X@`lqw#N&%e9=ZpY4@>7sF$o~hZ{Wms8RaVx=NStK!O`^ntNNlBMK
z8h>F?fY7<D5kT5EmvyUZWO3bPqL~L>Momr4n%Y`*1A_=Pb#)Pk!BW4Kn>TMR5J@=h
zk^zq0<cx?C48i<j%rEeR=b)#FYds7Lu;w^TH~9HEm!`IMB9~%-#r)S#5cy58cq}br
zX-P@HR1Ih4golT}l!oM$Jt;1VBqStEl8Lh&YxBdJH*Ul@4p&ZumTbN$G|cSo?sg$>
zuKTUj*Viw26rmvES)O=5bH>QJB?4e`8zqIcwT+FxT_U=rrCAhjQyUtt0mMDykTJw=
zEH#ly#B}H7<z*`ii(eYYg1Fc3O0!8~uAVw|O6xV2xKcfXIUy)Go6z_?B*gsGd1qUI
zS_c-zekvV9!;C}1=Eudvw9)!!X7+}WRXn=La}|)?0%io8sSf)KAs8ZHz#r9^2-v8M
zOHg^80Ki!vA*nspo*pzX+mWJ~s-df!^8WqV*PgUcUi2V>;o)Io_K^+Y=ePo^;x;$$
z&h!;%50F=Kd6Y7XH&SpooQA%B+V$gT4JaaSOtlXO1qI=)I|NP{7V5ypk~Wsrm6V<s
zdQ9*X<ipnO65F257|o`mNH_k*?zW0dI|a4>C!!l=9~C5<PtSK`@aLMPp!O*^P|Ih8
zjE@3o@(9d`@%J1<IFG%ggi<a<&*g*cvhGt66VBgWdI_NAEmcb&VpFkC2nPA*ENczU
zFVURbPsJGkgN8rLbfNN*to#=@{TrO^<-UTQ2+~`@q8du_Iq!;G7Kf=dG>hz`KnTq0
zrLgV)o7~UwCj=t&3)CwS<5C30jFsuGl+4UP3t_XGeR=vBezr}q3cGDtSXj<lx1W5I
zn0P{1Sp9@n+I3G)PpJYRr@P$vFbBWvg@Vd|>QoyH)Yjjh5w$tO8zyQSCQVvWU!Lk{
zw8}O9NLjShtlaM9;gP@W{2fwwphC($W}K*dC5*<$#?nMw)Yj&h;|vqziPX6>2%#&R
z*VG##tER3_!`3#P9lLa6${j{1G_=p{a9{0nTb@XanuLO+uB8>ies}HyX;_9FhmsQ!
z>-OW2_z758u(v-0mnhglO^J*5_xJZ3?#Z!jfqPO<->OW4qU=pxj7oR@4JF>adzW@g
zK|x^$%>xOqP50c!y*qsO(bI5=BIBCv?smOM^iIV9#4s~ETfH{qR7*LNOd1TMQ&sZ!
zD9P+f9?*sNP$!v}sSyt!AKGYIRt`j2S$VmdH)`CiglJGP4+ULUCXh{1OYRYUQ){xi
z>%xfAGv?E=ijA6(rSIOILHP_nFK^;)Ur681iYE0^<&cw283qMQA89!(0OXCja-ySU
zaV}pgwkzQ}rZk<Mo#kI!6U7Sbg-)GPvCEY-{hs$Ur4Hh0Jjx+SDJfTGOSXz1F>!d+
zR<*XZDd8T`A3CZ8+)Dy8{Zdy~H%%0{Tu{%9mZ72H)k(;oaR%0N+w>vTYih2{bY{r`
z6@E+TT6CA1?8(i%7Achs$Lqt-sXw4$Xhu02RG0G`<8d{OjiKBsuSHev+_@7b>6X!+
zuE$$4kg1ufmHhs_hNYz?1_Qg#nE-6}gJsJxz&n*!XB1!|vT}0!J(O`T!opI3f2g)3
zsI(;Ah+8V>AYX^-*PZ8_==yAA<foZ#ymEDQHB5Y?poAz{|5{AYv`-c?T7Km7Zg|_x
z;4x<>Cm?*-+9~?OqE|~uGxl+s2jBuO@iPdeLv%)MaN71xby}qK)vwt$ehx}900Mx9
zabV9n&CcRcO2qX3ZW!}-DpC&FFTPFvD-!$g&xe1&Q2r@(`Oi*VecHDTxh!ifg@H=H
zwgUj;vWo%LdKiiy<08Mo-JhA#|MYRgpAj7>SWouyT9x`xKvuR+cV%lD8F4gyYks4Q
z0zmYI2dyRE-un+8OwG$X7pw9^LUQ|eLh?30Ul)j{#ND;GD>FTbwV{I6-R~_yGT^&U
z8WrnHx)EA?>`T%oC#@hoCm`2z8r(oufJCygwr+`$d%Oe^$O-^Lx5xv}W&m*HcUW7T
zm9fX5qEEteCGCu`uqJSOMGmaSJz3cYv`ku1*dp(IJEYWnI|`csahaNsa4CpawVlvc
zuw1cMH7Pk+2}(XL9s<XDv?drG1h|0xdf`Xo>+FGwFbZT(0+!kXFT!4MqBKHh@7n^(
zQmsO7Nf+w3sj`DLKi`Bh$(@{&qZKM>q-A0f(`Me9bOU(0ri#il?qqn}t*QWgSrqsF
z{rmZt=_i2$IHs{f$QJ{19JF)AV63{{nR%=YJr*&qV^+cq%xYU%rO+_4GB=5yIHBxS
zGGOJ5T`RzlyYmPS|DkSDfr%iF!)v=sfy-kTs(HJMv7U8Nsj;ya*#oP(L6n-3!{L&q
zZ{x^^pQ`tudBSmb?%pFtHY>JOk0NwELHTiYi;0QVPA%)&=6mt4b(8U;2En1BCw9^4
z=-s+?Yo8~;#x4#h=^&E<a&Bm92KRe!VHr52rM_;$o3tgWa?A{r3`l4h8D&0tL<8(Y
z3D-E*0yL|&x!Dxom1`db6k=gvAs^ch93iid;Ku+2-jekWld+{`GO!H%ttv(aW}(vj
z+l|BXN%jN93+_^3GTy~N6<<7mek8Xi{f%;H&Df&l!bmkP-m)cuPf$?Rd90x=-*swa
zm58@$;|~rAfl#b(Ab?J&c)>+A2sDLTNj>4}6Y*lR+5_iTd!2Fd+D2GSB_$<(0RgS!
z`_yjScy8!Ta!s}Uk%(zh7A)GAX$Py<dGts-#rvI8bQIcIjM3R|89C{zfQkasfQr?)
z`=1Gu@98%D*%hJa^y4wwquwE-9rBc74+~I`zg^FP<;=C|tTG{c7{A|ULcI&QTAn0e
zEOqI>fAIfhAVNH1L?U}E_WEJj{s2nAR(2`(>#EZ0@$a&;N1gJP8YE}s!@UW4V<S#^
zM{_1x5*6Q{b0dU*t9!)-dwh?I)(Ti>zWcl>t0%?MMQbTBJH+Q9;7@0FcM1?@%i+pr
zVz$EA4VQ>>&XwKdsS@&uubbiLoLx5896=MP7GP$YKR%$vI}DZSgo3qWED0=E{8lA>
z{mawCCwf3ngDrybBrtieJpj%V$0W0PeebcWzi``jzP%uPyP;LkYksHM?c0h)<^ccw
zWzV^Ma)(RrQK6s*WFHSR!_I#?*q#>_#=^iV{$+<ZPD4j0DL$T??VQs{LI=I?Mc@#-
zQGw9H{Sy){jm;+mIgul-&UVObEy|<<^a-2ST?Z<JdKN&dgukBV<KwIO{P`Eux^O+g
z&p$Hno_30tmp6d~VdA$9WdA@-cB8a4NeWB~RFzlw?UryD^hvlD(LFpB5*nJCmR8rz
zMDyUGEP@P*Z$E?-<j)opU1p0`CxMxTNw}tf#(-*mwEKN-?o@A{vsjV+^?WBI6STtD
zZbNR56V$(^G0=%$ym*bm&2?kR5`9OOGe7xpSC1`DY_2b+q^IM%3%AI`$?0hg@H!04
z0CX#SxfBsW!@{J!yw`MyiPs|3Kti24a|RMN26%kRhYvc2ncBRnk*zxg3!{m%B}Txo
zaPa`Y)<F7n-x}W&weL?u(Z3qU<FV3pdz~6c_+|G1R*Fq9E|$K?F-^ogX2)>{2M447
zXr63K4Gs@ai&G4olpI(OD4u_2kBSu3jUkVDlX*=yFhKHHM66!G(xki+zCHO|k-ez|
zqNMvTnpIp=i1|g;@D0vgsD)R+I+)tmK+?UtNJ}`dij+~fZ(+viIAQHQ0{-k&{D93X
z3Q#j}UeQ_EhWJ;Ycl<X3;xBgtA|OpIuC~=86rPjFTre|=B!6`^{-?G2?`1uZcUWm-
zYpFigofRdF$nJkNgD4PB71|xDG>gf`znYTnbAuPoua5+Q85dGJ+AKL+xYtpdmC<^6
zvJDNKjg^_yva*Y$`9N=f3ui*_x%yYaigvkrU{|$5Jh_5e7GHrFDrJYVlAfN<B4!sZ
zYS-I2v+g?8K7sErYyr>G704Ut2vrCh)C+7g2Q3No`~ylF3<@w4gC8I0esC};%!j=)
z{(}KH<msoRq%;FX;W0Qwss*zUl3k88t|)`!24ZPuW@ZW00gboi$1<B2fRS#@l{1N$
zlu;`+N1pdQ3l>_0G*-8(t1EZ8_s{kJ7>O!2p<vscd;LCq#ubNV2N>BXHu)j$(P|AP
z-?a`(7Z7kDEx7m};R8281S)BTdKs3kVs=#-2dd*}z-=?Ln`2<e0cqiCNQ{p^&c#)3
z)e-@^`1<jmW@sOLv<QY;3F23bl35wp0~E&gkf5MjZc6ahZYPH*qdTU8xkbdp6j|-<
z>~b3J6dB^*zn2fUx3}-ea~?|*?SoRO&AIDsPGx1~ac!X4yF9laL>@D72!IeH5m)u9
zz`hP(J$E#!k@r{X?@cZQUXU(|N&_&<HLqWHXt7QN<eb4M+Q37v4S)9hVcx%fooZGa
zGI3jm_=??qkOKIDz6@zXH8>)|7OUpIG~N^jaCqRPPBhT0DX=GX-~IF?61&pXL#7t`
zGBuxUgp{g4$?#fgQuLV4s!Ah)=uuJw4*+$Z4jQ^&fIxu_k7<aK$y8*&Bk#E~-2`R*
z)_HSCdvq`~?E#8`hE72U{p@K3v;A5>KZSHZaeeqD6>PagV>a2}wvPJCHWMbqfp!l;
zjuWn1vjPJB2f6=28iCLFrN_mf*;k|)L2gw3oB7T=nXd(paq~gwmM~!T$-Y2&!^$Kf
zl(m?G){l?yUm?JOi4%!lo$xT?T&1SG@#zN-^n@WADzNuu1JS{XI0pQv<oEwOZUL~1
zuTOlf;a-Gd*W0~6_fR4>rT@a!*dvN$+|0ft5PHJ&FhH#<`9~U{tMVz(u&-PuRMFhn
z#n%I^fW~PvAao;K?ba7YQQ_9_MYIL;EETx7stoD<vo^G(C|=B@dWpjwMGdfdS<Yzh
ztyOPrVDIeSn~qA&A*b}tdMsJ6N#E50_8#Dt3>)Sc^o7gEdvllr!YrLgC{T6&R(AvR
z$6v@e<{xC-0E8S;p->ip9N4$d0+4{^oKrjiOB|G}Nx`iJK~$1|hSDq|q6ui_?|v0b
zhE1<6mCQrn3GDDqBN+=Zr=lGJ(_<!7gZ_tv)1np^7a>ccP0AllXqRjR1NimCS!-!%
zSODK{;@^$zQt89uj}GKAxSWVd^vM)+7?i~hA0GGuifUxpqpiI?VR5Wc@x7&;9bqN%
zqcymZ`{}6D(zCKoS84)c$Q!|IF@Tv05mI;5P}cho(v6zHxcH3?50SHHKaVZ;EwO-_
z29Nk>?P`a7!X++{?Au_+$N+!ML8{WpFvnzAalzuXSX@xha?vbS6$B1EUi;?FS5Umc
ze8sy=r~!qSrl3cVJ%(j8r7el7Q=S9F$l|rHI~mxebONOo{1`c;(|~9x;|#IOnmjx_
z$x!WMu3rYI_8={H*k(XqjB`bQ$U)r3ZTGePf3kLG1ZayG)JuIxYrE+3KZ1W3h)^O9
z<$|Wv7iDo5&^m*Z?nhnxx{tc|e7Julx&FVUqk5_A`#FFKA334_>aY*7%SQ8l7+^vM
zjj3e^F}v2F>-&(;7|m()YN5je2kEJPbLP=eKd_?*{xT3~=6uuYgNW??Tfnma=rH`f
zTD<cD)yYlzL9P7aYjb_zIee$*<!IVAl^#FB`Vh!OX~fs|-Qui&Nl|o)rZEMUri7jH
zf*-$UIWxt>n;#s3MN-1uMLTM%IT=v`QL%G~v50yV7Uz%daDvZnJ&fRk(#O)sl6jNI
zvv)-NfdDx~{wwD+1>&IR&*XDh%&rwWd`H1=K^b)UBZjcEmbgAMo}8ZTRtDbAqq%yV
z1c@>M1FfeLFXAz8#^2%EVz}Xd-R0F*9ictJ&ei$7qweyr=kV4%dL2b+KjGc-B3;u{
ziEKlH-o+-_4R4Z2llb(g^5<1sMo}tZA^O&<TkYe1ZJ&>1rdA3`AjQk=dZ6*pl8&Yc
zl=M`v<iV~6R{g%9uwO8Q%Px2So<s8wNM$Cj+d28P<u2p8%MC87i+$udI<8MVcT^sG
z$T(wLl3>*AhJ)+qeBZXD43nAK=-}7@hh`Nj4e^h5dzq30`*@bFsv1qvxvlN^-ruAv
z*au1ewc^P}sQ3CoCAHhP6G0QdhX5z7Rml{O4nO!9EyW&4dC#ZU&TVPu^vss~c4MK^
ztqy6;*WD#8D(?AvUP$ac$=z2I+}V{ZZKVxM6npJWk^x`Flvgpqox@fCyxVZQBHI;=
z!Rlh$maeTnn|5Z$9ejPTHE*gqR)40?P*{O&a(MEa?&KHajyucFzSCqQizq_BoX3KM
zmt@Dp1W_}*f7O&so<S-DkQ_W7H4&g!*Pew|vI7TFpl#4o^{eJLDt4!))FzwKJownT
z@6aT!zQ8l`Y0PutXyUDoZ(7R~+s9RB_^fPZJ4P*Z)QD{}moifC@$ejN)!!~(ogr9$
z6(`X)*6rwO$RIGIU4A{(TIWcLdbQZYc)`HcJPF2^u?=<&*h66%ZH`!GWwokcj|`e5
z!AAUvn<j6P<OH;t$h=-{$_lJTmn679jkk3ls)^g@lJ6;)AF-O+vpapNw+z2(`=F|{
zj*Y^`%BtCD^OF&Hl5*h5wa=r)8@yr(r;*PLfzX?NhPG83&rl$;{%1u+t>C&`yO%!x
zY!uT^pxps{|0XdaB0>U`Aq@iyw|1b{sbajbP*Qj}tB9!Rv1uXK*wyFcb4I`aKHW{)
z`M5maVdy@{%(&|j!iNqcpneQ_czIDj>Z`l6b2e%o2P!EmtApsN$O5HVnNmRquFjFI
z8%Ban#LHXZfBa^yC*P4WAE>fx@2l-lQc*$S7Vo{~HKhabvobrtaheC9@fQo2?~8cg
zD8VmYSd=~7j;2+6rcq{lyVm)w%|%QoK-n(gOSGjWq@I#C=yTycmaW!FUgy^aA9QEm
z4g~r)El`gO2}w9;ba(zy@|Zks92@W55c>P?t4rjrkDaO%Py$}obfU!`xvGHtKq{~u
z-?w7|OyC!_qo@Y!8<lT!D_&$9{q}7#(v#5i%MrP=ZUlYcrCkPE8k+-Kq^NI=QJF*K
zk5j>EVL5I3(D3fO0yNUP40KyJTVzN<#mnjTeCN-fxBEH1s=M;p;pOE_Zv!w;0(b1#
zu~f1}EWw2C6QN~dZ$(SW^t4T$zCh7pgCrc)1d19a?ifo$&m3J>ceOt9ydESvCUn2Z
zZyim%_&czMz<8SxIALz+wQdIYp3=*yBdG16r1)~r(0$1FA!#G5irw>S$wphI23Sg4
z<k_uu=scl)#ZGvGyTIK+h_)WKFN_(k3Y==wHfjTGSq_TYtROVUCZwmU43G$Js8}yh
ze)1G`kb(7kfTmq04s02MhoBD555&Q=z$t#{XNy1|-?sNd6G6>1_Mcjl1@DuXC0vrw
z8AHLIj0==*9uAbrNR0HjQWeON3#W-7BbF-<+aH&a8GyG@WDZ#986b;FS+yq3%@0?V
z<H|U^H?#V9KD9!pzYO?OZ+pAB8{g?HyT1InxuNnI0j|j$o31@8?oyag$BttvVfzG5
zox-n3N=TG}8X0=}bjRV;rwmF%@IgdDtzU9TNXXlG2Uk~o-<yiMj^Y*k92#g{2A4Dp
zJ~$lNETv+4xH{8wkephwkvhlZHAhvTe1*;*k+=-mfU@wd&BiSaXsh&%R)8lk_TIKf
z6g#CipcW;KofhCd2A~LhU|N8x&%)YT9r`e6i}e<2o}E0Y0j}n=;Fv_XhMQ-kBrhO<
z(RQHN0QmX#Ro4XYcEd!hwJJ&!de2iv%RMYNLCrVa_ZH8OU43cncJ4I#=>{t7pi7_z
zR1GuTY2v1I+7bE|s136<$Fyba#y4IWMPA~C?@4;+>Sez-WJNW7Bhih2XI8rei)~%^
z@-!xNuSit@oB9@+1O{M&!p{eip{oI+4h^}UT>Fk$?=4SF4UJBND`iKJ?&&HSa+bb8
zhqhf5cIB0*O=tAZg96YF>LuW2J7-qr!}g!h8i##tFPJS(g~kFX71bfbO<xhWZW*PG
z&BaC$@Sd=%1p{sOx9zk^*<4wQ_m;H>Oi2NgOCFw=Tks+YWt5YXlP(}%(OxF7qm88&
zRfu<f_zGnC0mr5++KWP!i`%*Fk2CLQcL6voe*zRRdyO(!??o~1xClwNno*~lRj~Un
z!1Orh{B68mY{1_&`8=iodsRiHXlM=WGxSpoXr?W9TRxMVF;Z6#O1Sze7E;9;i0zdt
zlYJ$Rmq!}yQL8-1<`w8Bj^RnuM97bciHQx!>2!FoUX}8dD`@-q;o(=9U$yhoaqCze
zkW;WPG2otCt<4R=GOPRg`l49T?>@{>pqyttTeuiN-pJh2g~m&J7DNCfGQ29^z8wnT
z<q=9*1xO1@7GZ#5vw{voPZb$rS7RCpzN-R=m`Km<SG#cG!b#;q>)f6yf(r(7CI8)$
zioGi@i3rQQ+<7a|61?T^cV^0&Oy13Xr1f(*!4a<v<j6!dYfKWf;!sl!$D=%biZPc5
ztcQu_H>mIjXx}5fsiaK~SozjbD|y;=QUiM7C%<+sHp*n)h`VG72LHp70(r#6ueZ0?
zj|9DQW!xoy<``%!bl*^G1tU+M!)q;u{m#g4?2NTh3yM4~QDhCSOa9~dIB&PFFi^(}
zKJ~LUokFCq2TQ)dBBnbVW_DE8#3shXTo`MJP=~0NkdR1o<p&Y%H8q<S1m934$H&Wq
z*Z3t~Dd@cy$pfF0Gr2w%g(AlX_xads;o>GUQ4+3K;F}<D13wIjR6PM6uL<Ay!1OJk
z@zP%O8mKz7^YMB41=|0tbKh;Ct3l5!H28=plG(=*d3n{byRyBJGp_1dgha4IZ7J({
zkF%Swy1v3^&Xj>x7|Qe}O$|Zb_^L)p+qzla$N~-jHr_5*{)U=bv+b7j+8_YOR2IWw
z(TC7bEC=;4q!e__mx)8##!czQB9t8$;+UqInkn4tnC)$^mt&I!@3cmQIx+Xwq`VBh
z1Ej)Za7tLbpnD66kf1|z%;N+4IZ&xk(H0Fi0wQPs|3<6o2fF?5vG@P%;hS6Q3OJ;^
TQV;YNf+#6mlh3$leE<IdEg8n;

diff --git a/docs/source/savefig/hist_with_text.png b/docs/source/savefig/hist_with_text.png
deleted file mode 100644
index ade1b6925afce04506f3f89dd87ace68c66467e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15978
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
Yoz2g$juMatcZ1>1tDMU|V{-d{00MO86951J

diff --git a/docs/source/savefig/plot_simple.png b/docs/source/savefig/plot_simple.png
deleted file mode 100644
index 5dd9465b4841d392e4e87a91992194c421cd2e46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21029
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

diff --git a/docs/source/savefig/plot_simple_python.png b/docs/source/savefig/plot_simple_python.png
deleted file mode 100644
index 5dd9465b4841d392e4e87a91992194c421cd2e46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21029
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


From 16a8c02785ee75eda0efd12c8e9510e9607049d6 Mon Sep 17 00:00:00 2001
From: Coco Mishra <kittenishkoko@gmail.com>
Date: Fri, 16 Apr 2021 21:13:13 -0500
Subject: [PATCH 0520/1407] remove comment from config

---
 docs/source/conf.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 30d05a1c652..eb5b39eacb0 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -38,8 +38,6 @@
     html_theme = "sphinx_rtd_theme"
     html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
-# html_show_sourcelink = False
-
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
 # absolute, like shown here.

From 1b289e4ff61285baf6450142f2e39776daf07e13 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 28 Oct 2020 11:02:38 -0700
Subject: [PATCH 0521/1407] Run mypy on more files.

---
 .github/workflows/mypy.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index aceca0066d4..e0a481cb5bf 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -27,6 +27,18 @@ jobs:
     - name: Lint with mypy
       run: |
         mypy IPython/terminal/ptutils.py
+        mypy IPython/core/magics/*.py
+        mypy IPython/terminal/__init__.py
+        mypy IPython/terminal/console.py
+        #mypy IPython/terminal/debugger.py
+        #mypy IPython/terminal/embed.py
+        mypy IPython/terminal/interactiveshell.py
+        mypy IPython/terminal/ipapp.py
+        mypy IPython/terminal/magics.py
+        mypy IPython/terminal/prompts.py
+        mypy IPython/terminal/ptshell.py
+        mypy IPython/terminal/ptutils.py
+        mypy IPython/terminal/shortcuts.py
         mypy IPython/core/c*.py
     - name: Lint with pyflakes
       run: |

From 288afbf34defea9d16867235b09a1fea9d01c279 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 16 Apr 2021 22:55:10 -0700
Subject: [PATCH 0522/1407] update

---
 .github/workflows/mypy.yml            | 17 +++--------------
 IPython/terminal/debugger.py          |  4 ++--
 IPython/terminal/embed.py             | 12 +++++++-----
 IPython/terminal/pt_inputhooks/osx.py |  4 ++--
 4 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index e0a481cb5bf..03b58c64c46 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -26,20 +26,9 @@ jobs:
         pip install mypy pyflakes flake8
     - name: Lint with mypy
       run: |
-        mypy IPython/terminal/ptutils.py
-        mypy IPython/core/magics/*.py
-        mypy IPython/terminal/__init__.py
-        mypy IPython/terminal/console.py
-        #mypy IPython/terminal/debugger.py
-        #mypy IPython/terminal/embed.py
-        mypy IPython/terminal/interactiveshell.py
-        mypy IPython/terminal/ipapp.py
-        mypy IPython/terminal/magics.py
-        mypy IPython/terminal/prompts.py
-        mypy IPython/terminal/ptshell.py
-        mypy IPython/terminal/ptutils.py
-        mypy IPython/terminal/shortcuts.py
-        mypy IPython/core/c*.py
+        mypy -p IPython.terminal
+        mypy -p IPython.core.magics
     - name: Lint with pyflakes
       run: |
         flake8  IPython/core/magics/script.py
+        flake8  IPython/core/magics/packaging.py
diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index 1ea1a862582..57aa5dd90d1 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -161,6 +161,6 @@ def set_trace(frame=None):
     # happened after hitting "c", this is needed in order to
     # be able to quit the debugging session (see #9950).
     old_trace_dispatch = pdb.Pdb.trace_dispatch
-    pdb.Pdb = TerminalPdb
-    pdb.Pdb.trace_dispatch = old_trace_dispatch
+    pdb.Pdb = TerminalPdb  # type: ignore
+    pdb.Pdb.trace_dispatch = old_trace_dispatch  # type: ignore
     pdb.main()
diff --git a/IPython/terminal/embed.py b/IPython/terminal/embed.py
index 188844faddb..b5ceeeca4c3 100644
--- a/IPython/terminal/embed.py
+++ b/IPython/terminal/embed.py
@@ -19,6 +19,8 @@
 from traitlets import Bool, CBool, Unicode
 from IPython.utils.io import ask_yes_no
 
+from typing import Set
+
 class KillEmbedded(Exception):pass
 
 # kept for backward compatibility as IPython 6 was released with
@@ -123,17 +125,17 @@ class InteractiveShellEmbed(TerminalInteractiveShell):
         help="Automatically set the terminal title"
     ).tag(config=True)
 
-    _inactive_locations = set()
+    _inactive_locations: Set[str] = set()
+
+    def _disable_init_location(self):
+        """Disable the current Instance creation location"""
+        InteractiveShellEmbed._inactive_locations.add(self._init_location_id)
 
     @property
     def embedded_active(self):
         return (self._call_location_id not in InteractiveShellEmbed._inactive_locations)\
             and (self._init_location_id not in InteractiveShellEmbed._inactive_locations)
 
-    def _disable_init_location(self):
-        """Disable the current Instance creation location"""
-        InteractiveShellEmbed._inactive_locations.add(self._init_location_id)
-
     @embedded_active.setter
     def embedded_active(self, value):
         if value:
diff --git a/IPython/terminal/pt_inputhooks/osx.py b/IPython/terminal/pt_inputhooks/osx.py
index 80440196fb4..2754820efc8 100644
--- a/IPython/terminal/pt_inputhooks/osx.py
+++ b/IPython/terminal/pt_inputhooks/osx.py
@@ -9,7 +9,7 @@
 import ctypes.util
 from threading import Event
 
-objc = ctypes.cdll.LoadLibrary(ctypes.util.find_library('objc'))
+objc = ctypes.cdll.LoadLibrary(ctypes.util.find_library("objc"))  # type: ignore
 
 void_p = ctypes.c_void_p
 
@@ -37,7 +37,7 @@ def C(classname):
 # end obj-c boilerplate from appnope
 
 # CoreFoundation C-API calls we will use:
-CoreFoundation = ctypes.cdll.LoadLibrary(ctypes.util.find_library('CoreFoundation'))
+CoreFoundation = ctypes.cdll.LoadLibrary(ctypes.util.find_library("CoreFoundation"))  # type: ignore
 
 CFFileDescriptorCreate = CoreFoundation.CFFileDescriptorCreate
 CFFileDescriptorCreate.restype = void_p

From 2e735f1fbf98131f47d0d8b1922eebe17969d655 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Fri, 2 Apr 2021 23:09:27 +0200
Subject: [PATCH 0523/1407] Strip vi-mode style prompts too (singleline)

This strips "[ins] " and "[nav] " prefix of the prompt from the
commands.

This commit adds support for it in singleline commands only.
---
 IPython/core/inputtransformer2.py | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index c7deab83bae..fc9d342efa3 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -89,7 +89,28 @@ def __call__(self, lines):
     initial_re=re.compile(r'^>>>( |$)')
 )
 
-ipython_prompt = PromptStripper(re.compile(r'^(In \[\d+\]: |\s*\.{3,}: ?)'))
+ipython_prompt = PromptStripper(re.compile(
+    r'''
+    ^(                         # Match from the beginning of a line, either:
+
+                               # 1. First-line prompt:
+    ((\[nav\]|\[ins\])?\ )?    # Vi editing mode prompt, if it's there
+    In\                        # The 'In' of the prompt, with a space
+    \[\d+\]:                   # Command index, as displayed in the prompt
+    \                          # With a mandatory trailing space
+
+    |                          # ... or ...
+
+                               # 2. The three dots of the multiline prompt
+    \s*                        # All leading whitespace characters
+    \.{3,}:                    # The three (or more) dots
+    \ ?                        # With an optional trailing space
+
+    )
+    ''',
+    re.VERBOSE
+))
+
 
 def cell_magic(lines):
     if not lines or not lines[0].startswith('%%'):

From d9909be16b1eed7fe8c17a31e2a4f991067bf8c2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 17 Apr 2021 18:40:27 -0700
Subject: [PATCH 0524/1407] reformat

---
 IPython/core/inputtransformer2.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index fc9d342efa3..b0aac2b5129 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -89,8 +89,9 @@ def __call__(self, lines):
     initial_re=re.compile(r'^>>>( |$)')
 )
 
-ipython_prompt = PromptStripper(re.compile(
-    r'''
+ipython_prompt = PromptStripper(
+    re.compile(
+        r"""
     ^(                         # Match from the beginning of a line, either:
 
                                # 1. First-line prompt:
@@ -107,9 +108,10 @@ def __call__(self, lines):
     \ ?                        # With an optional trailing space
 
     )
-    ''',
-    re.VERBOSE
-))
+    """,
+        re.VERBOSE,
+    )
+)
 
 
 def cell_magic(lines):

From baf253a1e653775a12e8269e5a59aaada5daef58 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 17 Apr 2021 18:56:44 -0700
Subject: [PATCH 0525/1407] DOC: Some more autoformatting of docstrings.

Trying to head toward 100% of DocString autoformatted in IPython and
fixing issues in velin when I find cases that are wrong.
---
 IPython/__init__.py               | 27 ++++++++++++---------------
 IPython/core/application.py       |  2 +-
 IPython/core/autocall.py          |  4 ++--
 IPython/core/compilerop.py        | 16 ++++++++--------
 IPython/core/completer.py         | 24 ++++++++++++------------
 IPython/core/crashhandler.py      | 10 ++--------
 IPython/core/debugger.py          |  1 -
 IPython/core/display_functions.py | 24 ++++++++----------------
 8 files changed, 45 insertions(+), 63 deletions(-)

diff --git a/IPython/__init__.py b/IPython/__init__.py
index 4fb77107680..0b182bd8400 100644
--- a/IPython/__init__.py
+++ b/IPython/__init__.py
@@ -68,20 +68,19 @@
 
 def embed_kernel(module=None, local_ns=None, **kwargs):
     """Embed and start an IPython kernel in a given scope.
-    
+
     If you don't want the kernel to initialize the namespace
     from the scope of the surrounding function,
     and/or you want to load full IPython configuration,
     you probably want `IPython.start_kernel()` instead.
-    
+
     Parameters
     ----------
     module : types.ModuleType, optional
         The module to load into IPython globals (default: caller)
     local_ns : dict, optional
         The namespace to load into IPython user namespace (default: caller)
-    
-    kwargs : various, optional
+    **kwargs : various, optional
         Further keyword args are relayed to the IPKernelApp constructor,
         allowing configuration of the Kernel.  Will only have an effect
         on the first embed_kernel call for a given process.
@@ -99,26 +98,25 @@ def embed_kernel(module=None, local_ns=None, **kwargs):
 
 def start_ipython(argv=None, **kwargs):
     """Launch a normal IPython instance (as opposed to embedded)
-    
+
     `IPython.embed()` puts a shell in a particular calling scope,
     such as a function or method for debugging purposes,
     which is often not desirable.
-    
+
     `start_ipython()` does full, regular IPython initialization,
     including loading startup files, configuration, etc.
     much of which is skipped by `embed()`.
-    
+
     This is a public API method, and will survive implementation changes.
-    
+
     Parameters
     ----------
-    
     argv : list or None, optional
         If unspecified or None, IPython will parse command-line options from sys.argv.
         To prevent any command-line parsing, pass an empty list: `argv=[]`.
     user_ns : dict, optional
         specify this dictionary to initialize the IPython user namespace with particular values.
-    kwargs : various, optional
+    **kwargs : various, optional
         Any other kwargs will be passed to the Application constructor,
         such as `config`.
     """
@@ -127,24 +125,23 @@ def start_ipython(argv=None, **kwargs):
 
 def start_kernel(argv=None, **kwargs):
     """Launch a normal IPython kernel instance (as opposed to embedded)
-    
+
     `IPython.embed_kernel()` puts a shell in a particular calling scope,
     such as a function or method for debugging purposes,
     which is often not desirable.
-    
+
     `start_kernel()` does full, regular IPython initialization,
     including loading startup files, configuration, etc.
     much of which is skipped by `embed()`.
-    
+
     Parameters
     ----------
-    
     argv : list or None, optional
         If unspecified or None, IPython will parse command-line options from sys.argv.
         To prevent any command-line parsing, pass an empty list: `argv=[]`.
     user_ns : dict, optional
         specify this dictionary to initialize the IPython user namespace with particular values.
-    kwargs : various, optional
+    **kwargs : various, optional
         Any other kwargs will be passed to the Application constructor,
         such as `config`.
     """
diff --git a/IPython/core/application.py b/IPython/core/application.py
index 2aae062419a..30bff844a8d 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -254,7 +254,7 @@ def unset_crashhandler():
     
     def excepthook(self, etype, evalue, tb):
         """this is sys.excepthook after init_crashhandler
-        
+
         set self.verbose_crash=True to use our full crashhandler, instead of
         a regular traceback with a short message (crash_handler_lite)
         """
diff --git a/IPython/core/autocall.py b/IPython/core/autocall.py
index bab7f859c96..5f7720bb46c 100644
--- a/IPython/core/autocall.py
+++ b/IPython/core/autocall.py
@@ -41,9 +41,9 @@ def __init__(self, ip=None):
     
     def set_ip(self, ip):
         """ Will be used to set _ip point to current ipython instance b/f call
-        
+
         Override this method if you don't want this to happen.
-        
+
         """
         self._ip = ip
 
diff --git a/IPython/core/compilerop.py b/IPython/core/compilerop.py
index 50672a19541..fd7ac9ab465 100644
--- a/IPython/core/compilerop.py
+++ b/IPython/core/compilerop.py
@@ -118,12 +118,12 @@ def get_code_name(self, raw_code, transformed_code, number):
         Parameters
         ----------
         raw_code : str
-          The raw cell code.
+            The raw cell code.
         transformed_code : str
-          The executable Python source code to cache and compile.
+            The executable Python source code to cache and compile.
         number : int
-          A number which forms part of the code's name. Used for the execution
-          counter.
+            A number which forms part of the code's name. Used for the execution
+            counter.
 
         Returns
         -------
@@ -137,12 +137,12 @@ def cache(self, transformed_code, number=0, raw_code=None):
         Parameters
         ----------
         transformed_code : str
-          The executable Python source code to cache and compile.
+            The executable Python source code to cache and compile.
         number : int
-          A number which forms part of the code's name. Used for the execution
-          counter.
+            A number which forms part of the code's name. Used for the execution
+            counter.
         raw_code : str
-          The raw code before transformation, if None, set to `transformed_code`.
+            The raw code before transformation, if None, set to `transformed_code`.
 
         Returns
         -------
diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 78bc57e1262..9237929f9a7 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -431,9 +431,9 @@ def _deduplicate_completions(text: str, completions: _IC)-> _IC:
 
     Parameters
     ----------
-    text: str
+    text : str
         text that should be completed.
-    completions: Iterator[Completion]
+    completions : Iterator[Completion]
         iterator over the completions to deduplicate
 
     Yields
@@ -474,9 +474,9 @@ def rectify_completions(text: str, completions: _IC, *, _debug=False)->_IC:
 
     Parameters
     ----------
-    text: str
+    text : str
         text that should be completed.
-    completions: Iterator[Completion]
+    completions : Iterator[Completion]
         iterator over the completions to rectify
 
     Notes
@@ -763,13 +763,13 @@ def match_dict_keys(keys: List[Union[str, bytes, Tuple[Union[str, bytes]]]], pre
 
     Parameters
     ----------
-    keys:
+    keys
         list of keys in dictionary currently being completed.
-    prefix:
+    prefix
         Part of the text already typed by the user. E.g. `mydict[b'fo`
-    delims:
+    delims
         String of delimiters to consider when finding the current key.
-    extra_prefix: optional
+    extra_prefix : optional
         Part of the text already typed in multi-key index cases. E.g. for
         `mydict['foo', "bar", 'b`, this would be `('foo', 'bar')`.
 
@@ -993,7 +993,7 @@ def _formatparamchildren(parameter) -> str:
 
     Parameters
     ----------
-    parameter:
+    parameter
         Jedi's function `Param`
 
     Returns
@@ -1013,7 +1013,7 @@ def _make_signature(completion)-> str:
 
     Parameters
     ----------
-    completion: jedi.Completion
+    completion : jedi.Completion
         object does not complete a function type
 
     Returns
@@ -1854,9 +1854,9 @@ def completions(self, text: str, offset: int)->Iterator[Completion]:
 
         Parameters
         ----------
-        text:str
+        text : str
             Full text of the current input, multi line string.
-        offset:int
+        offset : int
             Integer representing the position of the cursor in ``text``. Offset
             is 0-based indexed.
 
diff --git a/IPython/core/crashhandler.py b/IPython/core/crashhandler.py
index 2cfe85ce2db..181fc157954 100644
--- a/IPython/core/crashhandler.py
+++ b/IPython/core/crashhandler.py
@@ -101,25 +101,19 @@ def __init__(self, app, contact_name=None, contact_email=None,
 
         Parameters
         ----------
-        app :  Application
+        app : Application
             A running :class:`Application` instance, which will be queried at
             crash time for internal information.
-
         contact_name : str
             A string with the name of the person to contact.
-
         contact_email : str
             A string with the email address of the contact.
-
         bug_tracker : str
             A string with the URL for your project's bug tracker.
-
         show_crash_traceback : bool
             If false, don't print the crash traceback on stderr, only generate
             the on-disk report
-
-        Non-argument instance attributes:
-
+        Non-argument instance attributes
         These instances contain some non-argument attributes which allow for
         further customization of the crash handler's behavior. Please see the
         source for further details.
diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index b0e62cab9c7..0f4e6f99df3 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -109,7 +109,6 @@ def __init__(self, colors=None):
 
         Parameters
         ----------
-
         colors : str, optional
             The name of the color scheme to use, it must be one of IPython's
             valid color schemes.  If not given, the function will default to
diff --git a/IPython/core/display_functions.py b/IPython/core/display_functions.py
index ab5777a716f..aab2b7e71be 100644
--- a/IPython/core/display_functions.py
+++ b/IPython/core/display_functions.py
@@ -62,7 +62,7 @@ def publish_display_data(data, metadata=None, source=None, *, transient=None, **
         Unused.
     transient : dict, keyword-only
         A dictionary of transient data, such as display_id.
-        """
+    """
     from IPython.core.interactiveshell import InteractiveShell
 
     display_pub = InteractiveShell.instance().display_pub
@@ -133,12 +133,11 @@ def display(
     clear : bool, optional
         Should the output area be cleared before displaying anything? If True,
         this will wait for additional output before clearing. [default: False]
-    kwargs: additional keyword-args, optional
+    **kwargs : additional keyword-args, optional
         Additional keyword-arguments are passed through to the display publisher.
 
     Returns
     -------
-
     handle: DisplayHandle
         Returns a handle on updatable displays for use with :func:`update_display`,
         if `display_id` is given. Returns :any:`None` if no `display_id` is given
@@ -146,7 +145,6 @@ def display(
 
     Examples
     --------
-
     >>> class Json(object):
     ...     def __init__(self, json):
     ...         self.json = json
@@ -185,12 +183,10 @@ def display(
 
     See Also
     --------
-
     :func:`update_display`
 
     Notes
     -----
-
     In Python, objects can declare their textual representation using the
     `__repr__` method. IPython expands on this idea and allows objects to declare
     other, rich representations including:
@@ -300,15 +296,13 @@ def update_display(obj, *, display_id, **kwargs):
 
     Parameters
     ----------
-
-    obj:
+    obj
         The object with which to update the display
-    display_id: keyword-only
+    display_id : keyword-only
         The id of the display to update
 
     See Also
     --------
-
     :func:`display`
     """
     kwargs['update'] = True
@@ -343,10 +337,9 @@ def display(self, obj, **kwargs):
 
         Parameters
         ----------
-
-        obj:
+        obj
             object to display
-        **kwargs:
+        **kwargs
             additional keyword arguments passed to display
         """
         display(obj, display_id=self.display_id, **kwargs)
@@ -356,10 +349,9 @@ def update(self, obj, **kwargs):
 
         Parameters
         ----------
-
-        obj:
+        obj
             object to display
-        **kwargs:
+        **kwargs
             additional keyword arguments passed to update_display
         """
         update_display(obj, display_id=self.display_id, **kwargs)

From 7b8579708b73a13012b92aafc5275230842b36d0 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <code.mrmino@gmail.com>
Date: Sun, 18 Apr 2021 15:36:59 +0200
Subject: [PATCH 0526/1407] Test for vi-prompt strip

---
 .../core/tests/test_inputtransformer2_line.py | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/IPython/core/tests/test_inputtransformer2_line.py b/IPython/core/tests/test_inputtransformer2_line.py
index 263bbd9ee08..f93c68f3640 100644
--- a/IPython/core/tests/test_inputtransformer2_line.py
+++ b/IPython/core/tests/test_inputtransformer2_line.py
@@ -61,11 +61,39 @@ def test_classic_prompt():
     print(a ** 2)
 """)
 
+
+IPYTHON_PROMPT_VI_INS = ("""\
+[ins] In [11]: def a():
+          ...:     123
+          ...:
+          ...: 123
+""", """\
+def a():
+    123
+
+123
+""")
+
+IPYTHON_PROMPT_VI_NAV = ("""\
+[nav] In [11]: def a():
+          ...:     123
+          ...:
+          ...: 123
+""", """\
+def a():
+    123
+
+123
+""")
+
+
 def test_ipython_prompt():
-    for sample, expected in [IPYTHON_PROMPT, IPYTHON_PROMPT_L2]:
+    for sample, expected in [IPYTHON_PROMPT, IPYTHON_PROMPT_L2,
+                             IPYTHON_PROMPT_VI_INS, IPYTHON_PROMPT_VI_NAV]:
         nt.assert_equal(ipt2.ipython_prompt(sample.splitlines(keepends=True)),
                         expected.splitlines(keepends=True))
 
+
 INDENT_SPACES = ("""\
      if True:
         a = 3
@@ -123,4 +151,4 @@ def test_leading_empty_lines():
 
 def test_crlf_magic():
     for sample, expected in [CRLF_MAGIC]:
-        nt.assert_equal(ipt2.cell_magic(sample), expected)
\ No newline at end of file
+        nt.assert_equal(ipt2.cell_magic(sample), expected)

From fc86b3cc16fa7d5b604cff0ec200566b2528c632 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <code.mrmino@gmail.com>
Date: Sun, 18 Apr 2021 15:41:04 +0200
Subject: [PATCH 0527/1407] Reformat test code

---
 .../core/tests/test_inputtransformer2_line.py | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/IPython/core/tests/test_inputtransformer2_line.py b/IPython/core/tests/test_inputtransformer2_line.py
index f93c68f3640..8643a46ceac 100644
--- a/IPython/core/tests/test_inputtransformer2_line.py
+++ b/IPython/core/tests/test_inputtransformer2_line.py
@@ -62,36 +62,48 @@ def test_classic_prompt():
 """)
 
 
-IPYTHON_PROMPT_VI_INS = ("""\
+IPYTHON_PROMPT_VI_INS = (
+    """\
 [ins] In [11]: def a():
           ...:     123
           ...:
           ...: 123
-""", """\
+""",
+    """\
 def a():
     123
 
 123
-""")
+""",
+)
 
-IPYTHON_PROMPT_VI_NAV = ("""\
+IPYTHON_PROMPT_VI_NAV = (
+    """\
 [nav] In [11]: def a():
           ...:     123
           ...:
           ...: 123
-""", """\
+""",
+    """\
 def a():
     123
 
 123
-""")
+""",
+)
 
 
 def test_ipython_prompt():
-    for sample, expected in [IPYTHON_PROMPT, IPYTHON_PROMPT_L2,
-                             IPYTHON_PROMPT_VI_INS, IPYTHON_PROMPT_VI_NAV]:
-        nt.assert_equal(ipt2.ipython_prompt(sample.splitlines(keepends=True)),
-                        expected.splitlines(keepends=True))
+    for sample, expected in [
+        IPYTHON_PROMPT,
+        IPYTHON_PROMPT_L2,
+        IPYTHON_PROMPT_VI_INS,
+        IPYTHON_PROMPT_VI_NAV,
+    ]:
+        nt.assert_equal(
+            ipt2.ipython_prompt(sample.splitlines(keepends=True)),
+            expected.splitlines(keepends=True),
+        )
 
 
 INDENT_SPACES = ("""\

From 40a57d40ed7040678d7841814eeba78c3e6cca8e Mon Sep 17 00:00:00 2001
From: Blazej Michalik <code.mrmino@gmail.com>
Date: Sun, 18 Apr 2021 15:44:53 +0200
Subject: [PATCH 0528/1407] Fix indentation of the transformer regex

---
 IPython/core/inputtransformer2.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index b0aac2b5129..fefc523d70a 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -92,23 +92,23 @@ def __call__(self, lines):
 ipython_prompt = PromptStripper(
     re.compile(
         r"""
-    ^(                         # Match from the beginning of a line, either:
+        ^(                         # Match from the beginning of a line, either:
 
-                               # 1. First-line prompt:
-    ((\[nav\]|\[ins\])?\ )?    # Vi editing mode prompt, if it's there
-    In\                        # The 'In' of the prompt, with a space
-    \[\d+\]:                   # Command index, as displayed in the prompt
-    \                          # With a mandatory trailing space
+                                   # 1. First-line prompt:
+        ((\[nav\]|\[ins\])?\ )?    # Vi editing mode prompt, if it's there
+        In\                        # The 'In' of the prompt, with a space
+        \[\d+\]:                   # Command index, as displayed in the prompt
+        \                          # With a mandatory trailing space
 
-    |                          # ... or ...
+        |                          # ... or ...
 
-                               # 2. The three dots of the multiline prompt
-    \s*                        # All leading whitespace characters
-    \.{3,}:                    # The three (or more) dots
-    \ ?                        # With an optional trailing space
+                                   # 2. The three dots of the multiline prompt
+        \s*                        # All leading whitespace characters
+        \.{3,}:                    # The three (or more) dots
+        \ ?                        # With an optional trailing space
 
-    )
-    """,
+        )
+        """,
         re.VERBOSE,
     )
 )

From 285168004f043445d483cfe85a22539ca1956a61 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <code.mrmino@gmail.com>
Date: Sun, 18 Apr 2021 16:02:51 +0200
Subject: [PATCH 0529/1407] Add WN entry for vi prompt stripping

---
 docs/source/whatsnew/pr/vi-prompt-strip.rst | 29 +++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/vi-prompt-strip.rst

diff --git a/docs/source/whatsnew/pr/vi-prompt-strip.rst b/docs/source/whatsnew/pr/vi-prompt-strip.rst
new file mode 100644
index 00000000000..e642a4d1f83
--- /dev/null
+++ b/docs/source/whatsnew/pr/vi-prompt-strip.rst
@@ -0,0 +1,29 @@
+Automatic Vi prompt stripping
+=============================
+
+When pasting code into IPython, it will strip the leading prompt characters if
+there are any. For example, you can paste the following code into the console -
+it will still work, even though each line is prefixed with prompts (`In`,
+`Out`)::
+
+    In [1]: 2 * 2 == 4
+    Out[1]: True
+
+    In [2]: print("This still works as pasted")
+
+
+Previously, this was not the case for the Vi-mode prompts::
+
+    In [1]: [ins] In [13]: 2 * 2 == 4
+       ...: Out[13]: True
+       ...: 
+      File "<ipython-input-1-727bb88eaf33>", line 1
+        [ins] In [13]: 2 * 2 == 4
+              ^
+    SyntaxError: invalid syntax
+
+This is now fixed, and Vi prompt prefixes - ``[ins]`` and ``[nav]`` -  are
+skipped just as the normal ``In`` would be.
+
+IPython shell can be started in the Vi mode using ``ipython
+--TerminalInteractiveShell.editing_mode=vi``

From 7c853204ed0031a9b52bc45ce60ddc5fcbcf0bf6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 18 Apr 2021 10:08:54 -0700
Subject: [PATCH 0530/1407] DOC: More autoreformatting of docstrings.

Also add some configuration to ignore some files.
---
 IPython/core/displayhook.py |  2 +-
 IPython/core/displaypub.py  |  4 ++--
 IPython/core/events.py      | 38 ++++++++++++++++++-------------------
 IPython/core/extensions.py  |  2 +-
 IPython/core/formatters.py  | 26 ++++++++++++-------------
 setup.cfg                   |  5 +++++
 6 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/IPython/core/displayhook.py b/IPython/core/displayhook.py
index 3c06675e86e..578e783ab8e 100644
--- a/IPython/core/displayhook.py
+++ b/IPython/core/displayhook.py
@@ -146,7 +146,7 @@ def compute_format_data(self, result):
             MIME type representation of the object.
             md_dict is a :class:`dict` with the same MIME type keys
             of metadata associated with each output.
-            
+
         """
         return self.shell.display_formatter.format(result)
 
diff --git a/IPython/core/displaypub.py b/IPython/core/displaypub.py
index 14719a2e21a..74028ec79e0 100644
--- a/IPython/core/displaypub.py
+++ b/IPython/core/displaypub.py
@@ -94,11 +94,11 @@ def publish(self, data, metadata=None, source=None, *, transient=None, update=Fa
             the data itself.
         source : str, deprecated
             Unused.
-        transient: dict, keyword-only
+        transient : dict, keyword-only
             A dictionary for transient data.
             Data in this dictionary should not be persisted as part of saving this output.
             Examples include 'display_id'.
-        update: bool, keyword-only, default: False
+        update : bool, keyword-only, default: False
             If True, only update existing outputs with the same display_id,
             rather than creating a new output.
         """
diff --git a/IPython/core/events.py b/IPython/core/events.py
index 1af13ca406f..73fc181ae5a 100644
--- a/IPython/core/events.py
+++ b/IPython/core/events.py
@@ -28,34 +28,34 @@ class EventManager(object):
     """
     def __init__(self, shell, available_events):
         """Initialise the :class:`CallbackManager`.
-        
+
         Parameters
         ----------
         shell
-          The :class:`~IPython.core.interactiveshell.InteractiveShell` instance
-        available_callbacks
-          An iterable of names for callback events.
+            The :class:`~IPython.core.interactiveshell.InteractiveShell` instance
+        available_events
+            An iterable of names for callback events.
         """
         self.shell = shell
         self.callbacks = {n:[] for n in available_events}
     
     def register(self, event, function):
         """Register a new event callback.
-        
+
         Parameters
         ----------
         event : str
-          The event for which to register this callback.
+            The event for which to register this callback.
         function : callable
-          A function to be called on the given event. It should take the same
-          parameters as the appropriate callback prototype.
-        
+            A function to be called on the given event. It should take the same
+            parameters as the appropriate callback prototype.
+
         Raises
         ------
         TypeError
-          If ``function`` is not callable.
+            If ``function`` is not callable.
         KeyError
-          If ``event`` is not one of the known events.
+            If ``event`` is not one of the known events.
         """
         if not callable(function):
             raise TypeError('Need a callable, got %r' % function)
@@ -80,7 +80,7 @@ def unregister(self, event, function):
 
     def trigger(self, event, *args, **kwargs):
         """Call callbacks for ``event``.
-        
+
         Any additional arguments are passed to all callbacks registered for this
         event. Exceptions raised by callbacks are caught, and a message printed.
         """
@@ -109,7 +109,7 @@ def _define_event(callback_function):
 @_define_event
 def pre_execute():
     """Fires before code is executed in response to user/frontend action.
-    
+
     This includes comm and widget messages and silent execution, as well as user
     code cells.
     """
@@ -122,14 +122,14 @@ def pre_run_cell(info):
     Parameters
     ----------
     info : :class:`~IPython.core.interactiveshell.ExecutionInfo`
-      An object containing information used for the code execution.
+        An object containing information used for the code execution.
     """
     pass
 
 @_define_event
 def post_execute():
     """Fires after code is executed in response to user/frontend action.
-    
+
     This includes comm and widget messages and silent execution, as well as user
     code cells.
     """
@@ -142,20 +142,20 @@ def post_run_cell(result):
     Parameters
     ----------
     result : :class:`~IPython.core.interactiveshell.ExecutionResult`
-      The object which will be returned as the execution result.
+        The object which will be returned as the execution result.
     """
     pass
 
 @_define_event
 def shell_initialized(ip):
     """Fires after initialisation of :class:`~IPython.core.interactiveshell.InteractiveShell`.
-    
+
     This is before extensions and startup scripts are loaded, so it can only be
     set by subclassing.
-    
+
     Parameters
     ----------
     ip : :class:`~IPython.core.interactiveshell.InteractiveShell`
-      The newly initialised shell.
+        The newly initialised shell.
     """
     pass
diff --git a/IPython/core/extensions.py b/IPython/core/extensions.py
index e570d48ff3a..db3b040d24f 100644
--- a/IPython/core/extensions.py
+++ b/IPython/core/extensions.py
@@ -94,7 +94,7 @@ def unload_extension(self, module_str):
 
         This function looks up the extension's name in ``sys.modules`` and
         simply calls ``mod.unload_ipython_extension(self)``.
-        
+
         Returns the string "no unload function" if the extension doesn't define
         a function to unload itself, "not loaded" if the extension isn't loaded,
         otherwise None.
diff --git a/IPython/core/formatters.py b/IPython/core/formatters.py
index ab8172e82a8..07efecab40a 100644
--- a/IPython/core/formatters.py
+++ b/IPython/core/formatters.py
@@ -121,19 +121,17 @@ def format(self, obj, include=None, exclude=None):
         Returns
         -------
         (format_dict, metadata_dict) : tuple of two dicts
-        
             format_dict is a dictionary of key/value pairs, one of each format that was
             generated for the object. The keys are the format types, which
             will usually be MIME type strings and the values and JSON'able
             data structure containing the raw data for the representation in
             that format.
-            
+
             metadata_dict is a dictionary of metadata about each mime-type output.
             Its keys will be a strict subset of the keys in format_dict.
 
         Notes
         -----
-
             If an object implement `_repr_mimebundle_` as well as various
             `_repr_*_`, the data returned by `_repr_mimebundle_` will take
             precedence and the corresponding `_repr_*_` for this mimetype will
@@ -263,7 +261,7 @@ def __call__(self, obj):
 
 def _mod_name_key(typ):
     """Return a (__module__, __name__) tuple for a type.
-    
+
     Used as key in Formatter.deferred_printers.
     """
     module = getattr(typ, '__module__', None)
@@ -358,7 +356,7 @@ def __contains__(self, typ):
     
     def _check_return(self, r, obj):
         """Check that a return value is appropriate
-        
+
         Return the value if so, None otherwise, warning if invalid.
         """
         if r is None or isinstance(r, self._return_type) or \
@@ -373,10 +371,10 @@ def _check_return(self, r, obj):
     
     def lookup(self, obj):
         """Look up the formatter for a given instance.
-        
+
         Parameters
         ----------
-        obj  : object instance
+        obj : object instance
 
         Returns
         -------
@@ -399,7 +397,7 @@ def lookup_by_type(self, typ):
 
         Parameters
         ----------
-        typ  : type or '__module__.__name__' string for a type
+        typ : type or '__module__.__name__' string for a type
 
         Returns
         -------
@@ -430,7 +428,7 @@ def lookup_by_type(self, typ):
 
     def for_type(self, typ, func=None):
         """Add a format function for a given type.
-        
+
         Parameters
         ----------
         typ : type or '__module__.__name__' string for a type
@@ -441,10 +439,10 @@ def for_type(self, typ, func=None):
             and will return the raw data in this formatter's format.
             Subclasses may use a different call signature for the
             `func` argument.
-            
+
             If `func` is None or not specified, there will be no change,
             only returning the current value.
-        
+
         Returns
         -------
         oldfunc : callable
@@ -484,10 +482,10 @@ def for_type_by_name(self, type_module, type_name, func=None):
             and will return the raw data in this formatter's format.
             Subclasses may use a different call signature for the
             `func` argument.
-            
+
             If `func` is None or unspecified, there will be no change,
             only returning the current value.
-        
+
         Returns
         -------
         oldfunc : callable
@@ -827,7 +825,7 @@ class JSONFormatter(BaseFormatter):
     
     def _check_return(self, r, obj):
         """Check that a return value is appropriate
-        
+
         Return the value if so, None otherwise, warning if invalid.
         """
         if r is None:
diff --git a/setup.cfg b/setup.cfg
index 0c9e0fc1447..31a467ccbf3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,7 @@
 [metadata]
 license_file = LICENSE
+
+[velin]
+ignore_patterns = 
+   IPython/core/tests,
+   IPython/testing

From a9c5e02a1afc101ef50cfc94197d5da3e776a86a Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Fri, 30 Apr 2021 12:29:12 +0200
Subject: [PATCH 0531/1407] remove use of deprecated pipes module

pipes.quote is actually an alias to shlex.quote

deprecated by PEP 594, to be removed in 3.10
---
 IPython/lib/editorhooks.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/IPython/lib/editorhooks.py b/IPython/lib/editorhooks.py
index 7ce0577a091..d8bd6ac81bc 100644
--- a/IPython/lib/editorhooks.py
+++ b/IPython/lib/editorhooks.py
@@ -6,7 +6,6 @@
 """
 
 import os
-import pipes
 import shlex
 import subprocess
 import sys
@@ -47,9 +46,9 @@ def install_editor(template, wait=False):
     def call_editor(self, filename, line=0):
         if line is None:
             line = 0
-        cmd = template.format(filename=pipes.quote(filename), line=line)
+        cmd = template.format(filename=shlex.quote(filename), line=line)
         print(">", cmd)
-        # pipes.quote doesn't work right on Windows, but it does after splitting
+        # shlex.quote doesn't work right on Windows, but it does after splitting
         if sys.platform.startswith('win'):
             cmd = shlex.split(cmd)
         proc = subprocess.Popen(cmd, shell=True)

From 9741a8b1a4c647ad097066bc751a8e0968b9e87e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 30 Apr 2021 15:23:25 -0700
Subject: [PATCH 0532/1407] run darker with new version of black

---
 IPython/core/magics/script.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index d713a7f95f8..d4e7b08c3c1 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -213,7 +213,7 @@ async def _stream_communicate(process, cell):
                     *cmd,
                     stdout=asyncio.subprocess.PIPE,
                     stderr=asyncio.subprocess.PIPE,
-                    stdin=asyncio.subprocess.PIPE
+                    stdin=asyncio.subprocess.PIPE,
                 )
             )
         except OSError as e:

From 305c5ecbe908fed5bc7e61fbd268a44864ddb5d3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 30 Apr 2021 15:46:36 -0700
Subject: [PATCH 0533/1407] 7.23 release notes

---
 docs/source/whatsnew/version7.rst | 44 +++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index d4ca97126b6..eb8916ee0de 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,50 @@
  7.x Series
 ============
 
+.. _version 7.23:
+
+IPython 7.23
+============
+
+Third release of IPython for 2021, mostly containing bug fixes. A couple of not
+typical updates:
+
+ - We moved to GitHub actions away from Travis-CI, the transition may not be
+   100% complete (not testing on nightly anymore), but as we ran out of
+   Travis-Ci hours on the IPython organisation that was a necessary step.
+   :ghpull:`12900`.
+
+ - We have a new dependency: ``matplotlib-inline``, which try to extract
+   matplotlib inline backend specific behavior. It is available on PyPI and
+   conda-forge thus should not be a problem to upgrade to this version. If you
+   are a package maintainer that might be an extra dependency to package first.
+   :ghpull:`12817`
+
+In the addition/new feature category, ``display()`` now have a ``clear=True``
+option to clear the display if any further outputs arrives, allowing users to
+avoid having to use ``clear_output()`` directly. :ghpull:`12823`.
+
+In bug fixes category, this release fix an issue when printing tracebacks
+containing Unicode characters :ghpull:`12758`.
+
+In code cleanup category :ghpull:`12932` remove usage of some deprecated
+functionality for compatibility with Python 3.10.
+
+
+Thanks
+------
+
+Many thanks to all the contributors to this release you can find all individual
+contributions to this milestone `on github <https://github.com/ipython/ipython/milestone/86>`__.
+In particular MrMino for responding to almost all new issues, and triaging many
+of the old ones, as well as takluyver, minrk, willingc for reacting quikly when
+we ran out of CI Hours.
+
+Thanks as well to organisations, QuantStack (martinRenou and SylvainCorlay) for
+extracting matplotlib inline backend into its own package, and the `D. E. Shaw group
+<https://deshaw.com/>`__ for sponsoring work on IPython and related libraries.
+
+
 .. _version 7.22:
 
 IPython 7.22

From cd4d6fb21226138403b92e8605926acd39f202b4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 30 Apr 2021 15:59:24 -0700
Subject: [PATCH 0534/1407] Drop support for numpy 1.16

We said we would do that some time ago and havent.

Likely for 7.24
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index f7be18e9641..0696e740e2f 100755
--- a/setup.py
+++ b/setup.py
@@ -181,7 +181,7 @@
         "pygments",
         "nbformat",
         "ipykernel",
-        "numpy>=1.16",
+        "numpy>=1.17",
     ],
     terminal=[],
     kernel=["ipykernel"],

From 44faac2c81662042e44c696c6ff136debdd73dd6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 30 Apr 2021 16:17:10 -0700
Subject: [PATCH 0535/1407] Remove release trigger.

We don't do github release and the action is broken anyway
---
 .github/workflows/release.yml | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 187a8072dbc..00000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Github releases
-
-on:
-  push:
-    tags:
-      - '*.*.*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
-
-      - name: Make packages
-        run: |
-          pip install --upgrade setuptools wheel
-          rm -rf dist/
-          python setup.py sdist
-          python setup.py bdist_wheel
-
-      - name: Github release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: dist/*
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From d943820307aa86c0d310b9b52f6699b30f0ccdae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 1 May 2021 16:15:58 -0400
Subject: [PATCH 0536/1407] IPython.core.pylabtools: fix
 configure_inline_support import

The deprecated function IPython.core.pylabtools.configure_inline_support
attempts to import configure_inline_support_orig from the module
matplotlib_inline.backend_inline, but the actual function name is
configure_inline_support. Correct the import.
---
 IPython/core/pylabtools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index c71b0cdb679..bb815956e62 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -383,6 +383,6 @@ def configure_inline_support(shell, backend):
         stacklevel=2,
     )
 
-    from matplotlib_inline.backend_inline import configure_inline_support_orig
+    from matplotlib_inline.backend_inline import configure_inline_support as configure_inline_support_orig
 
     configure_inline_support_orig(shell, backend)

From cb238a7e2034bdcae5258e08201dd80cd4174647 Mon Sep 17 00:00:00 2001
From: Paul Ivanov <pivanov5@bloomberg.net>
Date: Thu, 6 May 2021 20:54:47 -0700
Subject: [PATCH 0537/1407] fix darker version 1.2.3 linting

it looks like the current version of darker doesn't work properly if
isort isn't installed - see https://github.com/akaihola/darker/pull/132/files
so let's just install isort to fix it.
---
 .github/workflows/python-package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index db571707ec6..ef24d627813 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -28,7 +28,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install darker
+        pip install darker isort
     - name: Lint with darker
       run: |
         darker -r 60625f241f298b5039cb2debc365db38aa7bb522 --check --diff . || (

From 972f2fbe68562088cef774904eac3b4225f05130 Mon Sep 17 00:00:00 2001
From: Paul Ivanov <pivanov5@bloomberg.net>
Date: Thu, 6 May 2021 21:17:53 -0700
Subject: [PATCH 0538/1407] fix linting missed while darker was broken

---
 IPython/core/pylabtools.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index bb815956e62..1914deb28f2 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -383,6 +383,8 @@ def configure_inline_support(shell, backend):
         stacklevel=2,
     )
 
-    from matplotlib_inline.backend_inline import configure_inline_support as configure_inline_support_orig
+    from matplotlib_inline.backend_inline import (
+        configure_inline_support as configure_inline_support_orig,
+    )
 
     configure_inline_support_orig(shell, backend)

From ba74182e644390a1146c8749f88a5f0d226c14ba Mon Sep 17 00:00:00 2001
From: Ashwin Vishnu <9155111+ashwinvis@users.noreply.github.com>
Date: Tue, 13 Oct 2020 06:48:45 +0200
Subject: [PATCH 0539/1407] Warn if user executes !pip or !conda

Fixes #12204
---
 IPython/core/interactiveshell.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 22b531ec159..dbaa1ce2d29 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2521,6 +2521,18 @@ def system_raw(self, cmd):
           Command to execute.
         """
         cmd = self.var_expand(cmd, depth=1)
+
+        # warn if there is an IPython magic alternative.
+        main_cmd = cmd.split()[0]
+        has_magic_alternatives = ("pip", "conda")
+        if main_cmd in has_magic_alternatives:
+            warnings.warn(
+                (
+                    "You executed the system command !{0} which may not work "
+                    "as expected. Try the IPython magic %{0} instead."
+                ).format(main_cmd)
+            )
+
         # protect os.system from UNC paths on Windows, which it can't handle:
         if sys.platform == 'win32':
             from IPython.utils._process_win32 import AvoidUNCPath

From e0c24607cb40bc4d2cc6f7859526db9a857ee51c Mon Sep 17 00:00:00 2001
From: Sammy Al Hashemi <salhashemi2@bloomberg.net>
Date: Fri, 7 May 2021 12:09:30 -0400
Subject: [PATCH 0540/1407] Adding !cd and !ls warnings

---
 IPython/core/interactiveshell.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index dbaa1ce2d29..5e0119c06ea 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2521,11 +2521,16 @@ def system_raw(self, cmd):
           Command to execute.
         """
         cmd = self.var_expand(cmd, depth=1)
-
         # warn if there is an IPython magic alternative.
         main_cmd = cmd.split()[0]
-        has_magic_alternatives = ("pip", "conda")
-        if main_cmd in has_magic_alternatives:
+        has_magic_alternatives = ("pip", "conda", "cd", "ls")
+
+        # had to check if the command was an alias expanded because of `ls`
+        is_alias_expanded = self.alias_manager.is_alias(main_cmd) and \
+                (self.alias_manager.retrieve_alias(main_cmd).strip()
+                                                                == cmd.strip())
+
+        if main_cmd in has_magic_alternatives and not is_alias_expanded:
             warnings.warn(
                 (
                     "You executed the system command !{0} which may not work "

From 7a458e040e3c8a7f6edec78b14159ba98ae337bf Mon Sep 17 00:00:00 2001
From: Sammy Al Hashemi <salhashemi2@bloomberg.net>
Date: Fri, 7 May 2021 13:03:53 -0400
Subject: [PATCH 0541/1407] Fixed linter error

---
 IPython/core/interactiveshell.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 5e0119c06ea..47db3fe2b95 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2526,9 +2526,9 @@ def system_raw(self, cmd):
         has_magic_alternatives = ("pip", "conda", "cd", "ls")
 
         # had to check if the command was an alias expanded because of `ls`
-        is_alias_expanded = self.alias_manager.is_alias(main_cmd) and \
-                (self.alias_manager.retrieve_alias(main_cmd).strip()
-                                                                == cmd.strip())
+        is_alias_expanded = self.alias_manager.is_alias(main_cmd) and (
+            self.alias_manager.retrieve_alias(main_cmd).strip() == cmd.strip()
+        )
 
         if main_cmd in has_magic_alternatives and not is_alias_expanded:
             warnings.warn(

From a61fb992a51218f3f77cba733222af28634ac682 Mon Sep 17 00:00:00 2001
From: Sammy Al Hashemi <salhashemi2@bloomberg.net>
Date: Fri, 7 May 2021 14:01:04 -0400
Subject: [PATCH 0542/1407] Adding test for magic warnings

---
 IPython/core/tests/test_interactiveshell.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 84bea9cd457..9092ce5b455 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -600,9 +600,16 @@ def test_control_c(self, *mocks):
         try:
             self.system("sleep 1 # wont happen")
         except KeyboardInterrupt:
-            self.fail("system call should intercept "
-                      "keyboard interrupt from subprocess.call")
-        self.assertEqual(ip.user_ns['_exit_code'], -signal.SIGINT)
+            self.fail(
+                "system call should intercept "
+                "keyboard interrupt from subprocess.call"
+            )
+        self.assertEqual(ip.user_ns["_exit_code"], -signal.SIGINT)
+
+    def test_magic_warnings(self):
+        for magic_cmd in ("ls", "pip", "conda", "cd"):
+            with self.assertWarnsRegex(Warning, "You executed the system command"):
+                ip.system_raw(magic_cmd)
 
 # TODO: Exit codes are currently ignored on Windows.
 class TestSystemPipedExitCode(ExitCodeChecks):

From 2fcb6ed79f1f0f5e6693e4536ed5332d41b57058 Mon Sep 17 00:00:00 2001
From: Sammy Al Hashemi <salhashemi2@bloomberg.net>
Date: Fri, 7 May 2021 17:00:12 -0400
Subject: [PATCH 0543/1407] Changing the cache to use the same compiler as the
 one that does work on the AST in `run_cell_async`

---
 IPython/core/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 22b531ec159..c8647cc991c 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3122,7 +3122,7 @@ def error_before_exec(value):
         _run_async = False
 
         with self.builtin_trap:
-            cell_name = self.compile.cache(
+            cell_name = compiler.cache(
                 cell, self.execution_count, raw_code=raw_cell
             )
 

From d9d0535f5bc5f150ed5cfb71bcf424d544253678 Mon Sep 17 00:00:00 2001
From: Sammy Al Hashemi <salhashemi2@bloomberg.net>
Date: Fri, 7 May 2021 17:43:54 -0400
Subject: [PATCH 0544/1407] Fixing linter error

---
 IPython/core/interactiveshell.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index c8647cc991c..fb89b8fa0de 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3122,9 +3122,7 @@ def error_before_exec(value):
         _run_async = False
 
         with self.builtin_trap:
-            cell_name = compiler.cache(
-                cell, self.execution_count, raw_code=raw_cell
-            )
+            cell_name = compiler.cache(cell, self.execution_count, raw_code=raw_cell)
 
             with self.display_trap:
                 # Compile to bytecode

From 1f29ce5ff5e305d4ce5c2126b2a7c4beb58244e6 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Thu, 6 May 2021 22:35:46 +0200
Subject: [PATCH 0545/1407] Ensure %recall does not show error after argument
 eval

---
 IPython/core/magics/history.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/core/magics/history.py b/IPython/core/magics/history.py
index 3b95ee7d7d3..bc1bfb947d6 100644
--- a/IPython/core/magics/history.py
+++ b/IPython/core/magics/history.py
@@ -282,6 +282,7 @@ def recall(self, arg):
                 return
         else:
             self.shell.set_next_input(cmd.rstrip())
+            return
         print("Couldn't evaluate or find in history:", arg)
 
     @line_magic

From 941d4409674ab6bcbe93785281719062aa2cbf3d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 10 May 2021 11:02:39 -0700
Subject: [PATCH 0546/1407] Implement more predicates to skip frames in
 debugger.

This refactors the code to have distinct predicates, give them
individual flags; and add the default predicates that read-only files
should be hidden.
---
 IPython/core/debugger.py          | 86 +++++++++++++++++++++++++++----
 docs/source/whatsnew/version7.rst | 44 ++++++++++++++++
 2 files changed, 120 insertions(+), 10 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 0f4e6f99df3..88c68b23477 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -33,6 +33,7 @@
 import sys
 import warnings
 import re
+import os
 
 from IPython import get_ipython
 from IPython.utils import PyColorize
@@ -281,6 +282,9 @@ def __init__(self, color_scheme=None, completekey=None,
         self.prompt = prompt
         self.skip_hidden = True
 
+        # list of predicates we use to skip frames
+        self._predicates = {"tbhide": True, "readonly": True, "ipython_internal": True}
+
     def set_colors(self, scheme):
         """Shorthand access to the color table scheme selector method."""
         self.color_scheme_table.set_active_scheme(scheme)
@@ -292,6 +296,26 @@ def set_trace(self, frame=None):
         self.initial_frame = frame
         return super().set_trace(frame)
 
+    def _hidden_predicate(self, frame):
+        """
+        Given a frame return whether it it should be hidden or not by IPython.
+        """
+
+        if self._predicates["readonly"]:
+            fname = frame.f_code.co_filename
+            # we need to check for file existence and interactively define
+            # function would otherwise appear as RO.
+            if os.path.isfile(fname) and not os.access(fname, os.W_OK):
+                return True
+
+        if self._predicates["tbhide"]:
+            if frame in (self.curframe, getattr(self, "initial_frame", None)):
+                return False
+            else:
+                return frame.f_locals.get("__tracebackhide__", False)
+
+        return False
+
     def hidden_frames(self, stack):
         """
         Given an index in the stack return whether it should be skipped.
@@ -302,14 +326,9 @@ def hidden_frames(self, stack):
         # locals whenever the .f_locals accessor is called, so we
         # avoid calling it here to preserve self.curframe_locals.
         # Futhermore, there is no good reason to hide the current frame.
-        ip_hide = [
-            False
-            if s[0] in (self.curframe, getattr(self, "initial_frame", None))
-            else s[0].f_locals.get("__tracebackhide__", False)
-            for s in stack
-        ]
+        ip_hide = [self._hidden_predicate(s[0]) for s in stack]
         ip_start = [i for i, s in enumerate(ip_hide) if s == "__ipython_bottom__"]
-        if ip_start:
+        if ip_start and self._predicates["ipython_internal"]:
             ip_hide = [h if i > ip_start[0] else True for (i, h) in enumerate(ip_hide)]
         return ip_hide
 
@@ -532,15 +551,62 @@ def print_list_lines(self, filename, first, last):
         except KeyboardInterrupt:
             pass
 
+    def do_skip_predicates(self, args):
+        """
+        Turn on/off individual predicates as to whether a frame should be hidden/skip.
+
+        The global option to skip (or not) hidden frames is set with skip_hidden
+
+        To change the value of a predicate
+
+            skip_predicates key [true|false]
+
+        Call without arguments to see the current values.
+
+        """
+        if not args.strip():
+            print("current predicates:")
+            for (p, v) in self._predicates.items():
+                print("   ", p, ":", v)
+            return
+        type_value = args.strip().split(" ")
+        if len(type_value) != 2:
+            print("Usage: skip_predicates <type> <value>")
+            return
+
+        type_, value = type_value
+        if type_ not in self._predicates:
+            print(f"{type_!r} not in {set(self._predicates.keys())}")
+            return
+        if value.lower() not in ("true", "yes", "1", "no", "false", "0"):
+            print(
+                f"{value} invalid use one of ('true', 'yes', '1', 'no', 'false', '0')"
+            )
+            return
+
+        self._predicates[type_] = value.lower() in ("true", "yes", "1")
+        if not any(self._predicates.values()):
+            print(
+                "Warning, all predicates set to False, skip_hidden may not have any effects."
+            )
+
     def do_skip_hidden(self, arg):
         """
         Change whether or not we should skip frames with the
         __tracebackhide__ attribute.
         """
-        if arg.strip().lower() in ("true", "yes"):
+        if not arg.strip():
+            print(
+                f"skip_hidden = {self.skip_hidden}, use 'yes','no', 'true', or 'false' to change."
+            )
+        elif arg.strip().lower() in ("true", "yes"):
             self.skip_hidden = True
         elif arg.strip().lower() in ("false", "no"):
             self.skip_hidden = False
+        if not any(self._predicates.values()):
+            print(
+                "Warning, all predicates set to False, skip_hidden may not have any effects."
+            )
 
     def do_list(self, arg):
         """Print lines of code from the current stack frame
@@ -704,7 +770,7 @@ def do_where(self, arg):
     def stop_here(self, frame):
         hidden = False
         if self.skip_hidden:
-            hidden = frame.f_locals.get("__tracebackhide__", False)
+            hidden = self._hidden_predicate(frame)
         if hidden:
             Colors = self.color_scheme_table.active_colors
             ColorsNormal = Colors.Normal
@@ -720,7 +786,7 @@ def do_up(self, arg):
         Will skip hidden frames.
         """
         # modified version of upstream that skips
-        # frames with __tracebackide__
+        # frames with __tracebackhide__
         if self.curindex == 0:
             self.error("Oldest frame")
             return
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index eb8916ee0de..b643217cc1e 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,50 @@
  7.x Series
 ============
 
+
+The debugger (and ``%debug`` magic) have been improved to skip and hide frames
+originating from files that are not writable to the user, as these are less
+likely to be the source of errors, or be part of system files.
+
+In addition to the global ``skip_hidden True|False`` command, the debugger has
+gained finer grained control of predicates as to whether to a frame should be
+considered hidden. So far 3 predicates are available and activated by default:
+
+  - ``tbhide``: frames containing the local variable ``__tracebackhide__`` set to
+    True.
+  - ``readonly``: frames originating from readonly files.
+  - ``ipython_internal``: frames that are likely to be from IPython internal code.
+
+You can toggle individual predicates during a session with
+
+.. code-block::
+
+   ipdb> skip_predicates readonly False
+
+Read-only files will not be considered hidden frames.
+
+
+You can call ``skip_predicates`` without arguments to see the states of current
+predicates:
+
+.. code-block::
+
+    ipdb> skip_predicates
+    current predicates:
+        tbhide : True
+        readonly : True
+        ipython_internal : True
+
+If all predicates are set to ``False``,  ``skip_hidden`` will practically have
+no effect. We attempt to warn you when all predicates are False.
+
+Note that the ``readonly`` predicate may increase disk access as we check for
+file access permission for all frames on many command invocation, but is usually
+cached by operating system. Let us know if you encounter any issues.
+
+
+
+
 .. _version 7.23:
 
 IPython 7.23

From 84f0593dc3b51d60059ac696bbeeb8ea7ff07e44 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 11 May 2021 11:55:09 -0700
Subject: [PATCH 0547/1407] Update IPython/core/debugger.py

Co-authored-by: Blazej Michalik <6691643+MrMino@users.noreply.github.com>
---
 IPython/core/debugger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 88c68b23477..1674c6b9b6e 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -580,7 +580,7 @@ def do_skip_predicates(self, args):
             return
         if value.lower() not in ("true", "yes", "1", "no", "false", "0"):
             print(
-                f"{value} invalid use one of ('true', 'yes', '1', 'no', 'false', '0')"
+                f"{repr(value)} is invalid - use one of ('true', 'yes', '1', 'no', 'false', '0')"
             )
             return
 

From 1b8fbc49c006bf0ead5ac7d7fade859f44789808 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 11 May 2021 11:58:48 -0700
Subject: [PATCH 0548/1407] improve error message

---
 IPython/core/debugger.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 1674c6b9b6e..471fa6ffe5c 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -571,7 +571,9 @@ def do_skip_predicates(self, args):
             return
         type_value = args.strip().split(" ")
         if len(type_value) != 2:
-            print("Usage: skip_predicates <type> <value>")
+            print(
+                f"Usage: skip_predicates <type> <value>, with <type> one of {set(self._predicates.keys())}"
+            )
             return
 
         type_, value = type_value
@@ -580,7 +582,7 @@ def do_skip_predicates(self, args):
             return
         if value.lower() not in ("true", "yes", "1", "no", "false", "0"):
             print(
-                f"{repr(value)} is invalid - use one of ('true', 'yes', '1', 'no', 'false', '0')"
+                f"{value!r} is invalid - use one of ('true', 'yes', '1', 'no', 'false', '0')"
             )
             return
 

From 73e6371c5e4d01501fcbf9b29b800c72d937a2d1 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Fri, 14 May 2021 00:01:52 +0200
Subject: [PATCH 0549/1407] Nicer output for erroneous args to %rerun -l

---
 IPython/core/magics/history.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/IPython/core/magics/history.py b/IPython/core/magics/history.py
index 3b95ee7d7d3..87716672c5c 100644
--- a/IPython/core/magics/history.py
+++ b/IPython/core/magics/history.py
@@ -301,6 +301,14 @@ def rerun(self, parameter_s=''):
         opts, args = self.parse_options(parameter_s, 'l:g:', mode='string')
         if "l" in opts:         # Last n lines
             n = int(opts['l'])
+
+            if n == 0:
+                print("Requested 0 last lines - nothing to run")
+                return
+            elif n < 0:
+                print("Number of lines to rerun cannot be negative")
+                return
+
             hist = self.shell.history_manager.get_tail(n)
         elif "g" in opts:       # Search
             p = "*"+opts['g']+"*"

From f5ac485fce32a66f24680ce170784e897ec14043 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 28 May 2021 17:32:55 +0200
Subject: [PATCH 0550/1407] Turn Readonly predicates to false.

It has been pointed to me privately that this is a change of default which is
potentially hard to understand, or discover how to change the values.
Turning back to False by default.
---
 IPython/core/debugger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 471fa6ffe5c..29d579435a7 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -283,7 +283,7 @@ def __init__(self, color_scheme=None, completekey=None,
         self.skip_hidden = True
 
         # list of predicates we use to skip frames
-        self._predicates = {"tbhide": True, "readonly": True, "ipython_internal": True}
+        self._predicates = {"tbhide": True, "readonly": False, "ipython_internal": True}
 
     def set_colors(self, scheme):
         """Shorthand access to the color table scheme selector method."""

From aca83d5d6c22f0bd40723765cc64fc63697544ae Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 28 May 2021 18:13:31 +0200
Subject: [PATCH 0551/1407] Prepare release notes for IPython 7.24

---
 docs/source/whatsnew/version7.rst | 58 ++++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index b643217cc1e..11560115ebe 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,27 +2,48 @@
  7.x Series
 ============
 
+.. _version 7.24:
 
-The debugger (and ``%debug`` magic) have been improved to skip and hide frames
+IPython 7.24
+============
+
+Third release of IPython for 2021, mostly containing bug fixes. A couple of not
+typical updates:
+
+Misc
+----
+
+
+ - Fix an issue where ``%recall`` would both succeeded and print an error message
+   it failed. :ghpull:`12952`
+ - Drop support for NumPy 1.16 – practically has no effect beyond indicating in
+   package metadata that we do not support it. :ghpull:`12937`
+
+Debugger improvements
+---------------------
+
+The debugger (and ``%debug`` magic) have been improved and can skip or hide frames
 originating from files that are not writable to the user, as these are less
-likely to be the source of errors, or be part of system files.
+likely to be the source of errors, or be part of system files this can be a useful
+addition when debugging long errors.
 
 In addition to the global ``skip_hidden True|False`` command, the debugger has
 gained finer grained control of predicates as to whether to a frame should be
-considered hidden. So far 3 predicates are available and activated by default:
+considered hidden. So far 3 predicates are available :
 
   - ``tbhide``: frames containing the local variable ``__tracebackhide__`` set to
     True.
-  - ``readonly``: frames originating from readonly files.
-  - ``ipython_internal``: frames that are likely to be from IPython internal code.
+  - ``readonly``: frames originating from readonly files, set to False.
+  - ``ipython_internal``: frames that are likely to be from IPython internal
+    code, set to True.
 
 You can toggle individual predicates during a session with
 
 .. code-block::
 
-   ipdb> skip_predicates readonly False
+   ipdb> skip_predicates readonly True
 
-Read-only files will not be considered hidden frames.
+Read-only files will now be considered hidden frames.
 
 
 You can call ``skip_predicates`` without arguments to see the states of current
@@ -33,7 +54,7 @@ predicates:
     ipdb> skip_predicates
     current predicates:
         tbhide : True
-        readonly : True
+        readonly : False
         ipython_internal : True
 
 If all predicates are set to ``False``,  ``skip_hidden`` will practically have
@@ -41,15 +62,27 @@ no effect. We attempt to warn you when all predicates are False.
 
 Note that the ``readonly`` predicate may increase disk access as we check for
 file access permission for all frames on many command invocation, but is usually
-cached by operating system. Let us know if you encounter any issues.
+cached by operating systems. Let us know if you encounter any issues.
+
+
+Thanks
+------
+
+Many thanks to all the contributors to this release you can find all individual
+contributions to this milestone `on github <https://github.com/ipython/ipython/milestone/87>`__.
+
+Thanks as well to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries, in particular above mentioned
+improvements to the debugger.
 
 
 
 
 .. _version 7.23:
 
-IPython 7.23
-============
+IPython 7.23 and 7.23.1
+=======================
+
 
 Third release of IPython for 2021, mostly containing bug fixes. A couple of not
 typical updates:
@@ -63,7 +96,7 @@ typical updates:
    matplotlib inline backend specific behavior. It is available on PyPI and
    conda-forge thus should not be a problem to upgrade to this version. If you
    are a package maintainer that might be an extra dependency to package first.
-   :ghpull:`12817`
+   :ghpull:`12817` (IPython 7.23.1 fix a typo that made this change fail)
 
 In the addition/new feature category, ``display()`` now have a ``clear=True``
 option to clear the display if any further outputs arrives, allowing users to
@@ -76,6 +109,7 @@ In code cleanup category :ghpull:`12932` remove usage of some deprecated
 functionality for compatibility with Python 3.10.
 
 
+
 Thanks
 ------
 

From b45a3b59c8737de7236b090157ab4156bf0ea4fa Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 28 May 2021 18:43:02 +0200
Subject: [PATCH 0552/1407] Improvement to release script

---
 tools/release_helper.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 317ef5eb4e9..ee7c06b3462 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -21,6 +21,7 @@ WHITE=$(tput setaf 7)
 NOR=$(tput sgr0)
 
 
+echo "Will use $EDITOR to edit files when necessary"
 echo -n "PREV_RELEASE (X.y.z) [$PREV_RELEASE]: "
 read input
 PREV_RELEASE=${input:-$PREV_RELEASE}
@@ -47,6 +48,18 @@ ask_section(){
 }
 
 
+maybe_edit(){
+    echo
+    echo $BLUE"$1"$NOR 
+    echo -n $GREEN"Press e to Edit $1, any other keys to skip: "$NOR
+    read -n1 value
+    echo 
+    if [ $value = 'e' ]  ; then
+        $EDITOR $1
+    fi
+}
+
+
 
 echo 
 if ask_section "Updating what's new with informations from docs/source/whatsnew/pr"
@@ -104,6 +117,7 @@ echo $GREEN"I tried ${RED}sed -i bkp -e '/Uncomment/s/^# //g' IPython/core/relea
 sed -i bkp -e '/Uncomment/s/^# //g' IPython/core/release.py
 rm IPython/core/release.pybkp
 git diff
+maybe_edit IPython/core/release.py
 
 echo $GREEN"Press enter to continue"$NOR
 read
@@ -151,6 +165,7 @@ then
    rm IPython/core/release.pybkp
    git diff
    echo $GREEN"Please bump ${RED}the minor version number${NOR}"
+   maybe_edit IPython/core/release.py
    echo ${BLUE}"Do not commit yet – we'll do it later."$NOR
 
    

From 29cc718058b5efa9225b4e9d8b8a3e18a4525f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E4=B9=9D=E9=BC=8E?= <109224573@qq.com>
Date: Tue, 1 Jun 2021 07:39:08 +0000
Subject: [PATCH 0553/1407] DOC: Use https for readthedocs.io

---
 docs/source/conf.py                        | 2 +-
 docs/source/config/custommagics.rst        | 2 +-
 docs/source/config/integrating.rst         | 2 +-
 docs/source/development/wrapperkernels.rst | 2 +-
 docs/source/index.rst                      | 8 ++++----
 docs/source/install/index.rst              | 2 +-
 docs/source/interactive/index.rst          | 2 +-
 docs/source/overview.rst                   | 4 ++--
 docs/source/whatsnew/github-stats-1.0.rst  | 2 +-
 docs/source/whatsnew/version5.rst          | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index eb5b39eacb0..2312cc248b0 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -18,7 +18,7 @@
 import sys, os
 from pathlib import Path
 
-# http://read-the-docs.readthedocs.io/en/latest/faq.html
+# https://read-the-docs.readthedocs.io/en/latest/faq.html
 ON_RTD = os.environ.get('READTHEDOCS', None) == 'True'
 
 if ON_RTD:
diff --git a/docs/source/config/custommagics.rst b/docs/source/config/custommagics.rst
index f4daa9a9a4c..99d4068773c 100644
--- a/docs/source/config/custommagics.rst
+++ b/docs/source/config/custommagics.rst
@@ -151,7 +151,7 @@ Complete Example
 
 Here is a full example of a magic package. You can distribute magics using
 setuptools, distutils, or any other distribution tools like `flit
-<http://flit.readthedocs.io>`_ for pure Python packages.
+<https://flit.readthedocs.io>`_ for pure Python packages.
 
 When distributing magics as part of a package, recommended best practice is to
 execute the registration inside the `load_ipython_extension` as demonstrated in
diff --git a/docs/source/config/integrating.rst b/docs/source/config/integrating.rst
index 0a1f0ec36a0..7041de5de52 100644
--- a/docs/source/config/integrating.rst
+++ b/docs/source/config/integrating.rst
@@ -103,7 +103,7 @@ Rarely, you might want to display a custom traceback when reporting an
 exception. To do this, define the custom traceback using
 `_render_traceback_(self)` method which returns a list of strings, one string
 for each line of the traceback. For example, the `ipyparallel
-<http://ipyparallel.readthedocs.io/>`__ a parallel computing framework for
+<https://ipyparallel.readthedocs.io/>`__ a parallel computing framework for
 IPython, does this to display errors from multiple engines.
 
 Please be conservative in using this feature; by replacing the default traceback
diff --git a/docs/source/development/wrapperkernels.rst b/docs/source/development/wrapperkernels.rst
index d734c30ee99..a15cf8e4326 100644
--- a/docs/source/development/wrapperkernels.rst
+++ b/docs/source/development/wrapperkernels.rst
@@ -7,7 +7,7 @@ You can now re-use the kernel machinery in IPython to easily make new kernels.
 This is useful for languages that have Python bindings, such as `Octave
 <http://www.gnu.org/software/octave/>`_ (via
 `Oct2Py <http://blink1073.github.io/oct2py/>`_), or languages
-where the REPL can be controlled in a tty using `pexpect <http://pexpect.readthedocs.io/en/latest/>`_,
+where the REPL can be controlled in a tty using `pexpect <https://pexpect.readthedocs.io/en/latest/>`_,
 such as bash.
 
 .. seealso::
diff --git a/docs/source/index.rst b/docs/source/index.rst
index c627993ab58..9cec0577bed 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -57,7 +57,7 @@ features:
 
 The Command line interface inherits the above functionality and adds 
  
-* real multi-line editing thanks to `prompt_toolkit <http://python-prompt-toolkit.readthedocs.io/en/stable/>`_.
+* real multi-line editing thanks to `prompt_toolkit <https://python-prompt-toolkit.readthedocs.io/en/stable/>`_.
  
 * syntax highlighting as you type.
 
@@ -69,7 +69,7 @@ it allows:
 * the object to create a rich display of Html, Images, Latex, Sound and
   Video.
 
-* interactive widgets with the use of the `ipywidgets <http://ipywidgets.readthedocs.io/en/stable/>`_ package.
+* interactive widgets with the use of the `ipywidgets <https://ipywidgets.readthedocs.io/en/stable/>`_ package.
 
 
 This documentation will walk you through most of the features of the IPython
@@ -102,9 +102,9 @@ repository <http://github.com/ipython/ipython>`_.
 
 .. seealso::
 
-   `Jupyter documentation <http://jupyter.readthedocs.io/en/latest/>`__
+   `Jupyter documentation <https://jupyter.readthedocs.io/en/latest/>`__
      The Jupyter documentation provides information about the Notebook code and other Jupyter sub-projects.
-   `ipyparallel documentation <http://ipyparallel.readthedocs.io/en/latest/>`__
+   `ipyparallel documentation <https://ipyparallel.readthedocs.io/en/latest/>`__
      Formerly ``IPython.parallel``.
 
 
diff --git a/docs/source/install/index.rst b/docs/source/install/index.rst
index 3793fae4e83..41036d83675 100644
--- a/docs/source/install/index.rst
+++ b/docs/source/install/index.rst
@@ -51,7 +51,7 @@ for more help see
 
 .. seealso::
 
-   `Installing Jupyter <http://jupyter.readthedocs.io/en/latest/install.html>`__
+   `Installing Jupyter <https://jupyter.readthedocs.io/en/latest/install.html>`__
      The Notebook, nbconvert, and many other former pieces of IPython are now
      part of Project Jupyter.
 
diff --git a/docs/source/interactive/index.rst b/docs/source/interactive/index.rst
index 7010c51b320..6684eb51bfb 100644
--- a/docs/source/interactive/index.rst
+++ b/docs/source/interactive/index.rst
@@ -29,4 +29,4 @@ done some work in the classic Python REPL.
 .. seealso::
 
     `A Qt Console for Jupyter <https://jupyter.org/qtconsole/>`__
-    `The Jupyter Notebook <http://jupyter-notebook.readthedocs.io/en/latest/>`__
+    `The Jupyter Notebook <https://jupyter-notebook.readthedocs.io/en/latest/>`__
diff --git a/docs/source/overview.rst b/docs/source/overview.rst
index fa70a2f3beb..2c5920e35e9 100644
--- a/docs/source/overview.rst
+++ b/docs/source/overview.rst
@@ -219,7 +219,7 @@ different numbers which correspond to the Process ID of the kernel.
 
 You can read more about using `jupyter qtconsole
 <https://jupyter.org/qtconsole/>`_, and
-`jupyter notebook <http://jupyter-notebook.readthedocs.io/en/latest/>`_. There
+`jupyter notebook <https://jupyter-notebook.readthedocs.io/en/latest/>`_. There
 is also a :ref:`message spec <messaging>` which documents the protocol for
 communication between kernels
 and clients.
@@ -234,7 +234,7 @@ Interactive parallel computing
 
 
 This functionality is optional and now part of the `ipyparallel
-<http://ipyparallel.readthedocs.io/>`_ project.
+<https://ipyparallel.readthedocs.io/>`_ project.
 
 Portability and Python requirements
 -----------------------------------
diff --git a/docs/source/whatsnew/github-stats-1.0.rst b/docs/source/whatsnew/github-stats-1.0.rst
index 03622ece1d6..4aeb36eecf3 100644
--- a/docs/source/whatsnew/github-stats-1.0.rst
+++ b/docs/source/whatsnew/github-stats-1.0.rst
@@ -1099,7 +1099,7 @@ Pull Requests (793):
 * :ghpull:`2274`: CLN: Use name to id mapping of notebooks instead of searching.
 * :ghpull:`2270`: SSHLauncher tweaks
 * :ghpull:`2269`: add missing location when disambiguating controller IP
-* :ghpull:`2263`: Allow docs to build on http://readthedocs.io/
+* :ghpull:`2263`: Allow docs to build on https://readthedocs.io/
 * :ghpull:`2256`: Adding data publication example notebook.
 * :ghpull:`2255`: better flush iopub with AsyncResults
 * :ghpull:`2261`: Fix: longest_substr([]) -> ''
diff --git a/docs/source/whatsnew/version5.rst b/docs/source/whatsnew/version5.rst
index 62aea160870..61b6ca0aeb3 100644
--- a/docs/source/whatsnew/version5.rst
+++ b/docs/source/whatsnew/version5.rst
@@ -307,7 +307,7 @@ and tab completions that don't clutter up your history.
     :target: ../_images/ptshell_features.png
 
 These features are provided by the Python library `prompt_toolkit
-<http://python-prompt-toolkit.readthedocs.io/en/stable/>`__, which replaces
+<https://python-prompt-toolkit.readthedocs.io/en/stable/>`__, which replaces
 ``readline`` throughout our terminal interface.
 
 Relying on this pure-Python, cross platform module also makes it simpler to

From 8d0d6dca14828ab92671821ada629e173d41dc9d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 1 Jun 2021 18:46:03 +0200
Subject: [PATCH 0554/1407] Document how to change the default predicates for
 the debugger.

Also make the default a class attribute for progrmatic modifications
---
 IPython/core/debugger.py          | 40 ++++++++++++++++++++++++-------
 docs/source/whatsnew/version7.rst | 22 ++++++++++++++---
 2 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 29d579435a7..b25d2d7e49e 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -199,21 +199,39 @@ class Pdb(OldPdb):
     for a standalone version that uses prompt_toolkit, see
     `IPython.terminal.debugger.TerminalPdb` and
     `IPython.terminal.debugger.set_trace()`
+
+
+    This debugger can hide and skip frames that are tagged according to some predicates.
+    See the `skip_predicates` commands.
+
     """
 
+    default_predicates = {"tbhide": True, "readonly": False, "ipython_internal": True}
+
     def __init__(self, color_scheme=None, completekey=None,
                  stdin=None, stdout=None, context=5, **kwargs):
         """Create a new IPython debugger.
 
-        :param color_scheme: Deprecated, do not use.
-        :param completekey: Passed to pdb.Pdb.
-        :param stdin: Passed to pdb.Pdb.
-        :param stdout: Passed to pdb.Pdb.
-        :param context: Number of lines of source code context to show when
+        Parameters
+        ----------
+        color_scheme : default None
+            Deprecated, do not use.
+        completekey : default None
+            Passed to pdb.Pdb.
+        stdin : default None
+            Passed to pdb.Pdb.
+        stdout : default None
+            Passed to pdb.Pdb.
+        context : int
+            Number of lines of source code context to show when
             displaying stacktrace information.
-        :param kwargs: Passed to pdb.Pdb.
-            The possibilities are python version dependent, see the python
-            docs for more info.
+        **kwargs
+            Passed to pdb.Pdb.
+
+        Notes
+        -----
+        The possibilities are python version dependent, see the python
+        docs for more info.
         """
 
         # Parent constructor:
@@ -283,7 +301,7 @@ def __init__(self, color_scheme=None, completekey=None,
         self.skip_hidden = True
 
         # list of predicates we use to skip frames
-        self._predicates = {"tbhide": True, "readonly": False, "ipython_internal": True}
+        self._predicates = self.default_predicates
 
     def set_colors(self, scheme):
         """Shorthand access to the color table scheme selector method."""
@@ -563,6 +581,10 @@ def do_skip_predicates(self, args):
 
         Call without arguments to see the current values.
 
+        To permanently change the value of an option add the corresponding
+        command to your ``~/.pdbrc`` file. If you are programmatically using the
+        Pdb instance you can also change the ``default_predicates`` class
+        attribute.
         """
         if not args.strip():
             print("current predicates:")
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 11560115ebe..a8768d6aba8 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -64,6 +64,22 @@ Note that the ``readonly`` predicate may increase disk access as we check for
 file access permission for all frames on many command invocation, but is usually
 cached by operating systems. Let us know if you encounter any issues.
 
+As the IPython debugger does not use the traitlets infrastructure for
+configuration, by editing your ``.pdbrc`` files and appending commands you would
+like to be executed just before entering the interactive prompt. For example:
+
+
+.. code::
+
+    # file : ~/.pdbrc
+    skip_predicates readonly True
+    skip_predicates tbhide False
+
+Will hide read only frames by default and show frames marked with
+``__tracebackhide__``.
+
+
+
 
 Thanks
 ------
@@ -236,14 +252,14 @@ was exceptionally no release last month.
   - Docs docs formatting that make the install commands work on zsh
     :ghpull:`12587`
   - Always display the last frame in tracebacks even if hidden with
-    ``__traceback_hide__`` :ghpull:`12601`
+    ``__tracebackhide__`` :ghpull:`12601`
   - Avoid an issue where a callback can be registered multiple times.
     :ghpull:`12625`
   - Avoid an issue in debugger mode where frames changes could be lost.
     :ghpull:`12627`
 
   - Never hide the frames that invoke a debugger, even if marked as hidden by
-    ``__traceback_hide__`` :ghpull:`12631`
+    ``__tracebackhide__`` :ghpull:`12631`
   - Fix calling the debugger in a recursive manner :ghpull:`12659`
 
 
@@ -394,7 +410,7 @@ Change of API and exposed objects automatically detected using `frappuccino
 <https://pypi.org/project/frappuccino/>`_ (still in beta):
 
 
-The following items are new and mostly related to understanding ``__tracebackbhide__``::
+The following items are new and mostly related to understanding ``__tracebackbide__``::
 
     + IPython.core.debugger.Pdb.do_down(self, arg)
     + IPython.core.debugger.Pdb.do_skip_hidden(self, arg)

From 02bf38cb21b47f768973f81aa556140a36822811 Mon Sep 17 00:00:00 2001
From: Krzysztof Cybulski <k.cybulski.dev@tuta.io>
Date: Wed, 2 Jun 2021 02:13:45 +0200
Subject: [PATCH 0555/1407] Fix typo in
 IPython.lib.pretty._seq_pprinter_factory doc

The docstring stated _seq_pprinter_factory is used for the default
pprint for dicts, but dicts use _dict_pprinter_factory instead.
---
 IPython/lib/pretty.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/lib/pretty.py b/IPython/lib/pretty.py
index 921c19d0b83..7a18f01c6cd 100644
--- a/IPython/lib/pretty.py
+++ b/IPython/lib/pretty.py
@@ -626,7 +626,7 @@ def _default_pprint(obj, p, cycle):
 def _seq_pprinter_factory(start, end):
     """
     Factory that returns a pprint function useful for sequences.  Used by
-    the default pprint for tuples, dicts, and lists.
+    the default pprint for tuples and lists.
     """
     def inner(obj, p, cycle):
         if cycle:

From 0975af51e6c9e474096849744340675f13c5b8d6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 2 Jun 2021 13:10:35 +0200
Subject: [PATCH 0556/1407] Backport PR #13000: Allow to control if reporting
 hidden frames

---
 IPython/core/debugger.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index b25d2d7e49e..36f0e71a685 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -299,6 +299,7 @@ def __init__(self, color_scheme=None, completekey=None,
         # Set the prompt - the default prompt is '(Pdb)'
         self.prompt = prompt
         self.skip_hidden = True
+        self.report_skipped = True
 
         # list of predicates we use to skip frames
         self._predicates = self.default_predicates
@@ -796,10 +797,12 @@ def stop_here(self, frame):
         if self.skip_hidden:
             hidden = self._hidden_predicate(frame)
         if hidden:
-            Colors = self.color_scheme_table.active_colors
-            ColorsNormal = Colors.Normal
-            print(f"{Colors.excName}    [... skipped 1 hidden frame]{ColorsNormal}\n")
-
+            if self.report_skipped:
+                Colors = self.color_scheme_table.active_colors
+                ColorsNormal = Colors.Normal
+                print(
+                    f"{Colors.excName}    [... skipped 1 hidden frame]{ColorsNormal}\n"
+                )
         return super().stop_here(frame)
 
     def do_up(self, arg):

From 6c8bfc4897d4b507d58f3809c072f08028a9690e Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Thu, 3 Jun 2021 17:03:28 -0700
Subject: [PATCH 0557/1407]  Clarify rich display docs, tabulate reprs

This is a draft; text wrapping is not finalized.
- when are the mimebundle and ipython_display methods available?
- can repr_pretty also return metadata?
- is the sphinx "autosectionlabel" extension enabled?
for #12992
---
 docs/source/config/integrating.rst | 121 ++++++++++++++++++++++-------
 1 file changed, 92 insertions(+), 29 deletions(-)

diff --git a/docs/source/config/integrating.rst b/docs/source/config/integrating.rst
index 7041de5de52..783a825a814 100644
--- a/docs/source/config/integrating.rst
+++ b/docs/source/config/integrating.rst
@@ -24,14 +24,59 @@ returns a list of objects which are possible keys in a subscript expression
 Rich display
 ============
 
-The notebook and the Qt console can display richer representations of objects.
-To use this, you can define any of a number of ``_repr_*_()`` methods. Note that
-these are surrounded by single, not double underscores.
-
-Both the notebook and the Qt console can display ``svg``, ``png`` and ``jpeg``
-representations. The notebook can also display ``html``, ``javascript``,
-``markdown`` and ``latex``. If the methods don't exist, or return ``None``, it
-falls back to a standard ``repr()``.
+Custom methods
+----------------------
+IPython can display richer representations of objects.
+To do this, you can define ``_ipython_display_()``, or any of a number of 
+``_repr_*_()`` methods. 
+Note that these are surrounded by single, not double underscores.
+
+.. list-table:: Supported ``_repr_*_`` methods
+   :widths: 20 15 15 15
+   :header-rows: 1
+   
+   * - Format
+     - REPL
+     - Notebook
+     - Qt Console
+   * - ``_repr_pretty_``
+     - yes
+     - yes
+     - yes
+   * - ``_repr_svg_``
+     - no
+     - yes
+     - yes
+   * - ``_repr_png_``
+     - no
+     - yes
+     - yes
+   * - ``_repr_jpeg_``
+     - no
+     - yes
+     - yes
+   * - ``_repr_html_``
+     - no
+     - yes
+     - no
+   * - ``_repr_javascript_``
+     - no
+     - yes
+     - no
+   * - ``_repr_markdown_``
+     - no
+     - yes
+     - no
+   * - ``_repr_latex_``
+     - no
+     - yes
+     - no
+   * - ``_repr_mimebundle_``
+     - no
+     - ?
+     - ?
+
+If the methods don't exist, or return ``None``, the standard ``repr()`` is used.
 
 For example::
 
@@ -42,43 +87,61 @@ For example::
         def _repr_html_(self):
             return "<h1>" + self.text + "</h1>"
 
-We often want to provide frontends with guidance on how to display the data. To
-support this, ``_repr_*_()`` methods can also return a ``(data, metadata)``
-tuple where ``metadata`` is a dictionary containing arbitrary key-value pairs for
-the frontend to interpret. An example use case is ``_repr_jpeg_()``, which can
-be set to return a jpeg image and a ``{'height': 400, 'width': 600}`` dictionary
-to inform the frontend how to size the image.
 
-There are also two more powerful display methods:
+Special methods
+^^^^^^^^^^^^^^^
+
+Pretty printing
+"""""""""""""""
+
+To customize how your object is pretty-printed, add a `_repr_pretty_` method
+to the class. 
+The method should accept a pretty printer, and a boolean that indicates whether
+the printer detected a cycle.
+The method should act on the printer to produce your customized pretty output.
+Here is an example::
+
+    class MyObject(object):
+
+        def _repr_pretty_(self, p, cycle):
+            if cycle:
+                p.text('MyObject(...)')
+            else:
+                p.text('MyObject[...]')
+
+For details on how to use the pretty printer, see :py:mod:`IPython.lib.pretty`.
+
+More powerful methods
+"""""""""""""""""""""
 
 .. class:: MyObject
 
    .. method:: _repr_mimebundle_(include=None, exclude=None)
 
      Should return a dictionary of multiple formats, keyed by mimetype, or a tuple
-     of two dictionaries: *data, metadata*. If this returns something, other
-     ``_repr_*_`` methods are ignored. The method should take keyword arguments
-     ``include`` and ``exclude``, though it is not required to respect them.
+     of two dictionaries: *data, metadata* (see :ref:`Metadata`).
+     If this returns something, other ``_repr_*_`` methods are ignored.
+     The method should take keyword arguments ``include`` and ``exclude``, though 
+     it is not required to respect them.
 
    .. method:: _ipython_display_()
 
       Displays the object as a side effect; the return value is ignored. If this
       is defined, all other display methods are ignored.
+      This method is ignored in the REPL.
 
-To customize how the REPL pretty-prints your object, add a `_repr_pretty_`
-method to the class.  The method should accept a pretty printer, and a boolean
-that indicates whether the printer detected a cycle.  The method should act on
-the printer to produce your customized pretty output.  Here is an example::
 
-    class MyObject(object):
+Metadata
+^^^^^^^^
+
+We often want to provide frontends with guidance on how to display the data. To
+support this, ``_repr_*_()`` methods (except `_repr_pretty_``?) can also return a ``(data, metadata)``
+tuple where ``metadata`` is a dictionary containing arbitrary key-value pairs for
+the frontend to interpret. An example use case is ``_repr_jpeg_()``, which can
+be set to return a jpeg image and a ``{'height': 400, 'width': 600}`` dictionary
+to inform the frontend how to size the image.
 
-        def _repr_pretty_(self, p, cycle):
-            if cycle:
-                p.text('MyObject(...)')
-            else:
-                p.text('MyObject[...]')
 
-For details, see :py:mod:`IPython.lib.pretty`.
 
 Formatters for third-party types
 --------------------------------

From 1b2bae020d7039c94f6e24172916deb5619b1da9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 4 Jun 2021 11:12:45 +0200
Subject: [PATCH 0558/1407] Apply suggestions from code review

---
 docs/source/config/integrating.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/config/integrating.rst b/docs/source/config/integrating.rst
index 783a825a814..a0459685236 100644
--- a/docs/source/config/integrating.rst
+++ b/docs/source/config/integrating.rst
@@ -94,7 +94,7 @@ Special methods
 Pretty printing
 """""""""""""""
 
-To customize how your object is pretty-printed, add a `_repr_pretty_` method
+To customize how your object is pretty-printed, add a ``_repr_pretty_`` method
 to the class. 
 The method should accept a pretty printer, and a boolean that indicates whether
 the printer detected a cycle.

From 4436f8671a5fb8777138e3de4f6a808039dae5ab Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 15 Jun 2021 15:17:20 +0200
Subject: [PATCH 0559/1407] Remove pickleutils alias,

It has also been deprecated in ipykernel and is now part of ipyparallel
---
 IPython/utils/pickleutil.py | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 IPython/utils/pickleutil.py

diff --git a/IPython/utils/pickleutil.py b/IPython/utils/pickleutil.py
deleted file mode 100644
index 785e6f6c80a..00000000000
--- a/IPython/utils/pickleutil.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from warnings import warn
-
-warn("IPython.utils.pickleutil has moved to ipykernel.pickleutil", stacklevel=2)
-
-from ipykernel.pickleutil import *

From 8bd83ce47372d2f93717654aead48501e124d99d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 15 Jun 2021 16:03:29 +0200
Subject: [PATCH 0560/1407] Don't access current_frame f_locals

This should fix #13020

Though it's a suttle enough bug that tests needs to be written.
And we can't rely on doctests as they are not ran.
---
 IPython/core/debugger.py | 43 ++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 36f0e71a685..e2676a61de7 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -331,7 +331,7 @@ def _hidden_predicate(self, frame):
             if frame in (self.curframe, getattr(self, "initial_frame", None)):
                 return False
             else:
-                return frame.f_locals.get("__tracebackhide__", False)
+                return self._get_frame_locals(frame).get("__tracebackhide__", False)
 
         return False
 
@@ -435,6 +435,28 @@ def print_stack_entry(self, frame_lineno, prompt_prefix='\n-> ',
         self.shell.hooks.synchronize_with_editor(filename, lineno, 0)
         # vds: <<
 
+    def _get_frame_locals(self, frame):
+        """ "
+        Acessing f_local of current frame reset the namespace, so we want to avoid
+        that or the following can happend
+
+        ipdb> foo
+        "old"
+        ipdb> foo = "new"
+        ipdb> foo
+        "new"
+        ipdb> where
+        ipdb> foo
+        "old"
+
+        So if frame is self.current_frame we instead return self.curframe_locals
+
+        """
+        if frame is self.curframe:
+            return self.curframe_locals
+        else:
+            return frame.f_locals
+
     def format_stack_entry(self, frame_lineno, lprefix=': ', context=None):
         if context is None:
             context = self.context
@@ -459,10 +481,11 @@ def format_stack_entry(self, frame_lineno, lprefix=': ', context=None):
         frame, lineno = frame_lineno
 
         return_value = ''
-        if '__return__' in frame.f_locals:
-            rv = frame.f_locals['__return__']
-            #return_value += '->'
-            return_value += reprlib.repr(rv) + '\n'
+        loc_frame = self._get_frame_locals(frame)
+        if "__return__" in loc_frame:
+            rv = loc_frame["__return__"]
+            # return_value += '->'
+            return_value += reprlib.repr(rv) + "\n"
         ret.append(return_value)
 
         #s = filename + '(' + `lineno` + ')'
@@ -474,10 +497,10 @@ def format_stack_entry(self, frame_lineno, lprefix=': ', context=None):
         else:
             func = "<lambda>"
 
-        call = ''
-        if func != '?':
-            if '__args__' in frame.f_locals:
-                args = reprlib.repr(frame.f_locals['__args__'])
+        call = ""
+        if func != "?":
+            if "__args__" in loc_frame:
+                args = reprlib.repr(loc_frame["__args__"])
             else:
                 args = '()'
             call = tpl_call % (func, args)
@@ -671,7 +694,7 @@ def do_list(self, arg):
 
     def getsourcelines(self, obj):
         lines, lineno = inspect.findsource(obj)
-        if inspect.isframe(obj) and obj.f_globals is obj.f_locals:
+        if inspect.isframe(obj) and obj.f_globals is self._get_frame_locals(obj):
             # must be a module frame: do not try to cut a block out of it
             return lines, 1
         elif inspect.ismodule(obj):

From ad18fbf44a9d189e80c97a8008bfde16e98e6ae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20A=2E=20Gomes?= <andremegafone@gmail.com>
Date: Thu, 17 Jun 2021 22:00:04 +0300
Subject: [PATCH 0561/1407] Fix erroneous code snippets.

---
 docs/source/interactive/python-ipython-diff.rst | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/source/interactive/python-ipython-diff.rst b/docs/source/interactive/python-ipython-diff.rst
index 85997575585..596c5789246 100644
--- a/docs/source/interactive/python-ipython-diff.rst
+++ b/docs/source/interactive/python-ipython-diff.rst
@@ -46,9 +46,9 @@ All the following constructs are valid IPython syntax:
 .. code-block:: ipython
 
     In [1]: my_files = !ls ~/
-    In [1]: for i,file in enumerate(my_file):
+    In [1]: for i, file in enumerate(my_files):
        ...:     raw = !echo $file
-       ...:     !echo {files[0].upper()} $raw
+       ...:     !echo {file[0].upper()} $raw
 
 
 .. code-block:: ipython
@@ -193,10 +193,9 @@ You can combine the different possibilities in for loops, conditions, functions.
 .. code-block:: ipython
 
     my_files = !ls ~/
-    b = "backup file"
-    for i,file in enumerate(my_file):
+    for i, file in enumerate(my_files):
         raw = !echo $backup $file
-        !cp $file {file.split('.')[0]+'.bak'}
+        !cp $file {file.split('.')[0] + '.bak'}
 
 
 Magics

From 3ca16739107ae1854605e2e2d08c81ac37098ade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20A=2E=20Gomes?= <andremegafone@gmail.com>
Date: Thu, 17 Jun 2021 22:00:48 +0300
Subject: [PATCH 0562/1407] Comment unfinished section.

---
 docs/source/interactive/python-ipython-diff.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/source/interactive/python-ipython-diff.rst b/docs/source/interactive/python-ipython-diff.rst
index 596c5789246..59f25472077 100644
--- a/docs/source/interactive/python-ipython-diff.rst
+++ b/docs/source/interactive/python-ipython-diff.rst
@@ -240,9 +240,10 @@ Magics with double percent signs (``%%``) can spread over multiple lines, but th
     map auto_home    0Bi    0Bi    0Bi   100%        0       0  100%   /hom
 
 
-Combining it all
-----------------
+..
+   Combining it all
+   ----------------
 
-::
+   ::
 
-    find a snippet that combine all that into one thing!
+       find a snippet that combine all that into one thing!

From bdf9148c990da208877fb243b157f6c594789dbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20A=2E=20Gomes?= <andremegafone@gmail.com>
Date: Thu, 17 Jun 2021 22:01:35 +0300
Subject: [PATCH 0563/1407] Fix typo.

---
 docs/source/interactive/tutorial.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/interactive/tutorial.rst b/docs/source/interactive/tutorial.rst
index e1000e0f974..bf6fcd1fbea 100644
--- a/docs/source/interactive/tutorial.rst
+++ b/docs/source/interactive/tutorial.rst
@@ -90,8 +90,8 @@ completion also works on file and directory names.
 Starting with IPython 6.0, if ``jedi`` is installed, IPython will try to pull
 completions from Jedi as well. This allows to not only inspect currently
 existing objects, but also to infer completion statically without executing
-code. There is nothing particular need to get this to work, simply use tab
-completion on more complex expressions like the following::
+code. There is nothing particular to get this to work, simply use tab completion
+on more complex expressions like the following::
 
     >>> data = ['Number of users', 123456]
     ... data[0].<tab>

From 20c5c33805e738e67da993738c521d656397ed35 Mon Sep 17 00:00:00 2001
From: Boyuan Liu <boyuanliu6@yahoo.com>
Date: Wed, 21 Apr 2021 19:54:55 -0700
Subject: [PATCH 0564/1407] modified docstring for IPython/core/magics/osm.py's
 env class to generate better documentation

---
 IPython/core/magics/osm.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index dcfa2adf8b6..c9983d71e1a 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -439,11 +439,11 @@ def env(self, parameter_s=''):
 
         Usage:\\
 
-          %env: lists all environment variables/values
-          %env var: get value for var
-          %env var val: set value for var
-          %env var=val: set value for var
-          %env var=$val: set value for var, using python expansion if possible
+          :%env: lists all environment variables/values
+          :%env var: get value for var
+          :%env var val: set value for var
+          :%env var=val: set value for var
+          :%env var=$val: set value for var, using python expansion if possible
         """
         if parameter_s.strip():
             split = '=' if '=' in parameter_s else ' '

From e4268012f12a3e743b08ee974db85e2305c621be Mon Sep 17 00:00:00 2001
From: Boyuan Liu <boyuanliu6@yahoo.com>
Date: Sun, 25 Apr 2021 05:34:20 +0000
Subject: [PATCH 0565/1407] added new documentation by using list and code
 syntax

---
 IPython/core/magics/osm.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index c9983d71e1a..c2d3963cdc0 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -439,11 +439,11 @@ def env(self, parameter_s=''):
 
         Usage:\\
 
-          :%env: lists all environment variables/values
-          :%env var: get value for var
-          :%env var val: set value for var
-          :%env var=val: set value for var
-          :%env var=$val: set value for var, using python expansion if possible
+          :``%env``: lists all environment variables/values
+          :``%env var``: get value for var
+          :``%env var val``: set value for var
+          :``%env var=val``: set value for var
+          :``%env var=$val``: set value for var, using python expansion if possible
         """
         if parameter_s.strip():
             split = '=' if '=' in parameter_s else ' '

From a5bdebad2a57517b59b919013fe4204b5a8584d8 Mon Sep 17 00:00:00 2001
From: Lightyagami1 <saurav24007@gmail.com>
Date: Sat, 19 Jun 2021 22:12:21 +0530
Subject: [PATCH 0566/1407] Fix %autocall doesn't handle integer parsing errors

---
 IPython/core/magics/auto.py | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/IPython/core/magics/auto.py b/IPython/core/magics/auto.py
index a18542f43d1..56aa4f72eb3 100644
--- a/IPython/core/magics/auto.py
+++ b/IPython/core/magics/auto.py
@@ -104,16 +104,32 @@ def autocall(self, parameter_s=''):
         # all-random (note for auto-testing)
         """
 
+        valid_modes = {
+            0: "Off",
+            1: "Smart",
+            2: "Full",
+        }
+
+        def errorMessage() -> str:
+            error = "Valid modes: "
+            for k, v in valid_modes.items():
+                error += str(k) + "->" + v + ", "
+            error = error[:-2]  # remove tailing `, ` after last element
+            return error
+
         if parameter_s:
+            if not parameter_s in map(str, valid_modes.keys()):
+                error(errorMessage())
+                return
             arg = int(parameter_s)
         else:
             arg = 'toggle'
 
-        if not arg in (0, 1, 2, 'toggle'):
-            error('Valid modes: (0->Off, 1->Smart, 2->Full')
+        if not arg in (*list(valid_modes.keys()), "toggle"):
+            error(errorMessage())
             return
 
-        if arg in (0, 1, 2):
+        if arg in (valid_modes.keys()):
             self.shell.autocall = arg
         else: # toggle
             if self.shell.autocall:
@@ -125,4 +141,4 @@ def autocall(self, parameter_s=''):
                 except AttributeError:
                     self.shell.autocall = self._magic_state.autocall_save = 1
 
-        print("Automatic calling is:",['OFF','Smart','Full'][self.shell.autocall])
+        print("Automatic calling is:", list(valid_modes.values())[self.shell.autocall])

From ecf6a0e0471862e2fa36d72a0bd853e50afee464 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 22 Jun 2021 11:31:59 +0200
Subject: [PATCH 0567/1407] add test

---
 IPython/core/tests/test_debugger.py | 92 +++++++++++++++++++++++++----
 1 file changed, 79 insertions(+), 13 deletions(-)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 2525e658a86..fdcbea880f9 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -277,14 +277,14 @@ def test_xmode_skip():
 
     block = dedent(
         """
-def f():
-    __tracebackhide__ = True
-    g()
+    def f():
+        __tracebackhide__ = True
+        g()
 
-def g():
-    raise ValueError
+    def g():
+        raise ValueError
 
-f()
+    f()
     """
     )
 
@@ -295,15 +295,15 @@ def g():
 
     block = dedent(
         """
-def f():
-    __tracebackhide__ = True
-    g()
+    def f():
+        __tracebackhide__ = True
+        g()
 
-def g():
-    from IPython.core.debugger import set_trace
-    set_trace()
+    def g():
+        from IPython.core.debugger import set_trace
+        set_trace()
 
-f()
+    f()
     """
     )
 
@@ -321,3 +321,69 @@ def g():
     child.expect("ipdb>")
 
     child.close()
+
+
+def test_where_erase_value():
+    """Test that `where` does nto access f_locals and erase values."""
+    import pexpect
+
+    env = os.environ.copy()
+    env["IPY_TEST_SIMPLE_PROMPT"] = "1"
+
+    child = pexpect.spawn(
+        sys.executable, ["-m", "IPython", "--colors=nocolor"], env=env
+    )
+    child.timeout = 15 * IPYTHON_TESTING_TIMEOUT_SCALE
+
+    child.expect("IPython")
+    child.expect("\n")
+    child.expect_exact("In [1]")
+
+    block = dedent(
+        """
+    def simple_f():
+         myvar = 1
+         print(myvar)
+         1/0
+         print(myvar)
+    simple_f()    """
+    )
+
+    for line in block.splitlines():
+        child.sendline(line)
+        child.expect_exact(line)
+    child.expect_exact("ZeroDivisionError")
+    child.expect_exact("In [2]:")
+
+    child.sendline("%debug")
+
+    ##
+    child.expect("ipdb>")
+
+    child.sendline("myvar")
+    child.expect("1")
+
+    ##
+    child.expect("ipdb>")
+
+    child.sendline("myvar = 2")
+
+    ##
+    child.expect_exact("ipdb>")
+
+    child.sendline("myvar")
+
+    child.expect_exact("2")
+
+    ##
+    child.expect("ipdb>")
+    child.sendline("where")
+
+    ##
+    child.expect("ipdb>")
+    child.sendline("myvar")
+
+    child.expect_exact("2")
+    child.expect("ipdb>")
+
+    child.close()

From dd10cc84e23e12dd747dbb72460b3d3c0e28d067 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 22 Jun 2021 13:58:38 +0200
Subject: [PATCH 0568/1407] Update IPython/core/tests/test_debugger.py

Co-authored-by: Blazej Michalik <6691643+MrMino@users.noreply.github.com>
---
 IPython/core/tests/test_debugger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index fdcbea880f9..fcdcb66ca80 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -324,7 +324,7 @@ def g():
 
 
 def test_where_erase_value():
-    """Test that `where` does nto access f_locals and erase values."""
+    """Test that `where` does not access f_locals and erase values."""
     import pexpect
 
     env = os.environ.copy()

From 08ee50b79b21b914d793c67eb1176cdfd5a8a391 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 22 Jun 2021 14:12:03 +0200
Subject: [PATCH 0569/1407] Skip: no pexpect on win32

---
 IPython/core/tests/test_debugger.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index fcdcb66ca80..35e77e4acd5 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -323,6 +323,7 @@ def g():
     child.close()
 
 
+@skip_win32
 def test_where_erase_value():
     """Test that `where` does not access f_locals and erase values."""
     import pexpect

From a14be3fcd6bec1c5620eb993ef26bff2928aed11 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 25 Jun 2021 16:51:34 +0200
Subject: [PATCH 0570/1407] what's new 7.25

---
 docs/source/whatsnew/version7.rst | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index a8768d6aba8..f3f1acacc1c 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,33 @@
  7.x Series
 ============
 
+.. _version 7.25:
+
+IPython 7.25
+============
+
+IPython 7.21 is a minor release that contains a singe bugfix, which is highly
+recommended for all users of ipdb, ipython debugger %debug magic and similar.
+
+Issuing commands like ``where`` from within the debugger would reset the
+local variables changes made by the user. It is interesting to look at the root
+cause of the issue as accessing an attribute (``frame.f_locals``) would trigger
+this side effects.
+
+Thanks in particular to the patience from the reporters at D.E. Shaw for their
+initial bug report that was due to a similar coding oversight in an extension,
+and who took time to debug and narrow down the problem.
+
+Thanks
+------
+
+Many thanks to all the contributors to this release you can find all individual
+contributions to this milestone `on github <https://github.com/ipython/ipython/milestone/89>`__.
+
+Thanks as well to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries.
+
+
 .. _version 7.24:
 
 IPython 7.24

From 8663b2b6e0c9ae156519864344d312ee8050105c Mon Sep 17 00:00:00 2001
From: Richard Shadrach <rhshadrach@gmail.com>
Date: Sat, 26 Jun 2021 14:37:02 -0400
Subject: [PATCH 0571/1407] Use Sphinx logging in IPython directive

---
 IPython/sphinxext/ipython_directive.py        | 34 +++++++++++--------
 .../pr/ipython_directive_warnings.rst         |  4 +++
 2 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 docs/source/whatsnew/pr/ipython_directive_warnings.rst

diff --git a/IPython/sphinxext/ipython_directive.py b/IPython/sphinxext/ipython_directive.py
index 3d5b3768230..dc54d131080 100644
--- a/IPython/sphinxext/ipython_directive.py
+++ b/IPython/sphinxext/ipython_directive.py
@@ -200,6 +200,7 @@
 # Third-party
 from docutils.parsers.rst import directives
 from docutils.parsers.rst import Directive
+from sphinx.util import logging
 
 # Our own
 from traitlets.config import Config
@@ -556,16 +557,19 @@ def process_input(self, data, input_prompt, lineno):
         if self.directive.state:
             filename = self.directive.state.document.current_source
             lineno = self.directive.state.document.current_line
+            
+        # Use sphinx logger for warnings
+        logger = logging.getLogger(__name__)
 
         # output any exceptions raised during execution to stdout
         # unless :okexcept: has been specified.
         if not is_okexcept and (("Traceback" in processed_output) or ("SyntaxError" in processed_output)):
-            s =  "\nException in %s at block ending on line %s\n" % (filename, lineno)
+            s =  '\n>>>' + ('-' * 73) + '\n'
+            s += "Exception in %s at block ending on line %s\n" % (filename, lineno)
             s += "Specify :okexcept: as an option in the ipython:: block to suppress this message\n"
-            sys.stdout.write('\n\n>>>' + ('-' * 73))
-            sys.stdout.write(s)
-            sys.stdout.write(processed_output)
-            sys.stdout.write('<<<' + ('-' * 73) + '\n\n')
+            s += processed_output + "\n"
+            s += "<<<" + ("-" * 73)
+            logger.warning(s)
             if self.warning_is_error:
                 raise RuntimeError('Non Expected exception in `{}` line {}'.format(filename, lineno))
 
@@ -573,15 +577,14 @@ def process_input(self, data, input_prompt, lineno):
         # unless :okwarning: has been specified.
         if not is_okwarning:
             for w in ws:
-                s =  "\nWarning in %s at block ending on line %s\n" % (filename, lineno)
+                s =  '\n>>>' + ('-' * 73) + '\n'
+                s += "Warning in %s at block ending on line %s\n" % (filename, lineno)
                 s += "Specify :okwarning: as an option in the ipython:: block to suppress this message\n"
-                sys.stdout.write('\n\n>>>' + ('-' * 73))
-                sys.stdout.write(s)
-                sys.stdout.write(('-' * 76) + '\n')
-                s=warnings.formatwarning(w.message, w.category,
-                                         w.filename, w.lineno, w.line)
-                sys.stdout.write(s)
-                sys.stdout.write('<<<' + ('-' * 73) + '\n')
+                s += ('-' * 76) + '\n'
+                s += warnings.formatwarning(w.message, w.category,
+                                            w.filename, w.lineno, w.line)
+                s += '<<<' + ('-' * 73)
+                logger.warning(s)
                 if self.warning_is_error:
                     raise RuntimeError('Non Expected warning in `{}` line {}'.format(filename, lineno))
 
@@ -1002,6 +1005,9 @@ def run(self):
         lines = ['.. code-block:: ipython', '']
         figures = []
 
+        # Use sphinx logger for warnings
+        logger = logging.getLogger(__name__)
+
         for part in parts:
             block = block_parser(part, rgxin, rgxout, promptin, promptout)
             if len(block):
@@ -1020,7 +1026,7 @@ def run(self):
                 if self.shell.warning_is_error:
                     raise RuntimeError(message)
                 else:
-                    warnings.warn(message)
+                    logger.warning(message)
 
         for figure in figures:
             lines.append('')
diff --git a/docs/source/whatsnew/pr/ipython_directive_warnings.rst b/docs/source/whatsnew/pr/ipython_directive_warnings.rst
new file mode 100644
index 00000000000..c658c0207ce
--- /dev/null
+++ b/docs/source/whatsnew/pr/ipython_directive_warnings.rst
@@ -0,0 +1,4 @@
+IPython directive warnings
+--------------------------
+
+The IPython directive now uses Sphinx logging for warnings.

From 268b259d067e3a89248373166a9cf873e4762a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lum=C3=ADr=20=27Frenzy=27=20Balhar?= <lbalhar@redhat.com>
Date: Mon, 28 Jun 2021 08:23:30 +0200
Subject: [PATCH 0572/1407] Fix typo in the latest version

---
 docs/source/whatsnew/version7.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index f3f1acacc1c..89b11444f2c 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -7,7 +7,7 @@
 IPython 7.25
 ============
 
-IPython 7.21 is a minor release that contains a singe bugfix, which is highly
+IPython 7.25 is a minor release that contains a singe bugfix, which is highly
 recommended for all users of ipdb, ipython debugger %debug magic and similar.
 
 Issuing commands like ``where`` from within the debugger would reset the

From 4510a3df01715a65296544f042b68821f1c51956 Mon Sep 17 00:00:00 2001
From: Rodolfo Carvalho <rhcarvalho@gmail.com>
Date: Mon, 28 Jun 2021 13:10:54 +0200
Subject: [PATCH 0573/1407] Fix typo in excepthook docstring

---
 IPython/core/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index e2abe144433..f6145d5228b 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1971,7 +1971,7 @@ def excepthook(self, etype, value, tb):
         sys.excepthook themselves.  I guess this is a feature that
         enables them to keep running after exceptions that would
         otherwise kill their mainloop. This is a bother for IPython
-        which excepts to catch all of the program exceptions with a try:
+        which expects to catch all of the program exceptions with a try:
         except: statement.
 
         Normally, IPython sets sys.excepthook to a CrashHandler instance, so if

From 38b4f14197cc1c4703001ea2e6d422eaecad3630 Mon Sep 17 00:00:00 2001
From: Leon Anavi <leon.anavi@konsulko.com>
Date: Tue, 29 Jun 2021 11:41:41 +0300
Subject: [PATCH 0574/1407] docs/source/whatsnew/version7.rst: Fix typo

Fix a minor typo in the release notes for version 7.25.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
 docs/source/whatsnew/version7.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 89b11444f2c..553752c8a0b 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -7,7 +7,7 @@
 IPython 7.25
 ============
 
-IPython 7.25 is a minor release that contains a singe bugfix, which is highly
+IPython 7.25 is a minor release that contains a single bugfix, which is highly
 recommended for all users of ipdb, ipython debugger %debug magic and similar.
 
 Issuing commands like ``where`` from within the debugger would reset the

From c20d7a0da79b0d784e717471534d4d716ec2ae4a Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Wed, 30 Jun 2021 16:55:33 +0200
Subject: [PATCH 0575/1407] Refactor strip_email_quotes

Also removes long_substr, which fixes the licesing issue mentioned
in #13039.
---
 IPython/utils/tests/test_text.py | 13 ----------
 IPython/utils/text.py            | 44 ++++++++++++--------------------
 2 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/IPython/utils/tests/test_text.py b/IPython/utils/tests/test_text.py
index 68474aececc..0fb643066bd 100644
--- a/IPython/utils/tests/test_text.py
+++ b/IPython/utils/tests/test_text.py
@@ -165,19 +165,6 @@ def test_dollar_formatter():
     nt.assert_equal(s, "$HOME")
 
 
-def test_long_substr():
-    data = ['hi']
-    nt.assert_equal(text.long_substr(data), 'hi')
-
-
-def test_long_substr2():
-    data = ['abc', 'abd', 'abf', 'ab']
-    nt.assert_equal(text.long_substr(data), 'ab')
-
-def test_long_substr_empty():
-    data = []
-    nt.assert_equal(text.long_substr(data), '')
-
 def test_strip_email():
     src = """\
         >> >>> def f(x):
diff --git a/IPython/utils/text.py b/IPython/utils/text.py
index f2131ace598..f54f97b9199 100644
--- a/IPython/utils/text.py
+++ b/IPython/utils/text.py
@@ -10,6 +10,7 @@
 
 import os
 import re
+import string
 import sys
 import textwrap
 from string import Formatter
@@ -405,22 +406,6 @@ def wrap_paragraphs(text, ncols=80):
     return out_ps
 
 
-def long_substr(data):
-    """Return the longest common substring in a list of strings.
-
-    Credit: http://stackoverflow.com/questions/2892931/longest-common-substring-from-more-than-two-strings-python
-    """
-    substr = ''
-    if len(data) > 1 and len(data[0]) > 0:
-        for i in range(len(data[0])):
-            for j in range(len(data[0])-i+1):
-                if j > len(substr) and all(data[0][i:i+j] in x for x in data):
-                    substr = data[0][i:i+j]
-    elif len(data) == 1:
-        substr = data[0]
-    return substr
-
-
 def strip_email_quotes(text):
     """Strip leading email quotation characters ('>').
 
@@ -447,27 +432,30 @@ def strip_email_quotes(text):
         In [4]: strip_email_quotes('> > text\\n> > more\\n> more...')
         Out[4]: '> text\\n> more\\nmore...'
 
-    So if any line has no quote marks ('>') , then none are stripped from any
+    So if any line has no quote marks ('>'), then none are stripped from any
     of them ::
-    
+
         In [5]: strip_email_quotes('> > text\\n> > more\\nlast different')
         Out[5]: '> > text\\n> > more\\nlast different'
     """
     lines = text.splitlines()
-    matches = set()
-    for line in lines:
-        prefix = re.match(r'^(\s*>[ >]*)', line)
-        if prefix:
-            matches.add(prefix.group(1))
+    strip_len = 0
+
+    for characters in zip(*lines):
+        # Check if all characters in this position are the same
+        if len(set(characters)) > 1:
+            break
+        prefix_char = characters[0][0]
+
+        if prefix_char in string.whitespace or prefix_char == ">":
+            strip_len += 1
         else:
             break
-    else:
-        prefix = long_substr(list(matches))
-        if prefix:
-            strip = len(prefix)
-            text = '\n'.join([ ln[strip:] for ln in lines])
+
+    text = "\n".join([ln[strip_len:] for ln in lines])
     return text
 
+
 def strip_ansi(source):
     """
     Remove ansi escape codes from text.

From 40ff0ebc7b0263a1e74d1fa83dbd00f48f447d6b Mon Sep 17 00:00:00 2001
From: Blazej Michalik <6691643+MrMino@users.noreply.github.com>
Date: Sat, 3 Jul 2021 20:32:09 +0200
Subject: [PATCH 0576/1407] Update IPython/utils/text.py

Co-authored-by: Matthias Bussonnier <bussonniermatthias@gmail.com>
---
 IPython/utils/text.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/utils/text.py b/IPython/utils/text.py
index f54f97b9199..c25869ab397 100644
--- a/IPython/utils/text.py
+++ b/IPython/utils/text.py
@@ -445,7 +445,7 @@ def strip_email_quotes(text):
         # Check if all characters in this position are the same
         if len(set(characters)) > 1:
             break
-        prefix_char = characters[0][0]
+        prefix_char = characters[0]
 
         if prefix_char in string.whitespace or prefix_char == ">":
             strip_len += 1

From 0aa5c32dd6a2888d2777c1018d8b9a4fdc032710 Mon Sep 17 00:00:00 2001
From: Strawkage <86151183+strawhat54@users.noreply.github.com>
Date: Tue, 6 Jul 2021 23:11:54 +0530
Subject: [PATCH 0577/1407] Fix documentation: reference.rst  (#13044)

The paragraph there was contradicting the information in `ipython --help`
---
 docs/source/interactive/reference.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/source/interactive/reference.rst b/docs/source/interactive/reference.rst
index e89fec4d6e5..05c8a458ce3 100644
--- a/docs/source/interactive/reference.rst
+++ b/docs/source/interactive/reference.rst
@@ -11,8 +11,11 @@ You start IPython with the command::
 
     $ ipython [options] files
 
-If invoked with no options, it executes all the files listed in sequence and
-exits. If you add the ``-i`` flag, it drops you into the interpreter while still
+If invoked with no options, it executes the file and exits, passing the
+remaining arguments to the script, just as if you had specified the same
+command with python. You may need to specify `--` before args to be passed
+to the script, to prevent IPython from attempting to parse them.
+If you add the ``-i`` flag, it drops you into the interpreter while still
 acknowledging any options you may have set in your ``ipython_config.py``. This
 behavior is different from standard Python, which when called as python ``-i``
 will only execute one file and ignore your configuration setup.

From 4fd469733b409e48f98d8d81483943e94b88cf5b Mon Sep 17 00:00:00 2001
From: richard <rhshadrach@gmail.com>
Date: Tue, 6 Jul 2021 22:30:50 -0400
Subject: [PATCH 0578/1407] darker

---
 IPython/sphinxext/ipython_directive.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/IPython/sphinxext/ipython_directive.py b/IPython/sphinxext/ipython_directive.py
index dc54d131080..ac0964032a5 100644
--- a/IPython/sphinxext/ipython_directive.py
+++ b/IPython/sphinxext/ipython_directive.py
@@ -557,14 +557,16 @@ def process_input(self, data, input_prompt, lineno):
         if self.directive.state:
             filename = self.directive.state.document.current_source
             lineno = self.directive.state.document.current_line
-            
+
         # Use sphinx logger for warnings
         logger = logging.getLogger(__name__)
 
         # output any exceptions raised during execution to stdout
         # unless :okexcept: has been specified.
-        if not is_okexcept and (("Traceback" in processed_output) or ("SyntaxError" in processed_output)):
-            s =  '\n>>>' + ('-' * 73) + '\n'
+        if not is_okexcept and (
+            ("Traceback" in processed_output) or ("SyntaxError" in processed_output)
+        ):
+            s = "\n>>>" + ("-" * 73) + "\n"
             s += "Exception in %s at block ending on line %s\n" % (filename, lineno)
             s += "Specify :okexcept: as an option in the ipython:: block to suppress this message\n"
             s += processed_output + "\n"
@@ -577,13 +579,14 @@ def process_input(self, data, input_prompt, lineno):
         # unless :okwarning: has been specified.
         if not is_okwarning:
             for w in ws:
-                s =  '\n>>>' + ('-' * 73) + '\n'
+                s = "\n>>>" + ("-" * 73) + "\n"
                 s += "Warning in %s at block ending on line %s\n" % (filename, lineno)
                 s += "Specify :okwarning: as an option in the ipython:: block to suppress this message\n"
-                s += ('-' * 76) + '\n'
-                s += warnings.formatwarning(w.message, w.category,
-                                            w.filename, w.lineno, w.line)
-                s += '<<<' + ('-' * 73)
+                s += ("-" * 76) + "\n"
+                s += warnings.formatwarning(
+                    w.message, w.category, w.filename, w.lineno, w.line
+                )
+                s += "<<<" + ("-" * 73)
                 logger.warning(s)
                 if self.warning_is_error:
                     raise RuntimeError('Non Expected warning in `{}` line {}'.format(filename, lineno))

From 07c4edd91f350d41466787ccdc36d60dff87dd72 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Thu, 8 Jul 2021 19:15:54 +0200
Subject: [PATCH 0579/1407] Empty histrange means history of current session

When empty string is given to
`IPython.core.history.extract_hist_ranges`, it will now return a range
corresponding to the whole history of the current session.

This means that `HistoryManager.get_range_by_str` will now also return
everything if given an empty string - which has implications for other
magics like `%save`, `%pastebin`, etc.

Commits that follow this one will introduce that fact to each magic
docstring and implementation, where required.
---
 IPython/core/history.py            | 14 ++++++++++++--
 IPython/core/tests/test_history.py |  8 ++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/IPython/core/history.py b/IPython/core/history.py
index 08db18f7a5b..afa05fa8a84 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -445,8 +445,11 @@ def get_range_by_str(self, rangestr, raw=True, output=False):
         Parameters
         ----------
         rangestr : str
-          A string specifying ranges, e.g. "5 ~2/1-4". See
-          :func:`magic_history` for full details.
+          A string specifying ranges, e.g. "5 ~2/1-4". If empty string is used,
+          this will return everything from current session's history.
+
+          See the documentation of :func:`%history` for the full details.
+
         raw, output : bool
           As :meth:`get_range`
 
@@ -851,11 +854,18 @@ def stop(self):
 def extract_hist_ranges(ranges_str):
     """Turn a string of history ranges into 3-tuples of (session, start, stop).
 
+    Empty string results in a `[(0, 1, None)]`, i.e. "everything from current
+    session".
+
     Examples
     --------
     >>> list(extract_hist_ranges("~8/5-~7/4 2"))
     [(-8, 5, None), (-7, 1, 5), (0, 2, 3)]
     """
+    if ranges_str == '':
+        yield (0, 1, None)  # Everything from current session
+        return
+
     for range_str in ranges_str.split():
         rmatch = range_re.match(range_str)
         if not rmatch:
diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
index 57266e5752b..6f1d8203953 100644
--- a/IPython/core/tests/test_history.py
+++ b/IPython/core/tests/test_history.py
@@ -160,6 +160,14 @@ def test_extract_hist_ranges():
     actual = list(extract_hist_ranges(instr))
     nt.assert_equal(actual, expected)
 
+
+def test_extract_hist_ranges_empty_str():
+    instr = ''
+    expected = [(0, 1, None)]  # 0 == current session, None == to end
+    actual = list(extract_hist_ranges(instr))
+    nt.assert_equal(actual, expected)
+
+
 def test_magic_rerun():
     """Simple test for %rerun (no args -> rerun last line)"""
     ip = get_ipython()

From 692ccd895d44c8a84ce017699289691be012f41a Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Thu, 8 Jul 2021 21:46:09 +0200
Subject: [PATCH 0580/1407] Don't return the last line in `find_user_code`

Changes `InteractiveShell.extract_input_lines` such that if the empty
histrange is given, the last line of history is omitted.

The reason for this is that `InteractiveShell.find_user_code`, the only
place where the aforementioned method is used, is only called by magics,
where the empty histrange argument would otherwise include the magics
themselves.
---
 IPython/core/interactiveshell.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index f6145d5228b..bef589d7086 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3702,6 +3702,9 @@ def extract_input_lines(self, range_str, raw=False):
             arguments as strings. The number before the / is the session
             number: ~n goes n back from the current session.
 
+            If empty string is given, returns history of current session
+            without the last input.
+
         raw : bool, optional
             By default, the processed input is used.  If this is true, the raw
             input history is used instead.
@@ -3715,7 +3718,16 @@ def extract_input_lines(self, range_str, raw=False):
         * ``N-M`` -> include items N..M (closed endpoint).
         """
         lines = self.history_manager.get_range_by_str(range_str, raw=raw)
-        return "\n".join(x for _, _, x in lines)
+        text = "\n".join(x for _, _, x in lines)
+
+        # Skip the last line, as it's probably the magic that called this
+        if not range_str:
+            if '\n' not in text:
+                text = ''
+            else:
+                text = text[:text.rfind('\n')]
+
+        return text
 
     def find_user_code(self, target, raw=True, py_only=False, skip_encoding_cookie=True, search_ns=False):
         """Get a code string from history, file, url, or a string or macro.
@@ -3724,14 +3736,15 @@ def find_user_code(self, target, raw=True, py_only=False, skip_encoding_cookie=T
 
         Parameters
         ----------
-
         target : str
-
           A string specifying code to retrieve. This will be tried respectively
           as: ranges of input history (see %history for syntax), url,
           corresponding .py file, filename, or an expression evaluating to a
           string or Macro in the user namespace.
 
+          If empty string is given, returns complete history of current
+          session, without the last line.
+
         raw : bool
           If true (default), retrieve raw history. Has no effect on the other
           retrieval mechanisms.

From 9c7c9ee20f0a1151e9800f6f5a4d254c84ab6b04 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Thu, 8 Jul 2021 19:33:15 +0200
Subject: [PATCH 0581/1407] Remove unnecessary branch in %history

Previously, this `if...else` was meant to provide the "get whole
history" functionality of `%history`. It is now unnecessary, since
`get_range_by_str` is now able to do the same thing when given an empty
string, the same way a call to `get_range` would.
---
 IPython/core/magics/history.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/IPython/core/magics/history.py b/IPython/core/magics/history.py
index 6703f26da0a..9762e6ee95c 100644
--- a/IPython/core/magics/history.py
+++ b/IPython/core/magics/history.py
@@ -184,14 +184,11 @@ def _format_lineno(session, line):
             n = 10 if limit is None else limit
             hist = history_manager.get_tail(n, raw=raw, output=get_output)
         else:
-            if args.range:      # Get history by ranges
-                if args.pattern:
-                    range_pattern = "*" + " ".join(args.pattern) + "*"
-                    print_nums = True
-                hist = history_manager.get_range_by_str(" ".join(args.range),
-                                                        raw, get_output)
-            else:               # Just get history for the current session
-                hist = history_manager.get_range(raw=raw, output=get_output)
+            if args.pattern:
+                range_pattern = "*" + " ".join(args.pattern) + "*"
+                print_nums = True
+            hist = history_manager.get_range_by_str(" ".join(args.range),
+                                                    raw, get_output)
 
         # We could be displaying the entire history, so let's not try to pull
         # it into a list in memory. Anything that needs more space will just

From b7d860b0fc731f06bd661ede0a4e880267157bdb Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Thu, 8 Jul 2021 21:16:48 +0200
Subject: [PATCH 0582/1407] Print whole history on `%pycat` without parameters

The only thing required here was removal of the empty argument guard, as
`InteractiveShell.find_user_code` already understands empty string as
"complete history of current session without the last line".
---
 IPython/core/magics/osm.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index c2d3963cdc0..a9047937686 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -808,17 +808,17 @@ def pycat(self, parameter_s=''):
         This magic command can either take a local filename, an url,
         an history range (see %history) or a macro as argument ::
 
+        If no parameter is given, prints out history of current session up to
+        this point.
+
         %pycat myscript.py
         %pycat 7-27
         %pycat myMacro
         %pycat http://www.example.com/myscript.py
         """
-        if not parameter_s:
-            raise UsageError('Missing filename, URL, input history range, '
-                             'or macro.')
-
-        try :
-            cont = self.shell.find_user_code(parameter_s, skip_encoding_cookie=False)
+        try:
+            cont = self.shell.find_user_code(parameter_s,
+                                             skip_encoding_cookie=False)
         except (ValueError, IOError):
             print("Error: no such file, variable, URL, history range or macro")
             return

From d2951853d16e755246d78021ad7134bf0d55385b Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Thu, 8 Jul 2021 22:01:24 +0200
Subject: [PATCH 0583/1407] Docs: fix wrong arg type in `extract_input_lines`

---
 IPython/core/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index bef589d7086..1846b3ce127 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3696,7 +3696,7 @@ def extract_input_lines(self, range_str, raw=False):
 
         Parameters
         ----------
-        range_str : string
+        range_str : str
             The set of slices is given as a string, like "~5/6-~4/2 4:8 9",
             since this function is for use by magic functions which get their
             arguments as strings. The number before the / is the session

From e94ec6c099861f060b8116dc6c62816dcf6444dc Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Thu, 8 Jul 2021 22:03:09 +0200
Subject: [PATCH 0584/1407] Docs: mention empty histrange behavior of `%save`

---
 IPython/core/magics/code.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index e5b2ce17635..9cad1accb83 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -202,6 +202,9 @@ def save(self, parameter_s=''):
         This function uses the same syntax as %history for input ranges,
         then saves the lines to the filename you specify.
 
+        If no ranges are specified, saves history of the current session up to
+        this point.
+
         It adds a '.py' extension to the file if you don't do so yourself, and
         it asks for confirmation before overwriting existing files.
 

From 88e203e05d9fd80ed35e3b9827113ab353d96be3 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Thu, 8 Jul 2021 22:09:25 +0200
Subject: [PATCH 0585/1407] Docs: mention empty histrange behavior of
 `%pastebin`

---
 IPython/core/magics/code.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index 9cad1accb83..8277aea92f7 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -257,6 +257,9 @@ def pastebin(self, parameter_s=''):
         The argument can be an input history range, a filename, or the name of a
         string or macro.
 
+        If no arguments are given, uploads the history of this session up to
+        this point.
+
         Options:
 
           -d: Pass a custom description. The default will say

From 8141a131d64fda87b1552bfc2b629d907ac29d17 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Thu, 8 Jul 2021 22:14:34 +0200
Subject: [PATCH 0586/1407] Load whole history on `%load` without parameters

---
 IPython/core/magics/code.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index 8277aea92f7..8682f7cf423 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -308,6 +308,9 @@ def load(self, arg_s):
           where source can be a filename, URL, input history range, macro, or
           element in the user namespace
 
+        If no arguments are given, loads the history of this session up to this
+        point.
+
         Options:
 
           -r <lines>: Specify lines or ranges of lines to load from the source.
@@ -326,6 +329,7 @@ def load(self, arg_s):
         confirmation before loading source with more than 200 000 characters, unless
         -y flag is passed or if the frontend does not support raw_input::
 
+        %load
         %load myscript.py
         %load 7-27
         %load myMacro
@@ -337,13 +341,7 @@ def load(self, arg_s):
         %load -n my_module.wonder_function
         """
         opts,args = self.parse_options(arg_s,'yns:r:')
-
-        if not args:
-            raise UsageError('Missing filename, URL, input history range, '
-                             'macro, or element in the user namespace.')
-
         search_ns = 'n' in opts
-
         contents = self.shell.find_user_code(args, search_ns=search_ns)
 
         if 's' in opts:

From f36278fd155d5fefade968b77dcf5aa8a9a1de31 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Thu, 8 Jul 2021 22:34:08 +0200
Subject: [PATCH 0587/1407] Add empty histrange `%save` test

---
 IPython/core/tests/test_magic.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 226c4607211..b939c99af3e 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -1089,6 +1089,29 @@ def test_save():
         nt.assert_in("coding: utf-8", content)
 
 
+def test_save_with_no_args():
+    ip = get_ipython()
+    ip.history_manager.reset()   # Clear any existing history.
+    cmds = [u"a=1", u"def b():\n    return a**2", u"print(a, b())", "%save"]
+    for i, cmd in enumerate(cmds, start=1):
+        ip.history_manager.store_inputs(i, cmd)
+
+    with TemporaryDirectory() as tmpdir:
+        path = os.path.join(tmpdir, "testsave.py")
+        ip.run_line_magic("save", path)
+        content = Path(path).read_text()
+        expected_content = dedent(
+            """\
+            # coding: utf-8
+            a=1
+            def b():
+                return a**2
+            print(a, b())
+            """
+        )
+        nt.assert_equal(content, expected_content)
+
+
 def test_store():
     """Test %store."""
     ip = get_ipython()

From 955ddb5a31689cb7c8a9575edb37c3b224b49df8 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Thu, 8 Jul 2021 22:47:17 +0200
Subject: [PATCH 0588/1407] Fix issue with pycat docs build

---
 IPython/core/magics/osm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index a9047937686..e8d1cbd6b0e 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -806,10 +806,10 @@ def pycat(self, parameter_s=''):
         to be Python source and will show it with syntax highlighting.
 
         This magic command can either take a local filename, an url,
-        an history range (see %history) or a macro as argument ::
+        an history range (see %history) or a macro as argument.
 
         If no parameter is given, prints out history of current session up to
-        this point.
+        this point. ::
 
         %pycat myscript.py
         %pycat 7-27

From 38efac316bc18bf40d718ec4b0152ae158b23c3d Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Fri, 9 Jul 2021 00:21:41 +0200
Subject: [PATCH 0589/1407] WN entry for empty hist range magics

---
 docs/source/whatsnew/pr/empty-hist-range.rst | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/empty-hist-range.rst

diff --git a/docs/source/whatsnew/pr/empty-hist-range.rst b/docs/source/whatsnew/pr/empty-hist-range.rst
new file mode 100644
index 00000000000..a36789f631d
--- /dev/null
+++ b/docs/source/whatsnew/pr/empty-hist-range.rst
@@ -0,0 +1,19 @@
+Empty History Ranges
+====================
+
+A number of magics that take history ranges can now be used with an empty
+range. These magics are:
+
+ * ``%save``
+ * ``%load``
+ * ``%pastebin``
+ * ``%pycat``
+
+Using them this way will make them take the history of the current session up
+to the point of the magic call (such that the magic itself will not be
+included).
+
+Therefore it is now possible to save the whole history to a file using simple
+``%save <filename>``, load and edit it using ``%load`` (makes for a nice usage
+when followed with :kbd:`F2`), send it to dpaste.org using ``%pastebin``, or
+view the whole thing syntax-highlighted with a single ``%pycat``.

From 65602328d812ee9e180d79ac2de17dd8e754d8d1 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Fri, 9 Jul 2021 01:19:13 +0200
Subject: [PATCH 0590/1407] Darker

---
 IPython/core/history.py            | 2 +-
 IPython/core/interactiveshell.py   | 6 +++---
 IPython/core/magics/history.py     | 5 +++--
 IPython/core/magics/osm.py         | 3 +--
 IPython/core/tests/test_history.py | 2 +-
 IPython/core/tests/test_magic.py   | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/IPython/core/history.py b/IPython/core/history.py
index afa05fa8a84..ff931d20dd7 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -862,7 +862,7 @@ def extract_hist_ranges(ranges_str):
     >>> list(extract_hist_ranges("~8/5-~7/4 2"))
     [(-8, 5, None), (-7, 1, 5), (0, 2, 3)]
     """
-    if ranges_str == '':
+    if ranges_str == "":
         yield (0, 1, None)  # Everything from current session
         return
 
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 1846b3ce127..499d6b7c516 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3722,10 +3722,10 @@ def extract_input_lines(self, range_str, raw=False):
 
         # Skip the last line, as it's probably the magic that called this
         if not range_str:
-            if '\n' not in text:
-                text = ''
+            if "\n" not in text:
+                text = ""
             else:
-                text = text[:text.rfind('\n')]
+                text = text[: text.rfind("\n")]
 
         return text
 
diff --git a/IPython/core/magics/history.py b/IPython/core/magics/history.py
index 9762e6ee95c..28f91fa5a82 100644
--- a/IPython/core/magics/history.py
+++ b/IPython/core/magics/history.py
@@ -187,8 +187,9 @@ def _format_lineno(session, line):
             if args.pattern:
                 range_pattern = "*" + " ".join(args.pattern) + "*"
                 print_nums = True
-            hist = history_manager.get_range_by_str(" ".join(args.range),
-                                                    raw, get_output)
+            hist = history_manager.get_range_by_str(
+                " ".join(args.range), raw, get_output
+            )
 
         # We could be displaying the entire history, so let's not try to pull
         # it into a list in memory. Anything that needs more space will just
diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index e8d1cbd6b0e..c0cb209daaa 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -817,8 +817,7 @@ def pycat(self, parameter_s=''):
         %pycat http://www.example.com/myscript.py
         """
         try:
-            cont = self.shell.find_user_code(parameter_s,
-                                             skip_encoding_cookie=False)
+            cont = self.shell.find_user_code(parameter_s, skip_encoding_cookie=False)
         except (ValueError, IOError):
             print("Error: no such file, variable, URL, history range or macro")
             return
diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
index 6f1d8203953..824ba1eeee0 100644
--- a/IPython/core/tests/test_history.py
+++ b/IPython/core/tests/test_history.py
@@ -162,7 +162,7 @@ def test_extract_hist_ranges():
 
 
 def test_extract_hist_ranges_empty_str():
-    instr = ''
+    instr = ""
     expected = [(0, 1, None)]  # 0 == current session, None == to end
     actual = list(extract_hist_ranges(instr))
     nt.assert_equal(actual, expected)
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index b939c99af3e..fd5696d686f 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -1091,7 +1091,7 @@ def test_save():
 
 def test_save_with_no_args():
     ip = get_ipython()
-    ip.history_manager.reset()   # Clear any existing history.
+    ip.history_manager.reset()  # Clear any existing history.
     cmds = [u"a=1", u"def b():\n    return a**2", u"print(a, b())", "%save"]
     for i, cmd in enumerate(cmds, start=1):
         ip.history_manager.store_inputs(i, cmd)

From dd522bf82e7c4761f892f07ba27b354b41392d53 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Thu, 8 Jul 2021 23:47:14 +0200
Subject: [PATCH 0591/1407] Add .mypy_cache to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 0a2a7ef8cb5..5b45fd4d6b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ __pycache__
 .python-version
 venv*/
 .idea/
+.mypy_cache/

From de2f96dac725ffb32f6cce36e2ee394e313eb315 Mon Sep 17 00:00:00 2001
From: Douglas Blank <doug.blank@gmail.com>
Date: Sat, 10 Jul 2021 11:00:49 -0700
Subject: [PATCH 0592/1407] Make timing work with jupyterlite

JupyterLite has a resource, but not getrusage(). This make the code a little more general.
---
 IPython/utils/timing.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/IPython/utils/timing.py b/IPython/utils/timing.py
index 9a31affadf0..600a08092c9 100644
--- a/IPython/utils/timing.py
+++ b/IPython/utils/timing.py
@@ -23,6 +23,11 @@
 # If possible (Unix), use the resource module instead of time.clock()
 try:
     import resource
+except ImportError:
+    resource = None
+
+# Some implementations (like jyputerlite) don't have getrusage
+if resource not None and hasattr(resource, "getrusage"):
     def clocku():
         """clocku() -> floating point number
 

From 75bdd216cb3581ba5f1bf8eb81411f7a54dbb9e6 Mon Sep 17 00:00:00 2001
From: Douglas Blank <doug.blank@gmail.com>
Date: Sat, 10 Jul 2021 11:07:14 -0700
Subject: [PATCH 0593/1407] Fix typo

---
 IPython/utils/timing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/utils/timing.py b/IPython/utils/timing.py
index 600a08092c9..c4acd6f0412 100644
--- a/IPython/utils/timing.py
+++ b/IPython/utils/timing.py
@@ -27,7 +27,7 @@
     resource = None
 
 # Some implementations (like jyputerlite) don't have getrusage
-if resource not None and hasattr(resource, "getrusage"):
+if resource is not None and hasattr(resource, "getrusage"):
     def clocku():
         """clocku() -> floating point number
 

From eb5685b0ac2884dfadac25f5b7cc13ff229e3be9 Mon Sep 17 00:00:00 2001
From: Douglas Blank <doug.blank@gmail.com>
Date: Sat, 10 Jul 2021 11:08:34 -0700
Subject: [PATCH 0594/1407] Fix else

---
 IPython/utils/timing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/utils/timing.py b/IPython/utils/timing.py
index c4acd6f0412..16de71cf471 100644
--- a/IPython/utils/timing.py
+++ b/IPython/utils/timing.py
@@ -61,7 +61,7 @@ def clock2():
 
         Similar to clock(), but return a tuple of user/system times."""
         return resource.getrusage(resource.RUSAGE_SELF)[:2]
-except ImportError:
+else:
     # There is no distinction of user/system time under windows, so we just use
     # time.perff_counter() for everything...
     clocku = clocks = clock = time.perf_counter

From f2bc8135fe942f0c3a60c050b6f2159396324288 Mon Sep 17 00:00:00 2001
From: Douglas Blank <doug.blank@gmail.com>
Date: Sat, 10 Jul 2021 11:13:26 -0700
Subject: [PATCH 0595/1407] Fix formatting

---
 IPython/utils/timing.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/utils/timing.py b/IPython/utils/timing.py
index 16de71cf471..32741acdd9c 100644
--- a/IPython/utils/timing.py
+++ b/IPython/utils/timing.py
@@ -61,6 +61,8 @@ def clock2():
 
         Similar to clock(), but return a tuple of user/system times."""
         return resource.getrusage(resource.RUSAGE_SELF)[:2]
+
+
 else:
     # There is no distinction of user/system time under windows, so we just use
     # time.perff_counter() for everything...

From 19c1a29c303864018ab82da2012a3101ad4eb036 Mon Sep 17 00:00:00 2001
From: Arthur Svistunov <madbird1304@gmail.com>
Date: Tue, 13 Jul 2021 02:46:39 +0200
Subject: [PATCH 0596/1407] Fix path handling in `pip` line magic (#13052)

* Fix path handling in `pip` line magic

* Remove unused import

* code style fix

* Remove `_get_full_path()` (`sys.executable` is always absolute)

* Quote executable path selectively, leaving whitespaces untouched.

* forgotten join

* reduce shlex usage - remove line split, leave only path quotation
---
 IPython/core/magics/packaging.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index e5e6877f15b..f1b19546413 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -66,7 +66,9 @@ def pip(self, line):
         Usage:
           %pip install [pkgs]
         """
-        self.shell.system(' '.join([sys.executable, '-m', 'pip', line]))
+        python = shlex.quote(sys.executable)
+        self.shell.system(" ".join([python, "-m", "pip", line]))
+
         print("Note: you may need to restart the kernel to use updated packages.")
 
     @line_magic

From 694d3c63052f9db3870fade2c34432bc916589d1 Mon Sep 17 00:00:00 2001
From: Eyenpi <eyenpix@gmail.com>
Date: Tue, 13 Jul 2021 15:20:14 +0430
Subject: [PATCH 0597/1407] add expiry days feature to pastebin magic

---
 IPython/core/magics/code.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index e5b2ce17635..962f70bd745 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -249,7 +249,7 @@ def pastebin(self, parameter_s=''):
         """Upload code to dpaste.com, returning the URL.
 
         Usage:\\
-          %pastebin [-d "Custom description"] 1-7
+          %pastebin [-d "Custom description"][-e 24] 1-7
 
         The argument can be an input history range, a filename, or the name of a
         string or macro.
@@ -258,8 +258,10 @@ def pastebin(self, parameter_s=''):
 
           -d: Pass a custom description. The default will say
               "Pasted from IPython".
+          -e: Pass number of days for the link to be expired.
+              The default will be 7 days.
         """
-        opts, args = self.parse_options(parameter_s, 'd:')
+        opts, args = self.parse_options(parameter_s, 'd:e:')
 
         try:
             code = self.shell.find_user_code(args)
@@ -267,11 +269,23 @@ def pastebin(self, parameter_s=''):
             print(e.args[0])
             return
 
+        expiry_days = 7
+        if "e" in opts:
+            try:
+                expiry_days = int(opts.get("e", 7))
+            except ValueError as e:
+                print(e.args[0])
+                return
+            if expiry_days < 1 or expiry_days > 365:
+                print("Expiry days should be in range of 1 to 365.")
+                return
+
         post_data = urlencode(
             {
                 "title": opts.get("d", "Pasted from IPython"),
                 "syntax": "python",
                 "content": code,
+                "expiry_days": expiry_days
             }
         ).encode("utf-8")
 

From b0bc122821f75638b5ca5898585d81bfba96a44c Mon Sep 17 00:00:00 2001
From: Eyenpi <eyenpix@gmail.com>
Date: Tue, 13 Jul 2021 15:23:35 +0430
Subject: [PATCH 0598/1407] change dpaste api protocol from http to https

---
 IPython/core/magics/code.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index 962f70bd745..4d330273938 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -290,7 +290,7 @@ def pastebin(self, parameter_s=''):
         ).encode("utf-8")
 
         request = Request(
-            "http://dpaste.com/api/v2/",
+            "https://dpaste.com/api/v2/",
             headers={"User-Agent": "IPython v{}".format(version)},
         )
         response = urlopen(request, post_data)

From 276557e49bd4e77e1db0b99534591226fe7da724 Mon Sep 17 00:00:00 2001
From: Eyenpi <eyenpix@gmail.com>
Date: Tue, 13 Jul 2021 16:12:48 +0430
Subject: [PATCH 0599/1407] fix the lint with darker check

---
 IPython/core/magics/code.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index 4d330273938..9a90e942a53 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -261,7 +261,7 @@ def pastebin(self, parameter_s=''):
           -e: Pass number of days for the link to be expired.
               The default will be 7 days.
         """
-        opts, args = self.parse_options(parameter_s, 'd:e:')
+        opts, args = self.parse_options(parameter_s, "d:e:")
 
         try:
             code = self.shell.find_user_code(args)
@@ -285,7 +285,7 @@ def pastebin(self, parameter_s=''):
                 "title": opts.get("d", "Pasted from IPython"),
                 "syntax": "python",
                 "content": code,
-                "expiry_days": expiry_days
+                "expiry_days": expiry_days,
             }
         ).encode("utf-8")
 

From 2c9ca78dd2906b3b24e9298de03301f4e06eefc7 Mon Sep 17 00:00:00 2001
From: Ali Nabipour <60272711+eyenpi@users.noreply.github.com>
Date: Wed, 14 Jul 2021 14:08:38 +0430
Subject: [PATCH 0600/1407] capitalize error for consistency with L280

Co-authored-by: Blazej Michalik <6691643+MrMino@users.noreply.github.com>
---
 IPython/core/magics/code.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index 9a90e942a53..7b766183b13 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -274,7 +274,7 @@ def pastebin(self, parameter_s=''):
             try:
                 expiry_days = int(opts.get("e", 7))
             except ValueError as e:
-                print(e.args[0])
+                print(e.args[0].capitalize())
                 return
             if expiry_days < 1 or expiry_days > 365:
                 print("Expiry days should be in range of 1 to 365.")

From 75f84eb8e464af30660a9b7759865d4107dc6958 Mon Sep 17 00:00:00 2001
From: Ali Nabipour <60272711+eyenpi@users.noreply.github.com>
Date: Wed, 14 Jul 2021 14:09:44 +0430
Subject: [PATCH 0601/1407] drop the dot for consistency with L277

Co-authored-by: Blazej Michalik <6691643+MrMino@users.noreply.github.com>
---
 IPython/core/magics/code.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index 7b766183b13..23709d04849 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -277,7 +277,7 @@ def pastebin(self, parameter_s=''):
                 print(e.args[0].capitalize())
                 return
             if expiry_days < 1 or expiry_days > 365:
-                print("Expiry days should be in range of 1 to 365.")
+                print("Expiry days should be in range of 1 to 365")
                 return
 
         post_data = urlencode(

From 3708b30a78d636795c063f720ff1f1e9fe3f2b06 Mon Sep 17 00:00:00 2001
From: Eyenpi <eyenpix@gmail.com>
Date: Wed, 14 Jul 2021 14:22:18 +0430
Subject: [PATCH 0602/1407] remove the unneeded if statment

---
 IPython/core/magics/code.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index 23709d04849..82ce71b2bf3 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -270,15 +270,14 @@ def pastebin(self, parameter_s=''):
             return
 
         expiry_days = 7
-        if "e" in opts:
-            try:
-                expiry_days = int(opts.get("e", 7))
-            except ValueError as e:
-                print(e.args[0].capitalize())
-                return
-            if expiry_days < 1 or expiry_days > 365:
-                print("Expiry days should be in range of 1 to 365")
-                return
+        try:
+            expiry_days = int(opts.get("e", 7))
+        except ValueError as e:
+            print(e.args[0].capitalize())
+            return
+        if expiry_days < 1 or expiry_days > 365:
+            print("Expiry days should be in range of 1 to 365")
+            return
 
         post_data = urlencode(
             {

From e4f95eba4e759e859ae999f740ea929ab936bb64 Mon Sep 17 00:00:00 2001
From: Eyenpi <eyenpix@gmail.com>
Date: Wed, 14 Jul 2021 14:38:11 +0430
Subject: [PATCH 0603/1407] add the what's new entry for pastebin option

---
 docs/source/whatsnew/pr/pastebin-expiry-days.rst | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/pastebin-expiry-days.rst

diff --git a/docs/source/whatsnew/pr/pastebin-expiry-days.rst b/docs/source/whatsnew/pr/pastebin-expiry-days.rst
new file mode 100644
index 00000000000..cb86b390bac
--- /dev/null
+++ b/docs/source/whatsnew/pr/pastebin-expiry-days.rst
@@ -0,0 +1,7 @@
+Pastebin magic expiry days option
+===================
+
+The Pastebin magic now has ``-e`` option to determine 
+the number of days for paste expiration. For example
+the paste that created with ``%pastebin -e 20 1`` magic will
+be available for next 20 days.

From 5b907230d0efddbfb232f71dc3a45c46139fc23b Mon Sep 17 00:00:00 2001
From: Blazej Michalik <6691643+MrMino@users.noreply.github.com>
Date: Wed, 14 Jul 2021 14:37:14 +0200
Subject: [PATCH 0604/1407] Fix RST warning in docs

"Title underline too short."
---
 docs/source/whatsnew/pr/pastebin-expiry-days.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/pr/pastebin-expiry-days.rst b/docs/source/whatsnew/pr/pastebin-expiry-days.rst
index cb86b390bac..68faa7851f8 100644
--- a/docs/source/whatsnew/pr/pastebin-expiry-days.rst
+++ b/docs/source/whatsnew/pr/pastebin-expiry-days.rst
@@ -1,5 +1,5 @@
 Pastebin magic expiry days option
-===================
+=================================
 
 The Pastebin magic now has ``-e`` option to determine 
 the number of days for paste expiration. For example

From 58aec644b1706918aa286a4b667dfcf795111b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20A=2E=20Gomes?= <andremegafone@gmail.com>
Date: Wed, 14 Jul 2021 18:54:31 +0300
Subject: [PATCH 0605/1407] Minor paraphrasing.

---
 docs/source/interactive/tutorial.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/interactive/tutorial.rst b/docs/source/interactive/tutorial.rst
index bf6fcd1fbea..511e7463875 100644
--- a/docs/source/interactive/tutorial.rst
+++ b/docs/source/interactive/tutorial.rst
@@ -90,8 +90,8 @@ completion also works on file and directory names.
 Starting with IPython 6.0, if ``jedi`` is installed, IPython will try to pull
 completions from Jedi as well. This allows to not only inspect currently
 existing objects, but also to infer completion statically without executing
-code. There is nothing particular to get this to work, simply use tab completion
-on more complex expressions like the following::
+code. There is nothing particular needed to get this to work, simply use tab
+completion on more complex expressions like the following::
 
     >>> data = ['Number of users', 123456]
     ... data[0].<tab>

From 55d4c79f1d9ad9e4f5461502301803bc2e2e1562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20A=2E=20Gomes?= <andremegafone@gmail.com>
Date: Wed, 14 Jul 2021 18:55:31 +0300
Subject: [PATCH 0606/1407] Delete incomplete section.

---
 docs/source/interactive/python-ipython-diff.rst | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/docs/source/interactive/python-ipython-diff.rst b/docs/source/interactive/python-ipython-diff.rst
index 59f25472077..564c1c5ab88 100644
--- a/docs/source/interactive/python-ipython-diff.rst
+++ b/docs/source/interactive/python-ipython-diff.rst
@@ -238,12 +238,3 @@ Magics with double percent signs (``%%``) can spread over multiple lines, but th
     devfs          190Ki  190Ki    0Bi   100%      656       0  100%   /dev
     map -hosts       0Bi    0Bi    0Bi   100%        0       0  100%   /net
     map auto_home    0Bi    0Bi    0Bi   100%        0       0  100%   /hom
-
-
-..
-   Combining it all
-   ----------------
-
-   ::
-
-       find a snippet that combine all that into one thing!

From b2433d6146424da7e8fb26e0fe5e9fb352fe998e Mon Sep 17 00:00:00 2001
From: Daniel Shimon <daniel.shimon22@gmail.com>
Date: Thu, 29 Jul 2021 03:12:05 +0300
Subject: [PATCH 0607/1407] Only complete exported submodules in import
 statements

When completing `import m.` statements, only complete exported (`__all__`) objects if they are modules.
E.g. `import os.pa` should complete `os.path` but not `os.pathconf`.
---
 IPython/core/completerlib.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/IPython/core/completerlib.py b/IPython/core/completerlib.py
index 7860cb67dcb..0ca97e7b7ff 100644
--- a/IPython/core/completerlib.py
+++ b/IPython/core/completerlib.py
@@ -154,6 +154,17 @@ def is_importable(module, attr, only_modules):
     else:
         return not(attr[:2] == '__' and attr[-2:] == '__')
 
+def is_possible_submodule(module, attr):
+    try:
+        obj = getattr(module, attr)
+    except AttributeError:
+        # Is possilby an unimported submodule
+        return True
+    except TypeError:
+        # https://github.com/ipython/ipython/issues/9678
+        return False
+    return inspect.ismodule(obj)
+
 
 def try_import(mod: str, only_modules=False) -> List[str]:
     """
@@ -172,7 +183,12 @@ def try_import(mod: str, only_modules=False) -> List[str]:
         completions.extend( [attr for attr in dir(m) if
                              is_importable(m, attr, only_modules)])
 
-    completions.extend(getattr(m, '__all__', []))
+    m_all = getattr(m, "__all__", [])
+    if only_modules:
+        completions.extend(attr for attr in m_all if is_possible_submodule(m, attr))
+    else:
+        completions.extend(m_all)
+
     if m_is_init:
         completions.extend(module_list(os.path.dirname(m.__file__)))
     completions_set = {c for c in completions if isinstance(c, str)}

From 69e40126b9764ddb9bd7a9c9f7319a19a27c4047 Mon Sep 17 00:00:00 2001
From: Daniel Shimon <daniel.shimon22@gmail.com>
Date: Thu, 29 Jul 2021 03:13:14 +0300
Subject: [PATCH 0608/1407] Add tests for completing exported submodules

---
 IPython/core/tests/test_completerlib.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/IPython/core/tests/test_completerlib.py b/IPython/core/tests/test_completerlib.py
index d1127048764..f87e784d63c 100644
--- a/IPython/core/tests/test_completerlib.py
+++ b/IPython/core/tests/test_completerlib.py
@@ -157,6 +157,11 @@ def test_bad_module_all():
         nt.assert_in('puppies', results)
         for r in results:
             nt.assert_is_instance(r, str)
+
+        # bad_all doesn't contain submodules, but this completion
+        # should finish without raising an exception:
+        results = module_completion("import bad_all.")
+        nt.assert_equal(results, [])
     finally:
         sys.path.remove(testsdir)
 
@@ -176,3 +181,14 @@ def test_module_without_init():
             assert s == []
         finally:
             sys.path.remove(tmpdir)
+
+
+def test_valid_exported_submodules():
+    """
+    Test checking exported (__all__) objects are submodules
+    """
+    results = module_completion("import os.pa")
+    # ensure we get a valid submodule:
+    nt.assert_in("os.path", results)
+    # ensure we don't get objects that aren't submodules:
+    nt.assert_not_in("os.pathconf", results)

From 15dccec13a3fe58ff16486b3881d9f5edad02fa0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 31 Jul 2021 16:33:08 +0200
Subject: [PATCH 0609/1407] update what's new for 7.26

---
 .../pr/ipython_directive_warnings.rst         |  4 --
 docs/source/whatsnew/version7.rst             | 38 +++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)
 delete mode 100644 docs/source/whatsnew/pr/ipython_directive_warnings.rst

diff --git a/docs/source/whatsnew/pr/ipython_directive_warnings.rst b/docs/source/whatsnew/pr/ipython_directive_warnings.rst
deleted file mode 100644
index c658c0207ce..00000000000
--- a/docs/source/whatsnew/pr/ipython_directive_warnings.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-IPython directive warnings
---------------------------
-
-The IPython directive now uses Sphinx logging for warnings.
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 553752c8a0b..2f5543444d4 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,44 @@
  7.x Series
 ============
 
+.. _version 7.26:
+
+IPython 7.26
+============
+
+IPython 7.26 is a minor release that fixes a couple of issues, updates in API
+and Copyright/Licenses issues around various part of the codebase.
+
+We'll highlight `this issue <https://github.com/ipython/ipython/issues/13039>`
+pointing out we were including and refereeing to code from Stack Overflow which
+was CC-BY-SA, hence incompatible with the BSD license of IPython. This lead us
+to a rewriting of the corresponding logic which in our case was done in a more
+efficient way (in our case we were searching string prefixes instead of full
+strings).
+
+You will notice also a number of documentation improvements and cleanup.
+
+Of particular interest are the following Pull-requests:
+
+
+ - The IPython directive now uses Sphinx logging for warnings. :ghpull:`13030`.
+ - Add expiry days option to pastebin magic and change http protocol to https.
+   :ghpull:`13056`
+ - Make Ipython.utils.timing work with jupyterlite :ghpull:`13050`.
+
+
+
+Thanks
+------
+
+Many thanks to all the contributors to this release and in particular MrMino who
+is doing most of the work those days. You can find all individual contributions
+to this milestone `on github <https://github.com/ipython/ipython/milestone/90>`__.
+
+Thanks as well to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries.
+
+
 .. _version 7.25:
 
 IPython 7.25

From aaeed5f903a8d1eff22a64d99d4f07e4bb4293e2 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Tue, 3 Aug 2021 10:40:15 +0200
Subject: [PATCH 0610/1407] inherit base aliases / flags from
 traitlets.config.Application

this gets e.g. `--show-config` from the base class when available (traitlets 5)
---
 IPython/core/application.py | 58 +++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/IPython/core/application.py b/IPython/core/application.py
index 30bff844a8d..db48ab2bb44 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -66,27 +66,49 @@
 
 # aliases and flags
 
-base_aliases = {
-    'profile-dir' : 'ProfileDir.location',
-    'profile' : 'BaseIPythonApplication.profile',
-    'ipython-dir' : 'BaseIPythonApplication.ipython_dir',
-    'log-level' : 'Application.log_level',
-    'config' : 'BaseIPythonApplication.extra_config_file',
-}
-
-base_flags = dict(
-    debug = ({'Application' : {'log_level' : logging.DEBUG}},
-            "set log level to logging.DEBUG (maximize logging output)"),
-    quiet = ({'Application' : {'log_level' : logging.CRITICAL}},
-            "set log level to logging.CRITICAL (minimize logging output)"),
-    init = ({'BaseIPythonApplication' : {
-                    'copy_config_files' : True,
-                    'auto_create' : True}
-            }, """Initialize profile with default config files.  This is equivalent
+base_aliases = {}
+if isinstance(Application.aliases, dict):
+    # traitlets 5
+    base_aliases.update(Application.aliases)
+base_aliases.update(
+    {
+        "profile-dir": "ProfileDir.location",
+        "profile": "BaseIPythonApplication.profile",
+        "ipython-dir": "BaseIPythonApplication.ipython_dir",
+        "log-level": "Application.log_level",
+        "config": "BaseIPythonApplication.extra_config_file",
+    }
+)
+
+base_flags = dict()
+if isinstance(Application.flags, dict):
+    # traitlets 5
+    base_flags.update(Application.flags)
+base_flags.update(
+    dict(
+        debug=(
+            {"Application": {"log_level": logging.DEBUG}},
+            "set log level to logging.DEBUG (maximize logging output)",
+        ),
+        quiet=(
+            {"Application": {"log_level": logging.CRITICAL}},
+            "set log level to logging.CRITICAL (minimize logging output)",
+        ),
+        init=(
+            {
+                "BaseIPythonApplication": {
+                    "copy_config_files": True,
+                    "auto_create": True,
+                }
+            },
+            """Initialize profile with default config files.  This is equivalent
             to running `ipython profile create <profile>` prior to startup.
-            """)
+            """,
+        ),
+    )
 )
 
+
 class ProfileAwareConfigLoader(PyFileConfigLoader):
     """A Python file config loader that is aware of IPython profiles."""
     def load_subconfig(self, fname, path=None, profile=None):

From 474a1b97bbcbe5fd3a8a7276fff0e3036ec5b8ea Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Tue, 3 Aug 2021 18:47:59 +0200
Subject: [PATCH 0611/1407] Remove deprecated IPython.html module

---
 IPython/html.py | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 IPython/html.py

diff --git a/IPython/html.py b/IPython/html.py
deleted file mode 100644
index 050be5c5991..00000000000
--- a/IPython/html.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-Shim to maintain backwards compatibility with old IPython.html imports.
-"""
-# Copyright (c) IPython Development Team.
-# Distributed under the terms of the Modified BSD License.
-
-import sys
-from warnings import warn
-
-from IPython.utils.shimmodule import ShimModule, ShimWarning
-
-warn("The `IPython.html` package has been deprecated since IPython 4.0. "
-     "You should import from `notebook` instead. "
-     "`IPython.html.widgets` has moved to `ipywidgets`.", ShimWarning)
-
-_widgets = sys.modules['IPython.html.widgets'] = ShimModule(
-    src='IPython.html.widgets', mirror='ipywidgets')
-
-_html = ShimModule(
-    src='IPython.html', mirror='notebook')
-
-# hook up widgets
-_html.widgets = _widgets
-sys.modules['IPython.html'] = _html
-
-if __name__ == '__main__':
-    from notebook import notebookapp as app
-    app.launch_new_instance()

From 459330fd4e01c185fd53f9189318d6d25933b51f Mon Sep 17 00:00:00 2001
From: Thomas A Caswell <tcaswell@gmail.com>
Date: Fri, 6 Aug 2021 18:45:43 -0400
Subject: [PATCH 0612/1407] ENH: add support for Qt6 input hooks

This is heavily cribbed from Matplotlib's Qt6 support.
---
 IPython/core/pylabtools.py                 |   1 +
 IPython/external/qt_for_kernel.py          |  46 ++++--
 IPython/external/qt_loaders.py             | 158 +++++++++++++++------
 IPython/terminal/pt_inputhooks/__init__.py |   7 +-
 IPython/terminal/pt_inputhooks/qt.py       |  26 +++-
 5 files changed, 174 insertions(+), 64 deletions(-)

diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index 1914deb28f2..2c0d25b2805 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -19,6 +19,7 @@
     "wx": "WXAgg",
     "qt4": "Qt4Agg",
     "qt5": "Qt5Agg",
+    "qt6": "QtAgg",
     "qt": "Qt5Agg",
     "osx": "MacOSX",
     "nbagg": "nbAgg",
diff --git a/IPython/external/qt_for_kernel.py b/IPython/external/qt_for_kernel.py
index 1a94e7e0a2e..8926caca38c 100644
--- a/IPython/external/qt_for_kernel.py
+++ b/IPython/external/qt_for_kernel.py
@@ -32,15 +32,32 @@
 import sys
 
 from IPython.utils.version import check_version
-from IPython.external.qt_loaders import (load_qt, loaded_api, QT_API_PYSIDE,
-                                         QT_API_PYSIDE2, QT_API_PYQT, QT_API_PYQT5,
-                                         QT_API_PYQTv1, QT_API_PYQT_DEFAULT)
+from IPython.external.qt_loaders import (
+    load_qt, loaded_api, enum_factory,
+    # QT6
+    QT_API_PYQT6, QT_API_PYSIDE6,
+    # QT5
+    QT_API_PYQT5, QT_API_PYSIDE2,
+    # QT4
+    QT_API_PYQTv1, QT_API_PYQT, QT_API_PYSIDE,
+    # default
+    QT_API_PYQT_DEFAULT
+)
+
+_qt_apis = (
+    # QT6
+    QT_API_PYQT6, QT_API_PYSIDE6,
+    # QT5
+    QT_API_PYQT5, QT_API_PYSIDE2,
+    # QT4
+    QT_API_PYQTv1, QT_API_PYQT, QT_API_PYSIDE,
+    # default
+    QT_API_PYQT_DEFAULT
+)
 
-_qt_apis = (QT_API_PYSIDE, QT_API_PYSIDE2, QT_API_PYQT, QT_API_PYQT5, QT_API_PYQTv1,
-            QT_API_PYQT_DEFAULT)
 
-#Constraints placed on an imported matplotlib
 def matplotlib_options(mpl):
+    """Constraints placed on an imported matplotlib."""
     if mpl is None:
         return
     backend = mpl.rcParams.get('backend', None)
@@ -66,9 +83,7 @@ def matplotlib_options(mpl):
                           mpqt)
 
 def get_options():
-    """Return a list of acceptable QT APIs, in decreasing order of
-    preference
-    """
+    """Return a list of acceptable QT APIs, in decreasing order of preference."""
     #already imported Qt somewhere. Use that
     loaded = loaded_api()
     if loaded is not None:
@@ -83,13 +98,22 @@ def get_options():
     qt_api = os.environ.get('QT_API', None)
     if qt_api is None:
         #no ETS variable. Ask mpl, then use default fallback path
-        return matplotlib_options(mpl) or [QT_API_PYQT_DEFAULT, QT_API_PYSIDE,
-                                           QT_API_PYQT5, QT_API_PYSIDE2]
+        return matplotlib_options(mpl) or [
+            QT_API_PYQT_DEFAULT,
+            QT_API_PYQT6,
+            QT_API_PYSIDE6,
+            QT_API_PYQT5,
+            QT_API_PYSIDE2,
+            QT_API_PYQT,
+            QT_API_PYSIDE
+        ]
     elif qt_api not in _qt_apis:
         raise RuntimeError("Invalid Qt API %r, valid values are: %r" %
                            (qt_api, ', '.join(_qt_apis)))
     else:
         return [qt_api]
 
+
 api_opts = get_options()
 QtCore, QtGui, QtSvg, QT_API = load_qt(api_opts)
+enum_helper = enum_factory(QT_API, QtCore)
diff --git a/IPython/external/qt_loaders.py b/IPython/external/qt_loaders.py
index ca7483ec1c9..14ce4091675 100644
--- a/IPython/external/qt_loaders.py
+++ b/IPython/external/qt_loaders.py
@@ -10,26 +10,41 @@
 """
 import sys
 import types
-from functools import partial
-from importlib import import_module
+from functools import partial, lru_cache
+import operator
 
 from IPython.utils.version import check_version
 
-# Available APIs.
-QT_API_PYQT = 'pyqt' # Force version 2
+# ### Available APIs.
+# Qt6
+QT_API_PYQT6 = "pyqt6"
+QT_API_PYSIDE6 = "pyside6"
+
+# Qt5
 QT_API_PYQT5 = 'pyqt5'
-QT_API_PYQTv1 = 'pyqtv1' # Force version 2
-QT_API_PYQT_DEFAULT = 'pyqtdefault' # use system default for version 1 vs. 2
-QT_API_PYSIDE = 'pyside'
 QT_API_PYSIDE2 = 'pyside2'
 
-api_to_module = {QT_API_PYSIDE2: 'PySide2',
-                 QT_API_PYSIDE: 'PySide',
-                 QT_API_PYQT: 'PyQt4',
-                 QT_API_PYQTv1: 'PyQt4',
-                 QT_API_PYQT5: 'PyQt5',
-                 QT_API_PYQT_DEFAULT: 'PyQt4',
-                }
+# Qt4
+QT_API_PYQT = 'pyqt'  # Force version 2
+QT_API_PYQTv1 = 'pyqtv1'  # Force version 2
+QT_API_PYSIDE = 'pyside'
+
+QT_API_PYQT_DEFAULT = 'pyqtdefault'  # use system default for version 1 vs. 2
+
+api_to_module = {
+    # Qt6
+    QT_API_PYQT6: "PyQt6",
+    QT_API_PYSIDE6: "PySide6",
+    # Qt5
+    QT_API_PYQT5: 'PyQt5',
+    QT_API_PYSIDE2: 'PySide2',
+    # Qt4
+    QT_API_PYSIDE: 'PySide',
+    QT_API_PYQT: 'PyQt4',
+    QT_API_PYQTv1: 'PyQt4',
+    # default
+    QT_API_PYQT_DEFAULT: 'PyQt6',
+}
 
 
 class ImportDenier(object):
@@ -56,6 +71,7 @@ def load_module(self, fullname):
     already imported an Incompatible QT Binding: %s
     """ % (fullname, loaded_api()))
 
+
 ID = ImportDenier()
 sys.meta_path.insert(0, ID)
 
@@ -63,23 +79,11 @@ def load_module(self, fullname):
 def commit_api(api):
     """Commit to a particular API, and trigger ImportErrors on subsequent
        dangerous imports"""
+    modules = set(api_to_module.values())
 
-    if api == QT_API_PYSIDE2:
-        ID.forbid('PySide')
-        ID.forbid('PyQt4')
-        ID.forbid('PyQt5')
-    elif api == QT_API_PYSIDE:
-        ID.forbid('PySide2')
-        ID.forbid('PyQt4')
-        ID.forbid('PyQt5')
-    elif api == QT_API_PYQT5:
-        ID.forbid('PySide2')
-        ID.forbid('PySide')
-        ID.forbid('PyQt4')
-    else:   # There are three other possibilities, all representing PyQt4
-        ID.forbid('PyQt5')
-        ID.forbid('PySide2')
-        ID.forbid('PySide')
+    modules.remove(api_to_module[api])
+    for mod in modules:
+        ID.forbid(mod)
 
 
 def loaded_api():
@@ -90,19 +94,24 @@ def loaded_api():
 
     Returns
     -------
-    None, 'pyside2', 'pyside', 'pyqt', 'pyqt5', or 'pyqtv1'
+    None, 'pyside6', 'pyqt6', 'pyside2', 'pyside', 'pyqt', 'pyqt5', 'pyqtv1'
     """
-    if 'PyQt4.QtCore' in sys.modules:
+    if sys.modules.get("PyQt6.QtCore"):
+        return QT_API_PYQT6
+    elif sys.modules.get("PySide6.QtCore"):
+        return QT_API_PYSIDE6
+    elif sys.modules.get("PyQt5.QtCore"):
+        return QT_API_PYQT5
+    elif sys.modules.get("PySide2.QtCore"):
+        return QT_API_PYSIDE2
+    elif sys.modules.get('PyQt4.QtCore'):
         if qtapi_version() == 2:
             return QT_API_PYQT
         else:
             return QT_API_PYQTv1
-    elif 'PySide.QtCore' in sys.modules:
+    elif sys.modules.get('PySide.QtCore'):
         return QT_API_PYSIDE
-    elif 'PySide2.QtCore' in sys.modules:
-        return QT_API_PYSIDE2
-    elif 'PyQt5.QtCore' in sys.modules:
-        return QT_API_PYQT5
+
     return None
 
 
@@ -122,7 +131,7 @@ def has_binding(api):
     from importlib.util import find_spec
 
     required = ['QtCore', 'QtGui', 'QtSvg']
-    if api in (QT_API_PYQT5, QT_API_PYSIDE2):
+    if api in (QT_API_PYQT5, QT_API_PYSIDE2, QT_API_PYQT6, QT_API_PYSIDE6):
         # QT5 requires QtWidgets too
         required.append('QtWidgets')
 
@@ -174,7 +183,7 @@ def can_import(api):
 
     current = loaded_api()
     if api == QT_API_PYQT_DEFAULT:
-        return current in [QT_API_PYQT, QT_API_PYQTv1, None]
+        return current in [QT_API_PYQT6, None]
     else:
         return current in [api, None]
 
@@ -224,7 +233,7 @@ def import_pyqt5():
     """
 
     from PyQt5 import QtCore, QtSvg, QtWidgets, QtGui
-    
+
     # Alias PyQt-specific functions for PySide compatibility.
     QtCore.Signal = QtCore.pyqtSignal
     QtCore.Slot = QtCore.pyqtSlot
@@ -237,6 +246,27 @@ def import_pyqt5():
     api = QT_API_PYQT5
     return QtCore, QtGuiCompat, QtSvg, api
 
+def import_pyqt6():
+    """
+    Import PyQt6
+
+    ImportErrors rasied within this function are non-recoverable
+    """
+
+    from PyQt6 import QtCore, QtSvg, QtWidgets, QtGui
+
+    # Alias PyQt-specific functions for PySide compatibility.
+    QtCore.Signal = QtCore.pyqtSignal
+    QtCore.Slot = QtCore.pyqtSlot
+
+    # Join QtGui and QtWidgets for Qt4 compatibility.
+    QtGuiCompat = types.ModuleType('QtGuiCompat')
+    QtGuiCompat.__dict__.update(QtGui.__dict__)
+    QtGuiCompat.__dict__.update(QtWidgets.__dict__)
+
+    api = QT_API_PYQT6
+    return QtCore, QtGuiCompat, QtSvg, api
+
 
 def import_pyside():
     """
@@ -263,6 +293,22 @@ def import_pyside2():
 
     return QtCore, QtGuiCompat, QtSvg, QT_API_PYSIDE2
 
+def import_pyside6():
+    """
+    Import PySide6
+
+    ImportErrors raised within this function are non-recoverable
+    """
+    from PySide6 import QtGui, QtCore, QtSvg, QtWidgets, QtPrintSupport
+
+    # Join QtGui and QtWidgets for Qt4 compatibility.
+    QtGuiCompat = types.ModuleType('QtGuiCompat')
+    QtGuiCompat.__dict__.update(QtGui.__dict__)
+    QtGuiCompat.__dict__.update(QtWidgets.__dict__)
+    QtGuiCompat.__dict__.update(QtPrintSupport.__dict__)
+
+    return QtCore, QtGuiCompat, QtSvg, QT_API_PYSIDE6
+
 
 def load_qt(api_options):
     """
@@ -291,13 +337,19 @@ def load_qt(api_options):
     an incompatible library has already been installed)
     """
     loaders = {
-               QT_API_PYSIDE2: import_pyside2,
-               QT_API_PYSIDE: import_pyside,
-               QT_API_PYQT: import_pyqt4,
-               QT_API_PYQT5: import_pyqt5,
-               QT_API_PYQTv1: partial(import_pyqt4, version=1),
-               QT_API_PYQT_DEFAULT: partial(import_pyqt4, version=None)
-              }
+        # Qt6
+        QT_API_PYQT6: import_pyqt6,
+        QT_API_PYSIDE6: import_pyside6,
+        # Qt5
+        QT_API_PYQT5: import_pyqt5,
+        QT_API_PYSIDE2: import_pyside2,
+        # Qt4
+        QT_API_PYSIDE: import_pyside,
+        QT_API_PYQT: import_pyqt4,
+        QT_API_PYQTv1: partial(import_pyqt4, version=1),
+        # default
+        QT_API_PYQT_DEFAULT: import_pyqt6,
+    }
 
     for api in api_options:
 
@@ -332,3 +384,15 @@ def load_qt(api_options):
            has_binding(QT_API_PYSIDE),
            has_binding(QT_API_PYSIDE2),
            api_options))
+
+
+def enum_factory(QT_API, QtCore):
+    """Construct an enum helper to account for PyQt5 <-> PyQt6 changes."""
+    @lru_cache(None)
+    def _enum(name):
+        # foo.bar.Enum.Entry (PyQt6) <=> foo.bar.Entry (non-PyQt6).
+        return operator.attrgetter(
+            name if QT_API == QT_API_PYQT6 else name.rpartition(".")[0]
+        )(sys.modules[QtCore.__package__])
+
+    return _enum
diff --git a/IPython/terminal/pt_inputhooks/__init__.py b/IPython/terminal/pt_inputhooks/__init__.py
index c7ba58dc4be..095881cd79e 100644
--- a/IPython/terminal/pt_inputhooks/__init__.py
+++ b/IPython/terminal/pt_inputhooks/__init__.py
@@ -7,7 +7,7 @@
 }
 
 backends = [
-    'qt', 'qt4', 'qt5',
+    'qt', 'qt4', 'qt5', 'qt6',
     'gtk', 'gtk2', 'gtk3',
     'tk',
     'wx',
@@ -22,6 +22,7 @@ def register(name, inputhook):
     """Register the function *inputhook* as an event loop integration."""
     registered[name] = inputhook
 
+
 class UnknownBackend(KeyError):
     def __init__(self, name):
         self.name = name
@@ -31,6 +32,7 @@ def __str__(self):
                 "Supported event loops are: {}").format(self.name,
                                     ', '.join(backends + sorted(registered)))
 
+
 def get_inputhook_name_and_func(gui):
     if gui in registered:
         return gui, registered[gui]
@@ -45,6 +47,9 @@ def get_inputhook_name_and_func(gui):
     if gui == 'qt5':
         os.environ['QT_API'] = 'pyqt5'
         gui_mod = 'qt'
+    elif gui == 'qt6':
+        os.environ['QT_API'] = 'pyqt6'
+        gui_mod = 'qt'
 
     mod = importlib.import_module('IPython.terminal.pt_inputhooks.'+gui_mod)
     return gui, mod.inputhook
diff --git a/IPython/terminal/pt_inputhooks/qt.py b/IPython/terminal/pt_inputhooks/qt.py
index b7683b8f249..6e9b120ba7f 100644
--- a/IPython/terminal/pt_inputhooks/qt.py
+++ b/IPython/terminal/pt_inputhooks/qt.py
@@ -1,6 +1,6 @@
 import sys
 import os
-from IPython.external.qt_for_kernel import QtCore, QtGui
+from IPython.external.qt_for_kernel import QtCore, QtGui, enum_helper
 from IPython import get_ipython
 
 # If we create a QApplication, keep a reference to it so that it doesn't get
@@ -9,6 +9,11 @@
 _already_warned = False
 
 
+def _exec(obj):
+    # exec on PyQt6, exec_ elsewhere.
+    obj.exec() if hasattr(obj, "exec") else obj.exec_()
+
+
 def _reclaim_excepthook():
     shell = get_ipython()
     if shell is not None:
@@ -32,7 +37,16 @@ def inputhook(context):
                         'variable. Deactivate Qt5 code.'
                     )
                 return
-        QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)
+        try:
+            QtCore.QApplication.setAttribute(
+                QtCore.Qt.AA_EnableHighDpiScaling)
+        except AttributeError:  # Only for Qt>=5.6, <6.
+            pass
+        try:
+            QtCore.QApplication.setHighDpiScaleFactorRoundingPolicy(
+                QtCore.Qt.HighDpiScaleFactorRoundingPolicy.PassThrough)
+        except AttributeError:  # Only for Qt>=5.14.
+            pass
         _appref = app = QtGui.QApplication([" "])
 
         # "reclaim" IPython sys.excepthook after event loop starts
@@ -55,8 +69,10 @@ def inputhook(context):
     else:
         # On POSIX platforms, we can use a file descriptor to quit the event
         # loop when there is input ready to read.
-        notifier = QtCore.QSocketNotifier(context.fileno(),
-                                          QtCore.QSocketNotifier.Read)
+        notifier = QtCore.QSocketNotifier(
+            context.fileno(),
+            enum_helper('QtCore.QSocketNotifier.Type').Read
+        )
         try:
             # connect the callback we care about before we turn it on
             # lambda is necessary as PyQT inspect the function signature to know
@@ -65,6 +81,6 @@ def inputhook(context):
             notifier.setEnabled(True)
             # only start the event loop we are not already flipped
             if not context.input_is_ready():
-                event_loop.exec_()
+                _exec(event_loop)
         finally:
             notifier.setEnabled(False)

From 273ac5763db61a73fe9ac6dae0403db066f2fc78 Mon Sep 17 00:00:00 2001
From: Thomas A Caswell <tcaswell@gmail.com>
Date: Fri, 6 Aug 2021 18:52:42 -0400
Subject: [PATCH 0613/1407] STY: apply darker

---
 IPython/external/qt_for_kernel.py          | 30 +++++++++++++-------
 IPython/external/qt_loaders.py             | 31 +++++++++++----------
 IPython/terminal/pt_inputhooks/__init__.py | 32 +++++++++++++---------
 IPython/terminal/pt_inputhooks/qt.py       |  9 +++---
 4 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/IPython/external/qt_for_kernel.py b/IPython/external/qt_for_kernel.py
index 8926caca38c..d2e7bd99f01 100644
--- a/IPython/external/qt_for_kernel.py
+++ b/IPython/external/qt_for_kernel.py
@@ -33,26 +33,36 @@
 
 from IPython.utils.version import check_version
 from IPython.external.qt_loaders import (
-    load_qt, loaded_api, enum_factory,
+    load_qt,
+    loaded_api,
+    enum_factory,
     # QT6
-    QT_API_PYQT6, QT_API_PYSIDE6,
+    QT_API_PYQT6,
+    QT_API_PYSIDE6,
     # QT5
-    QT_API_PYQT5, QT_API_PYSIDE2,
+    QT_API_PYQT5,
+    QT_API_PYSIDE2,
     # QT4
-    QT_API_PYQTv1, QT_API_PYQT, QT_API_PYSIDE,
+    QT_API_PYQTv1,
+    QT_API_PYQT,
+    QT_API_PYSIDE,
     # default
-    QT_API_PYQT_DEFAULT
+    QT_API_PYQT_DEFAULT,
 )
 
 _qt_apis = (
     # QT6
-    QT_API_PYQT6, QT_API_PYSIDE6,
+    QT_API_PYQT6,
+    QT_API_PYSIDE6,
     # QT5
-    QT_API_PYQT5, QT_API_PYSIDE2,
+    QT_API_PYQT5,
+    QT_API_PYSIDE2,
     # QT4
-    QT_API_PYQTv1, QT_API_PYQT, QT_API_PYSIDE,
+    QT_API_PYQTv1,
+    QT_API_PYQT,
+    QT_API_PYSIDE,
     # default
-    QT_API_PYQT_DEFAULT
+    QT_API_PYQT_DEFAULT,
 )
 
 
@@ -105,7 +115,7 @@ def get_options():
             QT_API_PYQT5,
             QT_API_PYSIDE2,
             QT_API_PYQT,
-            QT_API_PYSIDE
+            QT_API_PYSIDE,
         ]
     elif qt_api not in _qt_apis:
         raise RuntimeError("Invalid Qt API %r, valid values are: %r" %
diff --git a/IPython/external/qt_loaders.py b/IPython/external/qt_loaders.py
index 14ce4091675..79805358e72 100644
--- a/IPython/external/qt_loaders.py
+++ b/IPython/external/qt_loaders.py
@@ -25,25 +25,25 @@
 QT_API_PYSIDE2 = 'pyside2'
 
 # Qt4
-QT_API_PYQT = 'pyqt'  # Force version 2
-QT_API_PYQTv1 = 'pyqtv1'  # Force version 2
-QT_API_PYSIDE = 'pyside'
+QT_API_PYQT = "pyqt"  # Force version 2
+QT_API_PYQTv1 = "pyqtv1"  # Force version 2
+QT_API_PYSIDE = "pyside"
 
-QT_API_PYQT_DEFAULT = 'pyqtdefault'  # use system default for version 1 vs. 2
+QT_API_PYQT_DEFAULT = "pyqtdefault"  # use system default for version 1 vs. 2
 
 api_to_module = {
     # Qt6
     QT_API_PYQT6: "PyQt6",
     QT_API_PYSIDE6: "PySide6",
     # Qt5
-    QT_API_PYQT5: 'PyQt5',
-    QT_API_PYSIDE2: 'PySide2',
+    QT_API_PYQT5: "PyQt5",
+    QT_API_PYSIDE2: "PySide2",
     # Qt4
-    QT_API_PYSIDE: 'PySide',
-    QT_API_PYQT: 'PyQt4',
-    QT_API_PYQTv1: 'PyQt4',
+    QT_API_PYSIDE: "PySide",
+    QT_API_PYQT: "PyQt4",
+    QT_API_PYQTv1: "PyQt4",
     # default
-    QT_API_PYQT_DEFAULT: 'PyQt6',
+    QT_API_PYQT_DEFAULT: "PyQt6",
 }
 
 
@@ -104,12 +104,12 @@ def loaded_api():
         return QT_API_PYQT5
     elif sys.modules.get("PySide2.QtCore"):
         return QT_API_PYSIDE2
-    elif sys.modules.get('PyQt4.QtCore'):
+    elif sys.modules.get("PyQt4.QtCore"):
         if qtapi_version() == 2:
             return QT_API_PYQT
         else:
             return QT_API_PYQTv1
-    elif sys.modules.get('PySide.QtCore'):
+    elif sys.modules.get("PySide.QtCore"):
         return QT_API_PYSIDE
 
     return None
@@ -246,6 +246,7 @@ def import_pyqt5():
     api = QT_API_PYQT5
     return QtCore, QtGuiCompat, QtSvg, api
 
+
 def import_pyqt6():
     """
     Import PyQt6
@@ -260,7 +261,7 @@ def import_pyqt6():
     QtCore.Slot = QtCore.pyqtSlot
 
     # Join QtGui and QtWidgets for Qt4 compatibility.
-    QtGuiCompat = types.ModuleType('QtGuiCompat')
+    QtGuiCompat = types.ModuleType("QtGuiCompat")
     QtGuiCompat.__dict__.update(QtGui.__dict__)
     QtGuiCompat.__dict__.update(QtWidgets.__dict__)
 
@@ -293,6 +294,7 @@ def import_pyside2():
 
     return QtCore, QtGuiCompat, QtSvg, QT_API_PYSIDE2
 
+
 def import_pyside6():
     """
     Import PySide6
@@ -302,7 +304,7 @@ def import_pyside6():
     from PySide6 import QtGui, QtCore, QtSvg, QtWidgets, QtPrintSupport
 
     # Join QtGui and QtWidgets for Qt4 compatibility.
-    QtGuiCompat = types.ModuleType('QtGuiCompat')
+    QtGuiCompat = types.ModuleType("QtGuiCompat")
     QtGuiCompat.__dict__.update(QtGui.__dict__)
     QtGuiCompat.__dict__.update(QtWidgets.__dict__)
     QtGuiCompat.__dict__.update(QtPrintSupport.__dict__)
@@ -388,6 +390,7 @@ def load_qt(api_options):
 
 def enum_factory(QT_API, QtCore):
     """Construct an enum helper to account for PyQt5 <-> PyQt6 changes."""
+
     @lru_cache(None)
     def _enum(name):
         # foo.bar.Enum.Entry (PyQt6) <=> foo.bar.Entry (non-PyQt6).
diff --git a/IPython/terminal/pt_inputhooks/__init__.py b/IPython/terminal/pt_inputhooks/__init__.py
index 095881cd79e..8917baf97cf 100644
--- a/IPython/terminal/pt_inputhooks/__init__.py
+++ b/IPython/terminal/pt_inputhooks/__init__.py
@@ -7,13 +7,19 @@
 }
 
 backends = [
-    'qt', 'qt4', 'qt5', 'qt6',
-    'gtk', 'gtk2', 'gtk3',
-    'tk',
-    'wx',
-    'pyglet', 'glut',
-    'osx',
-    'asyncio'
+    "qt",
+    "qt4",
+    "qt5",
+    "qt6",
+    "gtk",
+    "gtk2",
+    "gtk3",
+    "tk",
+    "wx",
+    "pyglet",
+    "glut",
+    "osx",
+    "asyncio",
 ]
 
 registered = {}
@@ -44,12 +50,12 @@ def get_inputhook_name_and_func(gui):
         return get_inputhook_name_and_func(aliases[gui])
 
     gui_mod = gui
-    if gui == 'qt5':
-        os.environ['QT_API'] = 'pyqt5'
-        gui_mod = 'qt'
-    elif gui == 'qt6':
-        os.environ['QT_API'] = 'pyqt6'
-        gui_mod = 'qt'
+    if gui == "qt5":
+        os.environ["QT_API"] = "pyqt5"
+        gui_mod = "qt"
+    elif gui == "qt6":
+        os.environ["QT_API"] = "pyqt6"
+        gui_mod = "qt"
 
     mod = importlib.import_module('IPython.terminal.pt_inputhooks.'+gui_mod)
     return gui, mod.inputhook
diff --git a/IPython/terminal/pt_inputhooks/qt.py b/IPython/terminal/pt_inputhooks/qt.py
index 6e9b120ba7f..bc34f70a43c 100644
--- a/IPython/terminal/pt_inputhooks/qt.py
+++ b/IPython/terminal/pt_inputhooks/qt.py
@@ -38,13 +38,13 @@ def inputhook(context):
                     )
                 return
         try:
-            QtCore.QApplication.setAttribute(
-                QtCore.Qt.AA_EnableHighDpiScaling)
+            QtCore.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)
         except AttributeError:  # Only for Qt>=5.6, <6.
             pass
         try:
             QtCore.QApplication.setHighDpiScaleFactorRoundingPolicy(
-                QtCore.Qt.HighDpiScaleFactorRoundingPolicy.PassThrough)
+                QtCore.Qt.HighDpiScaleFactorRoundingPolicy.PassThrough
+            )
         except AttributeError:  # Only for Qt>=5.14.
             pass
         _appref = app = QtGui.QApplication([" "])
@@ -70,8 +70,7 @@ def inputhook(context):
         # On POSIX platforms, we can use a file descriptor to quit the event
         # loop when there is input ready to read.
         notifier = QtCore.QSocketNotifier(
-            context.fileno(),
-            enum_helper('QtCore.QSocketNotifier.Type').Read
+            context.fileno(), enum_helper("QtCore.QSocketNotifier.Type").Read
         )
         try:
             # connect the callback we care about before we turn it on

From 6720df42163191483fce578162363354e5f53fac Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@gmail.com>
Date: Fri, 2 Jul 2021 16:43:42 +0200
Subject: [PATCH 0614/1407] Improve error tracebacks so that it shows the cell
 prompts

---
 IPython/core/compilerop.py                    |  8 ++++
 IPython/core/ultratb.py                       | 24 +++++++-----
 .../whatsnew/pr/traceback-improvements.rst    | 39 +++++++++++++++++++
 3 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 docs/source/whatsnew/pr/traceback-improvements.rst

diff --git a/IPython/core/compilerop.py b/IPython/core/compilerop.py
index fd7ac9ab465..b43e570b3ad 100644
--- a/IPython/core/compilerop.py
+++ b/IPython/core/compilerop.py
@@ -92,6 +92,10 @@ def __init__(self):
         # (otherwise we'd lose our tracebacks).
         linecache.checkcache = check_linecache_ipython
 
+        # Caching a dictionary { filename: execution_count } for nicely
+        # rendered tracebacks. The filename corresponds to the filename
+        # argument used for the builtins.compile function.
+        self._filename_map = {}
 
     def ast_parse(self, source, filename='<unknown>', symbol='exec'):
         """Parse code to an AST with the current compiler flags active.
@@ -153,6 +157,10 @@ def cache(self, transformed_code, number=0, raw_code=None):
             raw_code = transformed_code
 
         name = self.get_code_name(raw_code, transformed_code, number)
+
+        # Save the execution count
+        self._filename_map[name] = number
+
         entry = (
             len(transformed_code),
             time.time(),
diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index beed8c07642..5d0a8e696e1 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -160,7 +160,7 @@ def _format_traceback_lines(lines, Colors, has_colors, lvals):
         else:
             num = '%*s' % (numbers_width, lineno)
             start_color = Colors.lineno
-        
+
         line = '%s%s%s %s' % (start_color, num, Colors.Normal, line)
 
         res.append(line)
@@ -300,7 +300,7 @@ class ListTB(TBTools):
 
     Calling requires 3 arguments: (etype, evalue, elist)
     as would be obtained by::
-    
+
       etype, evalue, tb = sys.exc_info()
       if tb:
         elist = traceback.extract_tb(tb)
@@ -581,25 +581,31 @@ def format_record(self, frame_info):
         Colors = self.Colors  # just a shorthand + quicker name lookup
         ColorsNormal = Colors.Normal  # used a lot
 
-
-
         if isinstance(frame_info, stack_data.RepeatedFrames):
             return '    %s[... skipping similar frames: %s]%s\n' % (
                 Colors.excName, frame_info.description, ColorsNormal)
 
+        file = frame_info.filename
+
+        ipinst = get_ipython()
+        if ipinst is not None and file in ipinst.compile._filename_map:
+            file = "[%s]" % ipinst.compile._filename_map[file]
+            tpl_link = "In %s%%s%s," % (Colors.filenameEm, ColorsNormal)
+        else:
+            file = util_path.compress_user(
+                py3compat.cast_unicode(file, util_path.fs_encoding)
+            )
+            tpl_link = "File %s%%s%s," % (Colors.filenameEm, ColorsNormal)
+
         indent = ' ' * INDENT_SIZE
         em_normal = '%s\n%s%s' % (Colors.valEm, indent, ColorsNormal)
-        tpl_link = '%s%%s%s' % (Colors.filenameEm, ColorsNormal)
         tpl_call = 'in %s%%s%s%%s%s' % (Colors.vName, Colors.valEm,
                                         ColorsNormal)
         tpl_call_fail = 'in %s%%s%s(***failed resolving arguments***)%s' % \
                         (Colors.vName, Colors.valEm, ColorsNormal)
-        tpl_local_var = '%s%%s%s' % (Colors.vName, ColorsNormal)
         tpl_name_val = '%%s %s= %%s%s' % (Colors.valEm, ColorsNormal)
 
-        file = frame_info.filename
-        file = py3compat.cast_unicode(file, util_path.fs_encoding)
-        link = tpl_link % util_path.compress_user(file)
+        link = tpl_link % file
         args, varargs, varkw, locals_ = inspect.getargvalues(frame_info.frame)
 
         func = frame_info.executing.code_qualname()
diff --git a/docs/source/whatsnew/pr/traceback-improvements.rst b/docs/source/whatsnew/pr/traceback-improvements.rst
new file mode 100644
index 00000000000..b2fed7e1f59
--- /dev/null
+++ b/docs/source/whatsnew/pr/traceback-improvements.rst
@@ -0,0 +1,39 @@
+Traceback improvements
+======================
+
+Previously, error tracebacks for errors happening in code cells were showing a hash, the one used for compiling the Python AST.
+
+    In [1]: def foo():
+    ...:     return 3 / 0
+    ...:
+
+    In [2]: foo()
+    ---------------------------------------------------------------------------
+    ZeroDivisionError                         Traceback (most recent call last)
+    <ipython-input-2-c19b6d9633cf> in <module>
+    ----> 1 foo()
+
+    <ipython-input-1-1595a74c32d5> in foo()
+        1 def foo():
+    ----> 2     return 3 / 0
+        3
+
+    ZeroDivisionError: division by zero
+
+The error traceback is now correctly formatted, showing the cell number in which the error happened:
+
+    In [1]: def foo():
+    ...:     return 3 / 0
+    ...:
+
+    In [2]: foo()
+    ---------------------------------------------------------------------------
+    ZeroDivisionError                         Traceback (most recent call last)
+    In [2], in <module>
+    ----> 1 foo()
+
+    In [1], in foo()
+        1 def foo():
+    ----> 2     return 3 / 0
+
+    ZeroDivisionError: division by zero

From 4f685f1edb2fbb99ece9650018b60666b9d9accf Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Thu, 12 Aug 2021 00:02:13 +0200
Subject: [PATCH 0615/1407] Fixed whatsnew entry RST warnings

---
 docs/source/whatsnew/pr/traceback-improvements.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/whatsnew/pr/traceback-improvements.rst b/docs/source/whatsnew/pr/traceback-improvements.rst
index b2fed7e1f59..7040f585e3f 100644
--- a/docs/source/whatsnew/pr/traceback-improvements.rst
+++ b/docs/source/whatsnew/pr/traceback-improvements.rst
@@ -1,7 +1,7 @@
 Traceback improvements
 ======================
 
-Previously, error tracebacks for errors happening in code cells were showing a hash, the one used for compiling the Python AST.
+Previously, error tracebacks for errors happening in code cells were showing a hash, the one used for compiling the Python AST::
 
     In [1]: def foo():
     ...:     return 3 / 0
@@ -20,7 +20,7 @@ Previously, error tracebacks for errors happening in code cells were showing a h
 
     ZeroDivisionError: division by zero
 
-The error traceback is now correctly formatted, showing the cell number in which the error happened:
+The error traceback is now correctly formatted, showing the cell number in which the error happened::
 
     In [1]: def foo():
     ...:     return 3 / 0

From 02660f35ca6e35f3f35b00ad2634945308badaa1 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@gmail.com>
Date: Thu, 12 Aug 2021 11:56:05 +0200
Subject: [PATCH 0616/1407] Improve traceback formatting for all kinds of
 tracebacks

---
 IPython/core/ultratb.py | 56 +++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 5d0a8e696e1..45975291316 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -169,6 +169,31 @@ def _format_traceback_lines(lines, Colors, has_colors, lvals):
     return res
 
 
+def _format_filename(file, Colors, ColorNormal):
+    """
+    Format filename lines with `In [n]` if it's the nth code cell or `File *.py` if it's a module...
+
+    Parameters
+    ----------
+    file : str
+    Colors
+        ColorScheme used.
+    ColorsNormal
+        ColorScheme's normal coloring to be used.
+    """
+    ipinst = get_ipython()
+
+    if ipinst is not None and file in ipinst.compile._filename_map:
+        file = "[%s]" % ipinst.compile._filename_map[file]
+        tpl_link = "In %s%%s%s" % (Colors.filenameEm, ColorNormal)
+    else:
+        file = util_path.compress_user(
+            py3compat.cast_unicode(file, util_path.fs_encoding)
+        )
+        tpl_link = "File %s%%s%s" % (Colors.filenameEm, ColorNormal)
+
+    return tpl_link % file
+
 #---------------------------------------------------------------------------
 # Module classes
 class TBTools(colorable.Colorable):
@@ -414,8 +439,8 @@ def _format_list(self, extracted_list):
         Colors = self.Colors
         list = []
         for filename, lineno, name, line in extracted_list[:-1]:
-            item = '  File %s"%s"%s, line %s%d%s, in %s%s%s\n' % \
-                   (Colors.filename, filename, Colors.Normal,
+            item = '  %s, line %s%d%s, in %s%s%s\n' % \
+                   (_format_filename(filename, Colors, Colors.normalEm),
                     Colors.lineno, lineno, Colors.Normal,
                     Colors.name, name, Colors.Normal)
             if line:
@@ -423,9 +448,9 @@ def _format_list(self, extracted_list):
             list.append(item)
         # Emphasize the last entry
         filename, lineno, name, line = extracted_list[-1]
-        item = '%s  File %s"%s"%s, line %s%d%s, in %s%s%s%s\n' % \
+        item = '%s  %s, line %s%d%s, in %s%s%s%s\n' % \
                (Colors.normalEm,
-                Colors.filenameEm, filename, Colors.normalEm,
+                _format_filename(filename, Colors, Colors.normalEm),
                 Colors.linenoEm, lineno, Colors.normalEm,
                 Colors.nameEm, name, Colors.normalEm,
                 Colors.Normal)
@@ -465,10 +490,11 @@ def _format_exception_only(self, etype, value):
                 else:
                     lineno = 'unknown'
                     textline = ''
-                list.append('%s  File %s"%s"%s, line %s%s%s\n' % \
+                list.append('%s  %s, line %s%s%s\n' %
                             (Colors.normalEm,
-                             Colors.filenameEm, py3compat.cast_unicode(value.filename), Colors.normalEm,
-                             Colors.linenoEm, lineno, Colors.Normal  ))
+                             _format_filename(value.filename, Colors, Colors.normalEm),
+                             Colors.linenoEm, lineno, Colors.Normal
+                             ))
                 if textline == '':
                     textline = py3compat.cast_unicode(value.text, "utf-8")
 
@@ -585,18 +611,6 @@ def format_record(self, frame_info):
             return '    %s[... skipping similar frames: %s]%s\n' % (
                 Colors.excName, frame_info.description, ColorsNormal)
 
-        file = frame_info.filename
-
-        ipinst = get_ipython()
-        if ipinst is not None and file in ipinst.compile._filename_map:
-            file = "[%s]" % ipinst.compile._filename_map[file]
-            tpl_link = "In %s%%s%s," % (Colors.filenameEm, ColorsNormal)
-        else:
-            file = util_path.compress_user(
-                py3compat.cast_unicode(file, util_path.fs_encoding)
-            )
-            tpl_link = "File %s%%s%s," % (Colors.filenameEm, ColorsNormal)
-
         indent = ' ' * INDENT_SIZE
         em_normal = '%s\n%s%s' % (Colors.valEm, indent, ColorsNormal)
         tpl_call = 'in %s%%s%s%%s%s' % (Colors.vName, Colors.valEm,
@@ -605,7 +619,7 @@ def format_record(self, frame_info):
                         (Colors.vName, Colors.valEm, ColorsNormal)
         tpl_name_val = '%%s %s= %%s%s' % (Colors.valEm, ColorsNormal)
 
-        link = tpl_link % file
+        link = _format_filename(frame_info.filename, Colors, ColorsNormal)
         args, varargs, varkw, locals_ = inspect.getargvalues(frame_info.frame)
 
         func = frame_info.executing.code_qualname()
@@ -645,7 +659,7 @@ def format_record(self, frame_info):
         if lvals_list:
             lvals = '%s%s' % (indent, em_normal.join(lvals_list))
 
-        result = '%s %s\n' % (link, call)
+        result = '%s, %s\n' % (link, call)
 
         result += ''.join(_format_traceback_lines(frame_info.lines, Colors, self.has_colors, lvals))
         return result

From f4aea77b461879f9eeeb2c152a7d979ed103a0f9 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@gmail.com>
Date: Thu, 12 Aug 2021 12:03:34 +0200
Subject: [PATCH 0617/1407] Linting

---
 IPython/core/ultratb.py | 53 ++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 45975291316..8f8713f6a39 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -439,21 +439,31 @@ def _format_list(self, extracted_list):
         Colors = self.Colors
         list = []
         for filename, lineno, name, line in extracted_list[:-1]:
-            item = '  %s, line %s%d%s, in %s%s%s\n' % \
-                   (_format_filename(filename, Colors, Colors.normalEm),
-                    Colors.lineno, lineno, Colors.Normal,
-                    Colors.name, name, Colors.Normal)
+            item = "  %s, line %s%d%s, in %s%s%s\n" % (
+                _format_filename(filename, Colors, Colors.normalEm),
+                Colors.lineno,
+                lineno,
+                Colors.Normal,
+                Colors.name,
+                name,
+                Colors.Normal,
+            )
             if line:
                 item += '    %s\n' % line.strip()
             list.append(item)
         # Emphasize the last entry
         filename, lineno, name, line = extracted_list[-1]
-        item = '%s  %s, line %s%d%s, in %s%s%s%s\n' % \
-               (Colors.normalEm,
-                _format_filename(filename, Colors, Colors.normalEm),
-                Colors.linenoEm, lineno, Colors.normalEm,
-                Colors.nameEm, name, Colors.normalEm,
-                Colors.Normal)
+        item = "%s  %s, line %s%d%s, in %s%s%s%s\n" % (
+            Colors.normalEm,
+            _format_filename(filename, Colors, Colors.normalEm),
+            Colors.linenoEm,
+            lineno,
+            Colors.normalEm,
+            Colors.nameEm,
+            name,
+            Colors.normalEm,
+            Colors.Normal,
+        )
         if line:
             item += '%s    %s%s\n' % (Colors.line, line.strip(),
                                       Colors.Normal)
@@ -488,14 +498,19 @@ def _format_exception_only(self, etype, value):
                     lineno = value.lineno
                     textline = linecache.getline(value.filename, value.lineno)
                 else:
-                    lineno = 'unknown'
-                    textline = ''
-                list.append('%s  %s, line %s%s%s\n' %
-                            (Colors.normalEm,
-                             _format_filename(value.filename, Colors, Colors.normalEm),
-                             Colors.linenoEm, lineno, Colors.Normal
-                             ))
-                if textline == '':
+                    lineno = "unknown"
+                    textline = ""
+                list.append(
+                    "%s  %s, line %s%s%s\n"
+                    % (
+                        Colors.normalEm,
+                        _format_filename(value.filename, Colors, Colors.normalEm),
+                        Colors.linenoEm,
+                        lineno,
+                        Colors.Normal,
+                    )
+                )
+                if textline == "":
                     textline = py3compat.cast_unicode(value.text, "utf-8")
 
                 if textline is not None:
@@ -659,7 +674,7 @@ def format_record(self, frame_info):
         if lvals_list:
             lvals = '%s%s' % (indent, em_normal.join(lvals_list))
 
-        result = '%s, %s\n' % (link, call)
+        result = "%s, %s\n" % (link, call)
 
         result += ''.join(_format_traceback_lines(frame_info.lines, Colors, self.has_colors, lvals))
         return result

From e5aa137df281a6c32c2e3ceda10f043facbbcd1c Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@gmail.com>
Date: Thu, 12 Aug 2021 12:14:30 +0200
Subject: [PATCH 0618/1407] Fix coloring

---
 IPython/core/ultratb.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 8f8713f6a39..e07c943ef6e 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -169,28 +169,28 @@ def _format_traceback_lines(lines, Colors, has_colors, lvals):
     return res
 
 
-def _format_filename(file, Colors, ColorNormal):
+def _format_filename(file, ColorFilename, ColorNormal):
     """
-    Format filename lines with `In [n]` if it's the nth code cell or `File *.py` if it's a module...
+    Format filename lines with `In [n]` if it's the nth code cell or `File *.py` if it's a module.
 
     Parameters
     ----------
     file : str
-    Colors
-        ColorScheme used.
-    ColorsNormal
+    ColorFilename
+        ColorScheme's filename coloring to be used.
+    ColorNormal
         ColorScheme's normal coloring to be used.
     """
     ipinst = get_ipython()
 
     if ipinst is not None and file in ipinst.compile._filename_map:
         file = "[%s]" % ipinst.compile._filename_map[file]
-        tpl_link = "In %s%%s%s" % (Colors.filenameEm, ColorNormal)
+        tpl_link = "In %s%%s%s" % (ColorFilename, ColorNormal)
     else:
         file = util_path.compress_user(
             py3compat.cast_unicode(file, util_path.fs_encoding)
         )
-        tpl_link = "File %s%%s%s" % (Colors.filenameEm, ColorNormal)
+        tpl_link = "File %s%%s%s" % (ColorFilename, ColorNormal)
 
     return tpl_link % file
 
@@ -440,7 +440,7 @@ def _format_list(self, extracted_list):
         list = []
         for filename, lineno, name, line in extracted_list[:-1]:
             item = "  %s, line %s%d%s, in %s%s%s\n" % (
-                _format_filename(filename, Colors, Colors.normalEm),
+                _format_filename(filename, Colors.filename, Colors.Normal),
                 Colors.lineno,
                 lineno,
                 Colors.Normal,
@@ -455,7 +455,7 @@ def _format_list(self, extracted_list):
         filename, lineno, name, line = extracted_list[-1]
         item = "%s  %s, line %s%d%s, in %s%s%s%s\n" % (
             Colors.normalEm,
-            _format_filename(filename, Colors, Colors.normalEm),
+            _format_filename(filename, Colors.filenameEm, Colors.normalEm),
             Colors.linenoEm,
             lineno,
             Colors.normalEm,
@@ -504,7 +504,7 @@ def _format_exception_only(self, etype, value):
                     "%s  %s, line %s%s%s\n"
                     % (
                         Colors.normalEm,
-                        _format_filename(value.filename, Colors, Colors.normalEm),
+                        _format_filename(value.filename, Colors.filenameEm, Colors.normalEm),
                         Colors.linenoEm,
                         lineno,
                         Colors.Normal,
@@ -634,7 +634,7 @@ def format_record(self, frame_info):
                         (Colors.vName, Colors.valEm, ColorsNormal)
         tpl_name_val = '%%s %s= %%s%s' % (Colors.valEm, ColorsNormal)
 
-        link = _format_filename(frame_info.filename, Colors, ColorsNormal)
+        link = _format_filename(frame_info.filename, Colors.filenameEm, ColorsNormal)
         args, varargs, varkw, locals_ = inspect.getargvalues(frame_info.frame)
 
         func = frame_info.executing.code_qualname()

From 083282b34772501a19c3e43e569c74140929b56f Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@gmail.com>
Date: Thu, 12 Aug 2021 12:17:45 +0200
Subject: [PATCH 0619/1407] Linting

---
 IPython/core/ultratb.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index e07c943ef6e..e8c92fc02b2 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -504,7 +504,9 @@ def _format_exception_only(self, etype, value):
                     "%s  %s, line %s%s%s\n"
                     % (
                         Colors.normalEm,
-                        _format_filename(value.filename, Colors.filenameEm, Colors.normalEm),
+                        _format_filename(
+                            value.filename, Colors.filenameEm, Colors.normalEm
+                        ),
                         Colors.linenoEm,
                         lineno,
                         Colors.Normal,

From 58e4653a04f5ca5081a7153d92f6b00741f2d0e2 Mon Sep 17 00:00:00 2001
From: Artur Svistunov <18216480+madbird1304@users.noreply.github.com>
Date: Mon, 16 Aug 2021 00:20:11 +0300
Subject: [PATCH 0620/1407] Fixed: Issue
 https://github.com/ipython/ipython/issues/12897

Problem:
  Changing to vi mode via config magic makes repl stop reacting
  to almost all keyboard input.
Solution:
  Recreating prompt tookit app every time editing mode changed.
---
 IPython/terminal/interactiveshell.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 0fa90281c55..9321946f63a 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -203,10 +203,10 @@ def _validate_editing_mode(self, proposal):
 
 
     @observe('editing_mode')
-    def _editing_mode(self, change):
+    def _editing_mode_changed(self, change):
         u_mode = change.new.upper()
         if self.pt_app:
-            self.pt_app.editing_mode = u_mode
+            self.init_prompt_toolkit_cli()
 
     @observe('autoformatter')
     def _autoformatter_changed(self, change):

From b18c585c730230ea66326fd34675d7e2e179676c Mon Sep 17 00:00:00 2001
From: Artur Svistunov <18216480+madbird1304@users.noreply.github.com>
Date: Mon, 16 Aug 2021 00:22:30 +0300
Subject: [PATCH 0621/1407] ' -> "

---
 IPython/terminal/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 9321946f63a..142217a691c 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -202,7 +202,7 @@ def _validate_editing_mode(self, proposal):
         return self.editing_mode
 
 
-    @observe('editing_mode')
+    @observe("editing_mode")
     def _editing_mode_changed(self, change):
         u_mode = change.new.upper()
         if self.pt_app:

From 62ebcb337087f76b869c1cd77a507f450602d93c Mon Sep 17 00:00:00 2001
From: Artur Svistunov <18216480+madbird1304@users.noreply.github.com>
Date: Mon, 16 Aug 2021 00:23:04 +0300
Subject: [PATCH 0622/1407] Remove redundant newline

---
 IPython/terminal/interactiveshell.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 142217a691c..bcbc6685b5f 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -201,7 +201,6 @@ def _validate_editing_mode(self, proposal):
 
         return self.editing_mode
 
-
     @observe("editing_mode")
     def _editing_mode_changed(self, change):
         u_mode = change.new.upper()

From d4ad76fcfd10736797b80aa1d7827d8d32cffda0 Mon Sep 17 00:00:00 2001
From: Artur Svistunov <18216480+madbird1304@users.noreply.github.com>
Date: Mon, 16 Aug 2021 00:24:36 +0300
Subject: [PATCH 0623/1407] Remove unused variable

---
 IPython/terminal/interactiveshell.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index bcbc6685b5f..1792523eb54 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -203,7 +203,6 @@ def _validate_editing_mode(self, proposal):
 
     @observe("editing_mode")
     def _editing_mode_changed(self, change):
-        u_mode = change.new.upper()
         if self.pt_app:
             self.init_prompt_toolkit_cli()
 

From a44718bdb19469bee2674ef8a01353b97554b025 Mon Sep 17 00:00:00 2001
From: Artur Svistunov <18216480+madbird1304@users.noreply.github.com>
Date: Mon, 16 Aug 2021 01:14:56 +0300
Subject: [PATCH 0624/1407] Fix for
 https://github.com/ipython/ipython/issues/13084

---
 IPython/core/magics/packaging.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index f1b19546413..48b4b360fc6 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -12,7 +12,7 @@
 import shlex
 import sys
 from pathlib import Path
-
+from multiprocessing import list2cmdline
 from IPython.core.magic import Magics, magics_class, line_magic
 
 
@@ -66,8 +66,7 @@ def pip(self, line):
         Usage:
           %pip install [pkgs]
         """
-        python = shlex.quote(sys.executable)
-        self.shell.system(" ".join([python, "-m", "pip", line]))
+        self.shell.system(list2cmdline([sys.executable, "-m", "pip"]) + " " + line)
 
         print("Note: you may need to restart the kernel to use updated packages.")
 

From e2443305eea560463c273a9fbdf19936b08d91bb Mon Sep 17 00:00:00 2001
From: Artur Svistunov <18216480+madbird1304@users.noreply.github.com>
Date: Mon, 16 Aug 2021 01:18:09 +0300
Subject: [PATCH 0625/1407] :facepalm:

---
 IPython/core/magics/packaging.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index 48b4b360fc6..cfcf283722b 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -12,7 +12,7 @@
 import shlex
 import sys
 from pathlib import Path
-from multiprocessing import list2cmdline
+from subprocess import list2cmdline
 from IPython.core.magic import Magics, magics_class, line_magic
 
 

From e62d7600bbb43a53035180a2d84a9b5b6c78e2f1 Mon Sep 17 00:00:00 2001
From: MRCWirtz <marcus.wirtz@rwth-aachen.de>
Date: Tue, 17 Aug 2021 15:54:08 +0200
Subject: [PATCH 0626/1407] Fix virtual environment user warning for lower case
 pathes

---
 IPython/core/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 499d6b7c516..6f295e83ce3 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -928,7 +928,7 @@ def init_virtualenv(self):
         elif len(str(p_venv)) >= 2 and str(p_venv)[1] == ":":
             p_venv = Path(str(p_venv)[2:])
 
-        if any(os.fspath(p_venv) in os.fspath(p) for p in paths):
+        if any(os.fspath(p_venv).lower() in os.fspath(p).lower() for p in paths):
             # Our exe is inside or has access to the virtualenv, don't need to do anything.
             return
 

From 0ddc69a747ac7ddcdacc618c58c75f268c69ae9a Mon Sep 17 00:00:00 2001
From: MRCWirtz <marcus.wirtz@rwth-aachen.de>
Date: Tue, 17 Aug 2021 16:31:41 +0200
Subject: [PATCH 0627/1407] Only apply lower-case path comparison for Windows
 filesystem

---
 IPython/core/interactiveshell.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 6f295e83ce3..b19cd079597 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -928,7 +928,12 @@ def init_virtualenv(self):
         elif len(str(p_venv)) >= 2 and str(p_venv)[1] == ":":
             p_venv = Path(str(p_venv)[2:])
 
-        if any(os.fspath(p_venv).lower() in os.fspath(p).lower() for p in paths):
+        if sys.platform == "win32":
+            # In Windows there might be a mixture of lower-case and mixed-case pathes
+            p_venv = Path(str(p_venv).lower())
+            paths = [Path(str(p).lower()) for p in paths]
+
+        if any(os.fspath(p_venv) in os.fspath(p) for p in paths):
             # Our exe is inside or has access to the virtualenv, don't need to do anything.
             return
 

From dde2950b3cd4092f4245bbc6080af2af467cf6b1 Mon Sep 17 00:00:00 2001
From: Artur Svistunov <18216480+madbird1304@users.noreply.github.com>
Date: Wed, 18 Aug 2021 01:37:30 +0300
Subject: [PATCH 0628/1407] Revert ":facepalm:"

This reverts commit e2443305eea560463c273a9fbdf19936b08d91bb.
---
 IPython/core/magics/packaging.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index cfcf283722b..48b4b360fc6 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -12,7 +12,7 @@
 import shlex
 import sys
 from pathlib import Path
-from subprocess import list2cmdline
+from multiprocessing import list2cmdline
 from IPython.core.magic import Magics, magics_class, line_magic
 
 

From 89b3766c67781ed1ab07e959d905c79d3a412721 Mon Sep 17 00:00:00 2001
From: Artur Svistunov <18216480+madbird1304@users.noreply.github.com>
Date: Wed, 18 Aug 2021 01:37:49 +0300
Subject: [PATCH 0629/1407] Revert "Fix for
 https://github.com/ipython/ipython/issues/13084"

This reverts commit a44718bdb19469bee2674ef8a01353b97554b025.
---
 IPython/core/magics/packaging.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index 48b4b360fc6..f1b19546413 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -12,7 +12,7 @@
 import shlex
 import sys
 from pathlib import Path
-from multiprocessing import list2cmdline
+
 from IPython.core.magic import Magics, magics_class, line_magic
 
 
@@ -66,7 +66,8 @@ def pip(self, line):
         Usage:
           %pip install [pkgs]
         """
-        self.shell.system(list2cmdline([sys.executable, "-m", "pip"]) + " " + line)
+        python = shlex.quote(sys.executable)
+        self.shell.system(" ".join([python, "-m", "pip", line]))
 
         print("Note: you may need to restart the kernel to use updated packages.")
 

From 3f7b134a20559b7913442c7378decb3fb1d89253 Mon Sep 17 00:00:00 2001
From: Artur Svistunov <18216480+madbird1304@users.noreply.github.com>
Date: Wed, 18 Aug 2021 01:44:07 +0300
Subject: [PATCH 0630/1407] Use `"` for win32, shlex.quote - for any other
 platform if needed

---
 IPython/core/magics/packaging.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index f1b19546413..66f6df5c8ee 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -66,7 +66,12 @@ def pip(self, line):
         Usage:
           %pip install [pkgs]
         """
-        python = shlex.quote(sys.executable)
+        if " " in sys.executable:
+            if sys.platform == "win32":
+                python = "\"" + sys.executable + "\""
+            else:
+                python = shlex.quote(sys.executable)
+
         self.shell.system(" ".join([python, "-m", "pip", line]))
 
         print("Note: you may need to restart the kernel to use updated packages.")

From da0c6cd620ff02ca0bfe65ea8fcb86a64beab06b Mon Sep 17 00:00:00 2001
From: Artur Svistunov <18216480+madbird1304@users.noreply.github.com>
Date: Wed, 18 Aug 2021 01:46:36 +0300
Subject: [PATCH 0631/1407] Default branch added

---
 IPython/core/magics/packaging.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index 66f6df5c8ee..9e181baf687 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -66,11 +66,12 @@ def pip(self, line):
         Usage:
           %pip install [pkgs]
         """
+        python = sys.executable
         if " " in sys.executable:
             if sys.platform == "win32":
-                python = "\"" + sys.executable + "\""
+                python = "\"" + python + "\""
             else:
-                python = shlex.quote(sys.executable)
+                python = shlex.quote(python)
 
         self.shell.system(" ".join([python, "-m", "pip", line]))
 

From 28b708a6f0e0aa4238a1b1f14cf97f2a07b05527 Mon Sep 17 00:00:00 2001
From: Artur Svistunov <18216480+madbird1304@users.noreply.github.com>
Date: Wed, 18 Aug 2021 01:47:11 +0300
Subject: [PATCH 0632/1407] Fix condition

---
 IPython/core/magics/packaging.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index 9e181baf687..3b846987f96 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -67,7 +67,7 @@ def pip(self, line):
           %pip install [pkgs]
         """
         python = sys.executable
-        if " " in sys.executable:
+        if " " in python:
             if sys.platform == "win32":
                 python = "\"" + python + "\""
             else:

From 80b9dac397aedb6fdcf31c4adafb21f2a443d181 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 18 Aug 2021 09:39:03 -0700
Subject: [PATCH 0633/1407] Remove some nose

---
 IPython/core/tests/test_formatters.py | 131 ++++++++++++++------------
 1 file changed, 70 insertions(+), 61 deletions(-)

diff --git a/IPython/core/tests/test_formatters.py b/IPython/core/tests/test_formatters.py
index cde43c94a92..efd6bf86e5a 100644
--- a/IPython/core/tests/test_formatters.py
+++ b/IPython/core/tests/test_formatters.py
@@ -48,16 +48,16 @@ def foo_printer(obj, pp, cycle):
 def test_pretty():
     f = PlainTextFormatter()
     f.for_type(A, foo_printer)
-    nt.assert_equal(f(A()), 'foo')
-    nt.assert_equal(f(B()), 'B()')
-    nt.assert_equal(f(GoodPretty()), 'foo')
+    assert f(A()) == "foo"
+    assert f(B()) == "B()"
+    assert f(GoodPretty()) == "foo"
     # Just don't raise an exception for the following:
     f(BadPretty())
 
     f.pprint = False
-    nt.assert_equal(f(A()), 'A()')
-    nt.assert_equal(f(B()), 'B()')
-    nt.assert_equal(f(GoodPretty()), 'GoodPretty()')
+    assert f(A()) == "A()"
+    assert f(B()) == "B()"
+    assert f(GoodPretty()) == "GoodPretty()"
 
 
 def test_deferred():
@@ -66,29 +66,30 @@ def test_deferred():
 def test_precision():
     """test various values for float_precision."""
     f = PlainTextFormatter()
-    nt.assert_equal(f(pi), repr(pi))
+    assert f(pi) == repr(pi)
     f.float_precision = 0
     if numpy:
         po = numpy.get_printoptions()
-        nt.assert_equal(po['precision'], 0)
-    nt.assert_equal(f(pi), '3')
+        assert po["precision"] == 0
+    assert f(pi) == "3"
     f.float_precision = 2
     if numpy:
         po = numpy.get_printoptions()
-        nt.assert_equal(po['precision'], 2)
-    nt.assert_equal(f(pi), '3.14')
-    f.float_precision = '%g'
+        assert po["precision"] == 2
+    assert f(pi) == "3.14"
+    f.float_precision = "%g"
     if numpy:
         po = numpy.get_printoptions()
-        nt.assert_equal(po['precision'], 2)
-    nt.assert_equal(f(pi), '3.14159')
-    f.float_precision = '%e'
-    nt.assert_equal(f(pi), '3.141593e+00')
-    f.float_precision = ''
+        assert po["precision"] == 2
+    assert f(pi) == "3.14159"
+    f.float_precision = "%e"
+    assert f(pi) == "3.141593e+00"
+    f.float_precision = ""
     if numpy:
         po = numpy.get_printoptions()
-        nt.assert_equal(po['precision'], 8)
-    nt.assert_equal(f(pi), repr(pi))
+        assert po["precision"] == 8
+    assert f(pi) == repr(pi)
+
 
 def test_bad_precision():
     """test various invalid values for float_precision."""
@@ -260,8 +261,9 @@ def _repr_html_(self):
     with capture_output() as captured:
         result = f(h)
     nt.assert_is(result, None)
-    nt.assert_equal("", captured.stderr)
-    nt.assert_equal("", captured.stdout)
+    assert "" == captured.stderr
+    assert "" == captured.stdout
+
 
 def test_warn_error_for_type():
     f = HTMLFormatter()
@@ -307,7 +309,8 @@ def _repr_pdf_(self):
 def test_pdf_formatter():
     pdf = MakePDF()
     f = PDFFormatter()
-    nt.assert_equal(f(pdf), 'PDF')
+    assert f(pdf) == "PDF"
+
 
 def test_print_method_bound():
     f = HTMLFormatter()
@@ -321,8 +324,9 @@ def _repr_html_(self):
 
     with capture_output() as captured:
         result = f(MyHTML())
-    nt.assert_equal(result, "hello")
-    nt.assert_equal(captured.stderr, "")
+    assert result == "hello"
+    assert captured.stderr == ""
+
 
 def test_print_method_weird():
 
@@ -331,9 +335,9 @@ def __getattr__(self, key):
             return key
 
     f = HTMLFormatter()
-    
+
     text_hat = TextMagicHat()
-    nt.assert_equal(text_hat._repr_html_, '_repr_html_')
+    assert text_hat._repr_html_ == "_repr_html_"
     with capture_output() as captured:
         result = f(text_hat)
     
@@ -347,8 +351,8 @@ def __getattr__(self, key):
     call_hat = CallableMagicHat()
     with capture_output() as captured:
         result = f(call_hat)
-    
-    nt.assert_equal(result, None)
+
+    assert result == None
 
     class BadReprArgs(object):
         def _repr_html_(self, extra, args):
@@ -369,24 +373,25 @@ def test_format_config():
     with capture_output() as captured:
         result = f(cfg)
     nt.assert_is(result, None)
-    nt.assert_equal(captured.stderr, "")
+    assert captured.stderr == ""
 
     with capture_output() as captured:
         result = f(Config)
     nt.assert_is(result, None)
-    nt.assert_equal(captured.stderr, "")
+    assert captured.stderr == ""
+
 
 def test_pretty_max_seq_length():
     f = PlainTextFormatter(max_seq_length=1)
     lis = list(range(3))
     text = f(lis)
-    nt.assert_equal(text, '[0, ...]')
+    assert text == "[0, ...]"
     f.max_seq_length = 0
     text = f(lis)
-    nt.assert_equal(text, '[0, 1, 2]')
+    assert text == "[0, 1, 2]"
     text = f(list(range(1024)))
     lines = text.splitlines()
-    nt.assert_equal(len(lines), 1024)
+    assert len(lines) == 1024
 
 
 def test_ipython_display_formatter():
@@ -409,16 +414,16 @@ def _ipython_display_(self):
     
     yes = SelfDisplaying()
     no = NotSelfDisplaying()
-    
+
     d, md = f.format(no)
-    nt.assert_equal(d, {'text/plain': repr(no)})
-    nt.assert_equal(md, {})
-    nt.assert_equal(catcher, [])
-    
+    assert d == {"text/plain": repr(no)}
+    assert md == {}
+    assert catcher == []
+
     d, md = f.format(yes)
-    nt.assert_equal(d, {})
-    nt.assert_equal(md, {})
-    nt.assert_equal(catcher, [yes])
+    assert d == {}
+    assert md == {}
+    assert catcher == [yes]
 
     f.ipython_display_formatter.enabled = save_enabled
 
@@ -431,8 +436,8 @@ def _repr_json_(self):
     f = JSONFormatter()
     with warnings.catch_warnings(record=True) as w:
         d = f(JSONString())
-    nt.assert_equal(d, {})
-    nt.assert_equal(len(w), 1)
+    assert d == {}
+    assert len(w) == 1
 
 
 def test_repr_mime():
@@ -458,19 +463,22 @@ def _repr_html_(self):
     obj = HasReprMime()
     d, md = f.format(obj)
     html_f.enabled = save_enabled
-    
-    nt.assert_equal(sorted(d), ['application/json+test.v2',
-                                'image/png',
-                                'plain/text',
-                                'text/html',
-                                'text/plain'])
-    nt.assert_equal(md, {})
 
-    d, md = f.format(obj, include={'image/png'})
-    nt.assert_equal(list(d.keys()), ['image/png'],
-                    'Include should filter out even things from repr_mimebundle')
-    nt.assert_equal(d['image/png'], 'i-overwrite', '_repr_mimebundle_ take precedence')
+    assert sorted(d) == [
+        "application/json+test.v2",
+        "image/png",
+        "plain/text",
+        "text/html",
+        "text/plain",
+    ]
+    assert md == {}
 
+    d, md = f.format(obj, include={"image/png"})
+    assert list(d.keys()) == [
+        "image/png"
+    ], "Include should filter out even things from repr_mimebundle"
+
+    assert d["image/png"] == "i-overwrite", "_repr_mimebundle_ take precedence"
 
 
 def test_pass_correct_include_exclude():
@@ -514,13 +522,14 @@ def _repr_mimebundle_(self, include=None, exclude=None):
     f = get_ipython().display_formatter
     obj = HasReprMimeMeta()
     d, md = f.format(obj)
-    nt.assert_equal(sorted(d), ['image/png', 'text/plain'])
-    nt.assert_equal(md, {
-        'image/png': {
-            'width': 5,
-            'height': 10,
+    assert sorted(d) == ["image/png", "text/plain"]
+    assert md == {
+        "image/png": {
+            "width": 5,
+            "height": 10,
         }
-    })
+    }
+
 
 def test_repr_mime_failure():
     class BadReprMime(object):
@@ -530,4 +539,4 @@ def _repr_mimebundle_(self, include=None, exclude=None):
     f = get_ipython().display_formatter
     obj = BadReprMime()
     d, md = f.format(obj)
-    nt.assert_in('text/plain', d)
+    assert "text/plain" in d

From 053e48a3684bb0dc70635e547a78d82294bdf773 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 18 Aug 2021 12:17:20 -0700
Subject: [PATCH 0634/1407] Protect against failure to show local data.

See https://github.com/napari/napari/pull/3201 where formatting
traceback was failing and lead to silenced errors.

With this change we  instead get the rest of the traceback but without
the local variables, which is still better.
---
 IPython/core/ultratb.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index beed8c07642..cf022eefdac 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -634,8 +634,16 @@ def format_record(self, frame_info):
         lvals = ''
         lvals_list = []
         if self.include_vars:
-            for var in frame_info.variables_in_executing_piece:
-                lvals_list.append(tpl_name_val % (var.name, repr(var.value)))
+            try:
+                # we likely want to fix stackdata at some point, but
+                # still need a workaround.
+                fibp = frame_info.variables_in_executing_piece
+                for var in fibp:
+                    lvals_list.append(tpl_name_val % (var.name, repr(var.value)))
+            except Exception:
+                lvals_list.append(
+                    "Exception trying to inspect frame. No more locals available."
+                )
         if lvals_list:
             lvals = '%s%s' % (indent, em_normal.join(lvals_list))
 

From 9bf821288c2f8c3f4b181a110398f09732801ff1 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 18 Aug 2021 09:39:03 -0700
Subject: [PATCH 0635/1407] Remove some nose

---
 IPython/core/tests/test_formatters.py | 131 ++++++++++++++------------
 1 file changed, 70 insertions(+), 61 deletions(-)

diff --git a/IPython/core/tests/test_formatters.py b/IPython/core/tests/test_formatters.py
index cde43c94a92..efd6bf86e5a 100644
--- a/IPython/core/tests/test_formatters.py
+++ b/IPython/core/tests/test_formatters.py
@@ -48,16 +48,16 @@ def foo_printer(obj, pp, cycle):
 def test_pretty():
     f = PlainTextFormatter()
     f.for_type(A, foo_printer)
-    nt.assert_equal(f(A()), 'foo')
-    nt.assert_equal(f(B()), 'B()')
-    nt.assert_equal(f(GoodPretty()), 'foo')
+    assert f(A()) == "foo"
+    assert f(B()) == "B()"
+    assert f(GoodPretty()) == "foo"
     # Just don't raise an exception for the following:
     f(BadPretty())
 
     f.pprint = False
-    nt.assert_equal(f(A()), 'A()')
-    nt.assert_equal(f(B()), 'B()')
-    nt.assert_equal(f(GoodPretty()), 'GoodPretty()')
+    assert f(A()) == "A()"
+    assert f(B()) == "B()"
+    assert f(GoodPretty()) == "GoodPretty()"
 
 
 def test_deferred():
@@ -66,29 +66,30 @@ def test_deferred():
 def test_precision():
     """test various values for float_precision."""
     f = PlainTextFormatter()
-    nt.assert_equal(f(pi), repr(pi))
+    assert f(pi) == repr(pi)
     f.float_precision = 0
     if numpy:
         po = numpy.get_printoptions()
-        nt.assert_equal(po['precision'], 0)
-    nt.assert_equal(f(pi), '3')
+        assert po["precision"] == 0
+    assert f(pi) == "3"
     f.float_precision = 2
     if numpy:
         po = numpy.get_printoptions()
-        nt.assert_equal(po['precision'], 2)
-    nt.assert_equal(f(pi), '3.14')
-    f.float_precision = '%g'
+        assert po["precision"] == 2
+    assert f(pi) == "3.14"
+    f.float_precision = "%g"
     if numpy:
         po = numpy.get_printoptions()
-        nt.assert_equal(po['precision'], 2)
-    nt.assert_equal(f(pi), '3.14159')
-    f.float_precision = '%e'
-    nt.assert_equal(f(pi), '3.141593e+00')
-    f.float_precision = ''
+        assert po["precision"] == 2
+    assert f(pi) == "3.14159"
+    f.float_precision = "%e"
+    assert f(pi) == "3.141593e+00"
+    f.float_precision = ""
     if numpy:
         po = numpy.get_printoptions()
-        nt.assert_equal(po['precision'], 8)
-    nt.assert_equal(f(pi), repr(pi))
+        assert po["precision"] == 8
+    assert f(pi) == repr(pi)
+
 
 def test_bad_precision():
     """test various invalid values for float_precision."""
@@ -260,8 +261,9 @@ def _repr_html_(self):
     with capture_output() as captured:
         result = f(h)
     nt.assert_is(result, None)
-    nt.assert_equal("", captured.stderr)
-    nt.assert_equal("", captured.stdout)
+    assert "" == captured.stderr
+    assert "" == captured.stdout
+
 
 def test_warn_error_for_type():
     f = HTMLFormatter()
@@ -307,7 +309,8 @@ def _repr_pdf_(self):
 def test_pdf_formatter():
     pdf = MakePDF()
     f = PDFFormatter()
-    nt.assert_equal(f(pdf), 'PDF')
+    assert f(pdf) == "PDF"
+
 
 def test_print_method_bound():
     f = HTMLFormatter()
@@ -321,8 +324,9 @@ def _repr_html_(self):
 
     with capture_output() as captured:
         result = f(MyHTML())
-    nt.assert_equal(result, "hello")
-    nt.assert_equal(captured.stderr, "")
+    assert result == "hello"
+    assert captured.stderr == ""
+
 
 def test_print_method_weird():
 
@@ -331,9 +335,9 @@ def __getattr__(self, key):
             return key
 
     f = HTMLFormatter()
-    
+
     text_hat = TextMagicHat()
-    nt.assert_equal(text_hat._repr_html_, '_repr_html_')
+    assert text_hat._repr_html_ == "_repr_html_"
     with capture_output() as captured:
         result = f(text_hat)
     
@@ -347,8 +351,8 @@ def __getattr__(self, key):
     call_hat = CallableMagicHat()
     with capture_output() as captured:
         result = f(call_hat)
-    
-    nt.assert_equal(result, None)
+
+    assert result == None
 
     class BadReprArgs(object):
         def _repr_html_(self, extra, args):
@@ -369,24 +373,25 @@ def test_format_config():
     with capture_output() as captured:
         result = f(cfg)
     nt.assert_is(result, None)
-    nt.assert_equal(captured.stderr, "")
+    assert captured.stderr == ""
 
     with capture_output() as captured:
         result = f(Config)
     nt.assert_is(result, None)
-    nt.assert_equal(captured.stderr, "")
+    assert captured.stderr == ""
+
 
 def test_pretty_max_seq_length():
     f = PlainTextFormatter(max_seq_length=1)
     lis = list(range(3))
     text = f(lis)
-    nt.assert_equal(text, '[0, ...]')
+    assert text == "[0, ...]"
     f.max_seq_length = 0
     text = f(lis)
-    nt.assert_equal(text, '[0, 1, 2]')
+    assert text == "[0, 1, 2]"
     text = f(list(range(1024)))
     lines = text.splitlines()
-    nt.assert_equal(len(lines), 1024)
+    assert len(lines) == 1024
 
 
 def test_ipython_display_formatter():
@@ -409,16 +414,16 @@ def _ipython_display_(self):
     
     yes = SelfDisplaying()
     no = NotSelfDisplaying()
-    
+
     d, md = f.format(no)
-    nt.assert_equal(d, {'text/plain': repr(no)})
-    nt.assert_equal(md, {})
-    nt.assert_equal(catcher, [])
-    
+    assert d == {"text/plain": repr(no)}
+    assert md == {}
+    assert catcher == []
+
     d, md = f.format(yes)
-    nt.assert_equal(d, {})
-    nt.assert_equal(md, {})
-    nt.assert_equal(catcher, [yes])
+    assert d == {}
+    assert md == {}
+    assert catcher == [yes]
 
     f.ipython_display_formatter.enabled = save_enabled
 
@@ -431,8 +436,8 @@ def _repr_json_(self):
     f = JSONFormatter()
     with warnings.catch_warnings(record=True) as w:
         d = f(JSONString())
-    nt.assert_equal(d, {})
-    nt.assert_equal(len(w), 1)
+    assert d == {}
+    assert len(w) == 1
 
 
 def test_repr_mime():
@@ -458,19 +463,22 @@ def _repr_html_(self):
     obj = HasReprMime()
     d, md = f.format(obj)
     html_f.enabled = save_enabled
-    
-    nt.assert_equal(sorted(d), ['application/json+test.v2',
-                                'image/png',
-                                'plain/text',
-                                'text/html',
-                                'text/plain'])
-    nt.assert_equal(md, {})
 
-    d, md = f.format(obj, include={'image/png'})
-    nt.assert_equal(list(d.keys()), ['image/png'],
-                    'Include should filter out even things from repr_mimebundle')
-    nt.assert_equal(d['image/png'], 'i-overwrite', '_repr_mimebundle_ take precedence')
+    assert sorted(d) == [
+        "application/json+test.v2",
+        "image/png",
+        "plain/text",
+        "text/html",
+        "text/plain",
+    ]
+    assert md == {}
 
+    d, md = f.format(obj, include={"image/png"})
+    assert list(d.keys()) == [
+        "image/png"
+    ], "Include should filter out even things from repr_mimebundle"
+
+    assert d["image/png"] == "i-overwrite", "_repr_mimebundle_ take precedence"
 
 
 def test_pass_correct_include_exclude():
@@ -514,13 +522,14 @@ def _repr_mimebundle_(self, include=None, exclude=None):
     f = get_ipython().display_formatter
     obj = HasReprMimeMeta()
     d, md = f.format(obj)
-    nt.assert_equal(sorted(d), ['image/png', 'text/plain'])
-    nt.assert_equal(md, {
-        'image/png': {
-            'width': 5,
-            'height': 10,
+    assert sorted(d) == ["image/png", "text/plain"]
+    assert md == {
+        "image/png": {
+            "width": 5,
+            "height": 10,
         }
-    })
+    }
+
 
 def test_repr_mime_failure():
     class BadReprMime(object):
@@ -530,4 +539,4 @@ def _repr_mimebundle_(self, include=None, exclude=None):
     f = get_ipython().display_formatter
     obj = BadReprMime()
     d, md = f.format(obj)
-    nt.assert_in('text/plain', d)
+    assert "text/plain" in d

From e3aa7e7bd3758f15738809954a4ce75aab4b1de3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 18 Aug 2021 14:34:47 -0700
Subject: [PATCH 0636/1407] Remove nose.tools.assert_equal from more places.

---
 IPython/utils/tests/test_text.py | 97 +++++++++++++++++---------------
 1 file changed, 51 insertions(+), 46 deletions(-)

diff --git a/IPython/utils/tests/test_text.py b/IPython/utils/tests/test_text.py
index 0fb643066bd..8f9b73c167e 100644
--- a/IPython/utils/tests/test_text.py
+++ b/IPython/utils/tests/test_text.py
@@ -32,31 +32,31 @@ def test_columnize():
     items = [l*size for l in 'abcd']
 
     out = text.columnize(items, displaywidth=80)
-    nt.assert_equal(out, 'aaaaa  bbbbb  ccccc  ddddd\n')
+    assert out == "aaaaa  bbbbb  ccccc  ddddd\n"
     out = text.columnize(items, displaywidth=25)
-    nt.assert_equal(out, 'aaaaa  ccccc\nbbbbb  ddddd\n')
+    assert out == "aaaaa  ccccc\nbbbbb  ddddd\n"
     out = text.columnize(items, displaywidth=12)
-    nt.assert_equal(out, 'aaaaa  ccccc\nbbbbb  ddddd\n')
+    assert out == "aaaaa  ccccc\nbbbbb  ddddd\n"
     out = text.columnize(items, displaywidth=10)
-    nt.assert_equal(out, 'aaaaa\nbbbbb\nccccc\nddddd\n')
+    assert out == "aaaaa\nbbbbb\nccccc\nddddd\n"
 
     out = text.columnize(items, row_first=True, displaywidth=80)
-    nt.assert_equal(out, 'aaaaa  bbbbb  ccccc  ddddd\n')
+    assert out == "aaaaa  bbbbb  ccccc  ddddd\n"
     out = text.columnize(items, row_first=True, displaywidth=25)
-    nt.assert_equal(out, 'aaaaa  bbbbb\nccccc  ddddd\n')
+    assert out == "aaaaa  bbbbb\nccccc  ddddd\n"
     out = text.columnize(items, row_first=True, displaywidth=12)
-    nt.assert_equal(out, 'aaaaa  bbbbb\nccccc  ddddd\n')
+    assert out == "aaaaa  bbbbb\nccccc  ddddd\n"
     out = text.columnize(items, row_first=True, displaywidth=10)
-    nt.assert_equal(out, 'aaaaa\nbbbbb\nccccc\nddddd\n')
+    assert out == "aaaaa\nbbbbb\nccccc\nddddd\n"
 
     out = text.columnize(items, displaywidth=40, spread=True)
-    nt.assert_equal(out, 'aaaaa      bbbbb      ccccc      ddddd\n')
+    assert out == "aaaaa      bbbbb      ccccc      ddddd\n"
     out = text.columnize(items, displaywidth=20, spread=True)
-    nt.assert_equal(out, 'aaaaa          ccccc\nbbbbb          ddddd\n')
+    assert out == "aaaaa          ccccc\nbbbbb          ddddd\n"
     out = text.columnize(items, displaywidth=12, spread=True)
-    nt.assert_equal(out, 'aaaaa  ccccc\nbbbbb  ddddd\n')
+    assert out == "aaaaa  ccccc\nbbbbb  ddddd\n"
     out = text.columnize(items, displaywidth=10, spread=True)
-    nt.assert_equal(out, 'aaaaa\nbbbbb\nccccc\nddddd\n')
+    assert out == "aaaaa\nbbbbb\nccccc\nddddd\n"
 
 
 def test_columnize_random():
@@ -77,38 +77,43 @@ def test_columnize_random():
                 print("size of each element :\n %s" % rand_len)
                 assert False, "row_first={0}".format(row_first)
 
+
+# TODO: pytest mark.parametrize once nose removed.
 def test_columnize_medium():
     """Test with inputs than shouldn't be wider than 80"""
     size = 40
     items = [l*size for l in 'abc']
     for row_first in [True, False]:
         out = text.columnize(items, row_first=row_first, displaywidth=80)
-        nt.assert_equal(out, '\n'.join(items+['']), "row_first={0}".format(row_first))
+        assert out == "\n".join(items + [""]), "row_first={0}".format(row_first)
+
 
+# TODO: pytest mark.parametrize once nose removed.
 def test_columnize_long():
     """Test columnize with inputs longer than the display window"""
     size = 11
     items = [l*size for l in 'abc']
     for row_first in [True, False]:
-        out = text.columnize(items, row_first=row_first, displaywidth=size-1)
-        nt.assert_equal(out, '\n'.join(items+['']), "row_first={0}".format(row_first))
+        out = text.columnize(items, row_first=row_first, displaywidth=size - 1)
+        assert out == "\n".join(items + [""]), "row_first={0}".format(row_first)
+
 
 def eval_formatter_check(f):
     ns = dict(n=12, pi=math.pi, stuff='hello there', os=os, u=u"café", b="café")
     s = f.format("{n} {n//4} {stuff.split()[0]}", **ns)
-    nt.assert_equal(s, "12 3 hello")
+    assert s == "12 3 hello"
     s = f.format(' '.join(['{n//%i}'%i for i in range(1,8)]), **ns)
-    nt.assert_equal(s, "12 6 4 3 2 2 1")
+    assert s == "12 6 4 3 2 2 1"
     s = f.format('{[n//i for i in range(1,8)]}', **ns)
-    nt.assert_equal(s, "[12, 6, 4, 3, 2, 2, 1]")
+    assert s == "[12, 6, 4, 3, 2, 2, 1]"
     s = f.format("{stuff!s}", **ns)
-    nt.assert_equal(s, ns['stuff'])
+    assert s == ns["stuff"]
     s = f.format("{stuff!r}", **ns)
-    nt.assert_equal(s, repr(ns['stuff']))
-    
+    assert s == repr(ns["stuff"])
+
     # Check with unicode:
     s = f.format("{u}", **ns)
-    nt.assert_equal(s, ns['u'])
+    assert s == ns["u"]
     # This decodes in a platform dependent manner, but it shouldn't error out
     s = f.format("{b}", **ns)
         
@@ -117,25 +122,25 @@ def eval_formatter_check(f):
 def eval_formatter_slicing_check(f):
     ns = dict(n=12, pi=math.pi, stuff='hello there', os=os)
     s = f.format(" {stuff.split()[:]} ", **ns)
-    nt.assert_equal(s, " ['hello', 'there'] ")
+    assert s == " ['hello', 'there'] "
     s = f.format(" {stuff.split()[::-1]} ", **ns)
-    nt.assert_equal(s, " ['there', 'hello'] ")
+    assert s == " ['there', 'hello'] "
     s = f.format("{stuff[::2]}", **ns)
-    nt.assert_equal(s, ns['stuff'][::2])
-    
+    assert s == ns["stuff"][::2]
+
     nt.assert_raises(SyntaxError, f.format, "{n:x}", **ns)
 
 def eval_formatter_no_slicing_check(f):
     ns = dict(n=12, pi=math.pi, stuff='hello there', os=os)
     
     s = f.format('{n:x} {pi**2:+f}', **ns)
-    nt.assert_equal(s, "c +9.869604")
-    
-    s = f.format('{stuff[slice(1,4)]}', **ns)
-    nt.assert_equal(s, 'ell')
+    assert s == "c +9.869604"
+
+    s = f.format("{stuff[slice(1,4)]}", **ns)
+    assert s == "ell"
 
     s = f.format("{a[:]}", a=[1, 2])
-    nt.assert_equal(s, "[1, 2]")
+    assert s == "[1, 2]"
 
 def test_eval_formatter():
     f = text.EvalFormatter()
@@ -154,15 +159,15 @@ def test_dollar_formatter():
     
     ns = dict(n=12, pi=math.pi, stuff='hello there', os=os)
     s = f.format("$n", **ns)
-    nt.assert_equal(s, "12")
+    assert s == "12"
     s = f.format("$n.real", **ns)
-    nt.assert_equal(s, "12")
+    assert s == "12"
     s = f.format("$n/{stuff[:5]}", **ns)
-    nt.assert_equal(s, "12/hello")
+    assert s == "12/hello"
     s = f.format("$n $$HOME", **ns)
-    nt.assert_equal(s, "12 $HOME")
+    assert s == "12 $HOME"
     s = f.format("${foo}", foo="HOME")
-    nt.assert_equal(s, "$HOME")
+    assert s == "$HOME"
 
 
 def test_strip_email():
@@ -176,25 +181,25 @@ def test_strip_email():
 ...   return x+1
 ... 
 >>> zz = f(2.5)"""
-    nt.assert_equal(text.strip_email_quotes(src), cln)
+    assert text.strip_email_quotes(src) == cln
 
 
 def test_strip_email2():
     src = '> > > list()'
     cln = 'list()'
-    nt.assert_equal(text.strip_email_quotes(src), cln)
+    assert text.strip_email_quotes(src) == cln
 
 def test_LSString():
     lss = text.LSString("abc\ndef")
-    nt.assert_equal(lss.l, ['abc', 'def'])
-    nt.assert_equal(lss.s, 'abc def')
+    assert lss.l == ["abc", "def"]
+    assert lss.s == "abc def"
     lss = text.LSString(os.getcwd())
     nt.assert_is_instance(lss.p[0], Path)
 
 def test_SList():
-    sl = text.SList(['a 11', 'b 1', 'a 2'])
-    nt.assert_equal(sl.n, 'a 11\nb 1\na 2')
-    nt.assert_equal(sl.s, 'a 11 b 1 a 2')
-    nt.assert_equal(sl.grep(lambda x: x.startswith('a')), text.SList(['a 11', 'a 2']))
-    nt.assert_equal(sl.fields(0), text.SList(['a', 'b', 'a']))
-    nt.assert_equal(sl.sort(field=1, nums=True), text.SList(['b 1', 'a 2', 'a 11']))
+    sl = text.SList(["a 11", "b 1", "a 2"])
+    assert sl.n == "a 11\nb 1\na 2"
+    assert sl.s == "a 11 b 1 a 2"
+    assert sl.grep(lambda x: x.startswith("a")) == text.SList(["a 11", "a 2"])
+    assert sl.fields(0) == text.SList(["a", "b", "a"])
+    assert sl.sort(field=1, nums=True) == text.SList(["b 1", "a 2", "a 11"])

From 4142eaaf2ec09492c68c1a8495092377d7b1bc89 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 18 Aug 2021 14:37:09 -0700
Subject: [PATCH 0637/1407] remove nose tools from test_editorhooks

---
 IPython/lib/tests/test_editorhooks.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/IPython/lib/tests/test_editorhooks.py b/IPython/lib/tests/test_editorhooks.py
index 658276c372b..6e3354786a2 100644
--- a/IPython/lib/tests/test_editorhooks.py
+++ b/IPython/lib/tests/test_editorhooks.py
@@ -2,8 +2,6 @@
 import sys
 from unittest import mock
 
-import nose.tools as nt
-
 from IPython import get_ipython
 from IPython.lib import editorhooks
 
@@ -20,15 +18,15 @@ def fake_popen(*args, **kwargs):
     with mock.patch('subprocess.Popen', fake_popen):
         get_ipython().hooks.editor('the file', 64)
     
-    nt.assert_equal(len(called), 1)
-    args = called[0]['args']
-    kwargs = called[0]['kwargs']
-    
-    nt.assert_equal(kwargs, {'shell': True})
-    
-    if sys.platform.startswith('win'):
-        expected = ['foo', '-l', '64', '-f', 'the file']
+    assert len(called) == 1
+    args = called[0]["args"]
+    kwargs = called[0]["kwargs"]
+
+    assert kwargs == {"shell": True}
+
+    if sys.platform.startswith("win"):
+        expected = ["foo", "-l", "64", "-f", "the file"]
     else:
         expected = "foo -l 64 -f 'the file'"
     cmd = args[0]
-    nt.assert_equal(cmd, expected)
+    assert cmd == expected

From 44f8b988ec41c059804e22b49e0c69d7142d53c1 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 18 Aug 2021 14:39:25 -0700
Subject: [PATCH 0638/1407] remove nose from test_process

---
 IPython/utils/tests/test_process.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index fbc000c3eeb..c53999ebd25 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -66,7 +66,8 @@ def test_find_cmd_fail():
     """Make sure that FindCmdError is raised if we can't find the cmd."""
     nt.assert_raises(FindCmdError,find_cmd,'asdfasdf')
 
-    
+
+# TODO: move to pytest.mark.parametrize once nose gone
 @dec.skip_win32
 def test_arg_split():
     """Ensure that argument lines are correctly split like in a shell."""
@@ -80,8 +81,10 @@ def test_arg_split():
              ['something "with quotes"', ['something', '"with quotes"']],
              ]
     for argstr, argv in tests:
-        nt.assert_equal(arg_split(argstr), argv)
-    
+        assert arg_split(argstr) == argv
+
+
+# TODO: move to pytest.mark.parametrize once nose gone
 @dec.skip_if_not_win32
 def test_arg_split_win32():
     """Ensure that argument lines are correctly split like in a shell."""
@@ -92,7 +95,7 @@ def test_arg_split_win32():
              ['something "with quotes"', ['something', 'with quotes']],
              ]
     for argstr, argv in tests:
-        nt.assert_equal(arg_split(argstr), argv)
+        assert arg_split(argstr) == argv
 
 
 class SubProcessTestCase(tt.TempFileMixin):

From efce141581dee7350f970590961eeb2e892193cd Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 18 Aug 2021 14:45:39 -0700
Subject: [PATCH 0639/1407] remove nose from test pretty

---
 IPython/lib/tests/test_pretty.py | 58 +++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py
index 36cc5d2ae48..3c8cbf201b3 100644
--- a/IPython/lib/tests/test_pretty.py
+++ b/IPython/lib/tests/test_pretty.py
@@ -81,7 +81,7 @@ def test_indentation():
     gotoutput = pretty.pretty(MyList(range(count)))
     expectedoutput = "MyList(\n" + ",\n".join("   %d" % i for i in range(count)) + ")"
 
-    nt.assert_equal(gotoutput, expectedoutput)
+    assert gotoutput == expectedoutput
 
 
 def test_dispatch():
@@ -92,7 +92,7 @@ def test_dispatch():
     gotoutput = pretty.pretty(MyDict())
     expectedoutput = "MyDict(...)"
 
-    nt.assert_equal(gotoutput, expectedoutput)
+    assert gotoutput == expectedoutput
 
 
 def test_callability_checking():
@@ -103,7 +103,7 @@ def test_callability_checking():
     gotoutput = pretty.pretty(Dummy2())
     expectedoutput = "Dummy1(...)"
 
-    nt.assert_equal(gotoutput, expectedoutput)
+    assert gotoutput == expectedoutput
 
 
 @pytest.mark.parametrize(
@@ -135,7 +135,7 @@ def test_sets(obj, expected_output):
     Test that set and frozenset use Python 3 formatting.
     """
     got_output = pretty.pretty(obj)
-    nt.assert_equal(got_output, expected_output)
+    assert got_output == expected_output
 
 
 @skip_without('xxlimited')
@@ -145,22 +145,24 @@ def test_pprint_heap_allocated_type():
     """
     import xxlimited
     output = pretty.pretty(xxlimited.Null)
-    nt.assert_equal(output, 'xxlimited.Null')
+    assert output == "xxlimited.Null"
+
 
 def test_pprint_nomod():
     """
     Test that pprint works for classes with no __module__.
     """
     output = pretty.pretty(NoModule)
-    nt.assert_equal(output, 'NoModule')
-    
+    assert output == "NoModule"
+
+
 def test_pprint_break():
     """
     Test that p.break_ produces expected output
     """
     output = pretty.pretty(Breaking())
     expected = "TG: Breaking(\n    ):"
-    nt.assert_equal(output, expected)
+    assert output == expected
 
 def test_pprint_break_repr():
     """
@@ -168,11 +170,11 @@ def test_pprint_break_repr():
     """
     output = pretty.pretty([[BreakingRepr()]])
     expected = "[[Breaking(\n  )]]"
-    nt.assert_equal(output, expected)
+    assert output == expected
 
     output = pretty.pretty([[BreakingRepr()]*2])
     expected = "[[Breaking(\n  ),\n  Breaking(\n  )]]"
-    nt.assert_equal(output, expected)
+    assert output == expected
 
 def test_bad_repr():
     """Don't catch bad repr errors"""
@@ -258,7 +260,7 @@ def __repr__(self):
 
 def test_metaclass_repr():
     output = pretty.pretty(ClassWithMeta)
-    nt.assert_equal(output, "[CUSTOM REPR FOR CLASS ClassWithMeta]")
+    assert output == "[CUSTOM REPR FOR CLASS ClassWithMeta]"
 
 
 def test_unicode_repr():
@@ -271,9 +273,9 @@ def __repr__(self):
     
     c = C()
     p = pretty.pretty(c)
-    nt.assert_equal(p, u)
+    assert p == u
     p = pretty.pretty([c])
-    nt.assert_equal(p, u'[%s]' % u)
+    assert p == u"[%s]" % u
 
 
 def test_basic_class():
@@ -290,10 +292,11 @@ def type_pprint_wrapper(obj, p, cycle):
     printer.flush()
     output = stream.getvalue()
 
-    nt.assert_equal(output, '%s.MyObj' % __name__)
+    assert output == "%s.MyObj" % __name__
     nt.assert_true(type_pprint_wrapper.called)
 
 
+# TODO : pytest.mark.parametrise once nose is gone.
 def test_collections_defaultdict():
     # Create defaultdicts with cycles
     a = defaultdict()
@@ -311,9 +314,10 @@ def test_collections_defaultdict():
         (b, "defaultdict(list, {'key': defaultdict(...)})"),
     ]
     for obj, expected in cases:
-        nt.assert_equal(pretty.pretty(obj), expected)
+        assert pretty.pretty(obj) == expected
 
 
+# TODO : pytest.mark.parametrise once nose is gone.
 def test_collections_ordereddict():
     # Create OrderedDict with cycle
     a = OrderedDict()
@@ -335,9 +339,10 @@ def test_collections_ordereddict():
         (a, "OrderedDict([('key', OrderedDict(...))])"),
     ]
     for obj, expected in cases:
-        nt.assert_equal(pretty.pretty(obj), expected)
+        assert pretty.pretty(obj) == expected
 
 
+# TODO : pytest.mark.parametrise once nose is gone.
 def test_collections_deque():
     # Create deque with cycle
     a = deque()
@@ -369,8 +374,10 @@ def test_collections_deque():
         (a, 'deque([deque(...)])'),
     ]
     for obj, expected in cases:
-        nt.assert_equal(pretty.pretty(obj), expected)
+        assert pretty.pretty(obj) == expected
 
+
+# TODO : pytest.mark.parametrise once nose is gone.
 def test_collections_counter():
     class MyCounter(Counter):
         pass
@@ -380,8 +387,9 @@ class MyCounter(Counter):
         (MyCounter(a=1), "MyCounter({'a': 1})"),
     ]
     for obj, expected in cases:
-        nt.assert_equal(pretty.pretty(obj), expected)
+        assert pretty.pretty(obj) == expected
 
+# TODO : pytest.mark.parametrise once nose is gone.
 def test_mappingproxy():
     MP = types.MappingProxyType
     underlying_dict = {}
@@ -424,9 +432,10 @@ def test_mappingproxy():
          "{2: mappingproxy({2: {...}, 3: {...}}), 3: {...}}"),
     ]
     for obj, expected in cases:
-        nt.assert_equal(pretty.pretty(obj), expected)
+        assert pretty.pretty(obj) == expected
 
 
+# TODO : pytest.mark.parametrise once nose is gone.
 def test_simplenamespace():
     SN = types.SimpleNamespace
 
@@ -444,7 +453,7 @@ def test_simplenamespace():
         (sn_recursive, "namespace(first=namespace(...), second=namespace(...))"),
     ]
     for obj, expected in cases:
-        nt.assert_equal(pretty.pretty(obj), expected)
+        assert pretty.pretty(obj) == expected
 
 
 def test_pretty_environ():
@@ -452,7 +461,7 @@ def test_pretty_environ():
     # reindent to align with 'environ' prefix
     dict_indented = dict_repr.replace('\n', '\n' + (' ' * len('environ')))
     env_repr = pretty.pretty(os.environ)
-    nt.assert_equal(env_repr, 'environ' + dict_indented)
+    assert env_repr == "environ" + dict_indented
 
 
 def test_function_pretty():
@@ -460,8 +469,9 @@ def test_function_pretty():
     # posixpath is a pure python module, its interface is consistent
     # across Python distributions
     import posixpath
-    nt.assert_equal(pretty.pretty(posixpath.join), '<function posixpath.join(a, *p)>')
- 
+
+    assert pretty.pretty(posixpath.join) == "<function posixpath.join(a, *p)>"
+
     # custom function
     def meaning_of_life(question=None):
         if question:
@@ -489,4 +499,4 @@ def test_custom_repr():
     oc = OrderedCounter("abracadabra")
     nt.assert_in("OrderedCounter(OrderedDict", pretty.pretty(oc))
 
-    nt.assert_equal(pretty.pretty(MySet()), 'mine')
+    assert pretty.pretty(MySet()) == "mine"

From 4d7cd534e8e7ae133738a2e6a2172e463db0f25c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 18 Aug 2021 14:50:41 -0700
Subject: [PATCH 0640/1407] remove some nose from test_paths

---
 IPython/utils/tests/test_path.py | 72 ++++++++++++++++----------------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index 1358deb688a..a7be2be885d 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -113,7 +113,7 @@ def test_get_home_dir_1():
     IPython.__file__ = abspath(join(HOME_TEST_DIR, "Lib/IPython/__init__.py"))
 
     home_dir = path.get_home_dir()
-    nt.assert_equal(home_dir, unfrozen)
+    assert home_dir == unfrozen
 
 
 @skip_if_not_win32
@@ -127,7 +127,7 @@ def test_get_home_dir_2():
     IPython.__file__ = abspath(join(HOME_TEST_DIR, "Library.zip/IPython/__init__.py")).lower()
 
     home_dir = path.get_home_dir(True)
-    nt.assert_equal(home_dir, unfrozen)
+    assert home_dir == unfrozen
 
 
 @skip_win32_py38
@@ -137,7 +137,7 @@ def test_get_home_dir_3():
     env["HOME"] = HOME_TEST_DIR
     home_dir = path.get_home_dir(True)
     # get_home_dir expands symlinks
-    nt.assert_equal(home_dir, os.path.realpath(env["HOME"]))
+    assert home_dir == os.path.realpath(env["HOME"])
 
 
 @with_environment
@@ -181,7 +181,7 @@ def __exit__(*args, **kwargs):
     with patch.object(wreg, 'OpenKey', return_value=key()), \
          patch.object(wreg, 'QueryValueEx', return_value=[abspath(HOME_TEST_DIR)]):
         home_dir = path.get_home_dir()
-    nt.assert_equal(home_dir, abspath(HOME_TEST_DIR))
+    assert home_dir == abspath(HOME_TEST_DIR)
 
 @with_environment
 def test_get_xdg_dir_0():
@@ -195,7 +195,7 @@ def test_get_xdg_dir_0():
     env.pop('IPYTHONDIR', None)
     env.pop('XDG_CONFIG_HOME', None)
 
-    nt.assert_equal(path.get_xdg_dir(), os.path.join('somewhere', '.config'))
+    assert path.get_xdg_dir() == os.path.join("somewhere", ".config")
 
 
 @with_environment
@@ -208,7 +208,7 @@ def test_get_xdg_dir_1():
     env.pop('IPYTHON_DIR', None)
     env.pop('IPYTHONDIR', None)
     env.pop('XDG_CONFIG_HOME', None)
-    nt.assert_equal(path.get_xdg_dir(), None)
+    assert path.get_xdg_dir() is None
 
 @with_environment
 def test_get_xdg_dir_2():
@@ -224,7 +224,7 @@ def test_get_xdg_dir_2():
     if not os.path.exists(cfgdir):
         os.makedirs(cfgdir)
 
-    nt.assert_equal(path.get_xdg_dir(), cfgdir)
+    assert path.get_xdg_dir() == cfgdir
 
 @with_environment
 def test_get_xdg_dir_3():
@@ -240,7 +240,7 @@ def test_get_xdg_dir_3():
     if not os.path.exists(cfgdir):
         os.makedirs(cfgdir)
 
-    nt.assert_equal(path.get_xdg_dir(), None)
+    assert path.get_xdg_dir() is None
 
 def test_filefind():
     """Various tests for filefind"""
@@ -263,13 +263,13 @@ def test_get_long_path_name_win32():
         # Test to see if the short path evaluates correctly.
         short_path = os.path.join(tmpdir, 'THISIS~1')
         evaluated_path = path.get_long_path_name(short_path)
-        nt.assert_equal(evaluated_path.lower(), long_path.lower())
+        assert evaluated_path.lower() == long_path.lower()
 
 
 @dec.skip_win32
 def test_get_long_path_name():
-    p = path.get_long_path_name('/usr/local')
-    nt.assert_equal(p,'/usr/local')
+    p = path.get_long_path_name("/usr/local")
+    assert p == "/usr/local"
 
 
 class TestRaiseDeprecation(unittest.TestCase):
@@ -300,18 +300,18 @@ def test_not_writable_ipdir(self):
 @with_environment
 def test_get_py_filename():
     os.chdir(TMP_TEST_DIR)
-    with make_tempfile('foo.py'):
-        nt.assert_equal(path.get_py_filename('foo.py'), 'foo.py')
-        nt.assert_equal(path.get_py_filename('foo'), 'foo.py')
-    with make_tempfile('foo'):
-        nt.assert_equal(path.get_py_filename('foo'), 'foo')
-        nt.assert_raises(IOError, path.get_py_filename, 'foo.py')
-    nt.assert_raises(IOError, path.get_py_filename, 'foo')
-    nt.assert_raises(IOError, path.get_py_filename, 'foo.py')
-    true_fn = 'foo with spaces.py'
+    with make_tempfile("foo.py"):
+        assert path.get_py_filename("foo.py") == "foo.py"
+        assert path.get_py_filename("foo") == "foo.py"
+    with make_tempfile("foo"):
+        assert path.get_py_filename("foo") == "foo"
+        nt.assert_raises(IOError, path.get_py_filename, "foo.py")
+    nt.assert_raises(IOError, path.get_py_filename, "foo")
+    nt.assert_raises(IOError, path.get_py_filename, "foo.py")
+    true_fn = "foo with spaces.py"
     with make_tempfile(true_fn):
-        nt.assert_equal(path.get_py_filename('foo with spaces'), true_fn)
-        nt.assert_equal(path.get_py_filename('foo with spaces.py'), true_fn)
+        assert path.get_py_filename("foo with spaces") == true_fn
+        assert path.get_py_filename("foo with spaces.py") == true_fn
         nt.assert_raises(IOError, path.get_py_filename, '"foo with spaces.py"')
         nt.assert_raises(IOError, path.get_py_filename, "'foo with spaces.py'")
 
@@ -361,8 +361,7 @@ def in_tempdir(cls):
     def check_match(self, patterns, matches):
         with self.in_tempdir():
             # glob returns unordered list. that's why sorted is required.
-            nt.assert_equal(sorted(path.shellglob(patterns)),
-                            sorted(matches))
+            assert sorted(path.shellglob(patterns)) == sorted(matches)
 
     def common_cases(self):
         return [
@@ -397,12 +396,13 @@ def test_match_windows(self):
             yield (self.check_match, patterns, matches)
 
 
+# TODO : pytest.mark.parametrise once nose is gone.
 def test_unescape_glob():
-    nt.assert_equal(path.unescape_glob(r'\*\[\!\]\?'), '*[!]?')
-    nt.assert_equal(path.unescape_glob(r'\\*'), r'\*')
-    nt.assert_equal(path.unescape_glob(r'\\\*'), r'\*')
-    nt.assert_equal(path.unescape_glob(r'\\a'), r'\a')
-    nt.assert_equal(path.unescape_glob(r'\a'), r'\a')
+    assert path.unescape_glob(r"\*\[\!\]\?") == "*[!]?"
+    assert path.unescape_glob(r"\\*") == r"\*"
+    assert path.unescape_glob(r"\\\*") == r"\*"
+    assert path.unescape_glob(r"\\a") == r"\a"
+    assert path.unescape_glob(r"\a") == r"\a"
 
 
 @onlyif_unicode_paths
@@ -431,17 +431,19 @@ def dst(self, *args):
         return os.path.join(self.tempdir.name, *args)
 
     def assert_inode_not_equal(self, a, b):
-        nt.assert_not_equal(os.stat(a).st_ino, os.stat(b).st_ino,
-                            "%r and %r do reference the same indoes" %(a, b))
+        assert (
+            os.stat(a).st_ino != os.stat(b).st_ino
+        ), "%r and %r do reference the same indoes" % (a, b)
 
     def assert_inode_equal(self, a, b):
-        nt.assert_equal(os.stat(a).st_ino, os.stat(b).st_ino,
-                        "%r and %r do not reference the same indoes" %(a, b))
+        assert (
+            os.stat(a).st_ino == os.stat(b).st_ino
+        ), "%r and %r do not reference the same indoes" % (a, b)
 
     def assert_content_equal(self, a, b):
         with open(a) as a_f:
             with open(b) as b_f:
-                nt.assert_equal(a_f.read(), b_f.read())
+                assert a_f.read() == b_f.read()
 
     @skip_win32
     def test_link_successful(self):
@@ -489,4 +491,4 @@ def test_link_twice(self):
         path.link_or_copy(self.src, dst)
         path.link_or_copy(self.src, dst)
         self.assert_inode_equal(self.src, dst)
-        nt.assert_equal(sorted(os.listdir(self.tempdir.name)), ['src', 'target'])
+        assert sorted(os.listdir(self.tempdir.name)) == ["src", "target"]

From c202203cde904ddb169d6ade9b312357a74e7e08 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 18 Aug 2021 14:57:34 -0700
Subject: [PATCH 0641/1407] remove some nose from test_capture.py

---
 IPython/utils/tests/test_capture.py | 45 ++++++++++++++---------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/IPython/utils/tests/test_capture.py b/IPython/utils/tests/test_capture.py
index c02dbaa4ea1..3cfa8276acf 100644
--- a/IPython/utils/tests/test_capture.py
+++ b/IPython/utils/tests/test_capture.py
@@ -15,7 +15,6 @@
 
 import sys
 
-import nose.tools as nt
 import pytest
 
 from IPython.testing.decorators import skip_iptest_but_not_pytest
@@ -75,18 +74,18 @@ def test_rich_output_empty(method_mime):
     """RichOutput with no args"""
     rich = capture.RichOutput()
     method, mime = method_mime
-    nt.assert_equal(getattr(rich, method)(), None)
+    assert getattr(rich, method)() is None
     
 def test_rich_output():
     """test RichOutput basics"""
     data = basic_data
     metadata = basic_metadata
     rich = capture.RichOutput(data=data, metadata=metadata)
-    nt.assert_equal(rich._repr_html_(), data["text/html"])
-    nt.assert_equal(rich._repr_png_(), (data["image/png"], metadata["image/png"]))
-    nt.assert_equal(rich._repr_latex_(), None)
-    nt.assert_equal(rich._repr_javascript_(), None)
-    nt.assert_equal(rich._repr_svg_(), None)
+    assert rich._repr_html_() == data["text/html"]
+    assert rich._repr_png_() == (data["image/png"], metadata["image/png"])
+    assert rich._repr_latex_() is None
+    assert rich._repr_javascript_() is None
+    assert rich._repr_svg_() is None
 
 
 @skip_iptest_but_not_pytest
@@ -96,7 +95,7 @@ def test_rich_output_no_metadata(method_mime):
     data = full_data
     rich = capture.RichOutput(data=data)
     method, mime = method_mime
-    nt.assert_equal(getattr(rich, method)(), data[mime])
+    assert getattr(rich, method)() == data[mime]
 
 
 @skip_iptest_but_not_pytest
@@ -107,7 +106,7 @@ def test_rich_output_metadata(method_mime):
     metadata = full_metadata
     rich = capture.RichOutput(data=data, metadata=metadata)
     method, mime = method_mime
-    nt.assert_equal(getattr(rich, method)(), (data[mime], metadata[mime]))
+    assert getattr(rich, method)() == (data[mime], metadata[mime])
 
 def test_rich_output_display():
     """test RichOutput.display
@@ -119,10 +118,10 @@ def test_rich_output_display():
     rich = capture.RichOutput(data=data)
     with capture.capture_output() as cap:
         rich.display()
-    nt.assert_equal(len(cap.outputs), 1)
+    assert len(cap.outputs) == 1
     rich2 = cap.outputs[0]
-    nt.assert_equal(rich2.data, rich.data)
-    nt.assert_equal(rich2.metadata, rich.metadata)
+    assert rich2.data == rich.data
+    assert rich2.metadata == rich.metadata
 
 def test_capture_output():
     """capture_output works"""
@@ -131,8 +130,8 @@ def test_capture_output():
         print(hello_stdout, end="")
         print(hello_stderr, end="", file=sys.stderr)
         rich.display()
-    nt.assert_equal(hello_stdout, cap.stdout)
-    nt.assert_equal(hello_stderr, cap.stderr)
+    assert hello_stdout == cap.stdout
+    assert hello_stderr == cap.stderr
 
 
 def test_capture_output_no_stdout():
@@ -142,9 +141,9 @@ def test_capture_output_no_stdout():
         print(hello_stdout, end="")
         print(hello_stderr, end="", file=sys.stderr)
         rich.display()
-    nt.assert_equal("", cap.stdout)
-    nt.assert_equal(hello_stderr, cap.stderr)
-    nt.assert_equal(len(cap.outputs), 1)
+    assert "" == cap.stdout
+    assert hello_stderr == cap.stderr
+    assert len(cap.outputs) == 1
 
 
 def test_capture_output_no_stderr():
@@ -155,9 +154,9 @@ def test_capture_output_no_stderr():
         print(hello_stdout, end="")
         print(hello_stderr, end="", file=sys.stderr)
         rich.display()
-    nt.assert_equal(hello_stdout, cap.stdout)
-    nt.assert_equal("", cap.stderr)
-    nt.assert_equal(len(cap.outputs), 1)
+    assert hello_stdout == cap.stdout
+    assert "" == cap.stderr
+    assert len(cap.outputs) == 1
 
 
 def test_capture_output_no_display():
@@ -167,6 +166,6 @@ def test_capture_output_no_display():
         print(hello_stdout, end="")
         print(hello_stderr, end="", file=sys.stderr)
         rich.display()
-    nt.assert_equal(hello_stdout, cap.stdout)
-    nt.assert_equal(hello_stderr, cap.stderr)
-    nt.assert_equal(cap.outputs, [])
+    assert hello_stdout == cap.stdout
+    assert hello_stderr == cap.stderr
+    assert cap.outputs == []

From 4aeedd32b06a524f062c2d2bdb1f4ff5265b125b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 18 Aug 2021 14:59:20 -0700
Subject: [PATCH 0642/1407] == None to is None

---
 IPython/core/tests/test_formatters.py | 2 +-
 IPython/lib/tests/test_latextools.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/tests/test_formatters.py b/IPython/core/tests/test_formatters.py
index efd6bf86e5a..15ce8df29d1 100644
--- a/IPython/core/tests/test_formatters.py
+++ b/IPython/core/tests/test_formatters.py
@@ -352,7 +352,7 @@ def __getattr__(self, key):
     with capture_output() as captured:
         result = f(call_hat)
 
-    assert result == None
+    assert result is None
 
     class BadReprArgs(object):
         def _repr_html_(self, extra, args):
diff --git a/IPython/lib/tests/test_latextools.py b/IPython/lib/tests/test_latextools.py
index 794688c103f..fafff73d153 100644
--- a/IPython/lib/tests/test_latextools.py
+++ b/IPython/lib/tests/test_latextools.py
@@ -25,7 +25,7 @@ def mock_find_cmd(arg):
             raise FindCmdError
 
     with patch.object(latextools, "find_cmd", mock_find_cmd):
-        assert latextools.latex_to_png_dvipng("whatever", True) == None
+        assert latextools.latex_to_png_dvipng("whatever", True) is None
 
 
 @contextmanager

From 2dc36ad6a10944614d55ea1b7d57557aeab0615e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 18 Aug 2021 15:01:07 -0700
Subject: [PATCH 0643/1407] start removing nose from
 IPython/lib/tests/test_display.py

---
 IPython/lib/tests/test_display.py | 36 ++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/IPython/lib/tests/test_display.py b/IPython/lib/tests/test_display.py
index 7e98a1858f4..414d3fd2b8c 100644
--- a/IPython/lib/tests/test_display.py
+++ b/IPython/lib/tests/test_display.py
@@ -59,8 +59,9 @@ def test_existing_path_FileLink():
     tf = NamedTemporaryFile()
     fl = display.FileLink(tf.name)
     actual = fl._repr_html_()
-    expected = "<a href='%s' target='_blank'>%s</a><br>" % (tf.name,tf.name)
-    nt.assert_equal(actual,expected)
+    expected = "<a href='%s' target='_blank'>%s</a><br>" % (tf.name, tf.name)
+    assert actual == expected
+
 
 def test_existing_path_FileLink_repr():
     """FileLink: Calling repr() functions as expected on existing filepath
@@ -69,7 +70,8 @@ def test_existing_path_FileLink_repr():
     fl = display.FileLink(tf.name)
     actual = repr(fl)
     expected = tf.name
-    nt.assert_equal(actual,expected)
+    assert actual == expected
+
 
 def test_error_on_directory_to_FileLink():
     """FileLink: Raises error when passed directory
@@ -111,7 +113,8 @@ def test_existing_path_FileLinks():
                  (tf1.name.replace("\\","/"),split(tf1.name)[1])]
     expected.sort()
     # We compare the sorted list of links here as that's more reliable
-    nt.assert_equal(actual,expected)
+    assert actual == expected
+
 
 def test_existing_path_FileLinks_alt_formatter():
     """FileLinks: Calling _repr_html_ functions as expected w/ an alt formatter
@@ -128,7 +131,8 @@ def fake_formatter(dirname,fnames,included_suffixes):
     expected = ["hello","world"]
     expected.sort()
     # We compare the sorted list of links here as that's more reliable
-    nt.assert_equal(actual,expected)
+    assert actual == expected
+
 
 def test_existing_path_FileLinks_repr():
     """FileLinks: Calling repr() functions as expected on existing directory """
@@ -142,8 +146,9 @@ def test_existing_path_FileLinks_repr():
     expected = ['%s/' % td, '  %s' % split(tf1.name)[1],'  %s' % split(tf2.name)[1]]
     expected.sort()
     # We compare the sorted list of links here as that's more reliable
-    nt.assert_equal(actual,expected)
-    
+    assert actual == expected
+
+
 def test_existing_path_FileLinks_repr_alt_formatter():
     """FileLinks: Calling repr() functions as expected w/ alt formatter
     """
@@ -159,8 +164,9 @@ def fake_formatter(dirname,fnames,included_suffixes):
     expected = ["hello","world"]
     expected.sort()
     # We compare the sorted list of links here as that's more reliable
-    nt.assert_equal(actual,expected)
-    
+    assert actual == expected
+
+
 def test_error_on_file_to_FileLinks():
     """FileLinks: Raises error when passed file
     """
@@ -178,11 +184,11 @@ def test_recursive_FileLinks():
     fl = display.FileLinks(td)
     actual = str(fl)
     actual = actual.split('\n')
-    nt.assert_equal(len(actual), 4, actual)
+    assert len(actual) == 4, actual
     fl = display.FileLinks(td, recursive=False)
     actual = str(fl)
     actual = actual.split('\n')
-    nt.assert_equal(len(actual), 2, actual)
+    assert len(actual) == 2, actual
 
 def test_audio_from_file():
     path = pjoin(dirname(__file__), 'test.wav')
@@ -194,13 +200,13 @@ class TestAudioDataWithNumpy(TestCase):
     def test_audio_from_numpy_array(self):
         test_tone = get_test_tone()
         audio = display.Audio(test_tone, rate=44100)
-        nt.assert_equal(len(read_wav(audio.data)), len(test_tone))
+        assert len(read_wav(audio.data)) == len(test_tone)
 
     @skipif_not_numpy
     def test_audio_from_list(self):
         test_tone = get_test_tone()
         audio = display.Audio(list(test_tone), rate=44100)
-        nt.assert_equal(len(read_wav(audio.data)), len(test_tone))
+        assert len(read_wav(audio.data)) == len(test_tone)
 
     @skipif_not_numpy
     def test_audio_from_numpy_array_without_rate_raises(self):
@@ -212,7 +218,7 @@ def test_audio_data_normalization(self):
         for scale in [1, 0.5, 2]:
             audio = display.Audio(get_test_tone(scale), rate=44100)
             actual_max_value = numpy.max(numpy.abs(read_wav(audio.data)))
-            nt.assert_equal(actual_max_value, expected_max_value)
+            assert actual_max_value == expected_max_value
 
     @skipif_not_numpy
     def test_audio_data_without_normalization(self):
@@ -223,7 +229,7 @@ def test_audio_data_without_normalization(self):
             expected_max_value = int(max_int16 * test_tone_max_abs)
             audio = display.Audio(test_tone, rate=44100, normalize=False)
             actual_max_value = numpy.max(numpy.abs(read_wav(audio.data)))
-            nt.assert_equal(actual_max_value, expected_max_value)
+            assert actual_max_value == expected_max_value
 
     def test_audio_data_without_normalization_raises_for_invalid_data(self):
         nt.assert_raises(

From f03bb32540a6ed0180cb5406de64c0e57b988350 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 18 Aug 2021 15:02:35 -0700
Subject: [PATCH 0644/1407] remove nose from test_background_jobs

---
 IPython/lib/tests/test_backgroundjobs.py | 27 +++++++++++-------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/IPython/lib/tests/test_backgroundjobs.py b/IPython/lib/tests/test_backgroundjobs.py
index d7793f50553..fc76ff198ec 100644
--- a/IPython/lib/tests/test_backgroundjobs.py
+++ b/IPython/lib/tests/test_backgroundjobs.py
@@ -15,9 +15,6 @@
 # Stdlib imports
 import time
 
-# Third-party imports
-import nose.tools as nt
-
 # Our own imports
 from IPython.lib import backgroundjobs as bg
 
@@ -49,18 +46,18 @@ def test_result():
     jobs = bg.BackgroundJobManager()
     j = jobs.new(sleeper)
     j.join()
-    nt.assert_equal(j.result['interval'], t_short)
-    
+    assert j.result["interval"] == t_short
+
 
 def test_flush():
     """Test job control"""
     jobs = bg.BackgroundJobManager()
     j = jobs.new(sleeper)
     j.join()
-    nt.assert_equal(len(jobs.completed), 1)
-    nt.assert_equal(len(jobs.dead), 0)
+    assert len(jobs.completed) == 1
+    assert len(jobs.dead) == 0
     jobs.flush()
-    nt.assert_equal(len(jobs.completed), 0)
+    assert len(jobs.completed) == 0
     
 
 def test_dead():
@@ -68,10 +65,10 @@ def test_dead():
     jobs = bg.BackgroundJobManager()
     j = jobs.new(crasher)
     j.join()
-    nt.assert_equal(len(jobs.completed), 0)
-    nt.assert_equal(len(jobs.dead), 1)
+    assert len(jobs.completed) == 0
+    assert len(jobs.dead) == 1
     jobs.flush()    
-    nt.assert_equal(len(jobs.dead), 0)
+    assert len(jobs.dead) == 0
 
 
 def test_longer():
@@ -81,8 +78,8 @@ def test_longer():
     # job as running, but not so long that it makes the test suite noticeably
     # slower. 
     j = jobs.new(sleeper, 0.1)
-    nt.assert_equal(len(jobs.running), 1)
-    nt.assert_equal(len(jobs.completed), 0)
+    assert len(jobs.running) == 1
+    assert len(jobs.completed) == 0
     j.join()
-    nt.assert_equal(len(jobs.running), 0)
-    nt.assert_equal(len(jobs.completed), 1)
+    assert len(jobs.running) == 0
+    assert len(jobs.completed) == 1

From 5cba8660db4735477e29d59e664f6a86359573ad Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 18 Aug 2021 15:05:36 -0700
Subject: [PATCH 0645/1407] remove nose.assert_equal from
 IPython/core/tests/test_oinspect.py

---
 IPython/core/tests/test_oinspect.py | 84 ++++++++++++++++-------------
 1 file changed, 46 insertions(+), 38 deletions(-)

diff --git a/IPython/core/tests/test_oinspect.py b/IPython/core/tests/test_oinspect.py
index 19c6db7c4f8..6d3ae2e5c44 100644
--- a/IPython/core/tests/test_oinspect.py
+++ b/IPython/core/tests/test_oinspect.py
@@ -56,7 +56,7 @@ def pyfile(fname):
 
 
 def match_pyfiles(f1, f2):
-    nt.assert_equal(pyfile(f1), pyfile(f2))
+    assert pyfile(f1) == pyfile(f2)
 
 
 def test_find_file():
@@ -76,7 +76,7 @@ def f(x):
         "My docstring"
     
     match_pyfiles(oinspect.find_file(f), os.path.abspath(__file__))
-    nt.assert_equal(f.__doc__, "My docstring")
+    assert f.__doc__ == "My docstring"
 
 
 def test_find_file_decorated2():
@@ -92,7 +92,7 @@ def f(x):
         "My docstring 2"
     
     match_pyfiles(oinspect.find_file(f), os.path.abspath(__file__))
-    nt.assert_equal(f.__doc__, "My docstring 2")
+    assert f.__doc__ == "My docstring 2"
     
 
 def test_find_file_magic():
@@ -167,41 +167,46 @@ def __getattr__(self, item):
 
 def test_info():
     "Check that Inspector.info fills out various fields as expected."
-    i = inspector.info(Call, oname='Call')
-    nt.assert_equal(i['type_name'], 'type')
+    i = inspector.info(Call, oname="Call")
+    assert i["type_name"] == "type"
     expted_class = str(type(type))  # <class 'type'> (Python 3) or <type 'type'>
-    nt.assert_equal(i['base_class'], expted_class)
-    nt.assert_regex(i['string_form'], "<class 'IPython.core.tests.test_oinspect.Call'( at 0x[0-9a-f]{1,9})?>")
+    assert i["base_class"] == expted_class
+    nt.assert_regex(
+        i["string_form"],
+        "<class 'IPython.core.tests.test_oinspect.Call'( at 0x[0-9a-f]{1,9})?>",
+    )
     fname = __file__
     if fname.endswith(".pyc"):
         fname = fname[:-1]
     # case-insensitive comparison needed on some filesystems
     # e.g. Windows:
-    nt.assert_equal(i['file'].lower(), compress_user(fname).lower())
-    nt.assert_equal(i['definition'], None)
-    nt.assert_equal(i['docstring'], Call.__doc__)
-    nt.assert_equal(i['source'], None)
-    nt.assert_true(i['isclass'])
-    nt.assert_equal(i['init_definition'], "Call(x, y=1)")
-    nt.assert_equal(i['init_docstring'], Call.__init__.__doc__)
+    assert i["file"].lower() == compress_user(fname).lower()
+    assert i["definition"] == None
+    assert i["docstring"] == Call.__doc__
+    assert i["source"] == None
+    nt.assert_true(i["isclass"])
+    assert i["init_definition"] == "Call(x, y=1)"
+    assert i["init_docstring"] == Call.__init__.__doc__
 
     i = inspector.info(Call, detail_level=1)
-    nt.assert_not_equal(i['source'], None)
-    nt.assert_equal(i['docstring'], None)
+    nt.assert_not_equal(i["source"], None)
+    assert i["docstring"] == None
 
     c = Call(1)
     c.__doc__ = "Modified instance docstring"
     i = inspector.info(c)
-    nt.assert_equal(i['type_name'], 'Call')
-    nt.assert_equal(i['docstring'], "Modified instance docstring")
-    nt.assert_equal(i['class_docstring'], Call.__doc__)
-    nt.assert_equal(i['init_docstring'], Call.__init__.__doc__)
-    nt.assert_equal(i['call_docstring'], Call.__call__.__doc__)
+    assert i["type_name"] == "Call"
+    assert i["docstring"] == "Modified instance docstring"
+    assert i["class_docstring"] == Call.__doc__
+    assert i["init_docstring"] == Call.__init__.__doc__
+    assert i["call_docstring"] == Call.__call__.__doc__
+
 
 def test_class_signature():
-    info = inspector.info(HasSignature, 'HasSignature')
-    nt.assert_equal(info['init_definition'], "HasSignature(test)")
-    nt.assert_equal(info['init_docstring'], HasSignature.__init__.__doc__)
+    info = inspector.info(HasSignature, "HasSignature")
+    assert info["init_definition"] == "HasSignature(test)"
+    assert info["init_docstring"] == HasSignature.__init__.__doc__
+
 
 def test_info_awkward():
     # Just test that this doesn't throw an error.
@@ -231,8 +236,9 @@ def f_kwarg(pos, *, kwonly):
     pass
 
 def test_definition_kwonlyargs():
-    i = inspector.info(f_kwarg, oname='f_kwarg')  # analysis:ignore
-    nt.assert_equal(i['definition'], "f_kwarg(pos, *, kwonly)")
+    i = inspector.info(f_kwarg, oname="f_kwarg")  # analysis:ignore
+    assert i["definition"] == "f_kwarg(pos, *, kwonly)"
+
 
 def test_getdoc():
     class A(object):
@@ -253,9 +259,9 @@ def getdoc(self):
     b = B()
     c = C()
     
-    nt.assert_equal(oinspect.getdoc(a), "standard docstring")
-    nt.assert_equal(oinspect.getdoc(b), "custom docstring")
-    nt.assert_equal(oinspect.getdoc(c), "standard docstring")
+    assert oinspect.getdoc(a) == "standard docstring"
+    assert oinspect.getdoc(b) == "custom docstring"
+    assert oinspect.getdoc(c) == "standard docstring"
 
 
 def test_empty_property_has_no_source():
@@ -299,15 +305,17 @@ def foobar(self):
             """This is `foobar` property."""
             pass
 
-    ip.user_ns['a_obj'] = A()
-    nt.assert_equal(
-        'This is `foobar` property.',
-        ip.object_inspect('a_obj.foobar', detail_level=0)['docstring'])
+    ip.user_ns["a_obj"] = A()
+    assert (
+        "This is `foobar` property."
+        == ip.object_inspect("a_obj.foobar", detail_level=0)["docstring"]
+    )
 
-    ip.user_ns['a_cls'] = A
-    nt.assert_equal(
-        'This is `foobar` property.',
-        ip.object_inspect('a_cls.foobar', detail_level=0)['docstring'])
+    ip.user_ns["a_cls"] = A
+    assert (
+        "This is `foobar` property."
+        == ip.object_inspect("a_cls.foobar", detail_level=0)["docstring"]
+    )
 
 
 def test_pdef():
@@ -404,7 +412,7 @@ def short_fun(a=1): pass
         signature(short_fun),
         short_fun.__name__,
     )
-    nt.assert_equal(sig, 'short_fun(a=1)')
+    assert sig == "short_fun(a=1)"
 
 
 def test_render_signature_long():

From 764461856ce1f88d9e4cb6188a0bdaefaec84933 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 18 Aug 2021 15:08:28 -0700
Subject: [PATCH 0646/1407] remove nose from test_security

---
 IPython/lib/tests/test_security.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/IPython/lib/tests/test_security.py b/IPython/lib/tests/test_security.py
index 7d89ba13281..27c32ab7328 100644
--- a/IPython/lib/tests/test_security.py
+++ b/IPython/lib/tests/test_security.py
@@ -1,26 +1,27 @@
 # coding: utf-8
 from IPython.lib import passwd
 from IPython.lib.security import passwd_check, salt_len
-import nose.tools as nt
 
 def test_passwd_structure():
-    p = passwd('passphrase')
-    algorithm, salt, hashed = p.split(':')
-    nt.assert_equal(algorithm, 'sha1')
-    nt.assert_equal(len(salt), salt_len)
-    nt.assert_equal(len(hashed), 40)
+    p = passwd("passphrase")
+    algorithm, salt, hashed = p.split(":")
+    assert algorithm == "sha1"
+    assert len(salt) == salt_len
+    assert len(hashed) == 40
 
 def test_roundtrip():
-    p = passwd('passphrase')
-    nt.assert_equal(passwd_check(p, 'passphrase'), True)
+    p = passwd("passphrase")
+    assert passwd_check(p, "passphrase") is True
+
 
 def test_bad():
     p = passwd('passphrase')
-    nt.assert_equal(passwd_check(p, p), False)
-    nt.assert_equal(passwd_check(p, 'a:b:c:d'), False)
-    nt.assert_equal(passwd_check(p, 'a:b'), False)
+    assert passwd_check(p, p) is False
+    assert passwd_check(p, "a:b:c:d") is False
+    assert passwd_check(p, "a:b") is False
+
 
 def test_passwd_check_unicode():
     # GH issue #4524
     phash = u'sha1:23862bc21dd3:7a415a95ae4580582e314072143d9c382c491e4f'
-    assert passwd_check(phash, u"łe¶ŧ←↓→")
\ No newline at end of file
+    assert passwd_check(phash, u"łe¶ŧ←↓→")

From 72a79cb130ce9d194842f1ff75c83adddb9562b1 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Thu, 19 Aug 2021 20:07:23 -0400
Subject: [PATCH 0647/1407] Add input hooks for GTK4.

---
 IPython/core/magics/basic.py               |  1 +
 IPython/core/magics/pylab.py               |  2 +-
 IPython/core/pylabtools.py                 |  2 ++
 IPython/lib/inputhookgtk4.py               | 42 ++++++++++++++++++++++
 IPython/terminal/pt_inputhooks/__init__.py |  1 +
 IPython/terminal/pt_inputhooks/gtk4.py     | 25 +++++++++++++
 docs/source/config/eventloops.rst          |  6 ++--
 docs/source/interactive/reference.rst      |  5 +--
 examples/IPython Kernel/Index.ipynb        |  2 ++
 examples/IPython Kernel/Rich Output.ipynb  |  2 ++
 examples/IPython Kernel/gui/gui-gtk4.py    | 36 +++++++++++++++++++
 11 files changed, 118 insertions(+), 6 deletions(-)
 create mode 100644 IPython/lib/inputhookgtk4.py
 create mode 100644 IPython/terminal/pt_inputhooks/gtk4.py
 create mode 100644 examples/IPython Kernel/gui/gui-gtk4.py

diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py
index a8feb755386..72cfc804143 100644
--- a/IPython/core/magics/basic.py
+++ b/IPython/core/magics/basic.py
@@ -493,6 +493,7 @@ def gui(self, parameter_s=''):
             %gui qt5     # enable PyQt5 event loop integration
             %gui gtk     # enable PyGTK event loop integration
             %gui gtk3    # enable Gtk3 event loop integration
+            %gui gtk4    # enable Gtk4 event loop integration
             %gui tk      # enable Tk event loop integration
             %gui osx     # enable Cocoa event loop integration
                          # (requires %matplotlib 1.1)
diff --git a/IPython/core/magics/pylab.py b/IPython/core/magics/pylab.py
index 9a46442349b..0f3fff62faf 100644
--- a/IPython/core/magics/pylab.py
+++ b/IPython/core/magics/pylab.py
@@ -88,7 +88,7 @@ def matplotlib(self, line=''):
         You can list the available backends using the -l/--list option::
 
            In [4]: %matplotlib --list
-           Available matplotlib backends: ['osx', 'qt4', 'qt5', 'gtk3', 'notebook', 'wx', 'qt', 'nbagg',
+           Available matplotlib backends: ['osx', 'qt4', 'qt5', 'gtk3', 'gtk4', 'notebook', 'wx', 'qt', 'nbagg',
            'gtk', 'tk', 'inline']
         """
         args = magic_arguments.parse_argstring(self.matplotlib, line)
diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index 2c0d25b2805..d114f695d03 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -16,6 +16,7 @@
     "tk": "TkAgg",
     "gtk": "GTKAgg",
     "gtk3": "GTK3Agg",
+    "gtk4": "GTK4Agg",
     "wx": "WXAgg",
     "qt4": "Qt4Agg",
     "qt5": "Qt5Agg",
@@ -44,6 +45,7 @@
 # map to the same GUI support
 backend2gui['GTK'] = backend2gui['GTKCairo'] = 'gtk'
 backend2gui['GTK3Cairo'] = 'gtk3'
+backend2gui['GTK4Cairo'] = 'gtk4'
 backend2gui['WX'] = 'wx'
 backend2gui['CocoaAgg'] = 'osx'
 # And some backends that don't need GUI integration
diff --git a/IPython/lib/inputhookgtk4.py b/IPython/lib/inputhookgtk4.py
new file mode 100644
index 00000000000..3b2ccf19dc6
--- /dev/null
+++ b/IPython/lib/inputhookgtk4.py
@@ -0,0 +1,42 @@
+"""
+Enable Gtk4 to be used interactively by IPython.
+"""
+#-----------------------------------------------------------------------------
+# Copyright (c) 2021, the IPython Development Team.
+#
+# Distributed under the terms of the Modified BSD License.
+#
+# The full license is in the file COPYING.txt, distributed with this software.
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Imports
+#-----------------------------------------------------------------------------
+
+import sys
+
+from gi.repository import GLib
+
+#-----------------------------------------------------------------------------
+# Code
+#-----------------------------------------------------------------------------
+
+class _InputHook:
+    def __init__(self, context):
+        self._quit = False
+        GLib.io_add_watch(sys.stdin, GLib.PRIORITY_DEFAULT, GLib.IO_IN, self.quit)
+
+    def quit(self, *args, **kwargs):
+        self._quit = True
+        return False
+
+    def run(self):
+        context = GLib.MainContext.default()
+        while not self._quit:
+            context.iteration(True)
+
+
+def inputhook_gtk4():
+    hook = _InputHook()
+    hook.run()
+    return 0
diff --git a/IPython/terminal/pt_inputhooks/__init__.py b/IPython/terminal/pt_inputhooks/__init__.py
index 8917baf97cf..69ff0ba1e6a 100644
--- a/IPython/terminal/pt_inputhooks/__init__.py
+++ b/IPython/terminal/pt_inputhooks/__init__.py
@@ -14,6 +14,7 @@
     "gtk",
     "gtk2",
     "gtk3",
+    "gtk4",
     "tk",
     "wx",
     "pyglet",
diff --git a/IPython/terminal/pt_inputhooks/gtk4.py b/IPython/terminal/pt_inputhooks/gtk4.py
new file mode 100644
index 00000000000..5ba7c4c0da8
--- /dev/null
+++ b/IPython/terminal/pt_inputhooks/gtk4.py
@@ -0,0 +1,25 @@
+"""
+prompt_toolkit input hook for GTK 4.
+"""
+
+from gi.repository import GLib
+
+
+class _InputHook:
+    def __init__(self, context):
+        self._quit = False
+        GLib.io_add_watch(context.fileno(), GLib.PRIORITY_DEFAULT, GLib.IO_IN, self.quit)
+
+    def quit(self, *args, **kwargs):
+        self._quit = True
+        return False
+
+    def run(self):
+        context = GLib.MainContext.default()
+        while not self._quit:
+            context.iteration(True)
+
+
+def inputhook(context):
+    hook = _InputHook(context)
+    hook.run()
diff --git a/docs/source/config/eventloops.rst b/docs/source/config/eventloops.rst
index 04bdd9f511e..dd527a61ec2 100644
--- a/docs/source/config/eventloops.rst
+++ b/docs/source/config/eventloops.rst
@@ -7,9 +7,9 @@ loop, so you can use both a GUI and an interactive prompt together. IPython
 supports a number of common GUI toolkits, but from IPython 3.0, it is possible
 to integrate other event loops without modifying IPython itself.
 
-Supported event loops include ``qt4``, ``qt5``, ``gtk2``, ``gtk3``, ``wx``,
-``osx`` and ``tk``. Make sure the event loop you specify matches the GUI
-toolkit used by your own code.
+Supported event loops include ``qt4``, ``qt5``, ``gtk2``, ``gtk3``, ``gtk4``,
+``wx``, ``osx`` and ``tk``. Make sure the event loop you specify matches the
+GUI toolkit used by your own code.
 
 To make IPython GUI event loop integration occur automatically at every
 startup, set the ``c.InteractiveShellApp.gui`` configuration key in your
diff --git a/docs/source/interactive/reference.rst b/docs/source/interactive/reference.rst
index 05c8a458ce3..8eed5348fd3 100644
--- a/docs/source/interactive/reference.rst
+++ b/docs/source/interactive/reference.rst
@@ -44,7 +44,7 @@ the command-line by passing the full class name and a corresponding value; type
     <...snip...>
     --matplotlib=<CaselessStrEnum> (InteractiveShellApp.matplotlib)
         Default: None
-        Choices: ['auto', 'gtk', 'gtk3', 'inline', 'nbagg', 'notebook', 'osx', 'qt', 'qt4', 'qt5', 'tk', 'wx']
+        Choices: ['auto', 'gtk', 'gtk3', 'gtk4', 'inline', 'nbagg', 'notebook', 'osx', 'qt', 'qt4', 'qt5', 'tk', 'wx']
         Configure matplotlib for interactive use with the default matplotlib
         backend.
     <...snip...>
@@ -902,7 +902,8 @@ For users, enabling GUI event loop integration is simple.  You simple use the
     %gui [GUINAME]
 
 With no arguments, ``%gui`` removes all GUI support.  Valid ``GUINAME``
-arguments include ``wx``, ``qt``, ``qt5``, ``gtk``, ``gtk3`` and ``tk``.
+arguments include ``wx``, ``qt``, ``qt5``, ``gtk``, ``gtk3`` ``gtk4``, and
+``tk``.
 
 Thus, to use wxPython interactively and create a running :class:`wx.App`
 object, do::
diff --git a/examples/IPython Kernel/Index.ipynb b/examples/IPython Kernel/Index.ipynb
index c494bd5fb77..6da3e93d202 100644
--- a/examples/IPython Kernel/Index.ipynb	
+++ b/examples/IPython Kernel/Index.ipynb	
@@ -150,6 +150,7 @@
        "&nbsp;&nbsp;<a href='gui/gui-glut.py' target='_blank'>gui-glut.py</a><br>\n",
        "&nbsp;&nbsp;<a href='gui/gui-gtk.py' target='_blank'>gui-gtk.py</a><br>\n",
        "&nbsp;&nbsp;<a href='gui/gui-gtk3.py' target='_blank'>gui-gtk3.py</a><br>\n",
+       "&nbsp;&nbsp;<a href='gui/gui-gtk4.py' target='_blank'>gui-gtk4.py</a><br>\n",
        "&nbsp;&nbsp;<a href='gui/gui-pyglet.py' target='_blank'>gui-pyglet.py</a><br>\n",
        "&nbsp;&nbsp;<a href='gui/gui-qt.py' target='_blank'>gui-qt.py</a><br>\n",
        "&nbsp;&nbsp;<a href='gui/gui-tk.py' target='_blank'>gui-tk.py</a><br>\n",
@@ -160,6 +161,7 @@
        "  gui-glut.py\n",
        "  gui-gtk.py\n",
        "  gui-gtk3.py\n",
+       "  gui-gtk4.py\n",
        "  gui-pyglet.py\n",
        "  gui-qt.py\n",
        "  gui-tk.py\n",
diff --git a/examples/IPython Kernel/Rich Output.ipynb b/examples/IPython Kernel/Rich Output.ipynb
index 28c052090a8..d294daf2826 100644
--- a/examples/IPython Kernel/Rich Output.ipynb	
+++ b/examples/IPython Kernel/Rich Output.ipynb	
@@ -3180,6 +3180,7 @@
        "&nbsp;&nbsp;<a href='./gui/gui-glut.py' target='_blank'>gui-glut.py</a><br>\n",
        "&nbsp;&nbsp;<a href='./gui/gui-gtk.py' target='_blank'>gui-gtk.py</a><br>\n",
        "&nbsp;&nbsp;<a href='./gui/gui-gtk3.py' target='_blank'>gui-gtk3.py</a><br>\n",
+       "&nbsp;&nbsp;<a href='./gui/gui-gtk4.py' target='_blank'>gui-gtk4.py</a><br>\n",
        "&nbsp;&nbsp;<a href='./gui/gui-pyglet.py' target='_blank'>gui-pyglet.py</a><br>\n",
        "&nbsp;&nbsp;<a href='./gui/gui-qt.py' target='_blank'>gui-qt.py</a><br>\n",
        "&nbsp;&nbsp;<a href='./gui/gui-tk.py' target='_blank'>gui-tk.py</a><br>\n",
@@ -3230,6 +3231,7 @@
        "  gui-glut.py\n",
        "  gui-gtk.py\n",
        "  gui-gtk3.py\n",
+       "  gui-gtk4.py\n",
        "  gui-pyglet.py\n",
        "  gui-qt.py\n",
        "  gui-tk.py\n",
diff --git a/examples/IPython Kernel/gui/gui-gtk4.py b/examples/IPython Kernel/gui/gui-gtk4.py
new file mode 100644
index 00000000000..6be7582badb
--- /dev/null
+++ b/examples/IPython Kernel/gui/gui-gtk4.py	
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+"""Simple Gtk example to manually test event loop integration.
+
+This is meant to run tests manually in ipython as:
+
+In [1]: %gui gtk4
+
+In [2]: %run gui-gtk4.py
+"""
+
+import gi
+gi.require_version('Gtk', '4.0')
+from gi.repository import Gtk, GLib  # noqa
+
+
+def hello_world(wigdet, data=None):
+    print("Hello World")
+
+
+def close_request_cb(widget, data=None):
+    global running
+    running = False
+
+
+running = True
+window = Gtk.Window()
+window.connect("close-request", close_request_cb)
+button = Gtk.Button(label="Hello World")
+button.connect("clicked", hello_world, None)
+
+window.set_child(button)
+window.show()
+
+context = GLib.MainContext.default()
+while running:
+    context.iteration(True)

From 0bd8ce0083bd82e3f4c4569804a3a68aeb77ee3f Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Fri, 20 Aug 2021 23:38:49 +0200
Subject: [PATCH 0648/1407] Lint

---
 IPython/core/magics/packaging.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index 3b846987f96..e20eb0ce475 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -69,7 +69,7 @@ def pip(self, line):
         python = sys.executable
         if " " in python:
             if sys.platform == "win32":
-                python = "\"" + python + "\""
+                python = '"' + python + '"'
             else:
                 python = shlex.quote(python)
 

From 63a33d66aa37920e00603147eb8b92deadcefe9e Mon Sep 17 00:00:00 2001
From: Blazej Michalik <6691643+MrMino@users.noreply.github.com>
Date: Fri, 20 Aug 2021 23:56:10 +0200
Subject: [PATCH 0649/1407] Remove branching over whitespace in executable path

---
 IPython/core/magics/packaging.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index e20eb0ce475..60fe1ac0762 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -67,11 +67,10 @@ def pip(self, line):
           %pip install [pkgs]
         """
         python = sys.executable
-        if " " in python:
-            if sys.platform == "win32":
-                python = '"' + python + '"'
-            else:
-                python = shlex.quote(python)
+        if sys.platform == "win32":
+            python = '"' + python + '"'
+        else:
+            python = shlex.quote(python)
 
         self.shell.system(" ".join([python, "-m", "pip", line]))
 

From 68ec67e6c87a3e8aeecdd770bdf766e18c91e915 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 25 Aug 2021 08:34:21 -0700
Subject: [PATCH 0650/1407] Update IPython/core/tests/test_formatters.py

Co-authored-by: Blazej Michalik <6691643+MrMino@users.noreply.github.com>
---
 IPython/core/tests/test_formatters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_formatters.py b/IPython/core/tests/test_formatters.py
index efd6bf86e5a..15ce8df29d1 100644
--- a/IPython/core/tests/test_formatters.py
+++ b/IPython/core/tests/test_formatters.py
@@ -352,7 +352,7 @@ def __getattr__(self, key):
     with capture_output() as captured:
         result = f(call_hat)
 
-    assert result == None
+    assert result is None
 
     class BadReprArgs(object):
         def _repr_html_(self, extra, args):

From c54a223b1c746de69a79044e58c8eda2bd6b7b62 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 27 Aug 2021 11:34:18 -0700
Subject: [PATCH 0651/1407] reformat

---
 IPython/core/pylabtools.py              | 10 +++++-----
 IPython/lib/inputhookgtk4.py            | 13 +++++++------
 IPython/terminal/pt_inputhooks/gtk4.py  |  4 +++-
 examples/IPython Kernel/gui/gui-gtk4.py |  3 ++-
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index d114f695d03..35f79249f7d 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -43,11 +43,11 @@
 backend2gui['Qt4Agg'] = 'qt'
 # In the reverse mapping, there are a few extra valid matplotlib backends that
 # map to the same GUI support
-backend2gui['GTK'] = backend2gui['GTKCairo'] = 'gtk'
-backend2gui['GTK3Cairo'] = 'gtk3'
-backend2gui['GTK4Cairo'] = 'gtk4'
-backend2gui['WX'] = 'wx'
-backend2gui['CocoaAgg'] = 'osx'
+backend2gui["GTK"] = backend2gui["GTKCairo"] = "gtk"
+backend2gui["GTK3Cairo"] = "gtk3"
+backend2gui["GTK4Cairo"] = "gtk4"
+backend2gui["WX"] = "wx"
+backend2gui["CocoaAgg"] = "osx"
 # And some backends that don't need GUI integration
 del backend2gui["nbAgg"]
 del backend2gui["agg"]
diff --git a/IPython/lib/inputhookgtk4.py b/IPython/lib/inputhookgtk4.py
index 3b2ccf19dc6..a872cee36a0 100644
--- a/IPython/lib/inputhookgtk4.py
+++ b/IPython/lib/inputhookgtk4.py
@@ -1,25 +1,26 @@
 """
 Enable Gtk4 to be used interactively by IPython.
 """
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 # Copyright (c) 2021, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 # Imports
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
 import sys
 
 from gi.repository import GLib
 
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 # Code
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
+
 
 class _InputHook:
     def __init__(self, context):
diff --git a/IPython/terminal/pt_inputhooks/gtk4.py b/IPython/terminal/pt_inputhooks/gtk4.py
index 5ba7c4c0da8..009fbf12126 100644
--- a/IPython/terminal/pt_inputhooks/gtk4.py
+++ b/IPython/terminal/pt_inputhooks/gtk4.py
@@ -8,7 +8,9 @@
 class _InputHook:
     def __init__(self, context):
         self._quit = False
-        GLib.io_add_watch(context.fileno(), GLib.PRIORITY_DEFAULT, GLib.IO_IN, self.quit)
+        GLib.io_add_watch(
+            context.fileno(), GLib.PRIORITY_DEFAULT, GLib.IO_IN, self.quit
+        )
 
     def quit(self, *args, **kwargs):
         self._quit = True
diff --git a/examples/IPython Kernel/gui/gui-gtk4.py b/examples/IPython Kernel/gui/gui-gtk4.py
index 6be7582badb..bb8c56bf115 100644
--- a/examples/IPython Kernel/gui/gui-gtk4.py	
+++ b/examples/IPython Kernel/gui/gui-gtk4.py	
@@ -9,7 +9,8 @@
 """
 
 import gi
-gi.require_version('Gtk', '4.0')
+
+gi.require_version("Gtk", "4.0")
 from gi.repository import Gtk, GLib  # noqa
 
 

From 1b5553f69af9c9a58ed0e0ac2eadaaefdde184f5 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 27 Aug 2021 14:18:24 -0700
Subject: [PATCH 0652/1407] 7.27 what's new.

---
 docs/source/whatsnew/version7.rst | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 2f5543444d4..7dd68592232 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,27 @@
  7.x Series
 ============
 
+.. _version 7.27:
+
+IPython 7.27
+============
+
+IPython 7.27 is a minor release that fixes a couple of issues and compatibility.
+
+- Add support for GTK4 :ghpull:`131011`
+- Add support for Qt6 :ghpull:`13085`
+- Fix an issue with pip magic on windows :ghpull:`13093`
+
+Thanks
+------
+
+Many thanks to all the contributors to this release. You can find all individual
+contributions to this milestone `on github
+<https://github.com/ipython/ipython/milestone/90>`__.
+
+Thanks as well to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries.
+
 .. _version 7.26:
 
 IPython 7.26

From 63c4effb16bdc1b154eb02222b8e172f8e83ee52 Mon Sep 17 00:00:00 2001
From: Artur Svistunov <madbirddiary@gmail.com>
Date: Sun, 29 Aug 2021 19:37:31 +0300
Subject: [PATCH 0653/1407] User `EditingMode` instance instead of upper-cased
 name of a mode

---
 IPython/terminal/interactiveshell.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 1792523eb54..df170ebc63d 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -201,10 +201,12 @@ def _validate_editing_mode(self, proposal):
 
         return self.editing_mode
 
-    @observe("editing_mode")
+
+    @observe('editing_mode')
     def _editing_mode_changed(self, change):
+        u_mode = change.new.upper()
         if self.pt_app:
-            self.init_prompt_toolkit_cli()
+            self.pt_app.editing_mode = getattr(EditingMode, u_mode)
 
     @observe('autoformatter')
     def _autoformatter_changed(self, change):

From 853f202ee240ee194379746ac040f1fcc2e4dafd Mon Sep 17 00:00:00 2001
From: Artur Svistunov <madbirddiary@gmail.com>
Date: Sun, 29 Aug 2021 19:44:03 +0300
Subject: [PATCH 0654/1407] Revert method name to minimize possible impact of
 the fix

---
 IPython/terminal/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index df170ebc63d..9e6a0209ad4 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -203,7 +203,7 @@ def _validate_editing_mode(self, proposal):
 
 
     @observe('editing_mode')
-    def _editing_mode_changed(self, change):
+    def _editing_mode(self, change):
         u_mode = change.new.upper()
         if self.pt_app:
             self.pt_app.editing_mode = getattr(EditingMode, u_mode)

From 6e77325722869fb25e0453bb364d1f014f320111 Mon Sep 17 00:00:00 2001
From: Artur Svistunov <madbirddiary@gmail.com>
Date: Sun, 29 Aug 2021 19:46:16 +0300
Subject: [PATCH 0655/1407] Simplify a bit, remove preliminary computation of
 mode

---
 IPython/terminal/interactiveshell.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 9e6a0209ad4..27144124074 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -204,9 +204,8 @@ def _validate_editing_mode(self, proposal):
 
     @observe('editing_mode')
     def _editing_mode(self, change):
-        u_mode = change.new.upper()
         if self.pt_app:
-            self.pt_app.editing_mode = getattr(EditingMode, u_mode)
+            self.pt_app.editing_mode = getattr(EditingMode, change.new.upper())
 
     @observe('autoformatter')
     def _autoformatter_changed(self, change):

From 8ab56c7c0af853d4ed24d8429c3f8cdeacf8ae50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20K=C5=82oczko?= <kloczek@github.com>
Date: Tue, 31 Aug 2021 18:07:30 +0100
Subject: [PATCH 0656/1407] nose2pytest migration batch 1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Most of the changes done by sed -i s/nt.assert/assert/ -> use
nose2pytest script from `nose2pytest` module from
https://github.com/schollii/nose2pytest/
At the end some manual changes (mostly about proper pytest module
import).

Signed-off-by: Tomasz Kłoczko <kloczek@github.com>
---
 IPython/core/tests/test_alias.py              | 16 ++---
 IPython/core/tests/test_compilerop.py         | 12 ++--
 .../core/tests/test_inputtransformer2_line.py | 21 ++++---
 IPython/core/tests/test_iplib.py              | 10 ++--
 IPython/core/tests/test_logger.py             |  4 +-
 IPython/core/tests/test_magic_arguments.py    | 58 +++++++++----------
 IPython/core/tests/test_prefilter.py          | 20 +++----
 7 files changed, 70 insertions(+), 71 deletions(-)

diff --git a/IPython/core/tests/test_alias.py b/IPython/core/tests/test_alias.py
index d99079661a4..6ec8278d16f 100644
--- a/IPython/core/tests/test_alias.py
+++ b/IPython/core/tests/test_alias.py
@@ -1,6 +1,6 @@
 from IPython.utils.capture import capture_output
 
-import nose.tools as nt
+import pytest
 
 def test_alias_lifecycle():
     name = 'test_alias1'
@@ -9,8 +9,8 @@ def test_alias_lifecycle():
     am.clear_aliases()
     am.define_alias(name, cmd)
     assert am.is_alias(name)
-    nt.assert_equal(am.retrieve_alias(name), cmd)
-    nt.assert_in((name, cmd), am.aliases)
+    assert am.retrieve_alias(name) == cmd
+    assert (name, cmd) in am.aliases
     
     # Test running the alias
     orig_system = _ip.system
@@ -19,16 +19,16 @@ def test_alias_lifecycle():
     try:
         _ip.run_cell('%{}'.format(name))
         result = [c.strip() for c in result]
-        nt.assert_equal(result, [cmd])
+        assert result == [cmd]
     finally:
         _ip.system = orig_system
     
     # Test removing the alias
     am.undefine_alias(name)
     assert not am.is_alias(name)
-    with nt.assert_raises(ValueError):
+    with pytest.raises(ValueError):
         am.retrieve_alias(name)
-    nt.assert_not_in((name, cmd), am.aliases)
+    assert (name, cmd) not in am.aliases
     
 
 def test_alias_args_error():
@@ -38,7 +38,7 @@ def test_alias_args_error():
     with capture_output() as cap:
         _ip.run_cell('parts 1')
 
-    nt.assert_equal(cap.stderr.split(':')[0], 'UsageError')
+    assert cap.stderr.split(':')[0] == 'UsageError'
 
 def test_alias_args_commented():
     """Check that alias correctly ignores 'commented out' args"""
@@ -62,4 +62,4 @@ def test_alias_args_commented_nargs():
     assert am.is_alias(alias_name)
     
     thealias = am.get_alias(alias_name)
-    nt.assert_equal(thealias.nargs, 1)
+    assert thealias.nargs == 1
diff --git a/IPython/core/tests/test_compilerop.py b/IPython/core/tests/test_compilerop.py
index 4b2f7153900..ba039fe9be9 100644
--- a/IPython/core/tests/test_compilerop.py
+++ b/IPython/core/tests/test_compilerop.py
@@ -18,7 +18,7 @@
 import sys
 
 # Third-party imports
-import nose.tools as nt
+import pytest
 
 # Our own imports
 from IPython.core import compilerop
@@ -30,13 +30,13 @@
 def test_code_name():
     code = 'x=1'
     name = compilerop.code_name(code)
-    nt.assert_true(name.startswith('<ipython-input-0'))
+    assert name.startswith('<ipython-input-0')
 
 
 def test_code_name2():
     code = 'x=1'
     name = compilerop.code_name(code, 9)
-    nt.assert_true(name.startswith('<ipython-input-9'))
+    assert name.startswith('<ipython-input-9')
 
 
 def test_cache():
@@ -45,18 +45,18 @@ def test_cache():
     cp = compilerop.CachingCompiler()
     ncache = len(linecache.cache)
     cp.cache('x=1')
-    nt.assert_true(len(linecache.cache) > ncache)
+    assert len(linecache.cache) > ncache
 
 def test_proper_default_encoding():
     # Check we're in a proper Python 2 environment (some imports, such
     # as GTK, can change the default encoding, which can hide bugs.)
-    nt.assert_equal(sys.getdefaultencoding(), "utf-8")
+    assert sys.getdefaultencoding() == "utf-8"
 
 def test_cache_unicode():
     cp = compilerop.CachingCompiler()
     ncache = len(linecache.cache)
     cp.cache(u"t = 'žćčšđ'")
-    nt.assert_true(len(linecache.cache) > ncache)
+    assert len(linecache.cache) > ncache
 
 def test_compiler_check_cache():
     """Test the compiler properly manages the cache.
diff --git a/IPython/core/tests/test_inputtransformer2_line.py b/IPython/core/tests/test_inputtransformer2_line.py
index 8643a46ceac..26289537e27 100644
--- a/IPython/core/tests/test_inputtransformer2_line.py
+++ b/IPython/core/tests/test_inputtransformer2_line.py
@@ -3,7 +3,7 @@
 Line-based transformers are the simpler ones; token-based transformers are
 more complex. See test_inputtransformer2 for tests for token-based transformers.
 """
-import nose.tools as nt
+import pytest
 
 from IPython.core import inputtransformer2 as ipt2
 
@@ -17,7 +17,7 @@
 
 def test_cell_magic():
     for sample, expected in [CELL_MAGIC]:
-        nt.assert_equal(ipt2.cell_magic(sample.splitlines(keepends=True)),
+        assert (ipt2.cell_magic(sample.splitlines(keepends=True)) ==
                         expected.splitlines(keepends=True))
 
 CLASSIC_PROMPT = ("""\
@@ -40,7 +40,7 @@ def test_cell_magic():
 
 def test_classic_prompt():
     for sample, expected in [CLASSIC_PROMPT, CLASSIC_PROMPT_L2]:
-        nt.assert_equal(ipt2.classic_prompt(sample.splitlines(keepends=True)),
+        assert (ipt2.classic_prompt(sample.splitlines(keepends=True)) ==
                         expected.splitlines(keepends=True))
 
 IPYTHON_PROMPT = ("""\
@@ -100,10 +100,9 @@ def test_ipython_prompt():
         IPYTHON_PROMPT_VI_INS,
         IPYTHON_PROMPT_VI_NAV,
     ]:
-        nt.assert_equal(
-            ipt2.ipython_prompt(sample.splitlines(keepends=True)),
-            expected.splitlines(keepends=True),
-        )
+        assert (
+            ipt2.ipython_prompt(sample.splitlines(keepends=True)) ==
+            expected.splitlines(keepends=True))
 
 
 INDENT_SPACES = ("""\
@@ -124,7 +123,7 @@ def test_ipython_prompt():
 
 def test_leading_indent():
     for sample, expected in [INDENT_SPACES, INDENT_TABS]:
-        nt.assert_equal(ipt2.leading_indent(sample.splitlines(keepends=True)),
+        assert (ipt2.leading_indent(sample.splitlines(keepends=True)) ==
                         expected.splitlines(keepends=True))
 
 LEADING_EMPTY_LINES = ("""\
@@ -151,8 +150,8 @@ def test_leading_indent():
 
 def test_leading_empty_lines():
     for sample, expected in [LEADING_EMPTY_LINES, ONLY_EMPTY_LINES]:
-        nt.assert_equal(
-                ipt2.leading_empty_lines(sample.splitlines(keepends=True)),
+        assert (
+                ipt2.leading_empty_lines(sample.splitlines(keepends=True)) ==
                 expected.splitlines(keepends=True))
 
 CRLF_MAGIC = ([
@@ -163,4 +162,4 @@ def test_leading_empty_lines():
 
 def test_crlf_magic():
     for sample, expected in [CRLF_MAGIC]:
-        nt.assert_equal(ipt2.cell_magic(sample), expected)
+        assert ipt2.cell_magic(sample) == expected
diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index 7d2b98252d4..5e1fc852852 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -5,7 +5,7 @@
 #-----------------------------------------------------------------------------
 
 # third party
-import nose.tools as nt
+import pytest
 
 # our own packages
 
@@ -31,8 +31,8 @@ def test_reset():
     
     # Finally, check that all namespaces have only as many variables as we
     # expect to find in them:
-    nt.assert_equal(len(ip.user_ns), nvars_user_ns)
-    nt.assert_equal(len(ip.user_ns_hidden), nvars_hidden)
+    assert len(ip.user_ns) == nvars_user_ns
+    assert len(ip.user_ns_hidden) == nvars_hidden
 
 
 # Tests for reporting of exceptions in various modes, handling of SystemExit,
@@ -209,7 +209,7 @@ def test_run_cell():
     ip.run_cell('a = 10\na+=1')
     ip.run_cell('assert a == 11\nassert 1')
 
-    nt.assert_equal(ip.user_ns['a'], 11)
+    assert ip.user_ns['a'] == 11
     complex = textwrap.dedent("""
     if 1:
         print "hello"
@@ -233,6 +233,6 @@ def test_run_cell():
 def test_db():
     """Test the internal database used for variable persistence."""
     ip.db['__unittest_'] = 12
-    nt.assert_equal(ip.db['__unittest_'], 12)
+    assert ip.db['__unittest_'] == 12
     del ip.db['__unittest_']
     assert '__unittest_' not in ip.db
diff --git a/IPython/core/tests/test_logger.py b/IPython/core/tests/test_logger.py
index ebebac16cfe..66d7ed7b1fd 100644
--- a/IPython/core/tests/test_logger.py
+++ b/IPython/core/tests/test_logger.py
@@ -2,8 +2,8 @@
 """Test IPython.core.logger"""
 
 import os.path
+import pytest
 
-import nose.tools as nt
 from IPython.utils.tempdir import TemporaryDirectory
 
 def test_logstart_inaccessible_file():
@@ -12,7 +12,7 @@ def test_logstart_inaccessible_file():
     except IOError:
         pass
     else:
-        nt.assert_true(False)           # The try block should never pass.
+        assert False                    # The try block should never pass.
     
     try:
         _ip.run_cell("a=1")                 # Check it doesn't try to log this
diff --git a/IPython/core/tests/test_magic_arguments.py b/IPython/core/tests/test_magic_arguments.py
index 5dea32dd8ec..66989cd30e0 100644
--- a/IPython/core/tests/test_magic_arguments.py
+++ b/IPython/core/tests/test_magic_arguments.py
@@ -7,7 +7,7 @@
 #-----------------------------------------------------------------------------
 
 import argparse
-from nose.tools import assert_equal
+import pytest
 
 from IPython.core.magic_arguments import (argument, argument_group, kwds,
     magic_arguments, parse_argstring, real_name)
@@ -74,45 +74,45 @@ def foo(self, args):
 
 
 def test_magic_arguments():
-    assert_equal(magic_foo1.__doc__, '::\n\n  %foo1 [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n')
-    assert_equal(getattr(magic_foo1, 'argcmd_name', None), None)
-    assert_equal(real_name(magic_foo1), 'foo1')
-    assert_equal(magic_foo1(None, ''), argparse.Namespace(foo=None))
+    assert magic_foo1.__doc__ == '::\n\n  %foo1 [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n'
+    assert getattr(magic_foo1, 'argcmd_name', None) == None
+    assert real_name(magic_foo1) == 'foo1'
+    assert magic_foo1(None, '') == argparse.Namespace(foo=None)
     assert hasattr(magic_foo1, 'has_arguments')
 
-    assert_equal(magic_foo2.__doc__, '::\n\n  %foo2\n\n A docstring.\n')
-    assert_equal(getattr(magic_foo2, 'argcmd_name', None), None)
-    assert_equal(real_name(magic_foo2), 'foo2')
-    assert_equal(magic_foo2(None, ''), argparse.Namespace())
+    assert magic_foo2.__doc__ == '::\n\n  %foo2\n\n A docstring.\n'
+    assert getattr(magic_foo2, 'argcmd_name', None) == None
+    assert real_name(magic_foo2) == 'foo2'
+    assert magic_foo2(None, '') == argparse.Namespace()
     assert hasattr(magic_foo2, 'has_arguments')
 
-    assert_equal(magic_foo3.__doc__, '::\n\n  %foo3 [-f FOO] [-b BAR] [-z BAZ]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n\nGroup:\n  -b BAR, --bar BAR  a grouped argument\n\nSecond Group:\n  -z BAZ, --baz BAZ  another grouped argument\n')
-    assert_equal(getattr(magic_foo3, 'argcmd_name', None), None)
-    assert_equal(real_name(magic_foo3), 'foo3')
-    assert_equal(magic_foo3(None, ''),
+    assert magic_foo3.__doc__ == '::\n\n  %foo3 [-f FOO] [-b BAR] [-z BAZ]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n\nGroup:\n  -b BAR, --bar BAR  a grouped argument\n\nSecond Group:\n  -z BAZ, --baz BAZ  another grouped argument\n'
+    assert getattr(magic_foo3, 'argcmd_name', None) == None
+    assert real_name(magic_foo3) == 'foo3'
+    assert (magic_foo3(None, '') ==
                        argparse.Namespace(bar=None, baz=None, foo=None))
     assert hasattr(magic_foo3, 'has_arguments')
 
-    assert_equal(magic_foo4.__doc__, '::\n\n  %foo4 [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n')
-    assert_equal(getattr(magic_foo4, 'argcmd_name', None), None)
-    assert_equal(real_name(magic_foo4), 'foo4')
-    assert_equal(magic_foo4(None, ''), argparse.Namespace())
+    assert magic_foo4.__doc__ == '::\n\n  %foo4 [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n'
+    assert getattr(magic_foo4, 'argcmd_name', None) == None
+    assert real_name(magic_foo4) == 'foo4'
+    assert magic_foo4(None, '') == argparse.Namespace()
     assert hasattr(magic_foo4, 'has_arguments')
 
-    assert_equal(magic_foo5.__doc__, '::\n\n  %frobnicate [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n')
-    assert_equal(getattr(magic_foo5, 'argcmd_name', None), 'frobnicate')
-    assert_equal(real_name(magic_foo5), 'frobnicate')
-    assert_equal(magic_foo5(None, ''), argparse.Namespace(foo=None))
+    assert magic_foo5.__doc__ == '::\n\n  %frobnicate [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n'
+    assert getattr(magic_foo5, 'argcmd_name', None) == 'frobnicate'
+    assert real_name(magic_foo5) == 'frobnicate'
+    assert magic_foo5(None, '') == argparse.Namespace(foo=None)
     assert hasattr(magic_foo5, 'has_arguments')
 
-    assert_equal(magic_magic_foo.__doc__, '::\n\n  %magic_foo [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n')
-    assert_equal(getattr(magic_magic_foo, 'argcmd_name', None), None)
-    assert_equal(real_name(magic_magic_foo), 'magic_foo')
-    assert_equal(magic_magic_foo(None, ''), argparse.Namespace(foo=None))
+    assert magic_magic_foo.__doc__ == '::\n\n  %magic_foo [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n'
+    assert getattr(magic_magic_foo, 'argcmd_name', None) == None
+    assert real_name(magic_magic_foo) == 'magic_foo'
+    assert magic_magic_foo(None, '') == argparse.Namespace(foo=None)
     assert hasattr(magic_magic_foo, 'has_arguments')
 
-    assert_equal(foo.__doc__, '::\n\n  %foo [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n')
-    assert_equal(getattr(foo, 'argcmd_name', None), None)
-    assert_equal(real_name(foo), 'foo')
-    assert_equal(foo(None, ''), argparse.Namespace(foo=None))
+    assert foo.__doc__ == '::\n\n  %foo [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n'
+    assert getattr(foo, 'argcmd_name', None) == None
+    assert real_name(foo) == 'foo'
+    assert foo(None, '') == argparse.Namespace(foo=None)
     assert hasattr(foo, 'has_arguments')
diff --git a/IPython/core/tests/test_prefilter.py b/IPython/core/tests/test_prefilter.py
index ca447b3d0b7..7f9a0af7641 100644
--- a/IPython/core/tests/test_prefilter.py
+++ b/IPython/core/tests/test_prefilter.py
@@ -3,7 +3,7 @@
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
-import nose.tools as nt
+import pytest
 
 from IPython.core.prefilter import AutocallChecker
 
@@ -19,7 +19,7 @@ def test_prefilter():
              ]
 
     for raw, correct in pairs:
-        nt.assert_equal(ip.prefilter(raw), correct)
+        assert ip.prefilter(raw) == correct
 
 def test_prefilter_shadowed():
     def dummy_magic(line): pass
@@ -33,14 +33,14 @@ def dummy_magic(line): pass
         for name in ['if', 'zip', 'get_ipython']: # keyword, builtin, global
             ip.register_magic_function(dummy_magic, magic_name=name)
             res = ip.prefilter(name+' foo')
-            nt.assert_equal(res, name+' foo')
+            assert res == name+' foo'
             del ip.magics_manager.magics['line'][name]
 
         # These should be transformed
         for name in ['fi', 'piz', 'nohtypi_teg']:
             ip.register_magic_function(dummy_magic, magic_name=name)
             res = ip.prefilter(name+' foo')
-            nt.assert_not_equal(res, name+' foo')
+            assert res != name+' foo'
             del ip.magics_manager.magics['line'][name]
 
     finally:
@@ -52,9 +52,9 @@ def test_autocall_binops():
     f = lambda x: x
     ip.user_ns['f'] = f
     try:
-        nt.assert_equal(ip.prefilter('f 1'),'f(1)')
+        assert ip.prefilter('f 1') =='f(1)'
         for t in ['f +1', 'f -1']:
-            nt.assert_equal(ip.prefilter(t), t)
+            assert ip.prefilter(t) == t
 
         # Run tests again with a more permissive exclude_regexp, which will
         # allow transformation of binary operations ('f -1' -> 'f(-1)').
@@ -66,8 +66,8 @@ def test_autocall_binops():
             ac.exclude_regexp = r'^[,&^\|\*/]|^is |^not |^in |^and |^or '
             pm.sort_checkers()
 
-            nt.assert_equal(ip.prefilter('f -1'), 'f(-1)')
-            nt.assert_equal(ip.prefilter('f +1'), 'f(+1)')
+            assert ip.prefilter('f -1') == 'f(-1)'
+            assert ip.prefilter('f +1') == 'f(+1)'
         finally:
             pm.unregister_checker(ac)
     finally:
@@ -88,7 +88,7 @@ def test_issue_114():
     try:
         for mgk in ip.magics_manager.lsmagic()['line']:
             raw = template % mgk
-            nt.assert_equal(ip.prefilter(raw), raw)
+            assert ip.prefilter(raw) == raw
     finally:
         ip.prefilter_manager.multi_line_specials = msp
 
@@ -121,7 +121,7 @@ def test_autocall_should_support_unicode():
     ip.magic('autocall 2')
     ip.user_ns['π'] = lambda x: x
     try:
-        nt.assert_equal(ip.prefilter('π 3'),'π(3)')
+        assert ip.prefilter('π 3') =='π(3)'
     finally:
         ip.magic('autocall 0')
         del ip.user_ns['π']

From 7b2546d20c8f0d272dc665b5d50bb253241ae0b3 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Tue, 31 Aug 2021 20:00:06 +0200
Subject: [PATCH 0657/1407] Darker

---
 IPython/core/tests/test_alias.py              |   3 +-
 IPython/core/tests/test_compilerop.py         |   4 +-
 .../core/tests/test_inputtransformer2_line.py |  27 ++---
 IPython/core/tests/test_iplib.py              |  75 ++++++-------
 IPython/core/tests/test_logger.py             |   4 +-
 IPython/core/tests/test_magic_arguments.py    | 101 ++++++++++--------
 IPython/core/tests/test_prefilter.py          |  22 ++--
 7 files changed, 130 insertions(+), 106 deletions(-)

diff --git a/IPython/core/tests/test_alias.py b/IPython/core/tests/test_alias.py
index 6ec8278d16f..90971deecb3 100644
--- a/IPython/core/tests/test_alias.py
+++ b/IPython/core/tests/test_alias.py
@@ -38,7 +38,8 @@ def test_alias_args_error():
     with capture_output() as cap:
         _ip.run_cell('parts 1')
 
-    assert cap.stderr.split(':')[0] == 'UsageError'
+    assert cap.stderr.split(":")[0] == "UsageError"
+
 
 def test_alias_args_commented():
     """Check that alias correctly ignores 'commented out' args"""
diff --git a/IPython/core/tests/test_compilerop.py b/IPython/core/tests/test_compilerop.py
index ba039fe9be9..aa531b81d44 100644
--- a/IPython/core/tests/test_compilerop.py
+++ b/IPython/core/tests/test_compilerop.py
@@ -30,13 +30,13 @@
 def test_code_name():
     code = 'x=1'
     name = compilerop.code_name(code)
-    assert name.startswith('<ipython-input-0')
+    assert name.startswith("<ipython-input-0")
 
 
 def test_code_name2():
     code = 'x=1'
     name = compilerop.code_name(code, 9)
-    assert name.startswith('<ipython-input-9')
+    assert name.startswith("<ipython-input-9")
 
 
 def test_cache():
diff --git a/IPython/core/tests/test_inputtransformer2_line.py b/IPython/core/tests/test_inputtransformer2_line.py
index 26289537e27..30558fd7e25 100644
--- a/IPython/core/tests/test_inputtransformer2_line.py
+++ b/IPython/core/tests/test_inputtransformer2_line.py
@@ -17,8 +17,9 @@
 
 def test_cell_magic():
     for sample, expected in [CELL_MAGIC]:
-        assert (ipt2.cell_magic(sample.splitlines(keepends=True)) ==
-                        expected.splitlines(keepends=True))
+        assert ipt2.cell_magic(sample.splitlines(keepends=True)) == expected.splitlines(
+            keepends=True
+        )
 
 CLASSIC_PROMPT = ("""\
 >>> for a in range(5):
@@ -40,8 +41,9 @@ def test_cell_magic():
 
 def test_classic_prompt():
     for sample, expected in [CLASSIC_PROMPT, CLASSIC_PROMPT_L2]:
-        assert (ipt2.classic_prompt(sample.splitlines(keepends=True)) ==
-                        expected.splitlines(keepends=True))
+        assert ipt2.classic_prompt(
+            sample.splitlines(keepends=True)
+        ) == expected.splitlines(keepends=True)
 
 IPYTHON_PROMPT = ("""\
 In [1]: for a in range(5):
@@ -100,9 +102,9 @@ def test_ipython_prompt():
         IPYTHON_PROMPT_VI_INS,
         IPYTHON_PROMPT_VI_NAV,
     ]:
-        assert (
-            ipt2.ipython_prompt(sample.splitlines(keepends=True)) ==
-            expected.splitlines(keepends=True))
+        assert ipt2.ipython_prompt(
+            sample.splitlines(keepends=True)
+        ) == expected.splitlines(keepends=True)
 
 
 INDENT_SPACES = ("""\
@@ -123,8 +125,9 @@ def test_ipython_prompt():
 
 def test_leading_indent():
     for sample, expected in [INDENT_SPACES, INDENT_TABS]:
-        assert (ipt2.leading_indent(sample.splitlines(keepends=True)) ==
-                        expected.splitlines(keepends=True))
+        assert ipt2.leading_indent(
+            sample.splitlines(keepends=True)
+        ) == expected.splitlines(keepends=True)
 
 LEADING_EMPTY_LINES = ("""\
     \t
@@ -150,9 +153,9 @@ def test_leading_indent():
 
 def test_leading_empty_lines():
     for sample, expected in [LEADING_EMPTY_LINES, ONLY_EMPTY_LINES]:
-        assert (
-                ipt2.leading_empty_lines(sample.splitlines(keepends=True)) ==
-                expected.splitlines(keepends=True))
+        assert ipt2.leading_empty_lines(
+            sample.splitlines(keepends=True)
+        ) == expected.splitlines(keepends=True)
 
 CRLF_MAGIC = ([
     "%%ls\r\n"
diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index 5e1fc852852..6804c2b2d3d 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -87,35 +87,36 @@ def doctest_tb_context():
 
 def doctest_tb_verbose():
     """
-In [5]: xmode verbose
-Exception reporting mode: Verbose
+    In [5]: xmode verbose
+    Exception reporting mode: Verbose
+
+    In [6]: run simpleerr.py
+    ---------------------------------------------------------------------------
+    ZeroDivisionError                         Traceback (most recent call last)
+    <BLANKLINE>
+    ... in <module>
+         29     except IndexError:
+         30         mode = 'div'
+    ---> 32     bar(mode)
+            mode = 'div'
+    <BLANKLINE>
+    ... in bar(mode='div')
+         14     "bar"
+         15     if mode=='div':
+    ---> 16         div0()
+         17     elif mode=='exit':
+         18         try:
+    <BLANKLINE>
+    ... in div0()
+          6     x = 1
+          7     y = 0
+    ----> 8     x/y
+            x = 1
+            y = 0
+    <BLANKLINE>
+    ZeroDivisionError: ...
+    """
 
-In [6]: run simpleerr.py
----------------------------------------------------------------------------
-ZeroDivisionError                         Traceback (most recent call last)
-<BLANKLINE>
-... in <module>
-     29     except IndexError:
-     30         mode = 'div'
----> 32     bar(mode)
-        mode = 'div'
-<BLANKLINE>
-... in bar(mode='div')
-     14     "bar"
-     15     if mode=='div':
----> 16         div0()
-     17     elif mode=='exit':
-     18         try:
-<BLANKLINE>
-... in div0()
-      6     x = 1
-      7     y = 0
-----> 8     x/y
-        x = 1
-        y = 0
-<BLANKLINE>
-ZeroDivisionError: ...
-      """
 
 # TODO : Marc 2021 – this seem to fail due
 # to upstream changes in CI for whatever reason.
@@ -206,11 +207,13 @@ def doctest_tb_verbose():
 
 def test_run_cell():
     import textwrap
-    ip.run_cell('a = 10\na+=1')
-    ip.run_cell('assert a == 11\nassert 1')
 
-    assert ip.user_ns['a'] == 11
-    complex = textwrap.dedent("""
+    ip.run_cell("a = 10\na+=1")
+    ip.run_cell("assert a == 11\nassert 1")
+
+    assert ip.user_ns["a"] == 11
+    complex = textwrap.dedent(
+        """
     if 1:
         print "hello"
         if 1:
@@ -232,7 +235,7 @@ def test_run_cell():
 
 def test_db():
     """Test the internal database used for variable persistence."""
-    ip.db['__unittest_'] = 12
-    assert ip.db['__unittest_'] == 12
-    del ip.db['__unittest_']
-    assert '__unittest_' not in ip.db
+    ip.db["__unittest_"] = 12
+    assert ip.db["__unittest_"] == 12
+    del ip.db["__unittest_"]
+    assert "__unittest_" not in ip.db
diff --git a/IPython/core/tests/test_logger.py b/IPython/core/tests/test_logger.py
index 66d7ed7b1fd..e53385f9cbf 100644
--- a/IPython/core/tests/test_logger.py
+++ b/IPython/core/tests/test_logger.py
@@ -12,8 +12,8 @@ def test_logstart_inaccessible_file():
     except IOError:
         pass
     else:
-        assert False                    # The try block should never pass.
-    
+        assert False  # The try block should never pass.
+
     try:
         _ip.run_cell("a=1")                 # Check it doesn't try to log this
     finally:
diff --git a/IPython/core/tests/test_magic_arguments.py b/IPython/core/tests/test_magic_arguments.py
index 66989cd30e0..62946dc5343 100644
--- a/IPython/core/tests/test_magic_arguments.py
+++ b/IPython/core/tests/test_magic_arguments.py
@@ -74,45 +74,62 @@ def foo(self, args):
 
 
 def test_magic_arguments():
-    assert magic_foo1.__doc__ == '::\n\n  %foo1 [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n'
-    assert getattr(magic_foo1, 'argcmd_name', None) == None
-    assert real_name(magic_foo1) == 'foo1'
-    assert magic_foo1(None, '') == argparse.Namespace(foo=None)
-    assert hasattr(magic_foo1, 'has_arguments')
-
-    assert magic_foo2.__doc__ == '::\n\n  %foo2\n\n A docstring.\n'
-    assert getattr(magic_foo2, 'argcmd_name', None) == None
-    assert real_name(magic_foo2) == 'foo2'
-    assert magic_foo2(None, '') == argparse.Namespace()
-    assert hasattr(magic_foo2, 'has_arguments')
-
-    assert magic_foo3.__doc__ == '::\n\n  %foo3 [-f FOO] [-b BAR] [-z BAZ]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n\nGroup:\n  -b BAR, --bar BAR  a grouped argument\n\nSecond Group:\n  -z BAZ, --baz BAZ  another grouped argument\n'
-    assert getattr(magic_foo3, 'argcmd_name', None) == None
-    assert real_name(magic_foo3) == 'foo3'
-    assert (magic_foo3(None, '') ==
-                       argparse.Namespace(bar=None, baz=None, foo=None))
-    assert hasattr(magic_foo3, 'has_arguments')
-
-    assert magic_foo4.__doc__ == '::\n\n  %foo4 [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n'
-    assert getattr(magic_foo4, 'argcmd_name', None) == None
-    assert real_name(magic_foo4) == 'foo4'
-    assert magic_foo4(None, '') == argparse.Namespace()
-    assert hasattr(magic_foo4, 'has_arguments')
-
-    assert magic_foo5.__doc__ == '::\n\n  %frobnicate [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n'
-    assert getattr(magic_foo5, 'argcmd_name', None) == 'frobnicate'
-    assert real_name(magic_foo5) == 'frobnicate'
-    assert magic_foo5(None, '') == argparse.Namespace(foo=None)
-    assert hasattr(magic_foo5, 'has_arguments')
-
-    assert magic_magic_foo.__doc__ == '::\n\n  %magic_foo [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n'
-    assert getattr(magic_magic_foo, 'argcmd_name', None) == None
-    assert real_name(magic_magic_foo) == 'magic_foo'
-    assert magic_magic_foo(None, '') == argparse.Namespace(foo=None)
-    assert hasattr(magic_magic_foo, 'has_arguments')
-
-    assert foo.__doc__ == '::\n\n  %foo [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n'
-    assert getattr(foo, 'argcmd_name', None) == None
-    assert real_name(foo) == 'foo'
-    assert foo(None, '') == argparse.Namespace(foo=None)
-    assert hasattr(foo, 'has_arguments')
+    assert (
+        magic_foo1.__doc__
+        == "::\n\n  %foo1 [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n"
+    )
+    assert getattr(magic_foo1, "argcmd_name", None) == None
+    assert real_name(magic_foo1) == "foo1"
+    assert magic_foo1(None, "") == argparse.Namespace(foo=None)
+    assert hasattr(magic_foo1, "has_arguments")
+
+    assert magic_foo2.__doc__ == "::\n\n  %foo2\n\n A docstring.\n"
+    assert getattr(magic_foo2, "argcmd_name", None) == None
+    assert real_name(magic_foo2) == "foo2"
+    assert magic_foo2(None, "") == argparse.Namespace()
+    assert hasattr(magic_foo2, "has_arguments")
+
+    assert (
+        magic_foo3.__doc__
+        == "::\n\n  %foo3 [-f FOO] [-b BAR] [-z BAZ]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n\nGroup:\n  -b BAR, --bar BAR  a grouped argument\n\nSecond Group:\n  -z BAZ, --baz BAZ  another grouped argument\n"
+    )
+    assert getattr(magic_foo3, "argcmd_name", None) == None
+    assert real_name(magic_foo3) == "foo3"
+    assert magic_foo3(None, "") == argparse.Namespace(bar=None, baz=None, foo=None)
+    assert hasattr(magic_foo3, "has_arguments")
+
+    assert (
+        magic_foo4.__doc__
+        == "::\n\n  %foo4 [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n"
+    )
+    assert getattr(magic_foo4, "argcmd_name", None) == None
+    assert real_name(magic_foo4) == "foo4"
+    assert magic_foo4(None, "") == argparse.Namespace()
+    assert hasattr(magic_foo4, "has_arguments")
+
+    assert (
+        magic_foo5.__doc__
+        == "::\n\n  %frobnicate [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n"
+    )
+    assert getattr(magic_foo5, "argcmd_name", None) == "frobnicate"
+    assert real_name(magic_foo5) == "frobnicate"
+    assert magic_foo5(None, "") == argparse.Namespace(foo=None)
+    assert hasattr(magic_foo5, "has_arguments")
+
+    assert (
+        magic_magic_foo.__doc__
+        == "::\n\n  %magic_foo [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n"
+    )
+    assert getattr(magic_magic_foo, "argcmd_name", None) == None
+    assert real_name(magic_magic_foo) == "magic_foo"
+    assert magic_magic_foo(None, "") == argparse.Namespace(foo=None)
+    assert hasattr(magic_magic_foo, "has_arguments")
+
+    assert (
+        foo.__doc__
+        == "::\n\n  %foo [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n"
+    )
+    assert getattr(foo, "argcmd_name", None) == None
+    assert real_name(foo) == "foo"
+    assert foo(None, "") == argparse.Namespace(foo=None)
+    assert hasattr(foo, "has_arguments")
diff --git a/IPython/core/tests/test_prefilter.py b/IPython/core/tests/test_prefilter.py
index 7f9a0af7641..91c3c868821 100644
--- a/IPython/core/tests/test_prefilter.py
+++ b/IPython/core/tests/test_prefilter.py
@@ -32,16 +32,16 @@ def dummy_magic(line): pass
         # These should not be transformed - they are shadowed by other names
         for name in ['if', 'zip', 'get_ipython']: # keyword, builtin, global
             ip.register_magic_function(dummy_magic, magic_name=name)
-            res = ip.prefilter(name+' foo')
-            assert res == name+' foo'
-            del ip.magics_manager.magics['line'][name]
+            res = ip.prefilter(name + " foo")
+            assert res == name + " foo"
+            del ip.magics_manager.magics["line"][name]
 
         # These should be transformed
         for name in ['fi', 'piz', 'nohtypi_teg']:
             ip.register_magic_function(dummy_magic, magic_name=name)
-            res = ip.prefilter(name+' foo')
-            assert res != name+' foo'
-            del ip.magics_manager.magics['line'][name]
+            res = ip.prefilter(name + " foo")
+            assert res != name + " foo"
+            del ip.magics_manager.magics["line"][name]
 
     finally:
         ip.automagic = prev_automagic_state
@@ -52,8 +52,8 @@ def test_autocall_binops():
     f = lambda x: x
     ip.user_ns['f'] = f
     try:
-        assert ip.prefilter('f 1') =='f(1)'
-        for t in ['f +1', 'f -1']:
+        assert ip.prefilter("f 1") == "f(1)"
+        for t in ["f +1", "f -1"]:
             assert ip.prefilter(t) == t
 
         # Run tests again with a more permissive exclude_regexp, which will
@@ -66,8 +66,8 @@ def test_autocall_binops():
             ac.exclude_regexp = r'^[,&^\|\*/]|^is |^not |^in |^and |^or '
             pm.sort_checkers()
 
-            assert ip.prefilter('f -1') == 'f(-1)'
-            assert ip.prefilter('f +1') == 'f(+1)'
+            assert ip.prefilter("f -1") == "f(-1)"
+            assert ip.prefilter("f +1") == "f(+1)"
         finally:
             pm.unregister_checker(ac)
     finally:
@@ -121,7 +121,7 @@ def test_autocall_should_support_unicode():
     ip.magic('autocall 2')
     ip.user_ns['π'] = lambda x: x
     try:
-        assert ip.prefilter('π 3') =='π(3)'
+        assert ip.prefilter("π 3") == "π(3)"
     finally:
         ip.magic('autocall 0')
         del ip.user_ns['π']

From 241c1f571deef0e4ffa9ba49c7680865c54b5ce0 Mon Sep 17 00:00:00 2001
From: Artur Svistunov <madbirddiary@gmail.com>
Date: Mon, 6 Sep 2021 00:02:56 +0300
Subject: [PATCH 0658/1407] Use custom CommandCompiler for input validation

---
 IPython/core/inputtransformer2.py | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index fefc523d70a..04875b64753 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -10,7 +10,9 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from codeop import compile_command
+import ast
+import sys
+from codeop import CommandCompiler
 import re
 import tokenize
 from typing import List, Tuple, Optional, Any
@@ -773,3 +775,20 @@ def find_last_indent(lines):
     if not m:
         return 0
     return len(m.group(0).replace('\t', ' '*4))
+
+
+class MaybeAsyncCommandCompiler(CommandCompiler):
+    def __init__(self, extra_flags=0):
+        self.compiler = self._compiler
+        self.extra_flags = extra_flags
+
+    def _compiler(self, source, filename, symbol, flags, feature):
+        flags |= self.extra_flags
+        return compile(source, filename, symbol, flags, feature)
+
+if (sys.version_info.major, sys.version_info.minor) >= (3, 8):
+    _extra_flags = ast.PyCF_ALLOW_TOP_LEVEL_AWAIT
+else:
+    _extra_flags = ast.PyCF_ONLY_AST
+
+compile_command = MaybeAsyncCommandCompiler(extra_flags=_extra_flags)

From aff59c6dd9867026facf6fc32784b8605013e5c3 Mon Sep 17 00:00:00 2001
From: Artur Svistunov <madbirddiary@gmail.com>
Date: Mon, 6 Sep 2021 00:33:01 +0300
Subject: [PATCH 0659/1407] Fix `compile()` invocation

---
 IPython/core/inputtransformer2.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index 04875b64753..c9e3f8c88c9 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -12,7 +12,7 @@
 
 import ast
 import sys
-from codeop import CommandCompiler
+from codeop import CommandCompiler, Compile
 import re
 import tokenize
 from typing import List, Tuple, Optional, Any
@@ -777,14 +777,18 @@ def find_last_indent(lines):
     return len(m.group(0).replace('\t', ' '*4))
 
 
+class MaybeAsyncCompile(Compile):
+    def __init__(self, extra_flags=0):
+        super().__init__()
+        self.flags |= extra_flags
+
+    __call__ = compile
+
+
 class MaybeAsyncCommandCompiler(CommandCompiler):
     def __init__(self, extra_flags=0):
-        self.compiler = self._compiler
-        self.extra_flags = extra_flags
+        self.compiler = MaybeAsyncCompile(extra_flags=extra_flags)
 
-    def _compiler(self, source, filename, symbol, flags, feature):
-        flags |= self.extra_flags
-        return compile(source, filename, symbol, flags, feature)
 
 if (sys.version_info.major, sys.version_info.minor) >= (3, 8):
     _extra_flags = ast.PyCF_ALLOW_TOP_LEVEL_AWAIT

From c84fa60f85127cea3ba620034cebf023b0660bed Mon Sep 17 00:00:00 2001
From: Artur Svistunov <madbirddiary@gmail.com>
Date: Mon, 6 Sep 2021 01:09:40 +0300
Subject: [PATCH 0660/1407] declare `MaybeAsyncCompile.__call__()` as a method

---
 IPython/core/inputtransformer2.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index c9e3f8c88c9..53e114c7139 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -782,7 +782,8 @@ def __init__(self, extra_flags=0):
         super().__init__()
         self.flags |= extra_flags
 
-    __call__ = compile
+    def __call__(self, *args, **kwds):
+        return compile(*args, **kwds)
 
 
 class MaybeAsyncCommandCompiler(CommandCompiler):

From d17b81ee6609afe151a941006b491e3a939528d2 Mon Sep 17 00:00:00 2001
From: Marcus Wirtz <marcus.wirtz@rwth-aachen.de>
Date: Tue, 7 Sep 2021 11:26:28 +0200
Subject: [PATCH 0661/1407] Fix typo in comment

Co-authored-by: Blazej Michalik <6691643+MrMino@users.noreply.github.com>
---
 IPython/core/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index b19cd079597..1e11ca6b998 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -929,7 +929,7 @@ def init_virtualenv(self):
             p_venv = Path(str(p_venv)[2:])
 
         if sys.platform == "win32":
-            # In Windows there might be a mixture of lower-case and mixed-case pathes
+            # On Windows there might be a mixture of lower-case and mixed-case paths
             p_venv = Path(str(p_venv).lower())
             paths = [Path(str(p).lower()) for p in paths]
 

From f5e8a3c78ef6100abfa6622329a56592025b1383 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Wed, 8 Sep 2021 02:54:12 +0200
Subject: [PATCH 0662/1407] Improve formatting of %time documentation

---
 IPython/core/magics/execution.py | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 9b49d798d16..a5cfd5f6a12 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -1235,22 +1235,25 @@ def time(self,line='', cell=None, local_ns=None):
           CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
           Wall time: 0.00
 
-          Note that the time needed by Python to compile the given expression
-          will be reported if it is more than 0.1s.  In this example, the
-          actual exponentiation is done by Python at compilation time, so while
-          the expression can take a noticeable amount of time to compute, that
-          time is purely due to the compilation:
 
-          In [5]: %time 3**9999;
-          CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
-          Wall time: 0.00 s
+        .. note::
+            The time needed by Python to compile the given expression will be
+            reported if it is more than 0.1s.
 
-          In [6]: %time 3**999999;
-          CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
-          Wall time: 0.00 s
-          Compiler : 0.78 s
-          """
+            In the example below, the actual exponentiation is done by Python
+            at compilation time, so while the expression can take a noticeable
+            amount of time to compute, that time is purely due to the
+            compilation::
 
+                In [5]: %time 3**9999;
+                CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
+                Wall time: 0.00 s
+
+                In [6]: %time 3**999999;
+                CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
+                Wall time: 0.00 s
+                Compiler : 0.78 s
+        """
         # fail immediately if the given expression can't be compiled
         
         if line and cell:

From bbe524673a246c1c5f30ee142fd5fac19675e1a6 Mon Sep 17 00:00:00 2001
From: yuji96 <y.yama683@gmail.com>
Date: Tue, 14 Sep 2021 01:33:10 +0900
Subject: [PATCH 0663/1407] enable autoplay in embed youtube player

---
 IPython/lib/display.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index 012b3ab9f82..b9e08de9af0 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -263,13 +263,15 @@ class IFrame(object):
             src="{src}{params}"
             frameborder="0"
             allowfullscreen
+            {extra}
         ></iframe>
         """
 
-    def __init__(self, src, width, height, **kwargs):
+    def __init__(self, src, width, height, extra="", **kwargs):
         self.src = src
         self.width = width
         self.height = height
+        self.extra = extra
         self.params = kwargs
 
     def _repr_html_(self):
@@ -282,7 +284,9 @@ def _repr_html_(self):
         return self.iframe.format(src=self.src,
                                   width=self.width,
                                   height=self.height,
-                                  params=params)
+                                  params=params,
+                                  extra=self.extra)
+
 
 class YouTubeVideo(IFrame):
     """Class for embedding a YouTube Video in an IPython session, based on its video id.
@@ -310,11 +314,13 @@ class YouTubeVideo(IFrame):
     will be inserted in the document.
     """
 
-    def __init__(self, id, width=400, height=300, **kwargs):
+    def __init__(self, id, width=400, height=300, allow_autoplay=False, **kwargs):
         self.id=id
         src = "https://www.youtube.com/embed/{0}".format(id)
+        if allow_autoplay:
+            kwargs.update(autoplay=1, extra='allow="autoplay"')
         super(YouTubeVideo, self).__init__(src, width, height, **kwargs)
-    
+
     def _repr_jpeg_(self):
         # Deferred import
         from urllib.request import urlopen

From f1229dff77f6d922f8896ac994446009a82fe551 Mon Sep 17 00:00:00 2001
From: yuji96 <y.yama683@gmail.com>
Date: Fri, 17 Sep 2021 15:19:34 +0900
Subject: [PATCH 0664/1407] fix broken links due to updated ipyparallel's
 inventory

---
 docs/source/development/parallel_connections.rst | 2 +-
 docs/source/development/parallel_messages.rst    | 2 +-
 docs/source/whatsnew/version0.11.rst             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/source/development/parallel_connections.rst b/docs/source/development/parallel_connections.rst
index db1cccfab61..72532735387 100644
--- a/docs/source/development/parallel_connections.rst
+++ b/docs/source/development/parallel_connections.rst
@@ -5,4 +5,4 @@ Connection Diagrams of The IPython ZMQ Cluster
 ==============================================
 
 IPython parallel has moved to ipyparallel -
-see :ref:`ipyparallel:parallel_connections` for the documentation.
+see :ref:`ipyparallel:/reference/connections.md` for the documentation.
diff --git a/docs/source/development/parallel_messages.rst b/docs/source/development/parallel_messages.rst
index f37ea930f75..180c311b720 100644
--- a/docs/source/development/parallel_messages.rst
+++ b/docs/source/development/parallel_messages.rst
@@ -5,4 +5,4 @@ Messaging for Parallel Computing
 ================================
 
 IPython parallel has moved to ipyparallel -
-see :ref:`ipyparallel:parallel_messages` for the documentation.
+see :ref:`ipyparallel:/reference/messages.md` for the documentation.
diff --git a/docs/source/whatsnew/version0.11.rst b/docs/source/whatsnew/version0.11.rst
index 05d64478b0b..fc35ae57a49 100644
--- a/docs/source/whatsnew/version0.11.rst
+++ b/docs/source/whatsnew/version0.11.rst
@@ -309,7 +309,7 @@ be started by calling ``ipython qtconsole``. The protocol is :ref:`documented
 <messaging>`.
 
 The parallel computing framework has also been rewritten using ZMQ. The
-protocol is described :ref:`here <parallel_messages>`, and the code is in the
+protocol is described :ref:`here <ipyparallel:/reference/messages.md>`, and the code is in the
 new :mod:`IPython.parallel` module.
 
 .. _python3_011:

From 941da40ab29389d70f6efc5556d440a7e8716038 Mon Sep 17 00:00:00 2001
From: Mithil Poojary <mithil467@gmail.com>
Date: Tue, 14 Sep 2021 08:57:29 +0530
Subject: [PATCH 0665/1407] Use pathlib parent relationships to compare
 virtualenv directories

Fix #13124
---
 IPython/core/interactiveshell.py | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 1e11ca6b998..05bd8eea071 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -922,18 +922,7 @@ def init_virtualenv(self):
             p = Path(os.readlink(p))
             paths.append(p.resolve())
 
-        # In Cygwin paths like "c:\..." and '\cygdrive\c\...' are possible
-        if str(p_venv).startswith("\\cygdrive"):
-            p_venv = Path(str(p_venv)[11:])
-        elif len(str(p_venv)) >= 2 and str(p_venv)[1] == ":":
-            p_venv = Path(str(p_venv)[2:])
-
-        if sys.platform == "win32":
-            # On Windows there might be a mixture of lower-case and mixed-case paths
-            p_venv = Path(str(p_venv).lower())
-            paths = [Path(str(p).lower()) for p in paths]
-
-        if any(os.fspath(p_venv) in os.fspath(p) for p in paths):
+        if any(p_venv == p.parents[1] for p in paths):
             # Our exe is inside or has access to the virtualenv, don't need to do anything.
             return
 

From 6f4501ca21368992cb3bc1d1027d78b123d7129e Mon Sep 17 00:00:00 2001
From: Mithil Poojary <mithil467@gmail.com>
Date: Mon, 20 Sep 2021 08:30:40 +0530
Subject: [PATCH 0666/1407] Restore cygwin path check

---
 IPython/core/interactiveshell.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 05bd8eea071..d3389a8be0e 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -921,7 +921,11 @@ def init_virtualenv(self):
         while p.is_symlink():
             p = Path(os.readlink(p))
             paths.append(p.resolve())
-
+        
+        # In Cygwin paths like "c:\..." and '\cygdrive\c\...' are possible
+        if str(p_venv).startswith("\\cygdrive"):
+            p_venv = "C:" / Path(str(p_venv)[11:])
+        
         if any(p_venv == p.parents[1] for p in paths):
             # Our exe is inside or has access to the virtualenv, don't need to do anything.
             return

From 94240ce5086d648abbdf889e94de537a567817b8 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Tue, 21 Sep 2021 00:17:55 +0200
Subject: [PATCH 0667/1407] Darker

---
 IPython/core/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index d3389a8be0e..ef83ce8621c 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -925,7 +925,7 @@ def init_virtualenv(self):
         # In Cygwin paths like "c:\..." and '\cygdrive\c\...' are possible
         if str(p_venv).startswith("\\cygdrive"):
             p_venv = "C:" / Path(str(p_venv)[11:])
-        
+
         if any(p_venv == p.parents[1] for p in paths):
             # Our exe is inside or has access to the virtualenv, don't need to do anything.
             return

From 49d02f78711c4733d4047ab6c6757f08e1497a90 Mon Sep 17 00:00:00 2001
From: yuji96 <y.yama683@gmail.com>
Date: Fri, 17 Sep 2021 15:22:31 +0900
Subject: [PATCH 0668/1407] fix coding style with darker

---
 IPython/lib/display.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index b9e08de9af0..e309398f1ea 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -281,11 +281,13 @@ def _repr_html_(self):
             params = "?" + urlencode(self.params)
         else:
             params = ""
-        return self.iframe.format(src=self.src,
-                                  width=self.width,
-                                  height=self.height,
-                                  params=params,
-                                  extra=self.extra)
+        return self.iframe.format(
+            src=self.src,
+            width=self.width,
+            height=self.height,
+            params=params,
+            extra=self.extra,
+        )
 
 
 class YouTubeVideo(IFrame):

From b709866b0a3a1108d98b20dd286ab8cd8c9d387f Mon Sep 17 00:00:00 2001
From: yuji96 <y.yama683@gmail.com>
Date: Fri, 17 Sep 2021 20:37:05 +0900
Subject: [PATCH 0669/1407] replace extra (str) -> extras (iterable)

---
 IPython/lib/display.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index e309398f1ea..68f9f3ea666 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -8,7 +8,7 @@
 
 from IPython.core.display import DisplayObject, TextDisplayObject
 
-from typing import Tuple
+from typing import Tuple, Iterable
 
 __all__ = ['Audio', 'IFrame', 'YouTubeVideo', 'VimeoVideo', 'ScribdDocument',
            'FileLink', 'FileLinks', 'Code']
@@ -263,15 +263,18 @@ class IFrame(object):
             src="{src}{params}"
             frameborder="0"
             allowfullscreen
-            {extra}
+            {extras}
         ></iframe>
         """
 
-    def __init__(self, src, width, height, extra="", **kwargs):
+    def __init__(self, src, width, height, extras: Iterable[str] = None, **kwargs):
+        if extras is None:
+            extras = []
+
         self.src = src
         self.width = width
         self.height = height
-        self.extra = extra
+        self.extras = extras
         self.params = kwargs
 
     def _repr_html_(self):
@@ -286,7 +289,7 @@ def _repr_html_(self):
             width=self.width,
             height=self.height,
             params=params,
-            extra=self.extra,
+            extras=" ".join(self.extras),
         )
 
 
@@ -320,7 +323,7 @@ def __init__(self, id, width=400, height=300, allow_autoplay=False, **kwargs):
         self.id=id
         src = "https://www.youtube.com/embed/{0}".format(id)
         if allow_autoplay:
-            kwargs.update(autoplay=1, extra='allow="autoplay"')
+            kwargs.update(autoplay=1, extras=['allow="autoplay"'])
         super(YouTubeVideo, self).__init__(src, width, height, **kwargs)
 
     def _repr_jpeg_(self):

From 1041f44680d312adbec9eb24406a7368c9ed9506 Mon Sep 17 00:00:00 2001
From: yuji96 <y.yama683@gmail.com>
Date: Fri, 17 Sep 2021 21:19:52 +0900
Subject: [PATCH 0670/1407] don't overwrite extras entered by user

---
 IPython/lib/display.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index 68f9f3ea666..19d4c35383b 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -323,7 +323,8 @@ def __init__(self, id, width=400, height=300, allow_autoplay=False, **kwargs):
         self.id=id
         src = "https://www.youtube.com/embed/{0}".format(id)
         if allow_autoplay:
-            kwargs.update(autoplay=1, extras=['allow="autoplay"'])
+            extras = list(kwargs.get("extras", [])) + ['allow="autoplay"']
+            kwargs.update(autoplay=1, extras=extras)
         super(YouTubeVideo, self).__init__(src, width, height, **kwargs)
 
     def _repr_jpeg_(self):

From b7e2c5a885f7f58a865888353caa3efb4c36b116 Mon Sep 17 00:00:00 2001
From: yuji96 <y.yama683@gmail.com>
Date: Tue, 21 Sep 2021 09:37:14 +0900
Subject: [PATCH 0671/1407] add docs: whats new entry

---
 .../enable-to-add-extra-attrs-to-iframe.rst   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst

diff --git a/docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst b/docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst
new file mode 100644
index 00000000000..f4f3ad55e02
--- /dev/null
+++ b/docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst
@@ -0,0 +1,37 @@
+Enable to add extra attributes to iframe
+========================================
+
+You can add any extra attributes to the ``<iframe>`` tag
+since the argument ``extras`` has been added to the ``IFrame`` class.
+for example::
+
+    In [1]: from IPython.display import IFrame
+
+    In [2]: print(IFrame(src="src", width=300, height=300, extras=["hello", "world"])._repr_html_())
+
+            <iframe
+                width="300"
+                height="300"
+                src="src"
+                frameborder="0"
+                allowfullscreen
+                hello world
+            ></iframe>
+
+Using it, you can autoplay ``YouTubeVideo`` by adding ``'allow="autoplay"'``,
+even in browsers that disable it by default, such as Google Chrome.
+And, you can write it more briefly by using the argument ``allow_autoplay``.
+::
+
+    In [1]: from IPython.display import YouTubeVideo
+
+    In [2]: print(YouTubeVideo("video-id", allow_autoplay=True)._repr_html_())
+
+            <iframe
+                width="400"
+                height="300"
+                src="https://www.youtube.com/embed/video-id?autoplay=1"
+                frameborder="0"
+                allowfullscreen
+                allow="autoplay"
+            ></iframe>

From 66774096f7653c18ba1e0a07142433f17aa9761b Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Wed, 22 Sep 2021 00:44:15 +0200
Subject: [PATCH 0672/1407] Reword the YouTubeVideo autoplay WN
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This should make it easier for the reader to understand the feature and
know what to expect.

Also, I couldn't help myself. I Never Gonna miss such opportunity.

🎶 Badum-ba-dubaba 🎶
---
 .../enable-to-add-extra-attrs-to-iframe.rst   | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst b/docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst
index f4f3ad55e02..efb23001a80 100644
--- a/docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst
+++ b/docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst
@@ -1,37 +1,39 @@
-Enable to add extra attributes to iframe
-========================================
+``YouTubeVideo`` autoplay and the ability to add extra attributes to ``IFrame``
+===============================================================================
 
-You can add any extra attributes to the ``<iframe>`` tag
-since the argument ``extras`` has been added to the ``IFrame`` class.
-for example::
+You can add any extra attributes to the ``<iframe>`` tag using the new
+``extras`` argument in the ``IFrame`` class. For example::
 
     In [1]: from IPython.display import IFrame
 
-    In [2]: print(IFrame(src="src", width=300, height=300, extras=["hello", "world"])._repr_html_())
+    In [2]: IFrame(src="src", width=300, height=300, extras=['loading="eager"'])
 
-            <iframe
-                width="300"
-                height="300"
-                src="src"
-                frameborder="0"
-                allowfullscreen
-                hello world
-            ></iframe>
+The above cells will result in the following HTML code being displayed in a
+notebook::
 
-Using it, you can autoplay ``YouTubeVideo`` by adding ``'allow="autoplay"'``,
-even in browsers that disable it by default, such as Google Chrome.
-And, you can write it more briefly by using the argument ``allow_autoplay``.
+    <iframe
+        width="300"
+        height="300"
+        src="src"
+        frameborder="0"
+        allowfullscreen
+        loading="eager"
+    ></iframe>
+
+Related to the above, the ``YouTubeVideo`` class now takes an
+``allow_autoplay`` flag, which sets up the iframe of the embedded YouTube video
+such that it allows autoplay.
+
+.. note::
+    Whether this works depends on whether the autoplay policy of the browser
+    rendering the HTML allows it. It might not work in every circumstance, and
+    could get blocked by browser extensions.
+
+Try it out!
 ::
 
     In [1]: from IPython.display import YouTubeVideo
 
-    In [2]: print(YouTubeVideo("video-id", allow_autoplay=True)._repr_html_())
+    In [2]: YouTubeVideo("dQw4w9WgXcQ", allow_autoplay=True)
 
-            <iframe
-                width="400"
-                height="300"
-                src="https://www.youtube.com/embed/video-id?autoplay=1"
-                frameborder="0"
-                allowfullscreen
-                allow="autoplay"
-            ></iframe>
+🙃

From 455e4afda37bfc35312e4d3d14f8d1afbfcfcacc Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Wed, 22 Sep 2021 01:03:22 +0200
Subject: [PATCH 0673/1407] Reword a WN entry

---
 .../whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst b/docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst
index efb23001a80..1954bc439b8 100644
--- a/docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst
+++ b/docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst
@@ -25,9 +25,8 @@ Related to the above, the ``YouTubeVideo`` class now takes an
 such that it allows autoplay.
 
 .. note::
-    Whether this works depends on whether the autoplay policy of the browser
-    rendering the HTML allows it. It might not work in every circumstance, and
-    could get blocked by browser extensions.
+    Whether this works depends on the autoplay policy of the browser rendering
+    the HTML allowing it. It also could get blocked by some browser extensions.
 
 Try it out!
 ::

From fe042603646f800f3a2f3516266219448260d5e6 Mon Sep 17 00:00:00 2001
From: Mithil Poojary <mithil467@gmail.com>
Date: Wed, 22 Sep 2021 16:33:03 +0530
Subject: [PATCH 0674/1407] Adapt to all sorts of drive names

Earlier implementation assumed the drive name to be C and ignored
the possibility of it being different. Drive names could also be
greater than 1 in length. This possibility is also considered now.
---
 IPython/core/interactiveshell.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index ef83ce8621c..7d5b8974380 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -924,7 +924,9 @@ def init_virtualenv(self):
         
         # In Cygwin paths like "c:\..." and '\cygdrive\c\...' are possible
         if str(p_venv).startswith("\\cygdrive"):
-            p_venv = "C:" / Path(str(p_venv)[11:])
+            p_venv = Path(str(p_venv))
+            drive_name = p_venv.parts[2]
+            p_venv = (drive_name + ":/") / Path(*p_venv.parts[3:])
 
         if any(p_venv == p.parents[1] for p in paths):
             # Our exe is inside or has access to the virtualenv, don't need to do anything.

From 338ffdcaa038358762bef7f10ef91b2ea6fe680c Mon Sep 17 00:00:00 2001
From: Mithil Poojary <mithil467@gmail.com>
Date: Wed, 22 Sep 2021 18:17:10 +0530
Subject: [PATCH 0675/1407] Use pathlib comparison over string comparison

---
 IPython/core/interactiveshell.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 7d5b8974380..37b31580d9c 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -923,8 +923,7 @@ def init_virtualenv(self):
             paths.append(p.resolve())
         
         # In Cygwin paths like "c:\..." and '\cygdrive\c\...' are possible
-        if str(p_venv).startswith("\\cygdrive"):
-            p_venv = Path(str(p_venv))
+        if p_venv.parts[1] == "cygdrive":
             drive_name = p_venv.parts[2]
             p_venv = (drive_name + ":/") / Path(*p_venv.parts[3:])
 

From 24a283a9f5a5003c0a6e4f8ccf7ca2268c8eae2c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 24 Sep 2021 15:08:49 -0700
Subject: [PATCH 0676/1407] What's new 7.28

---
 docs/source/whatsnew/version7.rst | 49 ++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 7dd68592232..84fccd20c53 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,53 @@
  7.x Series
 ============
 
+.. _version 7.28:
+
+IPython 7.28
+============
+
+
+IPython 7.28 is again a minor release that mostly bring bugfixes, and couple of
+improvement. Many thanks to MrMino, who again did all the work this month, and
+made a number of documentation improvements.
+
+Here is a non-exhaustive list of changes,
+
+Fixes:
+
+ - async with doesn't allow newlines :ghpull:`13090`
+ - Dynamically changing to vi mode via %config magic) :ghpull:`13091`
+
+Virtualenv handling fixes:
+
+ - init_virtualenv now uses Pathlib :ghpull:`12548`
+ - Fix Improper path comparison of virtualenv directories :ghpull:`13140`
+ - Fix virtual environment user warning for lower case pathes :ghpull:`13094`
+ - Adapt to all sorts of drive names for cygwin :ghpull:`13153`
+
+New Features:
+
+ - enable autoplay in embed YouTube player :ghpull:`13133`
+
+ Documentation:
+
+ - Fix formatting for the core.interactiveshell documentation :ghpull:`13118`
+ - Fix broken ipyparallel's refs :ghpull:`13138`
+ - Improve formatting of %time documentation :ghpull:`13125`
+ - Reword the YouTubeVideo autoplay WN :ghpull:`13147`
+
+
+Thanks
+------
+
+Many thanks to all the contributors to this release. You can find all individual
+contributions to this milestone `on github
+<https://github.com/ipython/ipython/milestone/92>`__.
+
+Thanks as well to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries.
+
+
 .. _version 7.27:
 
 IPython 7.27
@@ -18,7 +65,7 @@ Thanks
 
 Many thanks to all the contributors to this release. You can find all individual
 contributions to this milestone `on github
-<https://github.com/ipython/ipython/milestone/90>`__.
+<https://github.com/ipython/ipython/milestone/91>`__.
 
 Thanks as well to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
 work on IPython and related libraries.

From 20281a0140e3cf3c73180cae90bb50a7b4879324 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 24 Sep 2021 14:55:30 -0700
Subject: [PATCH 0677/1407] Add history file to debugger.

This adds a configurable
`InteractiveShell.debugger_history_file=...` which default to
`~/.pdbhistory`, that store what is typed in ipdb;
this make it easy to persist across sessions.

Some of the logic is moved into the debugger itself so that existance
and creation of file is used only once Pdb is started.
---
 IPython/terminal/debugger.py         | 15 +++++++++++++++
 IPython/terminal/interactiveshell.py |  5 ++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index 57aa5dd90d1..5c9c3612bb6 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -1,18 +1,22 @@
 import asyncio
+import os
 import sys
 import threading
 
 from IPython.core.debugger import Pdb
 
+
 from IPython.core.completer import IPCompleter
 from .ptutils import IPythonPTCompleter
 from .shortcuts import create_ipython_shortcuts
 from . import embed
 
+from pathlib import Path
 from pygments.token import Token
 from prompt_toolkit.shortcuts.prompt import PromptSession
 from prompt_toolkit.enums import EditingMode
 from prompt_toolkit.formatted_text import PygmentsTokens
+from prompt_toolkit.history import InMemoryHistory, FileHistory
 
 from prompt_toolkit import __version__ as ptk_version
 PTK3 = ptk_version.startswith('3.')
@@ -55,6 +59,17 @@ def gen_comp(self, text):
 
             self._ptcomp = IPythonPTCompleter(compl)
 
+        # setup history only when we start pdb
+        if self.shell.debugger_history is None:
+            if self.shell.debugger_history_file is not None:
+
+                p = Path(self.shell.debugger_history_file).expanduser()
+                if not p.exists():
+                    p.touch()
+                self.debugger_history = FileHistory(os.path.expanduser(str(p)))
+            else:
+                self.debugger_history = InMemoryHistory()
+
         options = dict(
             message=(lambda: PygmentsTokens(get_prompt_tokens())),
             editing_mode=getattr(EditingMode, self.shell.editing_mode.upper()),
diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 27144124074..b73a140f751 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -124,6 +124,10 @@ class TerminalInteractiveShell(InteractiveShell):
     pt_app = None
     debugger_history = None
 
+    debugger_history_file = Unicode(
+        "~/.pdbhistory", help="File in which to store and read history"
+    ).tag(config=True)
+
     simple_prompt = Bool(_use_simple_prompt,
         help="""Use `raw_input` for the REPL, without completion and prompt colors.
 
@@ -566,7 +570,6 @@ def __init__(self, *args, **kwargs):
         self.init_term_title()
         self.keep_running = True
 
-        self.debugger_history = InMemoryHistory()
 
     def ask_exit(self):
         self.keep_running = False

From b27ed6b5e5aa8ab176e8025e726c72e60c5e0c9e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 20 Sep 2021 15:33:08 -0700
Subject: [PATCH 0678/1407] Allow decorator frames to be marked as skippable.

When done so, by default pdb will step over those frames and directly
into the decorated functions.

    >>> def helper_1():
    ...     print("don't step in me")
    ...
    ...
    ... def helper_2():
    ...     print("in me neither")
    ...

One can define a decorator that wrap a function between the two helpers:

    >>> def pdb_skipped_decorator(function):
    ...
    ...
    ...     def wrapped_fn(*args, **kwargs):
    ...         __debuggerskip__ = True
    ...         helper_1()
    ...         __debuggerskip__ = False
    ...         result = function(*args, **kwargs)
    ...         __debuggerskip__ = True
    ...         helper_2()
    ...         return result
    ...
    ...     return wrapped_fn

When decorating a function, ipdb will directly step into ``bar()`` by
default:

    >>> @foo_decorator
    ... def bar(x, y):
    ...     return x * y

You can toggle the behavior with

    ipdb> skip_predicates debuggerskip False

or configure it in your ``.pdbrc``
---
 IPython/core/debugger.py            | 134 ++++++++++++++++++++++++++--
 IPython/core/tests/test_debugger.py | 112 +++++++++++++++++++++++
 IPython/terminal/debugger.py        |   4 +-
 docs/source/whatsnew/version7.rst   |   3 +-
 4 files changed, 243 insertions(+), 10 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index e2676a61de7..cbad8ff353b 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -2,6 +2,71 @@
 """
 Pdb debugger class.
 
+
+This is an extension to PDB which adds a number of new features.
+Note that there is also the `IPython.terminal.debugger` class which provides UI
+improvements.
+
+We also strongly recommend to use this via the `ipdb` package, which provides
+extra configuration options.
+
+Amoung other this subclass of PDB expose here:
+ - support many IPython magics like pdef/psource.
+ - allow to hide some frames in tracebacks
+ - allow to skip some frames.
+
+The skipping and hiding frames are configurable via the `skip_predicates`
+command.
+
+By default, frames from readonly files will be hidden, frames containing
+``__tracebackhide__=True`` will be hidden.
+
+Frames containing ``__debuggerskip__`` will be stepped over, frames who's parent
+frames value of ``__debuggerskip__`` is ``True`` will be skipped.
+
+    >>> def helper_1():
+    ...     print("don't step in me")
+    ...
+    ...
+    ... def helper_2():
+    ...     print("in me neither")
+    ...
+
+One can define a decorator that wrap a function between the two helpers:
+
+    >>> def pdb_skipped_decorator(function):
+    ...
+    ...
+    ...     def wrapped_fn(*args, **kwargs):
+    ...         __debuggerskip__ = True
+    ...         helper_1()
+    ...         __debuggerskip__ = False
+    ...         result = function(*args, **kwargs)
+    ...         __debuggerskip__ = True
+    ...         helper_2()
+    ...         return result
+    ...
+    ...     return wrapped_fn
+
+When decorating a function, ipdb will directly step into ``bar()`` by
+default:
+
+    >>> @foo_decorator
+    ... def bar(x, y):
+    ...     return x * y
+
+
+You can toggle the behavior with
+
+    ipdb> skip_predicates debuggerskip false
+
+or configure it in your ``.pdbrc``
+
+
+
+Licencse
+--------
+
 Modified from the standard pdb.Pdb class to avoid including readline, so that
 the command line completion of other programs which include this isn't
 damaged.
@@ -9,11 +74,16 @@
 In the future, this class will be expanded with improvements over the standard
 pdb.
 
-The code in this file is mainly lifted out of cmd.py in Python 2.2, with minor
-changes. Licensing should therefore be under the standard Python terms.  For
-details on the PSF (Python Software Foundation) standard license, see:
+The original code in this file is mainly lifted out of cmd.py in Python 2.2,
+with minor changes. Licensing should therefore be under the standard Python
+terms.  For details on the PSF (Python Software Foundation) standard license,
+see:
 
 https://docs.python.org/2/license.html
+
+
+All the changes since then are under the same license as IPython.
+
 """
 
 #*****************************************************************************
@@ -51,6 +121,8 @@
 # it does so with some limitations.  The rest of this support is implemented in
 # the Tracer constructor.
 
+DEBUGGERSKIP = "__debuggerskip__"
+
 
 def make_arrow(pad):
     """generate the leading arrow in front of traceback or debugger"""
@@ -206,7 +278,12 @@ class Pdb(OldPdb):
 
     """
 
-    default_predicates = {"tbhide": True, "readonly": False, "ipython_internal": True}
+    default_predicates = {
+        "tbhide": True,
+        "readonly": False,
+        "ipython_internal": True,
+        "debuggerskip": True,
+    }
 
     def __init__(self, color_scheme=None, completekey=None,
                  stdin=None, stdout=None, context=5, **kwargs):
@@ -303,7 +380,9 @@ def __init__(self, color_scheme=None, completekey=None,
 
         # list of predicates we use to skip frames
         self._predicates = self.default_predicates
+        self._skipping = False
 
+    #
     def set_colors(self, scheme):
         """Shorthand access to the color table scheme selector method."""
         self.color_scheme_table.set_active_scheme(scheme)
@@ -815,7 +894,50 @@ def do_where(self, arg):
 
     do_w = do_where
 
+    def break_anywhere(self, frame):
+        """
+
+        _stop_in_decorator_internals is overly restrictive, as we may still want
+        to trace function calls, so we need to also update break_anywhere so
+        that is we don't `stop_here`, because of debugger skip, we may still
+        stop at any point inside the function
+
+        """
+        if self._predicates["debuggerskip"]:
+            if DEBUGGERSKIP in frame.f_code.co_varnames:
+                return True
+            if frame.f_back and self._get_frame_locals(frame.f_back).get(DEBUGGERSKIP):
+                return True
+        return super().break_anywhere(frame)
+
+    @skip_doctest
+    def _is_in_decorator_internal_and_should_skip(self, frame):
+        """
+        Utility to tell us whether we are in a decorator internal and should stop.
+
+
+
+        """
+
+        # if we are disable don't skip
+        if not self._predicates["debuggerskip"]:
+            return False
+
+        # if frame is tagged, skip by default.
+        if DEBUGGERSKIP in frame.f_code.co_varnames:
+            return True
+
+        # if parent frame value set to True skip as well.
+        if frame.f_back and self._get_frame_locals(frame.f_back).get(DEBUGGERSKIP):
+            return True
+
+        return False
+
     def stop_here(self, frame):
+
+        if self._is_in_decorator_internal_and_should_skip(frame) is True:
+            return False
+
         hidden = False
         if self.skip_hidden:
             hidden = self._hidden_predicate(frame)
@@ -938,10 +1060,10 @@ def do_context(self, context):
 class InterruptiblePdb(Pdb):
     """Version of debugger where KeyboardInterrupt exits the debugger altogether."""
 
-    def cmdloop(self):
+    def cmdloop(self, intro=None):
         """Wrap cmdloop() such that KeyboardInterrupt stops the debugger."""
         try:
-            return OldPdb.cmdloop(self)
+            return OldPdb.cmdloop(self, intro=intro)
         except KeyboardInterrupt:
             self.stop_here = lambda frame: False
             self.do_quit("")
diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 35e77e4acd5..217eb6bd3fa 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -323,6 +323,118 @@ def g():
     child.close()
 
 
+skip_decorators_blocks = (
+    """
+    def helper_1():
+        pass # should not stop here
+    """,
+    """
+    def helper_2():
+        pass # should not stop here
+    """,
+    """
+    def pdb_skipped_decorator(function):
+        def wrapped_fn(*args, **kwargs):
+            __debuggerskip__ = True
+            helper_1()
+            __debuggerskip__ = False
+            result = function(*args, **kwargs)
+            __debuggerskip__ = True
+            helper_2()
+            return result
+        return wrapped_fn
+    """,
+    """
+    @pdb_skipped_decorator
+    def bar(x, y):
+        return x * y
+    """,
+    """import IPython.terminal.debugger as ipdb""",
+    """
+    def f():
+        ipdb.set_trace()
+        bar(3, 4)
+    """,
+    """
+    f()
+    """,
+)
+
+
+def _decorator_skip_setup():
+    import pexpect
+
+    env = os.environ.copy()
+    env["IPY_TEST_SIMPLE_PROMPT"] = "1"
+
+    child = pexpect.spawn(
+        sys.executable, ["-m", "IPython", "--colors=nocolor"], env=env
+    )
+    child.timeout = 5 * IPYTHON_TESTING_TIMEOUT_SCALE
+
+    child.expect("IPython")
+    child.expect("\n")
+
+    dedented_blocks = [dedent(b).strip() for b in skip_decorators_blocks]
+    in_prompt_number = 1
+    for cblock in dedented_blocks:
+        child.expect_exact(f"In [{in_prompt_number}]:")
+        in_prompt_number += 1
+        for line in cblock.splitlines():
+            child.sendline(line)
+            child.expect_exact(line)
+        child.sendline("")
+    return child
+
+
+@skip_win32
+def test_decorator_skip():
+    """test that decorator frames can be skipped."""
+
+    child = _decorator_skip_setup()
+
+    child.expect_exact("3     bar(3, 4)")
+    child.expect("ipdb>")
+
+    child.expect("ipdb>")
+    child.sendline("step")
+    child.expect_exact("step")
+
+    child.expect_exact("1 @pdb_skipped_decorator")
+
+    child.sendline("s")
+    child.expect_exact("return x * y")
+
+    child.close()
+
+
+@skip_win32
+def test_decorator_skip_disabled():
+    """test that decorator frame skipping can be disabled"""
+
+    child = _decorator_skip_setup()
+
+    child.expect_exact("3     bar(3, 4)")
+
+    for input_, expected in [
+        ("skip_predicates debuggerskip False", ""),
+        ("skip_predicates", "debuggerskip : False"),
+        ("step", "---> 2     def wrapped_fn"),
+        ("step", "----> 3         __debuggerskip__"),
+        ("step", "----> 4         helper_1()"),
+        ("step", "---> 1 def helper_1():"),
+        ("next", "----> 2     pass"),
+        ("next", "--Return--"),
+        ("next", "----> 5         __debuggerskip__ = False"),
+    ]:
+        child.expect("ipdb>")
+        child.sendline(input_)
+        child.expect_exact(input_)
+        child.expect_exact(expected)
+
+    child.close()
+
+
 @skip_win32
 def test_where_erase_value():
     """Test that `where` does not access f_locals and erase values."""
diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index 57aa5dd90d1..aec1a7fbb03 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -64,7 +64,7 @@ def gen_comp(self, text):
             enable_history_search=True,
             mouse_support=self.shell.mouse_support,
             complete_style=self.shell.pt_complete_style,
-            style=self.shell.style,
+            style=getattr(self.shell, "style", None),
             color_depth=self.shell.color_depth,
         )
 
@@ -89,7 +89,6 @@ def cmdloop(self, intro=None):
         # prompt itself in a different thread (we can't start an event loop
         # within an event loop). This new thread won't have any event loop
         # running, and here we run our prompt-loop.
-
         self.preloop()
 
         try:
@@ -124,7 +123,6 @@ def in_thread():
 
                     if keyboard_interrupt:
                         raise KeyboardInterrupt
-
                 line = self.precmd(line)
                 stop = self.onecmd(line)
                 stop = self.postcmd(stop, line)
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 84fccd20c53..990e0eb7021 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,7 @@
  7.x Series
 ============
 
+
 .. _version 7.28:
 
 IPython 7.28
@@ -543,7 +544,7 @@ Change of API and exposed objects automatically detected using `frappuccino
 <https://pypi.org/project/frappuccino/>`_ (still in beta):
 
 
-The following items are new and mostly related to understanding ``__tracebackbide__``::
+The following items are new and mostly related to understanding ``__tracebackhide__``::
 
     + IPython.core.debugger.Pdb.do_down(self, arg)
     + IPython.core.debugger.Pdb.do_skip_hidden(self, arg)

From d03a6c072aaca409219b53ba04f8f4262a41d5ac Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 28 Sep 2021 09:07:29 -0700
Subject: [PATCH 0679/1407] Apply suggestions from code review

Co-authored-by: Blazej Michalik <6691643+MrMino@users.noreply.github.com>
---
 IPython/core/debugger.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index cbad8ff353b..11f1bec534e 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -10,10 +10,10 @@
 We also strongly recommend to use this via the `ipdb` package, which provides
 extra configuration options.
 
-Amoung other this subclass of PDB expose here:
- - support many IPython magics like pdef/psource.
- - allow to hide some frames in tracebacks
- - allow to skip some frames.
+Among other things, this subclass of PDB:
+ - supports many IPython magics like pdef/psource
+ - hide frames in tracebacks based on `__tracebackhide__`
+ - allows to skip frames based on `__debuggerskip__`
 
 The skipping and hiding frames are configurable via the `skip_predicates`
 command.
@@ -32,7 +32,7 @@
     ...     print("in me neither")
     ...
 
-One can define a decorator that wrap a function between the two helpers:
+One can define a decorator that wraps a function between the two helpers:
 
     >>> def pdb_skipped_decorator(function):
     ...
@@ -380,7 +380,6 @@ def __init__(self, color_scheme=None, completekey=None,
 
         # list of predicates we use to skip frames
         self._predicates = self.default_predicates
-        self._skipping = False
 
     #
     def set_colors(self, scheme):
@@ -919,7 +918,7 @@ def _is_in_decorator_internal_and_should_skip(self, frame):
 
         """
 
-        # if we are disable don't skip
+        # if we are disabled don't skip
         if not self._predicates["debuggerskip"]:
             return False
 

From 4a2e85faf8e30c70a5d2c1af6bb45e2cdee5a067 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Wed, 29 Sep 2021 09:37:13 +0200
Subject: [PATCH 0680/1407] print_figure return base64 str instead of bytes

sending bytes relies on serializer's `default` functionality,
where we can just send the right thing here

this used to be ambiguous on Python 2, but not anymore
---
 IPython/core/pylabtools.py            | 54 ++++++++++++++++++++-------
 IPython/core/tests/test_display.py    |  6 ++-
 IPython/core/tests/test_pylabtools.py | 14 +++++--
 3 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index 35f79249f7d..3ad575ae931 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -5,6 +5,8 @@
 # Distributed under the terms of the Modified BSD License.
 
 from io import BytesIO
+from binascii import b2a_base64
+from functools import partial
 import warnings
 
 from IPython.core.display import _pngxy
@@ -99,7 +101,7 @@ def figsize(sizex, sizey):
     matplotlib.rcParams['figure.figsize'] = [sizex, sizey]
 
 
-def print_figure(fig, fmt='png', bbox_inches='tight', **kwargs):
+def print_figure(fig, fmt="png", bbox_inches="tight", base64=False, **kwargs):
     """Print a figure to an image, and return the resulting file data
 
     Returned data will be bytes unless ``fmt='svg'``,
@@ -107,6 +109,12 @@ def print_figure(fig, fmt='png', bbox_inches='tight', **kwargs):
 
     Any keyword args are passed to fig.canvas.print_figure,
     such as ``quality`` or ``bbox_inches``.
+
+    If `base64` is True, return base64-encoded str instead of raw bytes
+    for binary-encoded image formats
+
+    .. versionadded: 7.29
+        base64 argument
     """
     # When there's an empty figure, we shouldn't return anything, otherwise we
     # get big blank areas in the qt console.
@@ -138,19 +146,31 @@ def print_figure(fig, fmt='png', bbox_inches='tight', **kwargs):
     data = bytes_io.getvalue()
     if fmt == 'svg':
         data = data.decode('utf-8')
+    elif base64:
+        data = b2a_base64(data).decode("ascii")
     return data
 
-def retina_figure(fig, **kwargs):
-    """format a figure as a pixel-doubled (retina) PNG"""
-    pngdata = print_figure(fig, fmt='retina', **kwargs)
+def retina_figure(fig, base64=False, **kwargs):
+    """format a figure as a pixel-doubled (retina) PNG
+
+    If `base64` is True, return base64-encoded str instead of raw bytes
+    for binary-encoded image formats
+
+    .. versionadded: 7.29
+        base64 argument
+    """
+    pngdata = print_figure(fig, fmt="retina", base64=False, **kwargs)
     # Make sure that retina_figure acts just like print_figure and returns
     # None when the figure is empty.
     if pngdata is None:
         return
     w, h = _pngxy(pngdata)
     metadata = {"width": w//2, "height":h//2}
+    if base64:
+        pngdata = b2a_base64(pngdata).decode("ascii")
     return pngdata, metadata
 
+
 # We need a little factory function here to create the closure where
 # safe_execfile can live.
 def mpl_runner(safe_execfile):
@@ -249,16 +269,22 @@ def select_figure_formats(shell, formats, **kwargs):
         gs = "%s" % ','.join([repr(f) for f in supported])
         raise ValueError("supported formats are: %s not %s" % (gs, bs))
 
-    if 'png' in formats:
-        png_formatter.for_type(Figure, lambda fig: print_figure(fig, 'png', **kwargs))
-    if 'retina' in formats or 'png2x' in formats:
-        png_formatter.for_type(Figure, lambda fig: retina_figure(fig, **kwargs))
-    if 'jpg' in formats or 'jpeg' in formats:
-        jpg_formatter.for_type(Figure, lambda fig: print_figure(fig, 'jpg', **kwargs))
-    if 'svg' in formats:
-        svg_formatter.for_type(Figure, lambda fig: print_figure(fig, 'svg', **kwargs))
-    if 'pdf' in formats:
-        pdf_formatter.for_type(Figure, lambda fig: print_figure(fig, 'pdf', **kwargs))
+    if "png" in formats:
+        png_formatter.for_type(
+            Figure, partial(print_figure, fmt="png", base64=True, **kwargs)
+        )
+    if "retina" in formats or "png2x" in formats:
+        png_formatter.for_type(Figure, partial(retina_figure, base64=True, **kwargs))
+    if "jpg" in formats or "jpeg" in formats:
+        jpg_formatter.for_type(
+            Figure, partial(print_figure, fmt="jpg", base64=True, **kwargs)
+        )
+    if "svg" in formats:
+        svg_formatter.for_type(Figure, partial(print_figure, fmt="svg", **kwargs))
+    if "pdf" in formats:
+        pdf_formatter.for_type(
+            Figure, partial(print_figure, fmt="pdf", base64=True, **kwargs)
+        )
 
 #-----------------------------------------------------------------------------
 # Code for initializing matplotlib and importing pylab
diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index 5c9745d9d5d..f7e9a52f081 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -187,10 +187,12 @@ def test_set_matplotlib_formats_kwargs():
     display.set_matplotlib_formats('png', **kwargs)
     formatter = ip.display_formatter.formatters['image/png']
     f = formatter.lookup_by_type(Figure)
-    cell = f.__closure__[0].cell_contents
+    formatter_kwargs = f.keywords
     expected = kwargs
+    expected["base64"] = True
+    expected["fmt"] = "png"
     expected.update(cfg.print_figure_kwargs)
-    nt.assert_equal(cell, expected)
+    nt.assert_equal(formatter_kwargs, expected)
 
 def test_display_available():
     """
diff --git a/IPython/core/tests/test_pylabtools.py b/IPython/core/tests/test_pylabtools.py
index 9a6b2f7920b..426930d54fa 100644
--- a/IPython/core/tests/test_pylabtools.py
+++ b/IPython/core/tests/test_pylabtools.py
@@ -5,7 +5,8 @@
 # Distributed under the terms of the Modified BSD License.
 
 
-from io import UnsupportedOperation, BytesIO
+from binascii import a2b_base64
+from io import BytesIO
 
 import matplotlib
 matplotlib.use('Agg')
@@ -104,8 +105,11 @@ def test_select_figure_formats_kwargs():
     pt.select_figure_formats(ip, 'png', **kwargs)
     formatter = ip.display_formatter.formatters['image/png']
     f = formatter.lookup_by_type(Figure)
-    cell = f.__closure__[0].cell_contents
-    nt.assert_equal(cell, kwargs)
+    cell = f.keywords
+    expected = kwargs
+    expected["base64"] = True
+    expected["fmt"] = "png"
+    assert cell == expected
 
     # check that the formatter doesn't raise
     fig = plt.figure()
@@ -114,7 +118,9 @@ def test_select_figure_formats_kwargs():
     plt.draw()
     formatter.enabled = True
     png = formatter(fig)
-    assert png.startswith(_PNG)
+    assert isinstance(png, str)
+    png_bytes = a2b_base64(png)
+    assert png_bytes.startswith(_PNG)
 
 def test_select_figure_formats_set():
     ip = get_ipython()

From 913f3d1ca03f6dffe1eee4069976f05f17759cee Mon Sep 17 00:00:00 2001
From: Jakub <jakub.klus@gmail.com>
Date: Sat, 2 Oct 2021 20:36:59 +0200
Subject: [PATCH 0681/1407] Convert WindowsPath to str in init_virtualenv.

---
 IPython/core/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 37b31580d9c..e7d152a0a73 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -932,7 +932,7 @@ def init_virtualenv(self):
             return
 
         if sys.platform == "win32":
-            virtual_env = Path(os.environ["VIRTUAL_ENV"], "Lib", "site-packages")
+            virtual_env = str(Path(os.environ["VIRTUAL_ENV"], "Lib", "site-packages"))
         else:
             virtual_env_path = Path(
                 os.environ["VIRTUAL_ENV"], "lib", "python{}.{}", "site-packages"

From eadea3724bd66adf616bba9a0fefcac20695d583 Mon Sep 17 00:00:00 2001
From: KIU Shueng Chuan <nixchuan@gmail.com>
Date: Sun, 3 Oct 2021 10:44:00 +0800
Subject: [PATCH 0682/1407] use _exec wrapper for qt win32 inputhook

---
 IPython/terminal/pt_inputhooks/qt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/terminal/pt_inputhooks/qt.py b/IPython/terminal/pt_inputhooks/qt.py
index bc34f70a43c..f1e710aff54 100644
--- a/IPython/terminal/pt_inputhooks/qt.py
+++ b/IPython/terminal/pt_inputhooks/qt.py
@@ -64,7 +64,7 @@ def inputhook(context):
         timer.timeout.connect(event_loop.quit)
         while not context.input_is_ready():
             timer.start(50)  # 50 ms
-            event_loop.exec_()
+            _exec(event_loop)
             timer.stop()
     else:
         # On POSIX platforms, we can use a file descriptor to quit the event

From f6851e4f0732aa5f099428e6c9ec047f59ce1c96 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@kde.org>
Date: Sun, 3 Oct 2021 22:15:22 +0200
Subject: [PATCH 0683/1407] Fix cpaste documentation

- The code was example was invalid Python3
- IPython magics are supported
- Added example using a magic

Closes #12930
---
 IPython/terminal/magics.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/IPython/terminal/magics.py b/IPython/terminal/magics.py
index 9e6f6472303..c5d382e82a3 100644
--- a/IPython/terminal/magics.py
+++ b/IPython/terminal/magics.py
@@ -109,7 +109,7 @@ def cpaste(self, parameter_s=''):
         Just press enter and type -- (and press enter again) and the block
         will be what was just pasted.
 
-        IPython statements (magics, shell escapes) are not supported (yet).
+        Shell escapes are not supported (yet).
 
         See also
         --------
@@ -122,9 +122,19 @@ def cpaste(self, parameter_s=''):
           In [8]: %cpaste
           Pasting code; enter '--' alone on the line to stop.
           :>>> a = ["world!", "Hello"]
-          :>>> print " ".join(sorted(a))
+          :>>> print(" ".join(sorted(a)))
           :--
           Hello world!
+
+        ::
+          In [8]: %cpaste
+          Pasting code; enter '--' alone on the line to stop.
+          :>>> %alias_magic t timeit
+          :>>> %t -n1 pass
+          :--
+          Created `%t` as an alias for `%timeit`.
+          Created `%%t` as an alias for `%%timeit`.
+          354 ns ± 224 ns per loop (mean ± std. dev. of 7 runs, 1 loop each)
         """
         opts, name = self.parse_options(parameter_s, 'rqs:', mode='string')
         if 'r' in opts:

From 65c34c49df75dce643a87f2ecee39c3a5f9aa31a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 4 Oct 2021 09:07:06 -0700
Subject: [PATCH 0684/1407] Expand and Fix PDB skip.

This expand and fix the logic arround PBD skip.

1) it should support nested decorators, as long as they are all marked.
2) it will stop into breakpoints if those are set even in debuggerskip.
3) Documentation mentioned those facts.
---
 IPython/core/debugger.py            | 23 +++++++--
 IPython/core/tests/test_debugger.py | 78 ++++++++++++++++++++++++++++-
 2 files changed, 94 insertions(+), 7 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 11f1bec534e..0083f537227 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -24,8 +24,12 @@
 Frames containing ``__debuggerskip__`` will be stepped over, frames who's parent
 frames value of ``__debuggerskip__`` is ``True`` will be skipped.
 
-    >>> def helper_1():
+    >>> def helpers_helper():
+    ...     pass
+    ...
+    ... def helper_1():
     ...     print("don't step in me")
+    ...     helpers_helpers() # will be stepped over unless breakpoint set.
     ...
     ...
     ... def helper_2():
@@ -44,6 +48,7 @@
     ...         result = function(*args, **kwargs)
     ...         __debuggerskip__ = True
     ...         helper_2()
+    ...         # setting __debuggerskip__ to False again is not necessary
     ...         return result
     ...
     ...     return wrapped_fn
@@ -902,12 +907,16 @@ def break_anywhere(self, frame):
         stop at any point inside the function
 
         """
+
+        sup = super().break_anywhere(frame)
+        if sup:
+            return sup
         if self._predicates["debuggerskip"]:
             if DEBUGGERSKIP in frame.f_code.co_varnames:
                 return True
             if frame.f_back and self._get_frame_locals(frame.f_back).get(DEBUGGERSKIP):
                 return True
-        return super().break_anywhere(frame)
+        return False
 
     @skip_doctest
     def _is_in_decorator_internal_and_should_skip(self, frame):
@@ -926,9 +935,13 @@ def _is_in_decorator_internal_and_should_skip(self, frame):
         if DEBUGGERSKIP in frame.f_code.co_varnames:
             return True
 
-        # if parent frame value set to True skip as well.
-        if frame.f_back and self._get_frame_locals(frame.f_back).get(DEBUGGERSKIP):
-            return True
+        # if one of the parent frame value set to True skip as well.
+
+        cframe = frame
+        while getattr(cframe, "f_back", None):
+            cframe = cframe.f_back
+            if self._get_frame_locals(cframe).get(DEBUGGERSKIP):
+                return True
 
         return False
 
diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 217eb6bd3fa..7e1a07d5fb1 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -12,6 +12,7 @@
 import sys
 import time
 import warnings
+
 from subprocess import PIPE, CalledProcessError, check_output
 from tempfile import NamedTemporaryFile
 from textwrap import dedent
@@ -324,15 +325,31 @@ def g():
 
 
 skip_decorators_blocks = (
+    """
+    def helpers_helper():
+        pass # should not stop here except breakpoint
+    """,
     """
     def helper_1():
-        pass # should not stop here
+        helpers_helper() # should not stop here
     """,
     """
     def helper_2():
         pass # should not stop here
     """,
     """
+    def pdb_skipped_decorator2(function):
+        def wrapped_fn(*args, **kwargs):
+            __debuggerskip__ = True
+            helper_2()
+            __debuggerskip__ = False
+            result = function(*args, **kwargs)
+            __debuggerskip__ = True
+            helper_2()
+            return result
+        return wrapped_fn
+    """,
+    """
     def pdb_skipped_decorator(function):
         def wrapped_fn(*args, **kwargs):
             __debuggerskip__ = True
@@ -346,6 +363,7 @@ def wrapped_fn(*args, **kwargs):
     """,
     """
     @pdb_skipped_decorator
+    @pdb_skipped_decorator2
     def bar(x, y):
         return x * y
     """,
@@ -423,7 +441,7 @@ def test_decorator_skip_disabled():
         ("step", "----> 3         __debuggerskip__"),
         ("step", "----> 4         helper_1()"),
         ("step", "---> 1 def helper_1():"),
-        ("next", "----> 2     pass"),
+        ("next", "----> 2     helpers_helper()"),
         ("next", "--Return--"),
         ("next", "----> 5         __debuggerskip__ = False"),
     ]:
@@ -435,6 +453,62 @@ def test_decorator_skip_disabled():
     child.close()
 
 
+@skip_win32
+def test_decorator_skip_with_breakpoint():
+    """test that decorator frame skipping can be disabled"""
+
+    import pexpect
+
+    env = os.environ.copy()
+    env["IPY_TEST_SIMPLE_PROMPT"] = "1"
+
+    child = pexpect.spawn(
+        sys.executable, ["-m", "IPython", "--colors=nocolor"], env=env
+    )
+    child.timeout = 5 * IPYTHON_TESTING_TIMEOUT_SCALE
+
+    child.expect("IPython")
+    child.expect("\n")
+
+    ### we need a filename, so we need to exec the full block with a filename
+    with NamedTemporaryFile(suffix=".py", dir=".", delete=True) as tf:
+
+        name = tf.name[:-3].split("/")[-1]
+        tf.write("\n".join([dedent(x) for x in skip_decorators_blocks[:-1]]).encode())
+        tf.flush()
+        codeblock = f"from {name} import f"
+
+        dedented_blocks = [
+            codeblock,
+            "f()",
+        ]
+
+        in_prompt_number = 1
+        for cblock in dedented_blocks:
+            child.expect_exact(f"In [{in_prompt_number}]:")
+            in_prompt_number += 1
+            for line in cblock.splitlines():
+                child.sendline(line)
+                child.expect_exact(line)
+            child.sendline("")
+
+        # as the filename does not exists, we'll rely on the filename prompt
+        child.expect_exact("47     bar(3, 4)")
+
+        for input_, expected in [
+            (f"b {name}.py:3", ""),
+            ("step", "1---> 3     pass # should not stop here except"),
+            ("step", "---> 38 @pdb_skipped_decorator"),
+            ("continue", ""),
+        ]:
+            child.expect("ipdb>")
+            child.sendline(input_)
+            child.expect_exact(input_)
+            child.expect_exact(expected)
+
+    child.close()
+
+
 @skip_win32
 def test_where_erase_value():
     """Test that `where` does not access f_locals and erase values."""

From 9d184baa2f8d162cba3ea3b363a8f3453b2d4e36 Mon Sep 17 00:00:00 2001
From: Thomas A Caswell <tcaswell@gmail.com>
Date: Wed, 6 Oct 2021 20:00:17 -0400
Subject: [PATCH 0685/1407] FIX: make sure all of the Qt backends map to the qt
 event loop

---
 IPython/core/pylabtools.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index 3ad575ae931..7ebcf1e6df6 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -41,8 +41,6 @@
 # most part it's just a reverse of the above dict, but we also need to add a
 # few others that map to the same GUI manually:
 backend2gui = dict(zip(backends.values(), backends.keys()))
-# Our tests expect backend2gui to just return 'qt'
-backend2gui['Qt4Agg'] = 'qt'
 # In the reverse mapping, there are a few extra valid matplotlib backends that
 # map to the same GUI support
 backend2gui["GTK"] = backend2gui["GTKCairo"] = "gtk"
@@ -50,6 +48,13 @@
 backend2gui["GTK4Cairo"] = "gtk4"
 backend2gui["WX"] = "wx"
 backend2gui["CocoaAgg"] = "osx"
+# There needs to be a hysteresis here as the new QtAgg Matplotlib backend
+# supports either Qt5 or Qt6 and the IPython qt event loop support Qt4, Qt5,
+# and Qt6.
+backend2gui["QtAgg"] = "qt"
+backend2gui["Qt4Agg"] = "qt"
+backend2gui["Qt5Agg"] = "qt"
+
 # And some backends that don't need GUI integration
 del backend2gui["nbAgg"]
 del backend2gui["agg"]

From 5431ad665205af68171ac51e2e364f67bc6d450f Mon Sep 17 00:00:00 2001
From: Thomas A Caswell <tcaswell@gmail.com>
Date: Wed, 6 Oct 2021 20:05:35 -0400
Subject: [PATCH 0686/1407] FIX: ipympl does not need event loop support

---
 IPython/core/pylabtools.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index 7ebcf1e6df6..36b7276b8b2 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -62,6 +62,7 @@
 del backend2gui["pdf"]
 del backend2gui["ps"]
 del backend2gui["module://matplotlib_inline.backend_inline"]
+del backend2gui["module://ipympl.backend_nbagg"]
 
 #-----------------------------------------------------------------------------
 # Matplotlib utilities

From 7a20999bb2097a781b81e3098ba3e379cdd6b14e Mon Sep 17 00:00:00 2001
From: Bibo Hao <haobibo@users.noreply.github.com>
Date: Fri, 8 Oct 2021 08:43:44 +0000
Subject: [PATCH 0687/1407] create ipython_dir if not exists

---
 IPython/paths.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/paths.py b/IPython/paths.py
index 43146b0bb75..a2ea5bc1159 100644
--- a/IPython/paths.py
+++ b/IPython/paths.py
@@ -71,6 +71,8 @@ def get_ipython_dir() -> str:
             warn("IPython parent '{0}' is not a writable location,"
                     " using a temp directory.".format(parent))
             ipdir = tempfile.mkdtemp()
+        else:
+            os.makedirs(ipdir)
     assert isinstance(ipdir, str), "all path manipulation should be str(unicode), but are not."
     return ipdir
 

From 26b7363f293141541ad7ec003a26a48b82392454 Mon Sep 17 00:00:00 2001
From: Bibo Hao <haobibo@users.noreply.github.com>
Date: Fri, 8 Oct 2021 09:48:36 +0000
Subject: [PATCH 0688/1407] update test case for writable folder

---
 IPython/core/tests/test_paths.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IPython/core/tests/test_paths.py b/IPython/core/tests/test_paths.py
index ab1c4132a8e..524a74d18a0 100644
--- a/IPython/core/tests/test_paths.py
+++ b/IPython/core/tests/test_paths.py
@@ -160,6 +160,10 @@ def test_get_ipython_dir_7():
 @skip_win32
 def test_get_ipython_dir_8():
     """test_get_ipython_dir_8, test / home directory"""
+    if not os.path.isdir('/') or not os.access('/', os.W_OK):
+        # test only when HOME directory actually writable
+        return
+
     with patch.object(paths, '_writable_dir', lambda path: bool(path)), \
             patch.object(paths, 'get_xdg_dir', return_value=None), \
             modified_env({

From 7289630f5c158551084dbfe2e001da3eca8db4b9 Mon Sep 17 00:00:00 2001
From: Bibo Hao <haobibo@users.noreply.github.com>
Date: Fri, 8 Oct 2021 09:51:45 +0000
Subject: [PATCH 0689/1407] rm redundant if

---
 IPython/core/tests/test_paths.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_paths.py b/IPython/core/tests/test_paths.py
index 524a74d18a0..6b39b9c1791 100644
--- a/IPython/core/tests/test_paths.py
+++ b/IPython/core/tests/test_paths.py
@@ -160,7 +160,7 @@ def test_get_ipython_dir_7():
 @skip_win32
 def test_get_ipython_dir_8():
     """test_get_ipython_dir_8, test / home directory"""
-    if not os.path.isdir('/') or not os.access('/', os.W_OK):
+    if not os.access('/', os.W_OK):
         # test only when HOME directory actually writable
         return
 

From 397338f0ee4fcbcab962d3153d791250a1f7de3f Mon Sep 17 00:00:00 2001
From: Bibo Hao <haobibo@users.noreply.github.com>
Date: Fri, 8 Oct 2021 10:00:53 +0000
Subject: [PATCH 0690/1407] lint - use double quote

---
 IPython/core/tests/test_paths.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_paths.py b/IPython/core/tests/test_paths.py
index 6b39b9c1791..2182cb7cb0c 100644
--- a/IPython/core/tests/test_paths.py
+++ b/IPython/core/tests/test_paths.py
@@ -160,7 +160,7 @@ def test_get_ipython_dir_7():
 @skip_win32
 def test_get_ipython_dir_8():
     """test_get_ipython_dir_8, test / home directory"""
-    if not os.access('/', os.W_OK):
+    if not os.access("/", os.W_OK):
         # test only when HOME directory actually writable
         return
 

From f19f594066bb6821efb698b0c14de3ba8a1e88e6 Mon Sep 17 00:00:00 2001
From: Matthew Feickert <matthew.feickert@cern.ch>
Date: Sat, 9 Oct 2021 14:12:04 -0500
Subject: [PATCH 0691/1407] ci: Add schedule and workflow_dispatch support

---
 .github/workflows/test.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b9bbae48cf7..9f9d938969c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,6 +1,13 @@
 name: Run tests
 
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  # Run weekly on Monday at 1:23 UTC
+  schedule:
+  - cron:  '23 1 * * 1'
+  workflow_dispatch:
+
 
 jobs:
   test:

From b010c15d1134a90c44ef07c22e821266dcc8bd8e Mon Sep 17 00:00:00 2001
From: Matthew Feickert <matthew.feickert@cern.ch>
Date: Sat, 9 Oct 2021 14:18:31 -0500
Subject: [PATCH 0692/1407] ci: Add testing for macOS on ends

---
 .github/workflows/test.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9f9d938969c..c98d24ef823 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,10 +11,17 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        os: [ubuntu-latest]
+        python-version: ["3.7", "3.8", "3.9"]
+        # Test all on ubuntu, test ends on macos
+        include:
+          - os: macos-latest
+            python-version: "3.7"
+          - os: macos-latest
+            python-version: "3.9"
 
     steps:
     - uses: actions/checkout@v2
@@ -40,4 +47,5 @@ jobs:
       run: |
         pytest
     - name: Upload coverage to Codecov
+      if: matrix.os == 'ubuntu-latest'
       uses: codecov/codecov-action@v1

From 3158a1434dbf9c460431b4b35ab09e5caf754089 Mon Sep 17 00:00:00 2001
From: Matthew Feickert <matthew.feickert@cern.ch>
Date: Sat, 9 Oct 2021 14:19:35 -0500
Subject: [PATCH 0693/1407] ci: Remove now redundant workflow

---
 .github/workflows/test-osx.yml | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 .github/workflows/test-osx.yml

diff --git a/.github/workflows/test-osx.yml b/.github/workflows/test-osx.yml
deleted file mode 100644
index c9afbe0a0ea..00000000000
--- a/.github/workflows/test-osx.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Run tests on OSX
-
-on: [push, pull_request]
-
-jobs:
-  test:
-    runs-on: macos-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
-    - name: Install and update Python dependencies
-      run: |
-        python -m pip install --upgrade pip setuptools wheel
-        python -m pip install --upgrade -e file://$PWD#egg=ipython[test]
-        python -m pip install --upgrade --upgrade-strategy eager trio curio
-        python -m pip install --upgrade pytest pytest-trio 'matplotlib!=3.2.0'
-        python -m pip install --upgrade anyio
-    - name: pytest
-      run: pytest

From 02901f75b7fbf2bed3b2034909d2a8041a99a3b9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 11 Oct 2021 10:01:39 -0700
Subject: [PATCH 0694/1407] Update .github/workflows/test.yml

---
 .github/workflows/test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c98d24ef823..2788e8640a8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -47,5 +47,4 @@ jobs:
       run: |
         pytest
     - name: Upload coverage to Codecov
-      if: matrix.os == 'ubuntu-latest'
       uses: codecov/codecov-action@v1

From 27987a540065895922fc53b6b0abf6b497eef757 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sun, 17 Oct 2021 12:42:52 +0100
Subject: [PATCH 0695/1407] Use codecov Github action v2

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2788e8640a8..2ac1b746a84 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -47,4 +47,4 @@ jobs:
       run: |
         pytest
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v2

From 25f92b9988c81b70b444e88b4afc5aab8a875d8e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 16 Oct 2021 11:34:47 -0700
Subject: [PATCH 0696/1407] Try to fix some of current failures.

See error found in CI below. Hopefully this fixes it.

There are manycomplexity, we need to make sure the loop has no task
after each tests, so we need to close and restore the subprocess
watcher.

We make it a context manager and provide a decorator.

    ======================================================================
    ERROR: IPython.core.tests.test_magic.test_script_out
    ----------------------------------------------------------------------
    Traceback (most recent call last):
      File "/opt/hostedtoolcache/Python/3.7.12/x64/lib/python3.7/site-packages/nose/case.py", line 198, in runTest
        self.test(*self.arg)
      File "/home/runner/work/ipython/ipython/IPython/testing/decorators.py", line 223, in skipper_func
        return f(*args, **kwargs)
      File "/home/runner/work/ipython/ipython/IPython/core/tests/test_magic.py", line 953, in test_script_out
        ip.run_cell_magic("script", "--out output sh", "echo 'hi'")
      File "/home/runner/work/ipython/ipython/IPython/core/interactiveshell.py", line 2417, in run_cell_magic
        result = fn(*args, **kwargs)
      File "/opt/hostedtoolcache/Python/3.7.12/x64/lib/python3.7/site-packages/decorator.py", line 232, in fun
        return caller(func, *(extras + args), **kw)
      File "/home/runner/work/ipython/ipython/IPython/core/magic.py", line 187, in <lambda>
        call = lambda f, *a, **k: f(*a, **k)
      File "/home/runner/work/ipython/ipython/IPython/core/magics/script.py", line 216, in shebang
        stdin=asyncio.subprocess.PIPE,
      File "/opt/hostedtoolcache/Python/3.7.12/x64/lib/python3.7/asyncio/base_events.py", line 587, in run_until_complete
        return future.result()
      File "/opt/hostedtoolcache/Python/3.7.12/x64/lib/python3.7/asyncio/subprocess.py", line 217, in create_subprocess_exec
        stderr=stderr, **kwds)
      File "/opt/hostedtoolcache/Python/3.7.12/x64/lib/python3.7/asyncio/base_events.py", line 1544, in subprocess_exec
        bufsize, **kwargs)
      File "/opt/hostedtoolcache/Python/3.7.12/x64/lib/python3.7/asyncio/unix_events.py", line 193, in _make_subprocess_transport
        self._child_watcher_callback, transp)
      File "/opt/hostedtoolcache/Python/3.7.12/x64/lib/python3.7/asyncio/unix_events.py", line 941, in add_child_handler
        "Cannot add child handler, "
    RuntimeError: Cannot add child handler, the child watcher does not have a loop attached
---
 .github/workflows/python-package.yml |  1 +
 .github/workflows/test.yml           |  2 +-
 IPython/core/magics/script.py        | 53 ++++++++++++++++++++++------
 IPython/core/tests/test_magic.py     | 53 +++++++++++++++++++---------
 4 files changed, 81 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index ef24d627813..36ae8187fe2 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -13,6 +13,7 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     strategy:
       matrix:
         python-version: [3.8]
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2788e8640a8..19a0ba05158 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -45,6 +45,6 @@ jobs:
         cp /tmp/.coverage ./
     - name: pytest
       run: |
-        pytest
+        pytest -v
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v1
diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index d4e7b08c3c1..99258a87d96 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -3,24 +3,24 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+import asyncio
+import atexit
 import errno
+import functools
 import os
-import sys
 import signal
+import sys
 import time
-import asyncio
-import atexit
-
+from asyncio import SafeChildWatcher
+from contextlib import contextmanager
 from subprocess import CalledProcessError
 
+from traitlets import Dict, List, default
+
 from IPython.core import magic_arguments
-from IPython.core.magic import  (
-    Magics, magics_class, line_magic, cell_magic
-)
+from IPython.core.magic import Magics, cell_magic, line_magic, magics_class
 from IPython.lib.backgroundjobs import BackgroundJobManager
 from IPython.utils.process import arg_split
-from traitlets import List, Dict, default
-
 
 #-----------------------------------------------------------------------------
 # Magic implementation classes
@@ -67,6 +67,39 @@ def script_args(f):
         f = arg(f)
     return f
 
+
+@contextmanager
+def safe_watcher():
+    if sys.platform == "win32":
+        yield
+        return
+
+    policy = asyncio.get_event_loop_policy()
+    old_watcher = policy.get_child_watcher()
+    if isinstance(old_watcher, SafeChildWatcher):
+        yield
+        return
+
+    loop = asyncio.get_event_loop()
+    try:
+        watcher = asyncio.SafeChildWatcher()
+        watcher.attach_loop(loop)
+        policy.set_child_watcher(watcher)
+        yield
+    finally:
+        watcher.close()
+        policy.set_child_watcher(old_watcher)
+
+
+def dec_safe_watcher(fun):
+    @functools.wraps(fun)
+    def _inner(*args, **kwargs):
+        with safe_watcher():
+            return fun(*args, **kwargs)
+
+    return _inner
+
+
 @magics_class
 class ScriptMagics(Magics):
     """Magics for talking to scripts
@@ -157,6 +190,7 @@ def named_script_magic(line, cell):
     @magic_arguments.magic_arguments()
     @script_args
     @cell_magic("script")
+    @dec_safe_watcher
     def shebang(self, line, cell):
         """Run a cell via a shell command
         
@@ -204,7 +238,6 @@ async def _stream_communicate(process, cell):
         if sys.platform.startswith("win"):
             asyncio.set_event_loop_policy(asyncio.WindowsProactorEventLoopPolicy())
         loop = asyncio.get_event_loop()
-
         argv = arg_split(line, posix=not sys.platform.startswith("win"))
         args, cmd = self.shebang.parser.parse_known_args(argv)
         try:
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index fd5696d686f..6ecbe61f387 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -4,38 +4,40 @@
 Needs to be run by nose (to make ipython session available).
 """
 
+import asyncio
 import io
 import os
 import re
+import shlex
 import sys
 import warnings
-from textwrap import dedent
-from unittest import TestCase
-from unittest import mock
 from importlib import invalidate_caches
 from io import StringIO
 from pathlib import Path
+from textwrap import dedent
+from unittest import TestCase, mock
 
 import nose.tools as nt
 
-import shlex
-
 from IPython import get_ipython
 from IPython.core import magic
 from IPython.core.error import UsageError
-from IPython.core.magic import (Magics, magics_class, line_magic,
-                                cell_magic,
-                                register_line_magic, register_cell_magic)
-from IPython.core.magics import execution, script, code, logging, osm
+from IPython.core.magic import (
+    Magics,
+    cell_magic,
+    line_magic,
+    magics_class,
+    register_cell_magic,
+    register_line_magic,
+)
+from IPython.core.magics import code, execution, logging, osm, script
 from IPython.testing import decorators as dec
 from IPython.testing import tools as tt
 from IPython.utils.io import capture_output
-from IPython.utils.tempdir import (TemporaryDirectory,
-                                    TemporaryWorkingDirectory)
 from IPython.utils.process import find_cmd
-from .test_debugger import PdbTestInput
+from IPython.utils.tempdir import TemporaryDirectory, TemporaryWorkingDirectory
 
-import pytest
+from .test_debugger import PdbTestInput
 
 
 @magic.magics_class
@@ -947,32 +949,48 @@ def test_script_config():
     sm = script.ScriptMagics(shell=ip)
     nt.assert_in('whoda', sm.magics['cell'])
 
+@dec.skip_iptest_but_not_pytest
 @dec.skip_win32
 def test_script_out():
+    assert asyncio.get_event_loop().is_running() is False
+
     ip = get_ipython()
     ip.run_cell_magic("script", "--out output sh", "echo 'hi'")
+    assert asyncio.get_event_loop().is_running() is False
     nt.assert_equal(ip.user_ns['output'], 'hi\n')
 
+@dec.skip_iptest_but_not_pytest
 @dec.skip_win32
 def test_script_err():
     ip = get_ipython()
+    assert asyncio.get_event_loop().is_running() is False
     ip.run_cell_magic("script", "--err error sh", "echo 'hello' >&2")
+    assert asyncio.get_event_loop().is_running() is False
     nt.assert_equal(ip.user_ns['error'], 'hello\n')
 
+
+@dec.skip_iptest_but_not_pytest
 @dec.skip_win32
 def test_script_out_err():
+
     ip = get_ipython()
-    ip.run_cell_magic("script", "--out output --err error sh", "echo 'hi'\necho 'hello' >&2")
-    nt.assert_equal(ip.user_ns['output'], 'hi\n')
-    nt.assert_equal(ip.user_ns['error'], 'hello\n')
+    ip.run_cell_magic(
+        "script", "--out output --err error sh", "echo 'hi'\necho 'hello' >&2"
+    )
+    nt.assert_equal(ip.user_ns["output"], "hi\n")
+    nt.assert_equal(ip.user_ns["error"], "hello\n")
 
+
+@dec.skip_iptest_but_not_pytest
 @dec.skip_win32
 async def test_script_bg_out():
     ip = get_ipython()
     ip.run_cell_magic("script", "--bg --out output sh", "echo 'hi'")
     nt.assert_equal((await ip.user_ns["output"].read()), b"hi\n")
-    ip.user_ns['output'].close()
+    ip.user_ns["output"].close()
+    asyncio.get_event_loop().stop()
 
+@dec.skip_iptest_but_not_pytest
 @dec.skip_win32
 async def test_script_bg_err():
     ip = get_ipython()
@@ -981,6 +999,7 @@ async def test_script_bg_err():
     ip.user_ns["error"].close()
 
 
+@dec.skip_iptest_but_not_pytest
 @dec.skip_win32
 async def test_script_bg_out_err():
     ip = get_ipython()

From b93fe0c828c23d4b0c87fcf8fb70c9acd43d1603 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 17 Oct 2021 13:18:58 -0700
Subject: [PATCH 0697/1407] more agressive skip on windows

---
 IPython/core/tests/test_magic.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 6ecbe61f387..d534d11018b 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -19,6 +19,8 @@
 
 import nose.tools as nt
 
+import pytest
+
 from IPython import get_ipython
 from IPython.core import magic
 from IPython.core.error import UsageError
@@ -951,6 +953,9 @@ def test_script_config():
 
 @dec.skip_iptest_but_not_pytest
 @dec.skip_win32
+@pytest.mark.skipif(
+    sys.platform == "win32", reason="This test does not run under Windows"
+)
 def test_script_out():
     assert asyncio.get_event_loop().is_running() is False
 
@@ -961,6 +966,9 @@ def test_script_out():
 
 @dec.skip_iptest_but_not_pytest
 @dec.skip_win32
+@pytest.mark.skipif(
+    sys.platform == "win32", reason="This test does not run under Windows"
+)
 def test_script_err():
     ip = get_ipython()
     assert asyncio.get_event_loop().is_running() is False
@@ -971,6 +979,9 @@ def test_script_err():
 
 @dec.skip_iptest_but_not_pytest
 @dec.skip_win32
+@pytest.mark.skipif(
+    sys.platform == "win32", reason="This test does not run under Windows"
+)
 def test_script_out_err():
 
     ip = get_ipython()
@@ -983,6 +994,9 @@ def test_script_out_err():
 
 @dec.skip_iptest_but_not_pytest
 @dec.skip_win32
+@pytest.mark.skipif(
+    sys.platform == "win32", reason="This test does not run under Windows"
+)
 async def test_script_bg_out():
     ip = get_ipython()
     ip.run_cell_magic("script", "--bg --out output sh", "echo 'hi'")
@@ -992,6 +1006,9 @@ async def test_script_bg_out():
 
 @dec.skip_iptest_but_not_pytest
 @dec.skip_win32
+@pytest.mark.skipif(
+    sys.platform == "win32", reason="This test does not run under Windows"
+)
 async def test_script_bg_err():
     ip = get_ipython()
     ip.run_cell_magic("script", "--bg --err error sh", "echo 'hello' >&2")
@@ -1001,6 +1018,9 @@ async def test_script_bg_err():
 
 @dec.skip_iptest_but_not_pytest
 @dec.skip_win32
+@pytest.mark.skipif(
+    sys.platform == "win32", reason="This test does not run under Windows"
+)
 async def test_script_bg_out_err():
     ip = get_ipython()
     ip.run_cell_magic(

From f7213ea2a130207450771054ea17fc7df45625f2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 17 Oct 2021 17:24:42 -0700
Subject: [PATCH 0698/1407] conditional windows import

---
 IPython/core/magics/script.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index 99258a87d96..5bf6a023e13 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -11,7 +11,6 @@
 import signal
 import sys
 import time
-from asyncio import SafeChildWatcher
 from contextlib import contextmanager
 from subprocess import CalledProcessError
 
@@ -74,6 +73,8 @@ def safe_watcher():
         yield
         return
 
+    from asyncio import SafeChildWatcher
+
     policy = asyncio.get_event_loop_policy()
     old_watcher = policy.get_child_watcher()
     if isinstance(old_watcher, SafeChildWatcher):

From 887df6c2966685672f5236dc7ece8b29800b38df Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Mon, 18 Oct 2021 12:51:17 +0200
Subject: [PATCH 0699/1407] match log message for profile by name and path

we had debug-level for name, info-level for full path.

Make both debug-level for consistency
---
 IPython/core/application.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/application.py b/IPython/core/application.py
index db48ab2bb44..85c91274d4e 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -398,7 +398,7 @@ def init_profile_dir(self):
                     self.log.fatal("Profile %r not found."%self.profile)
                     self.exit(1)
             else:
-                self.log.debug("Using existing profile dir: %r"%p.location)
+                self.log.debug(f"Using existing profile dir: {p.location!r}")
         else:
             location = self.config.ProfileDir.location
             # location is fully specified
@@ -418,7 +418,7 @@ def init_profile_dir(self):
                     self.log.fatal("Profile directory %r not found."%location)
                     self.exit(1)
             else:
-                self.log.info("Using existing profile dir: %r"%location)
+                self.log.debug(f"Using existing profile dir: {p.location!r}")
             # if profile_dir is specified explicitly, set profile name
             dir_name = os.path.basename(p.location)
             if dir_name.startswith('profile_'):

From e8d652a21b5b829b8d494741bee11eff614622c6 Mon Sep 17 00:00:00 2001
From: gpotter2 <gabriel@potter.fr>
Date: Wed, 13 Oct 2021 15:43:35 +0200
Subject: [PATCH 0700/1407] Call inspect.signature on full class

---
 IPython/core/completer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 9237929f9a7..167acbd643c 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1542,7 +1542,7 @@ def _default_arguments(self, obj):
                   inspect.Parameter.POSITIONAL_OR_KEYWORD)
 
         try:
-            sig = inspect.signature(call_obj)
+            sig = inspect.signature(obj)
             ret.extend(k for k, v in sig.parameters.items() if
                        v.kind in _keeps)
         except ValueError:

From be24009069749d2f01bec90b361b8f389f9c35f6 Mon Sep 17 00:00:00 2001
From: Meysam Azad <MeysamAzad81@gmail.com>
Date: Sun, 17 Oct 2021 19:50:10 +0300
Subject: [PATCH 0701/1407] =?UTF-8?q?feat:=20remove=20deprecated=20code=20?=
 =?UTF-8?q?&=20files=20=E2=9A=B0=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IPython/__init__.py                 |  5 -----
 IPython/extensions/cythonmagic.py   | 21 -------------------
 IPython/extensions/rmagic.py        | 12 -----------
 IPython/extensions/sympyprinting.py | 32 -----------------------------
 4 files changed, 70 deletions(-)
 delete mode 100644 IPython/extensions/cythonmagic.py
 delete mode 100644 IPython/extensions/rmagic.py
 delete mode 100644 IPython/extensions/sympyprinting.py

diff --git a/IPython/__init__.py b/IPython/__init__.py
index 0b182bd8400..7d098bc9ee7 100644
--- a/IPython/__init__.py
+++ b/IPython/__init__.py
@@ -41,11 +41,6 @@
 
 """)
 
-# Make it easy to import extensions - they are always directly on pythonpath.
-# Therefore, non-IPython modules can be added to extensions directory.
-# This should probably be in ipapp.py.
-sys.path.append(os.path.join(os.path.dirname(__file__), "extensions"))
-
 #-----------------------------------------------------------------------------
 # Setup the top level names
 #-----------------------------------------------------------------------------
diff --git a/IPython/extensions/cythonmagic.py b/IPython/extensions/cythonmagic.py
deleted file mode 100644
index 3c88e7c2a1c..00000000000
--- a/IPython/extensions/cythonmagic.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-**DEPRECATED**
-
-The cython magic has been integrated into Cython itself, 
-which is now released in version 0.21.
-
-cf github `Cython` organisation, `Cython` repo, under the 
-file `Cython/Build/IpythonMagic.py`
-"""
-#-----------------------------------------------------------------------------
-# Copyright (C) 2010-2011, IPython Development Team.
-#-----------------------------------------------------------------------------
-
-import warnings
-
-## still load the magic in IPython 3.x, remove completely in future versions.
-def load_ipython_extension(ip):
-    """Load the extension in IPython."""
-
-    warnings.warn("""The Cython magic has been moved to the Cython package""")
diff --git a/IPython/extensions/rmagic.py b/IPython/extensions/rmagic.py
deleted file mode 100644
index ec5763972e4..00000000000
--- a/IPython/extensions/rmagic.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#-----------------------------------------------------------------------------
-#  Copyright (C) 2012 The IPython Development Team
-#-----------------------------------------------------------------------------
-
-import warnings
-
-def load_ipython_extension(ip):
-    """Load the extension in IPython."""
-    warnings.warn("The rmagic extension in IPython has moved to "
-            "`rpy2.ipython`, please see `rpy2` documentation.")
diff --git a/IPython/extensions/sympyprinting.py b/IPython/extensions/sympyprinting.py
deleted file mode 100644
index e6a83cd34b6..00000000000
--- a/IPython/extensions/sympyprinting.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""
-**DEPRECATED**
-
-A print function that pretty prints sympy Basic objects.
-
-:moduleauthor: Brian Granger
-
-Usage
-=====
-
-Once the extension is loaded, Sympy Basic objects are automatically
-pretty-printed.
-
-As of SymPy 0.7.2, maintenance of this extension has moved to SymPy under
-sympy.interactive.ipythonprinting, any modifications to account for changes to
-SymPy should be submitted to SymPy rather than changed here. This module is
-maintained here for backwards compatibility with old SymPy versions.
-
-"""
-#-----------------------------------------------------------------------------
-#  Copyright (C) 2008  The IPython Development Team
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
-
-import warnings
-
-def load_ipython_extension(ip):
-    warnings.warn("The sympyprinting extension has moved to `sympy`, "
-        "use `from sympy import init_printing; init_printing()`")

From bd9c17bf479482b5b6d98994c2710b0e1e2839c4 Mon Sep 17 00:00:00 2001
From: Meysam Azad <MeysamAzad81@gmail.com>
Date: Sun, 17 Oct 2021 22:55:40 +0300
Subject: [PATCH 0702/1407] =?UTF-8?q?docs:=20add=20changelog=20notice=20?=
 =?UTF-8?q?=F0=9F=93=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/source/whatsnew/pr/remove-deprecated-stuff.rst | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/remove-deprecated-stuff.rst

diff --git a/docs/source/whatsnew/pr/remove-deprecated-stuff.rst b/docs/source/whatsnew/pr/remove-deprecated-stuff.rst
new file mode 100644
index 00000000000..2a948e4f2d1
--- /dev/null
+++ b/docs/source/whatsnew/pr/remove-deprecated-stuff.rst
@@ -0,0 +1,8 @@
+Remove Deprecated Stuff
+================================
+
+We no longer need to add `extensions` to the PYTHONPATH because that is being
+handled by `load_extension`.
+
+We are also removing Cythonmagic, sympyprinting and rmagic as they are now in
+other packages and no longer need to be inside IPython.

From 37c1038b91bc3415f2bf0f43bb52138934a7e505 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 18 Oct 2021 15:28:03 -0700
Subject: [PATCH 0703/1407] hardcode builtins extensions

---
 IPython/core/extensions.py | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/IPython/core/extensions.py b/IPython/core/extensions.py
index db3b040d24f..ce419e1bd40 100644
--- a/IPython/core/extensions.py
+++ b/IPython/core/extensions.py
@@ -19,6 +19,9 @@
 # Main class
 #-----------------------------------------------------------------------------
 
+BUILTINS_EXTS = {"storemagic": False, "autoreload": False}
+
+
 class ExtensionManager(Configurable):
     """A class to manage IPython extensions.
 
@@ -62,13 +65,22 @@ def ipython_extension_dir(self):
     def _on_ipython_dir_changed(self, change):
         ensure_dir_exists(self.ipython_extension_dir)
 
-    def load_extension(self, module_str):
+    def load_extension(self, module_str: str):
         """Load an IPython extension by its module name.
 
         Returns the string "already loaded" if the extension is already loaded,
         "no load function" if the module doesn't have a load_ipython_extension
         function, or None if it succeeded.
         """
+        try:
+            return self._load_extension(module_str)
+        except ModuleNotFoundError:
+            if module_str in BUILTINS_EXTS:
+                BUILTINS_EXTS[module_str] = True
+                return self._load_extension("IPython.extensions." + module_str)
+            raise
+
+    def _load_extension(self, module_str: str):
         if module_str in self.loaded:
             return "already loaded"
 
@@ -89,7 +101,7 @@ def load_extension(self, module_str):
             else:
                 return "no load function"
 
-    def unload_extension(self, module_str):
+    def unload_extension(self, module_str: str):
         """Unload an IPython extension by its module name.
 
         This function looks up the extension's name in ``sys.modules`` and
@@ -99,9 +111,11 @@ def unload_extension(self, module_str):
         a function to unload itself, "not loaded" if the extension isn't loaded,
         otherwise None.
         """
+        if BUILTINS_EXTS.get(module_str, False) is True:
+            module_str = "IPython.extensions." + module_str
         if module_str not in self.loaded:
             return "not loaded"
-        
+
         if module_str in sys.modules:
             mod = sys.modules[module_str]
             if self._call_unload_ipython_extension(mod):
@@ -109,7 +123,7 @@ def unload_extension(self, module_str):
             else:
                 return "no unload function"
 
-    def reload_extension(self, module_str):
+    def reload_extension(self, module_str: str):
         """Reload an IPython extension by calling reload.
 
         If the module has not been loaded before,
@@ -119,6 +133,9 @@ def reload_extension(self, module_str):
         """
         from IPython.utils.syspathcontext import prepended_to_syspath
 
+        if BUILTINS_EXTS.get(module_str, False) is True:
+            module_str = "IPython.extensions." + module_str
+
         if (module_str in self.loaded) and (module_str in sys.modules):
             self.unload_extension(module_str)
             mod = sys.modules[module_str]

From 17153999ccdd336213a1e2d85ffc4b66f402e595 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 20 Oct 2021 00:53:33 +0300
Subject: [PATCH 0704/1407] Fix unintentional skipping of module level doctests

Importing `skip_doctest` decorator unintentionally marks for skipping a module level doctest. It happens because doctests discovery only checks whether a variable with name `skip_doctest` is presented without checking the type.

I have renamed the 'magic' variable name to `__skip_doctest__` to resolve the name clash, and also made the check actually depend on the variable content.

The module level doctest in `core/debugger.py` was previously unintentionally skipped and now is disabled because it contains syntax/name errors.
---
 IPython/core/completer.py           | 2 +-
 IPython/core/debugger.py            | 2 ++
 IPython/extensions/autoreload.py    | 2 +-
 IPython/testing/plugin/ipdoctest.py | 2 +-
 IPython/testing/skipdoctest.py      | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 167acbd643c..8ec99f4d7a2 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -142,7 +142,7 @@
 import __main__
 
 # skip module docstests
-skip_doctest = True
+__skip_doctest__ = True
 
 try:
     import jedi
diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 0083f537227..751145843c9 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -116,6 +116,8 @@
 from IPython.core.excolors import exception_colors
 from IPython.testing.skipdoctest import skip_doctest
 
+# skip module docstests
+__skip_doctest__ = True
 
 prompt = 'ipdb> '
 
diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index f481520a4c5..bcf1a198021 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -97,7 +97,7 @@
 - C extension modules cannot be reloaded, and so cannot be autoreloaded.
 """
 
-skip_doctest = True
+__skip_doctest__ = True
 
 # -----------------------------------------------------------------------------
 #  Copyright (C) 2000 Thomas Heller
diff --git a/IPython/testing/plugin/ipdoctest.py b/IPython/testing/plugin/ipdoctest.py
index 407aeb6f4f4..fdc8822b853 100644
--- a/IPython/testing/plugin/ipdoctest.py
+++ b/IPython/testing/plugin/ipdoctest.py
@@ -125,7 +125,7 @@ def _find(self, tests, obj, name, module, source_lines, globs, seen):
         add them to `tests`.
         """
         print('_find for:', obj, name, module)  # dbg
-        if hasattr(obj,"skip_doctest"):
+        if bool(getattr(obj, "__skip_doctest__", False)):
             #print 'SKIPPING DOCTEST FOR:',obj  # dbg
             obj = DocTestSkip(obj)
         
diff --git a/IPython/testing/skipdoctest.py b/IPython/testing/skipdoctest.py
index b0cf83c449e..f440ea14b27 100644
--- a/IPython/testing/skipdoctest.py
+++ b/IPython/testing/skipdoctest.py
@@ -15,5 +15,5 @@ def skip_doctest(f):
     This decorator allows you to mark a function whose docstring you wish to
     omit from testing, while preserving the docstring for introspection, help,
     etc."""
-    f.skip_doctest = True
+    f.__skip_doctest__ = True
     return f

From 91936a9d1c432270c7273c090fc6857dcceafd1a Mon Sep 17 00:00:00 2001
From: Dimitri Papadopoulos
 <3234522+DimitriPapadopoulos@users.noreply.github.com>
Date: Wed, 20 Oct 2021 22:29:44 +0200
Subject: [PATCH 0705/1407] Do not use mutables as default arguments

---
 docs/sphinxext/github.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/sphinxext/github.py b/docs/sphinxext/github.py
index a24b5a62e47..f56181e64e9 100644
--- a/docs/sphinxext/github.py
+++ b/docs/sphinxext/github.py
@@ -51,7 +51,7 @@ def make_link_node(rawtext, app, type, slug, options):
                            **options)
     return node
 
-def ghissue_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
+def ghissue_role(name, rawtext, text, lineno, inliner, options=None, content=None):
     """Link to a GitHub issue.
 
     Returns 2 part tuple containing list of nodes to insert into the
@@ -66,6 +66,8 @@ def ghissue_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
     :param options: Directive options for customization.
     :param content: The directive content for customization.
     """
+    if options is None:
+        options = {}
 
     try:
         issue_num = int(text)
@@ -92,7 +94,7 @@ def ghissue_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
     node = make_link_node(rawtext, app, category, str(issue_num), options)
     return [node], []
 
-def ghuser_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
+def ghuser_role(name, rawtext, text, lineno, inliner, options=None, content=None):
     """Link to a GitHub user.
 
     Returns 2 part tuple containing list of nodes to insert into the
@@ -107,13 +109,16 @@ def ghuser_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
     :param options: Directive options for customization.
     :param content: The directive content for customization.
     """
+    if options is None:
+        options = {}
+
     app = inliner.document.settings.env.app
     #info('user link %r' % text)
     ref = 'https://www.github.com/' + text
     node = nodes.reference(rawtext, text, refuri=ref, **options)
     return [node], []
 
-def ghcommit_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
+def ghcommit_role(name, rawtext, text, lineno, inliner, options=None, content=None):
     """Link to a GitHub commit.
 
     Returns 2 part tuple containing list of nodes to insert into the
@@ -128,6 +133,9 @@ def ghcommit_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
     :param options: Directive options for customization.
     :param content: The directive content for customization.
     """
+    if options is None:
+        options = {}
+
     app = inliner.document.settings.env.app
     #info('user link %r' % text)
     try:

From 5f90ef7cc824f6dd4b53583ef8d4d9fc91ba95d1 Mon Sep 17 00:00:00 2001
From: Dimitri Papadopoulos
 <3234522+DimitriPapadopoulos@users.noreply.github.com>
Date: Wed, 20 Oct 2021 23:05:55 +0200
Subject: [PATCH 0706/1407] Typos found by codespell

---
 IPython/core/completer.py                    |  8 ++++----
 IPython/core/debugger.py                     | 14 +++++++-------
 IPython/core/tests/test_alias.py             |  2 +-
 IPython/core/tests/test_completer.py         |  4 ++--
 IPython/core/tests/test_display.py           |  2 +-
 IPython/core/tests/test_inputtransformer2.py |  2 +-
 IPython/core/tests/test_run.py               |  2 +-
 IPython/extensions/tests/test_autoreload.py  |  2 +-
 IPython/external/qt_loaders.py               |  6 +++---
 IPython/lib/backgroundjobs.py                |  2 +-
 IPython/lib/demo.py                          |  2 +-
 IPython/testing/decorators.py                |  2 +-
 IPython/utils/path.py                        |  2 +-
 examples/IPython Kernel/gui/gui-gtk.py       |  2 +-
 examples/IPython Kernel/gui/gui-gtk3.py      |  2 +-
 examples/IPython Kernel/gui/gui-gtk4.py      |  2 +-
 tools/release_helper.sh                      |  4 ++--
 tools/retar.py                               |  2 +-
 tools/tests/CSS Reference.ipynb              |  2 +-
 19 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 167acbd643c..497aa4f1475 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -157,8 +157,8 @@
 #-----------------------------------------------------------------------------
 
 # ranges where we have most of the valid unicode names. We could be more finer
-# grained but is it worth it for performace  While unicode have character in the
-# rage 0, 0x110000, we seem to have name for about 10% of those. (131808 as I
+# grained but is it worth it for performance  While unicode have character in the
+# range 0, 0x110000, we seem to have name for about 10% of those. (131808 as I
 # write this). With below range we cover them all, with a density of ~67%
 # biggest next gap we consider only adds up about 1% density and there are 600
 # gaps that would need hard coding.
@@ -2062,7 +2062,7 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
         A tuple of N elements which are (likely):
             matched_text: ? the text that the complete matched
             matches: list of completions ?
-            matches_origin: ? list same lenght as matches, and where each completion came from
+            matches_origin: ? list same length as matches, and where each completion came from
             jedi_matches: list of Jedi matches, have it's own structure.
         """
 
@@ -2179,7 +2179,7 @@ def fwd_unicode_match(self, text:str) -> Tuple[str, Sequence[str]]:
         # TODO: self.unicode_names is here a list we traverse each time with ~100k elements.
         # We could do a faster match using a Trie.
 
-        # Using pygtrie the follwing seem to work:
+        # Using pygtrie the following seem to work:
 
         #     s = PrefixSet()
 
diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 0083f537227..5d3139e9c41 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -69,8 +69,8 @@
 
 
 
-Licencse
---------
+License
+-------
 
 Modified from the standard pdb.Pdb class to avoid including readline, so that
 the command line completion of other programs which include this isn't
@@ -427,7 +427,7 @@ def hidden_frames(self, stack):
         # The f_locals dictionary is updated from the actual frame
         # locals whenever the .f_locals accessor is called, so we
         # avoid calling it here to preserve self.curframe_locals.
-        # Futhermore, there is no good reason to hide the current frame.
+        # Furthermore, there is no good reason to hide the current frame.
         ip_hide = [self._hidden_predicate(s[0]) for s in stack]
         ip_start = [i for i, s in enumerate(ip_hide) if s == "__ipython_bottom__"]
         if ip_start and self._predicates["ipython_internal"]:
@@ -520,8 +520,8 @@ def print_stack_entry(self, frame_lineno, prompt_prefix='\n-> ',
 
     def _get_frame_locals(self, frame):
         """ "
-        Acessing f_local of current frame reset the namespace, so we want to avoid
-        that or the following can happend
+        Accessing f_local of current frame reset the namespace, so we want to avoid
+        that or the following can happen
 
         ipdb> foo
         "old"
@@ -993,7 +993,7 @@ def do_up(self, arg):
                 if counter >= count:
                     break
             else:
-                # if no break occured.
+                # if no break occurred.
                 self.error(
                     "all frames above hidden, use `skip_hidden False` to get get into those."
                 )
@@ -1038,7 +1038,7 @@ def do_down(self, arg):
                     break
             else:
                 self.error(
-                    "all frames bellow hidden, use `skip_hidden False` to get get into those."
+                    "all frames below hidden, use `skip_hidden False` to get get into those."
                 )
                 return
 
diff --git a/IPython/core/tests/test_alias.py b/IPython/core/tests/test_alias.py
index 90971deecb3..a84b0095334 100644
--- a/IPython/core/tests/test_alias.py
+++ b/IPython/core/tests/test_alias.py
@@ -49,7 +49,7 @@ def test_alias_args_commented():
         _ip.run_cell('commetarg')
     
     # strip() is for pytest compat; testing via iptest patch IPython shell
-    # in testin.globalipapp and replace the system call which messed up the
+    # in testing.globalipapp and replace the system call which messed up the
     # \r\n
     assert cap.stdout.strip() ==  'this is %s a commented out arg'
 
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index ad5a080ec9d..689b93e6cce 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -86,7 +86,7 @@ def test_unicode_range():
         size, start, stop, prct = recompute_unicode_ranges()
         message = f"""_UNICODE_RANGES likely wrong and need updating. This is
         likely due to a new release of Python. We've find that the biggest gap
-        in unicode characters has reduces in size to be {size} charaters
+        in unicode characters has reduces in size to be {size} characters
         ({prct}), from {start}, to {stop}. In completer.py likely update to
 
             _UNICODE_RANGES = [(32, {start}), ({stop}, 0xe01f0)]
@@ -302,7 +302,7 @@ def test_latex_no_results(self):
     def test_back_latex_completion(self):
         ip = get_ipython()
 
-        # do not return more than 1 matches fro \beta, only the latex one.
+        # do not return more than 1 matches for \beta, only the latex one.
         name, matches = ip.complete("\\β")
         nt.assert_equal(matches, ['\\beta'])
 
diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index 4b783bc50ae..15cae218587 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -125,7 +125,7 @@ def test_image_filename_defaults():
                      embed=True)
     nt.assert_raises(ValueError, display.Image)
     nt.assert_raises(ValueError, display.Image, data='this is not an image', format='badformat', embed=True)
-    # check boths paths to allow packages to test at build and install time
+    # check both paths to allow packages to test at build and install time
     imgfile = os.path.join(tpath, 'core/tests/2x2.png')
     img = display.Image(filename=imgfile)
     nt.assert_equal('png', img.format)
diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index e024d7cc923..cd7c5311e45 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -300,7 +300,7 @@ def test_check_complete_II():
 def test_check_complete_invalidates_sunken_brackets():
     """
     Test that a single line with more closing brackets than the opening ones is
-    interpretted as invalid
+    interpreted as invalid
     """
     cc = ipt2.TransformerManager().check_complete
     nt.assert_equal(cc(")"), ("invalid", None))
diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index 9634913ba76..5b690645af9 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -557,7 +557,7 @@ def test_multiprocessing_run():
     """Set we can run mutiprocesgin without messing up up main namespace
 
     Note that import `nose.tools as nt` mdify the value s
-    sys.module['__mp_main__'] so wee need to temporarily set it to None to test
+    sys.module['__mp_main__'] so we need to temporarily set it to None to test
     the issue.
     """
     with TemporaryDirectory() as td:
diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index a84c8c9fe96..4bccd4068e0 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -303,7 +303,7 @@ class TestEnum(Enum):
         self.shell.run_code("t = Test()")
         # test global built-in var now exists
         self.shell.run_code("number")
-        # test the enumerations gets loaded succesfully
+        # test the enumerations gets loaded successfully
         self.shell.run_code("TestEnum.A")
 
         # ----------- TEST NEW OBJ CAN BE CHANGED --------------------
diff --git a/IPython/external/qt_loaders.py b/IPython/external/qt_loaders.py
index 79805358e72..982590e6b10 100644
--- a/IPython/external/qt_loaders.py
+++ b/IPython/external/qt_loaders.py
@@ -198,7 +198,7 @@ def import_pyqt4(version=2):
       Which QString/QVariant API to use. Set to None to use the system
       default
 
-    ImportErrors rasied within this function are non-recoverable
+    ImportErrors raised within this function are non-recoverable
     """
     # The new-style string API (version=2) automatically
     # converts QStrings to Unicode Python strings. Also, automatically unpacks
@@ -229,7 +229,7 @@ def import_pyqt5():
     """
     Import PyQt5
 
-    ImportErrors rasied within this function are non-recoverable
+    ImportErrors raised within this function are non-recoverable
     """
 
     from PyQt5 import QtCore, QtSvg, QtWidgets, QtGui
@@ -251,7 +251,7 @@ def import_pyqt6():
     """
     Import PyQt6
 
-    ImportErrors rasied within this function are non-recoverable
+    ImportErrors raised within this function are non-recoverable
     """
 
     from PyQt6 import QtCore, QtSvg, QtWidgets, QtGui
diff --git a/IPython/lib/backgroundjobs.py b/IPython/lib/backgroundjobs.py
index 31997e13f28..588c15b17f6 100644
--- a/IPython/lib/backgroundjobs.py
+++ b/IPython/lib/backgroundjobs.py
@@ -135,7 +135,7 @@ def new(self, func_or_exp, *args, **kwargs):
 
           job_manager.new(myfunc, x, y, kw=dict(z=1))
 
-        The reason for this assymmetry is that the new() method needs to
+        The reason for this asymmetry is that the new() method needs to
         maintain access to its own keywords, and this prevents name collisions
         between arguments to new() and arguments to your own functions.
 
diff --git a/IPython/lib/demo.py b/IPython/lib/demo.py
index bfef82fc7dc..8367a6fd951 100644
--- a/IPython/lib/demo.py
+++ b/IPython/lib/demo.py
@@ -532,7 +532,7 @@ def highlight(self, block):
                 elif token[0] == Token.Comment.Single:
                     toks.append((Token.Comment.Single, token[1][0]))
                     # parse comment content by rst lexer
-                    # remove the extrat newline added by rst lexer
+                    # remove the extra newline added by rst lexer
                     toks += list(pygments.lex(token[1][1:], self.rst_lexer))[:-1]
                 else:
                     toks.append(token)
diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
index e31a47b1b88..a2458ce13fa 100644
--- a/IPython/testing/decorators.py
+++ b/IPython/testing/decorators.py
@@ -156,7 +156,7 @@ def decor(f):
 
 def skip_iptest_but_not_pytest(f):
     """
-    Warnign this will make the test invisible to iptest.
+    Warning this will make the test invisible to iptest.
     """
     import os
 
diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index cc10dffd1f0..b347e98ed46 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -209,7 +209,7 @@ def get_home_dir(require_writable=False) -> str:
             pass
 
     if (not require_writable) or _writable_dir(homedir):
-        assert isinstance(homedir, str), "Homedir shoudl be unicode not bytes"
+        assert isinstance(homedir, str), "Homedir should be unicode not bytes"
         return homedir
     else:
         raise HomeDirError('%s is not a writable dir, '
diff --git a/examples/IPython Kernel/gui/gui-gtk.py b/examples/IPython Kernel/gui/gui-gtk.py
index 80d888aff8b..3df9922b34b 100755
--- a/examples/IPython Kernel/gui/gui-gtk.py	
+++ b/examples/IPython Kernel/gui/gui-gtk.py	
@@ -13,7 +13,7 @@
 import gtk
 
 
-def hello_world(wigdet, data=None):
+def hello_world(widget, data=None):
     print("Hello World")
 
 def delete_event(widget, event, data=None):
diff --git a/examples/IPython Kernel/gui/gui-gtk3.py b/examples/IPython Kernel/gui/gui-gtk3.py
index 935c026d5e3..f35f498d33b 100644
--- a/examples/IPython Kernel/gui/gui-gtk3.py	
+++ b/examples/IPython Kernel/gui/gui-gtk3.py	
@@ -11,7 +11,7 @@
 from gi.repository import Gtk
 
 
-def hello_world(wigdet, data=None):
+def hello_world(widget, data=None):
     print("Hello World")
 
 def delete_event(widget, event, data=None):
diff --git a/examples/IPython Kernel/gui/gui-gtk4.py b/examples/IPython Kernel/gui/gui-gtk4.py
index bb8c56bf115..44ff1d97ed4 100644
--- a/examples/IPython Kernel/gui/gui-gtk4.py	
+++ b/examples/IPython Kernel/gui/gui-gtk4.py	
@@ -14,7 +14,7 @@
 from gi.repository import Gtk, GLib  # noqa
 
 
-def hello_world(wigdet, data=None):
+def hello_world(widget, data=None):
     print("Hello World")
 
 
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index ee7c06b3462..1c1d5e6cdb1 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -62,7 +62,7 @@ maybe_edit(){
 
 
 echo 
-if ask_section "Updating what's new with informations from docs/source/whatsnew/pr"
+if ask_section "Updating what's new with information from docs/source/whatsnew/pr"
 then
     python tools/update_whatsnew.py
 
@@ -100,7 +100,7 @@ then
     git checkout $PREV_RELEASE
     echo $BLUE"Saving API to file $PREV_RELEASE"$NOR
     frappuccino IPython --save IPython-$PREV_RELEASE.json
-    echo $BLUE"comming back to $BRANCH"$NOR
+    echo $BLUE"coming back to $BRANCH"$NOR
     git checkout $BRANCH
     echo $BLUE"comparing ..."$NOR
     frappuccino IPython --compare IPython-$PREV_RELEASE.json
diff --git a/tools/retar.py b/tools/retar.py
index 3615e7410fc..b81345d280d 100644
--- a/tools/retar.py
+++ b/tools/retar.py
@@ -9,7 +9,7 @@
 
 The process of creating an sdist can be non-reproducible:
   - directory created during the process get a mtime of the creation date; 
-  - gziping files embed the timestamp of fo zip creation. 
+  - gziping files embed the timestamp of zip creation. 
 
 This will untar-retar; ensuring that all mtime > SOURCE_DATE_EPOCH will be set
 equal to SOURCE_DATE_EPOCH.
diff --git a/tools/tests/CSS Reference.ipynb b/tools/tests/CSS Reference.ipynb
index a9e0c74da7d..a567cc6ad0d 100644
--- a/tools/tests/CSS Reference.ipynb	
+++ b/tools/tests/CSS Reference.ipynb	
@@ -8144,7 +8144,7 @@
     "    </thead>\n",
     "    <tbody>\n",
     "        <tr>\n",
-    "            <td>but thi</td>\n",
+    "            <td>but this</td>\n",
     "            <td>is the </td>\n",
     "        </tr>\n",
     "        <tr>\n",

From 24d76d5b45b534da8a14ba4848b7ad92047fc358 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 20 Oct 2021 19:52:14 -0700
Subject: [PATCH 0707/1407] Try to enable codecov status

Not sure why it does not work.
---
 codecov.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/codecov.yml b/codecov.yml
index eb9b9dff30c..8015ac1d6fc 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -3,7 +3,5 @@ coverage:
     project:
       default:
         target: auto
-        threshold: 10
-    patch:
-      default:
-        target: 0%
+codecov:
+  require_ci_to_pass: false

From ebeba47f2bcd473f4e76b22de2bd5b893abe9b6f Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 10:09:43 +0200
Subject: [PATCH 0708/1407] [setup] Add pytest to test dependencies

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 0696e740e2f..6c30c9f4043 100755
--- a/setup.py
+++ b/setup.py
@@ -176,6 +176,7 @@
     doc=["Sphinx>=1.3"],
     test=[
         "nose>=0.10.1",
+        "pytest",
         "requests",
         "testpath",
         "pygments",

From c8142425528cafc0352566ba2873db6b1d6ab10c Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 10:10:12 +0200
Subject: [PATCH 0709/1407] [pre-commit] Add initial configuration

---
 .pre-commit-config.yaml | 16 ++++++++++++++++
 MANIFEST.in             |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000000..6af0afb1d23
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,16 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
+
+-   repo: https://github.com/akaihola/darker
+    rev: 1.3.1
+    hooks:
+    -   id: darker
+
diff --git a/MANIFEST.in b/MANIFEST.in
index ec33beb19f0..8740db350f6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,6 +8,7 @@ include pytest.ini
 include mypy.ini
 include .mailmap
 include .flake8
+include .pre-commit-config.yaml
 
 recursive-exclude tools *
 exclude tools

From cf20712b7068ca94678c9c782074c7f858b53ccb Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 10:43:24 +0200
Subject: [PATCH 0710/1407] [testing][tests][decorators] Remove nose

---
 IPython/testing/tests/test_decorators.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/IPython/testing/tests/test_decorators.py b/IPython/testing/tests/test_decorators.py
index dc1ff41d7da..eb93ea17600 100644
--- a/IPython/testing/tests/test_decorators.py
+++ b/IPython/testing/tests/test_decorators.py
@@ -6,9 +6,6 @@
 import inspect
 import sys
 
-# Third party
-import nose.tools as nt
-
 # Our own
 from IPython.testing import decorators as dec
 
@@ -93,7 +90,7 @@ def test_skip_dt_decorator():
     # Fetch the docstring from doctest_bad after decoration.
     val = doctest_bad.__doc__
     
-    nt.assert_equal(check,val,"doctest_bad docstrings don't match")
+    assert check == val, "doctest_bad docstrings don't match"
 
 
 # Doctest skipping should work for class methods too
@@ -152,13 +149,14 @@ def test_skip_dt_decorator2():
 
 @dec.skip_linux
 def test_linux():
-    nt.assert_false(sys.platform.startswith('linux'),"This test can't run under linux")
+    assert sys.platform.startswith("linux") is False, "This test can't run under linux"
+
 
 @dec.skip_win32
 def test_win32():
-    nt.assert_not_equal(sys.platform,'win32',"This test can't run under windows")
+    assert sys.platform != "win32", "This test can't run under windows"
+
 
 @dec.skip_osx
 def test_osx():
-    nt.assert_not_equal(sys.platform,'darwin',"This test can't run under osx")
-
+    assert sys.platform != "darwin", "This test can't run under osx"

From 6b1a3e40a3cbbaaa8a442610414b36fad5aae07f Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 10:50:42 +0200
Subject: [PATCH 0711/1407] [testing][tests][tools] Remove nose

---
 IPython/testing/tests/test_tools.py | 40 ++++++++++++++---------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/IPython/testing/tests/test_tools.py b/IPython/testing/tests/test_tools.py
index 33c65dfaca4..f9f7e716cbd 100644
--- a/IPython/testing/tests/test_tools.py
+++ b/IPython/testing/tests/test_tools.py
@@ -17,8 +17,6 @@
 import os
 import unittest
 
-import nose.tools as nt
-
 from IPython.testing import decorators as dec
 from IPython.testing import tools as tt
 
@@ -28,26 +26,26 @@
 
 @dec.skip_win32
 def test_full_path_posix():
-    spath = '/foo/bar.py'
-    result = tt.full_path(spath,['a.txt','b.txt'])
-    nt.assert_equal(result, ['/foo/a.txt', '/foo/b.txt'])
-    spath = '/foo'
-    result = tt.full_path(spath,['a.txt','b.txt'])
-    nt.assert_equal(result, ['/a.txt', '/b.txt'])
-    result = tt.full_path(spath,'a.txt')
-    nt.assert_equal(result, ['/a.txt'])
+    spath = "/foo/bar.py"
+    result = tt.full_path(spath, ["a.txt", "b.txt"])
+    assert result, ["/foo/a.txt" == "/foo/b.txt"]
+    spath = "/foo"
+    result = tt.full_path(spath, ["a.txt", "b.txt"])
+    assert result, ["/a.txt" == "/b.txt"]
+    result = tt.full_path(spath, "a.txt")
+    assert result == ["/a.txt"]
 
 
 @dec.skip_if_not_win32
 def test_full_path_win32():
-    spath = 'c:\\foo\\bar.py'
-    result = tt.full_path(spath,['a.txt','b.txt'])
-    nt.assert_equal(result, ['c:\\foo\\a.txt', 'c:\\foo\\b.txt'])
-    spath = 'c:\\foo'
-    result = tt.full_path(spath,['a.txt','b.txt'])
-    nt.assert_equal(result, ['c:\\a.txt', 'c:\\b.txt'])
-    result = tt.full_path(spath,'a.txt')
-    nt.assert_equal(result, ['c:\\a.txt'])
+    spath = "c:\\foo\\bar.py"
+    result = tt.full_path(spath, ["a.txt", "b.txt"])
+    assert result, ["c:\\foo\\a.txt" == "c:\\foo\\b.txt"]
+    spath = "c:\\foo"
+    result = tt.full_path(spath, ["a.txt", "b.txt"])
+    assert result, ["c:\\a.txt" == "c:\\b.txt"]
+    result = tt.full_path(spath, "a.txt")
+    assert result == ["c:\\a.txt"]
 
     
 def test_parser():
@@ -56,8 +54,8 @@ def test_parser():
     both = ("FAILED (errors=1, failures=1)", 1, 1)
     for txt, nerr, nfail in [err, fail, both]:
         nerr1, nfail1 = tt.parse_test_output(txt)
-        nt.assert_equal(nerr, nerr1)
-        nt.assert_equal(nfail, nfail1)
+        assert nerr == nerr1
+        assert nfail == nfail1
 
 
 def test_temp_pyfile():
@@ -66,7 +64,7 @@ def test_temp_pyfile():
     assert os.path.isfile(fname)
     with open(fname) as fh2:
         src2 = fh2.read()
-    nt.assert_equal(src2, src)
+    assert src2 == src
 
 class TestAssertPrints(unittest.TestCase):
     def test_passing(self):

From 1efb0510ba66b8dfd66b6ec42b2429f6aa67b45a Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@kde.org>
Date: Wed, 29 Sep 2021 20:32:57 +0200
Subject: [PATCH 0712/1407] [core][tests][application] Remove nose

---
 IPython/core/tests/test_application.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/IPython/core/tests/test_application.py b/IPython/core/tests/test_application.py
index 45d42727c9b..891908e98e7 100644
--- a/IPython/core/tests/test_application.py
+++ b/IPython/core/tests/test_application.py
@@ -4,8 +4,6 @@
 import os
 import tempfile
 
-import nose.tools as nt
-
 from traitlets import Unicode
 
 from IPython.core.application import BaseIPythonApplication
@@ -65,9 +63,8 @@ class TestApp(BaseIPythonApplication):
             f.write("c.TestApp.test = 'config file'")
 
         app = TestApp()
-        app.initialize(['--profile-dir', td])
-        nt.assert_equal(app.test, 'config file')
+        app.initialize(["--profile-dir", td])
+        assert app.test == "config file"
         app = TestApp()
-        app.initialize(['--profile-dir', td, '--TestApp.test=cli'])
-        nt.assert_equal(app.test, 'cli')
-
+        app.initialize(["--profile-dir", td, "--TestApp.test=cli"])
+        assert app.test == "cli"

From 4ac9d7f384bd6ccb41d9f3573409d27e4d9220d8 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 10:52:34 +0200
Subject: [PATCH 0713/1407] [core][tests][async_helpers] Remove nose

---
 IPython/core/tests/test_async_helpers.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/IPython/core/tests/test_async_helpers.py b/IPython/core/tests/test_async_helpers.py
index 3498b06be5f..9ca67f47e9e 100644
--- a/IPython/core/tests/test_async_helpers.py
+++ b/IPython/core/tests/test_async_helpers.py
@@ -4,7 +4,6 @@
 Should only trigger on python 3.5+ or will have syntax errors.
 """
 from itertools import chain, repeat
-import nose.tools as nt
 from textwrap import dedent, indent
 from unittest import TestCase
 from IPython.testing.decorators import skip_without
@@ -24,10 +23,10 @@
 
 class AsyncTest(TestCase):
     def test_should_be_async(self):
-        nt.assert_false(_should_be_async("False"))
-        nt.assert_true(_should_be_async("await bar()"))
-        nt.assert_true(_should_be_async("x = await bar()"))
-        nt.assert_false(
+        self.assertFalse(_should_be_async("False"))
+        self.assertTrue(_should_be_async("await bar()"))
+        self.assertTrue(_should_be_async("x = await bar()"))
+        self.assertFalse(
             _should_be_async(
                 dedent(
                     """
@@ -298,7 +297,7 @@ def test_autoawait_trio_wrong_sleep(self):
         import asyncio
         await asyncio.sleep(0)
         """)
-        with nt.assert_raises(TypeError):
+        with self.assertRaises(TypeError):
             res.raise_error()
 
     @skip_without('trio')
@@ -308,7 +307,7 @@ def test_autoawait_asyncio_wrong_sleep(self):
         import trio
         await trio.sleep(0)
         """)
-        with nt.assert_raises(RuntimeError):
+        with self.assertRaises(RuntimeError):
             res.raise_error()
 
 

From 322441cbd2d1974954436631262b063d8f16d22f Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 10:56:23 +0200
Subject: [PATCH 0714/1407] [core][tests][completer] Remove nose

---
 IPython/core/tests/test_completer.py | 398 +++++++++++++--------------
 1 file changed, 197 insertions(+), 201 deletions(-)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 689b93e6cce..319bc2da08e 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -11,8 +11,6 @@
 
 from contextlib import contextmanager
 
-import nose.tools as nt
-
 from traitlets.config.loader import Config
 from IPython import get_ipython
 from IPython.core import completer
@@ -27,7 +25,6 @@
     match_dict_keys,
     _deduplicate_completions,
 )
-from nose.tools import assert_in, assert_not_in
 
 # -----------------------------------------------------------------------------
 # Test functions
@@ -150,7 +147,7 @@ def test_protect_filename():
     # run the actual tests
     for s1, s2 in pairs:
         s1p = completer.protect_filename(s1)
-        nt.assert_equal(s1p, s2)
+        assert s1p == s2
 
 
 def check_line_split(splitter, test_specs):
@@ -158,7 +155,7 @@ def check_line_split(splitter, test_specs):
         cursor_pos = len(part1)
         line = part1 + part2
         out = splitter.split_line(line, cursor_pos)
-        nt.assert_equal(out, split)
+        assert out == split
 
 
 def test_line_split():
@@ -267,8 +264,8 @@ def test_unicode_completions(self):
             # should be thrown and the return value should be a pair of text, list
             # values.
             text, matches = ip.complete(t)
-            nt.assert_true(isinstance(text, str))
-            nt.assert_true(isinstance(matches, list))
+            self.assertIsInstance(text, str)
+            self.assertIsInstance(matches, list)
 
     def test_latex_completions(self):
         from IPython.core.latex_symbols import latex_symbols
@@ -279,16 +276,16 @@ def test_latex_completions(self):
         keys = random.sample(latex_symbols.keys(), 10)
         for k in keys:
             text, matches = ip.complete(k)
-            nt.assert_equal(text, k)
-            nt.assert_equal(matches, [latex_symbols[k]])
+            self.assertEqual(text, k)
+            self.assertEqual(matches, [latex_symbols[k]])
         # Test a more complex line
         text, matches = ip.complete("print(\\alpha")
-        nt.assert_equal(text, "\\alpha")
-        nt.assert_equal(matches[0], latex_symbols["\\alpha"])
+        self.assertEqual(text, "\\alpha")
+        self.assertEqual(matches[0], latex_symbols["\\alpha"])
         # Test multiple matching latex symbols
         text, matches = ip.complete("\\al")
-        nt.assert_in("\\alpha", matches)
-        nt.assert_in("\\aleph", matches)
+        self.assertIn("\\alpha", matches)
+        self.assertIn("\\aleph", matches)
 
     def test_latex_no_results(self):
         """
@@ -296,30 +293,30 @@ def test_latex_no_results(self):
         """
         ip = get_ipython()
         text, matches = ip.Completer.latex_matches("\\really_i_should_match_nothing")
-        nt.assert_equal(text, "")
-        nt.assert_equal(matches, ())
+        self.assertEqual(text, "")
+        self.assertEqual(matches, ())
 
     def test_back_latex_completion(self):
         ip = get_ipython()
 
         # do not return more than 1 matches for \beta, only the latex one.
         name, matches = ip.complete("\\β")
-        nt.assert_equal(matches, ['\\beta'])
+        self.assertEqual(matches, ["\\beta"])
 
     def test_back_unicode_completion(self):
         ip = get_ipython()
 
         name, matches = ip.complete("\\Ⅴ")
-        nt.assert_equal(matches, ("\\ROMAN NUMERAL FIVE",))
+        self.assertEqual(matches, ("\\ROMAN NUMERAL FIVE",))
 
     def test_forward_unicode_completion(self):
         ip = get_ipython()
 
         name, matches = ip.complete("\\ROMAN NUMERAL FIVE")
-        nt.assert_equal(matches, ["Ⅴ"] ) # This is not a V
-        nt.assert_equal(matches, ["\u2164"] ) # same as above but explicit.
+        self.assertEqual(matches, ["Ⅴ"])  # This is not a V
+        self.assertEqual(matches, ["\u2164"])  # same as above but explicit.
 
-    @nt.nottest  # now we have a completion for \jmath
+    @unittest.skip("now we have a completion for \jmath")
     @decorators.knownfailureif(
         sys.platform == "win32", "Fails if there is a C:\\j... path"
     )
@@ -329,7 +326,7 @@ def test_no_ascii_back_completion(self):
             # single ascii letter that don't have yet completions
             for letter in "jJ":
                 name, matches = ip.complete("\\" + letter)
-                nt.assert_equal(matches, [])
+                self.assertEqual(matches, [])
 
     class CompletionSplitterTestCase(unittest.TestCase):
         def setUp(self):
@@ -337,8 +334,8 @@ def setUp(self):
 
         def test_delim_setting(self):
             self.sp.delims = " "
-            nt.assert_equal(self.sp.delims, " ")
-            nt.assert_equal(self.sp._delim_expr, r"[\ ]")
+            self.assertEqual(self.sp.delims, " ")
+            self.assertEqual(self.sp._delim_expr, r"[\ ]")
 
         def test_spaces(self):
             """Test with only spaces as split chars."""
@@ -348,19 +345,19 @@ def test_spaces(self):
 
     def test_has_open_quotes1(self):
         for s in ["'", "'''", "'hi' '"]:
-            nt.assert_equal(completer.has_open_quotes(s), "'")
+            self.assertEqual(completer.has_open_quotes(s), "'")
 
     def test_has_open_quotes2(self):
         for s in ['"', '"""', '"hi" "']:
-            nt.assert_equal(completer.has_open_quotes(s), '"')
+            self.assertEqual(completer.has_open_quotes(s), '"')
 
     def test_has_open_quotes3(self):
         for s in ["''", "''' '''", "'hi' 'ipython'"]:
-            nt.assert_false(completer.has_open_quotes(s))
+            self.assertFalse(completer.has_open_quotes(s))
 
     def test_has_open_quotes4(self):
         for s in ['""', '""" """', '"hi" "ipython"']:
-            nt.assert_false(completer.has_open_quotes(s))
+            self.assertFalse(completer.has_open_quotes(s))
 
     @decorators.knownfailureif(
         sys.platform == "win32", "abspath completions fail on Windows"
@@ -376,13 +373,13 @@ def test_abspath_file_completions(self):
 
             # Check simple completion
             c = ip.complete(prefix)[1]
-            nt.assert_equal(c, names)
+            self.assertEqual(c, names)
 
             # Now check with a function call
             cmd = 'a = f("%s' % prefix
             c = ip.complete(prefix, cmd)[1]
             comp = [prefix + s for s in suffixes]
-            nt.assert_equal(c, comp)
+            self.assertEqual(c, comp)
 
     def test_local_file_completions(self):
         ip = get_ipython()
@@ -395,13 +392,13 @@ def test_local_file_completions(self):
 
             # Check simple completion
             c = ip.complete(prefix)[1]
-            nt.assert_equal(c, names)
+            self.assertEqual(c, names)
 
             # Now check with a function call
             cmd = 'a = f("%s' % prefix
             c = ip.complete(prefix, cmd)[1]
             comp = {prefix + s for s in suffixes}
-            nt.assert_true(comp.issubset(set(c)))
+            self.assertTrue(comp.issubset(set(c)))
 
     def test_quoted_file_completions(self):
         ip = get_ipython()
@@ -417,21 +414,21 @@ def test_quoted_file_completions(self):
             c = ip.Completer._complete(
                 cursor_line=0, cursor_pos=len(text), full_text=text
             )[1]
-            nt.assert_equal(c, [escaped])
+            self.assertEqual(c, [escaped])
 
             # Double quote requires no escape
             text = 'open("foo'
             c = ip.Completer._complete(
                 cursor_line=0, cursor_pos=len(text), full_text=text
             )[1]
-            nt.assert_equal(c, [name])
+            self.assertEqual(c, [name])
 
             # No quote requires an escape
             text = "%ls foo"
             c = ip.Completer._complete(
                 cursor_line=0, cursor_pos=len(text), full_text=text
             )[1]
-            nt.assert_equal(c, [escaped])
+            self.assertEqual(c, [escaped])
 
     def test_all_completions_dups(self):
         """
@@ -537,18 +534,18 @@ def test_greedy_completions(self):
         ip = get_ipython()
         ip.ex("a=list(range(5))")
         _, c = ip.complete(".", line="a[0].")
-        nt.assert_false(".real" in c, "Shouldn't have completed on a[0]: %s" % c)
+        self.assertFalse(".real" in c, "Shouldn't have completed on a[0]: %s" % c)
 
         def _(line, cursor_pos, expect, message, completion):
             with greedy_completion(), provisionalcompleter():
                 ip.Completer.use_jedi = False
                 _, c = ip.complete(".", line=line, cursor_pos=cursor_pos)
-                nt.assert_in(expect, c, message % c)
+                self.assertIn(expect, c, message % c)
 
                 ip.Completer.use_jedi = True
                 with provisionalcompleter():
                     completions = ip.Completer.completions(line, cursor_pos)
-                nt.assert_in(completion, completions)
+                self.assertIn(completion, completions)
 
         with provisionalcompleter():
             yield _, "a[0].", 5, "a[0].real", "Should have completed on a[0].: %s", Completion(
@@ -575,13 +572,13 @@ def test_omit__names(self):
         with provisionalcompleter():
             c.use_jedi = False
             s, matches = c.complete("ip.")
-            nt.assert_in("ip.__str__", matches)
-            nt.assert_in("ip._hidden_attr", matches)
+            self.assertIn("ip.__str__", matches)
+            self.assertIn("ip._hidden_attr", matches)
 
             # c.use_jedi = True
             # completions = set(c.completions('ip.', 3))
-            # nt.assert_in(Completion(3, 3, '__str__'), completions)
-            # nt.assert_in(Completion(3,3, "_hidden_attr"), completions)
+            # self.assertIn(Completion(3, 3, '__str__'), completions)
+            # self.assertIn(Completion(3,3, "_hidden_attr"), completions)
 
         cfg = Config()
         cfg.IPCompleter.omit__names = 1
@@ -589,13 +586,13 @@ def test_omit__names(self):
         with provisionalcompleter():
             c.use_jedi = False
             s, matches = c.complete("ip.")
-            nt.assert_not_in("ip.__str__", matches)
-            # nt.assert_in('ip._hidden_attr', matches)
+            self.assertNotIn("ip.__str__", matches)
+            # self.assertIn('ip._hidden_attr', matches)
 
             # c.use_jedi = True
             # completions = set(c.completions('ip.', 3))
-            # nt.assert_not_in(Completion(3,3,'__str__'), completions)
-            # nt.assert_in(Completion(3,3, "_hidden_attr"), completions)
+            # self.assertNotIn(Completion(3,3,'__str__'), completions)
+            # self.assertIn(Completion(3,3, "_hidden_attr"), completions)
 
         cfg = Config()
         cfg.IPCompleter.omit__names = 2
@@ -603,22 +600,22 @@ def test_omit__names(self):
         with provisionalcompleter():
             c.use_jedi = False
             s, matches = c.complete("ip.")
-            nt.assert_not_in("ip.__str__", matches)
-            nt.assert_not_in("ip._hidden_attr", matches)
+            self.assertNotIn("ip.__str__", matches)
+            self.assertNotIn("ip._hidden_attr", matches)
 
             # c.use_jedi = True
             # completions = set(c.completions('ip.', 3))
-            # nt.assert_not_in(Completion(3,3,'__str__'), completions)
-            # nt.assert_not_in(Completion(3,3, "_hidden_attr"), completions)
+            # self.assertNotIn(Completion(3,3,'__str__'), completions)
+            # self.assertNotIn(Completion(3,3, "_hidden_attr"), completions)
 
         with provisionalcompleter():
             c.use_jedi = False
             s, matches = c.complete("ip._x.")
-            nt.assert_in("ip._x.keys", matches)
+            self.assertIn("ip._x.keys", matches)
 
             # c.use_jedi = True
             # completions = set(c.completions('ip._x.', 6))
-            # nt.assert_in(Completion(6,6, "keys"), completions)
+            # self.assertIn(Completion(6,6, "keys"), completions)
 
         del ip._hidden_attr
         del ip._x
@@ -636,21 +633,21 @@ def test_limit_to__all__False_ok(self):
         cfg.IPCompleter.limit_to__all__ = False
         c.update_config(cfg)
         s, matches = c.complete("d.")
-        nt.assert_in("d.x", matches)
+        self.assertIn("d.x", matches)
 
     def test_get__all__entries_ok(self):
         class A:
             __all__ = ["x", 1]
 
         words = completer.get__all__entries(A())
-        nt.assert_equal(words, ["x"])
+        self.assertEqual(words, ["x"])
 
     def test_get__all__entries_no__all__ok(self):
         class A:
             pass
 
         words = completer.get__all__entries(A())
-        nt.assert_equal(words, [])
+        self.assertEqual(words, [])
 
     def test_func_kw_completions(self):
         ip = get_ipython()
@@ -658,39 +655,39 @@ def test_func_kw_completions(self):
         c.use_jedi = False
         ip.ex("def myfunc(a=1,b=2): return a+b")
         s, matches = c.complete(None, "myfunc(1,b")
-        nt.assert_in("b=", matches)
+        self.assertIn("b=", matches)
         # Simulate completing with cursor right after b (pos==10):
         s, matches = c.complete(None, "myfunc(1,b)", 10)
-        nt.assert_in("b=", matches)
+        self.assertIn("b=", matches)
         s, matches = c.complete(None, 'myfunc(a="escaped\\")string",b')
-        nt.assert_in("b=", matches)
+        self.assertIn("b=", matches)
         # builtin function
         s, matches = c.complete(None, "min(k, k")
-        nt.assert_in("key=", matches)
+        self.assertIn("key=", matches)
 
     def test_default_arguments_from_docstring(self):
         ip = get_ipython()
         c = ip.Completer
         kwd = c._default_arguments_from_docstring("min(iterable[, key=func]) -> value")
-        nt.assert_equal(kwd, ["key"])
+        self.assertEqual(kwd, ["key"])
         # with cython type etc
         kwd = c._default_arguments_from_docstring(
             "Minuit.migrad(self, int ncall=10000, resume=True, int nsplit=1)\n"
         )
-        nt.assert_equal(kwd, ["ncall", "resume", "nsplit"])
+        self.assertEqual(kwd, ["ncall", "resume", "nsplit"])
         # white spaces
         kwd = c._default_arguments_from_docstring(
             "\n Minuit.migrad(self, int ncall=10000, resume=True, int nsplit=1)\n"
         )
-        nt.assert_equal(kwd, ["ncall", "resume", "nsplit"])
+        self.assertEqual(kwd, ["ncall", "resume", "nsplit"])
 
     def test_line_magics(self):
         ip = get_ipython()
         c = ip.Completer
         s, matches = c.complete(None, "lsmag")
-        nt.assert_in("%lsmagic", matches)
+        self.assertIn("%lsmagic", matches)
         s, matches = c.complete(None, "%lsmag")
-        nt.assert_in("%lsmagic", matches)
+        self.assertIn("%lsmagic", matches)
 
     def test_cell_magics(self):
         from IPython.core.magic import register_cell_magic
@@ -703,9 +700,9 @@ def _foo_cellm(line, cell):
         c = ip.Completer
 
         s, matches = c.complete(None, "_foo_ce")
-        nt.assert_in("%%_foo_cellm", matches)
+        self.assertIn("%%_foo_cellm", matches)
         s, matches = c.complete(None, "%%_foo_ce")
-        nt.assert_in("%%_foo_cellm", matches)
+        self.assertIn("%%_foo_cellm", matches)
 
     def test_line_cell_magics(self):
         from IPython.core.magic import register_line_cell_magic
@@ -722,14 +719,14 @@ def _bar_cellm(line, cell):
         # and this will show a difference if the same name is both a line and cell
         # magic.
         s, matches = c.complete(None, "_bar_ce")
-        nt.assert_in("%_bar_cellm", matches)
-        nt.assert_in("%%_bar_cellm", matches)
+        self.assertIn("%_bar_cellm", matches)
+        self.assertIn("%%_bar_cellm", matches)
         s, matches = c.complete(None, "%_bar_ce")
-        nt.assert_in("%_bar_cellm", matches)
-        nt.assert_in("%%_bar_cellm", matches)
+        self.assertIn("%_bar_cellm", matches)
+        self.assertIn("%%_bar_cellm", matches)
         s, matches = c.complete(None, "%%_bar_ce")
-        nt.assert_not_in("%_bar_cellm", matches)
-        nt.assert_in("%%_bar_cellm", matches)
+        self.assertNotIn("%_bar_cellm", matches)
+        self.assertIn("%%_bar_cellm", matches)
 
     def test_magic_completion_order(self):
         ip = get_ipython()
@@ -737,7 +734,7 @@ def test_magic_completion_order(self):
 
         # Test ordering of line and cell magics.
         text, matches = c.complete("timeit")
-        nt.assert_equal(matches, ["%timeit", "%%timeit"])
+        self.assertEqual(matches, ["%timeit", "%%timeit"])
 
     def test_magic_completion_shadowing(self):
         ip = get_ipython()
@@ -746,18 +743,18 @@ def test_magic_completion_shadowing(self):
 
         # Before importing matplotlib, %matplotlib magic should be the only option.
         text, matches = c.complete("mat")
-        nt.assert_equal(matches, ["%matplotlib"])
+        self.assertEqual(matches, ["%matplotlib"])
 
         # The newly introduced name should shadow the magic.
         ip.run_cell("matplotlib = 1")
         text, matches = c.complete("mat")
-        nt.assert_equal(matches, ["matplotlib"])
+        self.assertEqual(matches, ["matplotlib"])
 
         # After removing matplotlib from namespace, the magic should again be
         # the only option.
         del ip.user_ns["matplotlib"]
         text, matches = c.complete("mat")
-        nt.assert_equal(matches, ["%matplotlib"])
+        self.assertEqual(matches, ["%matplotlib"])
 
     def test_magic_completion_shadowing_explicit(self):
         """
@@ -769,62 +766,62 @@ def test_magic_completion_shadowing_explicit(self):
 
         # Before importing matplotlib, %matplotlib magic should be the only option.
         text, matches = c.complete("%mat")
-        nt.assert_equal(matches, ["%matplotlib"])
+        self.assertEqual(matches, ["%matplotlib"])
 
         ip.run_cell("matplotlib = 1")
 
         # After removing matplotlib from namespace, the magic should still be
         # the only option.
         text, matches = c.complete("%mat")
-        nt.assert_equal(matches, ["%matplotlib"])
+        self.assertEqual(matches, ["%matplotlib"])
 
     def test_magic_config(self):
         ip = get_ipython()
         c = ip.Completer
 
         s, matches = c.complete(None, "conf")
-        nt.assert_in("%config", matches)
+        self.assertIn("%config", matches)
         s, matches = c.complete(None, "conf")
-        nt.assert_not_in("AliasManager", matches)
+        self.assertNotIn("AliasManager", matches)
         s, matches = c.complete(None, "config ")
-        nt.assert_in("AliasManager", matches)
+        self.assertIn("AliasManager", matches)
         s, matches = c.complete(None, "%config ")
-        nt.assert_in("AliasManager", matches)
+        self.assertIn("AliasManager", matches)
         s, matches = c.complete(None, "config Ali")
-        nt.assert_list_equal(["AliasManager"], matches)
+        self.assertListEqual(["AliasManager"], matches)
         s, matches = c.complete(None, "%config Ali")
-        nt.assert_list_equal(["AliasManager"], matches)
+        self.assertListEqual(["AliasManager"], matches)
         s, matches = c.complete(None, "config AliasManager")
-        nt.assert_list_equal(["AliasManager"], matches)
+        self.assertListEqual(["AliasManager"], matches)
         s, matches = c.complete(None, "%config AliasManager")
-        nt.assert_list_equal(["AliasManager"], matches)
+        self.assertListEqual(["AliasManager"], matches)
         s, matches = c.complete(None, "config AliasManager.")
-        nt.assert_in("AliasManager.default_aliases", matches)
+        self.assertIn("AliasManager.default_aliases", matches)
         s, matches = c.complete(None, "%config AliasManager.")
-        nt.assert_in("AliasManager.default_aliases", matches)
+        self.assertIn("AliasManager.default_aliases", matches)
         s, matches = c.complete(None, "config AliasManager.de")
-        nt.assert_list_equal(["AliasManager.default_aliases"], matches)
+        self.assertListEqual(["AliasManager.default_aliases"], matches)
         s, matches = c.complete(None, "config AliasManager.de")
-        nt.assert_list_equal(["AliasManager.default_aliases"], matches)
+        self.assertListEqual(["AliasManager.default_aliases"], matches)
 
     def test_magic_color(self):
         ip = get_ipython()
         c = ip.Completer
 
         s, matches = c.complete(None, "colo")
-        nt.assert_in("%colors", matches)
+        self.assertIn("%colors", matches)
         s, matches = c.complete(None, "colo")
-        nt.assert_not_in("NoColor", matches)
+        self.assertNotIn("NoColor", matches)
         s, matches = c.complete(None, "%colors")  # No trailing space
-        nt.assert_not_in("NoColor", matches)
+        self.assertNotIn("NoColor", matches)
         s, matches = c.complete(None, "colors ")
-        nt.assert_in("NoColor", matches)
+        self.assertIn("NoColor", matches)
         s, matches = c.complete(None, "%colors ")
-        nt.assert_in("NoColor", matches)
+        self.assertIn("NoColor", matches)
         s, matches = c.complete(None, "colors NoCo")
-        nt.assert_list_equal(["NoColor"], matches)
+        self.assertListEqual(["NoColor"], matches)
         s, matches = c.complete(None, "%colors NoCo")
-        nt.assert_list_equal(["NoColor"], matches)
+        self.assertListEqual(["NoColor"], matches)
 
     def test_match_dict_keys(self):
         """
@@ -884,34 +881,34 @@ def test_dict_key_completion_string(self):
 
         # check completion at different stages
         _, matches = complete(line_buffer="d[")
-        nt.assert_in("'abc'", matches)
-        nt.assert_not_in("'abc']", matches)
+        self.assertIn("'abc'", matches)
+        self.assertNotIn("'abc']", matches)
 
         _, matches = complete(line_buffer="d['")
-        nt.assert_in("abc", matches)
-        nt.assert_not_in("abc']", matches)
+        self.assertIn("abc", matches)
+        self.assertNotIn("abc']", matches)
 
         _, matches = complete(line_buffer="d['a")
-        nt.assert_in("abc", matches)
-        nt.assert_not_in("abc']", matches)
+        self.assertIn("abc", matches)
+        self.assertNotIn("abc']", matches)
 
         # check use of different quoting
         _, matches = complete(line_buffer='d["')
-        nt.assert_in("abc", matches)
-        nt.assert_not_in('abc"]', matches)
+        self.assertIn("abc", matches)
+        self.assertNotIn('abc"]', matches)
 
         _, matches = complete(line_buffer='d["a')
-        nt.assert_in("abc", matches)
-        nt.assert_not_in('abc"]', matches)
+        self.assertIn("abc", matches)
+        self.assertNotIn('abc"]', matches)
 
         # check sensitivity to following context
         _, matches = complete(line_buffer="d[]", cursor_pos=2)
-        nt.assert_in("'abc'", matches)
+        self.assertIn("'abc'", matches)
 
         _, matches = complete(line_buffer="d['']", cursor_pos=3)
-        nt.assert_in("abc", matches)
-        nt.assert_not_in("abc'", matches)
-        nt.assert_not_in("abc']", matches)
+        self.assertIn("abc", matches)
+        self.assertNotIn("abc'", matches)
+        self.assertNotIn("abc']", matches)
 
         # check multiple solutions are correctly returned and that noise is not
         ip.user_ns["d"] = {
@@ -925,111 +922,110 @@ def test_dict_key_completion_string(self):
         }
 
         _, matches = complete(line_buffer="d['a")
-        nt.assert_in("abc", matches)
-        nt.assert_in("abd", matches)
-        nt.assert_not_in("bad", matches)
-        nt.assert_not_in("abe", matches)
-        nt.assert_not_in("abf", matches)
+        self.assertIn("abc", matches)
+        self.assertIn("abd", matches)
+        self.assertNotIn("bad", matches)
+        self.assertNotIn("abe", matches)
+        self.assertNotIn("abf", matches)
         assert not any(m.endswith(("]", '"', "'")) for m in matches), matches
 
         # check escaping and whitespace
         ip.user_ns["d"] = {"a\nb": None, "a'b": None, 'a"b': None, "a word": None}
         _, matches = complete(line_buffer="d['a")
-        nt.assert_in("a\\nb", matches)
-        nt.assert_in("a\\'b", matches)
-        nt.assert_in('a"b', matches)
-        nt.assert_in("a word", matches)
+        self.assertIn("a\\nb", matches)
+        self.assertIn("a\\'b", matches)
+        self.assertIn('a"b', matches)
+        self.assertIn("a word", matches)
         assert not any(m.endswith(("]", '"', "'")) for m in matches), matches
 
         # - can complete on non-initial word of the string
         _, matches = complete(line_buffer="d['a w")
-        nt.assert_in("word", matches)
+        self.assertIn("word", matches)
 
         # - understands quote escaping
         _, matches = complete(line_buffer="d['a\\'")
-        nt.assert_in("b", matches)
+        self.assertIn("b", matches)
 
         # - default quoting should work like repr
         _, matches = complete(line_buffer="d[")
-        nt.assert_in('"a\'b"', matches)
+        self.assertIn('"a\'b"', matches)
 
         # - when opening quote with ", possible to match with unescaped apostrophe
         _, matches = complete(line_buffer="d[\"a'")
-        nt.assert_in("b", matches)
+        self.assertIn("b", matches)
 
         # need to not split at delims that readline won't split at
         if "-" not in ip.Completer.splitter.delims:
             ip.user_ns["d"] = {"before-after": None}
             _, matches = complete(line_buffer="d['before-af")
-            nt.assert_in("before-after", matches)
+            self.assertIn("before-after", matches)
 
         # check completion on tuple-of-string keys at different stage - on first key
         ip.user_ns["d"] = {('foo', 'bar'): None}
         _, matches = complete(line_buffer="d[")
-        nt.assert_in("'foo'", matches)
-        nt.assert_not_in("'foo']", matches)
-        nt.assert_not_in("'bar'", matches)
-        nt.assert_not_in("foo", matches)
-        nt.assert_not_in("bar", matches)
+        self.assertIn("'foo'", matches)
+        self.assertNotIn("'foo']", matches)
+        self.assertNotIn("'bar'", matches)
+        self.assertNotIn("foo", matches)
+        self.assertNotIn("bar", matches)
 
         # - match the prefix
         _, matches = complete(line_buffer="d['f")
-        nt.assert_in("foo", matches)
-        nt.assert_not_in("foo']", matches)
-        nt.assert_not_in("foo\"]", matches)
+        self.assertIn("foo", matches)
+        self.assertNotIn("foo']", matches)
+        self.assertNotIn('foo"]', matches)
         _, matches = complete(line_buffer="d['foo")
-        nt.assert_in("foo", matches)
+        self.assertIn("foo", matches)
 
         # - can complete on second key
         _, matches = complete(line_buffer="d['foo', ")
-        nt.assert_in("'bar'", matches)
+        self.assertIn("'bar'", matches)
         _, matches = complete(line_buffer="d['foo', 'b")
-        nt.assert_in("bar", matches)
-        nt.assert_not_in("foo", matches)
+        self.assertIn("bar", matches)
+        self.assertNotIn("foo", matches)
 
         # - does not propose missing keys
         _, matches = complete(line_buffer="d['foo', 'f")
-        nt.assert_not_in("bar", matches)
-        nt.assert_not_in("foo", matches)
+        self.assertNotIn("bar", matches)
+        self.assertNotIn("foo", matches)
 
         # check sensitivity to following context
         _, matches = complete(line_buffer="d['foo',]", cursor_pos=8)
-        nt.assert_in("'bar'", matches)
-        nt.assert_not_in("bar", matches)
-        nt.assert_not_in("'foo'", matches)
-        nt.assert_not_in("foo", matches)
+        self.assertIn("'bar'", matches)
+        self.assertNotIn("bar", matches)
+        self.assertNotIn("'foo'", matches)
+        self.assertNotIn("foo", matches)
 
         _, matches = complete(line_buffer="d['']", cursor_pos=3)
-        nt.assert_in("foo", matches)
+        self.assertIn("foo", matches)
         assert not any(m.endswith(("]", '"', "'")) for m in matches), matches
 
         _, matches = complete(line_buffer='d[""]', cursor_pos=3)
-        nt.assert_in("foo", matches)
+        self.assertIn("foo", matches)
         assert not any(m.endswith(("]", '"', "'")) for m in matches), matches
 
         _, matches = complete(line_buffer='d["foo","]', cursor_pos=9)
-        nt.assert_in("bar", matches)
+        self.assertIn("bar", matches)
         assert not any(m.endswith(("]", '"', "'")) for m in matches), matches
 
         _, matches = complete(line_buffer='d["foo",]', cursor_pos=8)
-        nt.assert_in("'bar'", matches)
-        nt.assert_not_in("bar", matches)
+        self.assertIn("'bar'", matches)
+        self.assertNotIn("bar", matches)
 
         # Can complete with longer tuple keys
         ip.user_ns["d"] = {('foo', 'bar', 'foobar'): None}
 
         # - can complete second key
         _, matches = complete(line_buffer="d['foo', 'b")
-        nt.assert_in('bar', matches)
-        nt.assert_not_in('foo', matches)
-        nt.assert_not_in('foobar', matches)
+        self.assertIn("bar", matches)
+        self.assertNotIn("foo", matches)
+        self.assertNotIn("foobar", matches)
 
         # - can complete third key
         _, matches = complete(line_buffer="d['foo', 'bar', 'fo")
-        nt.assert_in('foobar', matches)
-        nt.assert_not_in('foo', matches)
-        nt.assert_not_in('bar', matches)
-
+        self.assertIn("foobar", matches)
+        self.assertNotIn("foo", matches)
+        self.assertNotIn("bar", matches)
 
     def test_dict_key_completion_contexts(self):
         """Test expression contexts in which dict key completion occurs"""
@@ -1046,16 +1042,16 @@ class C:
 
         def assert_no_completion(**kwargs):
             _, matches = complete(**kwargs)
-            nt.assert_not_in("abc", matches)
-            nt.assert_not_in("abc'", matches)
-            nt.assert_not_in("abc']", matches)
-            nt.assert_not_in("'abc'", matches)
-            nt.assert_not_in("'abc']", matches)
+            self.assertNotIn("abc", matches)
+            self.assertNotIn("abc'", matches)
+            self.assertNotIn("abc']", matches)
+            self.assertNotIn("'abc'", matches)
+            self.assertNotIn("'abc']", matches)
 
         def assert_completion(**kwargs):
             _, matches = complete(**kwargs)
-            nt.assert_in("'abc'", matches)
-            nt.assert_not_in("'abc']", matches)
+            self.assertIn("'abc'", matches)
+            self.assertNotIn("'abc']", matches)
 
         # no completion after string closed, even if reopened
         assert_no_completion(line_buffer="d['a'")
@@ -1071,7 +1067,7 @@ def assert_completion(**kwargs):
         # greedy flag
         def assert_completion(**kwargs):
             _, matches = complete(**kwargs)
-            nt.assert_in("get()['abc']", matches)
+            self.assertIn("get()['abc']", matches)
 
         assert_no_completion(line_buffer="get()[")
         with greedy_completion():
@@ -1089,25 +1085,25 @@ def test_dict_key_completion_bytes(self):
         ip.user_ns["d"] = {"abc": None, b"abd": None}
 
         _, matches = complete(line_buffer="d[")
-        nt.assert_in("'abc'", matches)
-        nt.assert_in("b'abd'", matches)
+        self.assertIn("'abc'", matches)
+        self.assertIn("b'abd'", matches)
 
         if False:  # not currently implemented
             _, matches = complete(line_buffer="d[b")
-            nt.assert_in("b'abd'", matches)
-            nt.assert_not_in("b'abc'", matches)
+            self.assertIn("b'abd'", matches)
+            self.assertNotIn("b'abc'", matches)
 
             _, matches = complete(line_buffer="d[b'")
-            nt.assert_in("abd", matches)
-            nt.assert_not_in("abc", matches)
+            self.assertIn("abd", matches)
+            self.assertNotIn("abc", matches)
 
             _, matches = complete(line_buffer="d[B'")
-            nt.assert_in("abd", matches)
-            nt.assert_not_in("abc", matches)
+            self.assertIn("abd", matches)
+            self.assertNotIn("abc", matches)
 
             _, matches = complete(line_buffer="d['")
-            nt.assert_in("abc", matches)
-            nt.assert_not_in("abd", matches)
+            self.assertIn("abc", matches)
+            self.assertNotIn("abd", matches)
 
     def test_dict_key_completion_unicode_py3(self):
         """Test handling of unicode in dict key completion"""
@@ -1120,20 +1116,20 @@ def test_dict_key_completion_unicode_py3(self):
         if sys.platform != "win32":
             # Known failure on Windows
             _, matches = complete(line_buffer="d['a\\u05d0")
-            nt.assert_in("u05d0", matches)  # tokenized after \\
+            self.assertIn("u05d0", matches)  # tokenized after \\
 
         # query using character
         _, matches = complete(line_buffer="d['a\u05d0")
-        nt.assert_in("a\u05d0", matches)
+        self.assertIn("a\u05d0", matches)
 
         with greedy_completion():
             # query using escape
             _, matches = complete(line_buffer="d['a\\u05d0")
-            nt.assert_in("d['a\\u05d0']", matches)  # tokenized after \\
+            self.assertIn("d['a\\u05d0']", matches)  # tokenized after \\
 
             # query using character
             _, matches = complete(line_buffer="d['a\u05d0")
-            nt.assert_in("d['a\u05d0']", matches)
+            self.assertIn("d['a\u05d0']", matches)
 
     @dec.skip_without("numpy")
     def test_struct_array_key_completion(self):
@@ -1144,8 +1140,8 @@ def test_struct_array_key_completion(self):
         complete = ip.Completer.complete
         ip.user_ns["d"] = numpy.array([], dtype=[("hello", "f"), ("world", "f")])
         _, matches = complete(line_buffer="d['")
-        nt.assert_in("hello", matches)
-        nt.assert_in("world", matches)
+        self.assertIn("hello", matches)
+        self.assertIn("world", matches)
         # complete on the numpy struct itself
         dt = numpy.dtype(
             [("my_head", [("my_dt", ">u4"), ("my_df", ">u4")]), ("my_data", ">f4", 5)]
@@ -1153,14 +1149,14 @@ def test_struct_array_key_completion(self):
         x = numpy.zeros(2, dtype=dt)
         ip.user_ns["d"] = x[1]
         _, matches = complete(line_buffer="d['")
-        nt.assert_in("my_head", matches)
-        nt.assert_in("my_data", matches)
+        self.assertIn("my_head", matches)
+        self.assertIn("my_data", matches)
         # complete on a nested level
         with greedy_completion():
             ip.user_ns["d"] = numpy.zeros(2, dtype=dt)
             _, matches = complete(line_buffer="d[1]['my_head']['")
-            nt.assert_true(any(["my_dt" in m for m in matches]))
-            nt.assert_true(any(["my_df" in m for m in matches]))
+            self.assertTrue(any(["my_dt" in m for m in matches]))
+            self.assertTrue(any(["my_df" in m for m in matches]))
 
     @dec.skip_without("pandas")
     def test_dataframe_key_completion(self):
@@ -1171,8 +1167,8 @@ def test_dataframe_key_completion(self):
         complete = ip.Completer.complete
         ip.user_ns["d"] = pandas.DataFrame({"hello": [1], "world": [2]})
         _, matches = complete(line_buffer="d['")
-        nt.assert_in("hello", matches)
-        nt.assert_in("world", matches)
+        self.assertIn("hello", matches)
+        self.assertIn("world", matches)
 
     def test_dict_key_completion_invalids(self):
         """Smoke test cases dict key completion can't handle"""
@@ -1197,8 +1193,8 @@ def test_object_key_completion(self):
         ip.user_ns["key_completable"] = KeyCompletable(["qwerty", "qwick"])
 
         _, matches = ip.Completer.complete(line_buffer="key_completable['qw")
-        nt.assert_in("qwerty", matches)
-        nt.assert_in("qwick", matches)
+        self.assertIn("qwerty", matches)
+        self.assertIn("qwick", matches)
 
     def test_class_key_completion(self):
         ip = get_ipython()
@@ -1207,8 +1203,8 @@ def test_class_key_completion(self):
         ip.user_ns["named_instance_class"] = NamedInstanceClass
 
         _, matches = ip.Completer.complete(line_buffer="named_instance_class['qw")
-        nt.assert_in("qwerty", matches)
-        nt.assert_in("qwick", matches)
+        self.assertIn("qwerty", matches)
+        self.assertIn("qwick", matches)
 
     def test_tryimport(self):
         """
@@ -1221,27 +1217,27 @@ def test_tryimport(self):
     def test_aimport_module_completer(self):
         ip = get_ipython()
         _, matches = ip.complete("i", "%aimport i")
-        nt.assert_in("io", matches)
-        nt.assert_not_in("int", matches)
+        self.assertIn("io", matches)
+        self.assertNotIn("int", matches)
 
     def test_nested_import_module_completer(self):
         ip = get_ipython()
         _, matches = ip.complete(None, "import IPython.co", 17)
-        nt.assert_in("IPython.core", matches)
-        nt.assert_not_in("import IPython.core", matches)
-        nt.assert_not_in("IPython.display", matches)
+        self.assertIn("IPython.core", matches)
+        self.assertNotIn("import IPython.core", matches)
+        self.assertNotIn("IPython.display", matches)
 
     def test_import_module_completer(self):
         ip = get_ipython()
         _, matches = ip.complete("i", "import i")
-        nt.assert_in("io", matches)
-        nt.assert_not_in("int", matches)
+        self.assertIn("io", matches)
+        self.assertNotIn("int", matches)
 
     def test_from_module_completer(self):
         ip = get_ipython()
         _, matches = ip.complete("B", "from io import B", 16)
-        nt.assert_in("BytesIO", matches)
-        nt.assert_not_in("BaseException", matches)
+        self.assertIn("BytesIO", matches)
+        self.assertNotIn("BaseException", matches)
 
     def test_snake_case_completion(self):
         ip = get_ipython()
@@ -1249,8 +1245,8 @@ def test_snake_case_completion(self):
         ip.user_ns["some_three"] = 3
         ip.user_ns["some_four"] = 4
         _, matches = ip.complete("s_", "print(s_f")
-        nt.assert_in("some_three", matches)
-        nt.assert_in("some_four", matches)
+        self.assertIn("some_three", matches)
+        self.assertIn("some_four", matches)
 
     def test_mix_terms(self):
         ip = get_ipython()
@@ -1274,5 +1270,5 @@ def meth_2(self, meth2_arg1, meth2_arg2):
             )
         )
         _, matches = ip.complete(None, "test.meth(")
-        nt.assert_in("meth_arg1=", matches)
-        nt.assert_not_in("meth2_arg1=", matches)
+        self.assertIn("meth_arg1=", matches)
+        self.assertNotIn("meth2_arg1=", matches)

From 44d74a9af58956162aef50022942b876f3423d6d Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 10:56:44 +0200
Subject: [PATCH 0715/1407] [core][tests][completerlib] Remove nose

---
 IPython/core/tests/test_completerlib.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/IPython/core/tests/test_completerlib.py b/IPython/core/tests/test_completerlib.py
index f87e784d63c..b5508447895 100644
--- a/IPython/core/tests/test_completerlib.py
+++ b/IPython/core/tests/test_completerlib.py
@@ -14,8 +14,6 @@
 import unittest
 from os.path import join
 
-import nose.tools as nt
-
 from IPython.core.completerlib import magic_run_completer, module_completion, try_import
 from IPython.utils.tempdir import TemporaryDirectory
 from IPython.testing.decorators import onlyif_unicode_paths
@@ -140,7 +138,7 @@ def test_import_invalid_module():
 
         s = set( module_completion('import foo') )
         intersection = s.intersection(invalid_module_names)
-        nt.assert_equal(intersection, set())
+        assert intersection == set()
 
         assert valid_module_names.issubset(s), valid_module_names.intersection(s)
 
@@ -153,15 +151,15 @@ def test_bad_module_all():
     testsdir = os.path.dirname(__file__)
     sys.path.insert(0, testsdir)
     try:
-        results = module_completion('from bad_all import ')
-        nt.assert_in('puppies', results)
+        results = module_completion("from bad_all import ")
+        assert "puppies" in results
         for r in results:
-            nt.assert_is_instance(r, str)
+            assert isinstance(r, str)
 
         # bad_all doesn't contain submodules, but this completion
         # should finish without raising an exception:
         results = module_completion("import bad_all.")
-        nt.assert_equal(results, [])
+        assert results == []
     finally:
         sys.path.remove(testsdir)
 
@@ -189,6 +187,6 @@ def test_valid_exported_submodules():
     """
     results = module_completion("import os.pa")
     # ensure we get a valid submodule:
-    nt.assert_in("os.path", results)
+    assert "os.path" in results
     # ensure we don't get objects that aren't submodules:
-    nt.assert_not_in("os.pathconf", results)
+    assert "os.pathconf" not in results

From 7880f76fed6c1c06f07f4e1afa2ca6aa4b7a5092 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 10:57:02 +0200
Subject: [PATCH 0716/1407] [core][tests][debugger] Remove nose

---
 IPython/core/tests/test_debugger.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 7e1a07d5fb1..ab6b3cb0233 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -18,8 +18,6 @@
 from textwrap import dedent
 from unittest.mock import patch
 
-import nose.tools as nt
-
 from IPython.core import debugger
 from IPython.testing import IPYTHON_TESTING_TIMEOUT_SCALE
 from IPython.testing.decorators import skip_win32
@@ -66,13 +64,13 @@ def test_longer_repr():
     a = '1234567890'* 7
     ar = "'1234567890123456789012345678901234567890123456789012345678901234567890'"
     a_trunc = "'123456789012...8901234567890'"
-    nt.assert_equal(trepr(a), a_trunc)
+    assert trepr(a) == a_trunc
     # The creation of our tracer modifies the repr module's repr function
     # in-place, since that global is used directly by the stdlib's pdb module.
     with warnings.catch_warnings():
         warnings.simplefilter('ignore', DeprecationWarning)
         debugger.Tracer()
-    nt.assert_equal(trepr(a), ar)
+    assert trepr(a) == ar
 
 def test_ipdb_magics():
     '''Test calling some IPython magics from ipdb.

From f4d8de49fa6aeadc4f0bceceff440b04a6136fb3 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:10:59 +0200
Subject: [PATCH 0717/1407] [core][tests][display] Remove nose

---
 IPython/core/tests/test_display.py | 245 ++++++++++++++++-------------
 1 file changed, 133 insertions(+), 112 deletions(-)

diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index 15cae218587..b88bee8c8c1 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -7,7 +7,7 @@
 
 from unittest import mock
 
-import nose.tools as nt
+import pytest
 
 from IPython import display
 from IPython.core.getipython import get_ipython
@@ -22,15 +22,15 @@ def test_image_size():
     """Simple test for display.Image(args, width=x,height=y)"""
     thisurl = 'http://www.google.fr/images/srpr/logo3w.png'
     img = display.Image(url=thisurl, width=200, height=200)
-    nt.assert_equal(u'<img src="%s" width="200" height="200"/>' % (thisurl), img._repr_html_())
+    assert '<img src="%s" width="200" height="200"/>' % (thisurl) == img._repr_html_()
     img = display.Image(url=thisurl, metadata={'width':200, 'height':200})
-    nt.assert_equal(u'<img src="%s" width="200" height="200"/>' % (thisurl), img._repr_html_())
+    assert '<img src="%s" width="200" height="200"/>' % (thisurl) == img._repr_html_()
     img = display.Image(url=thisurl, width=200)
-    nt.assert_equal(u'<img src="%s" width="200"/>' % (thisurl), img._repr_html_())
+    assert '<img src="%s" width="200"/>' % (thisurl) == img._repr_html_()
     img = display.Image(url=thisurl)
-    nt.assert_equal(u'<img src="%s"/>' % (thisurl), img._repr_html_())
+    assert '<img src="%s"/>' % (thisurl) == img._repr_html_()
     img = display.Image(url=thisurl, unconfined=True)
-    nt.assert_equal(u'<img src="%s" class="unconfined"/>' % (thisurl), img._repr_html_())
+    assert '<img src="%s" class="unconfined"/>' % (thisurl) == img._repr_html_()
 
 
 def test_image_mimes():
@@ -39,7 +39,7 @@ def test_image_mimes():
         mime = display.Image._MIMETYPES[format]
         img = display.Image(b'garbage', format=format)
         data, metadata = fmt(img)
-        nt.assert_equal(sorted(data), sorted([mime, 'text/plain']))
+        assert sorted(data) == sorted([mime, "text/plain"])
 
 
 def test_geojson():
@@ -60,17 +60,20 @@ def test_geojson():
             "attribution": "Celestia/praesepe",
             "minZoom": 0,
             "maxZoom": 18,
-        })
-    nt.assert_equal(u'<IPython.core.display.GeoJSON object>', str(gj))
+        },
+    )
+    assert "<IPython.core.display.GeoJSON object>" == str(gj)
+
 
 def test_retina_png():
     here = os.path.dirname(__file__)
     img = display.Image(os.path.join(here, "2x2.png"), retina=True)
-    nt.assert_equal(img.height, 1)
-    nt.assert_equal(img.width, 1)
+    assert img.height == 1
+    assert img.width == 1
     data, md = img._repr_png_()
-    nt.assert_equal(md['width'], 1)
-    nt.assert_equal(md['height'], 1)
+    assert md["width"] == 1
+    assert md["height"] == 1
+
 
 def test_embed_svg_url():
     import gzip
@@ -102,18 +105,20 @@ def read(self):
 
     with mock.patch('urllib.request.urlopen', side_effect=mocked_urlopen):
         svg = display.SVG(url=url)
-        nt.assert_true(svg._repr_svg_().startswith('<svg'))
-        svg = display.SVG(url=url + 'z')
-        nt.assert_true(svg._repr_svg_().startswith('<svg'))
+        assert svg._repr_svg_().startswith("<svg") is True
+        svg = display.SVG(url=url + "z")
+        assert svg._repr_svg_().startswith("<svg") is True
+
 
 def test_retina_jpeg():
     here = os.path.dirname(__file__)
     img = display.Image(os.path.join(here, "2x2.jpg"), retina=True)
-    nt.assert_equal(img.height, 1)
-    nt.assert_equal(img.width, 1)
+    assert img.height == 1
+    assert img.width == 1
     data, md = img._repr_jpeg_()
-    nt.assert_equal(md['width'], 1)
-    nt.assert_equal(md['height'], 1)
+    assert md["width"] == 1
+    assert md["height"] == 1
+
 
 def test_base64image():
     display.Image("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAAACnej3aAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB94BCRQnOqNu0b4AAAAKSURBVAjXY2AAAAACAAHiIbwzAAAAAElFTkSuQmCC")
@@ -121,18 +126,30 @@ def test_base64image():
 def test_image_filename_defaults():
     '''test format constraint, and validity of jpeg and png'''
     tpath = ipath.get_ipython_package_dir()
-    nt.assert_raises(ValueError, display.Image, filename=os.path.join(tpath, 'testing/tests/badformat.zip'),
-                     embed=True)
-    nt.assert_raises(ValueError, display.Image)
-    nt.assert_raises(ValueError, display.Image, data='this is not an image', format='badformat', embed=True)
-    # check both paths to allow packages to test at build and install time
+    pytest.raises(
+        ValueError,
+        display.Image,
+        filename=os.path.join(tpath, "testing/tests/badformat.zip"),
+        embed=True,
+    )
+    pytest.raises(ValueError, display.Image)
+    pytest.raises(
+        ValueError,
+        display.Image,
+        data="this is not an image",
+        format="badformat",
+        embed=True,
+    )
+    # check boths paths to allow packages to test at build and install time
     imgfile = os.path.join(tpath, 'core/tests/2x2.png')
     img = display.Image(filename=imgfile)
-    nt.assert_equal('png', img.format)
-    nt.assert_is_not_none(img._repr_png_())
-    img = display.Image(filename=os.path.join(tpath, 'testing/tests/logo.jpg'), embed=False)
-    nt.assert_equal('jpeg', img.format)
-    nt.assert_is_none(img._repr_jpeg_())
+    assert "png" == img.format
+    assert img._repr_png_() is not None
+    img = display.Image(
+        filename=os.path.join(tpath, "testing/tests/logo.jpg"), embed=False
+    )
+    assert "jpeg" == img.format
+    assert img._repr_jpeg_() is None
 
 def _get_inline_config():
     from matplotlib_inline.config import InlineBackend
@@ -171,9 +188,9 @@ def test_set_matplotlib_formats():
         display.set_matplotlib_formats(*formats)
         for mime, f in formatters.items():
             if mime in active_mimes:
-                nt.assert_in(Figure, f)
+                assert Figure in f
             else:
-                nt.assert_not_in(Figure, f)
+                assert Figure not in f
 
 
 @dec.skip_without("ipykernel")
@@ -192,7 +209,7 @@ def test_set_matplotlib_formats_kwargs():
     expected["base64"] = True
     expected["fmt"] = "png"
     expected.update(cfg.print_figure_kwargs)
-    nt.assert_equal(formatter_kwargs, expected)
+    assert formatter_kwargs == expected
 
 def test_display_available():
     """
@@ -213,27 +230,28 @@ def test_display_available():
         ip.run_cell('display')
 
 def test_textdisplayobj_pretty_repr():
-     p = display.Pretty("This is a simple test")
-     nt.assert_equal(repr(p), '<IPython.core.display.Pretty object>')
-     nt.assert_equal(p.data, 'This is a simple test')
+    p = display.Pretty("This is a simple test")
+    assert repr(p) == "<IPython.core.display.Pretty object>"
+    assert p.data == "This is a simple test"
+
+    p._show_mem_addr = True
+    assert repr(p) == object.__repr__(p)
 
-     p._show_mem_addr = True
-     nt.assert_equal(repr(p), object.__repr__(p))
 
 def test_displayobject_repr():
-    h = display.HTML('<br />')
-    nt.assert_equal(repr(h), '<IPython.core.display.HTML object>')
+    h = display.HTML("<br />")
+    assert repr(h) == "<IPython.core.display.HTML object>"
     h._show_mem_addr = True
-    nt.assert_equal(repr(h), object.__repr__(h))
+    assert repr(h) == object.__repr__(h)
     h._show_mem_addr = False
-    nt.assert_equal(repr(h), '<IPython.core.display.HTML object>')
+    assert repr(h) == "<IPython.core.display.HTML object>"
 
-    j = display.Javascript('')
-    nt.assert_equal(repr(j), '<IPython.core.display.Javascript object>')
+    j = display.Javascript("")
+    assert repr(j) == "<IPython.core.display.Javascript object>"
     j._show_mem_addr = True
-    nt.assert_equal(repr(j), object.__repr__(j))
+    assert repr(j) == object.__repr__(j)
     j._show_mem_addr = False
-    nt.assert_equal(repr(j), '<IPython.core.display.Javascript object>')
+    assert repr(j) == "<IPython.core.display.Javascript object>"
 
 @mock.patch('warnings.warn')
 def test_encourage_iframe_over_html(m_warn):
@@ -255,18 +273,22 @@ def test_encourage_iframe_over_html(m_warn):
 
 def test_progress():
     p = display.ProgressBar(10)
-    nt.assert_in('0/10',repr(p))
-    p.html_width = '100%'
+    assert "0/10" in repr(p)
+    p.html_width = "100%"
     p.progress = 5
-    nt.assert_equal(p._repr_html_(), "<progress style='width:100%' max='10' value='5'></progress>")
+    assert (
+        p._repr_html_() == "<progress style='width:100%' max='10' value='5'></progress>"
+    )
+
 
 def test_progress_iter():
     with capture_output(display=False) as captured:
         for i in display.ProgressBar(5):
             out = captured.stdout
-            nt.assert_in('{0}/5'.format(i), out)
+            assert "{0}/5".format(i) in out
     out = captured.stdout
-    nt.assert_in('5/5', out)
+    assert "5/5" in out
+
 
 def test_json():
     d = {'a': 5}
@@ -284,13 +306,13 @@ def test_json():
         display.JSON(d, expanded=True, root='custom'),
     ]
     for j, md in zip(json_objs, metadata):
-        nt.assert_equal(j._repr_json_(), (d, md))
+        assert j._repr_json_() == (d, md)
 
     with warnings.catch_warnings(record=True) as w:
         warnings.simplefilter("always")
         j = display.JSON(json.dumps(d))
-        nt.assert_equal(len(w), 1)
-        nt.assert_equal(j._repr_json_(), (d, metadata[0]))
+        assert len(w) == 1
+        assert j._repr_json_() == (d, metadata[0])
 
     json_objs = [
         display.JSON(lis),
@@ -299,23 +321,24 @@ def test_json():
         display.JSON(lis, expanded=True, root='custom'),
     ]
     for j, md in zip(json_objs, metadata):
-        nt.assert_equal(j._repr_json_(), (lis, md))
+        assert j._repr_json_() == (lis, md)
 
     with warnings.catch_warnings(record=True) as w:
         warnings.simplefilter("always")
         j = display.JSON(json.dumps(lis))
-        nt.assert_equal(len(w), 1)
-        nt.assert_equal(j._repr_json_(), (lis, metadata[0]))
+        assert len(w) == 1
+        assert j._repr_json_() == (lis, metadata[0])
+
 
 def test_video_embedding():
     """use a tempfile, with dummy-data, to ensure that video embedding doesn't crash"""
     v = display.Video("http://ignored")
     assert not v.embed
     html = v._repr_html_()
-    nt.assert_not_in('src="data:', html)
-    nt.assert_in('src="http://ignored"', html)
+    assert 'src="data:' not in html
+    assert 'src="http://ignored"' in html
 
-    with nt.assert_raises(ValueError):
+    with pytest.raises(ValueError):
         v = display.Video(b'abc')
 
     with NamedFileInTemporaryDirectory('test.mp4') as f:
@@ -325,52 +348,53 @@ def test_video_embedding():
         v = display.Video(f.name)
         assert not v.embed
         html = v._repr_html_()
-        nt.assert_not_in('src="data:', html)
+        assert 'src="data:' not in html
 
         v = display.Video(f.name, embed=True)
         html = v._repr_html_()
-        nt.assert_in('src="data:video/mp4;base64,YWJj"',html)
+        assert 'src="data:video/mp4;base64,YWJj"' in html
 
         v = display.Video(f.name, embed=True, mimetype='video/other')
         html = v._repr_html_()
-        nt.assert_in('src="data:video/other;base64,YWJj"',html)
+        assert 'src="data:video/other;base64,YWJj"' in html
 
         v = display.Video(b'abc', embed=True, mimetype='video/mp4')
         html = v._repr_html_()
-        nt.assert_in('src="data:video/mp4;base64,YWJj"',html)
+        assert 'src="data:video/mp4;base64,YWJj"' in html
 
         v = display.Video(u'YWJj', embed=True, mimetype='video/xyz')
         html = v._repr_html_()
-        nt.assert_in('src="data:video/xyz;base64,YWJj"',html)
+        assert 'src="data:video/xyz;base64,YWJj"' in html
 
 def test_html_metadata():
     s = "<h1>Test</h1>"
     h = display.HTML(s, metadata={"isolated": True})
-    nt.assert_equal(h._repr_html_(), (s, {"isolated": True}))
+    assert h._repr_html_() == (s, {"isolated": True})
+
 
 def test_display_id():
     ip = get_ipython()
     with mock.patch.object(ip.display_pub, 'publish') as pub:
         handle = display.display('x')
-        nt.assert_is(handle, None)
+        assert handle is None
         handle = display.display('y', display_id='secret')
-        nt.assert_is_instance(handle, display.DisplayHandle)
+        assert isinstance(handle, display.DisplayHandle)
         handle2 = display.display('z', display_id=True)
-        nt.assert_is_instance(handle2, display.DisplayHandle)
-    nt.assert_not_equal(handle.display_id, handle2.display_id)
+        assert isinstance(handle2, display.DisplayHandle)
+    assert handle.display_id != handle2.display_id
 
-    nt.assert_equal(pub.call_count, 3)
+    assert pub.call_count == 3
     args, kwargs = pub.call_args_list[0]
-    nt.assert_equal(args, ())
-    nt.assert_equal(kwargs, {
+    assert args == ()
+    assert kwargs == {
         'data': {
             'text/plain': repr('x')
         },
         'metadata': {},
-    })
+    }
     args, kwargs = pub.call_args_list[1]
-    nt.assert_equal(args, ())
-    nt.assert_equal(kwargs, {
+    assert args == ()
+    assert kwargs == {
         'data': {
             'text/plain': repr('y')
         },
@@ -378,10 +402,10 @@ def test_display_id():
         'transient': {
             'display_id': handle.display_id,
         },
-    })
+    }
     args, kwargs = pub.call_args_list[2]
-    nt.assert_equal(args, ())
-    nt.assert_equal(kwargs, {
+    assert args == ()
+    assert kwargs == {
         'data': {
             'text/plain': repr('z')
         },
@@ -389,19 +413,19 @@ def test_display_id():
         'transient': {
             'display_id': handle2.display_id,
         },
-    })
+    }
 
 
 def test_update_display():
     ip = get_ipython()
     with mock.patch.object(ip.display_pub, 'publish') as pub:
-        with nt.assert_raises(TypeError):
+        with pytest.raises(TypeError):
             display.update_display('x')
         display.update_display('x', display_id='1')
         display.update_display('y', display_id='2')
     args, kwargs = pub.call_args_list[0]
-    nt.assert_equal(args, ())
-    nt.assert_equal(kwargs, {
+    assert args == ()
+    assert kwargs == {
         'data': {
             'text/plain': repr('x')
         },
@@ -410,10 +434,10 @@ def test_update_display():
             'display_id': '1',
         },
         'update': True,
-    })
+    }
     args, kwargs = pub.call_args_list[1]
-    nt.assert_equal(args, ())
-    nt.assert_equal(kwargs, {
+    assert args == ()
+    assert kwargs == {
         'data': {
             'text/plain': repr('y')
         },
@@ -422,22 +446,22 @@ def test_update_display():
             'display_id': '2',
         },
         'update': True,
-    })
+    }
 
 
 def test_display_handle():
     ip = get_ipython()
     handle = display.DisplayHandle()
-    nt.assert_is_instance(handle.display_id, str)
-    handle = display.DisplayHandle('my-id')
-    nt.assert_equal(handle.display_id, 'my-id')
-    with mock.patch.object(ip.display_pub, 'publish') as pub:
-        handle.display('x')
-        handle.update('y')
+    assert isinstance(handle.display_id, str)
+    handle = display.DisplayHandle("my-id")
+    assert handle.display_id == "my-id"
+    with mock.patch.object(ip.display_pub, "publish") as pub:
+        handle.display("x")
+        handle.update("y")
 
     args, kwargs = pub.call_args_list[0]
-    nt.assert_equal(args, ())
-    nt.assert_equal(kwargs, {
+    assert args == ()
+    assert kwargs == {
         'data': {
             'text/plain': repr('x')
         },
@@ -445,10 +469,10 @@ def test_display_handle():
         'transient': {
             'display_id': handle.display_id,
         }
-    })
+    }
     args, kwargs = pub.call_args_list[1]
-    nt.assert_equal(args, ())
-    nt.assert_equal(kwargs, {
+    assert args == ()
+    assert kwargs == {
         'data': {
             'text/plain': repr('y')
         },
@@ -457,34 +481,31 @@ def test_display_handle():
             'display_id': handle.display_id,
         },
         'update': True,
-    })
+    }
 
 
 def test_image_alt_tag():
     """Simple test for display.Image(args, alt=x,)"""
     thisurl = "http://example.com/image.png"
     img = display.Image(url=thisurl, alt="an image")
-    nt.assert_equal(u'<img src="%s" alt="an image"/>' % (thisurl), img._repr_html_())
+    assert '<img src="%s" alt="an image"/>' % (thisurl) == img._repr_html_()
     img = display.Image(url=thisurl, unconfined=True, alt="an image")
-    nt.assert_equal(
-        u'<img src="%s" class="unconfined" alt="an image"/>' % (thisurl),
-        img._repr_html_(),
+    assert (
+        '<img src="%s" class="unconfined" alt="an image"/>' % (thisurl)
+        == img._repr_html_()
     )
     img = display.Image(url=thisurl, alt='>"& <')
-    nt.assert_equal(
-        u'<img src="%s" alt="&gt;&quot;&amp; &lt;"/>' % (thisurl), img._repr_html_()
-    )
+    assert '<img src="%s" alt="&gt;&quot;&amp; &lt;"/>' % (thisurl) == img._repr_html_()
 
     img = display.Image(url=thisurl, metadata={"alt": "an image"})
-    nt.assert_equal(img.alt, "an image")
-
+    assert img.alt == "an image"
     here = os.path.dirname(__file__)
     img = display.Image(os.path.join(here, "2x2.png"), alt="an image")
-    nt.assert_equal(img.alt, "an image")
+    assert img.alt == "an image"
     _, md = img._repr_png_()
-    nt.assert_equal(md["alt"], "an image")
+    assert md["alt"] == "an image"
 
 
-@nt.raises(FileNotFoundError)
 def test_image_bad_filename_raises_proper_exception():
-    display.Image("/this/file/does/not/exist/")._repr_png_()
+    with pytest.raises(FileNotFoundError):
+        display.Image("/this/file/does/not/exist/")._repr_png_()

From 8f530016199fb5e32955f4d4a78e34ef861095c1 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:11:46 +0200
Subject: [PATCH 0718/1407] [core][tests][events] Remove nose

---
 IPython/core/tests/test_events.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/IPython/core/tests/test_events.py b/IPython/core/tests/test_events.py
index a4211ecea4c..cc9bf40fd6d 100644
--- a/IPython/core/tests/test_events.py
+++ b/IPython/core/tests/test_events.py
@@ -1,6 +1,5 @@
 import unittest
 from unittest.mock import Mock
-import nose.tools as nt
 
 from IPython.core import events
 import IPython.testing.tools as tt
@@ -40,9 +39,9 @@ def cb1():
         def cb2():
             ...
 
-        self.em.register('ping_received', cb1)
-        nt.assert_raises(ValueError, self.em.unregister, 'ping_received', cb2)
-        self.em.unregister('ping_received', cb1)
+        self.em.register("ping_received", cb1)
+        self.assertRaises(ValueError, self.em.unregister, "ping_received", cb2)
+        self.em.unregister("ping_received", cb1)
 
     def test_cb_error(self):
         cb = Mock(side_effect=ValueError)

From 1304d9e8b37bc2df27974a7679dd17edc8bf9e38 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:12:00 +0200
Subject: [PATCH 0719/1407] [core][tests][extension] Remove nose

---
 IPython/core/tests/test_extension.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/IPython/core/tests/test_extension.py b/IPython/core/tests/test_extension.py
index b18e6848fe1..51db4b6258c 100644
--- a/IPython/core/tests/test_extension.py
+++ b/IPython/core/tests/test_extension.py
@@ -1,7 +1,5 @@
 import os.path
 
-import nose.tools as nt
-
 import IPython.testing.tools as tt
 from IPython.utils.syspathcontext import prepended_to_syspath
 from IPython.utils.tempdir import TemporaryDirectory
@@ -93,4 +91,4 @@ def test_extension_builtins():
 
 def test_non_extension():
     em = get_ipython().extension_manager
-    nt.assert_equal(em.load_extension('sys'), "no load function")
+    assert em.load_extension("sys") == "no load function"

From 2de4d8b31bd091ea60c6b5301ebdabcfe855aa04 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:13:46 +0200
Subject: [PATCH 0720/1407] [core][tests][formatters] Remove nose

---
 IPython/core/tests/test_formatters.py | 164 +++++++++++++-------------
 1 file changed, 83 insertions(+), 81 deletions(-)

diff --git a/IPython/core/tests/test_formatters.py b/IPython/core/tests/test_formatters.py
index 15ce8df29d1..6ea40eb22b6 100644
--- a/IPython/core/tests/test_formatters.py
+++ b/IPython/core/tests/test_formatters.py
@@ -7,7 +7,7 @@
     import numpy
 except:
     numpy = None
-import nose.tools as nt
+import pytest
 
 from IPython import get_ipython
 from traitlets.config import Config
@@ -95,24 +95,25 @@ def test_bad_precision():
     """test various invalid values for float_precision."""
     f = PlainTextFormatter()
     def set_fp(p):
-        f.float_precision=p
-    nt.assert_raises(ValueError, set_fp, '%')
-    nt.assert_raises(ValueError, set_fp, '%.3f%i')
-    nt.assert_raises(ValueError, set_fp, 'foo')
-    nt.assert_raises(ValueError, set_fp, -1)
+        f.float_precision = p
+
+    pytest.raises(ValueError, set_fp, "%")
+    pytest.raises(ValueError, set_fp, "%.3f%i")
+    pytest.raises(ValueError, set_fp, "foo")
+    pytest.raises(ValueError, set_fp, -1)
 
 def test_for_type():
     f = PlainTextFormatter()
     
     # initial return, None
-    nt.assert_is(f.for_type(C, foo_printer), None)
+    assert f.for_type(C, foo_printer) is None
     # no func queries
-    nt.assert_is(f.for_type(C), foo_printer)
+    assert f.for_type(C) is foo_printer
     # shouldn't change anything
-    nt.assert_is(f.for_type(C), foo_printer)
+    assert f.for_type(C) is foo_printer
     # None should do the same
-    nt.assert_is(f.for_type(C, None), foo_printer)
-    nt.assert_is(f.for_type(C, None), foo_printer)
+    assert f.for_type(C, None) is foo_printer
+    assert f.for_type(C, None) is foo_printer
 
 def test_for_type_string():
     f = PlainTextFormatter()
@@ -120,13 +121,13 @@ def test_for_type_string():
     type_str = '%s.%s' % (C.__module__, 'C')
     
     # initial return, None
-    nt.assert_is(f.for_type(type_str, foo_printer), None)
+    assert f.for_type(type_str, foo_printer) is None
     # no func queries
-    nt.assert_is(f.for_type(type_str), foo_printer)
-    nt.assert_in(_mod_name_key(C), f.deferred_printers)
-    nt.assert_is(f.for_type(C), foo_printer)
-    nt.assert_not_in(_mod_name_key(C), f.deferred_printers)
-    nt.assert_in(C, f.type_printers)
+    assert f.for_type(type_str) is foo_printer
+    assert _mod_name_key(C) in f.deferred_printers
+    assert f.for_type(C) is foo_printer
+    assert _mod_name_key(C) not in f.deferred_printers
+    assert C in f.type_printers
 
 def test_for_type_by_name():
     f = PlainTextFormatter()
@@ -134,21 +135,22 @@ def test_for_type_by_name():
     mod = C.__module__
     
     # initial return, None
-    nt.assert_is(f.for_type_by_name(mod, 'C', foo_printer), None)
+    assert f.for_type_by_name(mod, "C", foo_printer) is None
     # no func queries
-    nt.assert_is(f.for_type_by_name(mod, 'C'), foo_printer)
+    assert f.for_type_by_name(mod, "C") is foo_printer
     # shouldn't change anything
-    nt.assert_is(f.for_type_by_name(mod, 'C'), foo_printer)
+    assert f.for_type_by_name(mod, "C") is foo_printer
     # None should do the same
-    nt.assert_is(f.for_type_by_name(mod, 'C', None), foo_printer)
-    nt.assert_is(f.for_type_by_name(mod, 'C', None), foo_printer)
+    assert f.for_type_by_name(mod, "C", None) is foo_printer
+    assert f.for_type_by_name(mod, "C", None) is foo_printer
+
 
 def test_lookup():
     f = PlainTextFormatter()
     
     f.for_type(C, foo_printer)
-    nt.assert_is(f.lookup(C()), foo_printer)
-    with nt.assert_raises(KeyError):
+    assert f.lookup(C()) is foo_printer
+    with pytest.raises(KeyError):
         f.lookup(A())
 
 def test_lookup_string():
@@ -156,16 +158,16 @@ def test_lookup_string():
     type_str = '%s.%s' % (C.__module__, 'C')
     
     f.for_type(type_str, foo_printer)
-    nt.assert_is(f.lookup(C()), foo_printer)
+    assert f.lookup(C()) is foo_printer
     # should move from deferred to imported dict
-    nt.assert_not_in(_mod_name_key(C), f.deferred_printers)
-    nt.assert_in(C, f.type_printers)
+    assert _mod_name_key(C) not in f.deferred_printers
+    assert C in f.type_printers
 
 def test_lookup_by_type():
     f = PlainTextFormatter()
     f.for_type(C, foo_printer)
-    nt.assert_is(f.lookup_by_type(C), foo_printer)
-    with nt.assert_raises(KeyError):
+    assert f.lookup_by_type(C) is foo_printer
+    with pytest.raises(KeyError):
         f.lookup_by_type(A)
 
 def test_lookup_by_type_string():
@@ -174,69 +176,69 @@ def test_lookup_by_type_string():
     f.for_type(type_str, foo_printer)
     
     # verify insertion
-    nt.assert_in(_mod_name_key(C), f.deferred_printers)
-    nt.assert_not_in(C, f.type_printers)
+    assert _mod_name_key(C) in f.deferred_printers
+    assert C not in f.type_printers
     
-    nt.assert_is(f.lookup_by_type(type_str), foo_printer)
+    assert f.lookup_by_type(type_str) is foo_printer
     # lookup by string doesn't cause import
-    nt.assert_in(_mod_name_key(C), f.deferred_printers)
-    nt.assert_not_in(C, f.type_printers)
+    assert _mod_name_key(C) in f.deferred_printers
+    assert C not in f.type_printers
     
-    nt.assert_is(f.lookup_by_type(C), foo_printer)
+    assert f.lookup_by_type(C) is foo_printer
     # should move from deferred to imported dict
-    nt.assert_not_in(_mod_name_key(C), f.deferred_printers)
-    nt.assert_in(C, f.type_printers)
+    assert _mod_name_key(C) not in f.deferred_printers
+    assert C in f.type_printers
 
 def test_in_formatter():
     f = PlainTextFormatter()
     f.for_type(C, foo_printer)
     type_str = '%s.%s' % (C.__module__, 'C')
-    nt.assert_in(C, f)
-    nt.assert_in(type_str, f)
+    assert C in f
+    assert type_str in f
 
 def test_string_in_formatter():
     f = PlainTextFormatter()
     type_str = '%s.%s' % (C.__module__, 'C')
     f.for_type(type_str, foo_printer)
-    nt.assert_in(type_str, f)
-    nt.assert_in(C, f)
+    assert type_str in f
+    assert C in f
 
 def test_pop():
     f = PlainTextFormatter()
     f.for_type(C, foo_printer)
-    nt.assert_is(f.lookup_by_type(C), foo_printer)
-    nt.assert_is(f.pop(C, None), foo_printer)
+    assert f.lookup_by_type(C) is foo_printer
+    assert f.pop(C, None) is foo_printer
     f.for_type(C, foo_printer)
-    nt.assert_is(f.pop(C), foo_printer)
-    with nt.assert_raises(KeyError):
+    assert f.pop(C) is foo_printer
+    with pytest.raises(KeyError):
         f.lookup_by_type(C)
-    with nt.assert_raises(KeyError):
+    with pytest.raises(KeyError):
         f.pop(C)
-    with nt.assert_raises(KeyError):
+    with pytest.raises(KeyError):
         f.pop(A)
-    nt.assert_is(f.pop(A, None), None)
+    assert f.pop(A, None) is None
 
 def test_pop_string():
     f = PlainTextFormatter()
     type_str = '%s.%s' % (C.__module__, 'C')
     
-    with nt.assert_raises(KeyError):
+    with pytest.raises(KeyError):
         f.pop(type_str)
     
     f.for_type(type_str, foo_printer)
     f.pop(type_str)
-    with nt.assert_raises(KeyError):
+    with pytest.raises(KeyError):
         f.lookup_by_type(C)
-    with nt.assert_raises(KeyError):
+    with pytest.raises(KeyError):
         f.pop(type_str)
 
     f.for_type(C, foo_printer)
-    nt.assert_is(f.pop(type_str, None), foo_printer)
-    with nt.assert_raises(KeyError):
+    assert f.pop(type_str, None) is foo_printer
+    with pytest.raises(KeyError):
         f.lookup_by_type(C)
-    with nt.assert_raises(KeyError):
+    with pytest.raises(KeyError):
         f.pop(type_str)
-    nt.assert_is(f.pop(type_str, None), None)
+    assert f.pop(type_str, None) is None
     
 
 def test_error_method():
@@ -247,10 +249,10 @@ def _repr_html_(self):
     bad = BadHTML()
     with capture_output() as captured:
         result = f(bad)
-    nt.assert_is(result, None)
-    nt.assert_in("Traceback", captured.stdout)
-    nt.assert_in("Bad HTML", captured.stdout)
-    nt.assert_in("_repr_html_", captured.stdout)
+    assert result is None
+    assert "Traceback" in captured.stdout
+    assert "Bad HTML" in captured.stdout
+    assert "_repr_html_" in captured.stdout
 
 def test_nowarn_notimplemented():
     f = HTMLFormatter()
@@ -260,7 +262,7 @@ def _repr_html_(self):
     h = HTMLNotImplemented()
     with capture_output() as captured:
         result = f(h)
-    nt.assert_is(result, None)
+    assert result is None
     assert "" == captured.stderr
     assert "" == captured.stdout
 
@@ -270,10 +272,10 @@ def test_warn_error_for_type():
     f.for_type(int, lambda i: name_error)
     with capture_output() as captured:
         result = f(5)
-    nt.assert_is(result, None)
-    nt.assert_in("Traceback", captured.stdout)
-    nt.assert_in("NameError", captured.stdout)
-    nt.assert_in("name_error", captured.stdout)
+    assert result is None
+    assert "Traceback" in captured.stdout
+    assert "NameError" in captured.stdout
+    assert "name_error" in captured.stdout
 
 def test_error_pretty_method():
     f = PlainTextFormatter()
@@ -283,11 +285,11 @@ def _repr_pretty_(self):
     bad = BadPretty()
     with capture_output() as captured:
         result = f(bad)
-    nt.assert_is(result, None)
-    nt.assert_in("Traceback", captured.stdout)
-    nt.assert_in("_repr_pretty_", captured.stdout)
-    nt.assert_in("given", captured.stdout)
-    nt.assert_in("argument", captured.stdout)
+    assert result is None
+    assert "Traceback" in captured.stdout
+    assert "_repr_pretty_" in captured.stdout
+    assert "given" in captured.stdout
+    assert "argument" in captured.stdout
 
 
 def test_bad_repr_traceback():
@@ -296,10 +298,10 @@ def test_bad_repr_traceback():
     with capture_output() as captured:
         result = f(bad)
     # catches error, returns None
-    nt.assert_is(result, None)
-    nt.assert_in("Traceback", captured.stdout)
-    nt.assert_in("__repr__", captured.stdout)
-    nt.assert_in("ValueError", captured.stdout)
+    assert result is None
+    assert "Traceback" in captured.stdout
+    assert "__repr__" in captured.stdout
+    assert "ValueError" in captured.stdout
 
 
 class MakePDF(object):
@@ -319,8 +321,8 @@ def _repr_html_(self):
             return "hello"
     with capture_output() as captured:
         result = f(MyHTML)
-    nt.assert_is(result, None)
-    nt.assert_not_in("FormatterWarning", captured.stderr)
+    assert result is None
+    assert "FormatterWarning" not in captured.stderr
 
     with capture_output() as captured:
         result = f(MyHTML())
@@ -341,8 +343,8 @@ def __getattr__(self, key):
     with capture_output() as captured:
         result = f(text_hat)
     
-    nt.assert_is(result, None)
-    nt.assert_not_in("FormatterWarning", captured.stderr)
+    assert result is None
+    assert "FormatterWarning" not in captured.stderr
 
     class CallableMagicHat(object):
         def __getattr__(self, key):
@@ -362,8 +364,8 @@ def _repr_html_(self, extra, args):
     with capture_output() as captured:
         result = f(bad)
     
-    nt.assert_is(result, None)
-    nt.assert_not_in("FormatterWarning", captured.stderr)
+    assert result is None
+    assert "FormatterWarning" not in captured.stderr
 
 
 def test_format_config():
@@ -372,12 +374,12 @@ def test_format_config():
     cfg = Config()
     with capture_output() as captured:
         result = f(cfg)
-    nt.assert_is(result, None)
+    assert result is None
     assert captured.stderr == ""
 
     with capture_output() as captured:
         result = f(Config)
-    nt.assert_is(result, None)
+    assert result is None
     assert captured.stderr == ""
 
 

From 2965bcf0e93dc31fc0b6b9c5d2732d1f9f1ea715 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:13:57 +0200
Subject: [PATCH 0721/1407] [core][tests][handlers] Remove nose

---
 IPython/core/tests/test_handlers.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/IPython/core/tests/test_handlers.py b/IPython/core/tests/test_handlers.py
index 19248177295..e151e70ee91 100644
--- a/IPython/core/tests/test_handlers.py
+++ b/IPython/core/tests/test_handlers.py
@@ -4,9 +4,6 @@
 # Module imports
 #-----------------------------------------------------------------------------
 
-# third party
-import nose.tools as nt
-
 # our own packages
 from IPython.core import autocall
 from IPython.testing import tools as tt
@@ -91,4 +88,4 @@ def test_handlers():
         ])
     ip.magic('autocall 1')
 
-    nt.assert_equal(failures, [])
+    assert failures == []

From cf762a5685effaeed94a03a45927b87be5085175 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:19:49 +0200
Subject: [PATCH 0722/1407] [core][tests][history] Remove nose

---
 IPython/core/tests/test_history.py | 103 ++++++++++++++---------------
 1 file changed, 49 insertions(+), 54 deletions(-)

diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
index 824ba1eeee0..4cc43caeb6b 100644
--- a/IPython/core/tests/test_history.py
+++ b/IPython/core/tests/test_history.py
@@ -13,9 +13,6 @@
 from datetime import datetime
 import sqlite3
 
-# third party
-import nose.tools as nt
-
 # our own packages
 from traitlets.config.loader import Config
 from IPython.utils.tempdir import TemporaryDirectory
@@ -23,7 +20,7 @@
 from IPython.testing.decorators import skipif
 
 def test_proper_default_encoding():
-    nt.assert_equal(sys.getdefaultencoding(), "utf-8")
+    assert sys.getdefaultencoding() == "utf-8"
 
 @skipif(sqlite3.sqlite_version_info > (3,24,0))
 def test_history():
@@ -34,7 +31,7 @@ def test_history():
         hist_file = tmp_path / "history.sqlite"
         try:
             ip.history_manager = HistoryManager(shell=ip, hist_file=hist_file)
-            hist = [u'a=1', u'def f():\n    test = 1\n    return test', u"b='€Æ¾÷ß'"]
+            hist = ["a=1", "def f():\n    test = 1\n    return test", "b='€Æ¾÷ß'"]
             for i, h in enumerate(hist, start=1):
                 ip.history_manager.store_inputs(i, h)
 
@@ -43,13 +40,15 @@ def test_history():
             ip.history_manager.output_hist_reprs[3] = "spam"
             ip.history_manager.store_output(3)
 
-            nt.assert_equal(ip.history_manager.input_hist_raw, [''] + hist)
+            assert ip.history_manager.input_hist_raw == [""] + hist
 
             # Detailed tests for _get_range_session
             grs = ip.history_manager._get_range_session
-            nt.assert_equal(list(grs(start=2,stop=-1)), list(zip([0], [2], hist[1:-1])))
-            nt.assert_equal(list(grs(start=-2)), list(zip([0,0], [2,3], hist[-2:])))
-            nt.assert_equal(list(grs(output=True)), list(zip([0,0,0], [1,2,3], zip(hist, [None,None,'spam']))))
+            assert list(grs(start=2, stop=-1)) == list(zip([0], [2], hist[1:-1]))
+            assert list(grs(start=-2)) == list(zip([0, 0], [2, 3], hist[-2:]))
+            assert list(grs(output=True)) == list(
+                zip([0, 0, 0], [1, 2, 3], zip(hist, [None, None, "spam"]))
+            )
 
             # Check whether specifying a range beyond the end of the current
             # session results in an error (gh-804)
@@ -63,17 +62,14 @@ def test_history():
 
             # New session
             ip.history_manager.reset()
-            newcmds = [u"z=5",
-                       u"class X(object):\n    pass",
-                       u"k='p'",
-                       u"z=5"]
+            newcmds = ["z=5", "class X(object):\n    pass", "k='p'", "z=5"]
             for i, cmd in enumerate(newcmds, start=1):
                 ip.history_manager.store_inputs(i, cmd)
             gothist = ip.history_manager.get_range(start=1, stop=4)
-            nt.assert_equal(list(gothist), list(zip([0,0,0],[1,2,3], newcmds)))
+            assert list(gothist) == list(zip([0, 0, 0], [1, 2, 3], newcmds))
             # Previous session:
             gothist = ip.history_manager.get_range(-1, 1, 4)
-            nt.assert_equal(list(gothist), list(zip([1,1,1],[1,2,3], hist)))
+            assert list(gothist) == list(zip([1, 1, 1], [1, 2, 3], hist))
 
             newhist = [(2, i, c) for (i, c) in enumerate(newcmds, 1)]
 
@@ -82,62 +78,61 @@ def test_history():
                                                     include_latest=True)
             expected = [(1, 3, (hist[-1], "spam"))] \
                 + [(s, n, (c, None)) for (s, n, c) in newhist]
-            nt.assert_equal(list(gothist), expected)
+            assert list(gothist) == expected
 
             gothist = ip.history_manager.get_tail(2)
             expected = newhist[-3:-1]
-            nt.assert_equal(list(gothist), expected)
+            assert list(gothist) == expected
 
             # Check get_hist_search
 
             gothist = ip.history_manager.search("*test*")
-            nt.assert_equal(list(gothist), [(1,2,hist[1])] )
+            assert list(gothist) == [(1, 2, hist[1])]
 
             gothist = ip.history_manager.search("*=*")
-            nt.assert_equal(list(gothist),
-                            [(1, 1, hist[0]),
-                             (1, 2, hist[1]),
-                             (1, 3, hist[2]),
-                             newhist[0],
-                             newhist[2],
-                             newhist[3]])
+            assert list(gothist) == [
+                (1, 1, hist[0]),
+                (1, 2, hist[1]),
+                (1, 3, hist[2]),
+                newhist[0],
+                newhist[2],
+                newhist[3],
+            ]
 
             gothist = ip.history_manager.search("*=*", n=4)
-            nt.assert_equal(list(gothist),
-                            [(1, 3, hist[2]),
-                             newhist[0],
-                             newhist[2],
-                             newhist[3]])
+            assert list(gothist) == [
+                (1, 3, hist[2]),
+                newhist[0],
+                newhist[2],
+                newhist[3],
+            ]
 
             gothist = ip.history_manager.search("*=*", unique=True)
-            nt.assert_equal(list(gothist),
-                            [(1, 1, hist[0]),
-                             (1, 2, hist[1]),
-                             (1, 3, hist[2]),
-                             newhist[2],
-                             newhist[3]])
+            assert list(gothist) == [
+                (1, 1, hist[0]),
+                (1, 2, hist[1]),
+                (1, 3, hist[2]),
+                newhist[2],
+                newhist[3],
+            ]
 
             gothist = ip.history_manager.search("*=*", unique=True, n=3)
-            nt.assert_equal(list(gothist),
-                            [(1, 3, hist[2]),
-                             newhist[2],
-                             newhist[3]])
+            assert list(gothist) == [(1, 3, hist[2]), newhist[2], newhist[3]]
 
             gothist = ip.history_manager.search("b*", output=True)
-            nt.assert_equal(list(gothist), [(1,3,(hist[2],"spam"))] )
+            assert list(gothist) == [(1, 3, (hist[2], "spam"))]
 
             # Cross testing: check that magic %save can get previous session.
             testfilename = (tmp_path / "test.py").resolve()
             ip.magic("save " + str(testfilename) + " ~1/1-3")
-            with io.open(testfilename, encoding='utf-8') as testfile:
-                nt.assert_equal(testfile.read(),
-                                        u"# coding: utf-8\n" + u"\n".join(hist)+u"\n")
+            with io.open(testfilename, encoding="utf-8") as testfile:
+                assert testfile.read() == "# coding: utf-8\n" + "\n".join(hist) + "\n"
 
             # Duplicate line numbers - check that it doesn't crash, and
             # gets a new session
             ip.history_manager.store_inputs(1, "rogue")
             ip.history_manager.writeout_cache()
-            nt.assert_equal(ip.history_manager.session_number, 3)
+            assert ip.history_manager.session_number == 3
         finally:
             # Ensure saving thread is shut down before we try to clean up the files
             ip.history_manager.save_thread.stop()
@@ -158,14 +153,14 @@ def test_extract_hist_ranges():
                 (-7, 1, 6),
                 (-10, 1, None)]
     actual = list(extract_hist_ranges(instr))
-    nt.assert_equal(actual, expected)
+    assert actual == expected
 
 
 def test_extract_hist_ranges_empty_str():
     instr = ""
     expected = [(0, 1, None)]  # 0 == current session, None == to end
     actual = list(extract_hist_ranges(instr))
-    nt.assert_equal(actual, expected)
+    assert actual == expected
 
 
 def test_magic_rerun():
@@ -173,14 +168,14 @@ def test_magic_rerun():
     ip = get_ipython()
     ip.run_cell("a = 10", store_history=True)
     ip.run_cell("a += 1", store_history=True)
-    nt.assert_equal(ip.user_ns["a"], 11)
+    assert ip.user_ns["a"] == 11
     ip.run_cell("%rerun", store_history=True)
-    nt.assert_equal(ip.user_ns["a"], 12)
+    assert ip.user_ns["a"] == 12
 
 def test_timestamp_type():
     ip = get_ipython()
     info = ip.history_manager.get_session_info()
-    nt.assert_true(isinstance(info[1], datetime))
+    assert isinstance(info[1], datetime)
 
 def test_hist_file_config():
     cfg = Config()
@@ -188,7 +183,7 @@ def test_hist_file_config():
     cfg.HistoryManager.hist_file = Path(tfile.name)
     try:
         hm = HistoryManager(shell=get_ipython(), config=cfg)
-        nt.assert_equal(hm.hist_file, cfg.HistoryManager.hist_file)
+        assert hm.hist_file == cfg.HistoryManager.hist_file
     finally:
         try:
             Path(tfile.name).unlink()
@@ -210,14 +205,14 @@ def test_histmanager_disabled():
         cfg.HistoryManager.hist_file = hist_file
         try:
             ip.history_manager = HistoryManager(shell=ip, config=cfg)
-            hist = [u'a=1', u'def f():\n    test = 1\n    return test', u"b='€Æ¾÷ß'"]
+            hist = ["a=1", "def f():\n    test = 1\n    return test", "b='€Æ¾÷ß'"]
             for i, h in enumerate(hist, start=1):
                 ip.history_manager.store_inputs(i, h)
-            nt.assert_equal(ip.history_manager.input_hist_raw, [''] + hist)
+            assert ip.history_manager.input_hist_raw == [""] + hist
             ip.history_manager.reset()
             ip.history_manager.end_session()
         finally:
             ip.history_manager = hist_manager_ori
 
     # hist_file should not be created
-    nt.assert_false(hist_file.exists())
+    assert hist_file.exists() is False

From 0ee38081386bd1dd495b20780fd51e9387c00100 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:21:20 +0200
Subject: [PATCH 0723/1407] [core][tests][hooks] Remove nose

---
 IPython/core/tests/test_hooks.py | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/IPython/core/tests/test_hooks.py b/IPython/core/tests/test_hooks.py
index 35d3f315b74..bd37526a738 100644
--- a/IPython/core/tests/test_hooks.py
+++ b/IPython/core/tests/test_hooks.py
@@ -6,7 +6,6 @@
 # Imports
 #-----------------------------------------------------------------------------
 
-import nose.tools as nt
 from IPython.core.error import TryNext
 from IPython.core.hooks import CommandChainDispatcher
 
@@ -38,27 +37,26 @@ def __call__(self):
 
 def test_command_chain_dispatcher_ff():
     """Test two failing hooks"""
-    fail1 = Fail(u'fail1')
-    fail2 = Fail(u'fail2')
-    dp = CommandChainDispatcher([(0, fail1),
-                                 (10, fail2)])
+    fail1 = Fail("fail1")
+    fail2 = Fail("fail2")
+    dp = CommandChainDispatcher([(0, fail1), (10, fail2)])
 
     try:
         dp()
     except TryNext as e:
-        nt.assert_equal(str(e), u'fail2')
+        assert str(e) == "fail2"
     else:
         assert False, "Expected exception was not raised."
 
-    nt.assert_true(fail1.called)
-    nt.assert_true(fail2.called)
+    assert fail1.called is True
+    assert fail2.called is True
 
 def test_command_chain_dispatcher_fofo():
     """Test a mixture of failing and succeeding hooks."""
-    fail1 = Fail(u'fail1')
-    fail2 = Fail(u'fail2')
-    okay1 = Okay(u'okay1')
-    okay2 = Okay(u'okay2')
+    fail1 = Fail("fail1")
+    fail2 = Fail("fail2")
+    okay1 = Okay("okay1")
+    okay2 = Okay("okay2")
 
     dp = CommandChainDispatcher([(0, fail1),
                                  # (5, okay1), # add this later
@@ -66,12 +64,12 @@ def test_command_chain_dispatcher_fofo():
                                  (15, okay2)])
     dp.add(okay1, 5)
 
-    nt.assert_equal(dp(), u'okay1')
+    assert dp() == "okay1"
 
-    nt.assert_true(fail1.called)
-    nt.assert_true(okay1.called)
-    nt.assert_false(fail2.called)
-    nt.assert_false(okay2.called)
+    assert fail1.called is True
+    assert okay1.called is True
+    assert fail2.called is False
+    assert okay2.called is False
 
 def test_command_chain_dispatcher_eq_priority():
     okay1 = Okay(u'okay1')

From 8903f79e7ef56734ddfd8fb0fa552a69654afb78 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:27:28 +0200
Subject: [PATCH 0724/1407] [core][tests][inputsplitter] Remove nose

---
 IPython/core/tests/test_inputsplitter.py | 105 +++++++++++------------
 1 file changed, 52 insertions(+), 53 deletions(-)

diff --git a/IPython/core/tests/test_inputsplitter.py b/IPython/core/tests/test_inputsplitter.py
index a39943aed80..148c5f043e4 100644
--- a/IPython/core/tests/test_inputsplitter.py
+++ b/IPython/core/tests/test_inputsplitter.py
@@ -8,8 +8,6 @@
 import unittest
 import sys
 
-import nose.tools as nt
-
 from IPython.core import inputsplitter as isp
 from IPython.core.inputtransformer import InputTransformer
 from IPython.core.tests.test_inputtransformer import syntax, syntax_ml
@@ -98,10 +96,10 @@ def test_remove_comments():
 
 def test_get_input_encoding():
     encoding = isp.get_input_encoding()
-    nt.assert_true(isinstance(encoding, str))
+    assert isinstance(encoding, str)
     # simple-minded check that at least encoding a simple string works with the
     # encoding we got.
-    nt.assert_equal(u'test'.encode(encoding), b'test')
+    assert "test".encode(encoding) == b"test"
 
 
 class NoInputEncodingTestCase(unittest.TestCase):
@@ -419,7 +417,7 @@ def test_syntax_multiline(self):
                 for lraw, out_t_part in line_pairs:
                     if out_t_part is not None:
                         out_t_parts.append(out_t_part)
-                    
+
                     if lraw is not None:
                         isp.push(lraw)
                         raw_parts.append(lraw)
@@ -442,7 +440,7 @@ def test_syntax_multiline_cell(self):
                 out = isp.transform_cell(raw)
                 # Match ignoring trailing whitespace
                 self.assertEqual(out.rstrip(), out_t.rstrip())
-    
+
     def test_cellmagic_preempt(self):
         isp = self.isp
         for raw, name, line, cell in [
@@ -464,17 +462,17 @@ def test_multiline_passthrough(self):
         class CommentTransformer(InputTransformer):
             def __init__(self):
                 self._lines = []
-            
+
             def push(self, line):
                 self._lines.append(line + '#')
-            
+
             def reset(self):
                 text = '\n'.join(self._lines)
                 self._lines = []
                 return text
-        
+
         isp.physical_line_transforms.insert(0, CommentTransformer())
-        
+
         for raw, expected in [
             ("a=5", "a=5#"),
             ("%ls foo", "get_ipython().run_line_magic(%r, %r)" % (u'ls', u'foo#')),
@@ -527,38 +525,38 @@ def reset(self):
 # Tests for cell magics support
 
 def test_last_blank():
-    nt.assert_false(isp.last_blank(''))
-    nt.assert_false(isp.last_blank('abc'))
-    nt.assert_false(isp.last_blank('abc\n'))
-    nt.assert_false(isp.last_blank('abc\na'))
+    assert isp.last_blank("") is False
+    assert isp.last_blank("abc") is False
+    assert isp.last_blank("abc\n") is False
+    assert isp.last_blank("abc\na") is False
 
-    nt.assert_true(isp.last_blank('\n'))
-    nt.assert_true(isp.last_blank('\n '))
-    nt.assert_true(isp.last_blank('abc\n '))
-    nt.assert_true(isp.last_blank('abc\n\n'))
-    nt.assert_true(isp.last_blank('abc\nd\n\n'))
-    nt.assert_true(isp.last_blank('abc\nd\ne\n\n'))
-    nt.assert_true(isp.last_blank('abc \n \n \n\n'))
+    assert isp.last_blank("\n") is True
+    assert isp.last_blank("\n ") is True
+    assert isp.last_blank("abc\n ") is True
+    assert isp.last_blank("abc\n\n") is True
+    assert isp.last_blank("abc\nd\n\n") is True
+    assert isp.last_blank("abc\nd\ne\n\n") is True
+    assert isp.last_blank("abc \n \n \n\n") is True
 
 
 def test_last_two_blanks():
-    nt.assert_false(isp.last_two_blanks(''))
-    nt.assert_false(isp.last_two_blanks('abc'))
-    nt.assert_false(isp.last_two_blanks('abc\n'))
-    nt.assert_false(isp.last_two_blanks('abc\n\na'))
-    nt.assert_false(isp.last_two_blanks('abc\n \n'))
-    nt.assert_false(isp.last_two_blanks('abc\n\n'))
-
-    nt.assert_true(isp.last_two_blanks('\n\n'))
-    nt.assert_true(isp.last_two_blanks('\n\n '))
-    nt.assert_true(isp.last_two_blanks('\n \n'))
-    nt.assert_true(isp.last_two_blanks('abc\n\n '))
-    nt.assert_true(isp.last_two_blanks('abc\n\n\n'))
-    nt.assert_true(isp.last_two_blanks('abc\n\n \n'))
-    nt.assert_true(isp.last_two_blanks('abc\n\n \n '))
-    nt.assert_true(isp.last_two_blanks('abc\n\n \n \n'))
-    nt.assert_true(isp.last_two_blanks('abc\nd\n\n\n'))
-    nt.assert_true(isp.last_two_blanks('abc\nd\ne\nf\n\n\n'))
+    assert isp.last_two_blanks("") is False
+    assert isp.last_two_blanks("abc") is False
+    assert isp.last_two_blanks("abc\n") is False
+    assert isp.last_two_blanks("abc\n\na") is False
+    assert isp.last_two_blanks("abc\n \n") is False
+    assert isp.last_two_blanks("abc\n\n") is False
+
+    assert isp.last_two_blanks("\n\n") is True
+    assert isp.last_two_blanks("\n\n ") is True
+    assert isp.last_two_blanks("\n \n") is True
+    assert isp.last_two_blanks("abc\n\n ") is True
+    assert isp.last_two_blanks("abc\n\n\n") is True
+    assert isp.last_two_blanks("abc\n\n \n") is True
+    assert isp.last_two_blanks("abc\n\n \n ") is True
+    assert isp.last_two_blanks("abc\n\n \n \n") is True
+    assert isp.last_two_blanks("abc\nd\n\n\n") is True
+    assert isp.last_two_blanks("abc\nd\ne\nf\n\n\n") is True
 
 
 class CellMagicsCommon(object):
@@ -567,11 +565,11 @@ def test_whole_cell(self):
         src = "%%cellm line\nbody\n"
         out = self.sp.transform_cell(src)
         ref = "get_ipython().run_cell_magic('cellm', 'line', 'body')\n"
-        nt.assert_equal(out, ref)
-    
+        assert out == ref
+
     def test_cellmagic_help(self):
         self.sp.push('%%cellm?')
-        nt.assert_false(self.sp.push_accepts_more())
+        assert self.sp.push_accepts_more() is False
 
     def tearDown(self):
         self.sp.reset()
@@ -582,14 +580,14 @@ class CellModeCellMagics(CellMagicsCommon, unittest.TestCase):
 
     def test_incremental(self):
         sp = self.sp
-        sp.push('%%cellm firstline\n')
-        nt.assert_true(sp.push_accepts_more()) #1
-        sp.push('line2\n')
-        nt.assert_true(sp.push_accepts_more()) #2
-        sp.push('\n')
+        sp.push("%%cellm firstline\n")
+        assert sp.push_accepts_more() is True  # 1
+        sp.push("line2\n")
+        assert sp.push_accepts_more() is True  # 2
+        sp.push("\n")
         # This should accept a blank line and carry on until the cell is reset
-        nt.assert_true(sp.push_accepts_more()) #3
-    
+        assert sp.push_accepts_more() is True  # 3
+
     def test_no_strip_coding(self):
         src = '\n'.join([
             '%%writefile foo.py',
@@ -597,7 +595,7 @@ def test_no_strip_coding(self):
             'print(u"üñîçø∂é")',
         ])
         out = self.sp.transform_cell(src)
-        nt.assert_in('# coding: utf-8', out)
+        assert "# coding: utf-8" in out
 
 
 class LineModeCellMagics(CellMagicsCommon, unittest.TestCase):
@@ -605,11 +603,12 @@ class LineModeCellMagics(CellMagicsCommon, unittest.TestCase):
 
     def test_incremental(self):
         sp = self.sp
-        sp.push('%%cellm line2\n')
-        nt.assert_true(sp.push_accepts_more()) #1
-        sp.push('\n')
+        sp.push("%%cellm line2\n")
+        assert sp.push_accepts_more() is True  # 1
+        sp.push("\n")
         # In this case, a blank line should end the cell magic
-        nt.assert_false(sp.push_accepts_more()) #2
+        assert sp.push_accepts_more() is False  # 2
+
 
 indentation_samples = [
     ('a = 1', 0),

From 3bf77e7cb1d0b24e2954cff0eb789ae352b1ba9b Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:28:39 +0200
Subject: [PATCH 0725/1407] [core][tests][inputtransformer] Remove nose

---
 IPython/core/tests/test_inputtransformer.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/IPython/core/tests/test_inputtransformer.py b/IPython/core/tests/test_inputtransformer.py
index be8209e6d02..4de97b87cb8 100644
--- a/IPython/core/tests/test_inputtransformer.py
+++ b/IPython/core/tests/test_inputtransformer.py
@@ -1,5 +1,4 @@
 import tokenize
-import nose.tools as nt
 
 from IPython.testing import tools as tt
 
@@ -25,7 +24,7 @@ def transform_checker(tests, transformer, **kwargs):
                 out = transformer.reset()
             else:
                 out = transformer.push(inp)
-            nt.assert_equal(out, tr)
+            assert out == tr
     finally:
         transformer.reset()
 

From b75105dfa054175c0834edcd140530432327092b Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:29:52 +0200
Subject: [PATCH 0726/1407] [core][tests][inputtransformer2] Remove nose

---
 IPython/core/tests/test_inputtransformer2.py | 96 ++++++++++----------
 1 file changed, 50 insertions(+), 46 deletions(-)

diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index cd7c5311e45..d341ec737ab 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -4,7 +4,6 @@
 more complex. See test_inputtransformer2_line for tests for line-based
 transformations.
 """
-import nose.tools as nt
 import string
 
 from IPython.core import inputtransformer2 as ipt2
@@ -147,9 +146,10 @@ def check_make_token_by_line_never_ends_empty():
     """
     from string import printable
     for c in printable:
-        nt.assert_not_equal(make_tokens_by_line(c)[-1], [])
+        assert make_tokens_by_line(c)[-1] != []
         for k in printable:
-            nt.assert_not_equal(make_tokens_by_line(c+k)[-1], [])
+            assert make_tokens_by_line(c + k)[-1] != []
+
 
 def check_find(transformer, case, match=True):
     sample, expected_start, _  = case
@@ -157,21 +157,21 @@ def check_find(transformer, case, match=True):
     res = transformer.find(tbl)
     if match:
         # start_line is stored 0-indexed, expected values are 1-indexed
-        nt.assert_equal((res.start_line+1, res.start_col), expected_start)
+        assert (res.start_line + 1, res.start_col) == expected_start
         return res
     else:
-        nt.assert_is(res, None)
+        assert res is None
 
 def check_transform(transformer_cls, case):
     lines, start, expected = case
     transformer = transformer_cls(start)
-    nt.assert_equal(transformer.transform(lines), expected)
+    assert transformer.transform(lines) == expected
 
 def test_continued_line():
     lines = MULTILINE_MAGIC_ASSIGN[0]
-    nt.assert_equal(ipt2.find_end_of_continued_line(lines, 1), 2)
+    assert ipt2.find_end_of_continued_line(lines, 1) == 2
 
-    nt.assert_equal(ipt2.assemble_continued_line(lines, (1, 5), 2), "foo    bar")
+    assert ipt2.assemble_continued_line(lines, (1, 5), 2) == "foo    bar"
 
 def test_find_assign_magic():
     check_find(ipt2.MagicAssign, MULTILINE_MAGIC_ASSIGN)
@@ -217,12 +217,12 @@ def test_find_help():
         check_find(ipt2.HelpEnd, case)
 
     tf = check_find(ipt2.HelpEnd, HELP_CONTINUED_LINE)
-    nt.assert_equal(tf.q_line, 1)
-    nt.assert_equal(tf.q_col, 3)
+    assert tf.q_line == 1
+    assert tf.q_col == 3
 
     tf = check_find(ipt2.HelpEnd, HELP_MULTILINE)
-    nt.assert_equal(tf.q_line, 1)
-    nt.assert_equal(tf.q_col, 8)
+    assert tf.q_line == 1
+    assert tf.q_col == 8
 
     # ? in a comment does not trigger help
     check_find(ipt2.HelpEnd, (["foo # bar?\n"], None, None), match=False)
@@ -231,16 +231,16 @@ def test_find_help():
 
 def test_transform_help():
     tf = ipt2.HelpEnd((1, 0), (1, 9))
-    nt.assert_equal(tf.transform(HELP_IN_EXPR[0]), HELP_IN_EXPR[2])
+    assert tf.transform(HELP_IN_EXPR[0]) == HELP_IN_EXPR[2]
 
     tf = ipt2.HelpEnd((1, 0), (2, 3))
-    nt.assert_equal(tf.transform(HELP_CONTINUED_LINE[0]), HELP_CONTINUED_LINE[2])
+    assert tf.transform(HELP_CONTINUED_LINE[0]) == HELP_CONTINUED_LINE[2]
 
     tf = ipt2.HelpEnd((1, 0), (2, 8))
-    nt.assert_equal(tf.transform(HELP_MULTILINE[0]), HELP_MULTILINE[2])
+    assert tf.transform(HELP_MULTILINE[0]) == HELP_MULTILINE[2]
 
     tf = ipt2.HelpEnd((1, 0), (1, 0))
-    nt.assert_equal(tf.transform(HELP_UNICODE[0]), HELP_UNICODE[2])
+    assert tf.transform(HELP_UNICODE[0]) == HELP_UNICODE[2]
 
 def test_find_assign_op_dedent():
     """
@@ -250,31 +250,34 @@ class Tk:
         def __init__(self, s):
             self.string = s
 
-    nt.assert_equal(_find_assign_op([Tk(s) for s in ('','a','=','b')]), 2)
-    nt.assert_equal(_find_assign_op([Tk(s) for s in ('','(', 'a','=','b', ')', '=' ,'5')]), 6)
+    assert _find_assign_op([Tk(s) for s in ("", "a", "=", "b")]) == 2
+    assert (
+        _find_assign_op([Tk(s) for s in ("", "(", "a", "=", "b", ")", "=", "5")]) == 6
+    )
+
 
 def test_check_complete():
     cc = ipt2.TransformerManager().check_complete
-    nt.assert_equal(cc("a = 1"), ("complete", None))
-    nt.assert_equal(cc("for a in range(5):"), ("incomplete", 4))
-    nt.assert_equal(cc("for a in range(5):\n    if a > 0:"), ("incomplete", 8))
-    nt.assert_equal(cc("raise = 2"), ("invalid", None))
-    nt.assert_equal(cc("a = [1,\n2,"), ("incomplete", 0))
-    nt.assert_equal(cc("(\n))"), ("incomplete", 0))
-    nt.assert_equal(cc("\\\r\n"), ("incomplete", 0))
-    nt.assert_equal(cc("a = '''\n   hi"), ("incomplete", 3))
-    nt.assert_equal(cc("def a():\n x=1\n global x"), ("invalid", None))
-    nt.assert_equal(cc("a \\ "), ("invalid", None))  # Nothing allowed after backslash
-    nt.assert_equal(cc("1\\\n+2"), ("complete", None))
-    nt.assert_equal(cc("exit"), ("complete", None))
+    assert cc("a = 1") == ("complete", None)
+    assert cc("for a in range(5):") == ("incomplete", 4)
+    assert cc("for a in range(5):\n    if a > 0:") == ("incomplete", 8)
+    assert cc("raise = 2") == ("invalid", None)
+    assert cc("a = [1,\n2,") == ("incomplete", 0)
+    assert cc("(\n))") == ("incomplete", 0)
+    assert cc("\\\r\n") == ("incomplete", 0)
+    assert cc("a = '''\n   hi") == ("incomplete", 3)
+    assert cc("def a():\n x=1\n global x") == ("invalid", None)
+    assert cc("a \\ ") == ("invalid", None)  # Nothing allowed after backslash
+    assert cc("1\\\n+2") == ("complete", None)
+    assert cc("exit") == ("complete", None)
 
     example = dedent("""
         if True:
             a=1""" )
 
-    nt.assert_equal(cc(example), ('incomplete', 4))
-    nt.assert_equal(cc(example+'\n'), ('complete', None))
-    nt.assert_equal(cc(example+'\n    '), ('complete', None))
+    assert cc(example) == ("incomplete", 4)
+    assert cc(example + "\n") == ("complete", None)
+    assert cc(example + "\n    ") == ("complete", None)
 
     # no need to loop on all the letters/numbers.
     short = '12abAB'+string.printable[62:]
@@ -284,7 +287,8 @@ def test_check_complete():
         for k in short:
             cc(c+k)
 
-    nt.assert_equal(cc("def f():\n  x=0\n  \\\n  "), ('incomplete', 2))
+    assert cc("def f():\n  x=0\n  \\\n  ") == ("incomplete", 2)
+
 
 def test_check_complete_II():
     """
@@ -294,7 +298,7 @@ def test_check_complete_II():
 
     """
     cc = ipt2.TransformerManager().check_complete
-    nt.assert_equal(cc('''def foo():\n    """'''), ('incomplete', 4))
+    assert cc('''def foo():\n    """''') == ("incomplete", 4)
 
 
 def test_check_complete_invalidates_sunken_brackets():
@@ -303,22 +307,22 @@ def test_check_complete_invalidates_sunken_brackets():
     interpreted as invalid
     """
     cc = ipt2.TransformerManager().check_complete
-    nt.assert_equal(cc(")"), ("invalid", None))
-    nt.assert_equal(cc("]"), ("invalid", None))
-    nt.assert_equal(cc("}"), ("invalid", None))
-    nt.assert_equal(cc(")("), ("invalid", None))
-    nt.assert_equal(cc("]["), ("invalid", None))
-    nt.assert_equal(cc("}{"), ("invalid", None))
-    nt.assert_equal(cc("]()("), ("invalid", None))
-    nt.assert_equal(cc("())("), ("invalid", None))
-    nt.assert_equal(cc(")[]("), ("invalid", None))
-    nt.assert_equal(cc("()]("), ("invalid", None))
+    assert cc(")") == ("invalid", None)
+    assert cc("]") == ("invalid", None)
+    assert cc("}") == ("invalid", None)
+    assert cc(")(") == ("invalid", None)
+    assert cc("][") == ("invalid", None)
+    assert cc("}{") == ("invalid", None)
+    assert cc("]()(") == ("invalid", None)
+    assert cc("())(") == ("invalid", None)
+    assert cc(")[](") == ("invalid", None)
+    assert cc("()](") == ("invalid", None)
 
 
 def test_null_cleanup_transformer():
     manager = ipt2.TransformerManager()
     manager.cleanup_transforms.insert(0, null_cleanup_transformer)
-    assert  manager.transform_cell("") == ""
+    assert manager.transform_cell("") == ""
 
 
 

From 85ad41c0709f187419461c33c02ec0bd16b0a32e Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:33:14 +0200
Subject: [PATCH 0727/1407] [core][tests][interactiveshell] Remove nose

---
 IPython/core/tests/test_interactiveshell.py | 128 ++++++++++----------
 1 file changed, 66 insertions(+), 62 deletions(-)

diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 9092ce5b455..ef7d69ff8be 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -21,8 +21,6 @@
 
 from os.path import join
 
-import nose.tools as nt
-
 from IPython.core.error import InputRejected
 from IPython.core.inputtransformer import InputTransformer
 from IPython.core import interactiveshell
@@ -220,33 +218,39 @@ def test_var_expand(self):
     def test_var_expand_local(self):
         """Test local variable expansion in !system and %magic calls"""
         # !system
-        ip.run_cell('def test():\n'
-                    '    lvar = "ttt"\n'
-                    '    ret = !echo {lvar}\n'
-                    '    return ret[0]\n')
-        res = ip.user_ns['test']()
-        nt.assert_in('ttt', res)
-        
+        ip.run_cell(
+            "def test():\n"
+            '    lvar = "ttt"\n'
+            "    ret = !echo {lvar}\n"
+            "    return ret[0]\n"
+        )
+        res = ip.user_ns["test"]()
+        self.assertIn("ttt", res)
+
         # %magic
-        ip.run_cell('def makemacro():\n'
-                    '    macroname = "macro_var_expand_locals"\n'
-                    '    %macro {macroname} codestr\n')
-        ip.user_ns['codestr'] = "str(12)"
-        ip.run_cell('makemacro()')
-        nt.assert_in('macro_var_expand_locals', ip.user_ns)
-    
+        ip.run_cell(
+            "def makemacro():\n"
+            '    macroname = "macro_var_expand_locals"\n'
+            "    %macro {macroname} codestr\n"
+        )
+        ip.user_ns["codestr"] = "str(12)"
+        ip.run_cell("makemacro()")
+        self.assertIn("macro_var_expand_locals", ip.user_ns)
+
     def test_var_expand_self(self):
         """Test variable expansion with the name 'self', which was failing.
         
         See https://github.com/ipython/ipython/issues/1878#issuecomment-7698218
         """
-        ip.run_cell('class cTest:\n'
-                    '  classvar="see me"\n'
-                    '  def test(self):\n'
-                    '    res = !echo Variable: {self.classvar}\n'
-                    '    return res[0]\n')
-        nt.assert_in('see me', ip.user_ns['cTest']().test())
-    
+        ip.run_cell(
+            "class cTest:\n"
+            '  classvar="see me"\n'
+            "  def test(self):\n"
+            "    res = !echo Variable: {self.classvar}\n"
+            "    return res[0]\n"
+        )
+        self.assertIn("see me", ip.user_ns["cTest"]().test())
+
     def test_bad_var_expand(self):
         """var_expand on invalid formats shouldn't raise"""
         # SyntaxError
@@ -346,7 +350,7 @@ def lmagic(line):
         info = dict(found=True, isalias=False, ismagic=True,
                     namespace = 'IPython internal', obj= lmagic.__wrapped__,
                     parent = None)
-        nt.assert_equal(lfind, info)
+        self.assertEqual(lfind, info)
         
     def test_ofind_cell_magic(self):
         from IPython.core.magic import register_cell_magic
@@ -360,7 +364,7 @@ def cmagic(line, cell):
         info = dict(found=True, isalias=False, ismagic=True,
                     namespace = 'IPython internal', obj= cmagic.__wrapped__,
                     parent = None)
-        nt.assert_equal(find, info)
+        self.assertEqual(find, info)
 
     def test_ofind_property_with_error(self):
         class A(object):
@@ -372,7 +376,7 @@ def foo(self):
         found = ip._ofind('a.foo', [('locals', locals())])
         info = dict(found=True, isalias=False, ismagic=False,
                     namespace='locals', obj=A.foo, parent=a)
-        nt.assert_equal(found, info)
+        self.assertEqual(found, info)
 
     def test_ofind_multiple_attribute_lookups(self):
         class A(object):
@@ -387,7 +391,7 @@ def foo(self):
         found = ip._ofind('a.a.a.foo', [('locals', locals())])
         info = dict(found=True, isalias=False, ismagic=False,
                     namespace='locals', obj=A.foo, parent=a.a.a)
-        nt.assert_equal(found, info)
+        self.assertEqual(found, info)
 
     def test_ofind_slotted_attributes(self):
         class A(object):
@@ -399,12 +403,12 @@ def __init__(self):
         found = ip._ofind('a.foo', [('locals', locals())])
         info = dict(found=True, isalias=False, ismagic=False,
                     namespace='locals', obj=a.foo, parent=a)
-        nt.assert_equal(found, info)
+        self.assertEqual(found, info)
 
         found = ip._ofind('a.bar', [('locals', locals())])
         info = dict(found=False, isalias=False, ismagic=False,
                     namespace=None, obj=None, parent=a)
-        nt.assert_equal(found, info)
+        self.assertEqual(found, info)
 
     def test_ofind_prefers_property_to_instance_level_attribute(self):
         class A(object):
@@ -412,10 +416,10 @@ class A(object):
             def foo(self):
                 return 'bar'
         a = A()
-        a.__dict__['foo'] = 'baz'
-        nt.assert_equal(a.foo, 'bar')
-        found = ip._ofind('a.foo', [('locals', locals())])
-        nt.assert_is(found['obj'], A.foo)
+        a.__dict__["foo"] = "baz"
+        self.assertEqual(a.foo, "bar")
+        found = ip._ofind("a.foo", [("locals", locals())])
+        self.assertIs(found["obj"], A.foo)
 
     def test_custom_syntaxerror_exception(self):
         called = []
@@ -819,7 +823,7 @@ def test_unregistering(self):
             ip.run_cell("1 + 2")
         
         # This should have been removed.
-        nt.assert_not_in(err_transformer, ip.ast_transformers)
+        self.assertNotIn(err_transformer, ip.ast_transformers)
 
 
 class StringRejector(ast.NodeTransformer):
@@ -889,21 +893,21 @@ def test_user_variables():
     keys = {'dummy', 'doesnotexist'}
     r = ip.user_expressions({ key:key for key in keys})
 
-    nt.assert_equal(keys, set(r.keys()))
-    dummy = r['dummy']
-    nt.assert_equal({'status', 'data', 'metadata'}, set(dummy.keys()))
-    nt.assert_equal(dummy['status'], 'ok')
-    data = dummy['data']
-    metadata = dummy['metadata']
-    nt.assert_equal(data.get('text/html'), d._repr_html_())
+    assert keys == set(r.keys())
+    dummy = r["dummy"]
+    assert {"status", "data", "metadata"} == set(dummy.keys())
+    assert dummy["status"] == "ok"
+    data = dummy["data"]
+    metadata = dummy["metadata"]
+    assert data.get("text/html") == d._repr_html_()
     js, jsmd = d._repr_javascript_()
-    nt.assert_equal(data.get('application/javascript'), js)
-    nt.assert_equal(metadata.get('application/javascript'), jsmd)
-    
-    dne = r['doesnotexist']
-    nt.assert_equal(dne['status'], 'error')
-    nt.assert_equal(dne['ename'], 'NameError')
-    
+    assert data.get("application/javascript") == js
+    assert metadata.get("application/javascript") == jsmd
+
+    dne = r["doesnotexist"]
+    assert dne["status"] == "error"
+    assert dne["ename"] == "NameError"
+
     # back to text only
     ip.display_formatter.active_types = ['text/plain']
     
@@ -917,18 +921,18 @@ def test_user_expression():
     r = ip.user_expressions(query)
     import pprint
     pprint.pprint(r)
-    nt.assert_equal(set(r.keys()), set(query.keys()))
-    a = r['a']
-    nt.assert_equal({'status', 'data', 'metadata'}, set(a.keys()))
-    nt.assert_equal(a['status'], 'ok')
-    data = a['data']
-    metadata = a['metadata']
-    nt.assert_equal(data.get('text/plain'), '3')
-    
-    b = r['b']
-    nt.assert_equal(b['status'], 'error')
-    nt.assert_equal(b['ename'], 'ZeroDivisionError')
-    
+    assert set(r.keys()) == set(query.keys())
+    a = r["a"]
+    assert {"status", "data", "metadata"} == set(a.keys())
+    assert a["status"] == "ok"
+    data = a["data"]
+    metadata = a["metadata"]
+    assert data.get("text/plain") == "3"
+
+    b = r["b"]
+    assert b["status"] == "error"
+    assert b["ename"] == "ZeroDivisionError"
+
     # back to text only
     ip.display_formatter.active_types = ['text/plain']
 
@@ -1030,8 +1034,8 @@ def test_custom_exc_count():
     ip.run_cell("def foo()", store_history=True)
     # restore default excepthook
     ip.set_custom_exc((), None)
-    nt.assert_equal(hook.call_count, 1)
-    nt.assert_equal(ip.execution_count, before + 1)
+    assert hook.call_count == 1
+    assert ip.execution_count == before + 1
 
 
 def test_run_cell_async():

From 9567fb34a8b59abf8b371e91555d941af03cea5b Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:41:39 +0200
Subject: [PATCH 0728/1407] [core][tests][magic] Remove nose

---
 IPython/core/tests/test_magic.py | 471 ++++++++++++++++---------------
 1 file changed, 248 insertions(+), 223 deletions(-)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index d534d11018b..37432ca309d 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -17,8 +17,6 @@
 from textwrap import dedent
 from unittest import TestCase, mock
 
-import nose.tools as nt
-
 import pytest
 
 from IPython import get_ipython
@@ -47,18 +45,20 @@ class DummyMagics(magic.Magics): pass
 
 def test_extract_code_ranges():
     instr = "1 3 5-6 7-9 10:15 17: :10 10- -13 :"
-    expected = [(0, 1), 
-                (2, 3),
-                (4, 6),
-                (6, 9),
-                (9, 14),
-                (16, None),
-                (None, 9),
-                (9, None),
-                (None, 13),
-                (None, None)]
+    expected = [
+        (0, 1),
+        (2, 3),
+        (4, 6),
+        (6, 9),
+        (9, 14),
+        (16, None),
+        (None, 9),
+        (9, None),
+        (None, 13),
+        (None, None),
+    ]
     actual = list(code.extract_code_ranges(instr))
-    nt.assert_equal(actual, expected)
+    assert actual == expected
 
 def test_extract_symbols():
     source = """import foo\na = 10\ndef b():\n    return 42\n\n\nclass A: pass\n\n\n"""
@@ -70,7 +70,7 @@ def test_extract_symbols():
                 (["class A: pass\n"], ['a']),
                 ([], ['z'])]
     for symbols, exp in zip(symbols_args, expected):
-        nt.assert_equal(code.extract_symbols(source, symbols), exp)
+        assert code.extract_symbols(source, symbols) == exp
 
 
 def test_extract_symbols_raises_exception_with_non_python_code():
@@ -78,13 +78,13 @@ def test_extract_symbols_raises_exception_with_non_python_code():
               "def hello\n"
               "puts 'Hello world'\n"
               "end")
-    with nt.assert_raises(SyntaxError):
+    with pytest.raises(SyntaxError):
         code.extract_symbols(source, "hello")
 
 
 def test_magic_not_found():
     # magic not found raises UsageError
-    with nt.assert_raises(UsageError):
+    with pytest.raises(UsageError):
         _ip.magic('doesntexist')
 
     # ensure result isn't success when a magic isn't found
@@ -94,7 +94,7 @@ def test_magic_not_found():
 
 def test_cell_magic_not_found():
     # magic not found raises UsageError
-    with nt.assert_raises(UsageError):
+    with pytest.raises(UsageError):
         _ip.run_cell_magic('doesntexist', 'line', 'cell')
 
     # ensure result isn't success when a magic isn't found
@@ -127,7 +127,7 @@ def test_config_available_configs():
 
     stdout = captured.stdout
     config_classes = stdout.strip().split('\n')[1:]
-    nt.assert_list_equal(config_classes, sorted(set(config_classes)))
+    assert config_classes == sorted(set(config_classes))
 
 def test_config_print_class():
     """ test that config with a classname prints the class's options. """
@@ -144,19 +144,18 @@ def test_rehashx():
     # clear up everything
     _ip.alias_manager.clear_aliases()
     del _ip.db['syscmdlist']
-    
+
     _ip.magic('rehashx')
     # Practically ALL ipython development systems will have more than 10 aliases
 
-    nt.assert_true(len(_ip.alias_manager.aliases) > 10)
+    assert len(_ip.alias_manager.aliases) > 10
     for name, cmd in _ip.alias_manager.aliases:
         # we must strip dots from alias names
-        nt.assert_not_in('.', name)
+        assert "." not in name
 
     # rehashx must fill up syscmdlist
     scoms = _ip.db['syscmdlist']
-    nt.assert_true(len(scoms) > 10)
-            
+    assert len(scoms) > 10
 
 
 def test_magic_parse_options():
@@ -170,16 +169,17 @@ def test_magic_parse_options():
         expected = 'c:x'
     else:
         expected = path
-    nt.assert_equal(opts['f'], expected)
+    assert opts["f"] == expected
+
 
 def test_magic_parse_long_options():
     """Magic.parse_options can handle --foo=bar long options"""
     ip = get_ipython()
     m = DummyMagics(ip)
-    opts, _ = m.parse_options('--foo --bar=bubble', 'a', 'foo', 'bar=')
-    nt.assert_in('foo', opts)
-    nt.assert_in('bar', opts)
-    nt.assert_equal(opts['bar'], "bubble")
+    opts, _ = m.parse_options("--foo --bar=bubble", "a", "foo", "bar=")
+    assert "foo" in opts
+    assert "bar" in opts
+    assert opts["bar"] == "bubble"
 
 
 def doctest_hist_f():
@@ -200,24 +200,24 @@ def doctest_hist_op():
 
     In [1]: class b(float):
        ...:     pass
-       ...: 
+       ...:
 
     In [2]: class s(object):
        ...:     def __str__(self):
        ...:         return 's'
-       ...: 
+       ...:
 
-    In [3]: 
+    In [3]:
 
     In [4]: class r(b):
        ...:     def __repr__(self):
        ...:         return 'r'
-       ...: 
+       ...:
 
     In [5]: class sr(s,r): pass
-       ...: 
+       ...:
 
-    In [6]: 
+    In [6]:
 
     In [7]: bb=b()
 
@@ -233,23 +233,23 @@ def doctest_hist_op():
     In [12]: str(ss)
     Out[12]: 's'
 
-    In [13]: 
+    In [13]:
 
     In [14]: %hist -op
     >>> class b:
     ...     pass
-    ... 
+    ...
     >>> class s(b):
     ...     def __str__(self):
     ...         return 's'
-    ... 
-    >>> 
+    ...
+    >>>
     >>> class r(b):
     ...     def __repr__(self):
     ...         return 'r'
-    ... 
+    ...
     >>> class sr(s,r): pass
-    >>> 
+    >>>
     >>> bb=b()
     >>> ss=s()
     >>> rr=r()
@@ -258,12 +258,12 @@ def doctest_hist_op():
     4.5
     >>> str(ss)
     's'
-    >>> 
+    >>>
     """
 
 def test_hist_pof():
     ip = get_ipython()
-    ip.run_cell(u"1+2", store_history=True)
+    ip.run_cell("1+2", store_history=True)
     #raise Exception(ip.history_manager.session_number)
     #raise Exception(list(ip.history_manager._get_range_session()))
     with TemporaryDirectory() as td:
@@ -279,10 +279,10 @@ def test_macro():
     for i, cmd in enumerate(cmds, start=1):
         ip.history_manager.store_inputs(i, cmd)
     ip.magic("macro test 1-3")
-    nt.assert_equal(ip.user_ns["test"].value, "\n".join(cmds)+"\n")
-    
+    assert ip.user_ns["test"].value == "\n".join(cmds) + "\n"
+
     # List macros
-    nt.assert_in("test", ip.magic("macro"))
+    assert "test" in ip.magic("macro")
 
 
 def test_macro_run():
@@ -292,7 +292,7 @@ def test_macro_run():
     cmds = ["a=10", "a+=1", "print(a)", "%macro test 2-3"]
     for cmd in cmds:
         ip.run_cell(cmd, store_history=True)
-    nt.assert_equal(ip.user_ns["test"].value, "a+=1\nprint(a)\n")
+    assert ip.user_ns["test"].value == "a+=1\nprint(a)\n"
     with tt.AssertPrints("12"):
         ip.run_cell("test")
     with tt.AssertPrints("13"):
@@ -304,56 +304,61 @@ def test_magic_magic():
     ip = get_ipython()
     with capture_output() as captured:
         ip.magic("magic")
-    
+
     stdout = captured.stdout
-    nt.assert_in('%magic', stdout)
-    nt.assert_in('IPython', stdout)
-    nt.assert_in('Available', stdout)
+    assert "%magic" in stdout
+    assert "IPython" in stdout
+    assert "Available" in stdout
 
 
 @dec.skipif_not_numpy
 def test_numpy_reset_array_undec():
     "Test '%reset array' functionality"
-    _ip.ex('import numpy as np')
-    _ip.ex('a = np.empty(2)')
-    nt.assert_in('a', _ip.user_ns)
-    _ip.magic('reset -f array')
-    nt.assert_not_in('a', _ip.user_ns)
+    _ip.ex("import numpy as np")
+    _ip.ex("a = np.empty(2)")
+    assert "a" in _ip.user_ns
+    _ip.magic("reset -f array")
+    assert "a" not in _ip.user_ns
+
 
 def test_reset_out():
     "Test '%reset out' magic"
     _ip.run_cell("parrot = 'dead'", store_history=True)
     # test '%reset -f out', make an Out prompt
     _ip.run_cell("parrot", store_history=True)
-    nt.assert_true('dead' in [_ip.user_ns[x] for x in ('_','__','___')])
-    _ip.magic('reset -f out')
-    nt.assert_false('dead' in [_ip.user_ns[x] for x in ('_','__','___')])
-    nt.assert_equal(len(_ip.user_ns['Out']), 0)
+    assert "dead" in [_ip.user_ns[x] for x in ("_", "__", "___")]
+    _ip.magic("reset -f out")
+    assert "dead" not in [_ip.user_ns[x] for x in ("_", "__", "___")]
+    assert len(_ip.user_ns["Out"]) == 0
+
 
 def test_reset_in():
     "Test '%reset in' magic"
     # test '%reset -f in'
     _ip.run_cell("parrot", store_history=True)
-    nt.assert_true('parrot' in [_ip.user_ns[x] for x in ('_i','_ii','_iii')])
-    _ip.magic('%reset -f in')
-    nt.assert_false('parrot' in [_ip.user_ns[x] for x in ('_i','_ii','_iii')])
-    nt.assert_equal(len(set(_ip.user_ns['In'])), 1)
+    assert "parrot" in [_ip.user_ns[x] for x in ("_i", "_ii", "_iii")]
+    _ip.magic("%reset -f in")
+    assert "parrot" not in [_ip.user_ns[x] for x in ("_i", "_ii", "_iii")]
+    assert len(set(_ip.user_ns["In"])) == 1
+
 
 def test_reset_dhist():
     "Test '%reset dhist' magic"
-    _ip.run_cell("tmp = [d for d in _dh]") # copy before clearing
-    _ip.magic('cd ' + os.path.dirname(nt.__file__))
-    _ip.magic('cd -')
-    nt.assert_true(len(_ip.user_ns['_dh']) > 0)
-    _ip.magic('reset -f dhist')
-    nt.assert_equal(len(_ip.user_ns['_dh']), 0)
-    _ip.run_cell("_dh = [d for d in tmp]") #restore
+    _ip.run_cell("tmp = [d for d in _dh]")  # copy before clearing
+    _ip.magic("cd " + os.path.dirname(pytest.__file__))
+    _ip.magic("cd -")
+    assert len(_ip.user_ns["_dh"]) > 0
+    _ip.magic("reset -f dhist")
+    assert len(_ip.user_ns["_dh"]) == 0
+    _ip.run_cell("_dh = [d for d in tmp]")  # restore
+
 
 def test_reset_in_length():
     "Test that '%reset in' preserves In[] length"
     _ip.run_cell("print 'foo'")
     _ip.run_cell("reset -f in")
-    nt.assert_equal(len(_ip.user_ns['In']), _ip.displayhook.prompt_count+1)
+    assert len(_ip.user_ns["In"]) == _ip.displayhook.prompt_count + 1
+
 
 class TestResetErrors(TestCase):
 
@@ -384,7 +389,7 @@ def test_tb_syntaxerror():
     """test %tb after a SyntaxError"""
     ip = get_ipython()
     ip.run_cell("for")
-    
+
     # trap and validate stdout
     save_stdout = sys.stdout
     try:
@@ -395,18 +400,18 @@ def test_tb_syntaxerror():
         sys.stdout = save_stdout
     # trim output, and only check the last line
     last_line = out.rstrip().splitlines()[-1].strip()
-    nt.assert_equal(last_line, "SyntaxError: invalid syntax")
+    assert last_line == "SyntaxError: invalid syntax"
 
 
 def test_time():
     ip = get_ipython()
-    
+
     with tt.AssertPrints("Wall time: "):
         ip.run_cell("%time None")
-    
+
     ip.run_cell("def f(kmjy):\n"
                 "    %time print (2*kmjy)")
-    
+
     with tt.AssertPrints("Wall time: "):
         with tt.AssertPrints("hihi", suppress=False):
             ip.run_cell("f('hi')")
@@ -419,12 +424,12 @@ def test_time_last_not_expression():
     del ip.user_ns['var_1']
     assert ip.user_ns['var_2'] == 2
     del ip.user_ns['var_2']
-    
+
 
 @dec.skip_win32
 def test_time2():
     ip = get_ipython()
-    
+
     with tt.AssertPrints("CPU times: user "):
         ip.run_cell("%time None")
 
@@ -432,7 +437,7 @@ def test_time3():
     """Erroneous magic function calls, issue gh-3334"""
     ip = get_ipython()
     ip.user_ns.pop('run', None)
-    
+
     with tt.AssertNotPrints("not found", channel='stderr'):
         ip.run_cell("%%time\n"
                     "run = 0\n"
@@ -448,18 +453,21 @@ def test_multiline_time():
         a = "ho"
         b = "hey"
         a+b
-        """))
-    nt.assert_equal(ip.user_ns_hidden['_'], 'hohey')
+        """
+        )
+    )
+    assert ip.user_ns_hidden["_"] == "hohey"
+
 
 def test_time_local_ns():
     """
     Test that local_ns is actually global_ns when running a cell magic
     """
     ip = get_ipython()
-    ip.run_cell("%%time\n"
-                "myvar = 1")
-    nt.assert_equal(ip.user_ns['myvar'], 1)
-    del ip.user_ns['myvar']
+    ip.run_cell("%%time\n" "myvar = 1")
+    assert ip.user_ns["myvar"] == 1
+    del ip.user_ns["myvar"]
+
 
 def test_doctest_mode():
     "Toggle doctest_mode twice, it should be a no-op and run without error"
@@ -472,8 +480,8 @@ def test_parse_options():
     # These are only the most minimal of tests, more should be added later.  At
     # the very least we check that basic text/unicode calls work OK.
     m = DummyMagics(_ip)
-    nt.assert_equal(m.parse_options('foo', '')[1], 'foo')
-    nt.assert_equal(m.parse_options(u'foo', '')[1], u'foo')
+    assert m.parse_options("foo", "")[1] == "foo"
+    assert m.parse_options("foo", "")[1] == "foo"
 
 
 def test_parse_options_preserve_non_option_string():
@@ -482,8 +490,8 @@ def test_parse_options_preserve_non_option_string():
     opts, stmt = m.parse_options(
         " -n1  -r 13 _ = 314 + foo", "n:r:", preserve_non_opts=True
     )
-    nt.assert_equal(opts, {"n": "1", "r": "13"})
-    nt.assert_equal(stmt, "_ = 314 + foo")
+    assert opts == {"n": "1", "r": "13"}
+    assert stmt == "_ = 314 + foo"
 
 
 def test_run_magic_preserve_code_block():
@@ -501,13 +509,13 @@ def test_dirops():
     ipdir = os.path.realpath(_ip.ipython_dir)
     try:
         _ip.magic('cd "%s"' % ipdir)
-        nt.assert_equal(curpath(), ipdir)
+        assert curpath() == ipdir
         _ip.magic('cd -')
-        nt.assert_equal(curpath(), startdir)
+        assert curpath() == startdir
         _ip.magic('pushd "%s"' % ipdir)
-        nt.assert_equal(curpath(), ipdir)
+        assert curpath() == ipdir
         _ip.magic('popd')
-        nt.assert_equal(curpath(), startdir)
+        assert curpath() == startdir
     finally:
         os.chdir(startdir)
 
@@ -534,8 +542,8 @@ def test_xmode():
     xmode = _ip.InteractiveTB.mode
     for i in range(4):
         _ip.magic("xmode")
-    nt.assert_equal(_ip.InteractiveTB.mode, xmode)
-    
+    assert _ip.InteractiveTB.mode == xmode
+
 def test_reset_hard():
     monitor = []
     class A(object):
@@ -543,14 +551,14 @@ def __del__(self):
             monitor.append(1)
         def __repr__(self):
             return "<A instance>"
-            
+
     _ip.user_ns["a"] = A()
     _ip.run_cell("a")
-    
-    nt.assert_equal(monitor, [])
+
+    assert monitor == []
     _ip.magic("reset -f")
-    nt.assert_equal(monitor, [1])
-    
+    assert monitor == [1]
+
 class TestXdel(tt.TempFileMixin):
     def test_xdel(self):
         """Test that references from %run are cleared by xdel."""
@@ -564,36 +572,36 @@ def test_xdel(self):
         _ip.magic("run %s" % self.fname)
         # ... as does the displayhook.
         _ip.run_cell("a")
-        
+
         monitor = _ip.user_ns["A"].monitor
-        nt.assert_equal(monitor, [])
-        
+        assert monitor == []
+
         _ip.magic("xdel a")
-        
+
         # Check that a's __del__ method has been called.
-        nt.assert_equal(monitor, [1])
+        assert monitor == [1]
 
 def doctest_who():
     """doctest for %who
-    
+
     In [1]: %reset -f
-    
+
     In [2]: alpha = 123
-    
+
     In [3]: beta = 'beta'
-    
+
     In [4]: %who int
     alpha
-    
+
     In [5]: %who str
     beta
-    
+
     In [6]: %whos
     Variable   Type    Data/Info
     ----------------------------
     alpha      int     123
     beta       str     beta
-    
+
     In [7]: %who_ls
     Out[7]: ['alpha', 'beta']
     """
@@ -608,25 +616,25 @@ def __repr__(self):
 
 def doctest_precision():
     """doctest for %precision
-    
+
     In [1]: f = get_ipython().display_formatter.formatters['text/plain']
-    
+
     In [2]: %precision 5
     Out[2]: '%.5f'
-    
+
     In [3]: f.float_format
     Out[3]: '%.5f'
-    
+
     In [4]: %precision %e
     Out[4]: '%e'
-    
+
     In [5]: f(3.1415927)
     Out[5]: '3.141593e+00'
     """
 
 def test_debug_magic():
     """Test debugging a small code with %debug
-    
+
     In [1]: with PdbTestInput(['c']):
        ...:     %debug print("a b") #doctest: +ELLIPSIS
        ...:
@@ -661,11 +669,12 @@ def lmagic(line):
         ip.user_ns['lmagic_out'] = line
 
     # line mode test
-    _ip.run_line_magic('timeit', '-n1 -r1 %lmagic my line')
-    nt.assert_equal(_ip.user_ns['lmagic_out'], 'my line')
+    _ip.run_line_magic("timeit", "-n1 -r1 %lmagic my line")
+    assert _ip.user_ns["lmagic_out"] == "my line"
     # cell mode test
-    _ip.run_cell_magic('timeit', '-n1 -r1', '%lmagic my line2')
-    nt.assert_equal(_ip.user_ns['lmagic_out'], 'my line2')
+    _ip.run_cell_magic("timeit", "-n1 -r1", "%lmagic my line2")
+    assert _ip.user_ns["lmagic_out"] == "my line2"
+
 
 def test_timeit_return():
     """
@@ -688,7 +697,7 @@ def test_timeit_return_quiet():
     assert (res is not None)
 
 def test_timeit_invalid_return():
-    with nt.assert_raises_regex(SyntaxError, "outside function"):
+    with pytest.raises(SyntaxError):
         _ip.run_line_magic('timeit', 'return')
 
 @dec.skipif(execution.profile is None)
@@ -700,17 +709,19 @@ def lmagic(line):
         ip.user_ns['lmagic_out'] = line
 
     # line mode test
-    _ip.run_line_magic('prun', '-q %lmagic my line')
-    nt.assert_equal(_ip.user_ns['lmagic_out'], 'my line')
+    _ip.run_line_magic("prun", "-q %lmagic my line")
+    assert _ip.user_ns["lmagic_out"] == "my line"
     # cell mode test
-    _ip.run_cell_magic('prun', '-q', '%lmagic my line2')
-    nt.assert_equal(_ip.user_ns['lmagic_out'], 'my line2')
+    _ip.run_cell_magic("prun", "-q", "%lmagic my line2")
+    assert _ip.user_ns["lmagic_out"] == "my line2"
+
 
 @dec.skipif(execution.profile is None)
 def test_prun_quotes():
     "Test that prun does not clobber string escapes (GH #1302)"
     _ip.magic(r"prun -q x = '\t'")
-    nt.assert_equal(_ip.user_ns['x'], '\t')
+    assert _ip.user_ns["x"] == "\t"
+
 
 def test_extension():
     # Debugging information for failures of this test
@@ -719,14 +730,14 @@ def test_extension():
         print(' ', p)
     print('CWD', os.getcwd())
 
-    nt.assert_raises(ImportError, _ip.magic, "load_ext daft_extension")
+    pytest.raises(ImportError, _ip.magic, "load_ext daft_extension")
     daft_path = os.path.join(os.path.dirname(__file__), "daft_extension")
     sys.path.insert(0, daft_path)
     try:
         _ip.user_ns.pop('arq', None)
         invalidate_caches()   # Clear import caches
         _ip.magic("load_ext daft_extension")
-        nt.assert_equal(_ip.user_ns['arq'], 185)
+        assert _ip.user_ns["arq"] == 185
         _ip.magic("unload_ext daft_extension")
         assert 'arq' not in _ip.user_ns
     finally:
@@ -736,7 +747,7 @@ def test_extension():
 def test_notebook_export_json():
     _ip = get_ipython()
     _ip.history_manager.reset()   # Clear any existing history.
-    cmds = [u"a=1", u"def b():\n  return a**2", u"print('noël, été', b())"]
+    cmds = ["a=1", "def b():\n  return a**2", "print('noël, été', b())"]
     for i, cmd in enumerate(cmds, start=1):
         _ip.history_manager.store_inputs(i, cmd)
     with TemporaryDirectory() as td:
@@ -797,11 +808,11 @@ class CellMagicTestCase(TestCase):
 
     def check_ident(self, magic):
         # Manually called, we get the result
-        out = _ip.run_cell_magic(magic, 'a', 'b')
-        nt.assert_equal(out, ('a','b'))
+        out = _ip.run_cell_magic(magic, "a", "b")
+        assert out == ("a", "b")
         # Via run_cell, it goes into the user's namespace via displayhook
-        _ip.run_cell('%%' + magic +' c\nd\n')
-        nt.assert_equal(_ip.user_ns['_'], ('c','d\n'))
+        _ip.run_cell("%%" + magic + " c\nd\n")
+        assert _ip.user_ns["_"] == ("c", "d\n")
 
     def test_cell_magic_func_deco(self):
         "Cell magic using simple decorator"
@@ -839,12 +850,12 @@ class MyMagics2(Magics):
             @cell_magic('cellm4')
             def cellm33(self, line, cell):
                 return line, cell
-            
+
         _ip.register_magics(MyMagics2)
         self.check_ident('cellm4')
         # Check that nothing is registered as 'cellm33'
         c33 = _ip.find_cell_magic('cellm33')
-        nt.assert_equal(c33, None)
+        assert c33 == None
 
 def test_file():
     """Basic %%writefile"""
@@ -856,8 +867,9 @@ def test_file():
             'line2',
         ]))
         s = Path(fname).read_text()
-        nt.assert_in('line1\n', s)
-        nt.assert_in('line2', s)
+        assert "line1\n" in s
+        assert "line2" in s
+
 
 @dec.skip_win32
 def test_file_single_quote():
@@ -870,8 +882,9 @@ def test_file_single_quote():
             'line2',
         ]))
         s = Path(fname).read_text()
-        nt.assert_in('line1\n', s)
-        nt.assert_in('line2', s)
+        assert "line1\n" in s
+        assert "line2" in s
+
 
 @dec.skip_win32
 def test_file_double_quote():
@@ -884,8 +897,9 @@ def test_file_double_quote():
             'line2',
         ]))
         s = Path(fname).read_text()
-        nt.assert_in('line1\n', s)
-        nt.assert_in('line2', s)
+        assert "line1\n" in s
+        assert "line2" in s
+
 
 def test_file_var_expand():
     """%%writefile $filename"""
@@ -898,8 +912,9 @@ def test_file_var_expand():
             'line2',
         ]))
         s = Path(fname).read_text()
-        nt.assert_in('line1\n', s)
-        nt.assert_in('line2', s)
+        assert "line1\n" in s
+        assert "line2" in s
+
 
 def test_file_unicode():
     """%%writefile with unicode cell"""
@@ -912,8 +927,9 @@ def test_file_unicode():
         ]))
         with io.open(fname, encoding='utf-8') as f:
             s = f.read()
-        nt.assert_in(u'liné1\n', s)
-        nt.assert_in(u'liné2', s)
+        assert "liné1\n" in s
+        assert "liné2" in s
+
 
 def test_file_amend():
     """%%writefile -a amends files"""
@@ -929,8 +945,9 @@ def test_file_amend():
             'line4',
         ]))
         s = Path(fname).read_text()
-        nt.assert_in('line1\n', s)
-        nt.assert_in('line3\n', s)
+        assert "line1\n" in s
+        assert "line3\n" in s
+
 
 def test_file_spaces():
     """%%file with spaces in filename"""
@@ -942,14 +959,16 @@ def test_file_spaces():
             'line2',
         ]))
         s = Path(fname).read_text()
-        nt.assert_in('line1\n', s)
-        nt.assert_in('line2', s)
-    
+        assert "line1\n" in s
+        assert "line2" in s
+
+
 def test_script_config():
     ip = get_ipython()
     ip.config.ScriptMagics.script_magics = ['whoda']
     sm = script.ScriptMagics(shell=ip)
-    nt.assert_in('whoda', sm.magics['cell'])
+    assert "whoda" in sm.magics["cell"]
+
 
 @dec.skip_iptest_but_not_pytest
 @dec.skip_win32
@@ -962,7 +981,8 @@ def test_script_out():
     ip = get_ipython()
     ip.run_cell_magic("script", "--out output sh", "echo 'hi'")
     assert asyncio.get_event_loop().is_running() is False
-    nt.assert_equal(ip.user_ns['output'], 'hi\n')
+    assert ip.user_ns["output"] == "hi\n"
+
 
 @dec.skip_iptest_but_not_pytest
 @dec.skip_win32
@@ -974,7 +994,7 @@ def test_script_err():
     assert asyncio.get_event_loop().is_running() is False
     ip.run_cell_magic("script", "--err error sh", "echo 'hello' >&2")
     assert asyncio.get_event_loop().is_running() is False
-    nt.assert_equal(ip.user_ns['error'], 'hello\n')
+    assert ip.user_ns["error"] == "hello\n"
 
 
 @dec.skip_iptest_but_not_pytest
@@ -988,8 +1008,8 @@ def test_script_out_err():
     ip.run_cell_magic(
         "script", "--out output --err error sh", "echo 'hi'\necho 'hello' >&2"
     )
-    nt.assert_equal(ip.user_ns["output"], "hi\n")
-    nt.assert_equal(ip.user_ns["error"], "hello\n")
+    assert ip.user_ns["output"] == "hi\n"
+    assert ip.user_ns["error"] == "hello\n"
 
 
 @dec.skip_iptest_but_not_pytest
@@ -1000,10 +1020,11 @@ def test_script_out_err():
 async def test_script_bg_out():
     ip = get_ipython()
     ip.run_cell_magic("script", "--bg --out output sh", "echo 'hi'")
-    nt.assert_equal((await ip.user_ns["output"].read()), b"hi\n")
+    assert (await ip.user_ns["output"].read()) == b"hi\n"
     ip.user_ns["output"].close()
     asyncio.get_event_loop().stop()
 
+
 @dec.skip_iptest_but_not_pytest
 @dec.skip_win32
 @pytest.mark.skipif(
@@ -1012,7 +1033,7 @@ async def test_script_bg_out():
 async def test_script_bg_err():
     ip = get_ipython()
     ip.run_cell_magic("script", "--bg --err error sh", "echo 'hello' >&2")
-    nt.assert_equal((await ip.user_ns["error"].read()), b"hello\n")
+    assert (await ip.user_ns["error"].read()) == b"hello\n"
     ip.user_ns["error"].close()
 
 
@@ -1026,8 +1047,8 @@ async def test_script_bg_out_err():
     ip.run_cell_magic(
         "script", "--bg --out output --err error sh", "echo 'hi'\necho 'hello' >&2"
     )
-    nt.assert_equal((await ip.user_ns["output"].read()), b"hi\n")
-    nt.assert_equal((await ip.user_ns["error"].read()), b"hello\n")
+    assert (await ip.user_ns["output"].read()) == b"hi\n"
+    assert (await ip.user_ns["error"].read()) == b"hello\n"
     ip.user_ns["output"].close()
     ip.user_ns["error"].close()
 
@@ -1040,7 +1061,7 @@ def test_script_defaults():
         except Exception:
             pass
         else:
-            nt.assert_in(cmd, ip.magics_manager.magics['cell'])
+            assert cmd in ip.magics_manager.magics["cell"]
 
 
 @magics_class
@@ -1060,19 +1081,20 @@ def test_line_cell_info():
     """%%foo and %foo magics are distinguishable to inspect"""
     ip = get_ipython()
     ip.magics_manager.register(FooFoo)
-    oinfo = ip.object_inspect('foo')
-    nt.assert_true(oinfo['found'])
-    nt.assert_true(oinfo['ismagic'])
-    
-    oinfo = ip.object_inspect('%%foo')
-    nt.assert_true(oinfo['found'])
-    nt.assert_true(oinfo['ismagic'])
-    nt.assert_equal(oinfo['docstring'], FooFoo.cell_foo.__doc__)
-
-    oinfo = ip.object_inspect('%foo')
-    nt.assert_true(oinfo['found'])
-    nt.assert_true(oinfo['ismagic'])
-    nt.assert_equal(oinfo['docstring'], FooFoo.line_foo.__doc__)
+    oinfo = ip.object_inspect("foo")
+    assert oinfo["found"] is True
+    assert oinfo["ismagic"] is True
+
+    oinfo = ip.object_inspect("%%foo")
+    assert oinfo["found"] is True
+    assert oinfo["ismagic"] is True
+    assert oinfo["docstring"] == FooFoo.cell_foo.__doc__
+
+    oinfo = ip.object_inspect("%foo")
+    assert oinfo["found"] is True
+    assert oinfo["ismagic"] is True
+    assert oinfo["docstring"] == FooFoo.line_foo.__doc__
+
 
 def test_multiple_magics():
     ip = get_ipython()
@@ -1080,9 +1102,10 @@ def test_multiple_magics():
     foo2 = FooFoo(ip)
     mm = ip.magics_manager
     mm.register(foo1)
-    nt.assert_true(mm.magics['line']['foo'].__self__ is foo1)
+    assert mm.magics["line"]["foo"].__self__ is foo1
     mm.register(foo2)
-    nt.assert_true(mm.magics['line']['foo'].__self__ is foo2)
+    assert mm.magics["line"]["foo"].__self__ is foo2
+
 
 def test_alias_magic():
     """Test %alias_magic."""
@@ -1090,48 +1113,49 @@ def test_alias_magic():
     mm = ip.magics_manager
 
     # Basic operation: both cell and line magics are created, if possible.
-    ip.run_line_magic('alias_magic', 'timeit_alias timeit')
-    nt.assert_in('timeit_alias', mm.magics['line'])
-    nt.assert_in('timeit_alias', mm.magics['cell'])
+    ip.run_line_magic("alias_magic", "timeit_alias timeit")
+    assert "timeit_alias" in mm.magics["line"]
+    assert "timeit_alias" in mm.magics["cell"]
 
     # --cell is specified, line magic not created.
-    ip.run_line_magic('alias_magic', '--cell timeit_cell_alias timeit')
-    nt.assert_not_in('timeit_cell_alias', mm.magics['line'])
-    nt.assert_in('timeit_cell_alias', mm.magics['cell'])
+    ip.run_line_magic("alias_magic", "--cell timeit_cell_alias timeit")
+    assert "timeit_cell_alias" not in mm.magics["line"]
+    assert "timeit_cell_alias" in mm.magics["cell"]
 
     # Test that line alias is created successfully.
-    ip.run_line_magic('alias_magic', '--line env_alias env')
-    nt.assert_equal(ip.run_line_magic('env', ''),
-                    ip.run_line_magic('env_alias', ''))
+    ip.run_line_magic("alias_magic", "--line env_alias env")
+    assert ip.run_line_magic("env", "") == ip.run_line_magic("env_alias", "")
 
     # Test that line alias with parameters passed in is created successfully.
-    ip.run_line_magic('alias_magic', '--line history_alias history --params ' + shlex.quote('3'))
-    nt.assert_in('history_alias', mm.magics['line'])
+    ip.run_line_magic(
+        "alias_magic", "--line history_alias history --params " + shlex.quote("3")
+    )
+    assert "history_alias" in mm.magics["line"]
 
 
 def test_save():
     """Test %save."""
     ip = get_ipython()
     ip.history_manager.reset()   # Clear any existing history.
-    cmds = [u"a=1", u"def b():\n  return a**2", u"print(a, b())"]
+    cmds = ["a=1", "def b():\n  return a**2", "print(a, b())"]
     for i, cmd in enumerate(cmds, start=1):
         ip.history_manager.store_inputs(i, cmd)
     with TemporaryDirectory() as tmpdir:
         file = os.path.join(tmpdir, "testsave.py")
         ip.run_line_magic("save", "%s 1-10" % file)
         content = Path(file).read_text()
-        nt.assert_equal(content.count(cmds[0]), 1)
-        nt.assert_in("coding: utf-8", content)
+        assert content.count(cmds[0]) == 1
+        assert "coding: utf-8" in content
         ip.run_line_magic("save", "-a %s 1-10" % file)
         content = Path(file).read_text()
-        nt.assert_equal(content.count(cmds[0]), 2)
-        nt.assert_in("coding: utf-8", content)
+        assert content.count(cmds[0]) == 2
+        assert "coding: utf-8" in content
 
 
 def test_save_with_no_args():
     ip = get_ipython()
     ip.history_manager.reset()  # Clear any existing history.
-    cmds = [u"a=1", u"def b():\n    return a**2", u"print(a, b())", "%save"]
+    cmds = ["a=1", "def b():\n    return a**2", "print(a, b())", "%save"]
     for i, cmd in enumerate(cmds, start=1):
         ip.history_manager.store_inputs(i, cmd)
 
@@ -1148,26 +1172,26 @@ def b():
             print(a, b())
             """
         )
-        nt.assert_equal(content, expected_content)
+        assert content == expected_content
 
 
 def test_store():
     """Test %store."""
     ip = get_ipython()
     ip.run_line_magic('load_ext', 'storemagic')
-    
+
     # make sure the storage is empty
-    ip.run_line_magic('store', '-z')
-    ip.user_ns['var'] = 42
-    ip.run_line_magic('store', 'var')
-    ip.user_ns['var'] = 39
-    ip.run_line_magic('store', '-r')
-    nt.assert_equal(ip.user_ns['var'], 42)
+    ip.run_line_magic("store", "-z")
+    ip.user_ns["var"] = 42
+    ip.run_line_magic("store", "var")
+    ip.user_ns["var"] = 39
+    ip.run_line_magic("store", "-r")
+    assert ip.user_ns["var"] == 42
 
-    ip.run_line_magic('store', '-d var')
-    ip.user_ns['var'] = 39
-    ip.run_line_magic('store' , '-r')
-    nt.assert_equal(ip.user_ns['var'], 39)
+    ip.run_line_magic("store", "-d var")
+    ip.user_ns["var"] = 39
+    ip.run_line_magic("store", "-r")
+    assert ip.user_ns["var"] == 39
 
 
 def _run_edit_test(arg_s, exp_filename=None,
@@ -1179,29 +1203,29 @@ def _run_edit_test(arg_s, exp_filename=None,
     last_call = ['','']
     opts,args = M.parse_options(arg_s,'prxn:')
     filename, lineno, is_temp = M._find_edit_target(ip, args, opts, last_call)
-        
+
     if exp_filename is not None:
-        nt.assert_equal(exp_filename, filename)
+        assert exp_filename == filename
     if exp_contents is not None:
         with io.open(filename, 'r', encoding='utf-8') as f:
             contents = f.read()
-        nt.assert_equal(exp_contents, contents)
+        assert exp_contents == contents
     if exp_lineno != -1:
-        nt.assert_equal(exp_lineno, lineno)
+        assert exp_lineno == lineno
     if exp_is_temp is not None:
-        nt.assert_equal(exp_is_temp, is_temp)
+        assert exp_is_temp == is_temp
 
 
 def test_edit_interactive():
     """%edit on interactively defined objects"""
     ip = get_ipython()
     n = ip.execution_count
-    ip.run_cell(u"def foo(): return 1", store_history=True)
-    
+    ip.run_cell("def foo(): return 1", store_history=True)
+
     try:
         _run_edit_test("foo")
     except code.InteractivelyDefined as e:
-        nt.assert_equal(e.index, n)
+        assert e.index == n
     else:
         raise AssertionError("Should have raised InteractivelyDefined")
 
@@ -1209,9 +1233,9 @@ def test_edit_interactive():
 def test_edit_cell():
     """%edit [cell id]"""
     ip = get_ipython()
-    
-    ip.run_cell(u"def foo(): return 1", store_history=True)
-    
+
+    ip.run_cell("def foo(): return 1", store_history=True)
+
     # test
     _run_edit_test("1", exp_contents=ip.user_ns['In'][1], exp_is_temp=True)
 
@@ -1234,17 +1258,18 @@ def test_ls_magic():
     lsmagic = ip.magic('lsmagic')
     with warnings.catch_warnings(record=True) as w:
         j = json_formatter(lsmagic)
-    nt.assert_equal(sorted(j), ['cell', 'line'])
-    nt.assert_equal(w, []) # no warnings
+    assert sorted(j) == ["cell", "line"]
+    assert w == []  # no warnings
+
 
 def test_strip_initial_indent():
     def sii(s):
         lines = s.splitlines()
         return '\n'.join(code.strip_initial_indent(lines))
 
-    nt.assert_equal(sii("  a = 1\nb = 2"), "a = 1\nb = 2")
-    nt.assert_equal(sii("  a\n    b\nc"), "a\n  b\nc")
-    nt.assert_equal(sii("a\n  b"), "a\n  b")
+    assert sii("  a = 1\nb = 2") == "a = 1\nb = 2"
+    assert sii("  a\n    b\nc") == "a\n  b\nc"
+    assert sii("a\n  b") == "a\n  b"
 
 def test_logging_magic_quiet_from_arg():
     _ip.config.LoggingMagics.quiet = False
@@ -1336,6 +1361,6 @@ def is_package(self, __):
             _ip.run_cell("import my_tmp")
 
         output = "Loaded my_tmp\nI just ran a script\nLoaded my_tmp\n"
-        nt.assert_equal(output, captured.stdout)
+        assert output == captured.stdout
 
         sys.meta_path.pop(0)

From b5182174bac2e626424a8a7a6a5440a2683ae739 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:43:44 +0200
Subject: [PATCH 0729/1407] [core][tests][magic_terminal] Remove nose

---
 IPython/core/tests/test_magic_terminal.py | 67 ++++++++++++-----------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/IPython/core/tests/test_magic_terminal.py b/IPython/core/tests/test_magic_terminal.py
index 79e2d3ed4a5..3b53aadf068 100644
--- a/IPython/core/tests/test_magic_terminal.py
+++ b/IPython/core/tests/test_magic_terminal.py
@@ -11,8 +11,6 @@
 from io import StringIO
 from unittest import TestCase
 
-import nose.tools as nt
-
 from IPython.testing import tools as tt
 
 #-----------------------------------------------------------------------------
@@ -93,16 +91,16 @@ def tearDown(self):
         ip.hooks.clipboard_get = self.original_clip
        
     def test_paste(self):
-        ip.user_ns.pop('x', None)
-        self.paste('x = 1')
-        nt.assert_equal(ip.user_ns['x'], 1)
-        ip.user_ns.pop('x')
+        ip.user_ns.pop("x", None)
+        self.paste("x = 1")
+        self.assertEqual(ip.user_ns["x"], 1)
+        ip.user_ns.pop("x")
 
     def test_paste_pyprompt(self):
-        ip.user_ns.pop('x', None)
-        self.paste('>>> x=2')
-        nt.assert_equal(ip.user_ns['x'], 2)
-        ip.user_ns.pop('x')
+        ip.user_ns.pop("x", None)
+        self.paste(">>> x=2")
+        self.assertEqual(ip.user_ns["x"], 2)
+        ip.user_ns.pop("x")
 
     def test_paste_py_multi(self):
         self.paste("""
@@ -111,35 +109,38 @@ def test_paste_py_multi(self):
         >>> for i in x:
         ...     y.append(i**2)
         ... 
-        """)
-        nt.assert_equal(ip.user_ns['x'], [1,2,3])
-        nt.assert_equal(ip.user_ns['y'], [1,4,9])
+        """
+        )
+        self.assertEqual(ip.user_ns["x"], [1, 2, 3])
+        self.assertEqual(ip.user_ns["y"], [1, 4, 9])
 
     def test_paste_py_multi_r(self):
         "Now, test that self.paste -r works"
         self.test_paste_py_multi()
-        nt.assert_equal(ip.user_ns.pop('x'), [1,2,3])
-        nt.assert_equal(ip.user_ns.pop('y'), [1,4,9])
-        nt.assert_false('x' in ip.user_ns)
-        ip.magic('paste -r')
-        nt.assert_equal(ip.user_ns['x'], [1,2,3])
-        nt.assert_equal(ip.user_ns['y'], [1,4,9])
+        self.assertEqual(ip.user_ns.pop("x"), [1, 2, 3])
+        self.assertEqual(ip.user_ns.pop("y"), [1, 4, 9])
+        self.assertFalse("x" in ip.user_ns)
+        ip.magic("paste -r")
+        self.assertEqual(ip.user_ns["x"], [1, 2, 3])
+        self.assertEqual(ip.user_ns["y"], [1, 4, 9])
 
     def test_paste_email(self):
         "Test pasting of email-quoted contents"
         self.paste("""\
         >> def foo(x):
         >>     return x + 1
-        >> xx = foo(1.1)""")
-        nt.assert_equal(ip.user_ns['xx'], 2.1)
+        >> xx = foo(1.1)"""
+        )
+        self.assertEqual(ip.user_ns["xx"], 2.1)
 
     def test_paste_email2(self):
         "Email again; some programs add a space also at each quoting level"
         self.paste("""\
         > > def foo(x):
         > >     return x + 1
-        > > yy = foo(2.1)     """)
-        nt.assert_equal(ip.user_ns['yy'], 3.1)
+        > > yy = foo(2.1)     """
+        )
+        self.assertEqual(ip.user_ns["yy"], 3.1)
 
     def test_paste_email_py(self):
         "Email quoting of interactive input"
@@ -147,8 +148,9 @@ def test_paste_email_py(self):
         >> >>> def f(x):
         >> ...   return x+1
         >> ... 
-        >> >>> zz = f(2.5)      """)
-        nt.assert_equal(ip.user_ns['zz'], 3.5)
+        >> >>> zz = f(2.5)      """
+        )
+        self.assertEqual(ip.user_ns["zz"], 3.5)
 
     def test_paste_echo(self):
         "Also test self.paste echoing, by temporarily faking the writer"
@@ -163,9 +165,9 @@ def test_paste_echo(self):
             out = w.getvalue()
         finally:
             ip.write = writer
-        nt.assert_equal(ip.user_ns['a'], 100)
-        nt.assert_equal(ip.user_ns['b'], 200)
-        assert out == code+"\n## -- End pasted text --\n"
+        self.assertEqual(ip.user_ns["a"], 100)
+        self.assertEqual(ip.user_ns["b"], 200)
+        assert out == code + "\n## -- End pasted text --\n"
 
     def test_paste_leading_commas(self):
         "Test multiline strings with leading commas"
@@ -174,10 +176,9 @@ def test_paste_leading_commas(self):
 a = """
 ,1,2,3
 """'''
-        ip.user_ns.pop('foo', None)
-        tm.store_or_execute(s, 'foo')
-        nt.assert_in('foo', ip.user_ns)
-
+        ip.user_ns.pop("foo", None)
+        tm.store_or_execute(s, "foo")
+        self.assertIn("foo", ip.user_ns)
 
     def test_paste_trailing_question(self):
         "Test pasting sources with trailing question marks"
@@ -189,4 +190,4 @@ def funcfoo():
 '''
         ip.user_ns.pop('funcfoo', None)
         self.paste(s)
-        nt.assert_equal(ip.user_ns['funcfoo'](), 'fooresult')
+        self.assertEqual(ip.user_ns["funcfoo"](), "fooresult")

From 931096b771bc3bf0d92bd7e60a46de13cd76f25c Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:47:49 +0200
Subject: [PATCH 0730/1407] [core][tests][oinspect] Remove nose

---
 IPython/core/tests/test_oinspect.py | 69 ++++++++++++++---------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/IPython/core/tests/test_oinspect.py b/IPython/core/tests/test_oinspect.py
index 6d3ae2e5c44..7557fcf804b 100644
--- a/IPython/core/tests/test_oinspect.py
+++ b/IPython/core/tests/test_oinspect.py
@@ -9,8 +9,6 @@
 import os
 import re
 
-import nose.tools as nt
-
 from .. import oinspect
 
 from decorator import decorator
@@ -38,7 +36,7 @@ def setup_module():
 # defined, if any code is inserted above, the following line will need to be
 # updated.  Do NOT insert any whitespace between the next line and the function
 # definition below.
-THIS_LINE_NUMBER = 41  # Put here the actual number of this line
+THIS_LINE_NUMBER = 39  # Put here the actual number of this line
 
 from unittest import TestCase
 
@@ -74,7 +72,7 @@ def wrapper(*a, **kw):
     @noop1
     def f(x):
         "My docstring"
-    
+
     match_pyfiles(oinspect.find_file(f), os.path.abspath(__file__))
     assert f.__doc__ == "My docstring"
 
@@ -90,14 +88,14 @@ def noop2(f, *a, **kw):
     @noop2
     def f(x):
         "My docstring 2"
-    
+
     match_pyfiles(oinspect.find_file(f), os.path.abspath(__file__))
     assert f.__doc__ == "My docstring 2"
-    
+
 
 def test_find_file_magic():
     run = ip.find_line_magic('run')
-    nt.assert_not_equal(oinspect.find_file(run), None)
+    assert oinspect.find_file(run) is not None
 
 
 # A few generic objects we can then inspect in the tests below
@@ -169,11 +167,11 @@ def test_info():
     "Check that Inspector.info fills out various fields as expected."
     i = inspector.info(Call, oname="Call")
     assert i["type_name"] == "type"
-    expted_class = str(type(type))  # <class 'type'> (Python 3) or <type 'type'>
-    assert i["base_class"] == expted_class
-    nt.assert_regex(
-        i["string_form"],
+    expected_class = str(type(type))  # <class 'type'> (Python 3) or <type 'type'>
+    assert i["base_class"] == expected_class
+    assert re.search(
         "<class 'IPython.core.tests.test_oinspect.Call'( at 0x[0-9a-f]{1,9})?>",
+        i["string_form"],
     )
     fname = __file__
     if fname.endswith(".pyc"):
@@ -184,12 +182,12 @@ def test_info():
     assert i["definition"] == None
     assert i["docstring"] == Call.__doc__
     assert i["source"] == None
-    nt.assert_true(i["isclass"])
+    assert i["isclass"] is True
     assert i["init_definition"] == "Call(x, y=1)"
     assert i["init_docstring"] == Call.__init__.__doc__
 
     i = inspector.info(Call, detail_level=1)
-    nt.assert_not_equal(i["source"], None)
+    assert i["source"] is not None
     assert i["docstring"] == None
 
     c = Call(1)
@@ -221,7 +219,7 @@ def test_info_serialliar():
 
     # Nested attribute access should be cut off at 100 levels deep to avoid
     # infinite loops: https://github.com/ipython/ipython/issues/9122
-    nt.assert_less(fib_tracker[0], 9000)
+    assert fib_tracker[0] < 9000
 
 def support_function_one(x, y=2, *a, **kw):
     """A simple function."""
@@ -230,7 +228,8 @@ def test_calldef_none():
     # We should ignore __call__ for all of these.
     for obj in [support_function_one, SimpleClass().method, any, str.upper]:
         i = inspector.info(obj)
-        nt.assert_is(i['call_def'], None)
+        assert i["call_def"] is None
+
 
 def f_kwarg(pos, *, kwonly):
     pass
@@ -249,16 +248,16 @@ class B(object):
         """standard docstring"""
         def getdoc(self):
             return "custom docstring"
-    
+
     class C(object):
         """standard docstring"""
         def getdoc(self):
             return None
-    
+
     a = A()
     b = B()
     c = C()
-    
+
     assert oinspect.getdoc(a) == "standard docstring"
     assert oinspect.getdoc(b) == "custom docstring"
     assert oinspect.getdoc(c) == "standard docstring"
@@ -266,17 +265,17 @@ def getdoc(self):
 
 def test_empty_property_has_no_source():
     i = inspector.info(property(), detail_level=1)
-    nt.assert_is(i['source'], None)
+    assert i["source"] is None
 
 
 def test_property_sources():
-    import posixpath 
+    import posixpath
     # A simple adder whose source and signature stays
     # the same across Python distributions
     def simple_add(a, b):
         "Adds two numbers"
         return a + b
-    
+
     class A(object):
         @property
         def foo(self):
@@ -285,17 +284,17 @@ def foo(self):
         foo = foo.setter(lambda self, v: setattr(self, 'bar', v))
 
         dname = property(posixpath.dirname)
-        adder = property(simple_add) 
+        adder = property(simple_add)
 
     i = inspector.info(A.foo, detail_level=1)
-    nt.assert_in('def foo(self):', i['source'])
-    nt.assert_in('lambda self, v:', i['source'])
+    assert "def foo(self):" in i["source"]
+    assert "lambda self, v:" in i["source"]
 
     i = inspector.info(A.dname, detail_level=1)
-    nt.assert_in('def dirname(p)', i['source'])
-    
+    assert "def dirname(p)" in i["source"]
+
     i = inspector.info(A.adder, detail_level=1)
-    nt.assert_in('def simple_add(a, b)', i['source'])
+    assert "def simple_add(a, b)" in i["source"]
 
 
 def test_property_docstring_is_in_info_for_detail_level_0():
@@ -367,11 +366,11 @@ def test_pinfo_docstring_if_detail_and_no_source():
                   def bar(self):
                       """ This is a docstring for Foo.bar """
                       pass
-              ''' 
-    
+              '''
+
     ip.run_cell(obj_def)
     ip.run_cell('foo = Foo()')
-    
+
     with AssertNotPrints("Source:"):
         with AssertPrints('Docstring:'):
             ip._inspect('pinfo', 'foo', detail_level=0)
@@ -396,14 +395,14 @@ def test_pinfo_magic():
 def test_init_colors():
     # ensure colors are not present in signature info
     info = inspector.info(HasSignature)
-    init_def = info['init_definition']
-    nt.assert_not_in('[0m', init_def)
+    init_def = info["init_definition"]
+    assert "[0m" not in init_def
 
 
 def test_builtin_init():
     info = inspector.info(list)
     init_def = info['init_definition']
-    nt.assert_is_not_none(init_def)
+    assert init_def is not None
 
 
 def test_render_signature_short():
@@ -428,7 +427,7 @@ def long_function(
         signature(long_function),
         long_function.__name__,
     )
-    nt.assert_in(sig, [
+    assert sig in [
         # Python >=3.9
         '''\
 long_function(
@@ -452,4 +451,4 @@ def long_function(
     let_us_make_sure_this_is_looong:Union[str, NoneType]=None,
 ) -> bool\
 ''',
-    ])
+    ]

From a524414a9e838c235623b02303ecb8f00ecaf926 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:48:53 +0200
Subject: [PATCH 0731/1407] [core][tests][paths] Remove nose

---
 IPython/core/tests/test_paths.py | 53 ++++++++++++++++----------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/IPython/core/tests/test_paths.py b/IPython/core/tests/test_paths.py
index 2182cb7cb0c..e5de945e944 100644
--- a/IPython/core/tests/test_paths.py
+++ b/IPython/core/tests/test_paths.py
@@ -6,7 +6,6 @@
 import warnings
 from unittest.mock import patch
 
-import nose.tools as nt
 from testpath import modified_env, assert_isdir, assert_isfile
 
 from IPython import paths
@@ -52,7 +51,7 @@ def test_get_ipython_dir_1():
             modified_env({'IPYTHONDIR': env_ipdir}):
         ipdir = paths.get_ipython_dir()
 
-    nt.assert_equal(ipdir, env_ipdir)
+    assert ipdir == env_ipdir
 
 def test_get_ipython_dir_2():
     """test_get_ipython_dir_2, Testcase to see if we can call get_ipython_dir without Exceptions."""
@@ -66,7 +65,7 @@ def test_get_ipython_dir_2():
                          }):
         ipdir = paths.get_ipython_dir()
 
-    nt.assert_equal(ipdir, os.path.join("someplace", ".ipython"))
+    assert ipdir == os.path.join("someplace", ".ipython")
 
 def test_get_ipython_dir_3():
     """test_get_ipython_dir_3, move XDG if defined, and .ipython doesn't exist."""
@@ -81,10 +80,10 @@ def test_get_ipython_dir_3():
                 }), warnings.catch_warnings(record=True) as w:
             ipdir = paths.get_ipython_dir()
 
-        nt.assert_equal(ipdir, os.path.join(tmphome.name, ".ipython"))
+        assert ipdir == os.path.join(tmphome.name, ".ipython")
         if sys.platform != 'darwin':
-            nt.assert_equal(len(w), 1)
-            nt.assert_in('Moving', str(w[0]))
+            assert len(w) == 1
+            assert "Moving" in str(w[0])
     finally:
         tmphome.cleanup()
 
@@ -106,10 +105,11 @@ def test_get_ipython_dir_4():
         }), warnings.catch_warnings(record=True) as w:
             ipdir = paths.get_ipython_dir()
 
-        nt.assert_equal(ipdir, os.path.join(HOME_TEST_DIR, ".ipython"))
+        assert ipdir == os.path.join(HOME_TEST_DIR, ".ipython")
         if sys.platform != 'darwin':
-            nt.assert_equal(len(w), 1)
-            nt.assert_in('Ignoring', str(w[0]))
+            assert len(w) == 1
+            assert "Ignoring" in str(w[0])
+
 
 def test_get_ipython_dir_5():
     """test_get_ipython_dir_5, use .ipython if exists and XDG defined, but doesn't exist."""
@@ -128,7 +128,7 @@ def test_get_ipython_dir_5():
         }):
             ipdir = paths.get_ipython_dir()
 
-        nt.assert_equal(ipdir, IP_TEST_DIR)
+        assert ipdir == IP_TEST_DIR
 
 def test_get_ipython_dir_6():
     """test_get_ipython_dir_6, use home over XDG if defined and neither exist."""
@@ -146,8 +146,8 @@ def test_get_ipython_dir_6():
             }), warnings.catch_warnings(record=True) as w:
         ipdir = paths.get_ipython_dir()
 
-    nt.assert_equal(ipdir, os.path.join(HOME_TEST_DIR, '.ipython'))
-    nt.assert_equal(len(w), 0)
+    assert ipdir == os.path.join(HOME_TEST_DIR, ".ipython")
+    assert len(w) == 0
 
 def test_get_ipython_dir_7():
     """test_get_ipython_dir_7, test home directory expansion on IPYTHONDIR"""
@@ -155,7 +155,8 @@ def test_get_ipython_dir_7():
     with modified_env({'IPYTHONDIR': os.path.join('~', 'somewhere')}), \
             patch.object(paths, '_writable_dir', return_value=True):
         ipdir = paths.get_ipython_dir()
-    nt.assert_equal(ipdir, os.path.join(home_dir, 'somewhere'))
+    assert ipdir == os.path.join(home_dir, "somewhere")
+
 
 @skip_win32
 def test_get_ipython_dir_8():
@@ -164,14 +165,16 @@ def test_get_ipython_dir_8():
         # test only when HOME directory actually writable
         return
 
-    with patch.object(paths, '_writable_dir', lambda path: bool(path)), \
-            patch.object(paths, 'get_xdg_dir', return_value=None), \
-            modified_env({
-                'IPYTHON_DIR': None,
-                'IPYTHONDIR': None,
-                'HOME': '/',
-            }):
-        nt.assert_equal(paths.get_ipython_dir(), '/.ipython')
+    with patch.object(paths, "_writable_dir", lambda path: bool(path)), patch.object(
+        paths, "get_xdg_dir", return_value=None
+    ), modified_env(
+        {
+            "IPYTHON_DIR": None,
+            "IPYTHONDIR": None,
+            "HOME": "/",
+        }
+    ):
+        assert paths.get_ipython_dir() == "/.ipython"
 
 
 def test_get_ipython_cache_dir():
@@ -181,18 +184,16 @@ def test_get_ipython_cache_dir():
             os.makedirs(os.path.join(HOME_TEST_DIR, ".cache"))
             with modified_env({'XDG_CACHE_HOME': None}):
                 ipdir = paths.get_ipython_cache_dir()
-            nt.assert_equal(os.path.join(HOME_TEST_DIR, ".cache", "ipython"),
-                            ipdir)
+            assert os.path.join(HOME_TEST_DIR, ".cache", "ipython") == ipdir
             assert_isdir(ipdir)
 
             # test env override
             with modified_env({"XDG_CACHE_HOME": XDG_CACHE_DIR}):
                 ipdir = paths.get_ipython_cache_dir()
             assert_isdir(ipdir)
-            nt.assert_equal(ipdir, os.path.join(XDG_CACHE_DIR, "ipython"))
+            assert ipdir == os.path.join(XDG_CACHE_DIR, "ipython")
         else:
-            nt.assert_equal(paths.get_ipython_cache_dir(),
-                            paths.get_ipython_dir())
+            assert paths.get_ipython_cache_dir() == paths.get_ipython_dir()
 
 def test_get_ipython_package_dir():
     ipdir = paths.get_ipython_package_dir()

From eb08dcfc3f0caefd722688b9734b9d67f61cc458 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 11:50:29 +0200
Subject: [PATCH 0732/1407] [core][tests][profile] Remove nose

---
 IPython/core/tests/test_profile.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/IPython/core/tests/test_profile.py b/IPython/core/tests/test_profile.py
index f18a064154a..07f43e4ec05 100644
--- a/IPython/core/tests/test_profile.py
+++ b/IPython/core/tests/test_profile.py
@@ -27,8 +27,6 @@
 from pathlib import Path
 from unittest import TestCase
 
-import nose.tools as nt
-
 from IPython.core.profileapp import list_profiles_in, list_bundled_profiles
 from IPython.core.profiledir import ProfileDir
 
@@ -79,7 +77,7 @@ def win32_without_pywin32():
         except ImportError:
             return True
     return False
-    
+
 
 class ProfileStartupTest(TestCase):
     def setUp(self):
@@ -114,7 +112,7 @@ def test_startup_ipy(self):
         self.init('00-start.ipy', '%xmode plain\n', '')
         self.validate('Exception reporting mode: Plain')
 
-    
+
 def test_list_profiles_in():
     # No need to remove these directories and files, as they will get nuked in
     # the module-level teardown.
@@ -127,7 +125,7 @@ def test_list_profiles_in():
     with open(td / "profile_file", "w") as f:
         f.write("I am not a profile directory")
     profiles = list_profiles_in(td)
-    
+
     # unicode normalization can turn u'ünicode' into u'u\0308nicode',
     # so only check for *nicode, and that creating a ProfileDir from the
     # name remains valid
@@ -139,14 +137,14 @@ def test_list_profiles_in():
             found_unicode = True
             break
     if dec.unicode_paths:
-        nt.assert_true(found_unicode)
-    nt.assert_equal(set(profiles), {'foo', 'hello'})
+        assert found_unicode is True
+    assert set(profiles) == {"foo", "hello"}
 
 
 def test_list_bundled_profiles():
     # This variable will need to be updated when a new profile gets bundled
     bundled = sorted(list_bundled_profiles())
-    nt.assert_equal(bundled, [])
+    assert bundled == []
 
 
 def test_profile_create_ipython_dir():
@@ -167,4 +165,3 @@ def test_profile_create_ipython_dir():
         assert Path(profile_dir).exists()
         ipython_config = profile_dir / "ipython_config.py"
         assert Path(ipython_config).exists()
-        

From c2c26d9f9ad819b55092c419679270be0dc34e1d Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:49:11 +0200
Subject: [PATCH 0733/1407] [core][tests][pylabtools] Remove nose

---
 IPython/core/tests/test_pylabtools.py | 117 +++++++++++++-------------
 1 file changed, 58 insertions(+), 59 deletions(-)

diff --git a/IPython/core/tests/test_pylabtools.py b/IPython/core/tests/test_pylabtools.py
index 426930d54fa..64acd3d465a 100644
--- a/IPython/core/tests/test_pylabtools.py
+++ b/IPython/core/tests/test_pylabtools.py
@@ -12,12 +12,10 @@
 matplotlib.use('Agg')
 from matplotlib.figure import Figure
 
-from nose import SkipTest
-import nose.tools as nt
-
 from matplotlib import pyplot as plt
-import matplotlib_inline
+from matplotlib_inline import backend_inline
 import numpy as np
+import pytest
 
 from IPython.core.getipython import get_ipython
 from IPython.core.interactiveshell import InteractiveShell
@@ -30,7 +28,7 @@
 def test_figure_to_svg():
     # simple empty-figure test
     fig = plt.figure()
-    nt.assert_equal(pt.print_figure(fig, 'svg'), None)
+    assert pt.print_figure(fig, "svg") is None
 
     plt.close('all')
 
@@ -39,8 +37,9 @@ def test_figure_to_svg():
     ax = fig.add_subplot(1,1,1)
     ax.plot([1,2,3])
     plt.draw()
-    svg = pt.print_figure(fig, 'svg')[:100].lower()
-    nt.assert_in(u'doctype svg', svg)
+    svg = pt.print_figure(fig, "svg")[:100].lower()
+    assert "doctype svg" in svg
+
 
 def _check_pil_jpeg_bytes():
     """Skip if PIL can't write JPEGs to BytesIO objects"""
@@ -53,7 +52,7 @@ def _check_pil_jpeg_bytes():
         img.save(buf, 'jpeg')
     except Exception as e:
         ename = e.__class__.__name__
-        raise SkipTest("PIL can't write JPEG to BytesIO: %s: %s" % (ename, e)) from e
+        raise pytest.skip("PIL can't write JPEG to BytesIO: %s: %s" % (ename, e)) from e
 
 @dec.skip_without("PIL.Image")
 def test_figure_to_jpeg():
@@ -69,7 +68,7 @@ def test_figure_to_jpeg():
 def test_retina_figure():
     # simple empty-figure test
     fig = plt.figure()
-    nt.assert_equal(pt.retina_figure(fig), None)
+    assert pt.retina_figure(fig) == None
     plt.close('all')
 
     fig = plt.figure()
@@ -78,8 +77,9 @@ def test_retina_figure():
     plt.draw()
     png, md = pt.retina_figure(fig)
     assert png.startswith(_PNG)
-    nt.assert_in('width', md)
-    nt.assert_in('height', md)
+    assert "width" in md
+    assert "height" in md
+
 
 _fmt_mime_map = {
     'png': 'image/png',
@@ -95,9 +95,9 @@ def test_select_figure_formats_str():
         pt.select_figure_formats(ip, fmt)
         for mime, f in ip.display_formatter.formatters.items():
             if mime == active_mime:
-                nt.assert_in(Figure, f)
+                assert Figure in f
             else:
-                nt.assert_not_in(Figure, f)
+                assert Figure not in f
 
 def test_select_figure_formats_kwargs():
     ip = get_ipython()
@@ -134,24 +134,25 @@ def test_select_figure_formats_set():
         pt.select_figure_formats(ip, fmts)
         for mime, f in ip.display_formatter.formatters.items():
             if mime in active_mimes:
-                nt.assert_in(Figure, f)
+                assert Figure in f
             else:
-                nt.assert_not_in(Figure, f)
+                assert Figure not in f
 
 def test_select_figure_formats_bad():
     ip = get_ipython()
-    with nt.assert_raises(ValueError):
+    with pytest.raises(ValueError):
         pt.select_figure_formats(ip, 'foo')
-    with nt.assert_raises(ValueError):
+    with pytest.raises(ValueError):
         pt.select_figure_formats(ip, {'png', 'foo'})
-    with nt.assert_raises(ValueError):
+    with pytest.raises(ValueError):
         pt.select_figure_formats(ip, ['retina', 'pdf', 'bar', 'bad'])
 
 def test_import_pylab():
     ns = {}
     pt.import_pylab(ns, import_all=False)
-    nt.assert_true('plt' in ns)
-    nt.assert_equal(ns['np'], np)
+    assert "plt" in ns
+    assert ns["np"] == np
+
 
 from traitlets.config import Config
 
@@ -182,15 +183,13 @@ def act_mpl(backend):
         pt.activate_matplotlib = act_mpl
         self._save_ip = pt.import_pylab
         pt.import_pylab = lambda *a,**kw:None
-        self._save_cis = matplotlib_inline.backend_inline.configure_inline_support
-        matplotlib_inline.backend_inline.configure_inline_support = (
-            lambda *a, **kw: None
-        )
+        self._save_cis = backend_inline.configure_inline_support
+        backend_inline.configure_inline_support = lambda *a, **kw: None
 
     def teardown(self):
         pt.activate_matplotlib = self._save_am
         pt.import_pylab = self._save_ip
-        matplotlib_inline.backend_inline.configure_inline_support = self._save_cis
+        backend_inline.configure_inline_support = self._save_cis
         import matplotlib
         matplotlib.rcParams = self._saved_rcParams
         matplotlib.rcParamsOrig = self._saved_rcParamsOrig
@@ -199,68 +198,68 @@ def test_qt(self):
 
         s = self.Shell()
         gui, backend = s.enable_matplotlib(None)
-        nt.assert_equal(gui, 'qt')
-        nt.assert_equal(s.pylab_gui_select, 'qt')
+        assert gui == "qt"
+        assert s.pylab_gui_select == "qt"
 
-        gui, backend = s.enable_matplotlib('inline')
-        nt.assert_equal(gui, 'inline')
-        nt.assert_equal(s.pylab_gui_select, 'qt')
+        gui, backend = s.enable_matplotlib("inline")
+        assert gui == "inline"
+        assert s.pylab_gui_select == "qt"
 
-        gui, backend = s.enable_matplotlib('qt')
-        nt.assert_equal(gui, 'qt')
-        nt.assert_equal(s.pylab_gui_select, 'qt')
+        gui, backend = s.enable_matplotlib("qt")
+        assert gui == "qt"
+        assert s.pylab_gui_select == "qt"
 
-        gui, backend = s.enable_matplotlib('inline')
-        nt.assert_equal(gui, 'inline')
-        nt.assert_equal(s.pylab_gui_select, 'qt')
+        gui, backend = s.enable_matplotlib("inline")
+        assert gui == "inline"
+        assert s.pylab_gui_select == "qt"
 
         gui, backend = s.enable_matplotlib()
-        nt.assert_equal(gui, 'qt')
-        nt.assert_equal(s.pylab_gui_select, 'qt')
+        assert gui == "qt"
+        assert s.pylab_gui_select == "qt"
 
     def test_inline(self):
         s = self.Shell()
-        gui, backend = s.enable_matplotlib('inline')
-        nt.assert_equal(gui, 'inline')
-        nt.assert_equal(s.pylab_gui_select, None)
+        gui, backend = s.enable_matplotlib("inline")
+        assert gui == "inline"
+        assert s.pylab_gui_select == None
 
-        gui, backend = s.enable_matplotlib('inline')
-        nt.assert_equal(gui, 'inline')
-        nt.assert_equal(s.pylab_gui_select, None)
+        gui, backend = s.enable_matplotlib("inline")
+        assert gui == "inline"
+        assert s.pylab_gui_select == None
 
-        gui, backend = s.enable_matplotlib('qt')
-        nt.assert_equal(gui, 'qt')
-        nt.assert_equal(s.pylab_gui_select, 'qt')
+        gui, backend = s.enable_matplotlib("qt")
+        assert gui == "qt"
+        assert s.pylab_gui_select == "qt"
 
     def test_inline_twice(self):
         "Using '%matplotlib inline' twice should not reset formatters"
 
         ip = self.Shell()
-        gui, backend = ip.enable_matplotlib('inline')
-        nt.assert_equal(gui, 'inline')
+        gui, backend = ip.enable_matplotlib("inline")
+        assert gui == "inline"
 
         fmts =  {'png'}
         active_mimes = {_fmt_mime_map[fmt] for fmt in fmts}
         pt.select_figure_formats(ip, fmts)
 
-        gui, backend = ip.enable_matplotlib('inline')
-        nt.assert_equal(gui, 'inline')
+        gui, backend = ip.enable_matplotlib("inline")
+        assert gui == "inline"
 
         for mime, f in ip.display_formatter.formatters.items():
             if mime in active_mimes:
-                nt.assert_in(Figure, f)
+                assert Figure in f
             else:
-                nt.assert_not_in(Figure, f)
+                assert Figure not in f
 
     def test_qt_gtk(self):
         s = self.Shell()
-        gui, backend = s.enable_matplotlib('qt')
-        nt.assert_equal(gui, 'qt')
-        nt.assert_equal(s.pylab_gui_select, 'qt')
+        gui, backend = s.enable_matplotlib("qt")
+        assert gui == "qt"
+        assert s.pylab_gui_select == "qt"
 
-        gui, backend = s.enable_matplotlib('gtk')
-        nt.assert_equal(gui, 'qt')
-        nt.assert_equal(s.pylab_gui_select, 'qt')
+        gui, backend = s.enable_matplotlib("gtk")
+        assert gui == "qt"
+        assert s.pylab_gui_select == "qt"
 
 
 def test_no_gui_backends():

From 421d89b74f259a03391a41d03f640c5d45aefad3 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 12:01:00 +0200
Subject: [PATCH 0734/1407] [core][tests][run] Remove nose

---
 IPython/core/tests/test_run.py | 168 ++++++++++++++++-----------------
 1 file changed, 83 insertions(+), 85 deletions(-)

diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index 5b690645af9..c593a82da6a 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -26,8 +26,7 @@
 import unittest
 from unittest.mock import patch
 
-import nose.tools as nt
-from nose import SkipTest
+import pytest
 
 from IPython.testing import decorators as dec
 from IPython.testing import tools as tt
@@ -168,13 +167,13 @@ class TestMagicRunPass(tt.TempFileMixin):
     def setUp(self):
         content = "a = [1,2,3]\nb = 1"
         self.mktmp(content)
-        
+
     def run_tmpfile(self):
         _ip = get_ipython()
         # This fails on Windows if self.tmpfile.name has spaces or "~" in it.
         # See below and ticket https://bugs.launchpad.net/bugs/366353
         _ip.magic('run %s' % self.fname)
-        
+
     def run_tmpfile_p(self):
         _ip = get_ipython()
         # This fails on Windows if self.tmpfile.name has spaces or "~" in it.
@@ -188,7 +187,7 @@ def test_builtins_id(self):
         bid1 = id(_ip.user_ns['__builtins__'])
         self.run_tmpfile()
         bid2 = id(_ip.user_ns['__builtins__'])
-        nt.assert_equal(bid1, bid2)
+        assert bid1 == bid2
 
     def test_builtins_type(self):
         """Check that the type of __builtins__ doesn't change with %run.
@@ -199,9 +198,9 @@ def test_builtins_type(self):
         """
         _ip = get_ipython()
         self.run_tmpfile()
-        nt.assert_equal(type(_ip.user_ns['__builtins__']),type(sys))
-        
-    def test_run_profile( self ):
+        assert type(_ip.user_ns["__builtins__"]) == type(sys)
+
+    def test_run_profile(self):
         """Test that the option -p, which invokes the profiler, do not
         crash by invoking execfile"""
         self.run_tmpfile_p()
@@ -232,9 +231,9 @@ def test_simpledef(self):
         src = ("class foo: pass\n"
                "def f(): return foo()")
         self.mktmp(src)
-        _ip.magic('run %s' % self.fname)
-        _ip.run_cell('t = isinstance(f(), foo)')
-        nt.assert_true(_ip.user_ns['t'])
+        _ip.magic("run %s" % self.fname)
+        _ip.run_cell("t = isinstance(f(), foo)")
+        assert _ip.user_ns["t"] is True
 
     def test_obj_del(self):
         """Test that object's __del__ methods are called on exit."""
@@ -242,7 +241,7 @@ def test_obj_del(self):
             try:
                 import win32api
             except ImportError as e:
-                raise SkipTest("Test requires pywin32") from e
+                raise unittest.SkipTest("Test requires pywin32") from e
         src = ("class A(object):\n"
                "    def __del__(self):\n"
                "        print('object A deleted')\n"
@@ -250,42 +249,41 @@ def test_obj_del(self):
         self.mktmp(src)
         err = None
         tt.ipexec_validate(self.fname, 'object A deleted', err)
-    
+
     def test_aggressive_namespace_cleanup(self):
         """Test that namespace cleanup is not too aggressive GH-238
 
         Returning from another run magic deletes the namespace"""
         # see ticket https://github.com/ipython/ipython/issues/238
-        
+
         with tt.TempFileMixin() as empty:
-            empty.mktmp('')
+            empty.mktmp("")
             # On Windows, the filename will have \users in it, so we need to use the
             # repr so that the \u becomes \\u.
-            src = ("ip = get_ipython()\n"
-                   "for i in range(5):\n"
-                   "   try:\n"
-                   "       ip.magic(%r)\n"
-                   "   except NameError as e:\n"
-                   "       print(i)\n"
-                   "       break\n" % ('run ' + empty.fname))
+            src = (
+                "ip = get_ipython()\n"
+                "for i in range(5):\n"
+                "   try:\n"
+                "       ip.magic(%r)\n"
+                "   except NameError as e:\n"
+                "       print(i)\n"
+                "       break\n" % ("run " + empty.fname)
+            )
             self.mktmp(src)
-            _ip.magic('run %s' % self.fname)
-            _ip.run_cell('ip == get_ipython()')
-            nt.assert_equal(_ip.user_ns['i'], 4)
-    
+            _ip.magic("run %s" % self.fname)
+            _ip.run_cell("ip == get_ipython()")
+            assert _ip.user_ns["i"] == 4
+
     def test_run_second(self):
-        """Test that running a second file doesn't clobber the first, gh-3547
-        """
-        self.mktmp("avar = 1\n"
-                   "def afunc():\n"
-                   "  return avar\n")
+        """Test that running a second file doesn't clobber the first, gh-3547"""
+        self.mktmp("avar = 1\n" "def afunc():\n" "  return avar\n")
 
         with tt.TempFileMixin() as empty:
             empty.mktmp("")
-            
-            _ip.magic('run %s' % self.fname)
-            _ip.magic('run %s' % empty.fname)
-            nt.assert_equal(_ip.user_ns['afunc'](), 1)
+
+            _ip.magic("run %s" % self.fname)
+            _ip.magic("run %s" % empty.fname)
+            assert _ip.user_ns["afunc"]() == 1
 
     @dec.skip_win32
     def test_tclass(self):
@@ -312,24 +310,24 @@ def test_run_i_after_reset(self):
         self.mktmp(src)
         _ip.run_cell("zz = 23")
         try:
-            _ip.magic('run -i %s' % self.fname)
-            nt.assert_equal(_ip.user_ns['yy'], 23)
+            _ip.magic("run -i %s" % self.fname)
+            assert _ip.user_ns["yy"] == 23
         finally:
             _ip.magic('reset -f')
-            
+
         _ip.run_cell("zz = 23")
         try:
-            _ip.magic('run -i %s' % self.fname)
-            nt.assert_equal(_ip.user_ns['yy'], 23)
+            _ip.magic("run -i %s" % self.fname)
+            assert _ip.user_ns["yy"] == 23
         finally:
             _ip.magic('reset -f')
-            
+
     def test_unicode(self):
         """Check that files in odd encodings are accepted."""
         mydir = os.path.dirname(__file__)
         na = os.path.join(mydir, 'nonascii.py')
         _ip.magic('run "%s"' % na)
-        nt.assert_equal(_ip.user_ns['u'], u'Ўт№Ф')
+        assert _ip.user_ns["u"] == "Ўт№Ф"
 
     def test_run_py_file_attribute(self):
         """Test handling of `__file__` attribute in `%run <file>.py`."""
@@ -342,10 +340,10 @@ def test_run_py_file_attribute(self):
 
         # Check that __file__ was equal to the filename in the script's
         # namespace.
-        nt.assert_equal(_ip.user_ns['t'], self.fname)
+        assert _ip.user_ns["t"] == self.fname
 
         # Check that __file__ was not leaked back into user_ns.
-        nt.assert_equal(file1, file2)
+        assert file1 == file2
 
     def test_run_ipy_file_attribute(self):
         """Test handling of `__file__` attribute in `%run <file.ipy>`."""
@@ -358,10 +356,10 @@ def test_run_ipy_file_attribute(self):
 
         # Check that __file__ was equal to the filename in the script's
         # namespace.
-        nt.assert_equal(_ip.user_ns['t'], self.fname)
+        assert _ip.user_ns["t"] == self.fname
 
         # Check that __file__ was not leaked back into user_ns.
-        nt.assert_equal(file1, file2)
+        assert file1 == file2
 
     def test_run_formatting(self):
         """ Test that %run -t -N<N> does not raise a TypeError for N > 1."""
@@ -369,14 +367,14 @@ def test_run_formatting(self):
         self.mktmp(src)
         _ip.magic('run -t -N 1 %s' % self.fname)
         _ip.magic('run -t -N 10 %s' % self.fname)
-    
+
     def test_ignore_sys_exit(self):
         """Test the -e option to ignore sys.exit()"""
         src = "import sys; sys.exit(1)"
         self.mktmp(src)
         with tt.AssertPrints('SystemExit'):
             _ip.magic('run %s' % self.fname)
-        
+
         with tt.AssertNotPrints('SystemExit'):
             _ip.magic('run -e %s' % self.fname)
 
@@ -391,19 +389,19 @@ def test_run_nb(self):
         )
         src = writes(nb, version=4)
         self.mktmp(src, ext='.ipynb')
-        
+
         _ip.magic("run %s" % self.fname)
-        
-        nt.assert_equal(_ip.user_ns['answer'], 42)
+
+        assert _ip.user_ns["answer"] == 42
 
     def test_run_nb_error(self):
         """Test %run notebook.ipynb error"""
         from nbformat import v4, writes
         # %run when a file name isn't provided
-        nt.assert_raises(Exception, _ip.magic, "run")
+        pytest.raises(Exception, _ip.magic, "run")
 
         # %run when a file doesn't exist
-        nt.assert_raises(Exception, _ip.magic, "run foobar.ipynb")
+        pytest.raises(Exception, _ip.magic, "run foobar.ipynb")
 
         # %run on a notebook with an error
         nb = v4.new_notebook(
@@ -413,15 +411,15 @@ def test_run_nb_error(self):
         )
         src = writes(nb, version=4)
         self.mktmp(src, ext='.ipynb')
-        nt.assert_raises(Exception, _ip.magic, "run %s" % self.fname)
+        pytest.raises(Exception, _ip.magic, "run %s" % self.fname)
 
     def test_file_options(self):
         src = ('import sys\n'
                'a = " ".join(sys.argv[1:])\n')
         self.mktmp(src)
-        test_opts = '-x 3 --verbose'
-        _ip.run_line_magic("run", '{0} {1}'.format(self.fname, test_opts))
-        nt.assert_equal(_ip.user_ns['a'], test_opts)
+        test_opts = "-x 3 --verbose"
+        _ip.run_line_magic("run", "{0} {1}".format(self.fname, test_opts))
+        assert _ip.user_ns["a"] == test_opts
 
 
 class TestMagicRunWithPackage(unittest.TestCase):
@@ -500,33 +498,34 @@ def test_debug_run_submodule_with_relative_import(self):
         self.check_run_submodule('relative', '-d')
 
     def test_module_options(self):
-        _ip.user_ns.pop('a', None)
-        test_opts = '-x abc -m test'
-        _ip.run_line_magic('run', '-m {0}.args {1}'.format(self.package, test_opts))
-        nt.assert_equal(_ip.user_ns['a'], test_opts)
+        _ip.user_ns.pop("a", None)
+        test_opts = "-x abc -m test"
+        _ip.run_line_magic("run", "-m {0}.args {1}".format(self.package, test_opts))
+        assert _ip.user_ns["a"] == test_opts
 
     def test_module_options_with_separator(self):
-        _ip.user_ns.pop('a', None)
-        test_opts = '-x abc -m test'
-        _ip.run_line_magic('run', '-m {0}.args -- {1}'.format(self.package, test_opts))
-        nt.assert_equal(_ip.user_ns['a'], test_opts)
+        _ip.user_ns.pop("a", None)
+        test_opts = "-x abc -m test"
+        _ip.run_line_magic("run", "-m {0}.args -- {1}".format(self.package, test_opts))
+        assert _ip.user_ns["a"] == test_opts
+
 
 def test_run__name__():
     with TemporaryDirectory() as td:
         path = pjoin(td, 'foo.py')
         with open(path, 'w') as f:
             f.write("q = __name__")
-        
-        _ip.user_ns.pop('q', None)
-        _ip.magic('run {}'.format(path))
-        nt.assert_equal(_ip.user_ns.pop('q'), '__main__')
-        
-        _ip.magic('run -n {}'.format(path))
-        nt.assert_equal(_ip.user_ns.pop('q'), 'foo')
+
+        _ip.user_ns.pop("q", None)
+        _ip.magic("run {}".format(path))
+        assert _ip.user_ns.pop("q") == "__main__"
+
+        _ip.magic("run -n {}".format(path))
+        assert _ip.user_ns.pop("q") == "foo"
 
         try:
-            _ip.magic('run -i -n {}'.format(path))
-            nt.assert_equal(_ip.user_ns.pop('q'), 'foo')
+            _ip.magic("run -i -n {}".format(path))
+            assert _ip.user_ns.pop("q") == "foo"
         finally:
             _ip.magic('reset -f')
 
@@ -546,9 +545,9 @@ def test_run_tb():
         with capture_output() as io:
             _ip.magic('run {}'.format(path))
         out = io.stdout
-        nt.assert_not_in("execfile", out)
-        nt.assert_in("RuntimeError", out)
-        nt.assert_equal(out.count("---->"), 3)
+        assert "execfile" not in out
+        assert "RuntimeError" in out
+        assert out.count("---->") == 3
         del ip.user_ns['bar']
         del ip.user_ns['foo']
 
@@ -572,10 +571,10 @@ def test_multiprocessing_run():
                 _ip.run_line_magic('run', path)
                 _ip.run_cell("i_m_undefined")
             out = io.stdout
-            nt.assert_in("hoy", out)
-            nt.assert_not_in("AttributeError", out)
-            nt.assert_in("NameError", out)
-            nt.assert_equal(out.count("---->"), 1)
+            assert "hoy" in out
+            assert "AttributeError" not in out
+            assert "NameError" in out
+            assert out.count("---->") == 1
         except:
             raise
         finally:
@@ -595,7 +594,6 @@ def test_script_tb():
                 "foo()",
             ]))
         out, err = tt.ipexec(path)
-        nt.assert_not_in("execfile", out)
-        nt.assert_in("RuntimeError", out)
-        nt.assert_equal(out.count("---->"), 3)
-
+        assert "execfile" not in out
+        assert "RuntimeError" in out
+        assert out.count("---->") == 3

From 6d0a78f61354592ce546fb41eb5eb80b5dda993b Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 12:02:16 +0200
Subject: [PATCH 0735/1407] [core][tests][splitinput] Remove nose

---
 IPython/core/tests/test_splitinput.py | 52 +++++++++++++--------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/IPython/core/tests/test_splitinput.py b/IPython/core/tests/test_splitinput.py
index 98b4189e5b4..8969da250ae 100644
--- a/IPython/core/tests/test_splitinput.py
+++ b/IPython/core/tests/test_splitinput.py
@@ -1,38 +1,38 @@
 # coding: utf-8
-import nose.tools as nt
 
 from IPython.core.splitinput import split_user_input, LineInfo
 from IPython.testing import tools as tt
 
 tests = [
-    ('x=1', ('', '', 'x', '=1')),
-    ('?', ('', '?', '', '')),
-    ('??', ('', '??', '', '')),
-    (' ?', (' ', '?', '', '')),
-    (' ??', (' ', '??', '', '')),
-    ('??x', ('', '??', 'x', '')),
-    ('?x=1', ('', '?', 'x', '=1')),
-    ('!ls', ('', '!', 'ls', '')),
-    ('  !ls', ('  ', '!', 'ls', '')),
-    ('!!ls', ('', '!!', 'ls', '')),
-    ('  !!ls', ('  ', '!!', 'ls', '')),
-    (',ls', ('', ',', 'ls', '')),
-    (';ls', ('', ';', 'ls', '')),
-    ('  ;ls', ('  ', ';', 'ls', '')),
-    ('f.g(x)',  ('', '', 'f.g', '(x)')),
-    ('f.g (x)', ('', '', 'f.g', '(x)')),
-    ('?%hist1', ('', '?', '%hist1', '')),
-    ('?%%hist2', ('', '?', '%%hist2', '')),
-    ('??%hist3', ('', '??', '%hist3', '')),
-    ('??%%hist4', ('', '??', '%%hist4', '')),
-    ('?x*', ('', '?', 'x*', '')),
-    ]
-tests.append((u"Pérez Fernando", (u'', u'', u'Pérez', u'Fernando')))
+    ("x=1", ("", "", "x", "=1")),
+    ("?", ("", "?", "", "")),
+    ("??", ("", "??", "", "")),
+    (" ?", (" ", "?", "", "")),
+    (" ??", (" ", "??", "", "")),
+    ("??x", ("", "??", "x", "")),
+    ("?x=1", ("", "?", "x", "=1")),
+    ("!ls", ("", "!", "ls", "")),
+    ("  !ls", ("  ", "!", "ls", "")),
+    ("!!ls", ("", "!!", "ls", "")),
+    ("  !!ls", ("  ", "!!", "ls", "")),
+    (",ls", ("", ",", "ls", "")),
+    (";ls", ("", ";", "ls", "")),
+    ("  ;ls", ("  ", ";", "ls", "")),
+    ("f.g(x)", ("", "", "f.g", "(x)")),
+    ("f.g (x)", ("", "", "f.g", "(x)")),
+    ("?%hist1", ("", "?", "%hist1", "")),
+    ("?%%hist2", ("", "?", "%%hist2", "")),
+    ("??%hist3", ("", "??", "%hist3", "")),
+    ("??%%hist4", ("", "??", "%%hist4", "")),
+    ("?x*", ("", "?", "x*", "")),
+]
+tests.append(("Pérez Fernando", ("", "", "Pérez", "Fernando")))
+
 
 def test_split_user_input():
     return tt.check_pairs(split_user_input, tests)
 
 def test_LineInfo():
     """Simple test for LineInfo construction and str()"""
-    linfo = LineInfo('  %cd /home')
-    nt.assert_equal(str(linfo), 'LineInfo [  |%|cd|/home]')
+    linfo = LineInfo("  %cd /home")
+    assert str(linfo) == "LineInfo [  |%|cd|/home]"

From 12d08a51494137e81dc0cd631eef5afdc46ae07f Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 12:03:00 +0200
Subject: [PATCH 0736/1407] [extensions][tests][autoreload] Remove nose

---
 IPython/extensions/tests/test_autoreload.py | 75 ++++++++++-----------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index 4bccd4068e0..e03a08eec97 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -21,7 +21,6 @@
 import time
 from io import StringIO
 
-import nose.tools as nt
 import IPython.testing.tools as tt
 
 from unittest import TestCase
@@ -227,12 +226,12 @@ def square(self):
         self.shell.run_code("from %s import MyClass" % mod_name)
         self.shell.run_code("first = MyClass(5)")
         self.shell.run_code("first.square()")
-        with nt.assert_raises(AttributeError):
+        with self.assertRaises(AttributeError):
             self.shell.run_code("first.cube()")
-        with nt.assert_raises(AttributeError):
+        with self.assertRaises(AttributeError):
             self.shell.run_code("first.power(5)")
         self.shell.run_code("first.b")
-        with nt.assert_raises(AttributeError):
+        with self.assertRaises(AttributeError):
             self.shell.run_code("first.toto")
 
         # remove square, add power
@@ -258,13 +257,13 @@ def power(self, p):
 
         for object_name in {"first", "second"}:
             self.shell.run_code(f"{object_name}.power(5)")
-            with nt.assert_raises(AttributeError):
+            with self.assertRaises(AttributeError):
                 self.shell.run_code(f"{object_name}.cube()")
-            with nt.assert_raises(AttributeError):
+            with self.assertRaises(AttributeError):
                 self.shell.run_code(f"{object_name}.square()")
             self.shell.run_code(f"{object_name}.b")
             self.shell.run_code(f"{object_name}.a")
-            with nt.assert_raises(AttributeError):
+            with self.assertRaises(AttributeError):
                 self.shell.run_code(f"{object_name}.toto")
 
     def test_autoload_newly_added_objects(self):
@@ -275,11 +274,11 @@ def func1(): pass
         mod_name, mod_fn = self.new_module(textwrap.dedent(mod_code))
         self.shell.run_code(f"from {mod_name} import *")
         self.shell.run_code("func1()")
-        with nt.assert_raises(NameError):
+        with self.assertRaises(NameError):
             self.shell.run_code("func2()")
-        with nt.assert_raises(NameError):
+        with self.assertRaises(NameError):
             self.shell.run_code("t = Test()")
-        with nt.assert_raises(NameError):
+        with self.assertRaises(NameError):
             self.shell.run_code("number")
 
         # ----------- TEST NEW OBJ LOADED --------------------------
@@ -391,19 +390,19 @@ def foo(self):
             self.shell.magic_aimport(mod_name)
             stream = StringIO()
             self.shell.magic_aimport("", stream=stream)
-            nt.assert_in(("Modules to reload:\n%s" % mod_name), stream.getvalue())
+            self.assertIn(("Modules to reload:\n%s" % mod_name), stream.getvalue())
 
-            with nt.assert_raises(ImportError):
+            with self.assertRaises(ImportError):
                 self.shell.magic_aimport("tmpmod_as318989e89ds")
         else:
             self.shell.magic_autoreload("2")
             self.shell.run_code("import %s" % mod_name)
             stream = StringIO()
             self.shell.magic_aimport("", stream=stream)
-            nt.assert_true(
+            self.assertTrue(
                 "Modules to reload:\nall-except-skipped" in stream.getvalue()
             )
-        nt.assert_in(mod_name, self.shell.ns)
+        self.assertIn(mod_name, self.shell.ns)
 
         mod = sys.modules[mod_name]
 
@@ -415,21 +414,21 @@ def foo(self):
         old_obj2 = mod.Bar()
 
         def check_module_contents():
-            nt.assert_equal(mod.x, 9)
-            nt.assert_equal(mod.z, 123)
+            self.assertEqual(mod.x, 9)
+            self.assertEqual(mod.z, 123)
 
-            nt.assert_equal(old_foo(0), 3)
-            nt.assert_equal(mod.foo(0), 3)
+            self.assertEqual(old_foo(0), 3)
+            self.assertEqual(mod.foo(0), 3)
 
             obj = mod.Baz(9)
-            nt.assert_equal(old_obj.bar(1), 10)
-            nt.assert_equal(obj.bar(1), 10)
-            nt.assert_equal(obj.quux, 42)
-            nt.assert_equal(obj.zzz(), 99)
+            self.assertEqual(old_obj.bar(1), 10)
+            self.assertEqual(obj.bar(1), 10)
+            self.assertEqual(obj.quux, 42)
+            self.assertEqual(obj.zzz(), 99)
 
             obj2 = mod.Bar()
-            nt.assert_equal(old_obj2.foo(), 1)
-            nt.assert_equal(obj2.foo(), 1)
+            self.assertEqual(old_obj2.foo(), 1)
+            self.assertEqual(obj2.foo(), 1)
 
         check_module_contents()
 
@@ -481,25 +480,25 @@ def foo(self):
         )
 
         def check_module_contents():
-            nt.assert_equal(mod.x, 10)
-            nt.assert_false(hasattr(mod, "z"))
+            self.assertEqual(mod.x, 10)
+            self.assertFalse(hasattr(mod, "z"))
 
-            nt.assert_equal(old_foo(0), 4)  # superreload magic!
-            nt.assert_equal(mod.foo(0), 4)
+            self.assertEqual(old_foo(0), 4)  # superreload magic!
+            self.assertEqual(mod.foo(0), 4)
 
             obj = mod.Baz(9)
-            nt.assert_equal(old_obj.bar(1), 11)  # superreload magic!
-            nt.assert_equal(obj.bar(1), 11)
+            self.assertEqual(old_obj.bar(1), 11)  # superreload magic!
+            self.assertEqual(obj.bar(1), 11)
 
-            nt.assert_equal(old_obj.quux, 43)
-            nt.assert_equal(obj.quux, 43)
+            self.assertEqual(old_obj.quux, 43)
+            self.assertEqual(obj.quux, 43)
 
-            nt.assert_false(hasattr(old_obj, "zzz"))
-            nt.assert_false(hasattr(obj, "zzz"))
+            self.assertFalse(hasattr(old_obj, "zzz"))
+            self.assertFalse(hasattr(obj, "zzz"))
 
             obj2 = mod.Bar()
-            nt.assert_equal(old_obj2.foo(), 2)
-            nt.assert_equal(obj2.foo(), 2)
+            self.assertEqual(old_obj2.foo(), 2)
+            self.assertEqual(obj2.foo(), 2)
 
         self.shell.run_code("pass")  # trigger reload
         check_module_contents()
@@ -519,7 +518,7 @@ def check_module_contents():
             self.shell.magic_aimport("-" + mod_name)
             stream = StringIO()
             self.shell.magic_aimport("", stream=stream)
-            nt.assert_true(("Modules to skip:\n%s" % mod_name) in stream.getvalue())
+            self.assertTrue(("Modules to skip:\n%s" % mod_name) in stream.getvalue())
 
             # This should succeed, although no such module exists
             self.shell.magic_aimport("-tmpmod_as318989e89ds")
@@ -546,7 +545,7 @@ def check_module_contents():
             self.shell.magic_autoreload("")
 
         self.shell.run_code("pass")  # trigger reload
-        nt.assert_equal(mod.x, -99)
+        self.assertEqual(mod.x, -99)
 
     def test_smoketest_aimport(self):
         self._check_smoketest(use_aimport=True)

From f8ffa1df27b80e5ea79e69f9baf9ebfc60704009 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:05:45 +0200
Subject: [PATCH 0737/1407] [extensions][tests][storemagic] Remove nose

---
 IPython/extensions/tests/test_storemagic.py | 31 ++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/IPython/extensions/tests/test_storemagic.py b/IPython/extensions/tests/test_storemagic.py
index 6f8371d336f..acf1abffdc2 100644
--- a/IPython/extensions/tests/test_storemagic.py
+++ b/IPython/extensions/tests/test_storemagic.py
@@ -1,7 +1,6 @@
 import tempfile, os
 
 from traitlets.config.loader import Config
-import nose.tools as nt
 
 
 def setup_module():
@@ -23,10 +22,10 @@ def test_store_restore():
     ip.magic('store foobar foobaz')
 
     # Check storing
-    nt.assert_equal(ip.db['autorestore/foo'], 78)
-    nt.assert_in('bar', ip.db['stored_aliases'])
-    nt.assert_equal(ip.db['autorestore/foobar'], 79)
-    nt.assert_equal(ip.db['autorestore/foobaz'], '80')
+    assert ip.db["autorestore/foo"] == 78
+    assert "bar" in ip.db["stored_aliases"]
+    assert ip.db["autorestore/foobar"] == 79
+    assert ip.db["autorestore/foobaz"] == "80"
 
     # Remove those items
     ip.user_ns.pop('foo', None)
@@ -37,14 +36,14 @@ def test_store_restore():
     ip.user_ns['_dh'][:] = []
 
     # Check restoring
-    ip.magic('store -r foo bar foobar foobaz')
-    nt.assert_equal(ip.user_ns['foo'], 78)
-    assert ip.alias_manager.is_alias('bar')
-    nt.assert_equal(ip.user_ns['foobar'], 79)
-    nt.assert_equal(ip.user_ns['foobaz'], '80')
+    ip.magic("store -r foo bar foobar foobaz")
+    assert ip.user_ns["foo"] == 78
+    assert ip.alias_manager.is_alias("bar")
+    assert ip.user_ns["foobar"] == 79
+    assert ip.user_ns["foobaz"] == "80"
 
-    ip.magic('store -r') # restores _dh too
-    nt.assert_in(os.path.realpath(tmpd), ip.user_ns['_dh'])
+    ip.magic("store -r")  # restores _dh too
+    assert os.path.realpath(tmpd) in ip.user_ns["_dh"]
 
     os.rmdir(tmpd)
 
@@ -57,10 +56,10 @@ def test_autorestore():
     orig_config = ip.config
     try:
         ip.config = c
-        ip.extension_manager.reload_extension('storemagic')
-        nt.assert_not_in('foo', ip.user_ns)
+        ip.extension_manager.reload_extension("storemagic")
+        assert "foo" not in ip.user_ns
         c.StoreMagics.autorestore = True
-        ip.extension_manager.reload_extension('storemagic')
-        nt.assert_equal(ip.user_ns['foo'], 95)
+        ip.extension_manager.reload_extension("storemagic")
+        assert ip.user_ns["foo"] == 95
     finally:
         ip.config = orig_config

From 995c84486d5f176254f5d9f2762f51f05b10bc6a Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:07:03 +0200
Subject: [PATCH 0738/1407] [lib][tests][clipboard] Remove nose

---
 IPython/lib/tests/test_clipboard.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/IPython/lib/tests/test_clipboard.py b/IPython/lib/tests/test_clipboard.py
index f1050bfb5a6..802f753a339 100644
--- a/IPython/lib/tests/test_clipboard.py
+++ b/IPython/lib/tests/test_clipboard.py
@@ -1,5 +1,3 @@
-import nose.tools as nt
-
 from IPython.core.error import TryNext
 from IPython.lib.clipboard import ClipboardEmpty
 from IPython.testing.decorators import skip_if_no_x11
@@ -18,4 +16,4 @@ def test_clipboard_get():
         # No clipboard access API available
         pass
     else:
-        nt.assert_is_instance(a, str)
+        assert isinstance(a, str)

From a1ddd3bc4b72c913bdb95f01cb04c39391b0bc76 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:13:34 +0200
Subject: [PATCH 0739/1407] [lib][tests][deepreload] Remove nose

---
 IPython/lib/tests/test_deepreload.py |  6 ++---
 IPython/lib/tests/test_display.py    | 34 ++++++++++++++--------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/IPython/lib/tests/test_deepreload.py b/IPython/lib/tests/test_deepreload.py
index 992ebab73ac..d9af0f1dbbd 100644
--- a/IPython/lib/tests/test_deepreload.py
+++ b/IPython/lib/tests/test_deepreload.py
@@ -6,8 +6,6 @@
 
 from pathlib import Path
 
-import nose.tools as nt
-
 from IPython.utils.syspathcontext import prepended_to_syspath
 from IPython.utils.tempdir import TemporaryDirectory
 from IPython.lib.deepreload import reload as dreload
@@ -28,9 +26,9 @@ def test_deepreload():
             # Test that A is not reloaded.
             obj = A.Object()
             dreload(B, exclude=["A"])
-            nt.assert_true(isinstance(obj, A.Object))
+            assert isinstance(obj, A.Object) is True
 
             # Test that A is reloaded.
             obj = A.Object()
             dreload(B)
-            nt.assert_false(isinstance(obj, A.Object))
+            assert isinstance(obj, A.Object) is False
diff --git a/IPython/lib/tests/test_display.py b/IPython/lib/tests/test_display.py
index 414d3fd2b8c..f5ed34c912b 100644
--- a/IPython/lib/tests/test_display.py
+++ b/IPython/lib/tests/test_display.py
@@ -21,7 +21,7 @@
 from io import BytesIO
 
 # Third-party imports
-import nose.tools as nt
+import pytest
 
 try:
     import numpy
@@ -48,10 +48,10 @@ def test_instantiation_FileLink():
     fl = display.FileLink(pathlib.PurePath('example.txt'))
 
 def test_warning_on_non_existent_path_FileLink():
-    """FileLink: Calling _repr_html_ on non-existent files returns a warning
-    """
-    fl = display.FileLink('example.txt')
-    nt.assert_true(fl._repr_html_().startswith('Path (<tt>example.txt</tt>)'))
+    """FileLink: Calling _repr_html_ on non-existent files returns a warning"""
+    fl = display.FileLink("example.txt")
+    assert fl._repr_html_().startswith("Path (<tt>example.txt</tt>)")
+
 
 def test_existing_path_FileLink():
     """FileLink: Calling _repr_html_ functions as expected on existing filepath
@@ -77,7 +77,7 @@ def test_error_on_directory_to_FileLink():
     """FileLink: Raises error when passed directory
     """
     td = mkdtemp()
-    nt.assert_raises(ValueError,display.FileLink,td)
+    pytest.raises(ValueError, display.FileLink, td)
 
 #--------------------------
 # FileLinks tests
@@ -89,10 +89,10 @@ def test_instantiation_FileLinks():
     fls = display.FileLinks('example')
 
 def test_warning_on_non_existent_path_FileLinks():
-    """FileLinks: Calling _repr_html_ on non-existent files returns a warning
-    """
-    fls = display.FileLinks('example')
-    nt.assert_true(fls._repr_html_().startswith('Path (<tt>example</tt>)'))
+    """FileLinks: Calling _repr_html_ on non-existent files returns a warning"""
+    fls = display.FileLinks("example")
+    assert fls._repr_html_().startswith("Path (<tt>example</tt>)")
+
 
 def test_existing_path_FileLinks():
     """FileLinks: Calling _repr_html_ functions as expected on existing dir
@@ -172,7 +172,8 @@ def test_error_on_file_to_FileLinks():
     """
     td = mkdtemp()
     tf1 = NamedTemporaryFile(dir=td)
-    nt.assert_raises(ValueError,display.FileLinks,tf1.name)
+    pytest.raises(ValueError, display.FileLinks, tf1.name)
+
 
 def test_recursive_FileLinks():
     """FileLinks: Does not recurse when recursive=False
@@ -210,7 +211,7 @@ def test_audio_from_list(self):
 
     @skipif_not_numpy
     def test_audio_from_numpy_array_without_rate_raises(self):
-        nt.assert_raises(ValueError, display.Audio, get_test_tone())
+        self.assertRaises(ValueError, display.Audio, get_test_tone())
 
     @skipif_not_numpy
     def test_audio_data_normalization(self):
@@ -232,10 +233,10 @@ def test_audio_data_without_normalization(self):
             assert actual_max_value == expected_max_value
 
     def test_audio_data_without_normalization_raises_for_invalid_data(self):
-        nt.assert_raises(
+        self.assertRaises(
             ValueError,
             lambda: display.Audio([1.001], rate=44100, normalize=False))
-        nt.assert_raises(
+        self.assertRaises(
             ValueError,
             lambda: display.Audio([-1.001], rate=44100, normalize=False))
 
@@ -253,9 +254,8 @@ class TestAudioDataWithoutNumpy(TestAudioDataWithNumpy):
     @skipif_not_numpy
     def test_audio_raises_for_nested_list(self):
         stereo_signal = [list(get_test_tone())] * 2
-        nt.assert_raises(
-            TypeError,
-            lambda: display.Audio(stereo_signal, rate=44100))
+        self.assertRaises(TypeError, lambda: display.Audio(stereo_signal, rate=44100))
+
 
 @skipif_not_numpy
 def get_test_tone(scale=1):

From e01e33248d71fb5555b277dcd84dc9b28b1311bd Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:14:05 +0200
Subject: [PATCH 0740/1407] [lib][tests][latextools] Remove nose

---
 IPython/lib/tests/test_latextools.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/IPython/lib/tests/test_latextools.py b/IPython/lib/tests/test_latextools.py
index fafff73d153..60a7589b508 100644
--- a/IPython/lib/tests/test_latextools.py
+++ b/IPython/lib/tests/test_latextools.py
@@ -5,7 +5,6 @@
 from contextlib import contextmanager
 from unittest.mock import patch
 
-import nose.tools as nt
 import pytest
 
 from IPython.lib import latextools
@@ -185,7 +184,13 @@ def test_latex_to_png_invalid_hex_colors():
     Test that invalid hex colors provided to dvipng gives an exception.
     """
     latex_string = "$x^2$"
-    nt.assert_raises(ValueError, lambda: latextools.latex_to_png(latex_string,
-                                        backend='dvipng', color="#f00bar"))
-    nt.assert_raises(ValueError, lambda: latextools.latex_to_png(latex_string,
-                                        backend='dvipng', color="#f00"))
+    pytest.raises(
+        ValueError,
+        lambda: latextools.latex_to_png(
+            latex_string, backend="dvipng", color="#f00bar"
+        ),
+    )
+    pytest.raises(
+        ValueError,
+        lambda: latextools.latex_to_png(latex_string, backend="dvipng", color="#f00"),
+    )

From 3c04a296aa67cab9a88193d603e1be3e76dc838c Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:15:17 +0200
Subject: [PATCH 0741/1407] [lib][tests][pretty] Remove nose

---
 IPython/lib/tests/test_pretty.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py
index 3c8cbf201b3..8c116300b34 100644
--- a/IPython/lib/tests/test_pretty.py
+++ b/IPython/lib/tests/test_pretty.py
@@ -11,7 +11,6 @@
 import string
 import unittest
 
-import nose.tools as nt
 import pytest
 
 from IPython.lib import pretty
@@ -70,7 +69,6 @@ def __repr__(self):
         return "Breaking(\n)"
 
 class BadRepr(object):
-    
     def __repr__(self):
         return 1/0
 
@@ -178,7 +176,7 @@ def test_pprint_break_repr():
 
 def test_bad_repr():
     """Don't catch bad repr errors"""
-    with nt.assert_raises(ZeroDivisionError):
+    with pytest.raises(ZeroDivisionError):
         pretty.pretty(BadRepr())
 
 class BadException(Exception):
@@ -190,12 +188,12 @@ class ReallyBadRepr(object):
     @property
     def __class__(self):
         raise ValueError("I am horrible")
-    
+
     def __repr__(self):
         raise BadException()
 
 def test_really_bad_repr():
-    with nt.assert_raises(BadException):
+    with pytest.raises(BadException):
         pretty.pretty(ReallyBadRepr())
 
 
@@ -266,11 +264,11 @@ def test_metaclass_repr():
 def test_unicode_repr():
     u = u"üniçodé"
     ustr = u
-    
+
     class C(object):
         def __repr__(self):
             return ustr
-    
+
     c = C()
     p = pretty.pretty(c)
     assert p == u
@@ -293,7 +291,7 @@ def type_pprint_wrapper(obj, p, cycle):
     output = stream.getvalue()
 
     assert output == "%s.MyObj" % __name__
-    nt.assert_true(type_pprint_wrapper.called)
+    assert type_pprint_wrapper.called is True
 
 
 # TODO : pytest.mark.parametrise once nose is gone.
@@ -478,7 +476,7 @@ def meaning_of_life(question=None):
             return 42
         return "Don't panic"
 
-    nt.assert_in('meaning_of_life(question=None)', pretty.pretty(meaning_of_life))
+    assert "meaning_of_life(question=None)" in pretty.pretty(meaning_of_life)
 
 
 class OrderedCounter(Counter, OrderedDict):
@@ -497,6 +495,6 @@ def __repr__(self):
 def test_custom_repr():
     """A custom repr should override a pretty printer for a parent type"""
     oc = OrderedCounter("abracadabra")
-    nt.assert_in("OrderedCounter(OrderedDict", pretty.pretty(oc))
+    assert "OrderedCounter(OrderedDict" in pretty.pretty(oc)
 
     assert pretty.pretty(MySet()) == "mine"

From a167c8b57ba7ac6460652a75015f5f82d751a75b Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:15:52 +0200
Subject: [PATCH 0742/1407] [terminal][tests][embed] Remove nose

---
 IPython/terminal/tests/test_embed.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/IPython/terminal/tests/test_embed.py b/IPython/terminal/tests/test_embed.py
index 98dd94653ab..ac4c9424427 100644
--- a/IPython/terminal/tests/test_embed.py
+++ b/IPython/terminal/tests/test_embed.py
@@ -14,7 +14,7 @@
 import os
 import subprocess
 import sys
-import nose.tools as nt
+
 from IPython.utils.tempdir import NamedFileInTemporaryDirectory
 from IPython.testing.decorators import skip_win32
 from IPython.testing import IPYTHON_TESTING_TIMEOUT_SCALE
@@ -55,12 +55,13 @@ def test_ipython_embed():
         out, err = p.communicate(_exit)
         std = out.decode('UTF-8')
 
-        nt.assert_equal(p.returncode, 0)
-        nt.assert_in('3 . 14', std)
-        if os.name != 'nt':
+        assert p.returncode == 0
+        assert "3 . 14" in std
+        if os.name != "nt":
             # TODO: Fix up our different stdout references, see issue gh-14
-            nt.assert_in('IPython', std)
-        nt.assert_in('bye!', std)
+            assert "IPython" in std
+        assert "bye!" in std
+
 
 @skip_win32
 def test_nest_embed():

From 66e3f6ee970edd3d4dc292e1489a7e2bb16579a3 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:17:20 +0200
Subject: [PATCH 0743/1407] [terminal][tests][interactiveshell] Remove nose

---
 .../terminal/tests/test_interactivshell.py    | 70 ++++++++++++++-----
 1 file changed, 51 insertions(+), 19 deletions(-)

diff --git a/IPython/terminal/tests/test_interactivshell.py b/IPython/terminal/tests/test_interactivshell.py
index 640e5d482ae..763ccc96917 100644
--- a/IPython/terminal/tests/test_interactivshell.py
+++ b/IPython/terminal/tests/test_interactivshell.py
@@ -12,29 +12,42 @@
 from IPython.utils.capture import capture_output
 
 from IPython.terminal.ptutils import _elide, _adjust_completion_text_based_on_context
-import nose.tools as nt
 
-class TestElide(unittest.TestCase):
 
+class TestElide(unittest.TestCase):
     def test_elide(self):
-        _elide('concatenate((a1, a2, ...), axis', '') # do not raise
-        _elide('concatenate((a1, a2, ..), . axis', '') # do not raise
-        nt.assert_equal(_elide('aaaa.bbbb.ccccc.dddddd.eeeee.fffff.gggggg.hhhhhh',''), 'aaaa.b…g.hhhhhh')
-
-        test_string = os.sep.join(['', 10*'a', 10*'b', 10*'c', ''])
-        expect_stirng = os.sep + 'a' + '\N{HORIZONTAL ELLIPSIS}' + 'b' + os.sep + 10*'c'
-        nt.assert_equal(_elide(test_string, ''), expect_stirng)
+        _elide("concatenate((a1, a2, ...), axis", "")  # do not raise
+        _elide("concatenate((a1, a2, ..), . axis", "")  # do not raise
+        self.assertEqual(
+            _elide("aaaa.bbbb.ccccc.dddddd.eeeee.fffff.gggggg.hhhhhh", ""),
+            "aaaa.b…g.hhhhhh",
+        )
+
+        test_string = os.sep.join(["", 10 * "a", 10 * "b", 10 * "c", ""])
+        expect_stirng = (
+            os.sep + "a" + "\N{HORIZONTAL ELLIPSIS}" + "b" + os.sep + 10 * "c"
+        )
+        self.assertEqual(_elide(test_string, ""), expect_stirng)
 
     def test_elide_typed_normal(self):
-        nt.assert_equal(_elide('the quick brown fox jumped over the lazy dog', 'the quick brown fox', min_elide=10), 'the…fox jumped over the lazy dog')
-
+        self.assertEqual(
+            _elide(
+                "the quick brown fox jumped over the lazy dog",
+                "the quick brown fox",
+                min_elide=10,
+            ),
+            "the…fox jumped over the lazy dog",
+        )
 
     def test_elide_typed_short_match(self):
         """
         if the match is too short we don't elide.
         avoid the "the...the"
         """
-        nt.assert_equal(_elide('the quick brown fox jumped over the lazy dog', 'the', min_elide=10), 'the quick brown fox jumped over the lazy dog')
+        self.assertEqual(
+            _elide("the quick brown fox jumped over the lazy dog", "the", min_elide=10),
+            "the quick brown fox jumped over the lazy dog",
+        )
 
     def test_elide_typed_no_match(self):
         """
@@ -42,22 +55,41 @@ def test_elide_typed_no_match(self):
         avoid the "the...the"
         """
         # here we typed red instead of brown
-        nt.assert_equal(_elide('the quick brown fox jumped over the lazy dog', 'the quick red fox', min_elide=10), 'the quick brown fox jumped over the lazy dog')
+        self.assertEqual(
+            _elide(
+                "the quick brown fox jumped over the lazy dog",
+                "the quick red fox",
+                min_elide=10,
+            ),
+            "the quick brown fox jumped over the lazy dog",
+        )
 
-class TestContextAwareCompletion(unittest.TestCase):
 
+class TestContextAwareCompletion(unittest.TestCase):
     def test_adjust_completion_text_based_on_context(self):
         # Adjusted case
-        nt.assert_equal(_adjust_completion_text_based_on_context('arg1=', 'func1(a=)', 7), 'arg1')
+        self.assertEqual(
+            _adjust_completion_text_based_on_context("arg1=", "func1(a=)", 7), "arg1"
+        )
 
         # Untouched cases
-        nt.assert_equal(_adjust_completion_text_based_on_context('arg1=', 'func1(a)', 7), 'arg1=')
-        nt.assert_equal(_adjust_completion_text_based_on_context('arg1=', 'func1(a', 7), 'arg1=')
-        nt.assert_equal(_adjust_completion_text_based_on_context('%magic', 'func1(a=)', 7), '%magic')
-        nt.assert_equal(_adjust_completion_text_based_on_context('func2', 'func1(a=)', 7), 'func2')
+        self.assertEqual(
+            _adjust_completion_text_based_on_context("arg1=", "func1(a)", 7), "arg1="
+        )
+        self.assertEqual(
+            _adjust_completion_text_based_on_context("arg1=", "func1(a", 7), "arg1="
+        )
+        self.assertEqual(
+            _adjust_completion_text_based_on_context("%magic", "func1(a=)", 7), "%magic"
+        )
+        self.assertEqual(
+            _adjust_completion_text_based_on_context("func2", "func1(a=)", 7), "func2"
+        )
+
 
 # Decorator for interaction loop tests -----------------------------------------
 
+
 class mock_input_helper(object):
     """Machinery for tests of the main interact loop.
 

From b7155f665a91c65365b7a82d5daeb9fdec9b0722 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:17:47 +0200
Subject: [PATCH 0744/1407] [utils][tests][dir2] Remove nose

---
 IPython/utils/tests/test_dir2.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/IPython/utils/tests/test_dir2.py b/IPython/utils/tests/test_dir2.py
index bbebf60aed8..20c601e3b86 100644
--- a/IPython/utils/tests/test_dir2.py
+++ b/IPython/utils/tests/test_dir2.py
@@ -1,4 +1,3 @@
-import nose.tools as nt
 from IPython.utils.dir2 import dir2
 
 
@@ -9,12 +8,13 @@ class Base(object):
 
 def test_base():
     res = dir2(Base())
-    assert ('x' in res)
-    assert ('z' in res)
-    assert ('y' not in res)
-    assert ('__class__' in res)
-    nt.assert_equal(res.count('x'), 1)
-    nt.assert_equal(res.count('__class__'), 1)
+    assert "x" in res
+    assert "z" in res
+    assert "y" not in res
+    assert "__class__" in res
+    assert res.count("x") == 1
+    assert res.count("__class__") == 1
+
 
 def test_SubClass():
 
@@ -22,9 +22,9 @@ class SubClass(Base):
         y = 2
 
     res = dir2(SubClass())
-    assert ('y' in res)
-    nt.assert_equal(res.count('y'), 1)
-    nt.assert_equal(res.count('x'), 1)
+    assert "y" in res
+    assert res.count("y") == 1
+    assert res.count("x") == 1
 
 
 def test_SubClass_with_trait_names_attr():

From 77e81773ca867b9e90a788a7cb3875d4dd4a5bff Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:19:30 +0200
Subject: [PATCH 0745/1407] [utils][tests][importstring] Remove nose

---
 IPython/utils/tests/test_importstring.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/IPython/utils/tests/test_importstring.py b/IPython/utils/tests/test_importstring.py
index 0c79cb3cf08..007fd0d26e5 100644
--- a/IPython/utils/tests/test_importstring.py
+++ b/IPython/utils/tests/test_importstring.py
@@ -11,7 +11,7 @@
 # Imports
 #-----------------------------------------------------------------------------
 
-import nose.tools as nt
+import pytest
 
 from IPython.utils.importstring import import_item
 
@@ -22,18 +22,19 @@
 def test_import_plain():
     "Test simple imports"
     import os
-    os2 = import_item('os')
-    nt.assert_true(os is os2)
+
+    os2 = import_item("os")
+    assert os is os2
 
 
 def test_import_nested():
     "Test nested imports from the stdlib"
     from os import path
-    path2 = import_item('os.path')
-    nt.assert_true(path is path2)
+
+    path2 = import_item("os.path")
+    assert path is path2
 
 
 def test_import_raises():
     "Test that failing imports raise the right exception"
-    nt.assert_raises(ImportError, import_item, 'IPython.foobar')
-    
+    pytest.raises(ImportError, import_item, "IPython.foobar")

From c8161eb28b10cb73eb6f8497c37a87966ce053da Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:20:04 +0200
Subject: [PATCH 0746/1407] [utils][tests][io] Remove nose

---
 IPython/utils/tests/test_io.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/IPython/utils/tests/test_io.py b/IPython/utils/tests/test_io.py
index 83367fa9e9f..fa3abab748b 100644
--- a/IPython/utils/tests/test_io.py
+++ b/IPython/utils/tests/test_io.py
@@ -11,8 +11,6 @@
 from subprocess import Popen, PIPE
 import unittest
 
-import nose.tools as nt
-
 from IPython.utils.io import IOStream, Tee, capture_output
 
 
@@ -22,7 +20,7 @@ def test_tee_simple():
     text = 'Hello'
     tee = Tee(chan, channel='stdout')
     print(text, file=chan)
-    nt.assert_equal(chan.getvalue(), text+"\n")
+    assert chan.getvalue() == text + "\n"
 
 
 class TeeTestCase(unittest.TestCase):
@@ -39,7 +37,7 @@ def tchan(self, channel):
 
         print(text, end='', file=chan)
         trap_val = trap.getvalue()
-        nt.assert_equal(chan.getvalue(), text)
+        self.assertEqual(chan.getvalue(), text)
 
         tee.close()
 
@@ -82,8 +80,8 @@ def test_capture_output(self):
         """capture_output() context works"""
         
         with capture_output() as io:
-            print('hi, stdout')
-            print('hi, stderr', file=sys.stderr)
-        
-        nt.assert_equal(io.stdout, 'hi, stdout\n')
-        nt.assert_equal(io.stderr, 'hi, stderr\n')
+            print("hi, stdout")
+            print("hi, stderr", file=sys.stderr)
+
+        self.assertEqual(io.stdout, "hi, stdout\n")
+        self.assertEqual(io.stderr, "hi, stderr\n")

From 691cde99a8f3b0ffa8837c3ca5055a6c35eea6ce Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:20:21 +0200
Subject: [PATCH 0747/1407] [utils][tests][module_paths] Remove nose

---
 IPython/utils/tests/test_module_paths.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/IPython/utils/tests/test_module_paths.py b/IPython/utils/tests/test_module_paths.py
index ef2841bb34d..12679990c0c 100644
--- a/IPython/utils/tests/test_module_paths.py
+++ b/IPython/utils/tests/test_module_paths.py
@@ -22,8 +22,6 @@
 
 import IPython.utils.module_paths as mp
 
-import nose.tools as nt
-
 TEST_FILE_PATH = Path(__file__).resolve().parent
 
 TMP_TEST_DIR = Path(tempfile.mkdtemp(suffix="with.dot"))
@@ -67,7 +65,7 @@ def test_tempdir():
     """
     Ensure the test are done with a temporary file that have a dot somewhere.
     """
-    nt.assert_in(".", str(TMP_TEST_DIR))
+    assert "." in str(TMP_TEST_DIR)
 
 
 def test_find_mod_1():
@@ -76,7 +74,7 @@ def test_find_mod_1():
     Expected output: a path to that directory's __init__.py file.
     """
     modpath = TMP_TEST_DIR / "xmod" / "__init__.py"
-    nt.assert_equal(Path(mp.find_mod("xmod")), modpath)
+    assert Path(mp.find_mod("xmod")) == modpath
 
 def test_find_mod_2():
     """
@@ -85,7 +83,7 @@ def test_find_mod_2():
     TODO: Confirm why this is a duplicate test.
     """
     modpath = TMP_TEST_DIR / "xmod" / "__init__.py"
-    nt.assert_equal(Path(mp.find_mod("xmod")), modpath)
+    assert Path(mp.find_mod("xmod")) == modpath
 
 def test_find_mod_3():
     """
@@ -93,7 +91,7 @@ def test_find_mod_3():
     Expected output: full path with .py extension.
     """
     modpath = TMP_TEST_DIR / "xmod" / "sub.py"
-    nt.assert_equal(Path(mp.find_mod("xmod.sub")), modpath)
+    assert Path(mp.find_mod("xmod.sub")) == modpath
 
 def test_find_mod_4():
     """
@@ -101,11 +99,11 @@ def test_find_mod_4():
     Expected output: full path with .py extension
     """
     modpath = TMP_TEST_DIR / "pack.py"
-    nt.assert_equal(Path(mp.find_mod("pack")), modpath)
+    assert Path(mp.find_mod("pack")) == modpath
 
 def test_find_mod_5():
     """
     Search for a filename with a .pyc extension
     Expected output: TODO: do we exclude or include .pyc files?
     """
-    nt.assert_equal(mp.find_mod("packpyc"), None)
+    assert mp.find_mod("packpyc") == None

From 9c38a13d5c95503c6007fcc6affee7b6bc18ae36 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:22:07 +0200
Subject: [PATCH 0748/1407] [utils][tests][openpy] Remove nose

---
 IPython/utils/tests/test_openpy.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/IPython/utils/tests/test_openpy.py b/IPython/utils/tests/test_openpy.py
index 9e66d43df3e..e205f06ace3 100644
--- a/IPython/utils/tests/test_openpy.py
+++ b/IPython/utils/tests/test_openpy.py
@@ -1,6 +1,5 @@
 import io
 import os.path
-import nose.tools as nt
 
 from IPython.utils import openpy
 
@@ -11,14 +10,14 @@
 def test_detect_encoding():
     with open(nonascii_path, "rb") as f:
         enc, lines = openpy.detect_encoding(f.readline)
-    nt.assert_equal(enc, "iso-8859-5")
+    assert enc == "iso-8859-5"
 
 
 def test_read_file():
     with io.open(nonascii_path, encoding="iso-8859-5") as f:
         read_specified_enc = f.read()
     read_detected_enc = openpy.read_py_file(nonascii_path, skip_encoding_cookie=False)
-    nt.assert_equal(read_detected_enc, read_specified_enc)
+    assert read_detected_enc == read_specified_enc
     assert "coding: iso-8859-5" in read_detected_enc
 
     read_strip_enc_cookie = openpy.read_py_file(
@@ -30,10 +29,10 @@ def test_read_file():
 def test_source_to_unicode():
     with io.open(nonascii_path, "rb") as f:
         source_bytes = f.read()
-    nt.assert_equal(
-        openpy.source_to_unicode(source_bytes, skip_encoding_cookie=False).splitlines(),
-        source_bytes.decode("iso-8859-5").splitlines(),
+    assert (
+        openpy.source_to_unicode(source_bytes, skip_encoding_cookie=False).splitlines()
+        == source_bytes.decode("iso-8859-5").splitlines()
     )
 
     source_no_cookie = openpy.source_to_unicode(source_bytes, skip_encoding_cookie=True)
-    nt.assert_not_in("coding: iso-8859-5", source_no_cookie)
+    assert "coding: iso-8859-5" not in source_no_cookie

From c179da012af2a93c09c388cdd0f1c423a99ba4ea Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:22:31 +0200
Subject: [PATCH 0749/1407] [utils][tests][path] Remove the use of nt

Needs more work to remove all nose related code
---
 IPython/utils/tests/test_path.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index a7be2be885d..bca72f4666e 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -15,7 +15,7 @@
 from imp import reload
 
 from nose import SkipTest, with_setup
-import nose.tools as nt
+import pytest
 
 import IPython
 from IPython import paths
@@ -155,7 +155,7 @@ def test_get_home_dir_5():
     env['HOME'] = abspath(HOME_TEST_DIR+'garbage')
     # set os.name = posix, to prevent My Documents fallback on Windows
     os.name = 'posix'
-    nt.assert_raises(path.HomeDirError, path.get_home_dir, True)
+    pytest.raises(path.HomeDirError, path.get_home_dir, True)
 
 # Should we stub wreg fully so we can run the test on all platforms?
 @skip_if_not_win32
@@ -237,8 +237,7 @@ def test_get_xdg_dir_3():
     env.pop('IPYTHONDIR', None)
     env.pop('XDG_CONFIG_HOME', None)
     cfgdir=os.path.join(path.get_home_dir(), '.config')
-    if not os.path.exists(cfgdir):
-        os.makedirs(cfgdir)
+    os.makedirs(cfgdir, exist_ok=True)
 
     assert path.get_xdg_dir() is None
 
@@ -305,15 +304,15 @@ def test_get_py_filename():
         assert path.get_py_filename("foo") == "foo.py"
     with make_tempfile("foo"):
         assert path.get_py_filename("foo") == "foo"
-        nt.assert_raises(IOError, path.get_py_filename, "foo.py")
-    nt.assert_raises(IOError, path.get_py_filename, "foo")
-    nt.assert_raises(IOError, path.get_py_filename, "foo.py")
+        pytest.raises(IOError, path.get_py_filename, "foo.py")
+    pytest.raises(IOError, path.get_py_filename, "foo")
+    pytest.raises(IOError, path.get_py_filename, "foo.py")
     true_fn = "foo with spaces.py"
     with make_tempfile(true_fn):
         assert path.get_py_filename("foo with spaces") == true_fn
         assert path.get_py_filename("foo with spaces.py") == true_fn
-        nt.assert_raises(IOError, path.get_py_filename, '"foo with spaces.py"')
-        nt.assert_raises(IOError, path.get_py_filename, "'foo with spaces.py'")
+        pytest.raises(IOError, path.get_py_filename, '"foo with spaces.py"')
+        pytest.raises(IOError, path.get_py_filename, "'foo with spaces.py'")
 
 @onlyif_unicode_paths
 def test_unicode_in_filename():
@@ -414,7 +413,7 @@ def test_ensure_dir_exists():
         path.ensure_dir_exists(d) # no-op
         f = os.path.join(td, 'ƒile')
         open(f, 'w').close() # touch
-        with nt.assert_raises(IOError):
+        with pytest.raises(IOError):
             path.ensure_dir_exists(f)
 
 class TestLinkOrCopy(unittest.TestCase):

From 88d2ced99afc77004a1fb765af0d1d4404470cd0 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:23:10 +0200
Subject: [PATCH 0750/1407] [utils][tests][process] Remove nose

---
 IPython/utils/tests/test_process.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index c53999ebd25..f4ee3859ed8 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -20,9 +20,8 @@
 import time
 from _thread import interrupt_main  # Py 3
 import threading
-from unittest import SkipTest
 
-import nose.tools as nt
+import pytest
 
 from IPython.utils.process import (find_cmd, FindCmdError, arg_split,
                                    system, getoutput, getoutputerror,
@@ -41,8 +40,8 @@
 @dec.skip_win32
 def test_find_cmd_ls():
     """Make sure we can find the full path to ls."""
-    path = find_cmd('ls')
-    nt.assert_true(path.endswith('ls'))
+    path = find_cmd("ls")
+    assert path.endswith("ls")
 
     
 def has_pywin32():
@@ -64,7 +63,7 @@ def test_find_cmd_pythonw():
             "This test runs on posix or in win32 with win32api installed")
 def test_find_cmd_fail():
     """Make sure that FindCmdError is raised if we can't find the cmd."""
-    nt.assert_raises(FindCmdError,find_cmd,'asdfasdf')
+    pytest.raises(FindCmdError, find_cmd, "asdfasdf")
 
 
 # TODO: move to pytest.mark.parametrize once nose gone
@@ -121,7 +120,7 @@ def assert_interrupts(self, command):
         Interrupt a subprocess after a second.
         """
         if threading.main_thread() != threading.current_thread():
-            raise nt.SkipTest("Can't run this test if not in main thread.")
+            raise pytest.skip("Can't run this test if not in main thread.")
 
         # Some tests can overwrite SIGINT handler (by using pdb for example),
         # which then breaks this test, so just make sure it's operating

From bd2c171ee99c7afd51b4eb7f85fd83f6b9116e57 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:23:24 +0200
Subject: [PATCH 0751/1407] [utils][tests][pycolorize] Remove nose

---
 IPython/utils/tests/test_pycolorize.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/IPython/utils/tests/test_pycolorize.py b/IPython/utils/tests/test_pycolorize.py
index c3502f32a49..178f4a98c47 100644
--- a/IPython/utils/tests/test_pycolorize.py
+++ b/IPython/utils/tests/test_pycolorize.py
@@ -17,9 +17,6 @@
 # Imports
 #-----------------------------------------------------------------------------
 
-# third party
-import nose.tools as nt
-
 from IPython.testing.decorators import skip_iptest_but_not_pytest
 
 # our own
@@ -65,7 +62,7 @@ def test_parse_sample(style):
     buf.seek(0)
     f1 = buf.read()
 
-    nt.assert_not_in("ERROR", f1)
+    assert "ERROR" not in f1
 
 
 @skip_iptest_but_not_pytest
@@ -73,4 +70,4 @@ def test_parse_error(style):
     p = Parser(style=style)
     f1 = p.format(")", "str")
     if style != "NoColor":
-        nt.assert_in("ERROR", f1)
+        assert "ERROR" in f1

From 8be458e9bb7a51d205effce5f11da84514450aea Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:24:32 +0200
Subject: [PATCH 0752/1407] [utils][tests][sysinfo] Remove nose

---
 IPython/utils/tests/test_sysinfo.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IPython/utils/tests/test_sysinfo.py b/IPython/utils/tests/test_sysinfo.py
index c3f879b32f4..23f80e4e5ff 100644
--- a/IPython/utils/tests/test_sysinfo.py
+++ b/IPython/utils/tests/test_sysinfo.py
@@ -5,7 +5,6 @@
 # Distributed under the terms of the Modified BSD License.
 
 import json
-import nose.tools as nt
 
 from IPython.utils import sysinfo
 

From 45fe9d82996fb4781a2de79bf5aecc26b0eb20ed Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:25:14 +0200
Subject: [PATCH 0753/1407] [utils][tests][text] Remove nose

---
 IPython/utils/tests/test_text.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/IPython/utils/tests/test_text.py b/IPython/utils/tests/test_text.py
index 8f9b73c167e..72660d4826c 100644
--- a/IPython/utils/tests/test_text.py
+++ b/IPython/utils/tests/test_text.py
@@ -17,9 +17,10 @@
 import random
 import sys
 
-import nose.tools as nt
 from pathlib import Path
 
+import pytest
+
 from IPython.utils import text
 
 #-----------------------------------------------------------------------------
@@ -116,8 +117,9 @@ def eval_formatter_check(f):
     assert s == ns["u"]
     # This decodes in a platform dependent manner, but it shouldn't error out
     s = f.format("{b}", **ns)
-        
-    nt.assert_raises(NameError, f.format, '{dne}', **ns)
+
+    pytest.raises(NameError, f.format, "{dne}", **ns)
+
 
 def eval_formatter_slicing_check(f):
     ns = dict(n=12, pi=math.pi, stuff='hello there', os=os)
@@ -128,7 +130,7 @@ def eval_formatter_slicing_check(f):
     s = f.format("{stuff[::2]}", **ns)
     assert s == ns["stuff"][::2]
 
-    nt.assert_raises(SyntaxError, f.format, "{n:x}", **ns)
+    pytest.raises(SyntaxError, f.format, "{n:x}", **ns)
 
 def eval_formatter_no_slicing_check(f):
     ns = dict(n=12, pi=math.pi, stuff='hello there', os=os)
@@ -194,7 +196,7 @@ def test_LSString():
     assert lss.l == ["abc", "def"]
     assert lss.s == "abc def"
     lss = text.LSString(os.getcwd())
-    nt.assert_is_instance(lss.p[0], Path)
+    assert isinstance(lss.p[0], Path)
 
 def test_SList():
     sl = text.SList(["a 11", "b 1", "a 2"])

From 01716cb9888d520ff00fe447897b14af327bd329 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 13:25:34 +0200
Subject: [PATCH 0754/1407] [utils][tests][tokenutil] Remove nose

---
 IPython/utils/tests/test_tokenutil.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/IPython/utils/tests/test_tokenutil.py b/IPython/utils/tests/test_tokenutil.py
index 46b6631da9c..406c0ae51fa 100644
--- a/IPython/utils/tests/test_tokenutil.py
+++ b/IPython/utils/tests/test_tokenutil.py
@@ -2,7 +2,6 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-import nose.tools as nt
 import pytest
 from IPython.testing.decorators import skip_iptest_but_not_pytest
 
@@ -17,13 +16,16 @@ def expect_token(expected, cell, cursor_pos):
         else:
             offset += len(line)+1
     column = cursor_pos - offset
-    line_with_cursor = '%s|%s' % (line[:column], line[column:])
-    nt.assert_equal(token, expected,
-        "Expected %r, got %r in: %r (pos %i)" % (
-        expected, token, line_with_cursor, cursor_pos)
+    line_with_cursor = "%s|%s" % (line[:column], line[column:])
+    assert token == expected, "Expected %r, got %r in: %r (pos %i)" % (
+        expected,
+        token,
+        line_with_cursor,
+        cursor_pos,
     )
 
-def test_simple(): 
+
+def test_simple():
     cell = "foo"
     for i in range(len(cell)):
         expect_token("foo", cell, i)
@@ -107,20 +109,20 @@ def test_attrs():
 def test_line_at_cursor():
     cell = ""
     (line, offset) = line_at_cursor(cell, cursor_pos=11)
-    nt.assert_equal(line, "")
-    nt.assert_equal(offset, 0)
+    assert line == ""
+    assert offset == 0
 
     # The position after a newline should be the start of the following line.
     cell = "One\nTwo\n"
     (line, offset) = line_at_cursor(cell, cursor_pos=4)
-    nt.assert_equal(line, "Two\n")
-    nt.assert_equal(offset, 4)
+    assert line == "Two\n"
+    assert offset == 4
 
     # The end of a cell should be on the last line
     cell = "pri\npri"
     (line, offset) = line_at_cursor(cell, cursor_pos=7)
-    nt.assert_equal(line, "pri")
-    nt.assert_equal(offset, 4)
+    assert line == "pri"
+    assert offset == 4
 
 
 @pytest.mark.parametrize(

From 7fb86c59f29efcdd7059459f5fd614bc9fde68e7 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sat, 23 Oct 2021 15:30:05 +0200
Subject: [PATCH 0755/1407] [utils][tests][dir2] Improve
 test_misbehaving_object_without_trait_names

---
 IPython/utils/tests/test_dir2.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/IPython/utils/tests/test_dir2.py b/IPython/utils/tests/test_dir2.py
index 20c601e3b86..d35b110e413 100644
--- a/IPython/utils/tests/test_dir2.py
+++ b/IPython/utils/tests/test_dir2.py
@@ -1,5 +1,7 @@
 from IPython.utils.dir2 import dir2
 
+import pytest
+
 
 class Base(object):
     x = 1
@@ -35,24 +37,31 @@ class SubClass(Base):
         trait_names = 44
 
     res = dir2(SubClass())
-    assert('trait_names' in res)
+    assert "trait_names" in res
 
 
 def test_misbehaving_object_without_trait_names():
     # dir2 shouldn't raise even when objects are dumb and raise
     # something other than AttribteErrors on bad getattr.
 
-    class MisbehavingGetattr(object):
-        def __getattr__(self):
+    class MisbehavingGetattr:
+        def __getattr__(self, attr):
             raise KeyError("I should be caught")
 
         def some_method(self):
-            pass
+            return True
 
     class SillierWithDir(MisbehavingGetattr):
         def __dir__(self):
             return ['some_method']
 
     for bad_klass in (MisbehavingGetattr, SillierWithDir):
-        res = dir2(bad_klass())
-        assert('some_method' in res)
+        obj = bad_klass()
+
+        assert obj.some_method()
+
+        with pytest.raises(KeyError):
+            obj.other_method()
+
+        res = dir2(obj)
+        assert "some_method" in res

From 0083c5397fafb0e1650e3b0739bc168a709d5928 Mon Sep 17 00:00:00 2001
From: "Paulo S. Costa" <pauloscosta5@gmail.com>
Date: Sun, 24 Oct 2021 07:55:06 -0700
Subject: [PATCH 0756/1407] Adhere to usage style when documenting save args

---
 IPython/core/magics/code.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index e4b85e3b6b6..1451bd56488 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -185,7 +185,7 @@ def save(self, parameter_s=''):
         """Save a set of lines or a macro to a given filename.
 
         Usage:\\
-          %save [options] filename n1-n2 n3-n4 ... n5 .. n6 ...
+          %save [options] filename [history]
 
         Options:
 
@@ -199,7 +199,7 @@ def save(self, parameter_s=''):
 
           -a: append to the file instead of overwriting it.
 
-        This function uses the same syntax as %history for input ranges,
+        The history argument uses the same syntax as %history for input ranges,
         then saves the lines to the filename you specify.
 
         If no ranges are specified, saves history of the current session up to

From ac1cb9ab7b1bc13f68a7cb979971b9ebaae93fb2 Mon Sep 17 00:00:00 2001
From: Naelson Douglas <naelson17@gmail.com>
Date: Mon, 25 Oct 2021 00:11:13 -0300
Subject: [PATCH 0757/1407] removed a name shadowing pitfall

---
 setupbase.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setupbase.py b/setupbase.py
index 7befb88bf33..e6330ea11c5 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -95,8 +95,8 @@ def find_packages():
     """
     excludes = ['deathrow', 'quarantine']
     packages = []
-    for dir,subdirs,files in os.walk('IPython'):
-        package = dir.replace(os.path.sep, '.')
+    for directory, subdirs,files in os.walk('IPython'):
+        package = directory.replace(os.path.sep, '.')
         if any(package.startswith('IPython.'+exc) for exc in excludes):
             # package is to be excluded (e.g. deathrow)
             continue

From 7c15dbcdb985ec98cdfec447e7b078c4d3f0eb86 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 25 Oct 2021 18:47:54 +0300
Subject: [PATCH 0758/1407] Mark passwd doctest example as random output

---
 IPython/lib/security.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/lib/security.py b/IPython/lib/security.py
index 91a2344eab8..152561dabad 100644
--- a/IPython/lib/security.py
+++ b/IPython/lib/security.py
@@ -48,7 +48,7 @@ def passwd(passphrase=None, algorithm='sha1'):
     Examples
     --------
     >>> passwd('mypassword')
-    'sha1:7cf3:b7d6da294ea9592a9480c8f52e63cd42cfb9dd12'
+    'sha1:7cf3:b7d6da294ea9592a9480c8f52e63cd42cfb9dd12'  # random
 
     """
     if passphrase is None:

From 1720e0629c74dd02046c02a8e6ca56c4f8a28be9 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 25 Oct 2021 18:48:25 +0300
Subject: [PATCH 0759/1407] Make OS echo example Windows-compatible

---
 IPython/testing/plugin/test_exampleip.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/testing/plugin/test_exampleip.txt b/IPython/testing/plugin/test_exampleip.txt
index 8afcbfdf7d8..96b1eae19f0 100644
--- a/IPython/testing/plugin/test_exampleip.txt
+++ b/IPython/testing/plugin/test_exampleip.txt
@@ -21,7 +21,7 @@ Another example::
 
 Just like in IPython docstrings, you can use all IPython syntax and features::
 
-    In [9]: !echo "hello"
+    In [9]: !echo hello
     hello
 
     In [10]: a='hi'

From 8f0d50b7125b1c2cf2179d33fac03da5cd715e55 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 25 Oct 2021 18:49:16 +0300
Subject: [PATCH 0760/1407] Fix escaping warning in _get_long_path_name doctest

---
 IPython/utils/path.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index b347e98ed46..273c519a004 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -33,7 +33,7 @@ def _get_long_path_name(path):
         Examples
         --------
 
-        >>> get_long_path_name('c:\\docume~1')
+        >>> get_long_path_name('c:\\\\docume~1')
         'c:\\\\Documents and Settings'
 
         """

From cee163f6d219ff013dbb9ff888baee18fb80d814 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 25 Oct 2021 18:49:50 +0300
Subject: [PATCH 0761/1407] Fix IPythonConsoleLexer doctest

---
 IPython/lib/lexers.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/IPython/lib/lexers.py b/IPython/lib/lexers.py
index 4494da56571..0c9b6e1bc7e 100644
--- a/IPython/lib/lexers.py
+++ b/IPython/lib/lexers.py
@@ -221,11 +221,9 @@ class IPythonConsoleLexer(Lexer):
             In [2]: a
             Out[2]: 'foo'
 
-            In [3]: print a
+            In [3]: print(a)
             foo
 
-            In [4]: 1 / 0
-
 
     Support is also provided for IPython exceptions:
 
@@ -234,13 +232,9 @@ class IPythonConsoleLexer(Lexer):
         .. code-block:: ipythonconsole
 
             In [1]: raise Exception
-
-            ---------------------------------------------------------------------------
-            Exception                                 Traceback (most recent call last)
-            <ipython-input-1-fca2ab0ca76b> in <module>
-            ----> 1 raise Exception
-
-            Exception:
+            Traceback (most recent call last):
+            ...
+            Exception
 
     """
     name = 'IPython console session'

From 02a8decad7e8a51d56c91e9c8294f570864d0cac Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 25 Oct 2021 18:53:41 +0300
Subject: [PATCH 0762/1407] Do not run POSIX-specific doctest on Windows

---
 IPython/testing/plugin/dtexample.py | 34 +++++++++++++++++++----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/IPython/testing/plugin/dtexample.py b/IPython/testing/plugin/dtexample.py
index d73cd246fd2..119e0a0536c 100644
--- a/IPython/testing/plugin/dtexample.py
+++ b/IPython/testing/plugin/dtexample.py
@@ -4,6 +4,9 @@
 All tests should be loaded by nose.
 """
 
+import os
+
+
 def pyfunc():
     """Some pure python tests...
 
@@ -38,18 +41,6 @@ def ipfunc():
     0 1 1 2 2 3 
 
 
-    Examples that access the operating system work:
-
-    In [1]: !echo hello
-    hello
-
-    In [2]: !echo hello > /tmp/foo_iptest
-
-    In [3]: !cat /tmp/foo_iptest
-    hello
-
-    In [4]: rm -f /tmp/foo_iptest
-
     It's OK to use '_' for the last result, but do NOT try to use IPython's
     numbered history of _NN outputs, since those won't exist under the
     doctest environment:
@@ -72,6 +63,25 @@ def ipfunc():
     return 'ipfunc'
 
 
+def ipos():
+    """Examples that access the operating system work:
+
+    In [1]: !echo hello
+    hello
+
+    In [2]: !echo hello > /tmp/foo_iptest
+
+    In [3]: !cat /tmp/foo_iptest
+    hello
+
+    In [4]: rm -f /tmp/foo_iptest
+    """
+    pass
+
+
+ipos.__skip_doctest__ = os.name == "nt"
+
+
 def ranfunc():
     """A function with some random output.
 

From 9cc2f46b8734546190eff81b9d2e13ec2f810f27 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 25 Oct 2021 18:54:04 +0300
Subject: [PATCH 0763/1407] Fix Audio doctest

---
 IPython/lib/display.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index 19d4c35383b..33d70127a71 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -69,31 +69,33 @@ class Audio(DisplayObject):
     Generate a sound
 
     >>> import numpy as np
-    ... framerate = 44100
-    ... t = np.linspace(0,5,framerate*5)
-    ... data = np.sin(2*np.pi*220*t) + np.sin(2*np.pi*224*t)
-    ... Audio(data, rate=framerate)
+    >>> framerate = 44100
+    >>> t = np.linspace(0,5,framerate*5)
+    >>> data = np.sin(2*np.pi*220*t) + np.sin(2*np.pi*224*t)
+    >>> Audio(data, rate=framerate)
+    <IPython.lib.display.Audio object>
 
     Can also do stereo or more channels
 
     >>> dataleft = np.sin(2*np.pi*220*t)
-    ... dataright = np.sin(2*np.pi*224*t)
-    ... Audio([dataleft, dataright], rate=framerate)
+    >>> dataright = np.sin(2*np.pi*224*t)
+    >>> Audio([dataleft, dataright], rate=framerate)
+    <IPython.lib.display.Audio object>
 
     From URL:
 
-    >>> Audio("http://www.nch.com.au/acm/8k16bitpcm.wav")
-    >>> Audio(url="http://www.w3schools.com/html/horse.ogg")
+    >>> Audio("http://www.nch.com.au/acm/8k16bitpcm.wav")  # doctest: +SKIP
+    >>> Audio(url="http://www.w3schools.com/html/horse.ogg")  # doctest: +SKIP
 
     From a File:
 
-    >>> Audio('/path/to/sound.wav')
-    >>> Audio(filename='/path/to/sound.ogg')
+    >>> Audio('/path/to/sound.wav')  # doctest: +SKIP
+    >>> Audio(filename='/path/to/sound.ogg')  # doctest: +SKIP
 
     From Bytes:
 
-    >>> Audio(b'RAW_WAV_DATA..')
-    >>> Audio(data=b'RAW_WAV_DATA..')
+    >>> Audio(b'RAW_WAV_DATA..')  # doctest: +SKIP
+    >>> Audio(data=b'RAW_WAV_DATA..')  # doctest: +SKIP
 
     See Also
     --------

From fda2ebeadd29608aa3e5c11f17bf836d2b1326b3 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 25 Oct 2021 18:57:42 +0300
Subject: [PATCH 0764/1407] Partly revert "remove now-obsolete use of
 skip_doctest outside core"

This partly reverts commit 02234da0d461f5ddee142d51952dc10a86b8074e.

test_decorators.py is intended to test skip_doctest, the removing was wrong.
---
 IPython/testing/tests/test_decorators.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IPython/testing/tests/test_decorators.py b/IPython/testing/tests/test_decorators.py
index dc1ff41d7da..801ac28086d 100644
--- a/IPython/testing/tests/test_decorators.py
+++ b/IPython/testing/tests/test_decorators.py
@@ -11,6 +11,7 @@
 
 # Our own
 from IPython.testing import decorators as dec
+from IPython.testing.skipdoctest import skip_doctest
 
 #-----------------------------------------------------------------------------
 # Utilities
@@ -59,6 +60,7 @@ def test_deliberately_broken2():
 
 # Verify that we can correctly skip the doctest for a function at will, but
 # that the docstring itself is NOT destroyed by the decorator.
+@skip_doctest
 def doctest_bad(x,y=1,**k):
     """A function whose doctest we need to skip.
 
@@ -106,6 +108,7 @@ class FooClass(object):
     2
     """
 
+    @skip_doctest
     def __init__(self,x):
         """Make a FooClass.
 
@@ -117,6 +120,7 @@ def __init__(self,x):
         print('Making a FooClass.')
         self.x = x
         
+    @skip_doctest
     def bar(self,y):
         """Example:
 

From b5dc5d7cc67c3b418bcc23b29b5c752e416e36f8 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 25 Oct 2021 19:18:32 +0300
Subject: [PATCH 0765/1407] ipexec: prevent output coloring under PyCharm

QOL thing that fixes test suite fails under PyCharm
---
 IPython/testing/tools.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py
index b4301f83af1..10bd4b6e0be 100644
--- a/IPython/testing/tools.py
+++ b/IPython/testing/tools.py
@@ -205,6 +205,8 @@ def ipexec(fname, options=None, commands=()):
     # should we keep suppressing warnings here, even after removing shims?
     env['PYTHONWARNINGS'] = 'ignore'
     # env.pop('PYTHONWARNINGS', None)  # Avoid extraneous warnings appearing on stderr
+    # Prevent coloring under PyCharm ("\x1b[0m" at the end of the stdout)
+    env.pop("PYCHARM_HOSTED", None)
     for k, v in env.items():
         # Debug a bizarre failure we've seen on Windows:
         # TypeError: environment can only contain strings

From 69dbfc1ced1c5a74380caaf2c126d6f9ad84c1f7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 25 Oct 2021 11:02:23 -0700
Subject: [PATCH 0766/1407] reformat previous commit

---
 setupbase.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setupbase.py b/setupbase.py
index e6330ea11c5..ac2acc069f4 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -95,9 +95,9 @@ def find_packages():
     """
     excludes = ['deathrow', 'quarantine']
     packages = []
-    for directory, subdirs,files in os.walk('IPython'):
-        package = directory.replace(os.path.sep, '.')
-        if any(package.startswith('IPython.'+exc) for exc in excludes):
+    for directory, subdirs, files in os.walk("IPython"):
+        package = directory.replace(os.path.sep, ".")
+        if any(package.startswith("IPython." + exc) for exc in excludes):
             # package is to be excluded (e.g. deathrow)
             continue
         if '__init__.py' not in files:

From 4ea65147941c1b8a6cc641bd0947ff07b728afbd Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 25 Oct 2021 21:17:21 +0300
Subject: [PATCH 0767/1407] CI: Upload coverage from Appveyor

---
 appveyor.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index fb5e59500a4..849b91aba6d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,3 +29,6 @@ install:
   - "%CMD_IN_ENV%  cd results"
 test_script:
   - "%CMD_IN_ENV%  iptest --coverage xml"
+on_finish:
+  - pip install codecov
+  - codecov -e PYTHON_VERSION PYTHON_ARCH

From e92f70490ff6ccfaf245eb942e8e40fe71e3cc64 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 25 Oct 2021 12:24:45 -0700
Subject: [PATCH 0768/1407] Set InterruptiblePdb as the default debugger.

This make sure that user can stop pdb with SigInt,
for example if you refresh your notebook while being in a debug session.
---
 IPython/core/interactiveshell.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 37b31580d9c..dc3c726f7c2 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -43,7 +43,7 @@
 from IPython.core.builtin_trap import BuiltinTrap
 from IPython.core.events import EventManager, available_events
 from IPython.core.compilerop import CachingCompiler, check_linecache_ipython
-from IPython.core.debugger import Pdb
+from IPython.core.debugger import InterruptiblePdb
 from IPython.core.display_trap import DisplayTrap
 from IPython.core.displayhook import DisplayHook
 from IPython.core.displaypub import DisplayPublisher
@@ -1832,7 +1832,7 @@ def init_history(self):
     # Things related to exception handling and tracebacks (not debugging)
     #-------------------------------------------------------------------------
 
-    debugger_cls = Pdb
+    debugger_cls = InterruptiblePdb
 
     def init_traceback_handlers(self, custom_exceptions):
         # Syntax error handler.

From a680045e7bcc95afaacee6d1c17e722be7b4ff4f Mon Sep 17 00:00:00 2001
From: L0uisJ0shua <sun-louis@hotmail.com>
Date: Wed, 27 Oct 2021 00:23:16 +0800
Subject: [PATCH 0769/1407] Added Line numbers to Error Message

---
 IPython/core/ultratb.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index c7ce562524b..29d7f1f3ed3 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -630,7 +630,7 @@ def format_record(self, frame_info):
 
         indent = ' ' * INDENT_SIZE
         em_normal = '%s\n%s%s' % (Colors.valEm, indent, ColorsNormal)
-        tpl_call = 'in %s%%s%s%%s%s' % (Colors.vName, Colors.valEm,
+        tpl_call = 'in %s%%s%s%%s%s in Line %%s' % (Colors.vName, Colors.valEm,
                                         ColorsNormal)
         tpl_call_fail = 'in %s%%s%s(***failed resolving arguments***)%s' % \
                         (Colors.vName, Colors.valEm, ColorsNormal)
@@ -641,14 +641,14 @@ def format_record(self, frame_info):
 
         func = frame_info.executing.code_qualname()
         if func == '<module>':
-            call = tpl_call % (func, '')
+            call = tpl_call % (func, '', frame_info.lineno)
         else:
             # Decide whether to include variable details or not
             var_repr = eqrepr if self.include_vars else nullrepr
             try:
                 call = tpl_call % (func, inspect.formatargvalues(args,
                                                                  varargs, varkw,
-                                                                 locals_, formatvalue=var_repr))
+                                                                 locals_, formatvalue=var_repr), frame_info.lineno)
             except KeyError:
                 # This happens in situations like errors inside generator
                 # expressions, where local variables are listed in the

From dee6e63258ffa1d731a7161b62a8e28294af8462 Mon Sep 17 00:00:00 2001
From: Julien Rabinow <randprefix.github@fastmail.com>
Date: Thu, 28 Oct 2021 01:39:42 -0700
Subject: [PATCH 0770/1407] add optional support for xdg_config|cache_dir

---
 IPython/paths.py      | 3 +--
 IPython/utils/path.py | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/IPython/paths.py b/IPython/paths.py
index a2ea5bc1159..2dcb51949e0 100644
--- a/IPython/paths.py
+++ b/IPython/paths.py
@@ -54,8 +54,7 @@ def get_ipython_dir() -> str:
                     warn(('{0} is deprecated. Move link to {1} to '
                         'get rid of this message').format(cu(xdg_ipdir), cu(ipdir)))
                 else:
-                    warn('Moving {0} to {1}'.format(cu(xdg_ipdir), cu(ipdir)))
-                    shutil.move(xdg_ipdir, ipdir)
+                    ipdir = xdg_ipdir
 
     ipdir = os.path.normpath(os.path.expanduser(ipdir))
 
diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index 273c519a004..55405cfd6cc 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -223,7 +223,7 @@ def get_xdg_dir():
 
     env = os.environ
 
-    if os.name == 'posix' and sys.platform != 'darwin':
+    if os.name == "posix":
         # Linux, Unix, AIX, etc.
         # use ~/.config if empty OR not set
         xdg = env.get("XDG_CONFIG_HOME", None) or os.path.join(get_home_dir(), '.config')
@@ -242,7 +242,7 @@ def get_xdg_cache_dir():
 
     env = os.environ
 
-    if os.name == 'posix' and sys.platform != 'darwin':
+    if os.name == "posix":
         # Linux, Unix, AIX, etc.
         # use ~/.cache if empty OR not set
         xdg = env.get("XDG_CACHE_HOME", None) or os.path.join(get_home_dir(), '.cache')

From 09e2f50debda94d4b307fe3689fd56dc30c1e2cc Mon Sep 17 00:00:00 2001
From: Adam Johnson <me@adamj.eu>
Date: Thu, 28 Oct 2021 10:16:49 +0100
Subject: [PATCH 0771/1407] Fix quick reference documentation for 'exec'

`exec` was a statement in Python 2.7, but it's a function in Python 3+.

Following the old quickref line triggers a `SyntaxError` on Python 3:

```
In [2]: exec _i1
  File "<ipython-input-12-f8fcb58cbaa6>", line 1
    exec _i1
         ^
SyntaxError: Missing parentheses in call to 'exec'
```

But it is fixed with the parentheses:

```
In [3]: exec(_i1)
```
---
 IPython/core/usage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/usage.py b/IPython/core/usage.py
index 37024c44567..53219bceb25 100644
--- a/IPython/core/usage.py
+++ b/IPython/core/usage.py
@@ -305,7 +305,7 @@
 
 _i, _ii, _iii    : Previous, next previous, next next previous input
 _i4, _ih[2:5]    : Input history line 4, lines 2-4
-exec _i81        : Execute input history line #81 again
+exec(_i81)       : Execute input history line #81 again
 %rep 81          : Edit input history line #81
 _, __, ___       : previous, next previous, next next previous output
 _dh              : Directory history

From ee3d560bb7c1a99d6b607d53607c8485a82927de Mon Sep 17 00:00:00 2001
From: Julien Rabinow <randprefix.github@fastmail.com>
Date: Thu, 28 Oct 2021 02:01:17 -0700
Subject: [PATCH 0772/1407] fix broken tests around xdg_dirs

---
 IPython/core/tests/test_paths.py | 16 ++++++----------
 IPython/utils/tests/test_path.py |  6 +++---
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/IPython/core/tests/test_paths.py b/IPython/core/tests/test_paths.py
index e5de945e944..d1366ee34ef 100644
--- a/IPython/core/tests/test_paths.py
+++ b/IPython/core/tests/test_paths.py
@@ -68,7 +68,7 @@ def test_get_ipython_dir_2():
     assert ipdir == os.path.join("someplace", ".ipython")
 
 def test_get_ipython_dir_3():
-    """test_get_ipython_dir_3, move XDG if defined, and .ipython doesn't exist."""
+    """test_get_ipython_dir_3, use XDG if defined and exists, and .ipython doesn't exist."""
     tmphome = TemporaryDirectory()
     try:
         with patch_get_home_dir(tmphome.name), \
@@ -80,10 +80,8 @@ def test_get_ipython_dir_3():
                 }), warnings.catch_warnings(record=True) as w:
             ipdir = paths.get_ipython_dir()
 
-        assert ipdir == os.path.join(tmphome.name, ".ipython")
-        if sys.platform != 'darwin':
-            assert len(w) == 1
-            assert "Moving" in str(w[0])
+        assert ipdir == os.path.join(tmphome.name, XDG_TEST_DIR, "ipython")
+        assert len(w) == 0
     finally:
         tmphome.cleanup()
 
@@ -105,10 +103,8 @@ def test_get_ipython_dir_4():
         }), warnings.catch_warnings(record=True) as w:
             ipdir = paths.get_ipython_dir()
 
-        assert ipdir == os.path.join(HOME_TEST_DIR, ".ipython")
-        if sys.platform != 'darwin':
-            assert len(w) == 1
-            assert "Ignoring" in str(w[0])
+        assert len(w) == 1
+        assert "Ignoring" in str(w[0])
 
 
 def test_get_ipython_dir_5():
@@ -179,7 +175,7 @@ def test_get_ipython_dir_8():
 
 def test_get_ipython_cache_dir():
     with modified_env({'HOME': HOME_TEST_DIR}):
-        if os.name == 'posix' and sys.platform != 'darwin':
+        if os.name == "posix":
             # test default
             os.makedirs(os.path.join(HOME_TEST_DIR, ".cache"))
             with modified_env({'XDG_CACHE_HOME': None}):
diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index bca72f4666e..2b17f031794 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -228,11 +228,11 @@ def test_get_xdg_dir_2():
 
 @with_environment
 def test_get_xdg_dir_3():
-    """test_get_xdg_dir_3, check xdg_dir not used on OS X"""
+    """test_get_xdg_dir_3, check xdg_dir not used on non-posix systems"""
     reload(path)
     path.get_home_dir = lambda : HOME_TEST_DIR
-    os.name = "posix"
-    sys.platform = "darwin"
+    os.name = "nt"
+    sys.platform = "win32"
     env.pop('IPYTHON_DIR', None)
     env.pop('IPYTHONDIR', None)
     env.pop('XDG_CONFIG_HOME', None)

From 51d01f7425742759f2e022fe903c1b68b13d4044 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Thu, 28 Oct 2021 23:28:12 +0300
Subject: [PATCH 0773/1407] TST: Restore original trace function

---
 IPython/core/tests/test_debugger.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index ab6b3cb0233..d3312853149 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -247,13 +247,19 @@ def raising_input(msg="", called=[0]):
         else:
             raise AssertionError("input() should only be called once!")
 
-    with patch.object(builtins, "input", raising_input):
-        debugger.InterruptiblePdb().set_trace()
-        # The way this test will fail is by set_trace() never exiting,
-        # resulting in a timeout by the test runner. The alternative
-        # implementation would involve a subprocess, but that adds issues with
-        # interrupting subprocesses that are rather complex, so it's simpler
-        # just to do it this way.
+    tracer_orig = sys.gettrace()
+    try:
+        with patch.object(builtins, "input", raising_input):
+            debugger.InterruptiblePdb().set_trace()
+            # The way this test will fail is by set_trace() never exiting,
+            # resulting in a timeout by the test runner. The alternative
+            # implementation would involve a subprocess, but that adds issues
+            # with interrupting subprocesses that are rather complex, so it's
+            # simpler just to do it this way.
+    finally:
+        # restore the original trace function
+        sys.settrace(tracer_orig)
+
 
 @skip_win32
 def test_xmode_skip():

From 2358ac79e4368a24506764bb8f11935a73a4899c Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Thu, 28 Oct 2021 23:28:22 +0300
Subject: [PATCH 0774/1407] CI: Collect coverage from GHA Pytest run

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0fed8344f68..8095b875843 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -34,7 +34,7 @@ jobs:
         python -m pip install --upgrade pip setuptools wheel
         python -m pip install --upgrade -e file://$PWD#egg=ipython[test]
         python -m pip install --upgrade --upgrade-strategy eager trio curio 
-        python -m pip install --upgrade pytest pytest-trio 'matplotlib!=3.2.0'
+        python -m pip install --upgrade pytest pytest-cov pytest-trio 'matplotlib!=3.2.0'
         python -m pip install --upgrade check-manifest pytest-cov anyio
     - name: Check manifest
       run: check-manifest
@@ -45,6 +45,6 @@ jobs:
         cp /tmp/.coverage ./
     - name: pytest
       run: |
-        pytest -v
+        pytest -v --cov --cov-report=xml
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v2

From 3206fcd4dbde4b23829ad8d525933dd5f3ff50b1 Mon Sep 17 00:00:00 2001
From: Erik <erihe251@student.liu.se>
Date: Fri, 29 Oct 2021 11:27:36 +0200
Subject: [PATCH 0775/1407] Import `reload` from `importlib` instead of `imp`

The `imp` module was deprecated in Python 3.4 in favor of `importlib`, and the function `imp.reload` is now just a wrapper for `importlib.reload`.
---
 IPython/extensions/autoreload.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index bcf1a198021..0e43ec61fe5 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -121,9 +121,8 @@
 import types
 import weakref
 import gc
-from importlib import import_module
+from importlib import import_module, reload
 from importlib.util import source_from_cache
-from imp import reload
 
 # ------------------------------------------------------------------------------
 # Autoreload functionality

From 74c6e32237d1aca850fe30076f36c3bda1f38757 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Oct 2021 08:03:47 -0700
Subject: [PATCH 0776/1407] Disable codecov for current patch

It is too sensitive and fails when the number of lines in a file decreases.
---
 codecov.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/codecov.yml b/codecov.yml
index 8015ac1d6fc..d65a8d9cfdf 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,5 +1,6 @@
 coverage:
   status:
+    patch: off
     project:
       default:
         target: auto

From fa30063d3e1efa917907e665d76e1fd51a528ce0 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Fri, 29 Oct 2021 18:39:46 +0300
Subject: [PATCH 0777/1407] Make knownfailureif Pytest-compatible

---
 IPython/external/decorators/_decorators.py           |  9 ++++++++-
 .../decorators/_numpy_testing_noseclasses.py         | 12 +++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/IPython/external/decorators/_decorators.py b/IPython/external/decorators/_decorators.py
index 18f847adadd..2dcf621abd9 100644
--- a/IPython/external/decorators/_decorators.py
+++ b/IPython/external/decorators/_decorators.py
@@ -133,9 +133,16 @@ def knownfail_decorator(f):
         # import time overhead at actual test-time.
         import nose
 
+        try:
+            from pytest import xfail
+        except ImportError:
+
+            def xfail():
+                raise KnownFailureTest(msg)
+
         def knownfailer(*args, **kwargs):
             if fail_condition:
-                raise KnownFailureTest(msg)
+                xfail(msg)
             else:
                 return f(*args, **kwargs)
         return nose.tools.make_decorator(f)(knownfailer)
diff --git a/IPython/external/decorators/_numpy_testing_noseclasses.py b/IPython/external/decorators/_numpy_testing_noseclasses.py
index ca6ccd87bbc..7a4360cf5b6 100644
--- a/IPython/external/decorators/_numpy_testing_noseclasses.py
+++ b/IPython/external/decorators/_numpy_testing_noseclasses.py
@@ -7,9 +7,15 @@
 
 from nose.plugins.errorclass import ErrorClass, ErrorClassPlugin
 
-class KnownFailureTest(Exception):
-    '''Raise this exception to mark a test as a known failing test.'''
-    pass
+
+try:
+    import pytest
+
+    KnownFailureTest = pytest.xfail.Exception
+except ImportError:
+
+    class KnownFailureTest(Exception):
+        """Raise this exception to mark a test as a known failing test."""
 
 
 class KnownFailure(ErrorClassPlugin):

From 6572ff13316cca1274dbf8ae366fd8f50dc4d362 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Fri, 29 Oct 2021 20:46:24 +0300
Subject: [PATCH 0778/1407] Fix onlyif_cmds_exist skip message

---
 IPython/testing/decorators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
index a2458ce13fa..3ea101ce489 100644
--- a/IPython/testing/decorators.py
+++ b/IPython/testing/decorators.py
@@ -376,7 +376,7 @@ def onlyif_cmds_exist(*commands):
     Decorator to skip test when at least one of `commands` is not found.
     """
     for cmd in commands:
-        reason = "This test runs only if command '{cmd}' is installed"
+        reason = f"This test runs only if command '{cmd}' is installed"
         if not shutil.which(cmd):
             if os.environ.get("IPTEST_WORKING_DIR", None) is not None:
                 return skip(reason)

From 595b4f4e700660dcdc32bb2622a4f8775f471039 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Fri, 29 Oct 2021 20:50:06 +0300
Subject: [PATCH 0779/1407] CI: Remove noop %CMD_IN_ENV% usage

---
 appveyor.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 849b91aba6d..d31e199868b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -22,13 +22,13 @@ init:
 
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-  - "%CMD_IN_ENV%  python -m pip install --upgrade setuptools pip"
-  - "%CMD_IN_ENV%  pip install nose coverage pytest"
-  - "%CMD_IN_ENV%  pip install .[test]"
-  - "%CMD_IN_ENV%  mkdir results"
-  - "%CMD_IN_ENV%  cd results"
+  - python -m pip install --upgrade setuptools pip
+  - pip install nose coverage pytest
+  - pip install .[test]
+  - mkdir results
+  - cd results
 test_script:
-  - "%CMD_IN_ENV%  iptest --coverage xml"
+  - iptest --coverage xml
 on_finish:
   - pip install codecov
   - codecov -e PYTHON_VERSION PYTHON_ARCH

From e00c3e75765a679860a5e6ea7f8f9b0a296a4cc1 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Fri, 29 Oct 2021 21:43:36 +0300
Subject: [PATCH 0780/1407] CI: Switch to the new codecov uploader

Apparently the python one is deprecated already
---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index d31e199868b..eda8a2d1436 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,5 +30,5 @@ install:
 test_script:
   - iptest --coverage xml
 on_finish:
-  - pip install codecov
-  - codecov -e PYTHON_VERSION PYTHON_ARCH
+  - curl -Os https://uploader.codecov.io/latest/windows/codecov.exe
+  - codecov -e PYTHON_VERSION,PYTHON_ARCH

From 56e3f69aa650fdf6df8f0ff3b22eaa967dd6f73e Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Fri, 29 Oct 2021 21:43:50 +0300
Subject: [PATCH 0781/1407] CI: Run Pytest tests on Appveyor

---
 appveyor.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index eda8a2d1436..514da8ed3a9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,12 +23,14 @@ init:
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - python -m pip install --upgrade setuptools pip
-  - pip install nose coverage pytest
+  - pip install nose coverage pytest pytest-cov pytest-trio pywin32 matplotlib
   - pip install .[test]
   - mkdir results
   - cd results
 test_script:
   - iptest --coverage xml
+  - cd ..
+  - pytest -ra --cov --cov-report=xml
 on_finish:
   - curl -Os https://uploader.codecov.io/latest/windows/codecov.exe
   - codecov -e PYTHON_VERSION,PYTHON_ARCH

From bc86e0ca39f683c3cb5df81cb2b2eb94211ccd52 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Oct 2021 14:52:13 -0700
Subject: [PATCH 0782/1407] WN 7.29

---
 docs/source/whatsnew/version7.rst | 41 +++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 990e0eb7021..02e1dc43d3a 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,47 @@
  7.x Series
 ============
 
+.. _version 7.29:
+
+IPython 7.29
+============
+
+
+IPython 7.29 brings a couple of new functionalities to IPython and a number of bugfixes.
+It is one of the largest recent release, relatively speaking, with close to 15 Pull Requests.
+
+
+- fix an issue where base64 was returned instead of bytes when showing figures :ghpull:`13162`
+- fix compatibility with PyQt6, PySide 6 :ghpull:`13172`. This may be of
+  interest if you are running on Apple Silicon as only qt6.2+ is natively
+  compatible.
+- fix matplotlib qtagg eventloop :ghpull:`13179`
+- Multiple docs fixes, typos, ... etc.
+- Debugger will now exit by default on SigInt :ghpull:`13218`, this will be
+  useful in notebook/lab if you forgot to exit the debugger. "Interrupt Kernel"
+  will now exist the debugger.
+
+It give Pdb the ability to skip code in decorators. If functions contain a
+special value names ``__debuggerskip__ = True|False``, the function will not be
+stepped into, and Pdb will step into lower frames only if the value is set to
+``False``. The exact behavior is still likely to have corner cases and will be
+refined in subsequent releases. Feedback welcome. See the debugger module
+documentation for more info. Thanks to the `D. E. Shaw
+group <https://deshaw.com/>`__ for funding this feature.
+
+The main branch of IPython is receiving a number of changes as we received a
+`NumFOCUS SDG <https://numfocus.org/programs/small-development-grants>`__
+($4800), to help us finish replacing ``nose`` by ``pytest``, and make IPython
+future proof with an 8.0 release.
+
+
+Many thanks to all the contributors to this release. You can find all individual
+contributions to this milestone `on github
+<https://github.com/ipython/ipython/milestone/92>`__.
+
+Thanks as well to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries.
+
 
 .. _version 7.28:
 

From 302ac24f2c26e43ab260028066b53fd53bf40f21 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Oct 2021 16:43:08 -0700
Subject: [PATCH 0783/1407] Fix link and try to fix list.

Though it seem like the css is broken for lists on RTD
---
 docs/source/whatsnew/version7.rst | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 02e1dc43d3a..42e12e52543 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -12,15 +12,15 @@ IPython 7.29 brings a couple of new functionalities to IPython and a number of b
 It is one of the largest recent release, relatively speaking, with close to 15 Pull Requests.
 
 
-- fix an issue where base64 was returned instead of bytes when showing figures :ghpull:`13162`
-- fix compatibility with PyQt6, PySide 6 :ghpull:`13172`. This may be of
-  interest if you are running on Apple Silicon as only qt6.2+ is natively
-  compatible.
-- fix matplotlib qtagg eventloop :ghpull:`13179`
-- Multiple docs fixes, typos, ... etc.
-- Debugger will now exit by default on SigInt :ghpull:`13218`, this will be
-  useful in notebook/lab if you forgot to exit the debugger. "Interrupt Kernel"
-  will now exist the debugger.
+ - fix an issue where base64 was returned instead of bytes when showing figures :ghpull:`13162`
+ - fix compatibility with PyQt6, PySide 6 :ghpull:`13172`. This may be of
+   interest if you are running on Apple Silicon as only qt6.2+ is natively
+   compatible.
+ - fix matplotlib qtagg eventloop :ghpull:`13179`
+ - Multiple docs fixes, typos, ... etc.
+ - Debugger will now exit by default on SigInt :ghpull:`13218`, this will be
+   useful in notebook/lab if you forgot to exit the debugger. "Interrupt Kernel"
+   will now exist the debugger.
 
 It give Pdb the ability to skip code in decorators. If functions contain a
 special value names ``__debuggerskip__ = True|False``, the function will not be
@@ -38,7 +38,7 @@ future proof with an 8.0 release.
 
 Many thanks to all the contributors to this release. You can find all individual
 contributions to this milestone `on github
-<https://github.com/ipython/ipython/milestone/92>`__.
+<https://github.com/ipython/ipython/milestone/93>`__.
 
 Thanks as well to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
 work on IPython and related libraries.

From 7c02362387842d9cdf8000ec2abecdec56687fb5 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Oct 2021 17:02:52 -0700
Subject: [PATCH 0784/1407] Update what's of of older IPython (forgotten)

---
 .../enable-to-add-extra-attrs-to-iframe.rst   | 38 -------------
 .../whatsnew/pr/pastebin-expiry-days.rst      |  7 ---
 docs/source/whatsnew/version7.rst             | 53 +++++++++++++++++++
 3 files changed, 53 insertions(+), 45 deletions(-)
 delete mode 100644 docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst
 delete mode 100644 docs/source/whatsnew/pr/pastebin-expiry-days.rst

diff --git a/docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst b/docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst
deleted file mode 100644
index 1954bc439b8..00000000000
--- a/docs/source/whatsnew/pr/enable-to-add-extra-attrs-to-iframe.rst
+++ /dev/null
@@ -1,38 +0,0 @@
-``YouTubeVideo`` autoplay and the ability to add extra attributes to ``IFrame``
-===============================================================================
-
-You can add any extra attributes to the ``<iframe>`` tag using the new
-``extras`` argument in the ``IFrame`` class. For example::
-
-    In [1]: from IPython.display import IFrame
-
-    In [2]: IFrame(src="src", width=300, height=300, extras=['loading="eager"'])
-
-The above cells will result in the following HTML code being displayed in a
-notebook::
-
-    <iframe
-        width="300"
-        height="300"
-        src="src"
-        frameborder="0"
-        allowfullscreen
-        loading="eager"
-    ></iframe>
-
-Related to the above, the ``YouTubeVideo`` class now takes an
-``allow_autoplay`` flag, which sets up the iframe of the embedded YouTube video
-such that it allows autoplay.
-
-.. note::
-    Whether this works depends on the autoplay policy of the browser rendering
-    the HTML allowing it. It also could get blocked by some browser extensions.
-
-Try it out!
-::
-
-    In [1]: from IPython.display import YouTubeVideo
-
-    In [2]: YouTubeVideo("dQw4w9WgXcQ", allow_autoplay=True)
-
-🙃
diff --git a/docs/source/whatsnew/pr/pastebin-expiry-days.rst b/docs/source/whatsnew/pr/pastebin-expiry-days.rst
deleted file mode 100644
index 68faa7851f8..00000000000
--- a/docs/source/whatsnew/pr/pastebin-expiry-days.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Pastebin magic expiry days option
-=================================
-
-The Pastebin magic now has ``-e`` option to determine 
-the number of days for paste expiration. For example
-the paste that created with ``%pastebin -e 20 1`` magic will
-be available for next 20 days.
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 42e12e52543..20fa0397220 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -80,6 +80,49 @@ New Features:
  - Reword the YouTubeVideo autoplay WN :ghpull:`13147`
 
 
+Highlighted features
+--------------------
+
+
+``YouTubeVideo`` autoplay and the ability to add extra attributes to ``IFrame``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can add any extra attributes to the ``<iframe>`` tag using the new
+``extras`` argument in the ``IFrame`` class. For example::
+
+    In [1]: from IPython.display import IFrame
+
+    In [2]: IFrame(src="src", width=300, height=300, extras=['loading="eager"'])
+
+The above cells will result in the following HTML code being displayed in a
+notebook::
+
+    <iframe
+        width="300"
+        height="300"
+        src="src"
+        frameborder="0"
+        allowfullscreen
+        loading="eager"
+    ></iframe>
+
+Related to the above, the ``YouTubeVideo`` class now takes an
+``allow_autoplay`` flag, which sets up the iframe of the embedded YouTube video
+such that it allows autoplay.
+
+.. note::
+    Whether this works depends on the autoplay policy of the browser rendering
+    the HTML allowing it. It also could get blocked by some browser extensions.
+
+Try it out!
+::
+
+    In [1]: from IPython.display import YouTubeVideo
+
+    In [2]: YouTubeVideo("dQw4w9WgXcQ", allow_autoplay=True)
+
+
+
 Thanks
 ------
 
@@ -137,6 +180,16 @@ Of particular interest are the following Pull-requests:
    :ghpull:`13056`
  - Make Ipython.utils.timing work with jupyterlite :ghpull:`13050`.
 
+Pastebin magic expiry days option
+---------------------------------
+
+The Pastebin magic now has ``-e`` option to determine 
+the number of days for paste expiration. For example
+the paste that created with ``%pastebin -e 20 1`` magic will
+be available for next 20 days.
+
+
+
 
 
 Thanks

From f2a1048624a82a98cf4540cbf471e141840f4a6a Mon Sep 17 00:00:00 2001
From: Arthur Moreira <moreirarthur96@gmail.com>
Date: Fri, 29 Oct 2021 21:28:22 -0300
Subject: [PATCH 0785/1407] Add line number to error messages

---
 IPython/core/ultratb.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index c7ce562524b..8bc7105c321 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -630,10 +630,10 @@ def format_record(self, frame_info):
 
         indent = ' ' * INDENT_SIZE
         em_normal = '%s\n%s%s' % (Colors.valEm, indent, ColorsNormal)
-        tpl_call = 'in %s%%s%s%%s%s' % (Colors.vName, Colors.valEm,
+        tpl_call = 'line %s, in %s%%s%s%%s%s' % (frame_info.lineno, Colors.vName, Colors.valEm,
                                         ColorsNormal)
-        tpl_call_fail = 'in %s%%s%s(***failed resolving arguments***)%s' % \
-                        (Colors.vName, Colors.valEm, ColorsNormal)
+        tpl_call_fail = 'line %s, in %s%%s%s(***failed resolving arguments***)%s' % \
+                        (frame_info.lineno, Colors.vName, Colors.valEm, ColorsNormal)
         tpl_name_val = '%%s %s= %%s%s' % (Colors.valEm, ColorsNormal)
 
         link = _format_filename(frame_info.filename, Colors.filenameEm, ColorsNormal)

From c177aef56af7c68a3ea49e20b5ec90af2277b1a4 Mon Sep 17 00:00:00 2001
From: Arthur Moreira <moreirarthur96@gmail.com>
Date: Fri, 29 Oct 2021 21:52:29 -0300
Subject: [PATCH 0786/1407] Running darker to format changes

---
 IPython/core/ultratb.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 8bc7105c321..cf836a25908 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -628,13 +628,21 @@ def format_record(self, frame_info):
             return '    %s[... skipping similar frames: %s]%s\n' % (
                 Colors.excName, frame_info.description, ColorsNormal)
 
-        indent = ' ' * INDENT_SIZE
-        em_normal = '%s\n%s%s' % (Colors.valEm, indent, ColorsNormal)
-        tpl_call = 'line %s, in %s%%s%s%%s%s' % (frame_info.lineno, Colors.vName, Colors.valEm,
-                                        ColorsNormal)
-        tpl_call_fail = 'line %s, in %s%%s%s(***failed resolving arguments***)%s' % \
-                        (frame_info.lineno, Colors.vName, Colors.valEm, ColorsNormal)
-        tpl_name_val = '%%s %s= %%s%s' % (Colors.valEm, ColorsNormal)
+        indent = " " * INDENT_SIZE
+        em_normal = "%s\n%s%s" % (Colors.valEm, indent, ColorsNormal)
+        tpl_call = "line %s, in %s%%s%s%%s%s" % (
+            frame_info.lineno,
+            Colors.vName,
+            Colors.valEm,
+            ColorsNormal,
+        )
+        tpl_call_fail = "line %s, in %s%%s%s(***failed resolving arguments***)%s" % (
+            frame_info.lineno,
+            Colors.vName,
+            Colors.valEm,
+            ColorsNormal,
+        )
+        tpl_name_val = "%%s %s= %%s%s" % (Colors.valEm, ColorsNormal)
 
         link = _format_filename(frame_info.filename, Colors.filenameEm, ColorsNormal)
         args, varargs, varkw, locals_ = inspect.getargvalues(frame_info.frame)

From 92296e1c40367166d8b99b0d4e383920c5e02de9 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sun, 31 Oct 2021 17:38:49 +0300
Subject: [PATCH 0787/1407] test_completer tests resurrection

* Class in class tests never was a thing.
* Generating methods seems to not work even in nose, they report no coverage.
* Installed pandas in CI to run test_dataframe_key_completion
---
 .github/workflows/test.yml           |  2 +-
 IPython/core/tests/test_completer.py | 64 ++++++++++++++++------------
 appveyor.yml                         |  2 +-
 3 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8095b875843..0704f376b94 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -34,7 +34,7 @@ jobs:
         python -m pip install --upgrade pip setuptools wheel
         python -m pip install --upgrade -e file://$PWD#egg=ipython[test]
         python -m pip install --upgrade --upgrade-strategy eager trio curio 
-        python -m pip install --upgrade pytest pytest-cov pytest-trio 'matplotlib!=3.2.0'
+        python -m pip install --upgrade pytest pytest-cov pytest-trio 'matplotlib!=3.2.0' pandas
         python -m pip install --upgrade check-manifest pytest-cov anyio
     - name: Check manifest
       run: check-manifest
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 319bc2da08e..b39818dc80d 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -328,20 +328,18 @@ def test_no_ascii_back_completion(self):
                 name, matches = ip.complete("\\" + letter)
                 self.assertEqual(matches, [])
 
-    class CompletionSplitterTestCase(unittest.TestCase):
-        def setUp(self):
-            self.sp = completer.CompletionSplitter()
-
-        def test_delim_setting(self):
-            self.sp.delims = " "
-            self.assertEqual(self.sp.delims, " ")
-            self.assertEqual(self.sp._delim_expr, r"[\ ]")
-
-        def test_spaces(self):
-            """Test with only spaces as split chars."""
-            self.sp.delims = " "
-            t = [("foo", "", "foo"), ("run foo", "", "foo"), ("run foo", "bar", "foo")]
-            check_line_split(self.sp, t)
+    def test_delim_setting(self):
+        sp = completer.CompletionSplitter()
+        sp.delims = " "
+        self.assertEqual(sp.delims, " ")
+        self.assertEqual(sp._delim_expr, r"[\ ]")
+
+    def test_spaces(self):
+        """Test with only spaces as split chars."""
+        sp = completer.CompletionSplitter()
+        sp.delims = " "
+        t = [("foo", "", "foo"), ("run foo", "", "foo"), ("run foo", "bar", "foo")]
+        check_line_split(sp, t)
 
     def test_has_open_quotes1(self):
         for s in ["'", "'''", "'hi' '"]:
@@ -462,7 +460,7 @@ def _test_complete(reason, s, comp, start=None, end=None):
                 ip.Completer.use_jedi = True
                 completions = set(ip.Completer.completions(s, l))
                 ip.Completer.use_jedi = False
-                assert_in(Completion(start, end, comp), completions, reason)
+                assert Completion(start, end, comp) in completions, reason
 
         def _test_not_complete(reason, s, comp):
             l = len(s)
@@ -470,18 +468,18 @@ def _test_not_complete(reason, s, comp):
                 ip.Completer.use_jedi = True
                 completions = set(ip.Completer.completions(s, l))
                 ip.Completer.use_jedi = False
-                assert_not_in(Completion(l, l, comp), completions, reason)
+                assert Completion(l, l, comp) not in completions, reason
 
         import jedi
 
         jedi_version = tuple(int(i) for i in jedi.__version__.split(".")[:3])
         if jedi_version > (0, 10):
-            yield _test_complete, "jedi >0.9 should complete and not crash", "a=1;a.", "real"
-        yield _test_complete, "can infer first argument", 'a=(1,"foo");a[0].', "real"
-        yield _test_complete, "can infer second argument", 'a=(1,"foo");a[1].', "capitalize"
-        yield _test_complete, "cover duplicate completions", "im", "import", 0, 2
+            _test_complete("jedi >0.9 should complete and not crash", "a=1;a.", "real")
+        _test_complete("can infer first argument", 'a=(1,"foo");a[0].', "real")
+        _test_complete("can infer second argument", 'a=(1,"foo");a[1].', "capitalize")
+        _test_complete("cover duplicate completions", "im", "import", 0, 2)
 
-        yield _test_not_complete, "does not mix types", 'a=(1,"foo");a[0].', "capitalize"
+        _test_not_complete("does not mix types", 'a=(1,"foo");a[0].', "capitalize")
 
     def test_completion_have_signature(self):
         """
@@ -548,15 +546,27 @@ def _(line, cursor_pos, expect, message, completion):
                 self.assertIn(completion, completions)
 
         with provisionalcompleter():
-            yield _, "a[0].", 5, "a[0].real", "Should have completed on a[0].: %s", Completion(
-                5, 5, "real"
+            _(
+                "a[0].",
+                5,
+                "a[0].real",
+                "Should have completed on a[0].: %s",
+                Completion(5, 5, "real"),
             )
-            yield _, "a[0].r", 6, "a[0].real", "Should have completed on a[0].r: %s", Completion(
-                5, 6, "real"
+            _(
+                "a[0].r",
+                6,
+                "a[0].real",
+                "Should have completed on a[0].r: %s",
+                Completion(5, 6, "real"),
             )
 
-            yield _, "a[0].from_", 10, "a[0].from_bytes", "Should have completed on a[0].from_: %s", Completion(
-                5, 10, "from_bytes"
+            _(
+                "a[0].from_",
+                10,
+                "a[0].from_bytes",
+                "Should have completed on a[0].from_: %s",
+                Completion(5, 10, "from_bytes"),
             )
 
     def test_omit__names(self):
diff --git a/appveyor.yml b/appveyor.yml
index 514da8ed3a9..031ba7f6973 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,7 +23,7 @@ init:
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - python -m pip install --upgrade setuptools pip
-  - pip install nose coverage pytest pytest-cov pytest-trio pywin32 matplotlib
+  - pip install nose coverage pytest pytest-cov pytest-trio pywin32 matplotlib pandas
   - pip install .[test]
   - mkdir results
   - cd results

From ca9ff08faab633cfca5c74b3b70cd7ce44e3d399 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sun, 31 Oct 2021 00:37:03 +0300
Subject: [PATCH 0788/1407] Fix xfail polyfill signature

---
 IPython/external/decorators/_decorators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/external/decorators/_decorators.py b/IPython/external/decorators/_decorators.py
index 2dcf621abd9..308652febcc 100644
--- a/IPython/external/decorators/_decorators.py
+++ b/IPython/external/decorators/_decorators.py
@@ -137,7 +137,7 @@ def knownfail_decorator(f):
             from pytest import xfail
         except ImportError:
 
-            def xfail():
+            def xfail(msg):
                 raise KnownFailureTest(msg)
 
         def knownfailer(*args, **kwargs):

From b2d195e33ddbd38ca5de2c360345315406c266ce Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sun, 31 Oct 2021 00:38:14 +0300
Subject: [PATCH 0789/1407] CI: Colorize and widen Pytest summary

Pytest shows some error messages only in summary while also truncating lines there.
---
 .github/workflows/test.yml | 4 +++-
 appveyor.yml               | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0704f376b94..1a99ac62426 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -44,7 +44,9 @@ jobs:
         cp /tmp/ipy_coverage.xml ./
         cp /tmp/.coverage ./
     - name: pytest
+      env:
+        COLUMNS: 120
       run: |
-        pytest -v --cov --cov-report=xml
+        pytest --color=yes -v --cov --cov-report=xml
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v2
diff --git a/appveyor.yml b/appveyor.yml
index 031ba7f6973..26df940d77e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,6 +3,9 @@ matrix:
   fast_finish: true     # immediately finish build once one of the jobs fails.
 
 environment:
+  global:
+    COLUMNS: 120  # Appveyor web viwer window width is 130 chars
+
   matrix:
 
    - PYTHON: "C:\\Python37-x64"
@@ -30,7 +33,7 @@ install:
 test_script:
   - iptest --coverage xml
   - cd ..
-  - pytest -ra --cov --cov-report=xml
+  - pytest --color=yes -ra --cov --cov-report=xml
 on_finish:
   - curl -Os https://uploader.codecov.io/latest/windows/codecov.exe
   - codecov -e PYTHON_VERSION,PYTHON_ARCH

From 8a04efadf7e4cd7ced49f78a169de8c4cb2db75a Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 1 Nov 2021 20:10:41 +0300
Subject: [PATCH 0790/1407] Remove unused _find_cmd

It was replaced with shutil/py3compat.which in f42c9edb152ac392caa39fe9e50373ef0ec42a55
---
 IPython/utils/_process_cli.py   |  8 --------
 IPython/utils/_process_posix.py |  8 --------
 IPython/utils/_process_win32.py | 21 ---------------------
 3 files changed, 37 deletions(-)

diff --git a/IPython/utils/_process_cli.py b/IPython/utils/_process_cli.py
index 89a31c31643..03b2ecc7997 100644
--- a/IPython/utils/_process_cli.py
+++ b/IPython/utils/_process_cli.py
@@ -22,14 +22,6 @@
 from IPython.utils import py3compat
 from ._process_common import arg_split
 
-def _find_cmd(cmd):
-    """Find the full path to a command using which."""
-    paths = System.Environment.GetEnvironmentVariable("PATH").Split(os.pathsep)
-    for path in paths:
-        filename = os.path.join(path, cmd)
-        if System.IO.File.Exists(filename):
-            return py3compat.decode(filename)
-    raise OSError("command %r not found" % cmd)
 
 def system(cmd):
     """
diff --git a/IPython/utils/_process_posix.py b/IPython/utils/_process_posix.py
index a9b0e2182c0..5f6b1ab200f 100644
--- a/IPython/utils/_process_posix.py
+++ b/IPython/utils/_process_posix.py
@@ -31,14 +31,6 @@
 # Function definitions
 #-----------------------------------------------------------------------------
 
-def _find_cmd(cmd):
-    """Find the full path to a command using which."""
-
-    path = sp.Popen(['/usr/bin/env', 'which', cmd],
-                    stdout=sp.PIPE, stderr=sp.PIPE).communicate()[0]
-    return py3compat.decode(path)
-
-
 class ProcessHandler(object):
     """Execute subprocesses under the control of pexpect.
     """
diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py
index 2f072a8779e..36fb092d7b2 100644
--- a/IPython/utils/_process_win32.py
+++ b/IPython/utils/_process_win32.py
@@ -71,27 +71,6 @@ def __exit__(self, exc_type, exc_value, traceback):
             os.chdir(self.path)
 
 
-def _find_cmd(cmd):
-    """Find the full path to a .bat or .exe using the win32api module."""
-    try:
-        from win32api import SearchPath
-    except ImportError as e:
-        raise ImportError('you need to have pywin32 installed for this to work') from e
-    else:
-        PATH = os.environ['PATH']
-        extensions = ['.exe', '.com', '.bat', '.py']
-        path = None
-        for ext in extensions:
-            try:
-                path = SearchPath(PATH, cmd, ext)[0]
-            except:
-                pass
-        if path is None:
-            raise OSError("command %r not found" % cmd)
-        else:
-            return path
-
-
 def _system_body(p):
     """Callback for _system."""
     enc = DEFAULT_ENCODING

From bb11d0f597a32eab43987a2eb5b391c308f3ae7f Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Tue, 2 Nov 2021 19:16:25 +0300
Subject: [PATCH 0791/1407] Pytest ipdoctest plugin base

This is a copy of Pytest doctest.py without any changes.
---
 IPython/testing/plugin/pytest_ipdoctest.py | 724 +++++++++++++++++++++
 1 file changed, 724 insertions(+)
 create mode 100644 IPython/testing/plugin/pytest_ipdoctest.py

diff --git a/IPython/testing/plugin/pytest_ipdoctest.py b/IPython/testing/plugin/pytest_ipdoctest.py
new file mode 100644
index 00000000000..64e8f0e0eee
--- /dev/null
+++ b/IPython/testing/plugin/pytest_ipdoctest.py
@@ -0,0 +1,724 @@
+"""Discover and run doctests in modules and test files."""
+import bdb
+import inspect
+import platform
+import sys
+import traceback
+import types
+import warnings
+from contextlib import contextmanager
+from typing import Any
+from typing import Callable
+from typing import Dict
+from typing import Generator
+from typing import Iterable
+from typing import List
+from typing import Optional
+from typing import Pattern
+from typing import Sequence
+from typing import Tuple
+from typing import Type
+from typing import TYPE_CHECKING
+from typing import Union
+
+import py.path
+
+import pytest
+from _pytest import outcomes
+from _pytest._code.code import ExceptionInfo
+from _pytest._code.code import ReprFileLocation
+from _pytest._code.code import TerminalRepr
+from _pytest._io import TerminalWriter
+from _pytest.compat import safe_getattr
+from _pytest.config import Config
+from _pytest.config.argparsing import Parser
+from _pytest.fixtures import FixtureRequest
+from _pytest.nodes import Collector
+from _pytest.outcomes import OutcomeException
+from _pytest.pathlib import import_path
+from _pytest.python_api import approx
+from _pytest.warning_types import PytestWarning
+
+if TYPE_CHECKING:
+    import doctest
+
+DOCTEST_REPORT_CHOICE_NONE = "none"
+DOCTEST_REPORT_CHOICE_CDIFF = "cdiff"
+DOCTEST_REPORT_CHOICE_NDIFF = "ndiff"
+DOCTEST_REPORT_CHOICE_UDIFF = "udiff"
+DOCTEST_REPORT_CHOICE_ONLY_FIRST_FAILURE = "only_first_failure"
+
+DOCTEST_REPORT_CHOICES = (
+    DOCTEST_REPORT_CHOICE_NONE,
+    DOCTEST_REPORT_CHOICE_CDIFF,
+    DOCTEST_REPORT_CHOICE_NDIFF,
+    DOCTEST_REPORT_CHOICE_UDIFF,
+    DOCTEST_REPORT_CHOICE_ONLY_FIRST_FAILURE,
+)
+
+# Lazy definition of runner class
+RUNNER_CLASS = None
+# Lazy definition of output checker class
+CHECKER_CLASS: Optional[Type["doctest.OutputChecker"]] = None
+
+
+def pytest_addoption(parser: Parser) -> None:
+    parser.addini(
+        "doctest_optionflags",
+        "option flags for doctests",
+        type="args",
+        default=["ELLIPSIS"],
+    )
+    parser.addini(
+        "doctest_encoding", "encoding used for doctest files", default="utf-8"
+    )
+    group = parser.getgroup("collect")
+    group.addoption(
+        "--doctest-modules",
+        action="store_true",
+        default=False,
+        help="run doctests in all .py modules",
+        dest="doctestmodules",
+    )
+    group.addoption(
+        "--doctest-report",
+        type=str.lower,
+        default="udiff",
+        help="choose another output format for diffs on doctest failure",
+        choices=DOCTEST_REPORT_CHOICES,
+        dest="doctestreport",
+    )
+    group.addoption(
+        "--doctest-glob",
+        action="append",
+        default=[],
+        metavar="pat",
+        help="doctests file matching pattern, default: test*.txt",
+        dest="doctestglob",
+    )
+    group.addoption(
+        "--doctest-ignore-import-errors",
+        action="store_true",
+        default=False,
+        help="ignore doctest ImportErrors",
+        dest="doctest_ignore_import_errors",
+    )
+    group.addoption(
+        "--doctest-continue-on-failure",
+        action="store_true",
+        default=False,
+        help="for a given doctest, continue to run after the first failure",
+        dest="doctest_continue_on_failure",
+    )
+
+
+def pytest_unconfigure() -> None:
+    global RUNNER_CLASS
+
+    RUNNER_CLASS = None
+
+
+def pytest_collect_file(
+    path: py.path.local, parent: Collector,
+) -> Optional[Union["DoctestModule", "DoctestTextfile"]]:
+    config = parent.config
+    if path.ext == ".py":
+        if config.option.doctestmodules and not _is_setup_py(path):
+            mod: DoctestModule = DoctestModule.from_parent(parent, fspath=path)
+            return mod
+    elif _is_doctest(config, path, parent):
+        txt: DoctestTextfile = DoctestTextfile.from_parent(parent, fspath=path)
+        return txt
+    return None
+
+
+def _is_setup_py(path: py.path.local) -> bool:
+    if path.basename != "setup.py":
+        return False
+    contents = path.read_binary()
+    return b"setuptools" in contents or b"distutils" in contents
+
+
+def _is_doctest(config: Config, path: py.path.local, parent) -> bool:
+    if path.ext in (".txt", ".rst") and parent.session.isinitpath(path):
+        return True
+    globs = config.getoption("doctestglob") or ["test*.txt"]
+    for glob in globs:
+        if path.check(fnmatch=glob):
+            return True
+    return False
+
+
+class ReprFailDoctest(TerminalRepr):
+    def __init__(
+        self, reprlocation_lines: Sequence[Tuple[ReprFileLocation, Sequence[str]]]
+    ) -> None:
+        self.reprlocation_lines = reprlocation_lines
+
+    def toterminal(self, tw: TerminalWriter) -> None:
+        for reprlocation, lines in self.reprlocation_lines:
+            for line in lines:
+                tw.line(line)
+            reprlocation.toterminal(tw)
+
+
+class MultipleDoctestFailures(Exception):
+    def __init__(self, failures: Sequence["doctest.DocTestFailure"]) -> None:
+        super().__init__()
+        self.failures = failures
+
+
+def _init_runner_class() -> Type["doctest.DocTestRunner"]:
+    import doctest
+
+    class PytestDoctestRunner(doctest.DebugRunner):
+        """Runner to collect failures.
+
+        Note that the out variable in this case is a list instead of a
+        stdout-like object.
+        """
+
+        def __init__(
+            self,
+            checker: Optional["doctest.OutputChecker"] = None,
+            verbose: Optional[bool] = None,
+            optionflags: int = 0,
+            continue_on_failure: bool = True,
+        ) -> None:
+            doctest.DebugRunner.__init__(
+                self, checker=checker, verbose=verbose, optionflags=optionflags
+            )
+            self.continue_on_failure = continue_on_failure
+
+        def report_failure(
+            self, out, test: "doctest.DocTest", example: "doctest.Example", got: str,
+        ) -> None:
+            failure = doctest.DocTestFailure(test, example, got)
+            if self.continue_on_failure:
+                out.append(failure)
+            else:
+                raise failure
+
+        def report_unexpected_exception(
+            self,
+            out,
+            test: "doctest.DocTest",
+            example: "doctest.Example",
+            exc_info: Tuple[Type[BaseException], BaseException, types.TracebackType],
+        ) -> None:
+            if isinstance(exc_info[1], OutcomeException):
+                raise exc_info[1]
+            if isinstance(exc_info[1], bdb.BdbQuit):
+                outcomes.exit("Quitting debugger")
+            failure = doctest.UnexpectedException(test, example, exc_info)
+            if self.continue_on_failure:
+                out.append(failure)
+            else:
+                raise failure
+
+    return PytestDoctestRunner
+
+
+def _get_runner(
+    checker: Optional["doctest.OutputChecker"] = None,
+    verbose: Optional[bool] = None,
+    optionflags: int = 0,
+    continue_on_failure: bool = True,
+) -> "doctest.DocTestRunner":
+    # We need this in order to do a lazy import on doctest
+    global RUNNER_CLASS
+    if RUNNER_CLASS is None:
+        RUNNER_CLASS = _init_runner_class()
+    # Type ignored because the continue_on_failure argument is only defined on
+    # PytestDoctestRunner, which is lazily defined so can't be used as a type.
+    return RUNNER_CLASS(  # type: ignore
+        checker=checker,
+        verbose=verbose,
+        optionflags=optionflags,
+        continue_on_failure=continue_on_failure,
+    )
+
+
+class DoctestItem(pytest.Item):
+    def __init__(
+        self,
+        name: str,
+        parent: "Union[DoctestTextfile, DoctestModule]",
+        runner: Optional["doctest.DocTestRunner"] = None,
+        dtest: Optional["doctest.DocTest"] = None,
+    ) -> None:
+        super().__init__(name, parent)
+        self.runner = runner
+        self.dtest = dtest
+        self.obj = None
+        self.fixture_request: Optional[FixtureRequest] = None
+
+    @classmethod
+    def from_parent(  # type: ignore
+        cls,
+        parent: "Union[DoctestTextfile, DoctestModule]",
+        *,
+        name: str,
+        runner: "doctest.DocTestRunner",
+        dtest: "doctest.DocTest",
+    ):
+        # incompatible signature due to to imposed limits on sublcass
+        """The public named constructor."""
+        return super().from_parent(name=name, parent=parent, runner=runner, dtest=dtest)
+
+    def setup(self) -> None:
+        if self.dtest is not None:
+            self.fixture_request = _setup_fixtures(self)
+            globs = dict(getfixture=self.fixture_request.getfixturevalue)
+            for name, value in self.fixture_request.getfixturevalue(
+                "doctest_namespace"
+            ).items():
+                globs[name] = value
+            self.dtest.globs.update(globs)
+
+    def runtest(self) -> None:
+        assert self.dtest is not None
+        assert self.runner is not None
+        _check_all_skipped(self.dtest)
+        self._disable_output_capturing_for_darwin()
+        failures: List["doctest.DocTestFailure"] = []
+        # Type ignored because we change the type of `out` from what
+        # doctest expects.
+        self.runner.run(self.dtest, out=failures)  # type: ignore[arg-type]
+        if failures:
+            raise MultipleDoctestFailures(failures)
+
+    def _disable_output_capturing_for_darwin(self) -> None:
+        """Disable output capturing. Otherwise, stdout is lost to doctest (#985)."""
+        if platform.system() != "Darwin":
+            return
+        capman = self.config.pluginmanager.getplugin("capturemanager")
+        if capman:
+            capman.suspend_global_capture(in_=True)
+            out, err = capman.read_global_capture()
+            sys.stdout.write(out)
+            sys.stderr.write(err)
+
+    # TODO: Type ignored -- breaks Liskov Substitution.
+    def repr_failure(  # type: ignore[override]
+        self, excinfo: ExceptionInfo[BaseException],
+    ) -> Union[str, TerminalRepr]:
+        import doctest
+
+        failures: Optional[
+            Sequence[Union[doctest.DocTestFailure, doctest.UnexpectedException]]
+        ] = (None)
+        if isinstance(
+            excinfo.value, (doctest.DocTestFailure, doctest.UnexpectedException)
+        ):
+            failures = [excinfo.value]
+        elif isinstance(excinfo.value, MultipleDoctestFailures):
+            failures = excinfo.value.failures
+
+        if failures is not None:
+            reprlocation_lines = []
+            for failure in failures:
+                example = failure.example
+                test = failure.test
+                filename = test.filename
+                if test.lineno is None:
+                    lineno = None
+                else:
+                    lineno = test.lineno + example.lineno + 1
+                message = type(failure).__name__
+                # TODO: ReprFileLocation doesn't expect a None lineno.
+                reprlocation = ReprFileLocation(filename, lineno, message)  # type: ignore[arg-type]
+                checker = _get_checker()
+                report_choice = _get_report_choice(
+                    self.config.getoption("doctestreport")
+                )
+                if lineno is not None:
+                    assert failure.test.docstring is not None
+                    lines = failure.test.docstring.splitlines(False)
+                    # add line numbers to the left of the error message
+                    assert test.lineno is not None
+                    lines = [
+                        "%03d %s" % (i + test.lineno + 1, x)
+                        for (i, x) in enumerate(lines)
+                    ]
+                    # trim docstring error lines to 10
+                    lines = lines[max(example.lineno - 9, 0) : example.lineno + 1]
+                else:
+                    lines = [
+                        "EXAMPLE LOCATION UNKNOWN, not showing all tests of that example"
+                    ]
+                    indent = ">>>"
+                    for line in example.source.splitlines():
+                        lines.append(f"??? {indent} {line}")
+                        indent = "..."
+                if isinstance(failure, doctest.DocTestFailure):
+                    lines += checker.output_difference(
+                        example, failure.got, report_choice
+                    ).split("\n")
+                else:
+                    inner_excinfo = ExceptionInfo(failure.exc_info)
+                    lines += ["UNEXPECTED EXCEPTION: %s" % repr(inner_excinfo.value)]
+                    lines += [
+                        x.strip("\n")
+                        for x in traceback.format_exception(*failure.exc_info)
+                    ]
+                reprlocation_lines.append((reprlocation, lines))
+            return ReprFailDoctest(reprlocation_lines)
+        else:
+            return super().repr_failure(excinfo)
+
+    def reportinfo(self):
+        assert self.dtest is not None
+        return self.fspath, self.dtest.lineno, "[doctest] %s" % self.name
+
+
+def _get_flag_lookup() -> Dict[str, int]:
+    import doctest
+
+    return dict(
+        DONT_ACCEPT_TRUE_FOR_1=doctest.DONT_ACCEPT_TRUE_FOR_1,
+        DONT_ACCEPT_BLANKLINE=doctest.DONT_ACCEPT_BLANKLINE,
+        NORMALIZE_WHITESPACE=doctest.NORMALIZE_WHITESPACE,
+        ELLIPSIS=doctest.ELLIPSIS,
+        IGNORE_EXCEPTION_DETAIL=doctest.IGNORE_EXCEPTION_DETAIL,
+        COMPARISON_FLAGS=doctest.COMPARISON_FLAGS,
+        ALLOW_UNICODE=_get_allow_unicode_flag(),
+        ALLOW_BYTES=_get_allow_bytes_flag(),
+        NUMBER=_get_number_flag(),
+    )
+
+
+def get_optionflags(parent):
+    optionflags_str = parent.config.getini("doctest_optionflags")
+    flag_lookup_table = _get_flag_lookup()
+    flag_acc = 0
+    for flag in optionflags_str:
+        flag_acc |= flag_lookup_table[flag]
+    return flag_acc
+
+
+def _get_continue_on_failure(config):
+    continue_on_failure = config.getvalue("doctest_continue_on_failure")
+    if continue_on_failure:
+        # We need to turn off this if we use pdb since we should stop at
+        # the first failure.
+        if config.getvalue("usepdb"):
+            continue_on_failure = False
+    return continue_on_failure
+
+
+class DoctestTextfile(pytest.Module):
+    obj = None
+
+    def collect(self) -> Iterable[DoctestItem]:
+        import doctest
+
+        # Inspired by doctest.testfile; ideally we would use it directly,
+        # but it doesn't support passing a custom checker.
+        encoding = self.config.getini("doctest_encoding")
+        text = self.fspath.read_text(encoding)
+        filename = str(self.fspath)
+        name = self.fspath.basename
+        globs = {"__name__": "__main__"}
+
+        optionflags = get_optionflags(self)
+
+        runner = _get_runner(
+            verbose=False,
+            optionflags=optionflags,
+            checker=_get_checker(),
+            continue_on_failure=_get_continue_on_failure(self.config),
+        )
+
+        parser = doctest.DocTestParser()
+        test = parser.get_doctest(text, globs, name, filename, 0)
+        if test.examples:
+            yield DoctestItem.from_parent(
+                self, name=test.name, runner=runner, dtest=test
+            )
+
+
+def _check_all_skipped(test: "doctest.DocTest") -> None:
+    """Raise pytest.skip() if all examples in the given DocTest have the SKIP
+    option set."""
+    import doctest
+
+    all_skipped = all(x.options.get(doctest.SKIP, False) for x in test.examples)
+    if all_skipped:
+        pytest.skip("all tests skipped by +SKIP option")
+
+
+def _is_mocked(obj: object) -> bool:
+    """Return if an object is possibly a mock object by checking the
+    existence of a highly improbable attribute."""
+    return (
+        safe_getattr(obj, "pytest_mock_example_attribute_that_shouldnt_exist", None)
+        is not None
+    )
+
+
+@contextmanager
+def _patch_unwrap_mock_aware() -> Generator[None, None, None]:
+    """Context manager which replaces ``inspect.unwrap`` with a version
+    that's aware of mock objects and doesn't recurse into them."""
+    real_unwrap = inspect.unwrap
+
+    def _mock_aware_unwrap(
+        func: Callable[..., Any], *, stop: Optional[Callable[[Any], Any]] = None
+    ) -> Any:
+        try:
+            if stop is None or stop is _is_mocked:
+                return real_unwrap(func, stop=_is_mocked)
+            _stop = stop
+            return real_unwrap(func, stop=lambda obj: _is_mocked(obj) or _stop(func))
+        except Exception as e:
+            warnings.warn(
+                "Got %r when unwrapping %r.  This is usually caused "
+                "by a violation of Python's object protocol; see e.g. "
+                "https://github.com/pytest-dev/pytest/issues/5080" % (e, func),
+                PytestWarning,
+            )
+            raise
+
+    inspect.unwrap = _mock_aware_unwrap
+    try:
+        yield
+    finally:
+        inspect.unwrap = real_unwrap
+
+
+class DoctestModule(pytest.Module):
+    def collect(self) -> Iterable[DoctestItem]:
+        import doctest
+
+        class MockAwareDocTestFinder(doctest.DocTestFinder):
+            """A hackish doctest finder that overrides stdlib internals to fix a stdlib bug.
+
+            https://github.com/pytest-dev/pytest/issues/3456
+            https://bugs.python.org/issue25532
+            """
+
+            def _find_lineno(self, obj, source_lines):
+                """Doctest code does not take into account `@property`, this
+                is a hackish way to fix it.
+
+                https://bugs.python.org/issue17446
+                """
+                if isinstance(obj, property):
+                    obj = getattr(obj, "fget", obj)
+                # Type ignored because this is a private function.
+                return doctest.DocTestFinder._find_lineno(  # type: ignore
+                    self, obj, source_lines,
+                )
+
+            def _find(
+                self, tests, obj, name, module, source_lines, globs, seen
+            ) -> None:
+                if _is_mocked(obj):
+                    return
+                with _patch_unwrap_mock_aware():
+
+                    # Type ignored because this is a private function.
+                    doctest.DocTestFinder._find(  # type: ignore
+                        self, tests, obj, name, module, source_lines, globs, seen
+                    )
+
+        if self.fspath.basename == "conftest.py":
+            module = self.config.pluginmanager._importconftest(
+                self.fspath, self.config.getoption("importmode")
+            )
+        else:
+            try:
+                module = import_path(self.fspath)
+            except ImportError:
+                if self.config.getvalue("doctest_ignore_import_errors"):
+                    pytest.skip("unable to import module %r" % self.fspath)
+                else:
+                    raise
+        # Uses internal doctest module parsing mechanism.
+        finder = MockAwareDocTestFinder()
+        optionflags = get_optionflags(self)
+        runner = _get_runner(
+            verbose=False,
+            optionflags=optionflags,
+            checker=_get_checker(),
+            continue_on_failure=_get_continue_on_failure(self.config),
+        )
+
+        for test in finder.find(module, module.__name__):
+            if test.examples:  # skip empty doctests
+                yield DoctestItem.from_parent(
+                    self, name=test.name, runner=runner, dtest=test
+                )
+
+
+def _setup_fixtures(doctest_item: DoctestItem) -> FixtureRequest:
+    """Used by DoctestTextfile and DoctestItem to setup fixture information."""
+
+    def func() -> None:
+        pass
+
+    doctest_item.funcargs = {}  # type: ignore[attr-defined]
+    fm = doctest_item.session._fixturemanager
+    doctest_item._fixtureinfo = fm.getfixtureinfo(  # type: ignore[attr-defined]
+        node=doctest_item, func=func, cls=None, funcargs=False
+    )
+    fixture_request = FixtureRequest(doctest_item, _ispytest=True)
+    fixture_request._fillfixtures()
+    return fixture_request
+
+
+def _init_checker_class() -> Type["doctest.OutputChecker"]:
+    import doctest
+    import re
+
+    class LiteralsOutputChecker(doctest.OutputChecker):
+        # Based on doctest_nose_plugin.py from the nltk project
+        # (https://github.com/nltk/nltk) and on the "numtest" doctest extension
+        # by Sebastien Boisgerault (https://github.com/boisgera/numtest).
+
+        _unicode_literal_re = re.compile(r"(\W|^)[uU]([rR]?[\'\"])", re.UNICODE)
+        _bytes_literal_re = re.compile(r"(\W|^)[bB]([rR]?[\'\"])", re.UNICODE)
+        _number_re = re.compile(
+            r"""
+            (?P<number>
+              (?P<mantissa>
+                (?P<integer1> [+-]?\d*)\.(?P<fraction>\d+)
+                |
+                (?P<integer2> [+-]?\d+)\.
+              )
+              (?:
+                [Ee]
+                (?P<exponent1> [+-]?\d+)
+              )?
+              |
+              (?P<integer3> [+-]?\d+)
+              (?:
+                [Ee]
+                (?P<exponent2> [+-]?\d+)
+              )
+            )
+            """,
+            re.VERBOSE,
+        )
+
+        def check_output(self, want: str, got: str, optionflags: int) -> bool:
+            if doctest.OutputChecker.check_output(self, want, got, optionflags):
+                return True
+
+            allow_unicode = optionflags & _get_allow_unicode_flag()
+            allow_bytes = optionflags & _get_allow_bytes_flag()
+            allow_number = optionflags & _get_number_flag()
+
+            if not allow_unicode and not allow_bytes and not allow_number:
+                return False
+
+            def remove_prefixes(regex: Pattern[str], txt: str) -> str:
+                return re.sub(regex, r"\1\2", txt)
+
+            if allow_unicode:
+                want = remove_prefixes(self._unicode_literal_re, want)
+                got = remove_prefixes(self._unicode_literal_re, got)
+
+            if allow_bytes:
+                want = remove_prefixes(self._bytes_literal_re, want)
+                got = remove_prefixes(self._bytes_literal_re, got)
+
+            if allow_number:
+                got = self._remove_unwanted_precision(want, got)
+
+            return doctest.OutputChecker.check_output(self, want, got, optionflags)
+
+        def _remove_unwanted_precision(self, want: str, got: str) -> str:
+            wants = list(self._number_re.finditer(want))
+            gots = list(self._number_re.finditer(got))
+            if len(wants) != len(gots):
+                return got
+            offset = 0
+            for w, g in zip(wants, gots):
+                fraction: Optional[str] = w.group("fraction")
+                exponent: Optional[str] = w.group("exponent1")
+                if exponent is None:
+                    exponent = w.group("exponent2")
+                if fraction is None:
+                    precision = 0
+                else:
+                    precision = len(fraction)
+                if exponent is not None:
+                    precision -= int(exponent)
+                if float(w.group()) == approx(float(g.group()), abs=10 ** -precision):
+                    # They're close enough. Replace the text we actually
+                    # got with the text we want, so that it will match when we
+                    # check the string literally.
+                    got = (
+                        got[: g.start() + offset] + w.group() + got[g.end() + offset :]
+                    )
+                    offset += w.end() - w.start() - (g.end() - g.start())
+            return got
+
+    return LiteralsOutputChecker
+
+
+def _get_checker() -> "doctest.OutputChecker":
+    """Return a doctest.OutputChecker subclass that supports some
+    additional options:
+
+    * ALLOW_UNICODE and ALLOW_BYTES options to ignore u'' and b''
+      prefixes (respectively) in string literals. Useful when the same
+      doctest should run in Python 2 and Python 3.
+
+    * NUMBER to ignore floating-point differences smaller than the
+      precision of the literal number in the doctest.
+
+    An inner class is used to avoid importing "doctest" at the module
+    level.
+    """
+    global CHECKER_CLASS
+    if CHECKER_CLASS is None:
+        CHECKER_CLASS = _init_checker_class()
+    return CHECKER_CLASS()
+
+
+def _get_allow_unicode_flag() -> int:
+    """Register and return the ALLOW_UNICODE flag."""
+    import doctest
+
+    return doctest.register_optionflag("ALLOW_UNICODE")
+
+
+def _get_allow_bytes_flag() -> int:
+    """Register and return the ALLOW_BYTES flag."""
+    import doctest
+
+    return doctest.register_optionflag("ALLOW_BYTES")
+
+
+def _get_number_flag() -> int:
+    """Register and return the NUMBER flag."""
+    import doctest
+
+    return doctest.register_optionflag("NUMBER")
+
+
+def _get_report_choice(key: str) -> int:
+    """Return the actual `doctest` module flag value.
+
+    We want to do it as late as possible to avoid importing `doctest` and all
+    its dependencies when parsing options, as it adds overhead and breaks tests.
+    """
+    import doctest
+
+    return {
+        DOCTEST_REPORT_CHOICE_UDIFF: doctest.REPORT_UDIFF,
+        DOCTEST_REPORT_CHOICE_CDIFF: doctest.REPORT_CDIFF,
+        DOCTEST_REPORT_CHOICE_NDIFF: doctest.REPORT_NDIFF,
+        DOCTEST_REPORT_CHOICE_ONLY_FIRST_FAILURE: doctest.REPORT_ONLY_FIRST_FAILURE,
+        DOCTEST_REPORT_CHOICE_NONE: 0,
+    }[key]
+
+
+@pytest.fixture(scope="session")
+def doctest_namespace() -> Dict[str, Any]:
+    """Fixture that returns a :py:class:`dict` that will be injected into the
+    namespace of doctests."""
+    return dict()

From 96e4e9e355ccd6c0d9e9b6275db484d56ed97815 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sat, 30 Oct 2021 04:24:58 +0300
Subject: [PATCH 0792/1407] Pytest ipdoctest plugin

Based on Pytest doctest.py with changes ported from Nose ipdoctest plugin.
---
 IPython/core/tests/test_magic.py           |   2 +-
 IPython/testing/plugin/pytest_ipdoctest.py | 230 +++++++++++++--------
 appveyor.yml                               |   2 +-
 pytest.ini                                 |  41 ++++
 4 files changed, 189 insertions(+), 86 deletions(-)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 37432ca309d..8dd15dcd824 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -584,7 +584,7 @@ def test_xdel(self):
 def doctest_who():
     """doctest for %who
 
-    In [1]: %reset -f
+    In [1]: %reset -sf
 
     In [2]: alpha = 123
 
diff --git a/IPython/testing/plugin/pytest_ipdoctest.py b/IPython/testing/plugin/pytest_ipdoctest.py
index 64e8f0e0eee..a58d0868015 100644
--- a/IPython/testing/plugin/pytest_ipdoctest.py
+++ b/IPython/testing/plugin/pytest_ipdoctest.py
@@ -1,6 +1,13 @@
-"""Discover and run doctests in modules and test files."""
+# Based on Pytest doctest.py
+# Original license:
+# The MIT License (MIT)
+#
+# Copyright (c) 2004-2021 Holger Krekel and others
+"""Discover and run ipdoctests in modules and test files."""
+import builtins
 import bdb
 import inspect
+import os
 import platform
 import sys
 import traceback
@@ -59,56 +66,56 @@
 # Lazy definition of runner class
 RUNNER_CLASS = None
 # Lazy definition of output checker class
-CHECKER_CLASS: Optional[Type["doctest.OutputChecker"]] = None
+CHECKER_CLASS: Optional[Type["IPDoctestOutputChecker"]] = None
 
 
 def pytest_addoption(parser: Parser) -> None:
     parser.addini(
-        "doctest_optionflags",
-        "option flags for doctests",
+        "ipdoctest_optionflags",
+        "option flags for ipdoctests",
         type="args",
         default=["ELLIPSIS"],
     )
     parser.addini(
-        "doctest_encoding", "encoding used for doctest files", default="utf-8"
+        "ipdoctest_encoding", "encoding used for ipdoctest files", default="utf-8"
     )
     group = parser.getgroup("collect")
     group.addoption(
-        "--doctest-modules",
+        "--ipdoctest-modules",
         action="store_true",
         default=False,
-        help="run doctests in all .py modules",
-        dest="doctestmodules",
+        help="run ipdoctests in all .py modules",
+        dest="ipdoctestmodules",
     )
     group.addoption(
-        "--doctest-report",
+        "--ipdoctest-report",
         type=str.lower,
         default="udiff",
-        help="choose another output format for diffs on doctest failure",
+        help="choose another output format for diffs on ipdoctest failure",
         choices=DOCTEST_REPORT_CHOICES,
-        dest="doctestreport",
+        dest="ipdoctestreport",
     )
     group.addoption(
-        "--doctest-glob",
+        "--ipdoctest-glob",
         action="append",
         default=[],
         metavar="pat",
-        help="doctests file matching pattern, default: test*.txt",
-        dest="doctestglob",
+        help="ipdoctests file matching pattern, default: test*.txt",
+        dest="ipdoctestglob",
     )
     group.addoption(
-        "--doctest-ignore-import-errors",
+        "--ipdoctest-ignore-import-errors",
         action="store_true",
         default=False,
-        help="ignore doctest ImportErrors",
-        dest="doctest_ignore_import_errors",
+        help="ignore ipdoctest ImportErrors",
+        dest="ipdoctest_ignore_import_errors",
     )
     group.addoption(
-        "--doctest-continue-on-failure",
+        "--ipdoctest-continue-on-failure",
         action="store_true",
         default=False,
-        help="for a given doctest, continue to run after the first failure",
-        dest="doctest_continue_on_failure",
+        help="for a given ipdoctest, continue to run after the first failure",
+        dest="ipdoctest_continue_on_failure",
     )
 
 
@@ -119,15 +126,16 @@ def pytest_unconfigure() -> None:
 
 
 def pytest_collect_file(
-    path: py.path.local, parent: Collector,
-) -> Optional[Union["DoctestModule", "DoctestTextfile"]]:
+    path: py.path.local,
+    parent: Collector,
+) -> Optional[Union["IPDoctestModule", "IPDoctestTextfile"]]:
     config = parent.config
     if path.ext == ".py":
-        if config.option.doctestmodules and not _is_setup_py(path):
-            mod: DoctestModule = DoctestModule.from_parent(parent, fspath=path)
+        if config.option.ipdoctestmodules and not _is_setup_py(path):
+            mod: IPDoctestModule = IPDoctestModule.from_parent(parent, fspath=path)
             return mod
-    elif _is_doctest(config, path, parent):
-        txt: DoctestTextfile = DoctestTextfile.from_parent(parent, fspath=path)
+    elif _is_ipdoctest(config, path, parent):
+        txt: IPDoctestTextfile = IPDoctestTextfile.from_parent(parent, fspath=path)
         return txt
     return None
 
@@ -139,10 +147,10 @@ def _is_setup_py(path: py.path.local) -> bool:
     return b"setuptools" in contents or b"distutils" in contents
 
 
-def _is_doctest(config: Config, path: py.path.local, parent) -> bool:
+def _is_ipdoctest(config: Config, path: py.path.local, parent) -> bool:
     if path.ext in (".txt", ".rst") and parent.session.isinitpath(path):
         return True
-    globs = config.getoption("doctestglob") or ["test*.txt"]
+    globs = config.getoption("ipdoctestglob") or ["test*.txt"]
     for glob in globs:
         if path.check(fnmatch=glob):
             return True
@@ -168,10 +176,11 @@ def __init__(self, failures: Sequence["doctest.DocTestFailure"]) -> None:
         self.failures = failures
 
 
-def _init_runner_class() -> Type["doctest.DocTestRunner"]:
+def _init_runner_class() -> Type["IPDocTestRunner"]:
     import doctest
+    from .ipdoctest import IPDocTestRunner
 
-    class PytestDoctestRunner(doctest.DebugRunner):
+    class PytestDoctestRunner(IPDocTestRunner):
         """Runner to collect failures.
 
         Note that the out variable in this case is a list instead of a
@@ -180,18 +189,20 @@ class PytestDoctestRunner(doctest.DebugRunner):
 
         def __init__(
             self,
-            checker: Optional["doctest.OutputChecker"] = None,
+            checker: Optional["IPDoctestOutputChecker"] = None,
             verbose: Optional[bool] = None,
             optionflags: int = 0,
             continue_on_failure: bool = True,
         ) -> None:
-            doctest.DebugRunner.__init__(
-                self, checker=checker, verbose=verbose, optionflags=optionflags
-            )
+            super().__init__(checker=checker, verbose=verbose, optionflags=optionflags)
             self.continue_on_failure = continue_on_failure
 
         def report_failure(
-            self, out, test: "doctest.DocTest", example: "doctest.Example", got: str,
+            self,
+            out,
+            test: "doctest.DocTest",
+            example: "doctest.Example",
+            got: str,
         ) -> None:
             failure = doctest.DocTestFailure(test, example, got)
             if self.continue_on_failure:
@@ -220,11 +231,11 @@ def report_unexpected_exception(
 
 
 def _get_runner(
-    checker: Optional["doctest.OutputChecker"] = None,
+    checker: Optional["IPDoctestOutputChecker"] = None,
     verbose: Optional[bool] = None,
     optionflags: int = 0,
     continue_on_failure: bool = True,
-) -> "doctest.DocTestRunner":
+) -> "IPDocTestRunner":
     # We need this in order to do a lazy import on doctest
     global RUNNER_CLASS
     if RUNNER_CLASS is None:
@@ -239,12 +250,12 @@ def _get_runner(
     )
 
 
-class DoctestItem(pytest.Item):
+class IPDoctestItem(pytest.Item):
     def __init__(
         self,
         name: str,
-        parent: "Union[DoctestTextfile, DoctestModule]",
-        runner: Optional["doctest.DocTestRunner"] = None,
+        parent: "Union[IPDoctestTextfile, IPDoctestModule]",
+        runner: Optional["IPDocTestRunner"] = None,
         dtest: Optional["doctest.DocTest"] = None,
     ) -> None:
         super().__init__(name, parent)
@@ -256,10 +267,10 @@ def __init__(
     @classmethod
     def from_parent(  # type: ignore
         cls,
-        parent: "Union[DoctestTextfile, DoctestModule]",
+        parent: "Union[IPDoctestTextfile, IPDoctestModule]",
         *,
         name: str,
-        runner: "doctest.DocTestRunner",
+        runner: "IPDocTestRunner",
         dtest: "doctest.DocTest",
     ):
         # incompatible signature due to to imposed limits on sublcass
@@ -271,25 +282,70 @@ def setup(self) -> None:
             self.fixture_request = _setup_fixtures(self)
             globs = dict(getfixture=self.fixture_request.getfixturevalue)
             for name, value in self.fixture_request.getfixturevalue(
-                "doctest_namespace"
+                "ipdoctest_namespace"
             ).items():
                 globs[name] = value
             self.dtest.globs.update(globs)
 
+            from .ipdoctest import IPExample
+
+            if isinstance(self.dtest.examples[0], IPExample):
+                # for IPython examples *only*, we swap the globals with the ipython
+                # namespace, after updating it with the globals (which doctest
+                # fills with the necessary info from the module being tested).
+                self._user_ns_orig = {}
+                self._user_ns_orig.update(_ip.user_ns)
+                _ip.user_ns.update(self.dtest.globs)
+                # We must remove the _ key in the namespace, so that Python's
+                # doctest code sets it naturally
+                _ip.user_ns.pop("_", None)
+                _ip.user_ns["__builtins__"] = builtins
+                self.dtest.globs = _ip.user_ns
+
+    def teardown(self) -> None:
+        from .ipdoctest import IPExample
+
+        # Undo the test.globs reassignment we made
+        if isinstance(self.dtest.examples[0], IPExample):
+            self.dtest.globs = {}
+            _ip.user_ns.clear()
+            _ip.user_ns.update(self._user_ns_orig)
+            del self._user_ns_orig
+
+        self.dtest.globs.clear()
+
     def runtest(self) -> None:
         assert self.dtest is not None
         assert self.runner is not None
         _check_all_skipped(self.dtest)
         self._disable_output_capturing_for_darwin()
         failures: List["doctest.DocTestFailure"] = []
-        # Type ignored because we change the type of `out` from what
-        # doctest expects.
-        self.runner.run(self.dtest, out=failures)  # type: ignore[arg-type]
+
+        # exec(compile(..., "single", ...), ...) puts result in builtins._
+        had_underscore_value = hasattr(builtins, "_")
+        underscore_original_value = getattr(builtins, "_", None)
+
+        # Save our current directory and switch out to the one where the
+        # test was originally created, in case another doctest did a
+        # directory change.  We'll restore this in the finally clause.
+        curdir = os.getcwd()
+        os.chdir(self.fspath.dirname)
+        try:
+            # Type ignored because we change the type of `out` from what
+            # ipdoctest expects.
+            self.runner.run(self.dtest, out=failures, clear_globs=False)  # type: ignore[arg-type]
+        finally:
+            os.chdir(curdir)
+            if had_underscore_value:
+                setattr(builtins, "_", underscore_original_value)
+            elif hasattr(builtins, "_"):
+                delattr(builtins, "_")
+
         if failures:
             raise MultipleDoctestFailures(failures)
 
     def _disable_output_capturing_for_darwin(self) -> None:
-        """Disable output capturing. Otherwise, stdout is lost to doctest (#985)."""
+        """Disable output capturing. Otherwise, stdout is lost to ipdoctest (pytest#985)."""
         if platform.system() != "Darwin":
             return
         capman = self.config.pluginmanager.getplugin("capturemanager")
@@ -301,13 +357,14 @@ def _disable_output_capturing_for_darwin(self) -> None:
 
     # TODO: Type ignored -- breaks Liskov Substitution.
     def repr_failure(  # type: ignore[override]
-        self, excinfo: ExceptionInfo[BaseException],
+        self,
+        excinfo: ExceptionInfo[BaseException],
     ) -> Union[str, TerminalRepr]:
         import doctest
 
         failures: Optional[
             Sequence[Union[doctest.DocTestFailure, doctest.UnexpectedException]]
-        ] = (None)
+        ] = None
         if isinstance(
             excinfo.value, (doctest.DocTestFailure, doctest.UnexpectedException)
         ):
@@ -330,7 +387,7 @@ def repr_failure(  # type: ignore[override]
                 reprlocation = ReprFileLocation(filename, lineno, message)  # type: ignore[arg-type]
                 checker = _get_checker()
                 report_choice = _get_report_choice(
-                    self.config.getoption("doctestreport")
+                    self.config.getoption("ipdoctestreport")
                 )
                 if lineno is not None:
                     assert failure.test.docstring is not None
@@ -369,7 +426,7 @@ def repr_failure(  # type: ignore[override]
 
     def reportinfo(self):
         assert self.dtest is not None
-        return self.fspath, self.dtest.lineno, "[doctest] %s" % self.name
+        return self.fspath, self.dtest.lineno, "[ipdoctest] %s" % self.name
 
 
 def _get_flag_lookup() -> Dict[str, int]:
@@ -389,7 +446,7 @@ def _get_flag_lookup() -> Dict[str, int]:
 
 
 def get_optionflags(parent):
-    optionflags_str = parent.config.getini("doctest_optionflags")
+    optionflags_str = parent.config.getini("ipdoctest_optionflags")
     flag_lookup_table = _get_flag_lookup()
     flag_acc = 0
     for flag in optionflags_str:
@@ -398,7 +455,7 @@ def get_optionflags(parent):
 
 
 def _get_continue_on_failure(config):
-    continue_on_failure = config.getvalue("doctest_continue_on_failure")
+    continue_on_failure = config.getvalue("ipdoctest_continue_on_failure")
     if continue_on_failure:
         # We need to turn off this if we use pdb since we should stop at
         # the first failure.
@@ -407,15 +464,16 @@ def _get_continue_on_failure(config):
     return continue_on_failure
 
 
-class DoctestTextfile(pytest.Module):
+class IPDoctestTextfile(pytest.Module):
     obj = None
 
-    def collect(self) -> Iterable[DoctestItem]:
+    def collect(self) -> Iterable[IPDoctestItem]:
         import doctest
+        from .ipdoctest import IPDocTestParser
 
         # Inspired by doctest.testfile; ideally we would use it directly,
         # but it doesn't support passing a custom checker.
-        encoding = self.config.getini("doctest_encoding")
+        encoding = self.config.getini("ipdoctest_encoding")
         text = self.fspath.read_text(encoding)
         filename = str(self.fspath)
         name = self.fspath.basename
@@ -430,10 +488,10 @@ def collect(self) -> Iterable[DoctestItem]:
             continue_on_failure=_get_continue_on_failure(self.config),
         )
 
-        parser = doctest.DocTestParser()
+        parser = IPDocTestParser()
         test = parser.get_doctest(text, globs, name, filename, 0)
         if test.examples:
-            yield DoctestItem.from_parent(
+            yield IPDoctestItem.from_parent(
                 self, name=test.name, runner=runner, dtest=test
             )
 
@@ -487,12 +545,13 @@ def _mock_aware_unwrap(
         inspect.unwrap = real_unwrap
 
 
-class DoctestModule(pytest.Module):
-    def collect(self) -> Iterable[DoctestItem]:
+class IPDoctestModule(pytest.Module):
+    def collect(self) -> Iterable[IPDoctestItem]:
         import doctest
+        from .ipdoctest import DocTestFinder, IPDocTestParser
 
-        class MockAwareDocTestFinder(doctest.DocTestFinder):
-            """A hackish doctest finder that overrides stdlib internals to fix a stdlib bug.
+        class MockAwareDocTestFinder(DocTestFinder):
+            """A hackish ipdoctest finder that overrides stdlib internals to fix a stdlib bug.
 
             https://github.com/pytest-dev/pytest/issues/3456
             https://bugs.python.org/issue25532
@@ -507,8 +566,10 @@ def _find_lineno(self, obj, source_lines):
                 if isinstance(obj, property):
                     obj = getattr(obj, "fget", obj)
                 # Type ignored because this is a private function.
-                return doctest.DocTestFinder._find_lineno(  # type: ignore
-                    self, obj, source_lines,
+                return DocTestFinder._find_lineno(  # type: ignore
+                    self,
+                    obj,
+                    source_lines,
                 )
 
             def _find(
@@ -519,7 +580,7 @@ def _find(
                 with _patch_unwrap_mock_aware():
 
                     # Type ignored because this is a private function.
-                    doctest.DocTestFinder._find(  # type: ignore
+                    DocTestFinder._find(  # type: ignore
                         self, tests, obj, name, module, source_lines, globs, seen
                     )
 
@@ -531,12 +592,12 @@ def _find(
             try:
                 module = import_path(self.fspath)
             except ImportError:
-                if self.config.getvalue("doctest_ignore_import_errors"):
+                if self.config.getvalue("ipdoctest_ignore_import_errors"):
                     pytest.skip("unable to import module %r" % self.fspath)
                 else:
                     raise
         # Uses internal doctest module parsing mechanism.
-        finder = MockAwareDocTestFinder()
+        finder = MockAwareDocTestFinder(parser=IPDocTestParser())
         optionflags = get_optionflags(self)
         runner = _get_runner(
             verbose=False,
@@ -546,14 +607,14 @@ def _find(
         )
 
         for test in finder.find(module, module.__name__):
-            if test.examples:  # skip empty doctests
-                yield DoctestItem.from_parent(
+            if test.examples:  # skip empty ipdoctests
+                yield IPDoctestItem.from_parent(
                     self, name=test.name, runner=runner, dtest=test
                 )
 
 
-def _setup_fixtures(doctest_item: DoctestItem) -> FixtureRequest:
-    """Used by DoctestTextfile and DoctestItem to setup fixture information."""
+def _setup_fixtures(doctest_item: IPDoctestItem) -> FixtureRequest:
+    """Used by IPDoctestTextfile and IPDoctestItem to setup fixture information."""
 
     def func() -> None:
         pass
@@ -568,11 +629,12 @@ def func() -> None:
     return fixture_request
 
 
-def _init_checker_class() -> Type["doctest.OutputChecker"]:
+def _init_checker_class() -> Type["IPDoctestOutputChecker"]:
     import doctest
     import re
+    from .ipdoctest import IPDoctestOutputChecker
 
-    class LiteralsOutputChecker(doctest.OutputChecker):
+    class LiteralsOutputChecker(IPDoctestOutputChecker):
         # Based on doctest_nose_plugin.py from the nltk project
         # (https://github.com/nltk/nltk) and on the "numtest" doctest extension
         # by Sebastien Boisgerault (https://github.com/boisgera/numtest).
@@ -603,7 +665,7 @@ class LiteralsOutputChecker(doctest.OutputChecker):
         )
 
         def check_output(self, want: str, got: str, optionflags: int) -> bool:
-            if doctest.OutputChecker.check_output(self, want, got, optionflags):
+            if IPDoctestOutputChecker.check_output(self, want, got, optionflags):
                 return True
 
             allow_unicode = optionflags & _get_allow_unicode_flag()
@@ -627,7 +689,7 @@ def remove_prefixes(regex: Pattern[str], txt: str) -> str:
             if allow_number:
                 got = self._remove_unwanted_precision(want, got)
 
-            return doctest.OutputChecker.check_output(self, want, got, optionflags)
+            return IPDoctestOutputChecker.check_output(self, want, got, optionflags)
 
         def _remove_unwanted_precision(self, want: str, got: str) -> str:
             wants = list(self._number_re.finditer(want))
@@ -659,18 +721,18 @@ def _remove_unwanted_precision(self, want: str, got: str) -> str:
     return LiteralsOutputChecker
 
 
-def _get_checker() -> "doctest.OutputChecker":
-    """Return a doctest.OutputChecker subclass that supports some
+def _get_checker() -> "IPDoctestOutputChecker":
+    """Return a IPDoctestOutputChecker subclass that supports some
     additional options:
 
     * ALLOW_UNICODE and ALLOW_BYTES options to ignore u'' and b''
       prefixes (respectively) in string literals. Useful when the same
-      doctest should run in Python 2 and Python 3.
+      ipdoctest should run in Python 2 and Python 3.
 
     * NUMBER to ignore floating-point differences smaller than the
-      precision of the literal number in the doctest.
+      precision of the literal number in the ipdoctest.
 
-    An inner class is used to avoid importing "doctest" at the module
+    An inner class is used to avoid importing "ipdoctest" at the module
     level.
     """
     global CHECKER_CLASS
@@ -701,9 +763,9 @@ def _get_number_flag() -> int:
 
 
 def _get_report_choice(key: str) -> int:
-    """Return the actual `doctest` module flag value.
+    """Return the actual `ipdoctest` module flag value.
 
-    We want to do it as late as possible to avoid importing `doctest` and all
+    We want to do it as late as possible to avoid importing `ipdoctest` and all
     its dependencies when parsing options, as it adds overhead and breaks tests.
     """
     import doctest
@@ -718,7 +780,7 @@ def _get_report_choice(key: str) -> int:
 
 
 @pytest.fixture(scope="session")
-def doctest_namespace() -> Dict[str, Any]:
+def ipdoctest_namespace() -> Dict[str, Any]:
     """Fixture that returns a :py:class:`dict` that will be injected into the
-    namespace of doctests."""
+    namespace of ipdoctests."""
     return dict()
diff --git a/appveyor.yml b/appveyor.yml
index 26df940d77e..8f9841f5e7e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -27,7 +27,7 @@ install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - python -m pip install --upgrade setuptools pip
   - pip install nose coverage pytest pytest-cov pytest-trio pywin32 matplotlib pandas
-  - pip install .[test]
+  - pip install -e .[test]
   - mkdir results
   - cd results
 test_script:
diff --git a/pytest.ini b/pytest.ini
index 9da365334c6..2287272b8a9 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,2 +1,43 @@
 [pytest]
 addopts = --durations=10
+    -p IPython.testing.plugin.pytest_ipdoctest --ipdoctest-modules
+    --ignore=docs
+    --ignore=examples
+    --ignore=htmlcov
+    --ignore=ipython_kernel
+    --ignore=ipython_parallel
+    --ignore=results
+    --ignore=tmp
+    --ignore=tools
+    --ignore=traitlets
+    --ignore=IPython/core/tests/daft_extension
+    --ignore=IPython/sphinxext
+    --ignore=IPython/terminal/pt_inputhooks
+    --ignore=IPython/__main__.py
+    --ignore=IPython/config.py
+    --ignore=IPython/frontend.py
+    --ignore=IPython/html.py
+    --ignore=IPython/nbconvert.py
+    --ignore=IPython/nbformat.py
+    --ignore=IPython/parallel.py
+    --ignore=IPython/qt.py
+    --ignore=IPython/external/qt_for_kernel.py
+    --ignore=IPython/html/widgets/widget_link.py
+    --ignore=IPython/html/widgets/widget_output.py
+    --ignore=IPython/lib/inputhookglut.py
+    --ignore=IPython/lib/inputhookgtk.py
+    --ignore=IPython/lib/inputhookgtk3.py
+    --ignore=IPython/lib/inputhookgtk4.py
+    --ignore=IPython/lib/inputhookpyglet.py
+    --ignore=IPython/lib/inputhookqt4.py
+    --ignore=IPython/lib/inputhookwx.py
+    --ignore=IPython/terminal/console.py
+    --ignore=IPython/terminal/ptshell.py
+    --ignore=IPython/utils/_process_cli.py
+    --ignore=IPython/utils/_process_posix.py
+    --ignore=IPython/utils/_process_win32.py
+    --ignore=IPython/utils/_process_win32_controller.py
+    --ignore=IPython/utils/daemonize.py
+    --ignore=IPython/utils/eventful.py
+doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS
+ipdoctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS

From 7617110e9f3cf8b97991ce3727631f8ed800a571 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 3 Nov 2021 22:42:00 +0300
Subject: [PATCH 0793/1407] Add builtins._ doctest

Defining builtins._ should not break anything outside the doctest while also should be working as expected inside the doctest.
---
 IPython/testing/plugin/test_ipdoctest.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/IPython/testing/plugin/test_ipdoctest.py b/IPython/testing/plugin/test_ipdoctest.py
index d8f59916369..2686172bb29 100644
--- a/IPython/testing/plugin/test_ipdoctest.py
+++ b/IPython/testing/plugin/test_ipdoctest.py
@@ -74,3 +74,19 @@ def doctest_multiline3():
     In [15]: h(0)
     Out[15]: -1
    """
+
+
+def doctest_builtin_underscore():
+    """Defining builtins._ should not break anything outside the doctest
+    while also should be working as expected inside the doctest.
+
+    In [1]: import builtins
+
+    In [2]: builtins._ = 42
+
+    In [3]: builtins._
+    Out[3]: 42
+
+    In [4]: _
+    Out[4]: 42
+    """

From 2f9407e80c2d615d5c3d7d79fee31f7c1bffad20 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Thu, 4 Nov 2021 23:56:16 +0300
Subject: [PATCH 0794/1407] Skip test_pylabtools when no matplotlib installed

Currently Pytest will bail out the whole suit because of ImportError.
---
 IPython/core/tests/test_pylabtools.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IPython/core/tests/test_pylabtools.py b/IPython/core/tests/test_pylabtools.py
index 64acd3d465a..579e647e078 100644
--- a/IPython/core/tests/test_pylabtools.py
+++ b/IPython/core/tests/test_pylabtools.py
@@ -8,14 +8,15 @@
 from binascii import a2b_base64
 from io import BytesIO
 
-import matplotlib
+import pytest
+
+matplotlib = pytest.importorskip("matplotlib")
 matplotlib.use('Agg')
 from matplotlib.figure import Figure
 
 from matplotlib import pyplot as plt
 from matplotlib_inline import backend_inline
 import numpy as np
-import pytest
 
 from IPython.core.getipython import get_ipython
 from IPython.core.interactiveshell import InteractiveShell

From 27a33628310cbd68632f0e8b514de731a033f8e6 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Fri, 5 Nov 2021 00:00:03 +0300
Subject: [PATCH 0795/1407] Make test_shim_warning not fail on unrelated
 warnings

---
 IPython/utils/tests/test_shimmodule.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/IPython/utils/tests/test_shimmodule.py b/IPython/utils/tests/test_shimmodule.py
index 3a1561755a6..814e48240a9 100644
--- a/IPython/utils/tests/test_shimmodule.py
+++ b/IPython/utils/tests/test_shimmodule.py
@@ -1,13 +1,10 @@
+import pytest
 import sys
-import warnings
 
 from IPython.utils.shimmodule import ShimWarning
 
 
 def test_shim_warning():
     sys.modules.pop('IPython.config', None)
-    with warnings.catch_warnings(record=True) as w:
-        warnings.simplefilter("always")
+    with pytest.warns(ShimWarning):
         import IPython.config
-    assert len(w) == 1
-    assert issubclass(w[-1].category, ShimWarning)

From 201685e1f00049d3b8ec4bc68eefc8451783f5fe Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Tue, 2 Nov 2021 04:34:40 +0300
Subject: [PATCH 0796/1407] Revive doctest_tb_sysexit

Output changed with `pure-eval>=0.2.0` which learned to parse binary operators and to show its arguments. Test changed to not use the binary operator '%' to pass on any version.
---
 IPython/core/tests/simpleerr.py  |   2 +-
 IPython/core/tests/test_iplib.py | 162 +++++++++++++++----------------
 2 files changed, 78 insertions(+), 86 deletions(-)

diff --git a/IPython/core/tests/simpleerr.py b/IPython/core/tests/simpleerr.py
index 34e697029db..5ba5084a1c4 100644
--- a/IPython/core/tests/simpleerr.py
+++ b/IPython/core/tests/simpleerr.py
@@ -8,7 +8,7 @@ def div0():
     x/y
 
 def sysexit(stat, mode):
-    raise SystemExit(stat, 'Mode = %s' % mode)
+    raise SystemExit(stat, f'Mode = {mode}')
 
 def bar(mode):
     "bar"
diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index 6804c2b2d3d..0ee1b8da8c4 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -118,91 +118,83 @@ def doctest_tb_verbose():
     """
 
 
-# TODO : Marc 2021 – this seem to fail due
-# to upstream changes in CI for whatever reason.
-# Commenting for now, to revive someday (maybe?)
-# nose won't work in 3.10 anyway and we'll have to disable iptest.
-# thus this likely need to bemigrated to pytest.
-
-
-# def doctest_tb_sysexit():
-#     """
-# In [17]: %xmode plain
-# Exception reporting mode: Plain
-#
-# In [18]: %run simpleerr.py exit
-# An exception has occurred, use %tb to see the full traceback.
-# SystemExit: (1, 'Mode = exit')
-#
-# In [19]: %run simpleerr.py exit 2
-# An exception has occurred, use %tb to see the full traceback.
-# SystemExit: (2, 'Mode = exit')
-#
-# In [20]: %tb
-# Traceback (most recent call last):
-#   File ... in <module>
-#     bar(mode)
-#   File ... line 22, in bar
-#     sysexit(stat, mode)
-#   File ... line 11, in sysexit
-#     raise SystemExit(stat, 'Mode = %s' % mode)
-# SystemExit: (2, 'Mode = exit')
-#
-# In [21]: %xmode context
-# Exception reporting mode: Context
-#
-# In [22]: %tb
-# ---------------------------------------------------------------------------
-# SystemExit                                Traceback (most recent call last)
-# <BLANKLINE>
-# ...<module>
-#      29     except IndexError:
-#      30         mode = 'div'
-# ---> 32     bar(mode)
-# <BLANKLINE>
-# ...bar(mode)
-#      20         except:
-#      21             stat = 1
-# ---> 22         sysexit(stat, mode)
-#      23     else:
-#      24         raise ValueError('Unknown mode')
-# <BLANKLINE>
-# ...sysexit(stat, mode)
-#      10 def sysexit(stat, mode):
-# ---> 11     raise SystemExit(stat, 'Mode = %s' % mode)
-# <BLANKLINE>
-# SystemExit: (2, 'Mode = exit')
-#
-# In [23]: %xmode verbose
-# Exception reporting mode: Verbose
-#
-# In [24]: %tb
-# ---------------------------------------------------------------------------
-# SystemExit                                Traceback (most recent call last)
-# <BLANKLINE>
-# ... in <module>
-#      29     except IndexError:
-#      30         mode = 'div'
-# ---> 32     bar(mode)
-#         mode = 'exit'
-# <BLANKLINE>
-# ... in bar(mode='exit')
-#      20         except:
-#      21             stat = 1
-# ---> 22         sysexit(stat, mode)
-#         mode = 'exit'
-#         stat = 2
-#      23     else:
-#      24         raise ValueError('Unknown mode')
-# <BLANKLINE>
-# ... in sysexit(stat=2, mode='exit')
-#      10 def sysexit(stat, mode):
-# ---> 11     raise SystemExit(stat, 'Mode = %s' % mode)
-#         stat = 2
-#         mode = 'exit'
-# <BLANKLINE>
-# SystemExit: (2, 'Mode = exit')
-#     """
+def doctest_tb_sysexit():
+    """
+    In [17]: %xmode plain
+    Exception reporting mode: Plain
+
+    In [18]: %run simpleerr.py exit
+    An exception has occurred, use %tb to see the full traceback.
+    SystemExit: (1, 'Mode = exit')
+
+    In [19]: %run simpleerr.py exit 2
+    An exception has occurred, use %tb to see the full traceback.
+    SystemExit: (2, 'Mode = exit')
+
+    In [20]: %tb
+    Traceback (most recent call last):
+      File ... in <module>
+        bar(mode)
+      File ... line 22, in bar
+        sysexit(stat, mode)
+      File ... line 11, in sysexit
+        raise SystemExit(stat, f'Mode = {mode}')
+    SystemExit: (2, 'Mode = exit')
+
+    In [21]: %xmode context
+    Exception reporting mode: Context
+
+    In [22]: %tb
+    ---------------------------------------------------------------------------
+    SystemExit                                Traceback (most recent call last)
+    <BLANKLINE>
+    ...<module>
+         29     except IndexError:
+         30         mode = 'div'
+    ---> 32     bar(mode)
+    <BLANKLINE>
+    ...bar(mode)
+         20         except:
+         21             stat = 1
+    ---> 22         sysexit(stat, mode)
+         23     else:
+         24         raise ValueError('Unknown mode')
+    <BLANKLINE>
+    ...sysexit(stat, mode)
+         10 def sysexit(stat, mode):
+    ---> 11     raise SystemExit(stat, f'Mode = {mode}')
+    <BLANKLINE>
+    SystemExit: (2, 'Mode = exit')
+
+    In [23]: %xmode verbose
+    Exception reporting mode: Verbose
+
+    In [24]: %tb
+    ---------------------------------------------------------------------------
+    SystemExit                                Traceback (most recent call last)
+    <BLANKLINE>
+    ... in <module>
+         29     except IndexError:
+         30         mode = 'div'
+    ---> 32     bar(mode)
+            mode = 'exit'
+    <BLANKLINE>
+    ... in bar(mode='exit')
+         20         except:
+         21             stat = 1
+    ---> 22         sysexit(stat, mode)
+            mode = 'exit'
+            stat = 2
+         23     else:
+         24         raise ValueError('Unknown mode')
+    <BLANKLINE>
+    ... in sysexit(stat=2, mode='exit')
+         10 def sysexit(stat, mode):
+    ---> 11     raise SystemExit(stat, f'Mode = {mode}')
+            stat = 2
+    <BLANKLINE>
+    SystemExit: (2, 'Mode = exit')
+    """
 
 
 def test_run_cell():

From 31a08778f65af8ce597d4ee1a900724d31d49041 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 6 Nov 2021 19:38:39 -0700
Subject: [PATCH 0797/1407] attempt reformat

---
 IPython/core/tests/simpleerr.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/core/tests/simpleerr.py b/IPython/core/tests/simpleerr.py
index 5ba5084a1c4..f85e2d6b925 100644
--- a/IPython/core/tests/simpleerr.py
+++ b/IPython/core/tests/simpleerr.py
@@ -8,7 +8,8 @@ def div0():
     x/y
 
 def sysexit(stat, mode):
-    raise SystemExit(stat, f'Mode = {mode}')
+    raise SystemExit(stat, f"Mode = {mode}")
+
 
 def bar(mode):
     "bar"

From 023409c714300777b516da79919e406cd579934c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 6 Nov 2021 20:47:43 -0700
Subject: [PATCH 0798/1407] rectify line numbers

---
 IPython/core/tests/test_iplib.py | 142 +++++++++++++++++--------------
 1 file changed, 79 insertions(+), 63 deletions(-)

diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index 0ee1b8da8c4..5cbc77251db 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -43,15 +43,15 @@ def doctest_tb_plain():
 In [18]: xmode plain
 Exception reporting mode: Plain
 
-In [19]: run simpleerr.py
-Traceback (most recent call last):
-  ...line 32, in <module>
-    bar(mode)
-  ...line 16, in bar
-    div0()
-  ...line 8, in div0
-    x/y
-ZeroDivisionError: ...
+        In [19]: run simpleerr.py
+        Traceback (most recent call last):
+          ...line ..., in <module>
+            bar(mode)
+          ...line ..., in bar
+            div0()
+          ...line ..., in div0
+            x/y
+        ZeroDivisionError: ...
     """
 
 
@@ -60,29 +60,28 @@ def doctest_tb_context():
 In [3]: xmode context
 Exception reporting mode: Context
 
-In [4]: run simpleerr.py
----------------------------------------------------------------------------
-ZeroDivisionError                         Traceback (most recent call last)
-<BLANKLINE>
-... in <module>
-     29     except IndexError:
-     30         mode = 'div'
----> 32     bar(mode)
-<BLANKLINE>
-... in bar(mode)
-     14     "bar"
-     15     if mode=='div':
----> 16         div0()
-     17     elif mode=='exit':
-     18         try:
-<BLANKLINE>
-... in div0()
-      6     x = 1
-      7     y = 0
-----> 8     x/y
-<BLANKLINE>
-ZeroDivisionError: ...
-"""
+        In [4]: run simpleerr.py
+        ---------------------------------------------------------------------------
+        ZeroDivisionError                         Traceback (most recent call last)
+        <BLANKLINE>
+        ... in <module>
+             30     except IndexError:
+             31         mode = 'div'
+        ---> 33     bar(mode)
+        <BLANKLINE>
+        ... in bar(mode)
+             15     "bar"
+             16     if mode=='div':
+        ---> 17         div0()
+             18     elif mode=='exit':
+             19         try:
+        <BLANKLINE>
+        ... in div0()
+              6     x = 1
+              7     y = 0
+        ----> 8     x/y
+        <BLANKLINE>
+        ZeroDivisionError: ..."""
 
 
 def doctest_tb_verbose():
@@ -95,17 +94,17 @@ def doctest_tb_verbose():
     ZeroDivisionError                         Traceback (most recent call last)
     <BLANKLINE>
     ... in <module>
-         29     except IndexError:
-         30         mode = 'div'
-    ---> 32     bar(mode)
+         30     except IndexError:
+         31         mode = 'div'
+    ---> 33     bar(mode)
             mode = 'div'
     <BLANKLINE>
     ... in bar(mode='div')
-         14     "bar"
-         15     if mode=='div':
-    ---> 16         div0()
-         17     elif mode=='exit':
-         18         try:
+         15     "bar"
+         16     if mode=='div':
+    ---> 17         div0()
+         18     elif mode=='exit':
+         19         try:
     <BLANKLINE>
     ... in div0()
           6     x = 1
@@ -133,12 +132,14 @@ def doctest_tb_sysexit():
 
     In [20]: %tb
     Traceback (most recent call last):
-      File ... in <module>
+      File ..., in execfile
+        exec(compiler(f.read(), fname, 'exec'), glob, loc)
+      File ..., in <module>
         bar(mode)
-      File ... line 22, in bar
+      File ..., in bar
         sysexit(stat, mode)
-      File ... line 11, in sysexit
-        raise SystemExit(stat, f'Mode = {mode}')
+      File ..., in sysexit
+        raise SystemExit(stat, f"Mode = {mode}")
     SystemExit: (2, 'Mode = exit')
 
     In [21]: %xmode context
@@ -147,24 +148,39 @@ def doctest_tb_sysexit():
     In [22]: %tb
     ---------------------------------------------------------------------------
     SystemExit                                Traceback (most recent call last)
-    <BLANKLINE>
+    File ..., in execfile(fname, glob, loc, compiler)
+         70 with open(fname, 'rb') as f:
+         71     compiler = compiler or compile
+    ---> 72     exec(compiler(f.read(), fname, 'exec'), glob, loc)
     ...<module>
-         29     except IndexError:
-         30         mode = 'div'
-    ---> 32     bar(mode)
+         30     except IndexError:
+         31         mode = 'div'
+    ---> 33     bar(mode)
     <BLANKLINE>
     ...bar(mode)
-         20         except:
-         21             stat = 1
-    ---> 22         sysexit(stat, mode)
-         23     else:
-         24         raise ValueError('Unknown mode')
+         21         except:
+         22             stat = 1
+    ---> 23         sysexit(stat, mode)
+         24     else:
+         25         raise ValueError('Unknown mode')
     <BLANKLINE>
     ...sysexit(stat, mode)
          10 def sysexit(stat, mode):
-    ---> 11     raise SystemExit(stat, f'Mode = {mode}')
+    ---> 11     raise SystemExit(stat, f"Mode = {mode}")
     <BLANKLINE>
     SystemExit: (2, 'Mode = exit')
+    """
+
+
+def doctest_tb_sysexit_verbose():
+    """
+    In [18]: %run simpleerr.py exit
+    An exception has occurred, use %tb to see the full traceback.
+    SystemExit: (1, 'Mode = exit')
+
+    In [19]: %run simpleerr.py exit 2
+    An exception has occurred, use %tb to see the full traceback.
+    SystemExit: (2, 'Mode = exit')
 
     In [23]: %xmode verbose
     Exception reporting mode: Verbose
@@ -174,23 +190,23 @@ def doctest_tb_sysexit():
     SystemExit                                Traceback (most recent call last)
     <BLANKLINE>
     ... in <module>
-         29     except IndexError:
-         30         mode = 'div'
-    ---> 32     bar(mode)
+         30     except IndexError:
+         31         mode = 'div'
+    ---> 33     bar(mode)
             mode = 'exit'
     <BLANKLINE>
     ... in bar(mode='exit')
-         20         except:
-         21             stat = 1
-    ---> 22         sysexit(stat, mode)
+         ...     except:
+         ...         stat = 1
+    ---> ...     sysexit(stat, mode)
             mode = 'exit'
             stat = 2
-         23     else:
-         24         raise ValueError('Unknown mode')
+         ...     else:
+         ...         raise ValueError('Unknown mode')
     <BLANKLINE>
     ... in sysexit(stat=2, mode='exit')
          10 def sysexit(stat, mode):
-    ---> 11     raise SystemExit(stat, f'Mode = {mode}')
+    ---> 11     raise SystemExit(stat, f"Mode = {mode}")
             stat = 2
     <BLANKLINE>
     SystemExit: (2, 'Mode = exit')

From ecb0bd663e2f2bd5177b3983c15cfdc81375f658 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sun, 7 Nov 2021 18:48:33 +0300
Subject: [PATCH 0799/1407] Split coverage into distinct library and tests
 stats

Some projects exclude tests coverage completely because counting it with other code artificially increases total code coverage, but tests coverage monitoring is a good thing because it catches mistakenly not running tests. The split should eliminate situations with 'coverage decreases' status reports when tests code shrinks while the library code and its coverage remains the same.
---
 codecov.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/codecov.yml b/codecov.yml
index d65a8d9cfdf..f82fcfc7b87 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -2,7 +2,12 @@ coverage:
   status:
     patch: off
     project:
-      default:
+      default: false
+      library:
         target: auto
+        paths: '!.*/tests/.*'
+      tests:
+        target: auto
+        paths: '.*/tests/.*'
 codecov:
   require_ci_to_pass: false

From ebdea82dfa0638576c91c510eca46e9f7c57b385 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 8 Nov 2021 02:49:12 +0300
Subject: [PATCH 0800/1407] Suppress bunch of self-deprecation warnings

And exclude these deprecated modules from coverage report
---
 IPython/core/tests/test_display.py    | 14 +++++++++-----
 IPython/core/tests/test_pylabtools.py |  6 +++---
 codecov.yml                           | 12 ++++++++++++
 pytest.ini                            | 18 +++++++++++-------
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index b88bee8c8c1..c6e13b917c6 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -161,9 +161,11 @@ def _get_inline_config():
 def test_set_matplotlib_close():
     cfg = _get_inline_config()
     cfg.close_figures = False
-    display.set_matplotlib_close()
+    with pytest.deprecated_call():
+        display.set_matplotlib_close()
     assert cfg.close_figures
-    display.set_matplotlib_close(False)
+    with pytest.deprecated_call():
+        display.set_matplotlib_close(False)
     assert not cfg.close_figures
 
 _fmt_mime_map = {
@@ -185,7 +187,8 @@ def test_set_matplotlib_formats():
         (),
     ]:
         active_mimes = {_fmt_mime_map[fmt] for fmt in formats}
-        display.set_matplotlib_formats(*formats)
+        with pytest.deprecated_call():
+            display.set_matplotlib_formats(*formats)
         for mime, f in formatters.items():
             if mime in active_mimes:
                 assert Figure in f
@@ -201,8 +204,9 @@ def test_set_matplotlib_formats_kwargs():
     cfg = _get_inline_config()
     cfg.print_figure_kwargs.update(dict(foo='bar'))
     kwargs = dict(dpi=150)
-    display.set_matplotlib_formats('png', **kwargs)
-    formatter = ip.display_formatter.formatters['image/png']
+    with pytest.deprecated_call():
+        display.set_matplotlib_formats("png", **kwargs)
+    formatter = ip.display_formatter.formatters["image/png"]
     f = formatter.lookup_by_type(Figure)
     formatter_kwargs = f.keywords
     expected = kwargs
diff --git a/IPython/core/tests/test_pylabtools.py b/IPython/core/tests/test_pylabtools.py
index 579e647e078..78886373ced 100644
--- a/IPython/core/tests/test_pylabtools.py
+++ b/IPython/core/tests/test_pylabtools.py
@@ -102,9 +102,9 @@ def test_select_figure_formats_str():
 
 def test_select_figure_formats_kwargs():
     ip = get_ipython()
-    kwargs = dict(quality=10, bbox_inches='tight')
-    pt.select_figure_formats(ip, 'png', **kwargs)
-    formatter = ip.display_formatter.formatters['image/png']
+    kwargs = dict(bbox_inches="tight")
+    pt.select_figure_formats(ip, "png", **kwargs)
+    formatter = ip.display_formatter.formatters["image/png"]
     f = formatter.lookup_by_type(Figure)
     cell = f.keywords
     expected = kwargs
diff --git a/codecov.yml b/codecov.yml
index d65a8d9cfdf..dc3681c3dc4 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -6,3 +6,15 @@ coverage:
         target: auto
 codecov:
   require_ci_to_pass: false
+
+ignore:
+  - IPython/kernel/*
+  - IPython/consoleapp.py
+  - IPython/core/inputsplitter.py
+  - IPython/lib/inputhook*.py
+  - IPython/lib/kernel.py
+  - IPython/utils/jsonutil.py
+  - IPython/utils/localinterfaces.py
+  - IPython/utils/log.py
+  - IPython/utils/signatures.py
+  - IPython/utils/traitlets.py
diff --git a/pytest.ini b/pytest.ini
index 2287272b8a9..3aeec55e754 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -24,13 +24,6 @@ addopts = --durations=10
     --ignore=IPython/external/qt_for_kernel.py
     --ignore=IPython/html/widgets/widget_link.py
     --ignore=IPython/html/widgets/widget_output.py
-    --ignore=IPython/lib/inputhookglut.py
-    --ignore=IPython/lib/inputhookgtk.py
-    --ignore=IPython/lib/inputhookgtk3.py
-    --ignore=IPython/lib/inputhookgtk4.py
-    --ignore=IPython/lib/inputhookpyglet.py
-    --ignore=IPython/lib/inputhookqt4.py
-    --ignore=IPython/lib/inputhookwx.py
     --ignore=IPython/terminal/console.py
     --ignore=IPython/terminal/ptshell.py
     --ignore=IPython/utils/_process_cli.py
@@ -39,5 +32,16 @@ addopts = --durations=10
     --ignore=IPython/utils/_process_win32_controller.py
     --ignore=IPython/utils/daemonize.py
     --ignore=IPython/utils/eventful.py
+
+    --ignore=IPython/kernel
+    --ignore=IPython/consoleapp.py
+    --ignore=IPython/core/inputsplitter.py
+    --ignore-glob=IPython/lib/inputhook*.py
+    --ignore=IPython/lib/kernel.py
+    --ignore=IPython/utils/jsonutil.py
+    --ignore=IPython/utils/localinterfaces.py
+    --ignore=IPython/utils/log.py
+    --ignore=IPython/utils/signatures.py
+    --ignore=IPython/utils/traitlets.py
 doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS
 ipdoctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS

From c94e49d0b297a5ef91c1e64137be1bcc672cf012 Mon Sep 17 00:00:00 2001
From: Brian Lee <brianklee@google.com>
Date: Mon, 8 Nov 2021 09:22:27 -0500
Subject: [PATCH 0801/1407] Fixes race condition in get_ipython_dir()

Fixes https://github.com/ipython/ipython/issues/13255
---
 IPython/paths.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/paths.py b/IPython/paths.py
index a2ea5bc1159..e29eea58e20 100644
--- a/IPython/paths.py
+++ b/IPython/paths.py
@@ -72,7 +72,7 @@ def get_ipython_dir() -> str:
                     " using a temp directory.".format(parent))
             ipdir = tempfile.mkdtemp()
         else:
-            os.makedirs(ipdir)
+            ensure_dir_exists(ipdir)
     assert isinstance(ipdir, str), "all path manipulation should be str(unicode), but are not."
     return ipdir
 

From a5c798b38154a8b35bbd52ebb9305d5aa5934fdb Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 8 Nov 2021 22:02:38 +0300
Subject: [PATCH 0802/1407] TST: Remove unneeded requirement on pywin32

The only routine that requires `pywin32` is `win32_clipboard_get` which is not tested.
---
 IPython/core/tests/test_profile.py | 11 -----------
 IPython/core/tests/test_run.py     |  5 -----
 appveyor.yml                       |  2 +-
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/IPython/core/tests/test_profile.py b/IPython/core/tests/test_profile.py
index 07f43e4ec05..2732a8c8619 100644
--- a/IPython/core/tests/test_profile.py
+++ b/IPython/core/tests/test_profile.py
@@ -70,15 +70,6 @@ def teardown_module():
 #-----------------------------------------------------------------------------
 # Test functions
 #-----------------------------------------------------------------------------
-def win32_without_pywin32():
-    if sys.platform == 'win32':
-        try:
-            import pywin32
-        except ImportError:
-            return True
-    return False
-
-
 class ProfileStartupTest(TestCase):
     def setUp(self):
         # create profile dir
@@ -102,12 +93,10 @@ def init(self, startup_file, startup, test):
     def validate(self, output):
         tt.ipexec_validate(self.fname, output, '', options=self.options)
 
-    @dec.skipif(win32_without_pywin32(), "Test requires pywin32 on Windows")
     def test_startup_py(self):
         self.init('00-start.py', 'zzz=123\n', 'print(zzz)\n')
         self.validate('123')
 
-    @dec.skipif(win32_without_pywin32(), "Test requires pywin32 on Windows")
     def test_startup_ipy(self):
         self.init('00-start.ipy', '%xmode plain\n', '')
         self.validate('Exception reporting mode: Plain')
diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index c593a82da6a..742b6b27e4b 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -237,11 +237,6 @@ def test_simpledef(self):
 
     def test_obj_del(self):
         """Test that object's __del__ methods are called on exit."""
-        if sys.platform == 'win32':
-            try:
-                import win32api
-            except ImportError as e:
-                raise unittest.SkipTest("Test requires pywin32") from e
         src = ("class A(object):\n"
                "    def __del__(self):\n"
                "        print('object A deleted')\n"
diff --git a/appveyor.yml b/appveyor.yml
index 8f9841f5e7e..c3702755110 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,7 +26,7 @@ init:
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - python -m pip install --upgrade setuptools pip
-  - pip install nose coverage pytest pytest-cov pytest-trio pywin32 matplotlib pandas
+  - pip install nose coverage pytest pytest-cov pytest-trio matplotlib pandas
   - pip install -e .[test]
   - mkdir results
   - cd results

From 98372a94598eef79cf10a74c7081b707a853b233 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 8 Nov 2021 22:17:52 +0300
Subject: [PATCH 0803/1407] Add Path support to ipexec

---
 IPython/core/tests/test_profile.py | 2 +-
 IPython/testing/tools.py           | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/IPython/core/tests/test_profile.py b/IPython/core/tests/test_profile.py
index 2732a8c8619..8dd58cc67f4 100644
--- a/IPython/core/tests/test_profile.py
+++ b/IPython/core/tests/test_profile.py
@@ -91,7 +91,7 @@ def init(self, startup_file, startup, test):
             f.write(test)
 
     def validate(self, output):
-        tt.ipexec_validate(self.fname, output, '', options=self.options)
+        tt.ipexec_validate(self.fname, output, "", options=self.options)
 
     def test_startup_py(self):
         self.init('00-start.py', 'zzz=123\n', 'print(zzz)\n')
diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py
index 10bd4b6e0be..d1e57306b9d 100644
--- a/IPython/testing/tools.py
+++ b/IPython/testing/tools.py
@@ -177,7 +177,7 @@ def ipexec(fname, options=None, commands=()):
 
     Parameters
     ----------
-    fname : str
+    fname : str, Path
       Name of file to be executed (should have .py or .ipy extension).
 
     options : optional, list
@@ -200,6 +200,9 @@ def ipexec(fname, options=None, commands=()):
     # Absolute path for filename
     full_fname = os.path.join(test_dir, fname)
     full_cmd = ipython_cmd + cmdargs + ['--', full_fname]
+    if sys.platform == "win32" and sys.version_info < (3, 8):
+        # subprocess.Popen does not support Path objects yet
+        full_cmd = list(map(str, full_cmd))
     env = os.environ.copy()
     # FIXME: ignore all warnings in ipexec while we have shims
     # should we keep suppressing warnings here, even after removing shims?
@@ -232,7 +235,7 @@ def ipexec_validate(fname, expected_out, expected_err='',
 
     Parameters
     ----------
-    fname : str
+    fname : str, Path
       Name of the file to be executed (should have .py or .ipy extension).
 
     expected_out : str

From 63ddd77764600175adc5c246bf510227a18ef3db Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Tue, 9 Nov 2021 03:39:58 +0300
Subject: [PATCH 0804/1407] Fix codecov.yml syntax

It expects `paths` to be a list (though a string had been working previously) but for some reason Codecov will silently ignore mistakes and won't tell you that the file has incorrect syntax.
---
 codecov.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/codecov.yml b/codecov.yml
index 31ab1f18cfb..9a798d0c42d 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -5,10 +5,10 @@ coverage:
       default: false
       library:
         target: auto
-        paths: '!.*/tests/.*'
+        paths: ['!.*/tests/.*']
       tests:
         target: auto
-        paths: '.*/tests/.*'
+        paths: ['.*/tests/.*']
 codecov:
   require_ci_to_pass: false
 

From f9b36a4f407abf5a6379fe31d3e42ee1698f9639 Mon Sep 17 00:00:00 2001
From: Bibo Hao <haobibo@users.noreply.github.com>
Date: Tue, 9 Nov 2021 23:01:52 +0800
Subject: [PATCH 0805/1407] Update paths.py

---
 IPython/paths.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/paths.py b/IPython/paths.py
index a2ea5bc1159..f96ec4d36e4 100644
--- a/IPython/paths.py
+++ b/IPython/paths.py
@@ -72,7 +72,7 @@ def get_ipython_dir() -> str:
                     " using a temp directory.".format(parent))
             ipdir = tempfile.mkdtemp()
         else:
-            os.makedirs(ipdir)
+            os.makedirs(ipdir, exist_ok=True)
     assert isinstance(ipdir, str), "all path manipulation should be str(unicode), but are not."
     return ipdir
 

From 69c9dab7c56a46403f311de7d3076aa4ec69f6f6 Mon Sep 17 00:00:00 2001
From: Quentin Peter <impact27@users.noreply.github.com>
Date: Tue, 9 Nov 2021 16:17:45 +0100
Subject: [PATCH 0806/1407] f_locals might not have get

---
 IPython/core/debugger.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 978af307fc3..26aa94c1108 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -415,9 +415,10 @@ def _hidden_predicate(self, frame):
         if self._predicates["tbhide"]:
             if frame in (self.curframe, getattr(self, "initial_frame", None)):
                 return False
-            else:
-                return self._get_frame_locals(frame).get("__tracebackhide__", False)
-
+            frame_locals = self._get_frame_locals(frame)
+            if "__tracebackhide__" not in frame_locals:
+                return False
+            return frame_locals["__tracebackhide__"]
         return False
 
     def hidden_frames(self, stack):

From 4727faae664069510cb6bfcd0c905ce30fc3ca4c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 12 Nov 2021 10:27:54 -0800
Subject: [PATCH 0807/1407] Add Xfail test on 3.9.8

See https://bugs.python.org/issue45738 once fixed (or later if not fixed),
we can also catch system error only on the relevant Python versions and
that _should_ be ok, but I want to avoid doing it for now.
---
 IPython/core/tests/test_inputsplitter.py     |  2 +
 IPython/core/tests/test_inputtransformer2.py | 58 +++++++++++++++-----
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/IPython/core/tests/test_inputsplitter.py b/IPython/core/tests/test_inputsplitter.py
index 148c5f043e4..0a13fb68c85 100644
--- a/IPython/core/tests/test_inputsplitter.py
+++ b/IPython/core/tests/test_inputsplitter.py
@@ -12,6 +12,7 @@
 from IPython.core.inputtransformer import InputTransformer
 from IPython.core.tests.test_inputtransformer import syntax, syntax_ml
 from IPython.testing import tools as tt
+from IPython.testing.decorators import skipif
 
 #-----------------------------------------------------------------------------
 # Semi-complete examples (also used as tests)
@@ -321,6 +322,7 @@ def test_unicode(self):
         self.isp.push(u'\xc3\xa9')
         self.isp.push(u"u'\xc3\xa9'")
 
+    @skipif(sys.version_info[:3] == (3, 9, 8))
     def test_line_continuation(self):
         """ Test issue #2108."""
         isp = self.isp
diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index d341ec737ab..2a307d54d13 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -5,11 +5,14 @@
 transformations.
 """
 import string
+import sys
+from textwrap import dedent
 
-from IPython.core import inputtransformer2 as ipt2
-from IPython.core.inputtransformer2 import make_tokens_by_line, _find_assign_op
+import pytest
 
-from textwrap import dedent
+from IPython.core import inputtransformer2 as ipt2
+from IPython.core.inputtransformer2 import _find_assign_op, make_tokens_by_line
+from IPython.testing.decorators import skip_iptest_but_not_pytest
 
 MULTILINE_MAGIC = ("""\
 a = f()
@@ -256,20 +259,45 @@ def __init__(self, s):
     )
 
 
+examples = [
+    pytest.param("a = 1", "complete", None),
+    pytest.param("for a in range(5):", "incomplete", 4),
+    pytest.param("for a in range(5):\n    if a > 0:", "incomplete", 8),
+    pytest.param("raise = 2", "invalid", None),
+    pytest.param("a = [1,\n2,", "incomplete", 0),
+    pytest.param("(\n))", "incomplete", 0),
+    pytest.param("\\\r\n", "incomplete", 0),
+    pytest.param("a = '''\n   hi", "incomplete", 3),
+    pytest.param("def a():\n x=1\n global x", "invalid", None),
+    pytest.param(
+        "a \\ ",
+        "invalid",
+        None,
+        marks=pytest.mark.xfail(
+            reason="Bug in python 3.9.8 – bpo 45738",
+            condition=sys.version_info[:3] == (3, 9, 8),
+            raises=SystemError,
+            strict=True,
+        ),
+    ),  # Nothing allowed after backslash,
+    pytest.param("1\\\n+2", "complete", None),
+]
+
+
+@skip_iptest_but_not_pytest
+@pytest.mark.parametrize("code, expected, number", examples)
+def test_check_complete_param(code, expected, number):
+    cc = ipt2.TransformerManager().check_complete
+    assert cc(code) == (expected, number)
+
+
+@skip_iptest_but_not_pytest
+@pytest.mark.xfail(
+    reason="Bug in python 3.9.8 – bpo 45738",
+    condition=sys.version_info[:3] == (3, 9, 8),
+)
 def test_check_complete():
     cc = ipt2.TransformerManager().check_complete
-    assert cc("a = 1") == ("complete", None)
-    assert cc("for a in range(5):") == ("incomplete", 4)
-    assert cc("for a in range(5):\n    if a > 0:") == ("incomplete", 8)
-    assert cc("raise = 2") == ("invalid", None)
-    assert cc("a = [1,\n2,") == ("incomplete", 0)
-    assert cc("(\n))") == ("incomplete", 0)
-    assert cc("\\\r\n") == ("incomplete", 0)
-    assert cc("a = '''\n   hi") == ("incomplete", 3)
-    assert cc("def a():\n x=1\n global x") == ("invalid", None)
-    assert cc("a \\ ") == ("invalid", None)  # Nothing allowed after backslash
-    assert cc("1\\\n+2") == ("complete", None)
-    assert cc("exit") == ("complete", None)
 
     example = dedent("""
         if True:

From 317b1349689a3fc6794d1e3f585734833f4cee9a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 12 Nov 2021 12:43:37 -0800
Subject: [PATCH 0808/1407] relax coverage target

---
 codecov.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/codecov.yml b/codecov.yml
index 9a798d0c42d..2d3b8bb058c 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -6,6 +6,7 @@ coverage:
       library:
         target: auto
         paths: ['!.*/tests/.*']
+        threshold: 0.1%
       tests:
         target: auto
         paths: ['.*/tests/.*']

From 5a2a58eb557894b0fdca22014493399ebb54e40b Mon Sep 17 00:00:00 2001
From: Fernando Perez <fernando.perez@berkeley.edu>
Date: Wed, 10 Nov 2021 11:21:08 -0800
Subject: [PATCH 0809/1407] Document that `%run` can execute notebooks and ipy
 scripts.

This feature has been there for a long time but was not documented in the %run
docstring. This patch only adds documentation, without changing the
functionality.
---
 IPython/core/magics/execution.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index a5cfd5f6a12..f6586d64d99 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -522,7 +522,15 @@ def run(self, parameter_s='', runner=None,
         
           %run [-n -i -e -G]
                [( -t [-N<N>] | -d [-b<N>] | -p [profile options] )]
-               ( -m mod | file ) [args]
+               ( -m mod | filename ) [args]
+
+        The filename argument should be either a pure Python script (with
+        extension `.py`), or a file with custom IPython syntax (such as
+        magics). If the latter, the file can be either a script with `.ipy`
+        extension, or a Jupyter notebook with `.ipynb` extension. When running
+        a Jupyter notebook, the output from print statements and other
+        displayed objects will appear in the terminal (even matplotlib figures
+        will open, if a terminal-compliant backend is being used).
 
         Parameters after the filename are passed as command-line arguments to
         the program (put in sys.argv). Then, control returns to IPython's

From 86497d9bb8ec6628304323496ec67a9b54015805 Mon Sep 17 00:00:00 2001
From: Fernando Perez <fernando.perez@berkeley.edu>
Date: Wed, 10 Nov 2021 11:37:01 -0800
Subject: [PATCH 0810/1407] Update `%run` docs to mention parallel with
 `jupyter run`.

---
 IPython/core/magics/execution.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index f6586d64d99..e24992ff575 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -530,7 +530,10 @@ def run(self, parameter_s='', runner=None,
         extension, or a Jupyter notebook with `.ipynb` extension. When running
         a Jupyter notebook, the output from print statements and other
         displayed objects will appear in the terminal (even matplotlib figures
-        will open, if a terminal-compliant backend is being used).
+        will open, if a terminal-compliant backend is being used). Note that,
+        at the system command line, the `jupyter run` command offers similar
+        functionality for executing notebooks (albeit currently with some
+        differences in supported options).
 
         Parameters after the filename are passed as command-line arguments to
         the program (put in sys.argv). Then, control returns to IPython's

From ea376108e2e4434391b0a3698c0be6813540b1c4 Mon Sep 17 00:00:00 2001
From: Fernando Perez <fernando.perez@berkeley.edu>
Date: Wed, 10 Nov 2021 12:47:53 -0800
Subject: [PATCH 0811/1407] Fix backtics to be RST-formatted, not markdown.

---
 IPython/core/magics/execution.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index e24992ff575..8a262525f34 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -525,13 +525,13 @@ def run(self, parameter_s='', runner=None,
                ( -m mod | filename ) [args]
 
         The filename argument should be either a pure Python script (with
-        extension `.py`), or a file with custom IPython syntax (such as
-        magics). If the latter, the file can be either a script with `.ipy`
-        extension, or a Jupyter notebook with `.ipynb` extension. When running
+        extension ``.py``), or a file with custom IPython syntax (such as
+        magics). If the latter, the file can be either a script with ``.ipy``
+        extension, or a Jupyter notebook with ``.ipynb`` extension. When running
         a Jupyter notebook, the output from print statements and other
         displayed objects will appear in the terminal (even matplotlib figures
         will open, if a terminal-compliant backend is being used). Note that,
-        at the system command line, the `jupyter run` command offers similar
+        at the system command line, the ``jupyter run`` command offers similar
         functionality for executing notebooks (albeit currently with some
         differences in supported options).
 

From dfa6831643798e0eb2c5e752d5e3435e99be7085 Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <Kev.Kirsche+GitHub@gmail.com>
Date: Fri, 12 Nov 2021 08:26:10 -0500
Subject: [PATCH 0812/1407] Fix DeprecationWarning: There is no current event
 loop

Fix:

```
/Users/redacted/.asdf/installs/python/3.10.0/lib/python3.10/site-packages/IPython/terminal/interactiveshell.py:464: DeprecationWarning: There is no current event loop
  old_loop = asyncio.get_event_loop()
```

Per https://docs.python.org/3.10/library/asyncio-eventloop.html#asyncio.get_event_loop this method is deprecated and get_running_loop is preferred over this method moving forward. As IPython requires 3.7+ now, this can be updated
---
 IPython/terminal/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index b73a140f751..fd1e0035237 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -505,7 +505,7 @@ def prompt_for_code(self):
         # while/true inside which will freeze the prompt.
 
         try:
-            old_loop = asyncio.get_event_loop()
+            old_loop = asyncio.get_running_loop()
         except RuntimeError:
             # This happens when the user used `asyncio.run()`.
             old_loop = None

From 29f9992dfa9d2280996835cc41773f802eb793da Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 9 Nov 2021 11:11:21 -0800
Subject: [PATCH 0813/1407] Try to test downstream deps

---
 .github/workflows/downstream.yml | 50 ++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 .github/workflows/downstream.yml

diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
new file mode 100644
index 00000000000..168b32e2678
--- /dev/null
+++ b/.github/workflows/downstream.yml
@@ -0,0 +1,50 @@
+name: Run Downstream tests
+
+on:
+  push:
+  pull_request:
+  # Run weekly on Monday at 1:23 UTC
+  schedule:
+  - cron:  '23 1 * * 1'
+  workflow_dispatch:
+
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        python-version: ["3.9"]
+        include:
+          - os: macos-latest
+            python-version: "3.9"
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Update Python installer
+      run: |
+        python -m pip install --upgrade pip setuptools wheel
+    - name: Install ipykernel
+      run: |
+        cd .. 
+        git clone https://github.com/ipython/ipykernel
+        cd ipykernel
+        pip install -e .[test] 
+        cd ..
+    - name: Install and update Python dependencies
+      run: |
+        python -m pip install --upgrade -e file://$PWD#egg=ipython[test]
+        # we must instal IPython after ipykernel to get the right versions.
+        python -m pip install --upgrade --upgrade-strategy eager flaky ipyparallel
+        python -m pip install --upgrade pytest 
+    - name: pytest
+      env:
+        COLUMNS: 120
+      run: |
+        cd ../ipykernel
+        pytest

From 47037d10efddc808ea5909ba3c4c3936d641e7f4 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 1 Nov 2021 19:09:38 +0300
Subject: [PATCH 0814/1407] IPython.testing.tools without Nose

---
 IPython/testing/tools.py | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py
index d1e57306b9d..3dec1ffc634 100644
--- a/IPython/testing/tools.py
+++ b/IPython/testing/tools.py
@@ -21,15 +21,6 @@
 from subprocess import Popen, PIPE
 from unittest.mock import patch
 
-try:
-    # These tools are used by parts of the runtime, so we make the nose
-    # dependency optional at this point.  Nose is a hard dependency to run the
-    # test suite, but NOT to use ipython itself.
-    import nose.tools as nt
-    has_nose = True
-except ImportError:
-    has_nose = False
-
 from traitlets.config.loader import Config
 from IPython.utils.process import get_output_error_code
 from IPython.utils.text import list_strings
@@ -252,8 +243,6 @@ def ipexec_validate(fname, expected_out, expected_err='',
     None
     """
 
-    import nose.tools as nt
-
     out, err = ipexec(fname, options, commands)
     #print 'OUT', out  # dbg
     #print 'ERR', err  # dbg
@@ -261,12 +250,12 @@ def ipexec_validate(fname, expected_out, expected_err='',
     # more informative than simply having an empty stdout.
     if err:
         if expected_err:
-            nt.assert_equal("\n".join(err.strip().splitlines()), "\n".join(expected_err.strip().splitlines()))
+            assert err.strip().splitlines() == expected_err.strip().splitlines()
         else:
             raise ValueError('Running file %r produced error: %r' %
                              (fname, err))
     # If no errors or output on stderr was expected, match stdout
-    nt.assert_equal("\n".join(out.strip().splitlines()), "\n".join(expected_out.strip().splitlines()))
+    assert out.strip().splitlines() == expected_out.strip().splitlines()
 
 
 class TempFileMixin(unittest.TestCase):
@@ -458,10 +447,10 @@ def help_output_test(subcommand=''):
     """test that `ipython [subcommand] -h` works"""
     cmd = get_ipython_cmd() + [subcommand, '-h']
     out, err, rc = get_output_error_code(cmd)
-    nt.assert_equal(rc, 0, err)
-    nt.assert_not_in("Traceback", err)
-    nt.assert_in("Options", out)
-    nt.assert_in("--help-all", out)
+    assert rc == 0, err
+    assert "Traceback" not in err
+    assert "Options" in out
+    assert "--help-all" in out
     return out, err
 
 
@@ -469,9 +458,9 @@ def help_all_output_test(subcommand=''):
     """test that `ipython [subcommand] --help-all` works"""
     cmd = get_ipython_cmd() + [subcommand, '--help-all']
     out, err, rc = get_output_error_code(cmd)
-    nt.assert_equal(rc, 0, err)
-    nt.assert_not_in("Traceback", err)
-    nt.assert_in("Options", out)
-    nt.assert_in("Class", out)
+    assert rc == 0, err
+    assert "Traceback" not in err
+    assert "Options" in out
+    assert "Class" in out
     return out, err
 

From 360df2b6e99e3fabb6a7c1190b40aeba5aa2c997 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sun, 7 Nov 2021 21:04:20 +0300
Subject: [PATCH 0815/1407] Remove iptest and other Nose-dependent code

---
 .github/workflows/test.yml                    |   5 -
 CONTRIBUTING.md                               |  13 +-
 IPython/__init__.py                           |   1 -
 IPython/core/tests/test_completer.py          |  10 +-
 IPython/core/tests/test_magic.py              |   5 +-
 IPython/core/tests/test_magic_terminal.py     |   5 +-
 IPython/core/tests/test_run.py                |  13 +-
 IPython/external/decorators/__init__.py       |   8 -
 IPython/external/decorators/_decorators.py    | 150 ------
 .../decorators/_numpy_testing_noseclasses.py  |  47 --
 IPython/testing/__init__.py                   |  29 -
 IPython/testing/__main__.py                   |   3 -
 IPython/testing/decorators.py                 |  73 +--
 IPython/testing/iptest.py                     | 457 ----------------
 IPython/testing/iptestcontroller.py           | 496 ------------------
 IPython/testing/plugin/ipdoctest.py           | 310 -----------
 IPython/testing/plugin/iptest.py              |  18 -
 IPython/utils/tests/test_path.py              |  15 +-
 appveyor.yml                                  |   6 +-
 docs/environment.yml                          |   1 -
 docs/source/install/install.rst               |   5 +-
 setup.py                                      |   1 -
 setupbase.py                                  |   1 -
 tools/release_helper.sh                       |   2 +-
 24 files changed, 44 insertions(+), 1630 deletions(-)
 delete mode 100644 IPython/external/decorators/__init__.py
 delete mode 100644 IPython/external/decorators/_decorators.py
 delete mode 100644 IPython/external/decorators/_numpy_testing_noseclasses.py
 delete mode 100644 IPython/testing/__main__.py
 delete mode 100644 IPython/testing/iptest.py
 delete mode 100644 IPython/testing/iptestcontroller.py
 delete mode 100755 IPython/testing/plugin/iptest.py

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1a99ac62426..c79db6e0f7f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -38,11 +38,6 @@ jobs:
         python -m pip install --upgrade check-manifest pytest-cov anyio
     - name: Check manifest
       run: check-manifest
-    - name: iptest
-      run: |
-        cd /tmp && iptest --coverage xml && cd -
-        cp /tmp/ipy_coverage.xml ./
-        cp /tmp/.coverage ./
     - name: pytest
       env:
         COLUMNS: 120
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1c7922cce33..11321a4ca4c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -76,20 +76,15 @@ For more detailed information, see our [GitHub Workflow](https://github.com/ipyt
 
 All the tests can be run by using
 ```shell
-iptest
+pytest
 ```
 
 All the tests for a single module (for example **test_alias**) can be run by using the fully qualified path to the module.
 ```shell
-iptest IPython.core.tests.test_alias
+pytest IPython/core/tests/test_alias.py
 ```
 
-Only a single test (for example **test_alias_lifecycle**) within a single file can be run by adding the specific test after a `:` at the end:
+Only a single test (for example **test_alias_lifecycle**) within a single file can be run by adding the specific test after a `::` at the end:
 ```shell
-iptest IPython.core.tests.test_alias:test_alias_lifecycle
-```
-
-For convenience, the full path to a file can often be used instead of the module path on unix systems. For example we can run all the tests by using
-```shell
-iptest IPython/core/tests/test_alias.py
+pytest IPython/core/tests/test_alias.py::test_alias_lifecycle
 ```
diff --git a/IPython/__init__.py b/IPython/__init__.py
index 7d098bc9ee7..55cb5ef61bd 100644
--- a/IPython/__init__.py
+++ b/IPython/__init__.py
@@ -51,7 +51,6 @@
 from .terminal.embed import embed
 
 from .core.interactiveshell import InteractiveShell
-from .testing import test
 from .utils.sysinfo import sys_info
 from .utils.frame import extract_module_locals
 
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index b39818dc80d..61e1d35c1db 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -5,6 +5,7 @@
 # Distributed under the terms of the Modified BSD License.
 
 import os
+import pytest
 import sys
 import textwrap
 import unittest
@@ -14,7 +15,6 @@
 from traitlets.config.loader import Config
 from IPython import get_ipython
 from IPython.core import completer
-from IPython.external import decorators
 from IPython.utils.tempdir import TemporaryDirectory, TemporaryWorkingDirectory
 from IPython.utils.generics import complete_object
 from IPython.testing import decorators as dec
@@ -317,8 +317,8 @@ def test_forward_unicode_completion(self):
         self.assertEqual(matches, ["\u2164"])  # same as above but explicit.
 
     @unittest.skip("now we have a completion for \jmath")
-    @decorators.knownfailureif(
-        sys.platform == "win32", "Fails if there is a C:\\j... path"
+    @pytest.mark.xfail(
+        sys.platform == "win32", reason="Fails if there is a C:\\j... path"
     )
     def test_no_ascii_back_completion(self):
         ip = get_ipython()
@@ -357,8 +357,8 @@ def test_has_open_quotes4(self):
         for s in ['""', '""" """', '"hi" "ipython"']:
             self.assertFalse(completer.has_open_quotes(s))
 
-    @decorators.knownfailureif(
-        sys.platform == "win32", "abspath completions fail on Windows"
+    @pytest.mark.xfail(
+        sys.platform == "win32", reason="abspath completions fail on Windows"
     )
     def test_abspath_file_completions(self):
         ip = get_ipython()
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 8dd15dcd824..9c08926a3f3 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
-"""Tests for various magic functions.
-
-Needs to be run by nose (to make ipython session available).
-"""
+"""Tests for various magic functions."""
 
 import asyncio
 import io
diff --git a/IPython/core/tests/test_magic_terminal.py b/IPython/core/tests/test_magic_terminal.py
index 3b53aadf068..cffb7674c8e 100644
--- a/IPython/core/tests/test_magic_terminal.py
+++ b/IPython/core/tests/test_magic_terminal.py
@@ -1,7 +1,4 @@
-"""Tests for various magic functions specific to the terminal frontend.
-
-Needs to be run by nose (to make ipython session available).
-"""
+"""Tests for various magic functions specific to the terminal frontend."""
 
 #-----------------------------------------------------------------------------
 # Imports
diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index 742b6b27e4b..a8dfbd0e3c1 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -125,6 +125,9 @@ def doctest_run_option_parser_for_posix():
     """
 
 
+doctest_run_option_parser_for_posix.__skip_doctest__ = sys.platform == "win32"
+
+
 @dec.skip_if_not_win32
 def doctest_run_option_parser_for_windows():
     r"""Test option parser in %run (Windows specific).
@@ -132,16 +135,19 @@ def doctest_run_option_parser_for_windows():
     In Windows, you can't escape ``*` `by backslash:
 
     In [1]: %run print_argv.py print\\*.py
-    ['print\\*.py']
+    ['print\\\\*.py']
 
     You can use quote to escape glob:
 
     In [2]: %run print_argv.py 'print*.py'
-    ['print*.py']
+    ["'print*.py'"]
 
     """
 
 
+doctest_run_option_parser_for_windows.__skip_doctest__ = sys.platform != "win32"
+
+
 def doctest_reset_del():
     """Test that resetting doesn't cause errors in __del__ methods.
 
@@ -556,7 +562,6 @@ def test_multiprocessing_run():
     """
     with TemporaryDirectory() as td:
         mpm = sys.modules.get('__mp_main__')
-        assert mpm is not None
         sys.modules['__mp_main__'] = None
         try:
             path = pjoin(td, 'test.py')
@@ -575,7 +580,7 @@ def test_multiprocessing_run():
         finally:
             sys.modules['__mp_main__'] = mpm
 
-@dec.knownfailureif(sys.platform == 'win32', "writes to io.stdout aren't captured on Windows")
+
 def test_script_tb():
     """Test traceback offset in `ipython script.py`"""
     with TemporaryDirectory() as td:
diff --git a/IPython/external/decorators/__init__.py b/IPython/external/decorators/__init__.py
deleted file mode 100644
index 1db80edd357..00000000000
--- a/IPython/external/decorators/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-try:
-    from numpy.testing import KnownFailure, knownfailureif
-except ImportError:
-    from ._decorators import knownfailureif
-    try:
-        from ._numpy_testing_noseclasses import KnownFailure
-    except ImportError:
-        pass
diff --git a/IPython/external/decorators/_decorators.py b/IPython/external/decorators/_decorators.py
deleted file mode 100644
index 308652febcc..00000000000
--- a/IPython/external/decorators/_decorators.py
+++ /dev/null
@@ -1,150 +0,0 @@
-"""
-Decorators for labeling and modifying behavior of test objects.
-
-Decorators that merely return a modified version of the original
-function object are straightforward. Decorators that return a new
-function object need to use
-::
-
-  nose.tools.make_decorator(original_function)(decorator)
-
-in returning the decorator, in order to preserve meta-data such as
-function name, setup and teardown functions and so on - see
-``nose.tools`` for more information.
-
-"""
-
-# IPython changes: make this work if numpy not available
-# Original code:
-try:
-    from ._numpy_testing_noseclasses import KnownFailureTest
-except:
-    pass
-
-# End IPython changes
-
-
-def skipif(skip_condition, msg=None):
-    """
-    Make function raise SkipTest exception if a given condition is true.
-
-    If the condition is a callable, it is used at runtime to dynamically
-    make the decision. This is useful for tests that may require costly
-    imports, to delay the cost until the test suite is actually executed.
-
-    Parameters
-    ----------
-    skip_condition : bool or callable
-        Flag to determine whether to skip the decorated test.
-    msg : str, optional
-        Message to give on raising a SkipTest exception. Default is None.
-
-    Returns
-    -------
-    decorator : function
-        Decorator which, when applied to a function, causes SkipTest
-        to be raised when `skip_condition` is True, and the function
-        to be called normally otherwise.
-
-    Notes
-    -----
-    The decorator itself is decorated with the ``nose.tools.make_decorator``
-    function in order to transmit function name, and various other metadata.
-
-    """
-
-    def skip_decorator(f):
-        # Local import to avoid a hard nose dependency and only incur the
-        # import time overhead at actual test-time.
-        import nose
-
-        # Allow for both boolean or callable skip conditions.
-        if callable(skip_condition):
-            skip_val = lambda : skip_condition()
-        else:
-            skip_val = lambda : skip_condition
-
-        def get_msg(func,msg=None):
-            """Skip message with information about function being skipped."""
-            if msg is None:
-                out = 'Test skipped due to test condition'
-            else:
-                out = '\n'+msg
-
-            return "Skipping test: %s%s" % (func.__name__,out)
-
-        # We need to define *two* skippers because Python doesn't allow both
-        # return with value and yield inside the same function.
-        def skipper_func(*args, **kwargs):
-            """Skipper for normal test functions."""
-            if skip_val():
-                raise nose.SkipTest(get_msg(f,msg))
-            else:
-                return f(*args, **kwargs)
-
-        def skipper_gen(*args, **kwargs):
-            """Skipper for test generators."""
-            if skip_val():
-                raise nose.SkipTest(get_msg(f,msg))
-            else:
-                for x in f(*args, **kwargs):
-                    yield x
-
-        # Choose the right skipper to use when building the actual decorator.
-        if nose.util.isgenerator(f):
-            skipper = skipper_gen
-        else:
-            skipper = skipper_func
-
-        return nose.tools.make_decorator(f)(skipper)
-
-    return skip_decorator
-
-def knownfailureif(fail_condition, msg=None):
-    """
-    Make function raise KnownFailureTest exception if given condition is true.
-
-    Parameters
-    ----------
-    fail_condition : bool
-        Flag to determine whether to mark the decorated test as a known
-        failure (if True) or not (if False).
-    msg : str, optional
-        Message to give on raising a KnownFailureTest exception.
-        Default is None.
-
-    Returns
-    -------
-    decorator : function
-        Decorator, which, when applied to a function, causes KnownFailureTest to
-        be raised when `fail_condition` is True and the test fails.
-
-    Notes
-    -----
-    The decorator itself is decorated with the ``nose.tools.make_decorator``
-    function in order to transmit function name, and various other metadata.
-
-    """
-    if msg is None:
-        msg = 'Test skipped due to known failure'
-
-    def knownfail_decorator(f):
-        # Local import to avoid a hard nose dependency and only incur the
-        # import time overhead at actual test-time.
-        import nose
-
-        try:
-            from pytest import xfail
-        except ImportError:
-
-            def xfail(msg):
-                raise KnownFailureTest(msg)
-
-        def knownfailer(*args, **kwargs):
-            if fail_condition:
-                xfail(msg)
-            else:
-                return f(*args, **kwargs)
-        return nose.tools.make_decorator(f)(knownfailer)
-
-    return knownfail_decorator
diff --git a/IPython/external/decorators/_numpy_testing_noseclasses.py b/IPython/external/decorators/_numpy_testing_noseclasses.py
deleted file mode 100644
index 7a4360cf5b6..00000000000
--- a/IPython/external/decorators/_numpy_testing_noseclasses.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# IPython: modified copy of numpy.testing.noseclasses, so
-# IPython.external._decorators works without numpy being installed.
-
-# These classes implement a "known failure" error class.
-
-import os
-
-from nose.plugins.errorclass import ErrorClass, ErrorClassPlugin
-
-
-try:
-    import pytest
-
-    KnownFailureTest = pytest.xfail.Exception
-except ImportError:
-
-    class KnownFailureTest(Exception):
-        """Raise this exception to mark a test as a known failing test."""
-
-
-class KnownFailure(ErrorClassPlugin):
-    '''Plugin that installs a KNOWNFAIL error class for the
-    KnownFailureClass exception.  When KnownFailureTest is raised,
-    the exception will be logged in the knownfail attribute of the
-    result, 'K' or 'KNOWNFAIL' (verbose) will be output, and the
-    exception will not be counted as an error or failure.'''
-    enabled = True
-    knownfail = ErrorClass(KnownFailureTest,
-                           label='KNOWNFAIL',
-                           isfailure=False)
-
-    def options(self, parser, env=os.environ):
-        env_opt = 'NOSE_WITHOUT_KNOWNFAIL'
-        parser.add_option('--no-knownfail', action='store_true',
-                          dest='noKnownFail', default=env.get(env_opt, False),
-                          help='Disable special handling of KnownFailureTest '
-                               'exceptions')
-
-    def configure(self, options, conf):
-        if not self.can_configure:
-            return
-        self.conf = conf
-        disable = getattr(options, 'noKnownFail', False)
-        if disable:
-            self.enabled = False
-
-
diff --git a/IPython/testing/__init__.py b/IPython/testing/__init__.py
index 552608792d9..8fcd65ea41a 100644
--- a/IPython/testing/__init__.py
+++ b/IPython/testing/__init__.py
@@ -11,31 +11,6 @@
 
 import os
 
-#-----------------------------------------------------------------------------
-# Functions
-#-----------------------------------------------------------------------------
-
-# User-level entry point for testing
-def test(**kwargs):
-    """Run the entire IPython test suite.
-
-    Any of the options for run_iptestall() may be passed as keyword arguments.
-
-    For example::
-    
-        IPython.test(testgroups=['lib', 'config', 'utils'], fast=2)
-    
-    will run those three sections of the test suite, using two processes.
-    """
-
-    # Do the import internally, so that this function doesn't increase total
-    # import time
-    from .iptestcontroller import run_iptestall, default_options
-    options = default_options()
-    for name, val in kwargs.items():
-        setattr(options, name, val)
-    run_iptestall(options)
-
 #-----------------------------------------------------------------------------
 # Constants
 #-----------------------------------------------------------------------------
@@ -43,7 +18,3 @@ def test(**kwargs):
 # We scale all timeouts via this factor, slow machines can increase it
 IPYTHON_TESTING_TIMEOUT_SCALE = float(os.getenv(
                                     'IPYTHON_TESTING_TIMEOUT_SCALE', 1))
-
-# So nose doesn't try to run this as a test itself and we end up with an
-# infinite test loop
-test.__test__ = False
diff --git a/IPython/testing/__main__.py b/IPython/testing/__main__.py
deleted file mode 100644
index 4b0bb8ba9ca..00000000000
--- a/IPython/testing/__main__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-if __name__ == '__main__':
-    from IPython.testing import iptestcontroller
-    iptestcontroller.main()
diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
index 3ea101ce489..74af7c1c83d 100644
--- a/IPython/testing/decorators.py
+++ b/IPython/testing/decorators.py
@@ -44,11 +44,6 @@
 # Expose the unittest-driven decorators
 from .ipunittest import ipdoctest, ipdocstring
 
-# Grab the numpy-specific decorators which we keep in a file that we
-# occasionally update from upstream: decorators.py is a copy of
-# numpy.testing.decorators, we expose all of it here.
-from IPython.external.decorators import knownfailureif
-
 #-----------------------------------------------------------------------------
 # Classes and functions
 #-----------------------------------------------------------------------------
@@ -165,11 +160,8 @@ def skip_iptest_but_not_pytest(f):
     return f
 
 
-# Inspired by numpy's skipif, but uses the full apply_wrapper utility to
-# preserve function metadata better and allows the skip condition to be a
-# callable.
 def skipif(skip_condition, msg=None):
-    ''' Make function raise SkipTest exception if skip_condition is true
+    """Make function raise SkipTest exception if skip_condition is true
 
     Parameters
     ----------
@@ -188,57 +180,15 @@ def skipif(skip_condition, msg=None):
       Decorator, which, when applied to a function, causes SkipTest
       to be raised when the skip_condition was True, and the function
       to be called normally otherwise.
+    """
+    if msg is None:
+        msg = "Test skipped due to test condition."
 
-    Notes
-    -----
-    You will see from the code that we had to further decorate the
-    decorator with the nose.tools.make_decorator function in order to
-    transmit function name, and various other metadata.
-    '''
-
-    def skip_decorator(f):
-        # Local import to avoid a hard nose dependency and only incur the
-        # import time overhead at actual test-time.
-        import nose
-
-        # Allow for both boolean or callable skip conditions.
-        if callable(skip_condition):
-            skip_val = skip_condition
-        else:
-            skip_val = lambda : skip_condition
-
-        def get_msg(func,msg=None):
-            """Skip message with information about function being skipped."""
-            if msg is None: out = 'Test skipped due to test condition.'
-            else: out = msg
-            return "Skipping test: %s. %s" % (func.__name__,out)
-
-        # We need to define *two* skippers because Python doesn't allow both
-        # return with value and yield inside the same function.
-        def skipper_func(*args, **kwargs):
-            """Skipper for normal test functions."""
-            if skip_val():
-                raise nose.SkipTest(get_msg(f,msg))
-            else:
-                return f(*args, **kwargs)
-
-        def skipper_gen(*args, **kwargs):
-            """Skipper for test generators."""
-            if skip_val():
-                raise nose.SkipTest(get_msg(f,msg))
-            else:
-                for x in f(*args, **kwargs):
-                    yield x
-
-        # Choose the right skipper to use when building the actual generator.
-        if nose.util.isgenerator(f):
-            skipper = skipper_gen
-        else:
-            skipper = skipper_func
+    import pytest
 
-        return nose.tools.make_decorator(f)(skipper)
+    assert isinstance(skip_condition, bool)
+    return pytest.mark.skipif(skip_condition, reason=msg)
 
-    return skip_decorator
 
 # A version with the condition set to true, common case just to attach a message
 # to a skip decorator
@@ -265,12 +215,7 @@ def skip(msg=None):
 def onlyif(condition, msg):
     """The reverse from skipif, see skipif for details."""
 
-    if callable(condition):
-        skip_condition = lambda : not condition()
-    else:
-        skip_condition = lambda : not condition
-
-    return skipif(skip_condition, msg)
+    return skipif(not condition, msg)
 
 #-----------------------------------------------------------------------------
 # Utility functions for decorators
@@ -351,8 +296,6 @@ def skip_file_no_x11(name):
 
 skipif_not_sympy = skip_without('sympy')
 
-skip_known_failure = knownfailureif(True,'This test is known to fail')
-
 # A null 'decorator', useful to make more readable code that needs to pick
 # between different decorators based on OS or other conditions
 null_deco = lambda f: f
diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
deleted file mode 100644
index 8b7e34cbb3e..00000000000
--- a/IPython/testing/iptest.py
+++ /dev/null
@@ -1,457 +0,0 @@
-# -*- coding: utf-8 -*-
-"""IPython Test Suite Runner.
-
-This module provides a main entry point to a user script to test IPython
-itself from the command line. There are two ways of running this script:
-
-1. With the syntax `iptest all`.  This runs our entire test suite by
-   calling this script (with different arguments) recursively.  This
-   causes modules and package to be tested in different processes, using nose
-   or trial where appropriate.
-2. With the regular nose syntax, like `iptest IPython -- -vvs`. In this form
-   the script simply calls nose, but with special command line flags and
-   plugins loaded. Options after `--` are passed to nose.
-
-"""
-
-# Copyright (c) IPython Development Team.
-# Distributed under the terms of the Modified BSD License.
-
-
-import glob
-from io import BytesIO
-import os
-import os.path as path
-import sys
-from threading import Thread, Lock, Event
-import warnings
-
-import nose.plugins.builtin
-from nose.plugins.xunit import Xunit
-from nose import SkipTest
-from nose.core import TestProgram
-from nose.plugins import Plugin
-from nose.util import safe_str
-
-from IPython import version_info
-from IPython.utils.py3compat import decode
-from IPython.utils.importstring import import_item
-from IPython.testing.plugin.ipdoctest import IPythonDoctest
-from IPython.external.decorators import KnownFailure, knownfailureif
-
-pjoin = path.join
-
-
-# Enable printing all warnings raise by IPython's modules
-warnings.filterwarnings('ignore', message='.*Matplotlib is building the font cache.*', category=UserWarning, module='.*')
-warnings.filterwarnings('error', message='.*', category=ResourceWarning, module='.*')
-warnings.filterwarnings('error', message=".*{'config': True}.*", category=DeprecationWarning, module='IPy.*')
-warnings.filterwarnings('default', message='.*', category=Warning, module='IPy.*')
-
-warnings.filterwarnings('error', message='.*apply_wrapper.*', category=DeprecationWarning, module='.*')
-warnings.filterwarnings('error', message='.*make_label_dec', category=DeprecationWarning, module='.*')
-warnings.filterwarnings('error', message='.*decorated_dummy.*', category=DeprecationWarning, module='.*')
-warnings.filterwarnings('error', message='.*skip_file_no_x11.*', category=DeprecationWarning, module='.*')
-warnings.filterwarnings('error', message='.*onlyif_any_cmd_exists.*', category=DeprecationWarning, module='.*')
-
-warnings.filterwarnings('error', message='.*disable_gui.*', category=DeprecationWarning, module='.*')
-
-warnings.filterwarnings('error', message='.*ExceptionColors global is deprecated.*', category=DeprecationWarning, module='.*')
-warnings.filterwarnings('error', message='.*IPython.core.display.*', category=DeprecationWarning, module='.*')
-
-# Jedi older versions
-warnings.filterwarnings(
-    'error', message='.*elementwise != comparison failed and.*', category=FutureWarning, module='.*')
-
-if version_info < (6,):
-    # nose.tools renames all things from `camelCase` to `snake_case` which raise an
-    # warning with the runner they also import from standard import library. (as of Dec 2015)
-    # Ignore, let's revisit that in a couple of years for IPython 6.
-    warnings.filterwarnings(
-        'ignore', message='.*Please use assertEqual instead', category=Warning, module='IPython.*')
-
-if version_info < (8,):
-    warnings.filterwarnings('ignore', message='.*Completer.complete.*',
-                            category=PendingDeprecationWarning, module='.*')
-else:
-    warnings.warn(
-        'Completer.complete was pending deprecation and should be changed to Deprecated', FutureWarning)
-
-
-
-# ------------------------------------------------------------------------------
-# Monkeypatch Xunit to count known failures as skipped.
-# ------------------------------------------------------------------------------
-def monkeypatch_xunit():
-    try:
-        dec.knownfailureif(True)(lambda: None)()
-    except Exception as e:
-        KnownFailureTest = type(e)
-
-    def addError(self, test, err, capt=None):
-        if issubclass(err[0], KnownFailureTest):
-            err = (SkipTest,) + err[1:]
-        return self.orig_addError(test, err, capt)
-
-    Xunit.orig_addError = Xunit.addError
-    Xunit.addError = addError
-
-#-----------------------------------------------------------------------------
-# Check which dependencies are installed and greater than minimum version.
-#-----------------------------------------------------------------------------
-def extract_version(mod):
-    return mod.__version__
-
-def test_for(item, min_version=None, callback=extract_version):
-    """Test to see if item is importable, and optionally check against a minimum
-    version.
-
-    If min_version is given, the default behavior is to check against the
-    `__version__` attribute of the item, but specifying `callback` allows you to
-    extract the value you are interested in. e.g::
-
-        In [1]: import sys
-
-        In [2]: from IPython.testing.iptest import test_for
-
-        In [3]: test_for('sys', (2,6), callback=lambda sys: sys.version_info)
-        Out[3]: True
-
-    """
-    try:
-        check = import_item(item)
-    except (ImportError, RuntimeError):
-        # GTK reports Runtime error if it can't be initialized even if it's
-        # importable.
-        return False
-    else:
-        if min_version:
-            if callback:
-                # extra processing step to get version to compare
-                check = callback(check)
-
-            return check >= min_version
-        else:
-            return True
-
-# Global dict where we can store information on what we have and what we don't
-# have available at test run time
-have = {'matplotlib': test_for('matplotlib'),
-        'pygments': test_for('pygments'),
-        }
-
-#-----------------------------------------------------------------------------
-# Test suite definitions
-#-----------------------------------------------------------------------------
-
-test_group_names = ['core',
-                    'extensions', 'lib', 'terminal', 'testing', 'utils',
-                   ]
-
-class TestSection(object):
-    def __init__(self, name, includes):
-        self.name = name
-        self.includes = includes
-        self.excludes = []
-        self.dependencies = []
-        self.enabled = True
-    
-    def exclude(self, module):
-        if not module.startswith('IPython'):
-            module = self.includes[0] + "." + module
-        self.excludes.append(module.replace('.', os.sep))
-    
-    def requires(self, *packages):
-        self.dependencies.extend(packages)
-    
-    @property
-    def will_run(self):
-        return self.enabled and all(have[p] for p in self.dependencies)
-
-# Name -> (include, exclude, dependencies_met)
-test_sections = {n:TestSection(n, ['IPython.%s' % n]) for n in test_group_names}
-
-
-# Exclusions and dependencies
-# ---------------------------
-
-# core:
-sec = test_sections['core']
-if not have['matplotlib']:
-    sec.exclude('pylabtools'),
-    sec.exclude('tests.test_pylabtools')
-
-# lib:
-sec = test_sections['lib']
-sec.exclude('tests.test_latextools')
-#sec.exclude('kernel')
-if not have['pygments']:
-    sec.exclude('tests.test_lexers')
-# We do this unconditionally, so that the test suite doesn't import
-# gtk, changing the default encoding and masking some unicode bugs.
-sec.exclude('inputhookgtk')
-# We also do this unconditionally, because wx can interfere with Unix signals.
-# There are currently no tests for it anyway.
-sec.exclude('inputhookwx')
-# Testing inputhook will need a lot of thought, to figure out
-# how to have tests that don't lock up with the gui event
-# loops in the picture
-sec.exclude('inputhook')
-
-# testing:
-sec = test_sections['testing']
-# These have to be skipped on win32 because they use echo, rm, cd, etc.
-# See ticket https://github.com/ipython/ipython/issues/87
-if sys.platform == 'win32':
-    sec.exclude('plugin.test_exampleip')
-    sec.exclude('plugin.dtexample')
-
-# don't run jupyter_console tests found via shim
-test_sections['terminal'].exclude('console')
-
-# extensions:
-sec = test_sections['extensions']
-# autoreload does some strange stuff, so move it to its own test section
-sec.exclude('autoreload')
-sec.exclude('tests.test_autoreload')
-test_sections['autoreload'] = TestSection('autoreload',
-        ['IPython.extensions.autoreload', 'IPython.extensions.tests.test_autoreload'])
-test_group_names.append('autoreload')
-
-
-#-----------------------------------------------------------------------------
-# Functions and classes
-#-----------------------------------------------------------------------------
-
-def check_exclusions_exist():
-    from IPython.paths import get_ipython_package_dir
-    from warnings import warn
-    parent = os.path.dirname(get_ipython_package_dir())
-    for sec in test_sections:
-        for pattern in sec.exclusions:
-            fullpath = pjoin(parent, pattern)
-            if not os.path.exists(fullpath) and not glob.glob(fullpath + '.*'):
-                warn("Excluding nonexistent file: %r" % pattern)
-
-
-class ExclusionPlugin(Plugin):
-    """A nose plugin to effect our exclusions of files and directories.
-    """
-    name = 'exclusions'
-    score = 3000  # Should come before any other plugins
-    
-    def __init__(self, exclude_patterns=None):
-        """
-        Parameters
-        ----------
-
-        exclude_patterns : sequence of strings, optional
-          Filenames containing these patterns (as raw strings, not as regular
-          expressions) are excluded from the tests.
-        """
-        self.exclude_patterns = exclude_patterns or []
-        super(ExclusionPlugin, self).__init__()
-
-    def options(self, parser, env=os.environ):
-        Plugin.options(self, parser, env)
-    
-    def configure(self, options, config):
-        Plugin.configure(self, options, config)
-        # Override nose trying to disable plugin.
-        self.enabled = True
-        
-    def wantFile(self, filename):
-        """Return whether the given filename should be scanned for tests.
-        """
-        if any(pat in filename for pat in self.exclude_patterns):
-            return False
-        return None
-
-    def wantDirectory(self, directory):
-        """Return whether the given directory should be scanned for tests.
-        """
-        if any(pat in directory for pat in self.exclude_patterns):
-            return False
-        return None
-
-
-class StreamCapturer(Thread):
-    daemon = True  # Don't hang if main thread crashes
-    started = False
-    def __init__(self, echo=False):
-        super(StreamCapturer, self).__init__()
-        self.echo = echo
-        self.streams = []
-        self.buffer = BytesIO()
-        self.readfd, self.writefd = os.pipe()
-        self.buffer_lock = Lock()
-        self.stop = Event()
-
-    def run(self):
-        self.started = True
-
-        while not self.stop.is_set():
-            chunk = os.read(self.readfd, 1024)
-
-            with self.buffer_lock:
-                self.buffer.write(chunk)
-            if self.echo:
-                sys.stdout.write(decode(chunk))
-
-        os.close(self.readfd)
-        os.close(self.writefd)
-
-    def reset_buffer(self):
-        with self.buffer_lock:
-            self.buffer.truncate(0)
-            self.buffer.seek(0)
-
-    def get_buffer(self):
-        with self.buffer_lock:
-            return self.buffer.getvalue()
-
-    def ensure_started(self):
-        if not self.started:
-            self.start()
-
-    def halt(self):
-        """Safely stop the thread."""
-        if not self.started:
-            return
-
-        self.stop.set()
-        os.write(self.writefd, b'\0')  # Ensure we're not locked in a read()
-        self.join()
-
-class SubprocessStreamCapturePlugin(Plugin):
-    name='subprocstreams'
-    def __init__(self):
-        Plugin.__init__(self)
-        self.stream_capturer = StreamCapturer()
-        self.destination = os.environ.get('IPTEST_SUBPROC_STREAMS', 'capture')
-        # This is ugly, but distant parts of the test machinery need to be able
-        # to redirect streams, so we make the object globally accessible.
-        nose.iptest_stdstreams_fileno = self.get_write_fileno
-
-    def get_write_fileno(self):
-        if self.destination == 'capture':
-            self.stream_capturer.ensure_started()
-            return self.stream_capturer.writefd
-        elif self.destination == 'discard':
-            return os.open(os.devnull, os.O_WRONLY)
-        else:
-            return sys.__stdout__.fileno()
-    
-    def configure(self, options, config):
-        Plugin.configure(self, options, config)
-        # Override nose trying to disable plugin.
-        if self.destination == 'capture':
-            self.enabled = True
-    
-    def startTest(self, test):
-        # Reset log capture
-        self.stream_capturer.reset_buffer()
-    
-    def formatFailure(self, test, err):
-        # Show output
-        ec, ev, tb = err
-        captured = self.stream_capturer.get_buffer().decode('utf-8', 'replace')
-        if captured.strip():
-            ev = safe_str(ev)
-            out = [ev, '>> begin captured subprocess output <<',
-                    captured,
-                    '>> end captured subprocess output <<']
-            return ec, '\n'.join(out), tb
-
-        return err
-    
-    formatError = formatFailure
-    
-    def finalize(self, result):
-        self.stream_capturer.halt()
-
-
-def run_iptest():
-    """Run the IPython test suite using nose.
-
-    This function is called when this script is **not** called with the form
-    `iptest all`.  It simply calls nose with appropriate command line flags
-    and accepts all of the standard nose arguments.
-    """
-    # Apply our monkeypatch to Xunit
-    if '--with-xunit' in sys.argv and not hasattr(Xunit, 'orig_addError'):
-        monkeypatch_xunit()
-
-    arg1 = sys.argv[1]
-    if arg1.startswith('IPython/'):
-        if arg1.endswith('.py'):
-            arg1 = arg1[:-3]
-        sys.argv[1] = arg1.replace('/', '.')
-    
-    arg1 = sys.argv[1]
-    if arg1 in test_sections:
-        section = test_sections[arg1]
-        sys.argv[1:2] = section.includes
-    elif arg1.startswith('IPython.') and arg1[8:] in test_sections:
-        section = test_sections[arg1[8:]]
-        sys.argv[1:2] = section.includes
-    else:
-        section = TestSection(arg1, includes=[arg1])
-        
-
-    argv = sys.argv + [ '--detailed-errors',  # extra info in tracebacks
-                        # We add --exe because of setuptools' imbecility (it
-                        # blindly does chmod +x on ALL files).  Nose does the
-                        # right thing and it tries to avoid executables,
-                        # setuptools unfortunately forces our hand here.  This
-                        # has been discussed on the distutils list and the
-                        # setuptools devs refuse to fix this problem!
-                        '--exe',
-                        ]
-    if '-a' not in argv and '-A' not in argv:
-        argv = argv + ['-a', '!crash']
-
-    if nose.__version__ >= '0.11':
-        # I don't fully understand why we need this one, but depending on what
-        # directory the test suite is run from, if we don't give it, 0 tests
-        # get run.  Specifically, if the test suite is run from the source dir
-        # with an argument (like 'iptest.py IPython.core', 0 tests are run,
-        # even if the same call done in this directory works fine).  It appears
-        # that if the requested package is in the current dir, nose bails early
-        # by default.  Since it's otherwise harmless, leave it in by default
-        # for nose >= 0.11, though unfortunately nose 0.10 doesn't support it.
-        argv.append('--traverse-namespace')
-
-    plugins = [ ExclusionPlugin(section.excludes), KnownFailure(),
-               SubprocessStreamCapturePlugin() ]
-    
-    # we still have some vestigial doctests in core
-    if (section.name.startswith(('core', 'IPython.core', 'IPython.utils'))):
-        plugins.append(IPythonDoctest())
-        argv.extend([
-            '--with-ipdoctest',
-            '--ipdoctest-tests',
-            '--ipdoctest-extension=txt',
-        ])
-
-    
-    # Use working directory set by parent process (see iptestcontroller)
-    if 'IPTEST_WORKING_DIR' in os.environ:
-        os.chdir(os.environ['IPTEST_WORKING_DIR'])
-    
-    # We need a global ipython running in this process, but the special
-    # in-process group spawns its own IPython kernels, so for *that* group we
-    # must avoid also opening the global one (otherwise there's a conflict of
-    # singletons).  Ultimately the solution to this problem is to refactor our
-    # assumptions about what needs to be a singleton and what doesn't (app
-    # objects should, individual shells shouldn't).  But for now, this
-    # workaround allows the test suite for the inprocess module to complete.
-    if 'kernel.inprocess' not in section.name:
-        from IPython.testing import globalipapp
-        globalipapp.start_ipython()
-
-    # Now nose can run
-    TestProgram(argv=argv, addplugins=plugins)
-
-if __name__ == '__main__':
-    run_iptest()
diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py
deleted file mode 100644
index e50ab862ff3..00000000000
--- a/IPython/testing/iptestcontroller.py
+++ /dev/null
@@ -1,496 +0,0 @@
-# -*- coding: utf-8 -*-
-"""IPython Test Process Controller
-
-This module runs one or more subprocesses which will actually run the IPython
-test suite.
-
-"""
-
-# Copyright (c) IPython Development Team.
-# Distributed under the terms of the Modified BSD License.
-
-
-import argparse
-import multiprocessing.pool
-import os
-import stat
-import shutil
-import signal
-import sys
-import subprocess
-import time
-
-from .iptest import (
-    have, test_group_names as py_test_group_names, test_sections, StreamCapturer,
-)
-from IPython.utils.path import compress_user
-from IPython.utils.py3compat import decode
-from IPython.utils.sysinfo import get_sys_info
-from IPython.utils.tempdir import TemporaryDirectory
-from pathlib import Path
-from typing import Dict
-
-class TestController:
-    """Run tests in a subprocess
-    """
-    #: str, IPython test suite to be executed.
-    section = None
-    #: list, command line arguments to be executed
-    cmd = None
-    #: dict, extra environment variables to set for the subprocess
-    env: Dict[str, str] = {}
-    #: list, TemporaryDirectory instances to clear up when the process finishes
-    dirs = None
-    #: subprocess.Popen instance
-    process = None
-    #: str, process stdout+stderr
-    stdout = None
-
-    def __init__(self):
-        self.cmd = []
-        self.env = {}
-        self.dirs = []
-
-    def setUp(self):
-        """Create temporary directories etc.
-        
-        This is only called when we know the test group will be run. Things
-        created here may be cleaned up by self.cleanup().
-        """
-        pass
-
-    def launch(self, buffer_output=False, capture_output=False):
-        # print('*** ENV:', self.env)  # dbg
-        # print('*** CMD:', self.cmd)  # dbg
-        env = os.environ.copy()
-        env.update(self.env)
-        if buffer_output:
-            capture_output = True
-        self.stdout_capturer = c = StreamCapturer(echo=not buffer_output)
-        c.start()
-        stdout = c.writefd if capture_output else None
-        stderr = subprocess.STDOUT if capture_output else None
-        for k, v in env.items():
-            assert isinstance(v, str), f"env[{repr(k)}] is not a str: {v}"
-        self.process = subprocess.Popen(self.cmd, stdout=stdout,
-                stderr=stderr, env=env)
-
-    def wait(self):
-        self.process.wait()
-        self.stdout_capturer.halt()
-        self.stdout = self.stdout_capturer.get_buffer()
-        return self.process.returncode
-
-    def cleanup_process(self):
-        """Cleanup on exit by killing any leftover processes."""
-        subp = self.process
-        if subp is None or (subp.poll() is not None):
-            return  # Process doesn't exist, or is already dead.
-
-        try:
-            print('Cleaning up stale PID: %d' % subp.pid)
-            subp.kill()
-        except: # (OSError, WindowsError) ?
-            # This is just a best effort, if we fail or the process was
-            # really gone, ignore it.
-            pass
-        else:
-            for i in range(10):
-                if subp.poll() is None:
-                    time.sleep(0.1)
-                else:
-                    break
-
-        if subp.poll() is None:
-            # The process did not die...
-            print('... failed. Manual cleanup may be required.')
-
-    def cleanup(self):
-        "Kill process if it's still alive, and clean up temporary directories"
-        self.cleanup_process()
-        for td in self.dirs:
-            td.cleanup()
-
-    __del__ = cleanup
-
-
-class PyTestController(TestController):
-    """Run Python tests using IPython.testing.iptest"""
-    #: str, Python command to execute in subprocess
-    pycmd = None
-
-    def __init__(self, section, options):
-        """Create new test runner."""
-        TestController.__init__(self)
-        self.section = section
-        # pycmd is put into cmd[2] in PyTestController.launch()
-        self.cmd = [sys.executable, '-c', None, section]
-        self.pycmd = "from IPython.testing.iptest import run_iptest; run_iptest()"
-        self.options = options
-
-    def setup(self):
-        ipydir = TemporaryDirectory()
-        self.dirs.append(ipydir)
-        self.env['IPYTHONDIR'] = ipydir.name
-        self.workingdir = workingdir = TemporaryDirectory()
-        self.dirs.append(workingdir)
-        self.env['IPTEST_WORKING_DIR'] = workingdir.name
-        # This means we won't get odd effects from our own matplotlib config
-        self.env['MPLCONFIGDIR'] = workingdir.name
-        # For security reasons (http://bugs.python.org/issue16202), use
-        # a temporary directory to which other users have no access.
-        self.env['TMPDIR'] = workingdir.name
-
-        # Add a non-accessible directory to PATH (see gh-7053)
-        noaccess = Path(self.workingdir.name) / "_no_access_"
-        self.noaccess = noaccess.resolve()
-
-        noaccess.mkdir(0, exist_ok=True)
-
-        PATH = os.environ.get('PATH', '')
-        if PATH:
-            PATH = noaccess / PATH
-        else:
-            PATH = noaccess
-        self.env["PATH"] = str(PATH)
-
-        # From options:
-        if self.options.xunit:
-            self.add_xunit()
-        if self.options.coverage:
-            self.add_coverage()
-        self.env['IPTEST_SUBPROC_STREAMS'] = self.options.subproc_streams
-        self.cmd.extend(self.options.extra_args)
-
-    def cleanup(self):
-        """
-        Make the non-accessible directory created in setup() accessible
-        again, otherwise deleting the workingdir will fail.
-        """
-        self.noaccess.chmod(stat.S_IRWXU)
-        TestController.cleanup(self)
-
-    @property
-    def will_run(self):
-        try:
-            return test_sections[self.section].will_run
-        except KeyError:
-            return True
-
-    def add_xunit(self):
-        xunit_file = Path(f"{self.section}.xunit.xml")
-        self.cmd.extend(["--with-xunit", "--xunit-file", xunit_file.absolute()])
-
-    def add_coverage(self):
-        try:
-            sources = test_sections[self.section].includes
-        except KeyError:
-            sources = ["IPython"]
-
-        coverage_rc = (
-            "[run]\n" "data_file = {data_file}\n" "source =\n" "  {source}\n"
-        ).format(
-            data_file=Path(f".coverage.{self.section}").absolute(),
-            source="\n  ".join(sources),
-        )
-        config_file: Path = Path(self.workingdir.name) / ".coveragerc"
-        config_file.touch(exist_ok=True)
-        config_file.write_text(coverage_rc)
-
-        self.env["COVERAGE_PROCESS_START"] = str(config_file.resolve())
-        self.pycmd = "import coverage; coverage.process_startup(); " + self.pycmd
-
-    def launch(self, buffer_output=False):
-        self.cmd[2] = self.pycmd
-        super(PyTestController, self).launch(buffer_output=buffer_output)
-
-
-def prepare_controllers(options):
-    """Returns two lists of TestController instances, those to run, and those
-    not to run."""
-    testgroups = options.testgroups
-    if not testgroups:
-        testgroups = py_test_group_names
-
-    controllers = [PyTestController(name, options) for name in testgroups]
-
-    to_run = [c for c in controllers if c.will_run]
-    not_run = [c for c in controllers if not c.will_run]
-    return to_run, not_run
-
-def do_run(controller, buffer_output=True):
-    """Setup and run a test controller.
-    
-    If buffer_output is True, no output is displayed, to avoid it appearing
-    interleaved. In this case, the caller is responsible for displaying test
-    output on failure.
-    
-    Returns
-    -------
-    controller : TestController
-      The same controller as passed in, as a convenience for using map() type
-      APIs.
-    exitcode : int
-      The exit code of the test subprocess. Non-zero indicates failure.
-    """
-    try:
-        try:
-            controller.setup()
-            controller.launch(buffer_output=buffer_output)
-        except Exception:
-            import traceback
-            traceback.print_exc()
-            return controller, 1  # signal failure
-
-        exitcode = controller.wait()
-        return controller, exitcode
-
-    except KeyboardInterrupt:
-        return controller, -signal.SIGINT
-    finally:
-        controller.cleanup()
-
-def report():
-    """Return a string with a summary report of test-related variables."""
-    inf = get_sys_info()
-    out = []
-    def _add(name, value):
-        out.append((name, value))
-
-    _add('IPython version', inf['ipython_version'])
-    _add('IPython commit', "{} ({})".format(inf['commit_hash'], inf['commit_source']))
-    _add('IPython package', compress_user(inf['ipython_path']))
-    _add('Python version', inf['sys_version'].replace('\n',''))
-    _add('sys.executable', compress_user(inf['sys_executable']))
-    _add('Platform', inf['platform'])
-
-    width = max(len(n) for (n,v) in out)
-    out = ["{:<{width}}: {}\n".format(n, v, width=width) for (n,v) in out]
-
-    avail = []
-    not_avail = []
-
-    for k, is_avail in have.items():
-        if is_avail:
-            avail.append(k)
-        else:
-            not_avail.append(k)
-
-    if avail:
-        out.append('\nTools and libraries available at test time:\n')
-        avail.sort()
-        out.append('   ' + ' '.join(avail)+'\n')
-
-    if not_avail:
-        out.append('\nTools and libraries NOT available at test time:\n')
-        not_avail.sort()
-        out.append('   ' + ' '.join(not_avail)+'\n')
-
-    return ''.join(out)
-
-def run_iptestall(options):
-    """Run the entire IPython test suite by calling nose and trial.
-
-    This function constructs :class:`IPTester` instances for all IPython
-    modules and package and then runs each of them.  This causes the modules
-    and packages of IPython to be tested each in their own subprocess using
-    nose.
-
-    Parameters
-    ----------
-
-    All parameters are passed as attributes of the options object.
-
-    testgroups : list of str
-      Run only these sections of the test suite. If empty, run all the available
-      sections.
-
-    fast : int or None
-      Run the test suite in parallel, using n simultaneous processes. If None
-      is passed, one process is used per CPU core. Default 1 (i.e. sequential)
-
-    inc_slow : bool
-      Include slow tests. By default, these tests aren't run.
-
-    url : unicode
-      Address:port to use when running the JS tests.
-
-    xunit : bool
-      Produce Xunit XML output. This is written to multiple foo.xunit.xml files.
-
-    coverage : bool or str
-      Measure code coverage from tests. True will store the raw coverage data,
-      or pass 'html' or 'xml' to get reports.
-
-    extra_args : list
-      Extra arguments to pass to the test subprocesses, e.g. '-v'
-    """
-    to_run, not_run = prepare_controllers(options)
-
-    def justify(ltext, rtext, width=70, fill='-'):
-        ltext += ' '
-        rtext = (' ' + rtext).rjust(width - len(ltext), fill)
-        return ltext + rtext
-
-    # Run all test runners, tracking execution time
-    failed = []
-    t_start = time.time()
-
-    print()
-    if options.fast == 1:
-        # This actually means sequential, i.e. with 1 job
-        for controller in to_run:
-            print('Test group:', controller.section)
-            sys.stdout.flush()  # Show in correct order when output is piped
-            controller, res = do_run(controller, buffer_output=False)
-            if res:
-                failed.append(controller)
-                if res == -signal.SIGINT:
-                    print("Interrupted")
-                    break
-            print()
-
-    else:
-        # Run tests concurrently
-        try:
-            pool = multiprocessing.pool.ThreadPool(options.fast)
-            for (controller, res) in pool.imap_unordered(do_run, to_run):
-                res_string = 'OK' if res == 0 else 'FAILED'
-                print(justify('Test group: ' + controller.section, res_string))
-                if res:
-                    print(decode(controller.stdout))
-                    failed.append(controller)
-                    if res == -signal.SIGINT:
-                        print("Interrupted")
-                        break
-        except KeyboardInterrupt:
-            return
-
-    for controller in not_run:
-        print(justify('Test group: ' + controller.section, 'NOT RUN'))
-
-    t_end = time.time()
-    t_tests = t_end - t_start
-    nrunners = len(to_run)
-    nfail = len(failed)
-    # summarize results
-    print('_'*70)
-    print('Test suite completed for system with the following information:')
-    print(report())
-    took = "Took %.3fs." % t_tests
-    print('Status: ', end='')
-    if not failed:
-        print('OK (%d test groups).' % nrunners, took)
-    else:
-        # If anything went wrong, point out what command to rerun manually to
-        # see the actual errors and individual summary
-        failed_sections = [c.section for c in failed]
-        print('ERROR - {} out of {} test groups failed ({}).'.format(nfail,
-                                  nrunners, ', '.join(failed_sections)), took)
-        print()
-        print('You may wish to rerun these, with:')
-        print('  iptest', *failed_sections)
-        print()
-
-    if options.coverage:
-        from coverage import coverage, CoverageException
-        cov = coverage(data_file='.coverage')
-        cov.combine()
-        cov.save()
-
-        # Coverage HTML report
-        if options.coverage == 'html':
-            html_dir = 'ipy_htmlcov'
-            shutil.rmtree(html_dir, ignore_errors=True)
-            print("Writing HTML coverage report to %s/ ... " % html_dir, end="")
-            sys.stdout.flush()
-
-            # Custom HTML reporter to clean up module names.
-            from coverage.html import HtmlReporter
-            class CustomHtmlReporter(HtmlReporter):
-                def find_code_units(self, morfs):
-                    super(CustomHtmlReporter, self).find_code_units(morfs)
-                    for cu in self.code_units:
-                        nameparts = cu.name.split(os.sep)
-                        if 'IPython' not in nameparts:
-                            continue
-                        ix = nameparts.index('IPython')
-                        cu.name = '.'.join(nameparts[ix:])
-
-            # Reimplement the html_report method with our custom reporter
-            cov.get_data()
-            cov.config.from_args(omit='*{0}tests{0}*'.format(os.sep), html_dir=html_dir,
-                                 html_title='IPython test coverage',
-                                )
-            reporter = CustomHtmlReporter(cov, cov.config)
-            reporter.report(None)
-            print('done.')
-
-        # Coverage XML report
-        elif options.coverage == 'xml':
-            try:
-                cov.xml_report(outfile='ipy_coverage.xml')
-            except CoverageException as e:
-                print('Generating coverage report failed. Are you running javascript tests only?')
-                import traceback
-                traceback.print_exc()
-
-    if failed:
-        # Ensure that our exit code indicates failure
-        sys.exit(1)
-
-argparser = argparse.ArgumentParser(description='Run IPython test suite')
-argparser.add_argument('testgroups', nargs='*',
-                    help='Run specified groups of tests. If omitted, run '
-                    'all tests.')
-argparser.add_argument('--all', action='store_true',
-                    help='Include slow tests not run by default.')
-argparser.add_argument('-j', '--fast', nargs='?', const=None, default=1, type=int,
-                    help='Run test sections in parallel. This starts as many '
-                    'processes as you have cores, or you can specify a number.')
-argparser.add_argument('--xunit', action='store_true',
-                    help='Produce Xunit XML results')
-argparser.add_argument('--coverage', nargs='?', const=True, default=False,
-                    help="Measure test coverage. Specify 'html' or "
-                    "'xml' to get reports.")
-argparser.add_argument('--subproc-streams', default='capture',
-                    help="What to do with stdout/stderr from subprocesses. "
-                    "'capture' (default), 'show' and 'discard' are the options.")
-
-def default_options():
-    """Get an argparse Namespace object with the default arguments, to pass to
-    :func:`run_iptestall`.
-    """
-    options = argparser.parse_args([])
-    options.extra_args = []
-    return options
-
-def main():
-    # iptest doesn't work correctly if the working directory is the
-    # root of the IPython source tree. Tell the user to avoid
-    # frustration.
-    main_file = Path.cwd() / Path("IPython/testing/__main__.py")
-
-    if main_file.exists():
-        print("Don't run iptest from the IPython source directory", file=sys.stderr)
-        sys.exit(1)
-    # Arguments after -- should be passed through to nose. Argparse treats
-    # everything after -- as regular positional arguments, so we separate them
-    # first.
-    try:
-        ix = sys.argv.index('--')
-    except ValueError:
-        to_parse = sys.argv[1:]
-        extra_args = []
-    else:
-        to_parse = sys.argv[1:ix]
-        extra_args = sys.argv[ix+1:]
-
-    options = argparser.parse_args(to_parse)
-    options.extra_args = extra_args
-
-    run_iptestall(options)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/IPython/testing/plugin/ipdoctest.py b/IPython/testing/plugin/ipdoctest.py
index fdc8822b853..784760f81cf 100644
--- a/IPython/testing/plugin/ipdoctest.py
+++ b/IPython/testing/plugin/ipdoctest.py
@@ -19,35 +19,14 @@
 # Module imports
 
 # From the standard library
-import builtins as builtin_mod
 import doctest
 import inspect
 import logging
 import os
 import re
-import sys
-from importlib import import_module
-from io import StringIO
 
 from testpath import modified_env
 
-from inspect import getmodule
-
-from pathlib import Path, PurePath
-
-# We are overriding the default doctest runner, so we need to import a few
-# things from doctest directly
-from doctest import (REPORTING_FLAGS, REPORT_ONLY_FIRST_FAILURE,
-                     _unittest_reportflags, DocTestRunner,
-                     _extract_future_flags, pdb, _OutputRedirectingPdb,
-                     _exception_traceback,
-                     linecache)
-
-# Third-party modules
-
-from nose.plugins import doctests, Plugin
-from nose.util import anyp, tolist
-
 #-----------------------------------------------------------------------------
 # Module globals and other constants
 #-----------------------------------------------------------------------------
@@ -195,129 +174,6 @@ def check_output(self, want, got, optionflags):
         return ret
 
 
-class DocTestCase(doctests.DocTestCase):
-    """Proxy for DocTestCase: provides an address() method that
-    returns the correct address for the doctest case. Otherwise
-    acts as a proxy to the test case. To provide hints for address(),
-    an obj may also be passed -- this will be used as the test object
-    for purposes of determining the test address, if it is provided.
-    """
-
-    # Note: this method was taken from numpy's nosetester module.
-
-    # Subclass nose.plugins.doctests.DocTestCase to work around a bug in
-    # its constructor that blocks non-default arguments from being passed
-    # down into doctest.DocTestCase
-
-    def __init__(self, test, optionflags=0, setUp=None, tearDown=None,
-                 checker=None, obj=None, result_var='_'):
-        self._result_var = result_var
-        doctests.DocTestCase.__init__(self, test,
-                                      optionflags=optionflags,
-                                      setUp=setUp, tearDown=tearDown,
-                                      checker=checker)
-        # Now we must actually copy the original constructor from the stdlib
-        # doctest class, because we can't call it directly and a bug in nose
-        # means it never gets passed the right arguments.
-
-        self._dt_optionflags = optionflags
-        self._dt_checker = checker
-        self._dt_test = test
-        self._dt_test_globs_ori = test.globs
-        self._dt_setUp = setUp
-        self._dt_tearDown = tearDown
-
-        # XXX - store this runner once in the object!
-        runner = IPDocTestRunner(optionflags=optionflags,
-                                 checker=checker, verbose=False)
-        self._dt_runner = runner
-
-
-        # Each doctest should remember the directory it was loaded from, so
-        # things like %run work without too many contortions
-        self._ori_dir = os.path.dirname(test.filename)
-
-    # Modified runTest from the default stdlib
-    def runTest(self):
-        test = self._dt_test
-        runner = self._dt_runner
-
-        old = sys.stdout
-        new = StringIO()
-        optionflags = self._dt_optionflags
-
-        if not (optionflags & REPORTING_FLAGS):
-            # The option flags don't include any reporting flags,
-            # so add the default reporting flags
-            optionflags |= _unittest_reportflags
-
-        try:
-            # Save our current directory and switch out to the one where the
-            # test was originally created, in case another doctest did a
-            # directory change.  We'll restore this in the finally clause.
-            curdir = os.getcwd()
-            #print 'runTest in dir:', self._ori_dir  # dbg
-            os.chdir(self._ori_dir)
-
-            runner.DIVIDER = "-"*70
-            failures, tries = runner.run(test,out=new.write,
-                                         clear_globs=False)
-        finally:
-            sys.stdout = old
-            os.chdir(curdir)
-
-        if failures:
-            raise self.failureException(self.format_failure(new.getvalue()))
-
-    def setUp(self):
-        """Modified test setup that syncs with ipython namespace"""
-        #print "setUp test", self._dt_test.examples # dbg
-        if isinstance(self._dt_test.examples[0], IPExample):
-            # for IPython examples *only*, we swap the globals with the ipython
-            # namespace, after updating it with the globals (which doctest
-            # fills with the necessary info from the module being tested).
-            self.user_ns_orig = {}
-            self.user_ns_orig.update(_ip.user_ns)
-            _ip.user_ns.update(self._dt_test.globs)
-            # We must remove the _ key in the namespace, so that Python's
-            # doctest code sets it naturally
-            _ip.user_ns.pop('_', None)
-            _ip.user_ns['__builtins__'] = builtin_mod
-            self._dt_test.globs = _ip.user_ns
-
-        super(DocTestCase, self).setUp()
-
-    def tearDown(self):
-
-        # Undo the test.globs reassignment we made, so that the parent class
-        # teardown doesn't destroy the ipython namespace
-        if isinstance(self._dt_test.examples[0], IPExample):
-            self._dt_test.globs = self._dt_test_globs_ori
-            _ip.user_ns.clear()
-            _ip.user_ns.update(self.user_ns_orig)
-
-        # XXX - fperez: I am not sure if this is truly a bug in nose 0.11, but
-        # it does look like one to me: its tearDown method tries to run
-        #
-        # delattr(builtin_mod, self._result_var)
-        #
-        # without checking that the attribute really is there; it implicitly
-        # assumes it should have been set via displayhook.  But if the
-        # displayhook was never called, this doesn't necessarily happen.  I
-        # haven't been able to find a little self-contained example outside of
-        # ipython that would show the problem so I can report it to the nose
-        # team, but it does happen a lot in our code.
-        #
-        # So here, we just protect as narrowly as possible by trapping an
-        # attribute error whose message would be the name of self._result_var,
-        # and letting any other error propagate.
-        try:
-            super(DocTestCase, self).tearDown()
-        except AttributeError as exc:
-            if exc.args[0] != self._result_var:
-                raise
-
-
 # A simple subclassing of the original with a different class name, so we can
 # distinguish and treat differently IPython examples from pure python ones.
 class IPExample(doctest.Example): pass
@@ -594,169 +450,3 @@ class DocFileCase(doctest.DocFileCase):
     """
     def address(self):
         return (self._dt_test.filename, None, None)
-
-
-class ExtensionDoctest(doctests.Doctest):
-    """Nose Plugin that supports doctests in extension modules.
-    """
-    name = 'extdoctest'   # call nosetests with --with-extdoctest
-    enabled = True
-
-    def options(self, parser, env=os.environ):
-        Plugin.options(self, parser, env)
-        parser.add_option('--doctest-tests', action='store_true',
-                          dest='doctest_tests',
-                          default=env.get('NOSE_DOCTEST_TESTS',True),
-                          help="Also look for doctests in test modules. "
-                          "Note that classes, methods and functions should "
-                          "have either doctests or non-doctest tests, "
-                          "not both. [NOSE_DOCTEST_TESTS]")
-        parser.add_option('--doctest-extension', action="append",
-                          dest="doctestExtension",
-                          help="Also look for doctests in files with "
-                          "this extension [NOSE_DOCTEST_EXTENSION]")
-        # Set the default as a list, if given in env; otherwise
-        # an additional value set on the command line will cause
-        # an error.
-        env_setting = env.get('NOSE_DOCTEST_EXTENSION')
-        if env_setting is not None:
-            parser.set_defaults(doctestExtension=tolist(env_setting))
-
-
-    def configure(self, options, config):
-        Plugin.configure(self, options, config)
-        # Pull standard doctest plugin out of config; we will do doctesting
-        config.plugins.plugins = [p for p in config.plugins.plugins
-                                  if p.name != 'doctest']
-        self.doctest_tests = options.doctest_tests
-        self.extension = tolist(options.doctestExtension)
-
-        self.parser = doctest.DocTestParser()
-        self.finder = DocTestFinder()
-        self.checker = IPDoctestOutputChecker()
-        self.globs = None
-        self.extraglobs = None
-
-
-    def loadTestsFromExtensionModule(self,filename):
-        bpath,mod = os.path.split(filename)
-        modname = os.path.splitext(mod)[0]
-        try:
-            sys.path.append(bpath)
-            module = import_module(modname)
-            tests = list(self.loadTestsFromModule(module))
-        finally:
-            sys.path.pop()
-        return tests
-
-    # NOTE: the method below is almost a copy of the original one in nose, with
-    # a  few modifications to control output checking.
-
-    def loadTestsFromModule(self, module):
-        #print '*** ipdoctest - lTM',module  # dbg
-
-        if not self.matches(module.__name__):
-            log.debug("Doctest doesn't want module %s", module)
-            return
-
-        tests = self.finder.find(module,globs=self.globs,
-                                 extraglobs=self.extraglobs)
-        if not tests:
-            return
-
-        # always use whitespace and ellipsis options
-        optionflags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
-
-        tests.sort()
-        module_file = module.__file__
-        if module_file[-4:] in ('.pyc', '.pyo'):
-            module_file = module_file[:-1]
-        for test in tests:
-            if not test.examples:
-                continue
-            if not test.filename:
-                test.filename = module_file
-
-            yield DocTestCase(test,
-                              optionflags=optionflags,
-                              checker=self.checker)
-
-
-    def loadTestsFromFile(self, filename):
-        #print "ipdoctest - from file", filename # dbg
-        if is_extension_module(filename):
-            for t in self.loadTestsFromExtensionModule(filename):
-                yield t
-        else:
-            if self.extension and anyp(filename.endswith, self.extension):
-                name = PurePath(filename).name
-                doc = Path(filename).read_text()
-                test = self.parser.get_doctest(
-                    doc, globs={'__file__': filename}, name=name,
-                    filename=filename, lineno=0)
-                if test.examples:
-                    #print 'FileCase:',test.examples  # dbg
-                    yield DocFileCase(test)
-                else:
-                    yield False # no tests to load
-
-
-class IPythonDoctest(ExtensionDoctest):
-    """Nose Plugin that supports doctests in extension modules.
-    """
-    name = 'ipdoctest'   # call nosetests with --with-ipdoctest
-    enabled = True
-
-    def makeTest(self, obj, parent):
-        """Look for doctests in the given object, which will be a
-        function, method or class.
-        """
-        #print 'Plugin analyzing:', obj, parent  # dbg
-        # always use whitespace and ellipsis options
-        optionflags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
-
-        doctests = self.finder.find(obj, module=getmodule(parent))
-        if doctests:
-            for test in doctests:
-                if len(test.examples) == 0:
-                    continue
-
-                yield DocTestCase(test, obj=obj,
-                                  optionflags=optionflags,
-                                  checker=self.checker)
-
-    def options(self, parser, env=os.environ):
-        #print "Options for nose plugin:", self.name # dbg
-        Plugin.options(self, parser, env)
-        parser.add_option('--ipdoctest-tests', action='store_true',
-                          dest='ipdoctest_tests',
-                          default=env.get('NOSE_IPDOCTEST_TESTS',True),
-                          help="Also look for doctests in test modules. "
-                          "Note that classes, methods and functions should "
-                          "have either doctests or non-doctest tests, "
-                          "not both. [NOSE_IPDOCTEST_TESTS]")
-        parser.add_option('--ipdoctest-extension', action="append",
-                          dest="ipdoctest_extension",
-                          help="Also look for doctests in files with "
-                          "this extension [NOSE_IPDOCTEST_EXTENSION]")
-        # Set the default as a list, if given in env; otherwise
-        # an additional value set on the command line will cause
-        # an error.
-        env_setting = env.get('NOSE_IPDOCTEST_EXTENSION')
-        if env_setting is not None:
-            parser.set_defaults(ipdoctest_extension=tolist(env_setting))
-
-    def configure(self, options, config):
-        #print "Configuring nose plugin:", self.name # dbg
-        Plugin.configure(self, options, config)
-        # Pull standard doctest plugin out of config; we will do doctesting
-        config.plugins.plugins = [p for p in config.plugins.plugins
-                                  if p.name != 'doctest']
-        self.doctest_tests = options.ipdoctest_tests
-        self.extension = tolist(options.ipdoctest_extension)
-
-        self.parser = IPDocTestParser()
-        self.finder = DocTestFinder(parser=self.parser)
-        self.checker = IPDoctestOutputChecker()
-        self.globs = None
-        self.extraglobs = None
diff --git a/IPython/testing/plugin/iptest.py b/IPython/testing/plugin/iptest.py
deleted file mode 100755
index e24e22a8309..00000000000
--- a/IPython/testing/plugin/iptest.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-"""Nose-based test runner.
-"""
-
-from nose.core import main
-from nose.plugins.builtin import plugins
-from nose.plugins.doctests import Doctest
-
-from . import ipdoctest
-from .ipdoctest import IPDocTestRunner
-
-if __name__ == '__main__':
-    print('WARNING: this code is incomplete!')
-    print()
-
-    pp = [x() for x in plugins]  # activate all builtin plugins first
-    main(testRunner=IPDocTestRunner(),
-         plugins=pp+[ipdoctest.IPythonDoctest(),Doctest()])
diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index bca72f4666e..db5f1c879ba 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -14,7 +14,6 @@
 from os.path import join, abspath
 from imp import reload
 
-from nose import SkipTest, with_setup
 import pytest
 
 import IPython
@@ -98,8 +97,17 @@ def teardown_environment():
     if hasattr(sys, 'frozen'):
         del sys.frozen
 
+
 # Build decorator that uses the setup_environment/setup_environment
-with_environment = with_setup(setup_environment, teardown_environment)
+@pytest.fixture
+def environment():
+    setup_environment()
+    yield
+    teardown_environment()
+
+
+with_environment = pytest.mark.usefixtures("environment")
+
 
 @skip_if_not_win32
 @with_environment
@@ -291,7 +299,8 @@ def test_not_writable_ipdir(self):
         else:
             # I can still write to an unwritable dir,
             # assume I'm root and skip the test
-            raise SkipTest("I can't create directories that I can't write to")
+            pytest.skip("I can't create directories that I can't write to")
+
         with self.assertWarnsRegex(UserWarning, 'is not a writable location'):
             ipdir = paths.get_ipython_dir()
         env.pop('IPYTHON_DIR', None)
diff --git a/appveyor.yml b/appveyor.yml
index c3702755110..0a7b388401e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,13 +26,9 @@ init:
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - python -m pip install --upgrade setuptools pip
-  - pip install nose coverage pytest pytest-cov pytest-trio matplotlib pandas
+  - pip install pytest pytest-cov pytest-trio matplotlib pandas
   - pip install -e .[test]
-  - mkdir results
-  - cd results
 test_script:
-  - iptest --coverage xml
-  - cd ..
   - pytest --color=yes -ra --cov --cov-report=xml
 on_finish:
   - curl -Os https://uploader.codecov.io/latest/windows/codecov.exe
diff --git a/docs/environment.yml b/docs/environment.yml
index d24ae3129dc..b35ceb7a291 100644
--- a/docs/environment.yml
+++ b/docs/environment.yml
@@ -5,7 +5,6 @@ dependencies:
 - sphinx>=1.8
 - sphinx_rtd_theme
 - numpy
-- nose
 - testpath
 - matplotlib
 - pip:
diff --git a/docs/source/install/install.rst b/docs/source/install/install.rst
index 5804fa83d52..a4168c4f14a 100644
--- a/docs/source/install/install.rst
+++ b/docs/source/install/install.rst
@@ -100,12 +100,11 @@ permissions, you may need to run the last command with :command:`sudo`. You can
 also install in user specific location by using the ``--user`` flag in
 conjunction with pip.
 
-To run IPython's test suite, use the :command:`iptest` command from outside of
-the IPython source tree:
+To run IPython's test suite, use the :command:`pytest` command:
 
 .. code-block:: bash
 
-    $ iptest
+    $ pytest
 
 .. _devinstall:
 
diff --git a/setup.py b/setup.py
index 6c30c9f4043..c05a769a0ea 100755
--- a/setup.py
+++ b/setup.py
@@ -175,7 +175,6 @@
     qtconsole=["qtconsole"],
     doc=["Sphinx>=1.3"],
     test=[
-        "nose>=0.10.1",
         "pytest",
         "requests",
         "testpath",
diff --git a/setupbase.py b/setupbase.py
index ac2acc069f4..97cebe807e1 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -234,7 +234,6 @@ def find_entry_points():
     """
     ep = [
             'ipython%s = IPython:start_ipython',
-            'iptest%s = IPython.testing.iptestcontroller:main',
         ]
     suffix = str(sys.version_info[0])
     return [e % '' for e in ep] + [e % suffix for e in ep]
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 1c1d5e6cdb1..4d5672b498b 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -7,7 +7,7 @@ python -c 'import keyring'
 python -c 'import twine'
 python -c 'import sphinx'
 python -c 'import sphinx_rtd_theme'
-python -c 'import nose'
+python -c 'import pytest'
 
 
 BLACK=$(tput setaf 1)

From 28bb4c88e371132e2c825a4f4776a19a1dde8f6f Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 8 Nov 2021 20:55:35 +0300
Subject: [PATCH 0816/1407] find_cmd is not using pywin32 for a while already

---
 IPython/utils/tests/test_process.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index f4ee3859ed8..3ac479f048d 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -44,23 +44,13 @@ def test_find_cmd_ls():
     assert path.endswith("ls")
 
     
-def has_pywin32():
-    try:
-        import win32api
-    except ImportError:
-        return False
-    return True
-
-
-@dec.onlyif(has_pywin32, "This test requires win32api to run")
+@dec.skip_if_not_win32
 def test_find_cmd_pythonw():
     """Try to find pythonw on Windows."""
     path = find_cmd('pythonw')
     assert path.lower().endswith('pythonw.exe'), path
 
 
-@dec.onlyif(lambda : sys.platform != 'win32' or has_pywin32(),
-            "This test runs on posix or in win32 with win32api installed")
 def test_find_cmd_fail():
     """Make sure that FindCmdError is raised if we can't find the cmd."""
     pytest.raises(FindCmdError, find_cmd, "asdfasdf")

From 7f364bb801ae9511908f6681120c4e89e2607ebf Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sun, 14 Nov 2021 01:54:48 +0300
Subject: [PATCH 0817/1407] Port `deepreload` to `importlib`

`imp` is deprecated since Python 3.3 and scheduled for removal in Python 3.12

The code is severely undertested, I added several, and also fixed a bug that `modules_reloading` was not cleaned-up on an import failure.
---
 IPython/lib/deepreload.py            | 58 ++++------------------------
 IPython/lib/tests/test_deepreload.py | 28 ++++++++++++--
 2 files changed, 33 insertions(+), 53 deletions(-)

diff --git a/IPython/lib/deepreload.py b/IPython/lib/deepreload.py
index ddfa1bc603d..fa8009b59c1 100644
--- a/IPython/lib/deepreload.py
+++ b/IPython/lib/deepreload.py
@@ -28,7 +28,7 @@
 
 import builtins as builtin_mod
 from contextlib import contextmanager
-import imp
+import importlib
 import sys
 
 from types import ModuleType
@@ -174,33 +174,17 @@ def import_submodule(mod, subname, fullname):
         print('Reloading', fullname)
         found_now[fullname] = 1
         oldm = sys.modules.get(fullname, None)
-
-        if mod is None:
-            path = None
-        elif hasattr(mod, '__path__'):
-            path = mod.__path__
-        else:
-            return None
-
-        try:
-            # This appears to be necessary on Python 3, because imp.find_module()
-            # tries to import standard libraries (like io) itself, and we don't
-            # want them to be processed by our deep_import_hook.
-            with replace_import_hook(original_import):
-                fp, filename, stuff = imp.find_module(subname, path)
-        except ImportError:
-            return None
-
         try:
-            m = imp.load_module(fullname, fp, filename, stuff)
+            if oldm is not None:
+                m = importlib.reload(oldm)
+            else:
+                m = importlib.import_module(subname, mod)
         except:
             # load_module probably removed name from modules because of
             # the error.  Put back the original module object.
             if oldm:
                 sys.modules[fullname] = oldm
             raise
-        finally:
-            if fp: fp.close()
 
         add_submodule(mod, m, fullname, subname)
 
@@ -285,43 +269,17 @@ def deep_reload_hook(m):
     except:
         modules_reloading[name] = m
 
-    dot = name.rfind('.')
-    if dot < 0:
-        subname = name
-        path = None
-    else:
-        try:
-            parent = sys.modules[name[:dot]]
-        except KeyError as e:
-            modules_reloading.clear()
-            raise ImportError("reload(): parent %.200s not in sys.modules" % name[:dot]) from e
-        subname = name[dot+1:]
-        path = getattr(parent, "__path__", None)
-
-    try:
-        # This appears to be necessary on Python 3, because imp.find_module()
-        # tries to import standard libraries (like io) itself, and we don't
-        # want them to be processed by our deep_import_hook.
-        with replace_import_hook(original_import):
-            fp, filename, stuff  = imp.find_module(subname, path)
-    finally:
-        modules_reloading.clear()
-
     try:
-        newm = imp.load_module(name, fp, filename, stuff)
+        newm = importlib.reload(m)
     except:
-         # load_module probably removed name from modules because of
-         # the error.  Put back the original module object.
         sys.modules[name] = m
         raise
     finally:
-        if fp: fp.close()
-
-    modules_reloading.clear()
+        modules_reloading.clear()
     return newm
 
 # Save the original hooks
-original_reload = imp.reload
+original_reload = importlib.reload
 
 # Replacement for reload()
 def reload(module, exclude=('sys', 'os.path', 'builtins', '__main__',
diff --git a/IPython/lib/tests/test_deepreload.py b/IPython/lib/tests/test_deepreload.py
index d9af0f1dbbd..9759a7f69f7 100644
--- a/IPython/lib/tests/test_deepreload.py
+++ b/IPython/lib/tests/test_deepreload.py
@@ -4,11 +4,14 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+import pytest
+import types
+
 from pathlib import Path
 
 from IPython.utils.syspathcontext import prepended_to_syspath
 from IPython.utils.tempdir import TemporaryDirectory
-from IPython.lib.deepreload import reload as dreload
+from IPython.lib.deepreload import reload as dreload, modules_reloading
 
 
 def test_deepreload():
@@ -17,9 +20,9 @@ def test_deepreload():
         with prepended_to_syspath(tmpdir):
             tmpdirpath = Path(tmpdir)
             with open(tmpdirpath / "A.py", "w") as f:
-                f.write("class Object(object):\n    pass\n")
+                f.write("class Object:\n    pass\nok = True\n")
             with open(tmpdirpath / "B.py", "w") as f:
-                f.write("import A\n")
+                f.write("import A\nassert A.ok, 'we are fine'\n")
             import A
             import B
 
@@ -28,7 +31,26 @@ def test_deepreload():
             dreload(B, exclude=["A"])
             assert isinstance(obj, A.Object) is True
 
+            # Test that an import failure will not blow-up us.
+            A.ok = False
+            with pytest.raises(AssertionError, match="we are fine"):
+                dreload(B, exclude=["A"])
+            assert len(modules_reloading) == 0
+            assert not A.ok
+
             # Test that A is reloaded.
             obj = A.Object()
+            A.ok = False
             dreload(B)
+            assert A.ok
             assert isinstance(obj, A.Object) is False
+
+
+def test_not_module():
+    pytest.raises(TypeError, dreload, "modulename")
+
+
+def test_not_in_sys_modules():
+    fake_module = types.ModuleType("fake_module")
+    with pytest.raises(ImportError, match="not in sys.modules"):
+        dreload(fake_module)

From 75fd024c98b4552bf3ce8692f2442aff5c012fc6 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sat, 13 Nov 2021 04:31:23 +0300
Subject: [PATCH 0818/1407] Fix `history_manager.search(?, unique=True)`
 returning old entries

---
 IPython/core/history.py            | 12 +++++++++---
 IPython/core/tests/test_history.py | 13 +++++++++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/IPython/core/history.py b/IPython/core/history.py
index ff931d20dd7..43248066091 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -265,7 +265,7 @@ def writeout_cache(self):
     ## -------------------------------
     ## Methods for retrieving history:
     ## -------------------------------
-    def _run_sql(self, sql, params, raw=True, output=False):
+    def _run_sql(self, sql, params, raw=True, output=False, latest=False):
         """Prepares and runs an SQL query for the history database.
 
         Parameters
@@ -276,6 +276,8 @@ def _run_sql(self, sql, params, raw=True, output=False):
           Parameters passed to the SQL query (to replace "?")
         raw, output : bool
           See :meth:`get_range`
+        latest : bool
+          Select rows with max (session, line)
 
         Returns
         -------
@@ -286,8 +288,12 @@ def _run_sql(self, sql, params, raw=True, output=False):
         if output:
             sqlfrom = "history LEFT JOIN output_history USING (session, line)"
             toget = "history.%s, output_history.output" % toget
+        if latest:
+            toget += ", MAX(session * 128 * 1024 + line)"
         cur = self.db.execute("SELECT session, line, %s FROM %s " %\
                                 (toget, sqlfrom) + sql, params)
+        if latest:
+            cur = (row[:-1] for row in cur)
         if output:    # Regroup into 3-tuples, and parse JSON
             return ((ses, lin, (inp, out)) for ses, lin, inp, out in cur)
         return cur
@@ -395,7 +401,7 @@ def search(self, pattern="*", raw=True, search_raw=True,
             params += (n,)
         elif unique:
             sqlform += " ORDER BY session, line"
-        cur = self._run_sql(sqlform, params, raw=raw, output=output)
+        cur = self._run_sql(sqlform, params, raw=raw, output=output, latest=unique)
         if n is not None:
             return reversed(list(cur))
         return cur
@@ -817,7 +823,7 @@ def run(self):
         try:
             self.db = sqlite3.connect(
                 str(self.history_manager.hist_file),
-                **self.history_manager.connection_options
+                **self.history_manager.connection_options,
             )
             while True:
                 self.history_manager.save_flag.wait()
diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
index 4cc43caeb6b..6d6a1b1dd15 100644
--- a/IPython/core/tests/test_history.py
+++ b/IPython/core/tests/test_history.py
@@ -17,12 +17,10 @@
 from traitlets.config.loader import Config
 from IPython.utils.tempdir import TemporaryDirectory
 from IPython.core.history import HistoryManager, extract_hist_ranges
-from IPython.testing.decorators import skipif
 
 def test_proper_default_encoding():
     assert sys.getdefaultencoding() == "utf-8"
 
-@skipif(sqlite3.sqlite_version_info > (3,24,0))
 def test_history():
     ip = get_ipython()
     with TemporaryDirectory() as tmpdir:
@@ -133,6 +131,17 @@ def test_history():
             ip.history_manager.store_inputs(1, "rogue")
             ip.history_manager.writeout_cache()
             assert ip.history_manager.session_number == 3
+
+            # Check that session and line values are not just max values
+            sessid, lineno, entry = newhist[-1]
+            assert lineno > 1
+            ip.history_manager.reset()
+            lineno = 1
+            ip.history_manager.store_inputs(lineno, entry)
+            gothist = ip.history_manager.search("*=*", unique=True)
+            hist = list(gothist)[-1]
+            assert sessid < hist[0]
+            assert hist[1:] == (lineno, entry)
         finally:
             # Ensure saving thread is shut down before we try to clean up the files
             ip.history_manager.save_thread.stop()

From fc34990c713b036e4ae24d037fa37f844b19fb5b Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sun, 14 Nov 2021 22:45:09 +0300
Subject: [PATCH 0819/1407] Deprecate `utils.sysinfo.num_cpus`

`os.cpu_count()` exists since Python 3.4
---
 IPython/utils/sysinfo.py            | 54 ++++++++---------------------
 IPython/utils/tests/test_sysinfo.py |  6 ++++
 2 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/IPython/utils/sysinfo.py b/IPython/utils/sysinfo.py
index fed82a24537..857f0cf2d84 100644
--- a/IPython/utils/sysinfo.py
+++ b/IPython/utils/sysinfo.py
@@ -118,49 +118,25 @@ def sys_info():
     """
     return pprint.pformat(get_sys_info())
 
-def _num_cpus_unix():
-    """Return the number of active CPUs on a Unix system."""
-    return os.sysconf("SC_NPROCESSORS_ONLN")
-
-
-def _num_cpus_darwin():
-    """Return the number of active CPUs on a Darwin system."""
-    p = subprocess.Popen(['sysctl','-n','hw.ncpu'],stdout=subprocess.PIPE)
-    return p.stdout.read()
-
-
-def _num_cpus_windows():
-    """Return the number of active CPUs on a Windows system."""
-    return os.environ.get("NUMBER_OF_PROCESSORS")
-
 
 def num_cpus():
-   """Return the effective number of CPUs in the system as an integer.
-
-   This cross-platform function makes an attempt at finding the total number of
-   available CPUs in the system, as returned by various underlying system and
-   python calls.
+    """DEPRECATED
 
-   If it can't find a sensible answer, it returns 1 (though an error *may* make
-   it return a large positive number that's actually incorrect).
-   """
+    Return the effective number of CPUs in the system as an integer.
 
-   # Many thanks to the Parallel Python project (http://www.parallelpython.com)
-   # for the names of the keys we needed to look up for this function.  This
-   # code was inspired by their equivalent function.
+    This cross-platform function makes an attempt at finding the total number of
+    available CPUs in the system, as returned by various underlying system and
+    python calls.
 
-   ncpufuncs = {'Linux':_num_cpus_unix,
-                'Darwin':_num_cpus_darwin,
-                'Windows':_num_cpus_windows
-                }
-
-   ncpufunc = ncpufuncs.get(platform.system(),
-                            # default to unix version (Solaris, AIX, etc)
-                            _num_cpus_unix)
+    If it can't find a sensible answer, it returns 1 (though an error *may* make
+    it return a large positive number that's actually incorrect).
+    """
+    import warnings
 
-   try:
-       ncpus = max(1,int(ncpufunc()))
-   except:
-       ncpus = 1
-   return ncpus
+    warnings.warn(
+        "`num_cpus` is deprecated since IPython 8.0. Use `os.cpu_count` instead.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
 
+    return os.cpu_count() or 1
diff --git a/IPython/utils/tests/test_sysinfo.py b/IPython/utils/tests/test_sysinfo.py
index 23f80e4e5ff..07dd22d02e3 100644
--- a/IPython/utils/tests/test_sysinfo.py
+++ b/IPython/utils/tests/test_sysinfo.py
@@ -5,6 +5,7 @@
 # Distributed under the terms of the Modified BSD License.
 
 import json
+import pytest
 
 from IPython.utils import sysinfo
 
@@ -14,3 +15,8 @@ def test_json_getsysinfo():
     test that it is easily jsonable and don't return bytes somewhere.
     """
     json.dumps(sysinfo.get_sys_info())
+
+
+def test_num_cpus():
+    with pytest.deprecated_call():
+        sysinfo.num_cpus()

From 5afec8019772d73484eea9d768dfa8c526739fbf Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 15 Nov 2021 08:26:43 -0800
Subject: [PATCH 0820/1407] completer documentation

---
 IPython/core/completer.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 736d226d26f..57bfa9d9722 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -2057,6 +2057,24 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
         ``column`` when passing multiline strings this could/should be renamed
         but would add extra noise.
 
+        Parameters
+        ----------
+        cursor_line :
+            Index of the line the cursor is on. 0 indexed.
+        cursor_pos :
+            Position of the cursor in the current line/line_buffer/text. 0
+            indexed.
+        line_buffer : optional, str
+            The current line the cursor is in, this is mostly due to legacy
+            reason that readline coudl only give a us the single current line.
+            Prefer `full_text`.
+        text : str
+            The current "token" the cursor is in, mostly also for historical
+            reasons. as the completer would trigger only after the current line
+            was parsed.
+        full_text : str
+            Full text of the current cell.
+
         Returns
         -------
         A tuple of N elements which are (likely):

From 30e10db258e66e61b70d6d91c7e478b88db386fc Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 15 Nov 2021 10:04:53 -0800
Subject: [PATCH 0821/1407] manual reformat

---
 IPython/core/tests/test_iplib.py | 74 ++++++++++++++++----------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index 5cbc77251db..9bdfd514644 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -40,48 +40,48 @@ def test_reset():
 
 def doctest_tb_plain():
     """
-In [18]: xmode plain
-Exception reporting mode: Plain
-
-        In [19]: run simpleerr.py
-        Traceback (most recent call last):
-          ...line ..., in <module>
-            bar(mode)
-          ...line ..., in bar
-            div0()
-          ...line ..., in div0
-            x/y
-        ZeroDivisionError: ...
+    In [18]: xmode plain
+    Exception reporting mode: Plain
+
+    In [19]: run simpleerr.py
+    Traceback (most recent call last):
+      ...line ..., in <module>
+        bar(mode)
+      ...line ..., in bar
+        div0()
+      ...line ..., in div0
+        x/y
+    ZeroDivisionError: ...
     """
 
 
 def doctest_tb_context():
     """
-In [3]: xmode context
-Exception reporting mode: Context
-
-        In [4]: run simpleerr.py
-        ---------------------------------------------------------------------------
-        ZeroDivisionError                         Traceback (most recent call last)
-        <BLANKLINE>
-        ... in <module>
-             30     except IndexError:
-             31         mode = 'div'
-        ---> 33     bar(mode)
-        <BLANKLINE>
-        ... in bar(mode)
-             15     "bar"
-             16     if mode=='div':
-        ---> 17         div0()
-             18     elif mode=='exit':
-             19         try:
-        <BLANKLINE>
-        ... in div0()
-              6     x = 1
-              7     y = 0
-        ----> 8     x/y
-        <BLANKLINE>
-        ZeroDivisionError: ..."""
+    In [3]: xmode context
+    Exception reporting mode: Context
+
+    In [4]: run simpleerr.py
+    ---------------------------------------------------------------------------
+    ZeroDivisionError                         Traceback (most recent call last)
+    <BLANKLINE>
+    ... in <module>
+         30     except IndexError:
+         31         mode = 'div'
+    ---> 33     bar(mode)
+    <BLANKLINE>
+    ... in bar(mode)
+         15     "bar"
+         16     if mode=='div':
+    ---> 17         div0()
+         18     elif mode=='exit':
+         19         try:
+    <BLANKLINE>
+    ... in div0()
+          6     x = 1
+          7     y = 0
+    ----> 8     x/y
+    <BLANKLINE>
+    ZeroDivisionError: ..."""
 
 
 def doctest_tb_verbose():

From 04eb390c57db717dfa7de5963f7e75923b29f165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Luis=20Cano=20Rodr=C3=ADguez?=
 <juanlu@readthedocs.org>
Date: Tue, 9 Nov 2021 10:20:30 +0100
Subject: [PATCH 0822/1407] Update documentation dependencies

---
 docs/environment.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/environment.yml b/docs/environment.yml
index b35ceb7a291..e75373e17c9 100644
--- a/docs/environment.yml
+++ b/docs/environment.yml
@@ -2,8 +2,8 @@ name: ipython_docs
 dependencies:
 - python=3.8
 - setuptools>=18.5
-- sphinx>=1.8
-- sphinx_rtd_theme
+- sphinx>=4.2.0
+- sphinx_rtd_theme>=1.0.0
 - numpy
 - testpath
 - matplotlib

From 1a20e9318e792bc8a24789d79dae6dad7795f55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Luis=20Cano=20Rodr=C3=ADguez?= <hello@juanlu.space>
Date: Fri, 12 Nov 2021 21:01:16 +0100
Subject: [PATCH 0823/1407] Update environment.yml

---
 docs/environment.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/environment.yml b/docs/environment.yml
index e75373e17c9..628f31ee7b8 100644
--- a/docs/environment.yml
+++ b/docs/environment.yml
@@ -2,8 +2,8 @@ name: ipython_docs
 dependencies:
 - python=3.8
 - setuptools>=18.5
-- sphinx>=4.2.0
-- sphinx_rtd_theme>=1.0.0
+- sphinx>=4.2
+- sphinx_rtd_theme>=1.0
 - numpy
 - testpath
 - matplotlib

From f1a6a47954e56fb11999f6ddcd7e996f498b01c8 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 12 Nov 2021 16:00:47 -0800
Subject: [PATCH 0824/1407] try to fix enyml

---
 docs/environment.yml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/docs/environment.yml b/docs/environment.yml
index 628f31ee7b8..afb5eff0051 100644
--- a/docs/environment.yml
+++ b/docs/environment.yml
@@ -1,13 +1,17 @@
 name: ipython_docs
+channels:
+ - conda-forge
+ - defaults
 dependencies:
-- python=3.8
-- setuptools>=18.5
-- sphinx>=4.2
-- sphinx_rtd_theme>=1.0
-- numpy
-- testpath
-- matplotlib
-- pip:
+  - python=3.8
+  - setuptools>=18.5
+  - sphinx>=4.2
+  - sphinx_rtd_theme>=1.0
+  - numpy
+  - nose
+  - testpath
+  - matplotlib
+  - pip:
     - docrepr
     - prompt_toolkit
     - ipykernel

From 95fa8aeb6b109a9d9694659ae198a254896b1c5c Mon Sep 17 00:00:00 2001
From: Gal B <galbgit@gmail.com>
Date: Sat, 13 Nov 2021 17:45:33 +0000
Subject: [PATCH 0825/1407] Remove always skipped test.

See: #13219
---
 IPython/core/tests/test_completer.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 61e1d35c1db..4d60bafbf8b 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -316,18 +316,6 @@ def test_forward_unicode_completion(self):
         self.assertEqual(matches, ["Ⅴ"])  # This is not a V
         self.assertEqual(matches, ["\u2164"])  # same as above but explicit.
 
-    @unittest.skip("now we have a completion for \jmath")
-    @pytest.mark.xfail(
-        sys.platform == "win32", reason="Fails if there is a C:\\j... path"
-    )
-    def test_no_ascii_back_completion(self):
-        ip = get_ipython()
-        with TemporaryWorkingDirectory():  # Avoid any filename completions
-            # single ascii letter that don't have yet completions
-            for letter in "jJ":
-                name, matches = ip.complete("\\" + letter)
-                self.assertEqual(matches, [])
-
     def test_delim_setting(self):
         sp = completer.CompletionSplitter()
         sp.delims = " "

From fc57ec912eec9da4c33d8db5416fdb2dada706e7 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 1 Nov 2021 19:09:58 +0300
Subject: [PATCH 0826/1407] Handle changed exception type from
 inspect.getabsfile (bpo-44648)

https://bugs.python.org/issue44648 (Python 3.10+)
---
 IPython/core/oinspect.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index ab25eeeffca..09b74700ba0 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -305,13 +305,13 @@ def find_file(obj) -> str:
     fname = None
     try:
         fname = inspect.getabsfile(obj)
-    except TypeError:
+    except (OSError, TypeError):
         # For an instance, the file that matters is where its class was
         # declared.
         if hasattr(obj, '__class__'):
             try:
                 fname = inspect.getabsfile(obj.__class__)
-            except TypeError:
+            except (OSError, TypeError):
                 # Can happen for builtins
                 pass
     except:

From 8134c2ebd582daa3e2caa664ad310c70594de7f5 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 1 Nov 2021 19:09:58 +0300
Subject: [PATCH 0827/1407] Workaround argparse changed text in Python 3.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

“optional arguments” was replaced with “options” in argparse help.

https://docs.python.org/3/whatsnew/3.10.html#argparse
https://bugs.python.org/issue9694
---
 IPython/core/tests/test_magic_arguments.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/IPython/core/tests/test_magic_arguments.py b/IPython/core/tests/test_magic_arguments.py
index 62946dc5343..8b263b25d6f 100644
--- a/IPython/core/tests/test_magic_arguments.py
+++ b/IPython/core/tests/test_magic_arguments.py
@@ -7,7 +7,7 @@
 #-----------------------------------------------------------------------------
 
 import argparse
-import pytest
+import sys
 
 from IPython.core.magic_arguments import (argument, argument_group, kwds,
     magic_arguments, parse_argstring, real_name)
@@ -74,9 +74,14 @@ def foo(self, args):
 
 
 def test_magic_arguments():
+    # “optional arguments” was replaced with “options” in argparse help
+    # https://docs.python.org/3/whatsnew/3.10.html#argparse
+    # https://bugs.python.org/issue9694
+    options = "optional arguments" if sys.version_info < (3, 10) else "options"
+
     assert (
         magic_foo1.__doc__
-        == "::\n\n  %foo1 [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n"
+        == f"::\n\n  %foo1 [-f FOO]\n\n A docstring.\n\n{options}:\n  -f FOO, --foo FOO  an argument\n"
     )
     assert getattr(magic_foo1, "argcmd_name", None) == None
     assert real_name(magic_foo1) == "foo1"
@@ -91,7 +96,7 @@ def test_magic_arguments():
 
     assert (
         magic_foo3.__doc__
-        == "::\n\n  %foo3 [-f FOO] [-b BAR] [-z BAZ]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n\nGroup:\n  -b BAR, --bar BAR  a grouped argument\n\nSecond Group:\n  -z BAZ, --baz BAZ  another grouped argument\n"
+        == f"::\n\n  %foo3 [-f FOO] [-b BAR] [-z BAZ]\n\n A docstring.\n\n{options}:\n  -f FOO, --foo FOO  an argument\n\nGroup:\n  -b BAR, --bar BAR  a grouped argument\n\nSecond Group:\n  -z BAZ, --baz BAZ  another grouped argument\n"
     )
     assert getattr(magic_foo3, "argcmd_name", None) == None
     assert real_name(magic_foo3) == "foo3"
@@ -100,7 +105,7 @@ def test_magic_arguments():
 
     assert (
         magic_foo4.__doc__
-        == "::\n\n  %foo4 [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n"
+        == f"::\n\n  %foo4 [-f FOO]\n\n A docstring.\n\n{options}:\n  -f FOO, --foo FOO  an argument\n"
     )
     assert getattr(magic_foo4, "argcmd_name", None) == None
     assert real_name(magic_foo4) == "foo4"
@@ -109,7 +114,7 @@ def test_magic_arguments():
 
     assert (
         magic_foo5.__doc__
-        == "::\n\n  %frobnicate [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n"
+        == f"::\n\n  %frobnicate [-f FOO]\n\n A docstring.\n\n{options}:\n  -f FOO, --foo FOO  an argument\n"
     )
     assert getattr(magic_foo5, "argcmd_name", None) == "frobnicate"
     assert real_name(magic_foo5) == "frobnicate"
@@ -118,7 +123,7 @@ def test_magic_arguments():
 
     assert (
         magic_magic_foo.__doc__
-        == "::\n\n  %magic_foo [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n"
+        == f"::\n\n  %magic_foo [-f FOO]\n\n A docstring.\n\n{options}:\n  -f FOO, --foo FOO  an argument\n"
     )
     assert getattr(magic_magic_foo, "argcmd_name", None) == None
     assert real_name(magic_magic_foo) == "magic_foo"
@@ -127,7 +132,7 @@ def test_magic_arguments():
 
     assert (
         foo.__doc__
-        == "::\n\n  %foo [-f FOO]\n\n A docstring.\n\noptional arguments:\n  -f FOO, --foo FOO  an argument\n"
+        == f"::\n\n  %foo [-f FOO]\n\n A docstring.\n\n{options}:\n  -f FOO, --foo FOO  an argument\n"
     )
     assert getattr(foo, "argcmd_name", None) == None
     assert real_name(foo) == "foo"

From e63a8bbaa6a458d749ed275140ae55ecbc906154 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 1 Nov 2021 19:09:58 +0300
Subject: [PATCH 0828/1407] Workaround Jedi Python 3.10 issue

---
 IPython/core/tests/test_completer.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 61e1d35c1db..7ef4892e929 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -26,6 +26,15 @@
     _deduplicate_completions,
 )
 
+if sys.version_info >= (3, 10):
+    import jedi
+    from pkg_resources import parse_version
+
+    # Requires https://github.com/davidhalter/jedi/pull/1795
+    jedi_issue = parse_version(jedi.__version__) <= parse_version("0.18.0")
+else:
+    jedi_issue = False
+
 # -----------------------------------------------------------------------------
 # Test functions
 # -----------------------------------------------------------------------------
@@ -442,6 +451,8 @@ def test_all_completions_dups(self):
                 matches = c.all_completions("TestCl")
                 assert matches == ['TestClass'], jedi_status
                 matches = c.all_completions("TestClass.")
+                if jedi_status and jedi_issue:
+                    continue
                 assert len(matches) > 2, jedi_status
                 matches = c.all_completions("TestClass.a")
                 assert matches == ['TestClass.a', 'TestClass.a1'], jedi_status
@@ -496,6 +507,7 @@ def test_completion_have_signature(self):
             "encoding" in c.signature
         ), "Signature of function was not found by completer"
 
+    @pytest.mark.xfail(jedi_issue, reason="Known failure on jedi<=0.18.0")
     def test_deduplicate_completions(self):
         """
         Test that completions are correctly deduplicated (even if ranges are not the same)

From d0d8c07bad43bd558a8e7f4bdce9abdc3be89768 Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Thu, 7 Jan 2021 14:43:46 +0100
Subject: [PATCH 0829/1407] xxlimited module is xxlimited_35 in Python 3.10

---
 IPython/lib/tests/test_pretty.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py
index 8c116300b34..ec1211ac195 100644
--- a/IPython/lib/tests/test_pretty.py
+++ b/IPython/lib/tests/test_pretty.py
@@ -7,14 +7,16 @@
 
 from collections import Counter, defaultdict, deque, OrderedDict
 import os
+import pytest
 import types
 import string
+import sys
 import unittest
 
 import pytest
 
 from IPython.lib import pretty
-from IPython.testing.decorators import skip_without, skip_iptest_but_not_pytest
+from IPython.testing.decorators import skip_iptest_but_not_pytest
 
 from io import StringIO
 
@@ -136,12 +138,12 @@ def test_sets(obj, expected_output):
     assert got_output == expected_output
 
 
-@skip_without('xxlimited')
 def test_pprint_heap_allocated_type():
     """
     Test that pprint works for heap allocated types.
     """
-    import xxlimited
+    module_name = "xxlimited" if sys.version_info < (3, 10) else "xxlimited_35"
+    xxlimited = pytest.importorskip(module_name)
     output = pretty.pretty(xxlimited.Null)
     assert output == "xxlimited.Null"
 

From 39ea7f36a044a7ac6bbb6a08244215de0ba3b20c Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 15 Nov 2021 21:10:16 +0300
Subject: [PATCH 0830/1407] Add Python 3.10 CI runners

---
 .github/workflows/test.yml | 4 ++--
 appveyor.yml               | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c79db6e0f7f..9bd353a97e4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,13 +15,13 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.7", "3.8", "3.9"]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
         # Test all on ubuntu, test ends on macos
         include:
           - os: macos-latest
             python-version: "3.7"
           - os: macos-latest
-            python-version: "3.9"
+            python-version: "3.10"
 
     steps:
     - uses: actions/checkout@v2
diff --git a/appveyor.yml b/appveyor.yml
index 0a7b388401e..10659d8e8b1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,10 +4,15 @@ matrix:
 
 environment:
   global:
+    APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
     COLUMNS: 120  # Appveyor web viwer window width is 130 chars
 
   matrix:
 
+   - PYTHON: "C:\\Python310-x64"
+     PYTHON_VERSION: "3.10.x"
+     PYTHON_ARCH: "64"
+
    - PYTHON: "C:\\Python37-x64"
      PYTHON_VERSION: "3.7.x"
      PYTHON_ARCH: "64"

From d23958a156c5460009d6a79cdc92d7392d0814ea Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 15 Nov 2021 11:26:45 -0800
Subject: [PATCH 0831/1407] Move dict keys completions higher.

If we are in a dict this is likely way more accurate.
---
 IPython/core/completer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 57bfa9d9722..c6d20bbf5af 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1191,18 +1191,18 @@ def matchers(self) -> List[Any]:
         if self.use_jedi:
             return [
                 *self.custom_matchers,
+                self.dict_key_matches,
                 self.file_matches,
                 self.magic_matches,
-                self.dict_key_matches,
             ]
         else:
             return [
                 *self.custom_matchers,
+                self.dict_key_matches,
                 self.python_matches,
                 self.file_matches,
                 self.magic_matches,
                 self.python_func_kw_matches,
-                self.dict_key_matches,
             ]
 
     def all_completions(self, text:str) -> List[str]:

From 856b05957523262c7fc7262a09d5c9cb8b78c225 Mon Sep 17 00:00:00 2001
From: Gal B <galbgit@gmail.com>
Date: Sat, 13 Nov 2021 19:30:58 +0000
Subject: [PATCH 0832/1407] Use pathlib in historyapp.py

---
 IPython/core/historyapp.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/IPython/core/historyapp.py b/IPython/core/historyapp.py
index a6437eff26e..01a55343f8a 100644
--- a/IPython/core/historyapp.py
+++ b/IPython/core/historyapp.py
@@ -5,8 +5,8 @@
 To be invoked as the `ipython history` subcommand.
 """
 
-import os
 import sqlite3
+from pathlib import Path
 
 from traitlets.config.application import Application
 from .application import BaseIPythonApplication
@@ -52,8 +52,8 @@ class HistoryTrim(BaseIPythonApplication):
     ))
     
     def start(self):
-        profile_dir = self.profile_dir.location
-        hist_file = os.path.join(profile_dir, 'history.sqlite')
+        profile_dir = Path(self.profile_dir.location)
+        hist_file = profile_dir / "history.sqlite"
         con = sqlite3.connect(hist_file)
 
         # Grab the recent history from the current database.
@@ -77,12 +77,12 @@ def start(self):
         con.close()
         
         # Create the new history database.
-        new_hist_file = os.path.join(profile_dir, 'history.sqlite.new')
+        new_hist_file = profile_dir / "history.sqlite.new"
         i = 0
-        while os.path.exists(new_hist_file):
+        while new_hist_file.exists():
             # Make sure we don't interfere with an existing file.
             i += 1
-            new_hist_file = os.path.join(profile_dir, 'history.sqlite.new'+str(i))
+            new_hist_file = profile_dir / ("history.sqlite.new" + str(i))
         new_db = sqlite3.connect(new_hist_file)
         new_db.execute("""CREATE TABLE IF NOT EXISTS sessions (session integer
                             primary key autoincrement, start timestamp,
@@ -106,16 +106,16 @@ def start(self):
 
         if self.backup:
             i = 1
-            backup_hist_file = os.path.join(profile_dir, 'history.sqlite.old.%d' % i)
-            while os.path.exists(backup_hist_file):
+            backup_hist_file = profile_dir / ("history.sqlite.old.%d" % i)
+            while backup_hist_file.exists():
                 i += 1
-                backup_hist_file = os.path.join(profile_dir, 'history.sqlite.old.%d' % i)
-            os.rename(hist_file, backup_hist_file)
+                backup_hist_file = profile_dir / ("history.sqlite.old.%d" % i)
+            hist_file.rename(backup_hist_file)
             print("Backed up longer history file to", backup_hist_file)
         else:
-            os.remove(hist_file)
+            hist_file.unlink()
         
-        os.rename(new_hist_file, hist_file)
+        new_hist_file.rename(hist_file)
 
 class HistoryClear(HistoryTrim):
     description = clear_hist_help

From 6b90f9ce9f0e793f05f586e478508f0c4a4e3d03 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Tue, 16 Nov 2021 21:23:05 +0300
Subject: [PATCH 0833/1407] Switch out off deprecated `asyncio.get_event_loop`
 call

---
 IPython/core/async_helpers.py               |  2 +-
 IPython/core/magics/script.py               |  4 ++--
 IPython/core/tests/test_interactiveshell.py |  2 +-
 IPython/core/tests/test_magic.py            | 21 +++++++++++++--------
 IPython/terminal/interactiveshell.py        |  2 +-
 IPython/terminal/pt_inputhooks/asyncio.py   |  2 +-
 6 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/IPython/core/async_helpers.py b/IPython/core/async_helpers.py
index 67ff169c774..9d2e5ddaab0 100644
--- a/IPython/core/async_helpers.py
+++ b/IPython/core/async_helpers.py
@@ -25,7 +25,7 @@ def __call__(self, coro):
         """
         import asyncio
 
-        return asyncio.get_event_loop().run_until_complete(coro)
+        return asyncio.get_event_loop_policy().get_event_loop().run_until_complete(coro)
 
     def __str__(self):
         return 'asyncio'
diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index 5bf6a023e13..b9f3b8fb157 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -81,7 +81,7 @@ def safe_watcher():
         yield
         return
 
-    loop = asyncio.get_event_loop()
+    loop = policy.get_event_loop()
     try:
         watcher = asyncio.SafeChildWatcher()
         watcher.attach_loop(loop)
@@ -238,7 +238,7 @@ async def _stream_communicate(process, cell):
 
         if sys.platform.startswith("win"):
             asyncio.set_event_loop_policy(asyncio.WindowsProactorEventLoopPolicy())
-        loop = asyncio.get_event_loop()
+        loop = asyncio.get_event_loop_policy().get_event_loop()
         argv = arg_split(line, posix=not sys.platform.startswith("win"))
         args, cmd = self.shebang.parser.parse_known_args(argv)
         try:
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index ef7d69ff8be..f2185e45e76 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -1039,7 +1039,7 @@ def test_custom_exc_count():
 
 
 def test_run_cell_async():
-    loop = asyncio.get_event_loop()
+    loop = asyncio.get_event_loop_policy().get_event_loop()
     ip.run_cell("import asyncio")
     coro = ip.run_cell_async("await asyncio.sleep(0.01)\n5")
     assert asyncio.iscoroutine(coro)
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 9c08926a3f3..cf4c31eb6e9 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -967,17 +967,22 @@ def test_script_config():
     assert "whoda" in sm.magics["cell"]
 
 
+@pytest.fixture
+def event_loop():
+    yield asyncio.get_event_loop_policy().get_event_loop()
+
+
 @dec.skip_iptest_but_not_pytest
 @dec.skip_win32
 @pytest.mark.skipif(
     sys.platform == "win32", reason="This test does not run under Windows"
 )
-def test_script_out():
-    assert asyncio.get_event_loop().is_running() is False
+def test_script_out(event_loop):
+    assert event_loop.is_running() is False
 
     ip = get_ipython()
     ip.run_cell_magic("script", "--out output sh", "echo 'hi'")
-    assert asyncio.get_event_loop().is_running() is False
+    assert event_loop.is_running() is False
     assert ip.user_ns["output"] == "hi\n"
 
 
@@ -986,11 +991,11 @@ def test_script_out():
 @pytest.mark.skipif(
     sys.platform == "win32", reason="This test does not run under Windows"
 )
-def test_script_err():
+def test_script_err(event_loop):
     ip = get_ipython()
-    assert asyncio.get_event_loop().is_running() is False
+    assert event_loop.is_running() is False
     ip.run_cell_magic("script", "--err error sh", "echo 'hello' >&2")
-    assert asyncio.get_event_loop().is_running() is False
+    assert event_loop.is_running() is False
     assert ip.user_ns["error"] == "hello\n"
 
 
@@ -1014,12 +1019,12 @@ def test_script_out_err():
 @pytest.mark.skipif(
     sys.platform == "win32", reason="This test does not run under Windows"
 )
-async def test_script_bg_out():
+async def test_script_bg_out(event_loop):
     ip = get_ipython()
     ip.run_cell_magic("script", "--bg --out output sh", "echo 'hi'")
     assert (await ip.user_ns["output"].read()) == b"hi\n"
     ip.user_ns["output"].close()
-    asyncio.get_event_loop().stop()
+    event_loop.stop()
 
 
 @dec.skip_iptest_but_not_pytest
diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index fd1e0035237..7207a572408 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -648,7 +648,7 @@ def enable_gui(self, gui=None):
                 # When we integrate the asyncio event loop, run the UI in the
                 # same event loop as the rest of the code. don't use an actual
                 # input hook. (Asyncio is not made for nesting event loops.)
-                self.pt_loop = asyncio.get_event_loop()
+                self.pt_loop = asyncio.get_event_loop_policy().get_event_loop()
 
             elif self._inputhook:
                 # If an inputhook was set, create a new asyncio event loop with
diff --git a/IPython/terminal/pt_inputhooks/asyncio.py b/IPython/terminal/pt_inputhooks/asyncio.py
index 95cf194f866..72c45ea251e 100644
--- a/IPython/terminal/pt_inputhooks/asyncio.py
+++ b/IPython/terminal/pt_inputhooks/asyncio.py
@@ -35,7 +35,7 @@
 
 # Keep reference to the original asyncio loop, because getting the event loop
 # within the input hook would return the other loop.
-loop = asyncio.get_event_loop()
+loop = asyncio.get_event_loop_policy().get_event_loop()
 
 
 def inputhook(context):

From ad4aa0fcc43326cd3abdc8c705ebb9db2b643b72 Mon Sep 17 00:00:00 2001
From: Ahmed Fasih <afasih@bloomberg.net>
Date: Tue, 16 Nov 2021 10:57:19 -0800
Subject: [PATCH 0834/1407] use sphinxify (if available) in object_inspect_mime
 path

Background: if we use `%pinfo` line magic (or equivalently `?`; and similarly
for `pinfo2` and `??`), we will call `interactiveshell`'s `_inspect` method
which automatically uses the docrepr module (if available and activated) to
beautifully format docstrings.

However, if we use the lower-level `object_inspect_mime` public method in
`interactiveshell`, docrepr is not used.

(Sidenote: practically speaking, this function is called from JupyterLab's
Context Help, which creates an "inspect_request" message, which in turns calls
`object_inspect_mime`.)

This commit enables `object_inspect_mime` to use the same functionality as
`_inspect`.
---
 IPython/core/interactiveshell.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index c831aa4096f..e76e2142bae 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1813,8 +1813,9 @@ def object_inspect_mime(self, oname, detail_level=0):
         with self.builtin_trap:
             info = self._object_find(oname)
             if info.found:
+                docformat = sphinxify if self.sphinxify_docstring else None
                 return self.inspector._get_info(info.obj, oname, info=info,
-                            detail_level=detail_level
+                            detail_level=detail_level, formatter=docformat
                 )
             else:
                 raise KeyError(oname)

From aec60658534e2c0a55d36559c19d67dd06a44634 Mon Sep 17 00:00:00 2001
From: Ahmed Fasih <afasih@bloomberg.net>
Date: Tue, 16 Nov 2021 12:12:46 -0800
Subject: [PATCH 0835/1407] darker

---
 IPython/core/interactiveshell.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index e76e2142bae..0dec7535356 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1814,8 +1814,12 @@ def object_inspect_mime(self, oname, detail_level=0):
             info = self._object_find(oname)
             if info.found:
                 docformat = sphinxify if self.sphinxify_docstring else None
-                return self.inspector._get_info(info.obj, oname, info=info,
-                            detail_level=detail_level, formatter=docformat
+                return self.inspector._get_info(
+                    info.obj,
+                    oname,
+                    info=info,
+                    detail_level=detail_level,
+                    formatter=docformat,
                 )
             else:
                 raise KeyError(oname)

From d0c8b31d178b7880de1c9ccd5f0ab7ff8e164d23 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 17 Nov 2021 02:08:42 +0300
Subject: [PATCH 0836/1407] module_paths: Fix confusing things

---
 IPython/utils/module_paths.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/IPython/utils/module_paths.py b/IPython/utils/module_paths.py
index b5ae60c3322..f9f7cacc332 100644
--- a/IPython/utils/module_paths.py
+++ b/IPython/utils/module_paths.py
@@ -2,8 +2,6 @@
 
 Utility functions for finding modules on sys.path.
 
-`find_module` returns a path to module or None, given certain conditions.
-
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2011, the IPython Development Team.
@@ -59,11 +57,11 @@ def find_mod(module_name):
         Path to module `module_name`, its __init__.py, or None,
         depending on above conditions.
     """
-    loader = importlib.util.find_spec(module_name)
-    module_path = loader.origin
+    spec = importlib.util.find_spec(module_name)
+    module_path = spec.origin
     if module_path is None:
-        if loader.loader in sys.meta_path:
-            return loader.loader
+        if spec.loader in sys.meta_path:
+            return spec.loader
         return None
     else:
         split_path = module_path.split(".")

From b89cba42488d45bcc37045bc7fe3cce31c645977 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 17 Nov 2021 02:09:10 +0300
Subject: [PATCH 0837/1407] test_path: Replace imp.reload with importlib.reload

---
 IPython/utils/tests/test_path.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index db5f1c879ba..57619a203c1 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -12,7 +12,7 @@
 from contextlib import contextmanager
 from unittest.mock import patch
 from os.path import join, abspath
-from imp import reload
+from importlib import reload
 
 import pytest
 

From 579c9f2a35c0347a5864e5f4886d49031852f765 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 17 Nov 2021 02:10:35 +0300
Subject: [PATCH 0838/1407] MyTempImporter: implement modern interface

---
 IPython/core/tests/test_magic.py | 35 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 9c08926a3f3..93542c67d1d 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -1332,24 +1332,23 @@ def test_run_module_from_import_hook():
         fullpath = os.path.join(tmpdir, 'my_tmp.py')
         Path(fullpath).write_text(TEST_MODULE)
 
-        class MyTempImporter(object):
-            def __init__(self):
-                pass
-
-            def find_module(self, fullname, path=None):
-                if 'my_tmp' in fullname:
-                    return self
-                return None
-
-            def load_module(self, name):
-                import imp
-                return imp.load_source('my_tmp', fullpath)
-
-            def get_code(self, fullname):
-                return compile(Path(fullpath).read_text(), "foo", "exec")
-
-            def is_package(self, __):
-                return False
+        import importlib.abc
+        import importlib.util
+
+        class MyTempImporter(importlib.abc.MetaPathFinder, importlib.abc.SourceLoader):
+            def find_spec(self, fullname, path, target=None):
+                if fullname == "my_tmp":
+                    return importlib.util.spec_from_loader(fullname, self)
+
+            def get_filename(self, fullname):
+                if fullname != "my_tmp":
+                    raise ImportError(f"unexpected module name '{fullname}'")
+                return fullpath
+
+            def get_data(self, path):
+                if not Path(path).samefile(fullpath):
+                    raise OSError(f"expected path '{fullpath}', got '{path}'")
+                return Path(fullpath).read_text()
 
         sys.meta_path.insert(0, MyTempImporter())
 

From d71d42658298e9ec766be04adb29eebf3554d134 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 17 Nov 2021 02:11:23 +0300
Subject: [PATCH 0839/1407] ShimImporter: implement modern interface

---
 IPython/utils/shimmodule.py            | 35 ++++++++------------------
 IPython/utils/tests/test_shimmodule.py |  4 +++
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/IPython/utils/shimmodule.py b/IPython/utils/shimmodule.py
index cc05503e825..ec243a03429 100644
--- a/IPython/utils/shimmodule.py
+++ b/IPython/utils/shimmodule.py
@@ -3,6 +3,8 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+import importlib.abc
+import importlib.util
 import sys
 import types
 from importlib import import_module
@@ -13,41 +15,26 @@
 class ShimWarning(Warning):
     """A warning to show when a module has moved, and a shim is in its place."""
 
-class ShimImporter(object):
+
+class ShimImporter(importlib.abc.MetaPathFinder):
     """Import hook for a shim.
-    
+
     This ensures that submodule imports return the real target module,
     not a clone that will confuse `is` and `isinstance` checks.
     """
     def __init__(self, src, mirror):
         self.src = src
         self.mirror = mirror
-    
+
     def _mirror_name(self, fullname):
         """get the name of the mirrored module"""
-        
-        return self.mirror + fullname[len(self.src):]
 
-    def find_module(self, fullname, path=None):
-        """Return self if we should be used to import the module."""
-        if fullname.startswith(self.src + '.'):
-            mirror_name = self._mirror_name(fullname)
-            try:
-                mod = import_item(mirror_name)
-            except ImportError:
-                return
-            else:
-                if not isinstance(mod, types.ModuleType):
-                    # not a module
-                    return None
-                return self
+        return self.mirror + fullname[len(self.src) :]
 
-    def load_module(self, fullname):
-        """Import the mirrored module, and insert it into sys.modules"""
-        mirror_name = self._mirror_name(fullname)
-        mod = import_item(mirror_name)
-        sys.modules[fullname] = mod
-        return mod
+    def find_spec(self, fullname, path, target=None):
+        if fullname.startswith(self.src + "."):
+            mirror_name = self._mirror_name(fullname)
+            return importlib.util.find_spec(mirror_name)
 
 
 class ShimModule(types.ModuleType):
diff --git a/IPython/utils/tests/test_shimmodule.py b/IPython/utils/tests/test_shimmodule.py
index 814e48240a9..30f2ffa09f2 100644
--- a/IPython/utils/tests/test_shimmodule.py
+++ b/IPython/utils/tests/test_shimmodule.py
@@ -8,3 +8,7 @@ def test_shim_warning():
     sys.modules.pop('IPython.config', None)
     with pytest.warns(ShimWarning):
         import IPython.config
+
+    import traitlets.config
+
+    assert IPython.config.Config is traitlets.config.Config

From c2ae085713ac810a3dc72807f5c61b60b0d496d8 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 17 Nov 2021 03:56:04 +0300
Subject: [PATCH 0840/1407] ImportDenier: implement modern interface

---
 IPython/external/qt_loaders.py            | 11 +++++------
 IPython/external/tests/__init__.py        |  0
 IPython/external/tests/test_qt_loaders.py | 11 +++++++++++
 3 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 IPython/external/tests/__init__.py
 create mode 100644 IPython/external/tests/test_qt_loaders.py

diff --git a/IPython/external/qt_loaders.py b/IPython/external/qt_loaders.py
index 982590e6b10..3351e880bcb 100644
--- a/IPython/external/qt_loaders.py
+++ b/IPython/external/qt_loaders.py
@@ -8,6 +8,7 @@
 This is used primarily by qt and qt_for_kernel, and shouldn't
 be accessed directly from the outside
 """
+import importlib.abc
 import sys
 import types
 from functools import partial, lru_cache
@@ -47,7 +48,7 @@
 }
 
 
-class ImportDenier(object):
+class ImportDenier(importlib.abc.MetaPathFinder):
     """Import Hook that will guard against bad Qt imports
     once IPython commits to a specific binding
     """
@@ -59,14 +60,12 @@ def forbid(self, module_name):
         sys.modules.pop(module_name, None)
         self.__forbidden.add(module_name)
 
-    def find_module(self, fullname, path=None):
+    def find_spec(self, fullname, path, target=None):
         if path:
             return
         if fullname in self.__forbidden:
-            return self
-
-    def load_module(self, fullname):
-        raise ImportError("""
+            raise ImportError(
+                """
     Importing %s disabled by IPython, which has
     already imported an Incompatible QT Binding: %s
     """ % (fullname, loaded_api()))
diff --git a/IPython/external/tests/__init__.py b/IPython/external/tests/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/IPython/external/tests/test_qt_loaders.py b/IPython/external/tests/test_qt_loaders.py
new file mode 100644
index 00000000000..7bc9ccfa86d
--- /dev/null
+++ b/IPython/external/tests/test_qt_loaders.py
@@ -0,0 +1,11 @@
+import importlib
+import pytest
+from IPython.external.qt_loaders import ID
+
+
+def test_import_denier():
+    ID.forbid("ipython_denied_module")
+    with pytest.raises(ImportError, match="disabled by IPython"):
+        import ipython_denied_module
+    with pytest.raises(ImportError, match="disabled by IPython"):
+        importlib.import_module("ipython_denied_module")

From 27b007b338003f9fa9e8ef381c33fb48362b5032 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Thu, 18 Nov 2021 17:52:55 +0300
Subject: [PATCH 0841/1407] test_py_script_file_attribute_interactively:
 Coverage fix

---
 IPython/core/tests/test_shellapp.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/IPython/core/tests/test_shellapp.py b/IPython/core/tests/test_shellapp.py
index f9ea57825be..32a6aee7238 100644
--- a/IPython/core/tests/test_shellapp.py
+++ b/IPython/core/tests/test_shellapp.py
@@ -50,8 +50,4 @@ def test_py_script_file_attribute_interactively(self):
 
         out, err = tt.ipexec(self.fname, options=['-i'],
                            commands=['"__file__" in globals()', 'print(123)', 'exit()'])
-        if 'False' not in out:
-            print("Subprocess stderr:")
-            print(err)
-            print('-----')
-            raise AssertionError("'False' not found in %r" % out)
+        assert "False" in out, f"Subprocess stderr:\n{err}\n-----"

From 5e3d218fe03271cb4daebf16dd1cedd3148e7cb2 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Thu, 18 Nov 2021 17:53:06 +0300
Subject: [PATCH 0842/1407] darker

---
 IPython/core/tests/test_shellapp.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/IPython/core/tests/test_shellapp.py b/IPython/core/tests/test_shellapp.py
index 32a6aee7238..9f4f87b81f2 100644
--- a/IPython/core/tests/test_shellapp.py
+++ b/IPython/core/tests/test_shellapp.py
@@ -48,6 +48,9 @@ def test_py_script_file_attribute_interactively(self):
         src = "True\n"
         self.mktmp(src)
 
-        out, err = tt.ipexec(self.fname, options=['-i'],
-                           commands=['"__file__" in globals()', 'print(123)', 'exit()'])
+        out, err = tt.ipexec(
+            self.fname,
+            options=["-i"],
+            commands=['"__file__" in globals()', "print(123)", "exit()"],
+        )
         assert "False" in out, f"Subprocess stderr:\n{err}\n-----"

From 420a29d8b78081aa17114f969a8983e375fd07c2 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Thu, 18 Nov 2021 18:15:44 +0300
Subject: [PATCH 0843/1407] Enable `check_make_token_by_line_never_ends_empty`
 test

It was added in 28a8ea639a7a37bfb03ee87d397ea5e69dcc537e but missed `test_` prefix in the name.

Note: There is a type mismatch in calls to `make_tokens_by_line` but that does not lead to an error.
---
 IPython/core/tests/test_inputtransformer2.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index 2a307d54d13..b00d1a8fb70 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -143,7 +143,8 @@ def null_cleanup_transformer(lines):
     """
     return []
 
-def check_make_token_by_line_never_ends_empty():
+
+def test_check_make_token_by_line_never_ends_empty():
     """
     Check that not sequence of single or double characters ends up leading to en empty list of tokens
     """

From b221a8fb67e9db705de35c935858ac5f4531f0de Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Thu, 18 Nov 2021 18:27:40 +0300
Subject: [PATCH 0844/1407] test_inputsplitter: remove unused function

Leftover from 358332df835afb918bdfe4c8d87ec4fc70d00c25
---
 IPython/core/tests/test_inputsplitter.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/IPython/core/tests/test_inputsplitter.py b/IPython/core/tests/test_inputsplitter.py
index 0a13fb68c85..46c804aecda 100644
--- a/IPython/core/tests/test_inputsplitter.py
+++ b/IPython/core/tests/test_inputsplitter.py
@@ -49,10 +49,6 @@ def mini_interactive_loop(input_func):
 # Test utilities, just for local use
 #-----------------------------------------------------------------------------
 
-def assemble(block):
-    """Assemble a block into multi-line sub-blocks."""
-    return ['\n'.join(sub_block)+'\n' for sub_block in block]
-
 
 def pseudo_input(lines):
     """Return a function that acts like raw_input but feeds the input list."""

From b00e8a7d1ecb70e72361de52d50b816989fa9278 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Thu, 18 Nov 2021 19:23:25 +0300
Subject: [PATCH 0845/1407] test_path: revive match tests

These tests had not been running on Nose and I did not spot that previously.
---
 IPython/utils/tests/test_path.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index db5f1c879ba..e846b584e19 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -390,7 +390,7 @@ def test_match_posix(self):
                 ([r'a\*', 'a*'], ['a*'] + self.filenames_start_with_a),
                 ([r'a\[012]'], ['a[012]']),
                 ]:
-            yield (self.check_match, patterns, matches)
+            self.check_match(patterns, matches)
 
     @skip_if_not_win32
     def test_match_windows(self):
@@ -401,7 +401,7 @@ def test_match_windows(self):
                 ([r'a\*', 'a*'], [r'a\*'] + self.filenames_start_with_a),
                 ([r'a\[012]'], [r'a\[012]']),
                 ]:
-            yield (self.check_match, patterns, matches)
+            self.check_match(patterns, matches)
 
 
 # TODO : pytest.mark.parametrise once nose is gone.

From e8d5d4b18c0f0ded27647051e707abe5aeb811ea Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Thu, 18 Nov 2021 19:42:34 +0300
Subject: [PATCH 0846/1407] CI: Install texlive to run latex tests

---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9bd353a97e4..b2bbf9c4601 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,6 +29,9 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+    - name: Install latex
+      if: runner.os == 'Linux'
+      run: sudo apt-get -yq -o Acquire::Retries=3 --no-install-suggests --no-install-recommends install texlive dvipng
     - name: Install and update Python dependencies
       run: |
         python -m pip install --upgrade pip setuptools wheel

From 044a51b3b20ce726d6d67e7a6289623593a4d37c Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 17 Nov 2021 22:10:39 +0300
Subject: [PATCH 0847/1407] Deprecate `IPython.utils.version`

The `distutils.version.LooseVersion` is deprecated and there is no replacement in the standard library.
---
 IPython/external/qt_for_kernel.py |  5 ++---
 IPython/external/qt_loaders.py    |  7 +++----
 IPython/utils/version.py          | 18 +++++++++++-------
 pytest.ini                        |  1 +
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/IPython/external/qt_for_kernel.py b/IPython/external/qt_for_kernel.py
index d2e7bd99f01..b3168f6e2e0 100644
--- a/IPython/external/qt_for_kernel.py
+++ b/IPython/external/qt_for_kernel.py
@@ -31,7 +31,6 @@
 import os
 import sys
 
-from IPython.utils.version import check_version
 from IPython.external.qt_loaders import (
     load_qt,
     loaded_api,
@@ -101,8 +100,8 @@ def get_options():
 
     mpl = sys.modules.get('matplotlib', None)
 
-    if mpl is not None and not check_version(mpl.__version__, '1.0.2'):
-        #1.0.1 only supports PyQt4 v1
+    if mpl is not None and tuple(mpl.__version__.split(".")) < ("1", "0", "2"):
+        # 1.0.1 only supports PyQt4 v1
         return [QT_API_PYQT_DEFAULT]
 
     qt_api = os.environ.get('QT_API', None)
diff --git a/IPython/external/qt_loaders.py b/IPython/external/qt_loaders.py
index 982590e6b10..c563b587d62 100644
--- a/IPython/external/qt_loaders.py
+++ b/IPython/external/qt_loaders.py
@@ -13,8 +13,6 @@
 from functools import partial, lru_cache
 import operator
 
-from IPython.utils.version import check_version
-
 # ### Available APIs.
 # Qt6
 QT_API_PYQT6 = "pyqt6"
@@ -149,7 +147,8 @@ def has_binding(api):
     if api == QT_API_PYSIDE:
         # We can also safely check PySide version
         import PySide
-        return check_version(PySide.__version__, '1.0.3')
+
+        return PySide.__version_info__ >= (1, 0, 3)
 
     return True
 
@@ -211,7 +210,7 @@ def import_pyqt4(version=2):
 
     from PyQt4 import QtGui, QtCore, QtSvg
 
-    if not check_version(QtCore.PYQT_VERSION_STR, '4.7'):
+    if QtCore.PYQT_VERSION < 0x040700:
         raise ImportError("IPython requires PyQt4 >= 4.7, found %s" %
                           QtCore.PYQT_VERSION_STR)
 
diff --git a/IPython/utils/version.py b/IPython/utils/version.py
index 1de0047e6b4..050155640d4 100644
--- a/IPython/utils/version.py
+++ b/IPython/utils/version.py
@@ -12,15 +12,10 @@
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
+from warnings import warn
 
-from distutils.version import LooseVersion
+warn("The `IPython.utils.version` module has been deprecated since IPython 8.0.")
 
-#-----------------------------------------------------------------------------
-# Code
-#-----------------------------------------------------------------------------
 
 def check_version(v, check):
     """check version string v >= check
@@ -29,6 +24,15 @@ def check_version(v, check):
     it is assumed that the dependency is satisfied.
     Users on dev branches are responsible for keeping their own packages up to date.
     """
+    warn(
+        "`check_version` function is deprecated as of IPython 8.0"
+        "and will be removed in future versions.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+
+    from distutils.version import LooseVersion
+
     try:
         return LooseVersion(v) >= LooseVersion(check)
     except TypeError:
diff --git a/pytest.ini b/pytest.ini
index 3aeec55e754..9189cf6c33b 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -43,5 +43,6 @@ addopts = --durations=10
     --ignore=IPython/utils/log.py
     --ignore=IPython/utils/signatures.py
     --ignore=IPython/utils/traitlets.py
+    --ignore=IPython/utils/version.py
 doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS
 ipdoctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS

From 0e59ae55629f08fd4e129e3678a59318b61f42e7 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Thu, 18 Nov 2021 22:05:05 +0300
Subject: [PATCH 0848/1407] Rewrite bunch of `raise AssertionError` and `assert
 False` tests

---
 IPython/core/tests/test_compilerop.py |  8 +++----
 IPython/core/tests/test_debugger.py   |  6 ++----
 IPython/core/tests/test_hooks.py      |  8 +++----
 IPython/core/tests/test_logger.py     |  6 +-----
 IPython/core/tests/test_magic.py      | 15 ++++++-------
 IPython/utils/tests/test_text.py      | 31 +++++++++++++++------------
 6 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/IPython/core/tests/test_compilerop.py b/IPython/core/tests/test_compilerop.py
index aa531b81d44..b939bb60676 100644
--- a/IPython/core/tests/test_compilerop.py
+++ b/IPython/core/tests/test_compilerop.py
@@ -66,8 +66,6 @@ def test_compiler_check_cache():
     cp.cache('x=1', 99)
     # Ensure now that after clearing the cache, our entries survive
     linecache.checkcache()
-    for k in linecache.cache:
-        if k.startswith('<ipython-input-99'):
-            break
-    else:
-        raise AssertionError('Entry for input-99 missing from linecache')
+    assert any(
+        k.startswith("<ipython-input-99") for k in linecache.cache
+    ), "Entry for input-99 missing from linecache"
diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index d3312853149..4b4af229881 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -242,10 +242,8 @@ def test_interruptible_core_debugger():
     """
     def raising_input(msg="", called=[0]):
         called[0] += 1
-        if called[0] == 1:
-            raise KeyboardInterrupt()
-        else:
-            raise AssertionError("input() should only be called once!")
+        assert called[0] == 1, "input() should only be called once!"
+        raise KeyboardInterrupt()
 
     tracer_orig = sys.gettrace()
     try:
diff --git a/IPython/core/tests/test_hooks.py b/IPython/core/tests/test_hooks.py
index bd37526a738..6e0b1c152fa 100644
--- a/IPython/core/tests/test_hooks.py
+++ b/IPython/core/tests/test_hooks.py
@@ -6,6 +6,7 @@
 # Imports
 #-----------------------------------------------------------------------------
 
+import pytest
 from IPython.core.error import TryNext
 from IPython.core.hooks import CommandChainDispatcher
 
@@ -41,12 +42,9 @@ def test_command_chain_dispatcher_ff():
     fail2 = Fail("fail2")
     dp = CommandChainDispatcher([(0, fail1), (10, fail2)])
 
-    try:
+    with pytest.raises(TryNext) as e:
         dp()
-    except TryNext as e:
-        assert str(e) == "fail2"
-    else:
-        assert False, "Expected exception was not raised."
+    assert str(e.value) == "fail2"
 
     assert fail1.called is True
     assert fail2.called is True
diff --git a/IPython/core/tests/test_logger.py b/IPython/core/tests/test_logger.py
index e53385f9cbf..71c4e6b60c0 100644
--- a/IPython/core/tests/test_logger.py
+++ b/IPython/core/tests/test_logger.py
@@ -7,12 +7,8 @@
 from IPython.utils.tempdir import TemporaryDirectory
 
 def test_logstart_inaccessible_file():
-    try:
+    with pytest.raises(IOError):
         _ip.logger.logstart(logfname="/")   # Opening that filename will fail.
-    except IOError:
-        pass
-    else:
-        assert False  # The try block should never pass.
 
     try:
         _ip.run_cell("a=1")                 # Check it doesn't try to log this
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 9c08926a3f3..2c37c3e8214 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -132,10 +132,10 @@ def test_config_print_class():
         _ip.magic('config TerminalInteractiveShell')
 
     stdout = captured.stdout
-    if not re.match("TerminalInteractiveShell.* options", stdout.splitlines()[0]):
-        print(stdout)
-        raise AssertionError("1st line of stdout not like "
-                             "'TerminalInteractiveShell.* options'")
+    assert re.match(
+        "TerminalInteractiveShell.* options", stdout.splitlines()[0]
+    ), f"{stdout}\n\n1st line of stdout not like 'TerminalInteractiveShell.* options'"
+
 
 def test_rehashx():
     # clear up everything
@@ -1219,12 +1219,9 @@ def test_edit_interactive():
     n = ip.execution_count
     ip.run_cell("def foo(): return 1", store_history=True)
 
-    try:
+    with pytest.raises(code.InteractivelyDefined) as e:
         _run_edit_test("foo")
-    except code.InteractivelyDefined as e:
-        assert e.index == n
-    else:
-        raise AssertionError("Should have raised InteractivelyDefined")
+    assert e.value.index == n
 
 
 def test_edit_cell():
diff --git a/IPython/utils/tests/test_text.py b/IPython/utils/tests/test_text.py
index 72660d4826c..72cbbcb711b 100644
--- a/IPython/utils/tests/test_text.py
+++ b/IPython/utils/tests/test_text.py
@@ -70,13 +70,14 @@ def test_columnize_random():
             out = text.columnize(items, row_first=row_first, displaywidth=displaywidth)
             longer_line = max([len(x) for x in out.split('\n')])
             longer_element = max(rand_len)
-            if longer_line > displaywidth:
-                print("Columnize displayed something lager than displaywidth : %s " % longer_line)
-                print("longer element : %s " % longer_element)
-                print("displaywidth : %s " % displaywidth)
-                print("number of element : %s " % nitems)
-                print("size of each element :\n %s" % rand_len)
-                assert False, "row_first={0}".format(row_first)
+            assert longer_line <= displaywidth, (
+                f"Columnize displayed something lager than displaywidth : {longer_line}\n"
+                f"longer element : {longer_element}\n"
+                f"displaywidth : {displaywidth}\n"
+                f"number of element : {nitems}\n"
+                f"size of each element : {rand_len}\n"
+                f"row_first={row_first}\n"
+            )
 
 
 # TODO: pytest mark.parametrize once nose removed.
@@ -103,9 +104,9 @@ def eval_formatter_check(f):
     ns = dict(n=12, pi=math.pi, stuff='hello there', os=os, u=u"café", b="café")
     s = f.format("{n} {n//4} {stuff.split()[0]}", **ns)
     assert s == "12 3 hello"
-    s = f.format(' '.join(['{n//%i}'%i for i in range(1,8)]), **ns)
+    s = f.format(" ".join(["{n//%i}" % i for i in range(1, 8)]), **ns)
     assert s == "12 6 4 3 2 2 1"
-    s = f.format('{[n//i for i in range(1,8)]}', **ns)
+    s = f.format("{[n//i for i in range(1,8)]}", **ns)
     assert s == "[12, 6, 4, 3, 2, 2, 1]"
     s = f.format("{stuff!s}", **ns)
     assert s == ns["stuff"]
@@ -133,9 +134,9 @@ def eval_formatter_slicing_check(f):
     pytest.raises(SyntaxError, f.format, "{n:x}", **ns)
 
 def eval_formatter_no_slicing_check(f):
-    ns = dict(n=12, pi=math.pi, stuff='hello there', os=os)
-    
-    s = f.format('{n:x} {pi**2:+f}', **ns)
+    ns = dict(n=12, pi=math.pi, stuff="hello there", os=os)
+
+    s = f.format("{n:x} {pi**2:+f}", **ns)
     assert s == "c +9.869604"
 
     s = f.format("{stuff[slice(1,4)]}", **ns)
@@ -187,10 +188,11 @@ def test_strip_email():
 
 
 def test_strip_email2():
-    src = '> > > list()'
-    cln = 'list()'
+    src = "> > > list()"
+    cln = "list()"
     assert text.strip_email_quotes(src) == cln
 
+
 def test_LSString():
     lss = text.LSString("abc\ndef")
     assert lss.l == ["abc", "def"]
@@ -198,6 +200,7 @@ def test_LSString():
     lss = text.LSString(os.getcwd())
     assert isinstance(lss.p[0], Path)
 
+
 def test_SList():
     sl = text.SList(["a 11", "b 1", "a 2"])
     assert sl.n == "a 11\nb 1\na 2"

From 7410af58c54f7356328a9311025853b1191c492f Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Thu, 18 Nov 2021 23:04:44 +0300
Subject: [PATCH 0849/1407] Remove `skip_iptest_but_not_pytest`

---
 IPython/core/tests/test_inputtransformer2.py |  3 ---
 IPython/core/tests/test_magic.py             |  6 ------
 IPython/lib/tests/test_latextools.py         |  4 ----
 IPython/lib/tests/test_pretty.py             |  2 --
 IPython/testing/decorators.py                | 11 -----------
 IPython/utils/tests/test_capture.py          |  5 -----
 IPython/utils/tests/test_pycolorize.py       |  4 ----
 IPython/utils/tests/test_tokenutil.py        |  2 --
 8 files changed, 37 deletions(-)

diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index b00d1a8fb70..f29bb2af6dd 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -12,7 +12,6 @@
 
 from IPython.core import inputtransformer2 as ipt2
 from IPython.core.inputtransformer2 import _find_assign_op, make_tokens_by_line
-from IPython.testing.decorators import skip_iptest_but_not_pytest
 
 MULTILINE_MAGIC = ("""\
 a = f()
@@ -285,14 +284,12 @@ def __init__(self, s):
 ]
 
 
-@skip_iptest_but_not_pytest
 @pytest.mark.parametrize("code, expected, number", examples)
 def test_check_complete_param(code, expected, number):
     cc = ipt2.TransformerManager().check_complete
     assert cc(code) == (expected, number)
 
 
-@skip_iptest_but_not_pytest
 @pytest.mark.xfail(
     reason="Bug in python 3.9.8 – bpo 45738",
     condition=sys.version_info[:3] == (3, 9, 8),
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 0cadae6ef8d..95bd85b15e0 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -972,7 +972,6 @@ def event_loop():
     yield asyncio.get_event_loop_policy().get_event_loop()
 
 
-@dec.skip_iptest_but_not_pytest
 @dec.skip_win32
 @pytest.mark.skipif(
     sys.platform == "win32", reason="This test does not run under Windows"
@@ -986,7 +985,6 @@ def test_script_out(event_loop):
     assert ip.user_ns["output"] == "hi\n"
 
 
-@dec.skip_iptest_but_not_pytest
 @dec.skip_win32
 @pytest.mark.skipif(
     sys.platform == "win32", reason="This test does not run under Windows"
@@ -999,7 +997,6 @@ def test_script_err(event_loop):
     assert ip.user_ns["error"] == "hello\n"
 
 
-@dec.skip_iptest_but_not_pytest
 @dec.skip_win32
 @pytest.mark.skipif(
     sys.platform == "win32", reason="This test does not run under Windows"
@@ -1014,7 +1011,6 @@ def test_script_out_err():
     assert ip.user_ns["error"] == "hello\n"
 
 
-@dec.skip_iptest_but_not_pytest
 @dec.skip_win32
 @pytest.mark.skipif(
     sys.platform == "win32", reason="This test does not run under Windows"
@@ -1027,7 +1023,6 @@ async def test_script_bg_out(event_loop):
     event_loop.stop()
 
 
-@dec.skip_iptest_but_not_pytest
 @dec.skip_win32
 @pytest.mark.skipif(
     sys.platform == "win32", reason="This test does not run under Windows"
@@ -1039,7 +1034,6 @@ async def test_script_bg_err():
     ip.user_ns["error"].close()
 
 
-@dec.skip_iptest_but_not_pytest
 @dec.skip_win32
 @pytest.mark.skipif(
     sys.platform == "win32", reason="This test does not run under Windows"
diff --git a/IPython/lib/tests/test_latextools.py b/IPython/lib/tests/test_latextools.py
index 60a7589b508..ead73abff93 100644
--- a/IPython/lib/tests/test_latextools.py
+++ b/IPython/lib/tests/test_latextools.py
@@ -11,13 +11,11 @@
 from IPython.testing.decorators import (
     onlyif_cmds_exist,
     skipif_not_matplotlib,
-    skip_iptest_but_not_pytest,
 )
 from IPython.utils.process import FindCmdError
 
 
 @pytest.mark.parametrize('command', ['latex', 'dvipng'])
-@skip_iptest_but_not_pytest
 def test_check_latex_to_png_dvipng_fails_when_no_cmd(command):
     def mock_find_cmd(arg):
         if arg == command:
@@ -32,7 +30,6 @@ def no_op(*args, **kwargs):
     yield
 
 
-@skip_iptest_but_not_pytest
 @onlyif_cmds_exist("latex", "dvipng")
 @pytest.mark.parametrize("s, wrap", [(u"$$x^2$$", False), (u"x^2", True)])
 def test_latex_to_png_dvipng_runs(s, wrap):
@@ -60,7 +57,6 @@ def patch_latextool(mock=mock_kpsewhich):
 
 @pytest.mark.parametrize('context', [no_op, patch_latextool])
 @pytest.mark.parametrize('s_wrap', [("$x^2$", False), ("x^2", True)])
-@skip_iptest_but_not_pytest
 def test_latex_to_png_mpl_runs(s_wrap, context):
     """
     Test that latex_to_png_mpl just runs without error.
diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py
index ec1211ac195..8b8a6ee75f6 100644
--- a/IPython/lib/tests/test_pretty.py
+++ b/IPython/lib/tests/test_pretty.py
@@ -16,7 +16,6 @@
 import pytest
 
 from IPython.lib import pretty
-from IPython.testing.decorators import skip_iptest_but_not_pytest
 
 from io import StringIO
 
@@ -129,7 +128,6 @@ def test_callability_checking():
         ],
     ),
 )
-@skip_iptest_but_not_pytest
 def test_sets(obj, expected_output):
     """
     Test that set and frozenset use Python 3 formatting.
diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
index 74af7c1c83d..93f55d96806 100644
--- a/IPython/testing/decorators.py
+++ b/IPython/testing/decorators.py
@@ -149,17 +149,6 @@ def decor(f):
     return decor
 
 
-def skip_iptest_but_not_pytest(f):
-    """
-    Warning this will make the test invisible to iptest.
-    """
-    import os
-
-    if os.environ.get("IPTEST_WORKING_DIR", None) is not None:
-        f.__test__ = False
-    return f
-
-
 def skipif(skip_condition, msg=None):
     """Make function raise SkipTest exception if skip_condition is true
 
diff --git a/IPython/utils/tests/test_capture.py b/IPython/utils/tests/test_capture.py
index 3cfa8276acf..8645ed18c9e 100644
--- a/IPython/utils/tests/test_capture.py
+++ b/IPython/utils/tests/test_capture.py
@@ -17,8 +17,6 @@
 
 import pytest
 
-from IPython.testing.decorators import skip_iptest_but_not_pytest
-
 from IPython.utils import capture
 
 #-----------------------------------------------------------------------------
@@ -69,7 +67,6 @@
 # Test Functions
 #-----------------------------------------------------------------------------
 @pytest.mark.parametrize("method_mime", _mime_map.items())
-@skip_iptest_but_not_pytest
 def test_rich_output_empty(method_mime):
     """RichOutput with no args"""
     rich = capture.RichOutput()
@@ -88,7 +85,6 @@ def test_rich_output():
     assert rich._repr_svg_() is None
 
 
-@skip_iptest_but_not_pytest
 @pytest.mark.parametrize("method_mime", _mime_map.items())
 def test_rich_output_no_metadata(method_mime):
     """test RichOutput with no metadata"""
@@ -98,7 +94,6 @@ def test_rich_output_no_metadata(method_mime):
     assert getattr(rich, method)() == data[mime]
 
 
-@skip_iptest_but_not_pytest
 @pytest.mark.parametrize("method_mime", _mime_map.items())
 def test_rich_output_metadata(method_mime):
     """test RichOutput with metadata"""
diff --git a/IPython/utils/tests/test_pycolorize.py b/IPython/utils/tests/test_pycolorize.py
index 178f4a98c47..05d51b6e44d 100644
--- a/IPython/utils/tests/test_pycolorize.py
+++ b/IPython/utils/tests/test_pycolorize.py
@@ -17,8 +17,6 @@
 # Imports
 #-----------------------------------------------------------------------------
 
-from IPython.testing.decorators import skip_iptest_but_not_pytest
-
 # our own
 from IPython.utils.PyColorize import Parser
 import io
@@ -53,7 +51,6 @@ def __init__(self):
 """
 
 
-@skip_iptest_but_not_pytest
 def test_parse_sample(style):
     """and test writing to a buffer"""
     buf = io.StringIO()
@@ -65,7 +62,6 @@ def test_parse_sample(style):
     assert "ERROR" not in f1
 
 
-@skip_iptest_but_not_pytest
 def test_parse_error(style):
     p = Parser(style=style)
     f1 = p.format(")", "str")
diff --git a/IPython/utils/tests/test_tokenutil.py b/IPython/utils/tests/test_tokenutil.py
index 406c0ae51fa..c4539d1fc7e 100644
--- a/IPython/utils/tests/test_tokenutil.py
+++ b/IPython/utils/tests/test_tokenutil.py
@@ -3,7 +3,6 @@
 # Distributed under the terms of the Modified BSD License.
 
 import pytest
-from IPython.testing.decorators import skip_iptest_but_not_pytest
 
 from IPython.utils.tokenutil import token_at_cursor, line_at_cursor
 
@@ -132,7 +131,6 @@ def test_line_at_cursor():
         ["int"] * (22 - 16) + ["map"] * (28 - 22),
     ),
 )
-@skip_iptest_but_not_pytest
 def test_multiline_statement(c, token):
     cell = """a = (1,
     3)

From daadb7c2e34e62ebf8a3aec9621f2969d391e076 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Thu, 18 Nov 2021 23:12:01 +0300
Subject: [PATCH 0850/1407] Remove bunch of deprecated and unused testing
 decorators

---
 IPython/testing/decorators.py | 119 ----------------------------------
 1 file changed, 119 deletions(-)

diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
index 74af7c1c83d..63a1063aaa0 100644
--- a/IPython/testing/decorators.py
+++ b/IPython/testing/decorators.py
@@ -61,93 +61,6 @@ def test(self):
 
 # Utility functions
 
-def apply_wrapper(wrapper, func):
-    """Apply a wrapper to a function for decoration.
-
-    This mixes Michele Simionato's decorator tool with nose's make_decorator,
-    to apply a wrapper in a decorator so that all nose attributes, as well as
-    function signature and other properties, survive the decoration cleanly.
-    This will ensure that wrapped functions can still be well introspected via
-    IPython, for example.
-    """
-    warnings.warn("The function `apply_wrapper` is deprecated since IPython 4.0",
-            DeprecationWarning, stacklevel=2)
-    import nose.tools
-
-    return decorator(wrapper,nose.tools.make_decorator(func)(wrapper))
-
-
-def make_label_dec(label, ds=None):
-    """Factory function to create a decorator that applies one or more labels.
-
-    Parameters
-    ----------
-      label : string or sequence
-      One or more labels that will be applied by the decorator to the functions
-    it decorates.  Labels are attributes of the decorated function with their
-    value set to True.
-
-      ds : string
-      An optional docstring for the resulting decorator.  If not given, a
-      default docstring is auto-generated.
-
-    Returns
-    -------
-      A decorator.
-
-    Examples
-    --------
-
-    A simple labeling decorator:
-
-    >>> slow = make_label_dec('slow')
-    >>> slow.__doc__
-    "Labels a test as 'slow'."
-
-    And one that uses multiple labels and a custom docstring:
-
-    >>> rare = make_label_dec(['slow','hard'],
-    ... "Mix labels 'slow' and 'hard' for rare tests.")
-    >>> rare.__doc__
-    "Mix labels 'slow' and 'hard' for rare tests."
-
-    Now, let's test using this one:
-    >>> @rare
-    ... def f(): pass
-    ...
-    >>>
-    >>> f.slow
-    True
-    >>> f.hard
-    True
-    """
-
-    warnings.warn("The function `make_label_dec` is deprecated since IPython 4.0",
-            DeprecationWarning, stacklevel=2)
-    if isinstance(label, str):
-        labels = [label]
-    else:
-        labels = label
-
-    # Validate that the given label(s) are OK for use in setattr() by doing a
-    # dry run on a dummy function.
-    tmp = lambda : None
-    for label in labels:
-        setattr(tmp,label,True)
-
-    # This is the actual decorator we'll return
-    def decor(f):
-        for label in labels:
-            setattr(f,label,True)
-        return f
-
-    # Apply the user's docstring, or autogenerate a basic one
-    if ds is None:
-        ds = "Labels a test as %r." % label
-    decor.__doc__ = ds
-
-    return decor
-
 
 def skip_iptest_but_not_pytest(f):
     """
@@ -234,20 +147,6 @@ def module_not_available(module):
     return mod_not_avail
 
 
-def decorated_dummy(dec, name):
-    """Return a dummy function decorated with dec, with the given name.
-
-    Examples
-    --------
-    import IPython.testing.decorators as dec
-    setup = dec.decorated_dummy(dec.skip_if_no_x11, __name__)
-    """
-    warnings.warn("The function `decorated_dummy` is deprecated since IPython 4.0",
-        DeprecationWarning, stacklevel=2)
-    dummy = lambda: None
-    dummy.__name__ = name
-    return dec(dummy)
-
 #-----------------------------------------------------------------------------
 # Decorators for public use
 
@@ -279,12 +178,6 @@ def decorated_dummy(dec, name):
 skip_win32_py38 = skipif(sys.version_info > (3,8) and os.name == 'nt')
 
 
-# not a decorator itself, returns a dummy function to be used as setup
-def skip_file_no_x11(name):
-    warnings.warn("The function `skip_file_no_x11` is deprecated since IPython 4.0",
-            DeprecationWarning, stacklevel=2)
-    return decorated_dummy(skip_if_no_x11, name) if _x11_skip_cond else None
-
 # Other skip decorators
 
 # generic skip without module
@@ -328,15 +221,3 @@ def onlyif_cmds_exist(*commands):
 
                 return pytest.mark.skip(reason=reason)
     return null_deco
-
-def onlyif_any_cmd_exists(*commands):
-    """
-    Decorator to skip test unless at least one of `commands` is found.
-    """
-    warnings.warn("The function `onlyif_any_cmd_exists` is deprecated since IPython 4.0",
-            DeprecationWarning, stacklevel=2)
-    for cmd in commands:
-        if shutil.which(cmd):
-            return null_deco
-    return skip("This test runs only if one of the commands {0} "
-                "is installed".format(commands))

From 6b1846f57ca3db5e32e32605335b0f3b5c5d97be Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Thu, 18 Nov 2021 23:33:18 +0300
Subject: [PATCH 0851/1407] Cleanup ipdoctest

Leftovers after Nose plugin removal.
---
 IPython/testing/plugin/ipdoctest.py | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/IPython/testing/plugin/ipdoctest.py b/IPython/testing/plugin/ipdoctest.py
index 784760f81cf..d5c794b80ff 100644
--- a/IPython/testing/plugin/ipdoctest.py
+++ b/IPython/testing/plugin/ipdoctest.py
@@ -38,14 +38,6 @@
 # Classes and functions
 #-----------------------------------------------------------------------------
 
-def is_extension_module(filename):
-    """Return whether the given filename is an extension module.
-
-    This simply checks that the extension is either .so or .pyd.
-    """
-    return os.path.splitext(filename)[1].lower() in ('.so','.pyd')
-
-
 class DocTestSkip(object):
     """Object wrapper for doctests to be skipped."""
 
@@ -443,10 +435,3 @@ def run(self, test, compileflags=None, out=None, clear_globs=True):
         with modified_env({'COLUMNS': '80', 'LINES': '24'}):
             return super(IPDocTestRunner,self).run(test,
                                                    compileflags,out,clear_globs)
-
-
-class DocFileCase(doctest.DocFileCase):
-    """Overrides to provide filename
-    """
-    def address(self):
-        return (self._dt_test.filename, None, None)

From ccdbaf50e48619dee0401ec68977dd6376e16d20 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 1 Nov 2021 20:20:27 +0300
Subject: [PATCH 0852/1407] CI: Collect coverage from docs build

---
 .github/workflows/docs.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 38b6ab9ec5d..de9b70a7058 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -18,9 +18,18 @@ jobs:
         sudo apt-get install graphviz
     - name: Install Python dependencies
       run: |
-        python -m pip install --upgrade pip setuptools
+        python -m pip install --upgrade pip setuptools coverage
         pip install -r docs/requirements.txt
     - name: Build docs
       run: |
         python tools/fixup_whats_new_pr.py
-        make -C docs/ html SPHINXOPTS="-W"
+        make -C docs/ html SPHINXOPTS="-W" \
+          PYTHON="coverage run -a" \
+          SPHINXBUILD="coverage run -a -m sphinx.cmd.build"
+    - name: Generate coverage xml
+      run: |
+        coverage combine `find . -name .coverage\*` && coverage xml
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v2
+      with:
+        name: Docs

From cd387ef61715f61c6ea71f0cfa58ecab5a8a7f78 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Fri, 19 Nov 2021 04:20:36 +0300
Subject: [PATCH 0853/1407] Preserve function/method identity in magic
 decorators

`decorator(call, func)` does `func.__doc__ = call.__doc__` and so on, where `func` is the original function and `call = lambda f, *a, **k: f(*a, **k)`. Because of that ipdoctest is not able to see the function original docstring, leading to missing tests. The resulting wrapper is simply calling the original function and thus is not needed.
---
 IPython/core/magic.py                       | 13 ++--
 IPython/core/magics/basic.py                |  1 +
 IPython/core/magics/config.py               | 79 ++++++++++++++-------
 IPython/core/magics/script.py               |  2 +
 IPython/core/tests/test_interactiveshell.py | 26 ++++---
 IPython/extensions/storemagic.py            |  3 +
 IPython/terminal/magics.py                  |  2 +
 7 files changed, 84 insertions(+), 42 deletions(-)

diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 6dc0ad34dde..7f7f1f94b28 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -20,7 +20,6 @@
 from . import oinspect
 from .error import UsageError
 from .inputtransformer2 import ESC_MAGIC, ESC_MAGIC2
-from decorator import decorator
 from ..utils.ipstruct import Struct
 from ..utils.process import arg_split
 from ..utils.text import dedent
@@ -184,20 +183,18 @@ def _method_magic_marker(magic_kind):
     # This is a closure to capture the magic_kind.  We could also use a class,
     # but it's overkill for just that one bit of state.
     def magic_deco(arg):
-        call = lambda f, *a, **k: f(*a, **k)
-
         if callable(arg):
             # "Naked" decorator call (just @foo, no args)
             func = arg
             name = func.__name__
-            retval = decorator(call, func)
+            retval = arg
             record_magic(magics, magic_kind, name, name)
         elif isinstance(arg, str):
             # Decorator called with arguments (@foo('bar'))
             name = arg
             def mark(func, *a, **kw):
                 record_magic(magics, magic_kind, name, func.__name__)
-                return decorator(call, func)
+                return func
             retval = mark
         else:
             raise TypeError("Decorator can only be called with "
@@ -217,8 +214,6 @@ def _function_magic_marker(magic_kind):
     # This is a closure to capture the magic_kind.  We could also use a class,
     # but it's overkill for just that one bit of state.
     def magic_deco(arg):
-        call = lambda f, *a, **k: f(*a, **k)
-
         # Find get_ipython() in the caller's namespace
         caller = sys._getframe(1)
         for ns in ['f_locals', 'f_globals', 'f_builtins']:
@@ -236,13 +231,13 @@ def magic_deco(arg):
             func = arg
             name = func.__name__
             ip.register_magic_function(func, magic_kind, name)
-            retval = decorator(call, func)
+            retval = arg
         elif isinstance(arg, str):
             # Decorator called with arguments (@foo('bar'))
             name = arg
             def mark(func, *a, **kw):
                 ip.register_magic_function(func, magic_kind, name)
-                return decorator(call, func)
+                return func
             retval = mark
         else:
             raise TypeError("Decorator can only be called with "
diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py
index 72cfc804143..4a8f223c206 100644
--- a/IPython/core/magics/basic.py
+++ b/IPython/core/magics/basic.py
@@ -74,6 +74,7 @@ class BasicMagics(Magics):
     These are various magics that don't fit into specific categories but that
     are all part of the base 'IPython experience'."""
 
+    @skip_doctest
     @magic_arguments.magic_arguments()
     @magic_arguments.argument(
         '-l', '--line', action='store_true',
diff --git a/IPython/core/magics/config.py b/IPython/core/magics/config.py
index b582bdd6eac..25a74e041ab 100644
--- a/IPython/core/magics/config.py
+++ b/IPython/core/magics/config.py
@@ -54,44 +54,73 @@ def config(self, s):
 
             In [1]: %config
             Available objects for config:
-                TerminalInteractiveShell
-                HistoryManager
-                PrefilterManager
                 AliasManager
-                IPCompleter
                 DisplayFormatter
+                HistoryManager
+                IPCompleter
+                LoggingMagics
+                MagicsManager
+                OSMagics
+                PrefilterManager
+                ScriptMagics
+                TerminalInteractiveShell
 
         To view what is configurable on a given class, just pass the class
         name::
 
             In [2]: %config IPCompleter
-            IPCompleter options
-            -----------------
-            IPCompleter.omit__names=<Enum>
-                Current: 2
-                Choices: (0, 1, 2)
-                Instruct the completer to omit private method names
-                Specifically, when completing on ``object.<tab>``.
-                When 2 [default]: all names that start with '_' will be excluded.
-                When 1: all 'magic' names (``__foo__``) will be excluded.
-                When 0: nothing will be excluded.
-            IPCompleter.merge_completions=<CBool>
+            IPCompleter(Completer) options
+            ----------------------------
+            IPCompleter.backslash_combining_completions=<Bool>
+                Enable unicode completions, e.g. \\alpha<tab> . Includes completion of latex
+                commands, unicode names, and expanding unicode characters back to latex
+                commands.
                 Current: True
-                Whether to merge completion results into a single list
-                If False, only the completion results from the first non-empty
-                completer will be returned.
-            IPCompleter.limit_to__all__=<CBool>
+            IPCompleter.debug=<Bool>
+                Enable debug for the Completer. Mostly print extra information for
+                experimental jedi integration.
+                Current: False
+            IPCompleter.greedy=<Bool>
+                Activate greedy completion
+                        PENDING DEPRECTION. this is now mostly taken care of with Jedi.
+                        This will enable completion on elements of lists, results of function calls, etc.,
+                        but can be unsafe because the code is actually evaluated on TAB.
                 Current: False
+            IPCompleter.jedi_compute_type_timeout=<Int>
+                Experimental: restrict time (in milliseconds) during which Jedi can compute types.
+                        Set to 0 to stop computing types. Non-zero value lower than 100ms may hurt
+                        performance by preventing jedi to build its cache.
+                Current: 400
+            IPCompleter.limit_to__all__=<Bool>
+                DEPRECATED as of version 5.0.
                 Instruct the completer to use __all__ for the completion
                 Specifically, when completing on ``object.<tab>``.
                 When True: only those names in obj.__all__ will be included.
                 When False [default]: the __all__ attribute is ignored
-            IPCompleter.greedy=<CBool>
                 Current: False
-                Activate greedy completion
-                This will enable completion on elements of lists, results of
-                function calls, etc., but can be unsafe because the code is
-                actually evaluated on TAB.
+            IPCompleter.merge_completions=<Bool>
+                Whether to merge completion results into a single list
+                        If False, only the completion results from the first non-empty
+                        completer will be returned.
+                Current: True
+            IPCompleter.omit__names=<Enum>
+                Instruct the completer to omit private method names
+                        Specifically, when completing on ``object.<tab>``.
+                        When 2 [default]: all names that start with '_' will be excluded.
+                        When 1: all 'magic' names (``__foo__``) will be excluded.
+                        When 0: nothing will be excluded.
+                Choices: any of [0, 1, 2]
+                Current: 2
+            IPCompleter.profile_completions=<Bool>
+                If True, emit profiling data for completion subsystem using cProfile.
+                Current: False
+            IPCompleter.profiler_output_dir=<Unicode>
+                Template for path at which to output profile data for completions.
+                Current: '.completion_profiles'
+            IPCompleter.use_jedi=<Bool>
+                Experimental: Use Jedi to generate autocompletions. Default to True if jedi
+                is installed.
+                Current: True
 
         but the real use is in setting values::
 
@@ -118,7 +147,7 @@ def config(self, s):
             # print available configurable names
             print("Available objects for config:")
             for name in classnames:
-                print("    ", name)
+                print("   ", name)
             return
         elif line in classnames:
             # `%config TerminalInteractiveShell` will print trait info for
diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index b9f3b8fb157..7876e648674 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -304,6 +304,8 @@ async def _stream_communicate(process, cell):
             # in case it's stuck in uninterruptible sleep. -9 = SIGKILL
             rc = p.returncode or -9
             raise CalledProcessError(rc, cell)
+
+    shebang.__skip_doctest__ = os.name != "posix"
     
     def _run_script(self, p, cell, to_close):
         """callback for running the script in the background"""
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index f2185e45e76..a3a55fc66af 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -346,10 +346,15 @@ def lmagic(line):
             "A line magic"
 
         # Get info on line magic
-        lfind = ip._ofind('lmagic')
-        info = dict(found=True, isalias=False, ismagic=True,
-                    namespace = 'IPython internal', obj= lmagic.__wrapped__,
-                    parent = None)
+        lfind = ip._ofind("lmagic")
+        info = dict(
+            found=True,
+            isalias=False,
+            ismagic=True,
+            namespace="IPython internal",
+            obj=lmagic,
+            parent=None,
+        )
         self.assertEqual(lfind, info)
         
     def test_ofind_cell_magic(self):
@@ -360,10 +365,15 @@ def cmagic(line, cell):
             "A cell magic"
 
         # Get info on cell magic
-        find = ip._ofind('cmagic')
-        info = dict(found=True, isalias=False, ismagic=True,
-                    namespace = 'IPython internal', obj= cmagic.__wrapped__,
-                    parent = None)
+        find = ip._ofind("cmagic")
+        info = dict(
+            found=True,
+            isalias=False,
+            ismagic=True,
+            namespace="IPython internal",
+            obj=cmagic,
+            parent=None,
+        )
         self.assertEqual(find, info)
 
     def test_ofind_property_with_error(self):
diff --git a/IPython/extensions/storemagic.py b/IPython/extensions/storemagic.py
index 9102ea1c20c..b4a8cf82442 100644
--- a/IPython/extensions/storemagic.py
+++ b/IPython/extensions/storemagic.py
@@ -17,6 +17,7 @@
 
 from IPython.core.error import UsageError
 from IPython.core.magic import Magics, magics_class, line_magic
+from IPython.testing.skipdoctest import skip_doctest
 from traitlets import Bool
 
 
@@ -74,6 +75,7 @@ def __init__(self, shell):
         if self.autorestore:
             restore_data(self.shell)
 
+    @skip_doctest
     @line_magic
     def store(self, parameter_s=''):
         """Lightweight persistence for python variables.
@@ -82,6 +84,7 @@ def store(self, parameter_s=''):
 
           In [1]: l = ['hello',10,'world']
           In [2]: %store l
+          Stored 'l' (list)
           In [3]: exit
 
           (IPython session is closed and started again...)
diff --git a/IPython/terminal/magics.py b/IPython/terminal/magics.py
index c5d382e82a3..38842231f0d 100644
--- a/IPython/terminal/magics.py
+++ b/IPython/terminal/magics.py
@@ -11,6 +11,7 @@
 from IPython.core.error import TryNext, UsageError
 from IPython.core.magic import Magics, magics_class, line_magic
 from IPython.lib.clipboard import ClipboardEmpty
+from IPython.testing.skipdoctest import skip_doctest
 from IPython.utils.text import SList, strip_email_quotes
 from IPython.utils import py3compat
 
@@ -83,6 +84,7 @@ def autoindent(self, parameter_s = ''):
         self.shell.set_autoindent()
         print("Automatic indentation is:",['OFF','ON'][self.shell.autoindent])
 
+    @skip_doctest
     @line_magic
     def cpaste(self, parameter_s=''):
         """Paste & execute a pre-formatted code block from clipboard.

From 51151144348f143051b12d88fe23cedadb866626 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sat, 20 Nov 2021 22:19:51 +0300
Subject: [PATCH 0854/1407] Remove unused `requests` from test requirements

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index c05a769a0ea..a96b5473f27 100755
--- a/setup.py
+++ b/setup.py
@@ -176,7 +176,6 @@
     doc=["Sphinx>=1.3"],
     test=[
         "pytest",
-        "requests",
         "testpath",
         "pygments",
         "nbformat",

From eac76a508587b0d95d6c55f6db58c5e2feb20f5d Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sat, 20 Nov 2021 22:37:30 +0300
Subject: [PATCH 0855/1407] Move optional dependencies to a separate set

---
 .github/workflows/test.yml          | 15 ++++++++++-----
 IPython/core/tests/test_magic.py    |  1 +
 IPython/core/tests/test_run.py      |  2 ++
 IPython/lib/display.py              |  3 +++
 IPython/terminal/tests/test_help.py |  2 ++
 appveyor.yml                        |  4 ++--
 setup.py                            |  9 +++++++++
 7 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b2bbf9c4601..c40291316b9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,12 +16,19 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         python-version: ["3.7", "3.8", "3.9", "3.10"]
+        deps: [test_extra]
         # Test all on ubuntu, test ends on macos
         include:
           - os: macos-latest
             python-version: "3.7"
+            deps: test_extra
           - os: macos-latest
             python-version: "3.10"
+            deps: test_extra
+          # Tests minimal dependencies set
+          - os: ubuntu-latest
+            python-version: "3.10"
+            deps: test
 
     steps:
     - uses: actions/checkout@v2
@@ -30,15 +37,13 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install latex
-      if: runner.os == 'Linux'
+      if: runner.os == 'Linux' && matrix.deps == 'test_extra'
       run: sudo apt-get -yq -o Acquire::Retries=3 --no-install-suggests --no-install-recommends install texlive dvipng
     - name: Install and update Python dependencies
       run: |
         python -m pip install --upgrade pip setuptools wheel
-        python -m pip install --upgrade -e file://$PWD#egg=ipython[test]
-        python -m pip install --upgrade --upgrade-strategy eager trio curio 
-        python -m pip install --upgrade pytest pytest-cov pytest-trio 'matplotlib!=3.2.0' pandas
-        python -m pip install --upgrade check-manifest pytest-cov anyio
+        python -m pip install --upgrade -e .[${{ matrix.deps }}]
+        python -m pip install --upgrade check-manifest pytest-cov
     - name: Check manifest
       run: check-manifest
     - name: pytest
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 0cadae6ef8d..3d8a37bf3a6 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -742,6 +742,7 @@ def test_extension():
 
 
 def test_notebook_export_json():
+    pytest.importorskip("nbformat")
     _ip = get_ipython()
     _ip.history_manager.reset()   # Clear any existing history.
     cmds = ["a=1", "def b():\n  return a**2", "print('noël, été', b())"]
diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index a8dfbd0e3c1..a872f5a6620 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -381,6 +381,7 @@ def test_ignore_sys_exit(self):
 
     def test_run_nb(self):
         """Test %run notebook.ipynb"""
+        pytest.importorskip("nbformat")
         from nbformat import v4, writes
         nb = v4.new_notebook(
            cells=[
@@ -397,6 +398,7 @@ def test_run_nb(self):
 
     def test_run_nb_error(self):
         """Test %run notebook.ipynb error"""
+        pytest.importorskip("nbformat")
         from nbformat import v4, writes
         # %run when a file name isn't provided
         pytest.raises(Exception, _ip.magic, "run")
diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index 33d70127a71..57ae8deb3e8 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -66,6 +66,9 @@ class Audio(DisplayObject):
     Examples
     --------
 
+    >>> import pytest
+    >>> np = pytest.importorskip("numpy")
+
     Generate a sound
 
     >>> import numpy as np
diff --git a/IPython/terminal/tests/test_help.py b/IPython/terminal/tests/test_help.py
index ec5bf6f9f62..038f560b2fb 100644
--- a/IPython/terminal/tests/test_help.py
+++ b/IPython/terminal/tests/test_help.py
@@ -3,6 +3,7 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+import pytest
 import IPython.testing.tools as tt
 
 
@@ -25,4 +26,5 @@ def test_locate_profile_help():
     tt.help_all_output_test("locate profile")
 
 def test_trust_help():
+    pytest.importorskip("nbformat")
     tt.help_all_output_test("trust")
diff --git a/appveyor.yml b/appveyor.yml
index 10659d8e8b1..b524356f52e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -31,8 +31,8 @@ init:
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - python -m pip install --upgrade setuptools pip
-  - pip install pytest pytest-cov pytest-trio matplotlib pandas
-  - pip install -e .[test]
+  - pip install pytest-cov
+  - pip install -e .[test_extra]
 test_script:
   - pytest --color=yes -ra --cov --cov-report=xml
 on_finish:
diff --git a/setup.py b/setup.py
index a96b5473f27..ce8e1682cb5 100755
--- a/setup.py
+++ b/setup.py
@@ -178,9 +178,18 @@
         "pytest",
         "testpath",
         "pygments",
+    ],
+    test_extra=[
+        "pytest",
+        "testpath",
+        "curio",
+        "matplotlib!=3.2.0",
         "nbformat",
         "ipykernel",
         "numpy>=1.17",
+        "pandas",
+        "pygments",
+        "trio",
     ],
     terminal=[],
     kernel=["ipykernel"],

From 227d51b897a5be3c14b1e835fa5336fd7eddc864 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sat, 20 Nov 2021 23:42:59 +0300
Subject: [PATCH 0856/1407] Python 3.11 fixes

---
 .github/workflows/test.yml                   | 4 ++++
 IPython/core/tests/test_completer.py         | 9 +++++++--
 IPython/core/tests/test_inputsplitter.py     | 9 +++++++--
 IPython/core/tests/test_inputtransformer2.py | 7 +++++--
 IPython/core/tests/test_oinspect.py          | 5 ++---
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c40291316b9..d9528f007ee 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,6 +29,10 @@ jobs:
           - os: ubuntu-latest
             python-version: "3.10"
             deps: test
+          # Tests latest development Python version
+          - os: ubuntu-latest
+            python-version: "3.11-dev"
+            deps: test
 
     steps:
     - uses: actions/checkout@v2
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 47071507933..c470b1fe723 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -104,7 +104,7 @@ def test_unicode_range():
     assert len_exp == len_test, message
 
     # fail if new unicode symbols have been added. 
-    assert len_exp <= 137714, message
+    assert len_exp <= 138552, message
 
 
 @contextmanager
@@ -219,6 +219,11 @@ def _ipython_key_completions_(self):
         return list(self.things)
 
 
+@pytest.mark.xfail(
+    sys.version_info >= (3, 11),
+    reason="parso does not support 3.11 yet",
+    raises=NotImplementedError,
+)
 class TestCompleter(unittest.TestCase):
     def setUp(self):
         """
@@ -282,7 +287,7 @@ def test_latex_completions(self):
 
         ip = get_ipython()
         # Test some random unicode symbols
-        keys = random.sample(latex_symbols.keys(), 10)
+        keys = random.sample(sorted(latex_symbols), 10)
         for k in keys:
             text, matches = ip.complete(k)
             self.assertEqual(text, k)
diff --git a/IPython/core/tests/test_inputsplitter.py b/IPython/core/tests/test_inputsplitter.py
index 46c804aecda..ec000a2ae61 100644
--- a/IPython/core/tests/test_inputsplitter.py
+++ b/IPython/core/tests/test_inputsplitter.py
@@ -6,13 +6,13 @@
 # Distributed under the terms of the Modified BSD License.
 
 import unittest
+import pytest
 import sys
 
 from IPython.core import inputsplitter as isp
 from IPython.core.inputtransformer import InputTransformer
 from IPython.core.tests.test_inputtransformer import syntax, syntax_ml
 from IPython.testing import tools as tt
-from IPython.testing.decorators import skipif
 
 #-----------------------------------------------------------------------------
 # Semi-complete examples (also used as tests)
@@ -318,7 +318,12 @@ def test_unicode(self):
         self.isp.push(u'\xc3\xa9')
         self.isp.push(u"u'\xc3\xa9'")
 
-    @skipif(sys.version_info[:3] == (3, 9, 8))
+    @pytest.mark.xfail(
+        reason="Bug in python 3.9.8 – bpo 45738",
+        condition=sys.version_info in [(3, 9, 8, "final", 0), (3, 11, 0, "alpha", 2)],
+        raises=SystemError,
+        strict=True,
+    )
     def test_line_continuation(self):
         """ Test issue #2108."""
         isp = self.isp
diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index b00d1a8fb70..4a2306a0b64 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -276,7 +276,8 @@ def __init__(self, s):
         None,
         marks=pytest.mark.xfail(
             reason="Bug in python 3.9.8 – bpo 45738",
-            condition=sys.version_info[:3] == (3, 9, 8),
+            condition=sys.version_info
+            in [(3, 9, 8, "final", 0), (3, 11, 0, "alpha", 2)],
             raises=SystemError,
             strict=True,
         ),
@@ -295,7 +296,9 @@ def test_check_complete_param(code, expected, number):
 @skip_iptest_but_not_pytest
 @pytest.mark.xfail(
     reason="Bug in python 3.9.8 – bpo 45738",
-    condition=sys.version_info[:3] == (3, 9, 8),
+    condition=sys.version_info in [(3, 9, 8, "final", 0), (3, 11, 0, "alpha", 2)],
+    raises=SystemError,
+    strict=True,
 )
 def test_check_complete():
     cc = ipt2.TransformerManager().check_complete
diff --git a/IPython/core/tests/test_oinspect.py b/IPython/core/tests/test_oinspect.py
index 7557fcf804b..58d07db8030 100644
--- a/IPython/core/tests/test_oinspect.py
+++ b/IPython/core/tests/test_oinspect.py
@@ -269,7 +269,6 @@ def test_empty_property_has_no_source():
 
 
 def test_property_sources():
-    import posixpath
     # A simple adder whose source and signature stays
     # the same across Python distributions
     def simple_add(a, b):
@@ -283,7 +282,7 @@ def foo(self):
 
         foo = foo.setter(lambda self, v: setattr(self, 'bar', v))
 
-        dname = property(posixpath.dirname)
+        dname = property(oinspect.getdoc)
         adder = property(simple_add)
 
     i = inspector.info(A.foo, detail_level=1)
@@ -291,7 +290,7 @@ def foo(self):
     assert "lambda self, v:" in i["source"]
 
     i = inspector.info(A.dname, detail_level=1)
-    assert "def dirname(p)" in i["source"]
+    assert "def getdoc(obj)" in i["source"]
 
     i = inspector.info(A.adder, detail_level=1)
     assert "def simple_add(a, b)" in i["source"]

From 03a05afaf6f977aff9b9af57d442e9cb4f2071ef Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sun, 21 Nov 2021 01:50:29 +0300
Subject: [PATCH 0857/1407] Remove unneeded `ipykernel` tests requirement

---
 IPython/core/tests/test_display.py | 2 --
 setup.py                           | 1 -
 2 files changed, 3 deletions(-)

diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index c6e13b917c6..2abd8cb3d84 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -156,7 +156,6 @@ def _get_inline_config():
     return InlineBackend.instance()
 
 
-@dec.skip_without("ipykernel")
 @dec.skip_without("matplotlib")
 def test_set_matplotlib_close():
     cfg = _get_inline_config()
@@ -196,7 +195,6 @@ def test_set_matplotlib_formats():
                 assert Figure not in f
 
 
-@dec.skip_without("ipykernel")
 @dec.skip_without("matplotlib")
 def test_set_matplotlib_formats_kwargs():
     from matplotlib.figure import Figure
diff --git a/setup.py b/setup.py
index ce8e1682cb5..bc536a84d77 100755
--- a/setup.py
+++ b/setup.py
@@ -185,7 +185,6 @@
         "curio",
         "matplotlib!=3.2.0",
         "nbformat",
-        "ipykernel",
         "numpy>=1.17",
         "pandas",
         "pygments",

From 298a52dc64e442c10763b523e8309ad2917a740c Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sun, 21 Nov 2021 02:32:40 +0300
Subject: [PATCH 0858/1407] test_inputsplitter: suppress self-deprecation
 warning

---
 IPython/core/tests/test_inputsplitter.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_inputsplitter.py b/IPython/core/tests/test_inputsplitter.py
index 46c804aecda..0b0a15cd533 100644
--- a/IPython/core/tests/test_inputsplitter.py
+++ b/IPython/core/tests/test_inputsplitter.py
@@ -6,9 +6,11 @@
 # Distributed under the terms of the Modified BSD License.
 
 import unittest
+import pytest
 import sys
 
-from IPython.core import inputsplitter as isp
+with pytest.warns(DeprecationWarning, match="inputsplitter"):
+    from IPython.core import inputsplitter as isp
 from IPython.core.inputtransformer import InputTransformer
 from IPython.core.tests.test_inputtransformer import syntax, syntax_ml
 from IPython.testing import tools as tt

From a788e0c86455ca4f09e99f60d294512fc4ba0698 Mon Sep 17 00:00:00 2001
From: Maor Kleinberger <kmaork@gmail.com>
Date: Sun, 21 Nov 2021 15:30:44 +0200
Subject: [PATCH 0859/1407] Use ThreadPoolExecutor for debugger cmdloop

---
 IPython/terminal/debugger.py | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index 6ba73c7177c..1c4fb6ab413 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -1,11 +1,8 @@
 import asyncio
 import os
 import sys
-import threading
 
 from IPython.core.debugger import Pdb
-
-
 from IPython.core.completer import IPCompleter
 from .ptutils import IPythonPTCompleter
 from .shortcuts import create_ipython_shortcuts
@@ -17,6 +14,7 @@
 from prompt_toolkit.enums import EditingMode
 from prompt_toolkit.formatted_text import PygmentsTokens
 from prompt_toolkit.history import InMemoryHistory, FileHistory
+from concurrent.futures import ThreadPoolExecutor
 
 from prompt_toolkit import __version__ as ptk_version
 PTK3 = ptk_version.startswith('3.')
@@ -29,6 +27,7 @@ def __init__(self, *args, pt_session_options=None, **kwargs):
         Pdb.__init__(self, *args, **kwargs)
         self._ptcomp = None
         self.pt_init(pt_session_options)
+        self.thread_executor = ThreadPoolExecutor(1)
 
     def pt_init(self, pt_session_options=None):
         """Initialize the prompt session and the prompt loop
@@ -110,7 +109,7 @@ def cmdloop(self, intro=None):
             if intro is not None:
                 self.intro = intro
             if self.intro:
-                self.stdout.write(str(self.intro)+"\n")
+                print(self.intro, file=self.stdout)
             stop = None
             while not stop:
                 if self.cmdqueue:
@@ -120,24 +119,11 @@ def cmdloop(self, intro=None):
                     self._ptcomp.ipy_completer.global_namespace = self.curframe.f_globals
 
                     # Run the prompt in a different thread.
-                    line = ''
-                    keyboard_interrupt = False
-
-                    def in_thread():
-                        nonlocal line, keyboard_interrupt
-                        try:
-                            line = self.pt_app.prompt()
-                        except EOFError:
-                            line = 'EOF'
-                        except KeyboardInterrupt:
-                            keyboard_interrupt = True
-
-                    th = threading.Thread(target=in_thread)
-                    th.start()
-                    th.join()
-
-                    if keyboard_interrupt:
-                        raise KeyboardInterrupt
+                    try:
+                        line = self.thread_executor.submit(self.pt_app.prompt).result()
+                    except EOFError:
+                        line = "EOF"
+
                 line = self.precmd(line)
                 stop = self.onecmd(line)
                 stop = self.postcmd(stop, line)

From 323d9f476d717495ba55b5409172605b91c2470c Mon Sep 17 00:00:00 2001
From: Ahmed Fasih <afasih@bloomberg.net>
Date: Thu, 18 Nov 2021 15:49:15 -0800
Subject: [PATCH 0860/1407] Specify unwanted sections of info output

---
 IPython/core/interactiveshell.py |  3 ++-
 IPython/core/oinspect.py         | 12 +++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 0dec7535356..7d3d00300ea 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1804,7 +1804,7 @@ def object_inspect_text(self, oname, detail_level=0):
         """Get object info as formatted text"""
         return self.object_inspect_mime(oname, detail_level)['text/plain']
 
-    def object_inspect_mime(self, oname, detail_level=0):
+    def object_inspect_mime(self, oname, detail_level=0, omit_sections={}):
         """Get object info as a mimebundle of formatted representations.
 
         A mimebundle is a dictionary, keyed by mime-type.
@@ -1820,6 +1820,7 @@ def object_inspect_mime(self, oname, detail_level=0):
                     info=info,
                     detail_level=detail_level,
                     formatter=docformat,
+                    omit_sections=omit_sections,
                 )
             else:
                 raise KeyError(oname)
diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 09b74700ba0..9153eb1f72e 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -566,7 +566,7 @@ def format_mime(self, bundle):
         bundle['text/plain'] = text
         return bundle
 
-    def _get_info(self, obj, oname='', formatter=None, info=None, detail_level=0):
+    def _get_info(self, obj, oname='', formatter=None, info=None, detail_level=0, omit_sections={}):
         """Retrieve an info dict and format it.
 
         Parameters
@@ -581,6 +581,8 @@ def _get_info(self, obj, oname='', formatter=None, info=None, detail_level=0):
             already computed information
         detail_level: integer
             Granularity of detail level, if set to 1, give more information.
+        omit_sections: set[str]
+            Titles or keys to omit from output
         """
 
         info = self._info(obj, oname=oname, info=info, detail_level=detail_level)
@@ -591,6 +593,8 @@ def _get_info(self, obj, oname='', formatter=None, info=None, detail_level=0):
         }
 
         def append_field(bundle, title:str, key:str, formatter=None):
+            if title in omit_sections or key in omit_sections:
+                return
             field = info[key]
             if field is not None:
                 formatted_field = self._mime_format(field, formatter)
@@ -655,7 +659,7 @@ def code_formatter(text):
 
         return self.format_mime(_mime)
 
-    def pinfo(self, obj, oname='', formatter=None, info=None, detail_level=0, enable_html_pager=True):
+    def pinfo(self, obj, oname='', formatter=None, info=None, detail_level=0, enable_html_pager=True, omit_sections={}):
         """Show detailed information about an object.
 
         Optional arguments:
@@ -676,8 +680,10 @@ def pinfo(self, obj, oname='', formatter=None, info=None, detail_level=0, enable
           precomputed already.
 
         - detail_level: if set to 1, more information is given.
+
+        - omit_sections: set of section keys and titles to omit
         """
-        info = self._get_info(obj, oname, formatter, info, detail_level)
+        info = self._get_info(obj, oname, formatter, info, detail_level, omit_sections=omit_sections)
         if not enable_html_pager:
             del info['text/html']
         page.page(info)

From 50b543d805f5da1ab3e088abcc030eb64941df5b Mon Sep 17 00:00:00 2001
From: Ahmed Fasih <afasih@bloomberg.net>
Date: Tue, 23 Nov 2021 10:40:42 -0800
Subject: [PATCH 0861/1407] darker

---
 IPython/core/oinspect.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 9153eb1f72e..74b3cc9916a 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -566,7 +566,9 @@ def format_mime(self, bundle):
         bundle['text/plain'] = text
         return bundle
 
-    def _get_info(self, obj, oname='', formatter=None, info=None, detail_level=0, omit_sections={}):
+    def _get_info(
+        self, obj, oname="", formatter=None, info=None, detail_level=0, omit_sections={}
+    ):
         """Retrieve an info dict and format it.
 
         Parameters
@@ -659,7 +661,16 @@ def code_formatter(text):
 
         return self.format_mime(_mime)
 
-    def pinfo(self, obj, oname='', formatter=None, info=None, detail_level=0, enable_html_pager=True, omit_sections={}):
+    def pinfo(
+        self,
+        obj,
+        oname="",
+        formatter=None,
+        info=None,
+        detail_level=0,
+        enable_html_pager=True,
+        omit_sections={},
+    ):
         """Show detailed information about an object.
 
         Optional arguments:
@@ -683,7 +694,9 @@ def pinfo(self, obj, oname='', formatter=None, info=None, detail_level=0, enable
 
         - omit_sections: set of section keys and titles to omit
         """
-        info = self._get_info(obj, oname, formatter, info, detail_level, omit_sections=omit_sections)
+        info = self._get_info(
+            obj, oname, formatter, info, detail_level, omit_sections=omit_sections
+        )
         if not enable_html_pager:
             del info['text/html']
         page.page(info)

From ba154eb9c6e5d519a648a5ea9d6082ef98128851 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Fri, 19 Nov 2021 19:45:40 +0300
Subject: [PATCH 0862/1407] Remove unneeded `skip_doctest` decorator usages

---
 IPython/core/debugger.py         | 3 ---
 IPython/core/magics/execution.py | 1 -
 IPython/core/magics/osm.py       | 7 ++-----
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 26aa94c1108..7163ae130d4 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -114,7 +114,6 @@
 from IPython.utils import PyColorize
 from IPython.utils import coloransi, py3compat
 from IPython.core.excolors import exception_colors
-from IPython.testing.skipdoctest import skip_doctest
 
 # skip module docstests
 __skip_doctest__ = True
@@ -180,7 +179,6 @@ class Tracer(object):
     while functioning acceptably (though with limitations) if outside of it.
     """
 
-    @skip_doctest
     def __init__(self, colors=None):
         """
         DEPRECATED
@@ -921,7 +919,6 @@ def break_anywhere(self, frame):
                 return True
         return False
 
-    @skip_doctest
     def _is_in_decorator_internal_and_should_skip(self, frame):
         """
         Utility to tell us whether we are in a decorator internal and should stop.
diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 8a262525f34..0f765fec433 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -413,7 +413,6 @@ def pdb(self, parameter_s=''):
         self.shell.call_pdb = new_pdb
         print('Automatic pdb calling has been turned',on_off(new_pdb))
 
-    @skip_doctest
     @magic_arguments.magic_arguments()
     @magic_arguments.argument('--breakpoint', '-b', metavar='FILE:LINE',
         help="""
diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index c0cb209daaa..0940df31c34 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -63,7 +63,6 @@ def __init__(self, shell=None, **kwargs):
         super().__init__(shell=shell, **kwargs)
 
 
-    @skip_doctest
     def _isexec_POSIX(self, file):
         """
             Test for executable on a POSIX system
@@ -75,14 +74,12 @@ def _isexec_POSIX(self, file):
 
 
     
-    @skip_doctest
     def _isexec_WIN(self, file):
         """
             Test for executable file on non POSIX system
         """
         return file.is_file() and self.execre.match(file.name) is not None
 
-    @skip_doctest
     def isexec(self, file):
         """
             Test for executable file on non POSIX system
@@ -633,8 +630,8 @@ def sc(self, parameter_s=''):
 
             # while the list form is useful to loop over:
             In [6]: for f in a.l:
-              ...:      !wc -l $f
-              ...:
+               ...:      !wc -l $f
+               ...:
             146 setup.py
             130 win32_manual_post_install.py
 

From c70d54890b32de3b4f47dc80130c29a3359df1e9 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Fri, 19 Nov 2021 19:39:54 +0300
Subject: [PATCH 0863/1407] Remove old workaround for a bug fixed in Python 3.4

http://bugs.python.org/issue3158
---
 IPython/core/completer.py           |  3 ++
 IPython/testing/plugin/ipdoctest.py | 78 ++---------------------------
 2 files changed, 6 insertions(+), 75 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index c6d20bbf5af..afb8a6ca2b2 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -132,6 +132,7 @@
 from IPython.core.inputtransformer2 import ESC_MAGIC
 from IPython.core.latex_symbols import latex_symbols, reverse_latex_symbol
 from IPython.core.oinspect import InspectColors
+from IPython.testing.skipdoctest import skip_doctest
 from IPython.utils import generics
 from IPython.utils.dir2 import dir2, get_real_method
 from IPython.utils.path import ensure_dir_exists
@@ -190,6 +191,8 @@ class ProvisionalCompleterWarning(FutureWarning):
 
 warnings.filterwarnings('error', category=ProvisionalCompleterWarning)
 
+
+@skip_doctest
 @contextmanager
 def provisionalcompleter(action='ignore'):
     """
diff --git a/IPython/testing/plugin/ipdoctest.py b/IPython/testing/plugin/ipdoctest.py
index d5c794b80ff..ad07d7d40fa 100644
--- a/IPython/testing/plugin/ipdoctest.py
+++ b/IPython/testing/plugin/ipdoctest.py
@@ -20,7 +20,6 @@
 
 # From the standard library
 import doctest
-import inspect
 import logging
 import os
 import re
@@ -54,42 +53,8 @@ def __getattribute__(self,key):
         else:
             return getattr(object.__getattribute__(self,'obj'),key)
 
-# Modified version of the one in the stdlib, that fixes a python bug (doctests
-# not found in extension modules, http://bugs.python.org/issue3158)
-class DocTestFinder(doctest.DocTestFinder):
-
-    def _from_module(self, module, object):
-        """
-        Return true if the given object is defined in the given
-        module.
-        """
-        if module is None:
-            return True
-        elif inspect.isfunction(object):
-            return module.__dict__ is object.__globals__
-        elif inspect.isbuiltin(object):
-            return module.__name__ == object.__module__
-        elif inspect.isclass(object):
-            return module.__name__ == object.__module__
-        elif inspect.ismethod(object):
-            # This one may be a bug in cython that fails to correctly set the
-            # __module__ attribute of methods, but since the same error is easy
-            # to make by extension code writers, having this safety in place
-            # isn't such a bad idea
-            return module.__name__ == object.__self__.__class__.__module__
-        elif inspect.getmodule(object) is not None:
-            return module is inspect.getmodule(object)
-        elif hasattr(object, '__module__'):
-            return module.__name__ == object.__module__
-        elif isinstance(object, property):
-            return True # [XX] no way not be sure.
-        elif inspect.ismethoddescriptor(object):
-            # Unbound PyQt signals reach this point in Python 3.4b3, and we want
-            # to avoid throwing an error. See also http://bugs.python.org/issue3158
-            return False
-        else:
-            raise ValueError("object must be a class or function, got %r" % object)
 
+class DocTestFinder(doctest.DocTestFinder):
     def _find(self, tests, obj, name, module, source_lines, globs, seen):
         """
         Find tests for the given object and any contained objects, and
@@ -99,45 +64,8 @@ def _find(self, tests, obj, name, module, source_lines, globs, seen):
         if bool(getattr(obj, "__skip_doctest__", False)):
             #print 'SKIPPING DOCTEST FOR:',obj  # dbg
             obj = DocTestSkip(obj)
-        
-        doctest.DocTestFinder._find(self,tests, obj, name, module,
-                                    source_lines, globs, seen)
-
-        # Below we re-run pieces of the above method with manual modifications,
-        # because the original code is buggy and fails to correctly identify
-        # doctests in extension modules.
-
-        # Local shorthands
-        from inspect import isroutine, isclass
-
-        # Look for tests in a module's contained objects.
-        if inspect.ismodule(obj) and self._recurse:
-            for valname, val in obj.__dict__.items():
-                valname1 = '%s.%s' % (name, valname)
-                if ( (isroutine(val) or isclass(val))
-                     and self._from_module(module, val) ):
-
-                    self._find(tests, val, valname1, module, source_lines,
-                               globs, seen)
-
-        # Look for tests in a class's contained objects.
-        if inspect.isclass(obj) and self._recurse:
-            #print 'RECURSE into class:',obj  # dbg
-            for valname, val in obj.__dict__.items():
-                # Special handling for staticmethod/classmethod.
-                if isinstance(val, staticmethod):
-                    val = getattr(obj, valname)
-                if isinstance(val, classmethod):
-                    val = getattr(obj, valname).__func__
-
-                # Recurse to methods, properties, and nested classes.
-                if ((inspect.isfunction(val) or inspect.isclass(val) or
-                     inspect.ismethod(val) or
-                      isinstance(val, property)) and
-                      self._from_module(module, val)):
-                    valname = '%s.%s' % (name, valname)
-                    self._find(tests, val, valname, module, source_lines,
-                               globs, seen)
+
+        super()._find(tests, obj, name, module, source_lines, globs, seen)
 
 
 class IPDoctestOutputChecker(doctest.OutputChecker):

From 55086297a709ba23c44f8e393959a3d403cdbd55 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Fri, 19 Nov 2021 19:55:02 +0300
Subject: [PATCH 0864/1407] Refactor doctest-skipping implementation

The old one rewrites docstring which creates a doctest where is no examples presented in the docstring.
---
 IPython/testing/plugin/ipdoctest.py | 33 ++++++-----------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

diff --git a/IPython/testing/plugin/ipdoctest.py b/IPython/testing/plugin/ipdoctest.py
index ad07d7d40fa..dacb4d1d7c1 100644
--- a/IPython/testing/plugin/ipdoctest.py
+++ b/IPython/testing/plugin/ipdoctest.py
@@ -37,35 +37,16 @@
 # Classes and functions
 #-----------------------------------------------------------------------------
 
-class DocTestSkip(object):
-    """Object wrapper for doctests to be skipped."""
-
-    ds_skip = """Doctest to skip.
-    >>> 1 #doctest: +SKIP
-    """
-
-    def __init__(self,obj):
-        self.obj = obj
-
-    def __getattribute__(self,key):
-        if key == '__doc__':
-            return DocTestSkip.ds_skip
-        else:
-            return getattr(object.__getattribute__(self,'obj'),key)
-
 
 class DocTestFinder(doctest.DocTestFinder):
-    def _find(self, tests, obj, name, module, source_lines, globs, seen):
-        """
-        Find tests for the given object and any contained objects, and
-        add them to `tests`.
-        """
-        print('_find for:', obj, name, module)  # dbg
-        if bool(getattr(obj, "__skip_doctest__", False)):
-            #print 'SKIPPING DOCTEST FOR:',obj  # dbg
-            obj = DocTestSkip(obj)
+    def _get_test(self, obj, name, module, globs, source_lines):
+        test = super()._get_test(obj, name, module, globs, source_lines)
+
+        if bool(getattr(obj, "__skip_doctest__", False)) and test is not None:
+            for example in test.examples:
+                example.options[doctest.SKIP] = True
 
-        super()._find(tests, obj, name, module, source_lines, globs, seen)
+        return test
 
 
 class IPDoctestOutputChecker(doctest.OutputChecker):

From 4a68e2c977e87f5d62845db05ca798cbd6f2b786 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 16 Nov 2021 09:24:11 -0800
Subject: [PATCH 0865/1407] some typing

---
 IPython/core/interactiveshell.py | 28 ++++++++++++++++++++++------
 mypy.ini                         |  2 +-
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 0dec7535356..de9691fb889 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -82,14 +82,17 @@
 from logging import error
 import IPython.core.hooks
 
-from typing import List as ListType, Tuple, Optional
-from ast import AST
+from typing import List as ListType, Tuple, Optional, Callable
+from ast import AST, stmt
+
 
 # NoOpContext is deprecated, but ipykernel imports it from here.
 # See https://github.com/ipython/ipykernel/issues/157
 # (2016, let's try to remove than in IPython 8.0)
 from IPython.utils.contexts import NoOpContext
 
+sphinxify: Optional[Callable]
+
 try:
     import docrepr.sphinxify as sphx
 
@@ -207,14 +210,20 @@ def _ast_asyncify(cell:str, wrapper_name:str) -> ast.Module:
         is updated only on `local()` calls.
     """
 
-    from ast import Expr, Await, Return
+    from ast import Expr, Await, Return, stmt, FunctionDef, Try, AsyncFunctionDef
     if sys.version_info >= (3,8):
         return ast.parse(cell)
     tree = ast.parse(_asyncify(cell))
 
     function_def = tree.body[0]
+    if sys.version_info > (3, 8):
+        assert isinstance(function_def, FunctionDef), function_def
+    else:
+        assert isinstance(function_def, (FunctionDef, AsyncFunctionDef)), function_def
+
     function_def.name = wrapper_name
     try_block = function_def.body[0]
+    assert isinstance(try_block, Try)
     lastexpr = try_block.body[-1]
     if isinstance(lastexpr, (Expr, Await)):
         try_block.body[-1] = Return(lastexpr.value)
@@ -312,7 +321,7 @@ class ExecutionResult(object):
     """
     execution_count = None
     error_before_exec = None
-    error_in_exec = None
+    error_in_exec: Optional[BaseException] = None
     info = None
     result = None
 
@@ -3278,8 +3287,14 @@ def transform_ast(self, node):
             ast.fix_missing_locations(node)
         return node
 
-    async def run_ast_nodes(self, nodelist:ListType[AST], cell_name:str, interactivity='last_expr',
-                        compiler=compile, result=None):
+    async def run_ast_nodes(
+        self,
+        nodelist: ListType[stmt],
+        cell_name: str,
+        interactivity="last_expr",
+        compiler=compile,
+        result=None,
+    ):
         """Run a sequence of AST nodes. The execution mode depends on the
         interactivity parameter.
 
@@ -3318,6 +3333,7 @@ async def run_ast_nodes(self, nodelist:ListType[AST], cell_name:str, interactivi
         if not nodelist:
             return
 
+
         if interactivity == 'last_expr_or_assign':
             if isinstance(nodelist[-1], _assign_nodes):
                 asg = nodelist[-1]
diff --git a/mypy.ini b/mypy.ini
index 998aed51a29..7c1be49cd62 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -1,4 +1,4 @@
 [mypy]
-python_version = 3.6
+python_version = 3.8
 ignore_missing_imports = True
 follow_imports = silent

From 4a966fb07e2370c85dd66cb237f24a85e268e305 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Tue, 23 Nov 2021 22:57:56 +0300
Subject: [PATCH 0866/1407] Move most of Windows test runners to GitHub Actions

Leave only 32-bit jobs on Appveyor, I don't know how to configure actions/setup-python to install 32-bit CPython.
---
 .github/workflows/test.yml |  5 +++--
 appveyor.yml               | 12 ------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d9528f007ee..767f71db872 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, windows-latest]
         python-version: ["3.7", "3.8", "3.9", "3.10"]
         deps: [test_extra]
         # Test all on ubuntu, test ends on macos
@@ -49,11 +49,12 @@ jobs:
         python -m pip install --upgrade -e .[${{ matrix.deps }}]
         python -m pip install --upgrade check-manifest pytest-cov
     - name: Check manifest
+      if: runner.os != 'Windows'  # setup.py does not support sdist on Windows
       run: check-manifest
     - name: pytest
       env:
         COLUMNS: 120
       run: |
-        pytest --color=yes -v --cov --cov-report=xml
+        pytest --color=yes -ra -v --cov --cov-report=xml
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v2
diff --git a/appveyor.yml b/appveyor.yml
index b524356f52e..4348ad05e04 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,22 +9,10 @@ environment:
 
   matrix:
 
-   - PYTHON: "C:\\Python310-x64"
-     PYTHON_VERSION: "3.10.x"
-     PYTHON_ARCH: "64"
-
-   - PYTHON: "C:\\Python37-x64"
-     PYTHON_VERSION: "3.7.x"
-     PYTHON_ARCH: "64"
-
    - PYTHON: "C:\\Python38"
      PYTHON_VERSION: "3.8.x"
      PYTHON_ARCH: "32"
 
-   - PYTHON: "C:\\Python38-x64"
-     PYTHON_VERSION: "3.8.x"
-     PYTHON_ARCH: "64"
-
 init:
   - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
 

From 8e428a7175dabd6e0b624e7482b2e3a21679c048 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Tue, 23 Nov 2021 23:29:23 +0300
Subject: [PATCH 0867/1407] On Windows `Path.cwd()` might be in short
 filename/SFN format

---
 IPython/extensions/tests/test_storemagic.py | 3 ++-
 IPython/utils/tests/test_tempdir.py         | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/IPython/extensions/tests/test_storemagic.py b/IPython/extensions/tests/test_storemagic.py
index acf1abffdc2..3ac306bcddd 100644
--- a/IPython/extensions/tests/test_storemagic.py
+++ b/IPython/extensions/tests/test_storemagic.py
@@ -1,4 +1,5 @@
 import tempfile, os
+from pathlib import Path
 
 from traitlets.config.loader import Config
 
@@ -43,7 +44,7 @@ def test_store_restore():
     assert ip.user_ns["foobaz"] == "80"
 
     ip.magic("store -r")  # restores _dh too
-    assert os.path.realpath(tmpd) in ip.user_ns["_dh"]
+    assert any(Path(tmpd).samefile(p) for p in ip.user_ns["_dh"])
 
     os.rmdir(tmpd)
 
diff --git a/IPython/utils/tests/test_tempdir.py b/IPython/utils/tests/test_tempdir.py
index 68a3e036a75..9191b97acb8 100644
--- a/IPython/utils/tests/test_tempdir.py
+++ b/IPython/utils/tests/test_tempdir.py
@@ -22,8 +22,8 @@ def test_named_file_in_temporary_directory():
 
 def test_temporary_working_directory():
     with TemporaryWorkingDirectory() as directory:
-        directory_path = Path(directory)
+        directory_path = Path(directory).resolve()
         assert directory_path.exists()
-        assert Path.cwd() == directory_path.resolve()
+        assert Path.cwd().resolve() == directory_path
     assert not directory_path.exists()
-    assert Path.cwd() != directory_path.resolve()
+    assert Path.cwd().resolve() != directory_path

From 59cf48e40e1bafdb27bea54695e5bc5c6dd81f81 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 24 Nov 2021 00:38:12 +0300
Subject: [PATCH 0868/1407] TST: Simplify `NamedInstanceClass`

The `__getitem__`/`get_instance` methods are unused.
---
 IPython/core/tests/test_completer.py | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index c470b1fe723..4feba09a651 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -191,25 +191,16 @@ def test_line_split():
     check_line_split(sp, [map(str, p) for p in t])
 
 
-class NamedInstanceMetaclass(type):
-    def __getitem__(cls, item):
-        return cls.get_instance(item)
+class NamedInstanceClass:
+    instances = {}
 
-
-class NamedInstanceClass(metaclass=NamedInstanceMetaclass):
     def __init__(self, name):
-        if not hasattr(self.__class__, "instances"):
-            self.__class__.instances = {}
-        self.__class__.instances[name] = self
+        self.instances[name] = self
 
     @classmethod
     def _ipython_key_completions_(cls):
         return cls.instances.keys()
 
-    @classmethod
-    def get_instance(cls, name):
-        return cls.instances[name]
-
 
 class KeyCompletable:
     def __init__(self, things=()):

From 3070118fe87ac4f89c49c2afe45503c22ef73e70 Mon Sep 17 00:00:00 2001
From: Gal B <galbgit@gmail.com>
Date: Tue, 23 Nov 2021 22:16:28 +0200
Subject: [PATCH 0869/1407] Remove version check for globals

---
 IPython/core/interactiveshell.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 0dec7535356..ce4ac836357 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -117,12 +117,8 @@ class ProvisionalWarning(DeprecationWarning):
     from ast import Module as OriginalModule
     Module = lambda nodelist, type_ignores: OriginalModule(nodelist)
 
-if sys.version_info > (3,6):
-    _assign_nodes         = (ast.AugAssign, ast.AnnAssign, ast.Assign)
-    _single_targets_nodes = (ast.AugAssign, ast.AnnAssign)
-else:
-    _assign_nodes         = (ast.AugAssign, ast.Assign )
-    _single_targets_nodes = (ast.AugAssign, )
+_assign_nodes = (ast.AugAssign, ast.AnnAssign, ast.Assign)
+_single_targets_nodes = (ast.AugAssign, ast.AnnAssign)
 
 #-----------------------------------------------------------------------------
 # Await Helpers

From b6d84ef95e42f96cf48bb8d4e8f150c8eb37a8eb Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 24 Nov 2021 00:51:11 +0300
Subject: [PATCH 0870/1407] `io.StringIO` always has `encoding` field

At lease since Python 2.7/3.5+
---
 IPython/core/tests/test_magic_terminal.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/IPython/core/tests/test_magic_terminal.py b/IPython/core/tests/test_magic_terminal.py
index cffb7674c8e..d7984280d75 100644
--- a/IPython/core/tests/test_magic_terminal.py
+++ b/IPython/core/tests/test_magic_terminal.py
@@ -21,9 +21,6 @@ def check_cpaste(code, should_fail=False):
     ip.user_ns['code_ran'] = False
 
     src = StringIO()
-    if not hasattr(src, 'encoding'):
-        # IPython expects stdin to have an encoding attribute
-        src.encoding = None
     src.write(code)
     src.write('\n--\n')
     src.seek(0)

From 5b9aa9c88325012439384b5a704e2b3d183c3366 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 23 Nov 2021 11:33:35 -0800
Subject: [PATCH 0871/1407] Stop support for 3.7 on the master branch.

According to NEP 29, Python 3.7 support can be stopped this december.

https://numpy.org/neps/nep-0029-deprecation_policy.html

Here we start dropping support for 3.7 as we'll release 8.0 likely early
2022
---
 .github/workflows/test.yml |  4 ++--
 IPython/__init__.py        |  7 ++++---
 appveyor.yml               |  1 -
 setup.py                   | 23 ++++++++++++-----------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 767f71db872..2620162c209 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,12 +15,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10"]
         deps: [test_extra]
         # Test all on ubuntu, test ends on macos
         include:
           - os: macos-latest
-            python-version: "3.7"
+            python-version: "3.8"
             deps: test_extra
           - os: macos-latest
             python-version: "3.10"
diff --git a/IPython/__init__.py b/IPython/__init__.py
index 55cb5ef61bd..5df72f83775 100644
--- a/IPython/__init__.py
+++ b/IPython/__init__.py
@@ -1,4 +1,3 @@
-# encoding: utf-8
 """
 IPython: tools for interactive and parallel computing in Python.
 
@@ -27,13 +26,15 @@
 #-----------------------------------------------------------------------------
 
 # Don't forget to also update setup.py when this changes!
-if sys.version_info < (3, 6):
+if sys.version_info < (3, 8):
     raise ImportError(
 """
-IPython 7.10+ supports Python 3.6 and above.
+IPython 8+ supports Python 3.8 and above, following NEP 29.
 When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
 Python 3.3 and 3.4 were supported up to IPython 6.x.
 Python 3.5 was supported with IPython 7.0 to 7.9.
+Python 3.6 was supported with IPython up to 7.16.
+Python 3.7 was still supported with the 7.x branch.
 
 See IPython `README.rst` file for more information:
 
diff --git a/appveyor.yml b/appveyor.yml
index 4348ad05e04..fbd8a2604f2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,6 @@ environment:
     COLUMNS: 120  # Appveyor web viwer window width is 130 chars
 
   matrix:
-
    - PYTHON: "C:\\Python38"
      PYTHON_VERSION: "3.8.x"
      PYTHON_ARCH: "32"
diff --git a/setup.py b/setup.py
index bc536a84d77..69279cdf438 100755
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@
 #
 # This check is also made in IPython/__init__, don't forget to update both when
 # changing Python version requirements.
-if sys.version_info < (3, 7):
+if sys.version_info < (3, 8):
     pip_message = 'This may be due to an out of date pip. Make sure you have pip >= 9.0.1.'
     try:
         import pip
@@ -41,11 +41,12 @@
 
 
     error = """
-IPython 7.17+ supports Python 3.7 and above, following NEP 29.
+IPython 8+ supports Python 3.8 and above, following NEP 29.
 When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
 Python 3.3 and 3.4 were supported up to IPython 6.x.
 Python 3.5 was supported with IPython 7.0 to 7.9.
 Python 3.6 was supported with IPython up to 7.16.
+Python 3.7 was still supported with the 7.x branch.
 
 See IPython `README.rst` file for more information:
 
@@ -244,15 +245,15 @@
         everything.update(deps)
 extras_require['all'] = list(sorted(everything))
 
-if 'setuptools' in sys.modules:
-    setuptools_extra_args['python_requires'] = '>=3.7'
-    setuptools_extra_args['zip_safe'] = False
-    setuptools_extra_args['entry_points'] = {
-        'console_scripts': find_entry_points(),
-        'pygments.lexers': [
-            'ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer',
-            'ipython = IPython.lib.lexers:IPythonLexer',
-            'ipython3 = IPython.lib.lexers:IPython3Lexer',
+if "setuptools" in sys.modules:
+    setuptools_extra_args["python_requires"] = ">=3.8"
+    setuptools_extra_args["zip_safe"] = False
+    setuptools_extra_args["entry_points"] = {
+        "console_scripts": find_entry_points(),
+        "pygments.lexers": [
+            "ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer",
+            "ipython = IPython.lib.lexers:IPythonLexer",
+            "ipython3 = IPython.lib.lexers:IPython3Lexer",
         ],
     }
     setup_args['extras_require'] = extras_require

From 16e7375c5b7260504e5db805150119ff192f57f8 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 6 Nov 2021 19:36:32 -0700
Subject: [PATCH 0872/1407] A few modification to fix docs passing.

Also make sure some of the function signature are reproducible by not
having the hex address of objects in reprs.
---
 IPython/core/completer.py        | 8 +++++++-
 IPython/core/interactiveshell.py | 4 ++--
 IPython/core/pylabtools.py       | 6 +++---
 IPython/utils/text.py            | 3 +++
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index afb8a6ca2b2..356a1e56568 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -177,7 +177,13 @@
 # may have trouble processing.
 MATCHES_LIMIT = 500
 
-_deprecation_readline_sentinel = object()
+
+class Sentinel:
+    def __repr__(self):
+        return "<deprecated sentinel>"
+
+
+_deprecation_readline_sentinel = Sentinel()
 
 
 class ProvisionalCompleterWarning(FutureWarning):
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 1838bf3e698..2bd8cea6522 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3004,7 +3004,7 @@ def should_run_async(
         result: bool
             Whether the code needs to be run with a coroutine runner or not
 
-        .. versionadded: 7.0
+        .. versionadded:: 7.0
         """
         if not self.autoawait:
             return False
@@ -3069,7 +3069,7 @@ async def run_cell_async(
         -------
         result : :class:`ExecutionResult`
 
-        .. versionadded: 7.0
+        .. versionadded:: 7.0
         """
         info = ExecutionInfo(
             raw_cell, store_history, silent, shell_futures)
diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index 36b7276b8b2..711ee758e77 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -119,7 +119,7 @@ def print_figure(fig, fmt="png", bbox_inches="tight", base64=False, **kwargs):
     If `base64` is True, return base64-encoded str instead of raw bytes
     for binary-encoded image formats
 
-    .. versionadded: 7.29
+    .. versionadded:: 7.29
         base64 argument
     """
     # When there's an empty figure, we shouldn't return anything, otherwise we
@@ -162,7 +162,7 @@ def retina_figure(fig, base64=False, **kwargs):
     If `base64` is True, return base64-encoded str instead of raw bytes
     for binary-encoded image formats
 
-    .. versionadded: 7.29
+    .. versionadded:: 7.29
         base64 argument
     """
     pngdata = print_figure(fig, fmt="retina", base64=False, **kwargs)
@@ -399,7 +399,7 @@ def import_pylab(user_ns, import_all=True):
 
 def configure_inline_support(shell, backend):
     """
-    .. deprecated: 7.23
+    .. deprecated:: 7.23
 
         use `matplotlib_inline.backend_inline.configure_inline_support()`
 
diff --git a/IPython/utils/text.py b/IPython/utils/text.py
index c25869ab397..a1754d254de 100644
--- a/IPython/utils/text.py
+++ b/IPython/utils/text.py
@@ -593,6 +593,9 @@ def parse(self, fmt_string):
             # Re-yield the {foo} style pattern
             yield (txt + literal_txt[continue_from:], field_name, format_spec, conversion)
 
+    def __repr__(self):
+        return "<DollarFormatter>"
+
 #-----------------------------------------------------------------------------
 # Utils to columnize a list of string
 #-----------------------------------------------------------------------------

From 2591ecb9fda06ead972f42fcbe71d5db2285ddd8 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 3 Nov 2021 08:06:53 -0700
Subject: [PATCH 0873/1407] Fix debugger history outside of IPython.

This fixes the debugger when ran outside of IPython context as
self.shell.debugger_history is not set.
---
 IPython/terminal/debugger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index 1c4fb6ab413..d76550d878f 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -73,7 +73,7 @@ def gen_comp(self, text):
             message=(lambda: PygmentsTokens(get_prompt_tokens())),
             editing_mode=getattr(EditingMode, self.shell.editing_mode.upper()),
             key_bindings=create_ipython_shortcuts(self.shell),
-            history=self.shell.debugger_history,
+            history=self.debugger_history,
             completer=self._ptcomp,
             enable_history_search=True,
             mouse_support=self.shell.mouse_support,

From c079d3827dcec3f2ffa23885f5c804528548d34e Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 24 Nov 2021 17:39:55 +0300
Subject: [PATCH 0874/1407] Don't build docs for deprecated `utils.version`

Reuse `utils.warn` entry as it is no longer presented.
---
 docs/autogen_api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/autogen_api.py b/docs/autogen_api.py
index 46a806ca95f..6abda9c93ca 100755
--- a/docs/autogen_api.py
+++ b/docs/autogen_api.py
@@ -55,7 +55,7 @@
                                         r'\.parallel',
                                         r'\.qt',
                                         # this is deprecated.
-                                        r'\.utils\.warn',
+                                        r'\.utils\.version',
                                         # Private APIs (there should be a lot more here)
                                         r'\.terminal\.ptutils',
                                         ]

From 919f313f6ff7c43dbcf7d63b26de5e93351c4f9c Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 24 Nov 2021 18:11:24 +0300
Subject: [PATCH 0875/1407] darker

---
 docs/autogen_api.py | 49 +++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/docs/autogen_api.py b/docs/autogen_api.py
index 6abda9c93ca..d2fdfaeb046 100755
--- a/docs/autogen_api.py
+++ b/docs/autogen_api.py
@@ -35,30 +35,31 @@
 
     # The inputhook* modules often cause problems on import, such as trying to
     # load incompatible Qt bindings. It's easiest to leave them all out. The
-    docwriter.module_skip_patterns += [ r'\.lib\.inputhook.+',
-                                        r'\.ipdoctest',
-                                        r'\.testing\.plugin',
-                                        # Backwards compat import for lib.lexers
-                                        r'\.nbconvert\.utils\.lexers',
-                                        # We document this manually.
-                                        r'\.utils\.py3compat',
-                                        # These are exposed in display
-                                        r'\.core\.display',
-                                        r'\.lib\.display',
-                                        # Shims
-                                        r'\.config',
-                                        r'\.consoleapp',
-                                        r'\.frontend$',
-                                        r'\.html',
-                                        r'\.nbconvert',
-                                        r'\.nbformat',
-                                        r'\.parallel',
-                                        r'\.qt',
-                                        # this is deprecated.
-                                        r'\.utils\.version',
-                                        # Private APIs (there should be a lot more here)
-                                        r'\.terminal\.ptutils',
-                                        ]
+    docwriter.module_skip_patterns += [
+        r"\.lib\.inputhook.+",
+        r"\.ipdoctest",
+        r"\.testing\.plugin",
+        # Backwards compat import for lib.lexers
+        r"\.nbconvert\.utils\.lexers",
+        # We document this manually.
+        r"\.utils\.py3compat",
+        # These are exposed in display
+        r"\.core\.display",
+        r"\.lib\.display",
+        # Shims
+        r"\.config",
+        r"\.consoleapp",
+        r"\.frontend$",
+        r"\.html",
+        r"\.nbconvert",
+        r"\.nbformat",
+        r"\.parallel",
+        r"\.qt",
+        # this is deprecated.
+        r"\.utils\.version",
+        # Private APIs (there should be a lot more here)
+        r"\.terminal\.ptutils",
+    ]
     # main API is in the inputhook module, which is documented.
 
     # These modules import functions and classes from other places to expose

From fd4b9610bf1314346be8b51e72129d8635e6a7f5 Mon Sep 17 00:00:00 2001
From: Gal B <galbgit@gmail.com>
Date: Thu, 25 Nov 2021 00:43:38 +0200
Subject: [PATCH 0876/1407] Remove version check for import

---
 IPython/core/interactiveshell.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 1838bf3e698..069585b9068 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -112,13 +112,7 @@ class ProvisionalWarning(DeprecationWarning):
     """
     pass
 
-if sys.version_info > (3,8):
-    from ast import Module
-else :
-    # mock the new API, ignore second argument
-    # see https://github.com/ipython/ipython/issues/11590
-    from ast import Module as OriginalModule
-    Module = lambda nodelist, type_ignores: OriginalModule(nodelist)
+from ast import Module
 
 _assign_nodes = (ast.AugAssign, ast.AnnAssign, ast.Assign)
 _single_targets_nodes = (ast.AugAssign, ast.AnnAssign)

From 0ec26e4a01a9fea4f59a438bc4f8f890c1efafe4 Mon Sep 17 00:00:00 2001
From: Gal B <galbgit@gmail.com>
Date: Thu, 25 Nov 2021 00:44:38 +0200
Subject: [PATCH 0877/1407] Remove no-op function in interactiveshell.py

---
 IPython/core/interactiveshell.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 069585b9068..3fa92663218 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -690,7 +690,6 @@ def __init__(self, ipython_dir=None, profile_dir=None,
         self.init_pdb()
         self.init_extension_manager()
         self.init_payload()
-        self.init_deprecation_warnings()
         self.hooks.late_startup_hook()
         self.events.trigger('shell_initialized', self)
         atexit.register(self.atexit_operations)
@@ -816,16 +815,6 @@ def init_logstart(self):
         elif self.logstart:
             self.magic('logstart')
 
-    def init_deprecation_warnings(self):
-        """
-        register default filter for deprecation warning.
-
-        This will allow deprecation warning of function used interactively to show
-        warning to users, and still hide deprecation warning from libraries import.
-        """
-        if sys.version_info < (3,7):
-            warnings.filterwarnings("default", category=DeprecationWarning, module=self.user_ns.get("__name__"))
-
 
     def init_builtins(self):
         # A single, static flag that we set to True.  Its presence indicates

From f6d27b5d004bfb844a2ad43b61fee6ad8cfc8da3 Mon Sep 17 00:00:00 2001
From: Gal B <galbgit@gmail.com>
Date: Thu, 25 Nov 2021 00:45:28 +0200
Subject: [PATCH 0878/1407] Remove unused ast_asyncify() and related code

The code removed here in unreachable after moving to Python >=3.8 as
shown in: https://app.codecov.io/gh/ipython/ipython/compare/13315/changes
---
 IPython/core/interactiveshell.py | 210 ++++---------------------------
 1 file changed, 25 insertions(+), 185 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 3fa92663218..6f8656478af 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -83,7 +83,7 @@
 import IPython.core.hooks
 
 from typing import List as ListType, Tuple, Optional, Callable
-from ast import AST, stmt
+from ast import stmt
 
 
 # NoOpContext is deprecated, but ipykernel imports it from here.
@@ -121,104 +121,11 @@ class ProvisionalWarning(DeprecationWarning):
 # Await Helpers
 #-----------------------------------------------------------------------------
 
-def removed_co_newlocals(function:types.FunctionType) -> types.FunctionType:
-    """Return a function that do not create a new local scope.
-
-    Given a function, create a clone of this function where the co_newlocal flag
-    has been removed, making this function code actually run in the sourounding
-    scope.
-
-    We need this in order to run asynchronous code in user level namespace.
-    """
-    from types import CodeType, FunctionType
-    CO_NEWLOCALS = 0x0002
-    code = function.__code__
-    new_co_flags = code.co_flags & ~CO_NEWLOCALS
-    if sys.version_info > (3, 8, 0, 'alpha', 3):
-        new_code = code.replace(co_flags=new_co_flags)
-    else:
-        new_code = CodeType(
-            code.co_argcount,
-            code.co_kwonlyargcount,
-            code.co_nlocals,
-            code.co_stacksize,
-            new_co_flags,
-            code.co_code,
-            code.co_consts,
-            code.co_names,
-            code.co_varnames,
-            code.co_filename,
-            code.co_name,
-            code.co_firstlineno,
-            code.co_lnotab,
-            code.co_freevars,
-            code.co_cellvars
-        )
-    return FunctionType(new_code, globals(), function.__name__, function.__defaults__)
-
-
 # we still need to run things using the asyncio eventloop, but there is no
 # async integration
-from .async_helpers import (_asyncio_runner,  _asyncify, _pseudo_sync_runner)
+from .async_helpers import (_asyncio_runner, _pseudo_sync_runner)
 from .async_helpers import _curio_runner, _trio_runner, _should_be_async
 
-
-def _ast_asyncify(cell:str, wrapper_name:str) -> ast.Module:
-    """
-    Parse a cell with top-level await and modify the AST to be able to run it later.
-
-    Parameters
-    ----------
-    cell: str
-        The code cell to asyncronify
-    wrapper_name: str
-        The name of the function to be used to wrap the passed `cell`. It is
-        advised to **not** use a python identifier in order to not pollute the
-        global namespace in which the function will be ran.
-
-    Returns
-    -------
-    ModuleType:
-        A module object AST containing **one** function named `wrapper_name`.
-
-        The given code is wrapped in a async-def function, parsed into an AST, and
-        the resulting function definition AST is modified to return the last
-        expression.
-
-        The last expression or await node is moved into a return statement at the
-        end of the function, and removed from its original location. If the last
-        node is not Expr or Await nothing is done.
-
-        The function `__code__` will need to be later modified  (by
-        ``removed_co_newlocals``) in a subsequent step to not create new `locals()`
-        meaning that the local and global scope are the same, ie as if the body of
-        the function was at module level.
-
-        Lastly a call to `locals()` is made just before the last expression of the
-        function, or just after the last assignment or statement to make sure the
-        global dict is updated as python function work with a local fast cache which
-        is updated only on `local()` calls.
-    """
-
-    from ast import Expr, Await, Return, stmt, FunctionDef, Try, AsyncFunctionDef
-    if sys.version_info >= (3,8):
-        return ast.parse(cell)
-    tree = ast.parse(_asyncify(cell))
-
-    function_def = tree.body[0]
-    if sys.version_info > (3, 8):
-        assert isinstance(function_def, FunctionDef), function_def
-    else:
-        assert isinstance(function_def, (FunctionDef, AsyncFunctionDef)), function_def
-
-    function_def.name = wrapper_name
-    try_block = function_def.body[0]
-    assert isinstance(try_block, Try)
-    lastexpr = try_block.body[-1]
-    if isinstance(lastexpr, (Expr, Await)):
-        try_block.body[-1] = Return(lastexpr.value)
-    ast.fix_missing_locations(tree)
-    return tree
 #-----------------------------------------------------------------------------
 # Globals
 #-----------------------------------------------------------------------------
@@ -3136,28 +3043,7 @@ def error_before_exec(value):
             with self.display_trap:
                 # Compile to bytecode
                 try:
-                    if sys.version_info < (3,8) and self.autoawait:
-                        if _should_be_async(cell):
-                            # the code AST below will not be user code: we wrap it
-                            # in an `async def`. This will likely make some AST
-                            # transformer below miss some transform opportunity and
-                            # introduce a small coupling to run_code (in which we
-                            # bake some assumptions of what _ast_asyncify returns.
-                            # they are ways around (like grafting part of the ast
-                            # later:
-                            #    - Here, return code_ast.body[0].body[1:-1], as well
-                            #    as last expression in  return statement which is
-                            #    the user code part.
-                            #    - Let it go through the AST transformers, and graft
-                            #    - it back after the AST transform
-                            # But that seem unreasonable, at least while we
-                            # do not need it.
-                            code_ast = _ast_asyncify(cell, 'async-def-wrapper')
-                            _run_async = True
-                        else:
-                            code_ast = compiler.ast_parse(cell, filename=cell_name)
-                    else:
-                        code_ast = compiler.ast_parse(cell, filename=cell_name)
+                    code_ast = compiler.ast_parse(cell, filename=cell_name)
                 except self.custom_exceptions as e:
                     etype, value, tb = sys.exc_info()
                     self.CustomTB(etype, value, tb)
@@ -3183,8 +3069,6 @@ def error_before_exec(value):
 
                 # Execute the user code
                 interactivity = "none" if silent else self.ast_node_interactivity
-                if _run_async:
-                    interactivity = 'async'
 
                 has_raised = await self.run_ast_nodes(code_ast.body, cell_name,
                        interactivity=interactivity, compiler=compiler, result=result)
@@ -3293,11 +3177,6 @@ async def run_ast_nodes(
           or the last assignment. Other values for this parameter will raise a
           ValueError.
 
-          Experimental value: 'async' Will try to run top level interactive
-          async/await code in default runner, this will not respect the
-          interactivity setting and will only run the last node if it is an
-          expression.
-
         compiler : callable
           A function with the same interface as the built-in compile(), to turn
           the AST nodes into code objects. Default is the built-in compile().
@@ -3341,52 +3220,32 @@ async def run_ast_nodes(
             to_run_exec, to_run_interactive = nodelist[:-1], nodelist[-1:]
         elif interactivity == 'all':
             to_run_exec, to_run_interactive = [], nodelist
-        elif interactivity == 'async':
-            to_run_exec, to_run_interactive = [], nodelist
-            _async = True
         else:
             raise ValueError("Interactivity was %r" % interactivity)
 
         try:
-            if _async and sys.version_info > (3,8):
-                raise ValueError("This branch should never happen on Python 3.8 and above, "
-                                 "please try to upgrade IPython and open a bug report with your case.")
-            if _async:
-                # If interactivity is async the semantics of run_code are
-                # completely different Skip usual machinery.
-                mod = Module(nodelist, [])
-                async_wrapper_code = compiler(mod, cell_name, 'exec')
-                exec(async_wrapper_code, self.user_global_ns, self.user_ns)
-                async_code = removed_co_newlocals(self.user_ns.pop('async-def-wrapper')).__code__
-                if (await self.run_code(async_code, result, async_=True)):
+            def compare(code):
+                is_async = (inspect.CO_COROUTINE & code.co_flags == inspect.CO_COROUTINE)
+                return is_async
+
+            # refactor that to just change the mod constructor.
+            to_run = []
+            for node in to_run_exec:
+                to_run.append((node, 'exec'))
+
+            for node in to_run_interactive:
+                to_run.append((node, 'single'))
+
+            for node,mode in to_run:
+                if mode == 'exec':
+                    mod = Module([node], [])
+                elif mode == 'single':
+                    mod = ast.Interactive([node])
+                with compiler.extra_flags(getattr(ast, 'PyCF_ALLOW_TOP_LEVEL_AWAIT', 0x0) if self.autoawait else 0x0):
+                    code = compiler(mod, cell_name, mode)
+                    asy = compare(code)
+                if (await self.run_code(code, result,  async_=asy)):
                     return True
-            else:
-                if sys.version_info > (3, 8):
-                    def compare(code):
-                        is_async = (inspect.CO_COROUTINE & code.co_flags == inspect.CO_COROUTINE)
-                        return is_async
-                else:
-                    def compare(code):
-                        return _async
-
-                # refactor that to just change the mod constructor.
-                to_run = []
-                for node in to_run_exec:
-                    to_run.append((node, 'exec'))
-
-                for node in to_run_interactive:
-                    to_run.append((node, 'single'))
-
-                for node,mode in to_run:
-                    if mode == 'exec':
-                        mod = Module([node], [])
-                    elif mode == 'single':
-                        mod = ast.Interactive([node])
-                    with compiler.extra_flags(getattr(ast, 'PyCF_ALLOW_TOP_LEVEL_AWAIT', 0x0) if self.autoawait else 0x0):
-                        code = compiler(mod, cell_name, mode)
-                        asy = compare(code)
-                    if (await self.run_code(code, result,  async_=asy)):
-                        return True
 
             # Flush softspace
             if softspace(sys.stdout, 0):
@@ -3409,21 +3268,6 @@ def compare(code):
 
         return False
 
-    def _async_exec(self, code_obj: types.CodeType, user_ns: dict):
-        """
-        Evaluate an asynchronous code object using a code runner
-
-        Fake asynchronous execution of code_object in a namespace via a proxy namespace.
-
-        Returns coroutine object, which can be executed via async loop runner
-
-        WARNING: The semantics of `async_exec` are quite different from `exec`,
-        in particular you can only pass a single namespace. It also return a
-        handle to the value of the last things returned by code_object.
-        """
-
-        return eval(code_obj, user_ns)
-
     async def run_code(self, code_obj, result=None, *, async_=False):
         """Execute a code object.
 
@@ -3458,11 +3302,7 @@ async def run_code(self, code_obj, result=None, *, async_=False):
         try:
             try:
                 self.hooks.pre_run_code_hook()
-                if async_ and sys.version_info < (3,8):
-                    last_expr = (await self._async_exec(code_obj, self.user_ns))
-                    code = compile('last_expr', 'fake', "single")
-                    exec(code, {'last_expr': last_expr})
-                elif async_ :
+                if async_ :
                     await eval(code_obj, self.user_global_ns, self.user_ns)
                 else:
                     exec(code_obj, self.user_global_ns, self.user_ns)

From c8ed4d8189d813b322516bc352eab2768e75ec5b Mon Sep 17 00:00:00 2001
From: Gal B <galbgit@gmail.com>
Date: Thu, 25 Nov 2021 00:54:50 +0200
Subject: [PATCH 0879/1407] Apply linter on interactiveshell.py

---
 IPython/core/interactiveshell.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 6f8656478af..34cdaaba8d0 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -123,7 +123,7 @@ class ProvisionalWarning(DeprecationWarning):
 
 # we still need to run things using the asyncio eventloop, but there is no
 # async integration
-from .async_helpers import (_asyncio_runner, _pseudo_sync_runner)
+from .async_helpers import _asyncio_runner, _pseudo_sync_runner
 from .async_helpers import _curio_runner, _trio_runner, _should_be_async
 
 #-----------------------------------------------------------------------------
@@ -3224,27 +3224,32 @@ async def run_ast_nodes(
             raise ValueError("Interactivity was %r" % interactivity)
 
         try:
+
             def compare(code):
-                is_async = (inspect.CO_COROUTINE & code.co_flags == inspect.CO_COROUTINE)
+                is_async = inspect.CO_COROUTINE & code.co_flags == inspect.CO_COROUTINE
                 return is_async
 
             # refactor that to just change the mod constructor.
             to_run = []
             for node in to_run_exec:
-                to_run.append((node, 'exec'))
+                to_run.append((node, "exec"))
 
             for node in to_run_interactive:
-                to_run.append((node, 'single'))
+                to_run.append((node, "single"))
 
-            for node,mode in to_run:
-                if mode == 'exec':
+            for node, mode in to_run:
+                if mode == "exec":
                     mod = Module([node], [])
-                elif mode == 'single':
+                elif mode == "single":
                     mod = ast.Interactive([node])
-                with compiler.extra_flags(getattr(ast, 'PyCF_ALLOW_TOP_LEVEL_AWAIT', 0x0) if self.autoawait else 0x0):
+                with compiler.extra_flags(
+                    getattr(ast, "PyCF_ALLOW_TOP_LEVEL_AWAIT", 0x0)
+                    if self.autoawait
+                    else 0x0
+                ):
                     code = compiler(mod, cell_name, mode)
                     asy = compare(code)
-                if (await self.run_code(code, result,  async_=asy)):
+                if await self.run_code(code, result, async_=asy):
                     return True
 
             # Flush softspace
@@ -3302,7 +3307,7 @@ async def run_code(self, code_obj, result=None, *, async_=False):
         try:
             try:
                 self.hooks.pre_run_code_hook()
-                if async_ :
+                if async_:
                     await eval(code_obj, self.user_global_ns, self.user_ns)
                 else:
                     exec(code_obj, self.user_global_ns, self.user_ns)

From cb2e14e314e437c8f46ba18ee478d673feffefe6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 25 Nov 2021 17:33:22 -0800
Subject: [PATCH 0880/1407] Remove pre-3.8 code path

---
 IPython/core/async_helpers.py | 94 +++--------------------------------
 1 file changed, 7 insertions(+), 87 deletions(-)

diff --git a/IPython/core/async_helpers.py b/IPython/core/async_helpers.py
index 9d2e5ddaab0..72220511838 100644
--- a/IPython/core/async_helpers.py
+++ b/IPython/core/async_helpers.py
@@ -12,13 +12,10 @@
 
 
 import ast
-import sys
 import inspect
-from textwrap import dedent, indent
 
 
 class _AsyncIORunner:
-
     def __call__(self, coro):
         """
         Handler for asyncio autoawait
@@ -28,7 +25,8 @@ def __call__(self, coro):
         return asyncio.get_event_loop_policy().get_event_loop().run_until_complete(coro)
 
     def __str__(self):
-        return 'asyncio'
+        return "asyncio"
+
 
 _asyncio_runner = _AsyncIORunner()
 
@@ -74,69 +72,6 @@ def _pseudo_sync_runner(coro):
         )
 
 
-def _asyncify(code: str) -> str:
-    """wrap code in async def definition.
-
-    And setup a bit of context to run it later.
-    """
-    res = dedent(
-        """
-    async def __wrapper__():
-        try:
-    {usercode}
-        finally:
-            locals()
-    """
-    ).format(usercode=indent(code, " " * 8))
-    return res
-
-
-class _AsyncSyntaxErrorVisitor(ast.NodeVisitor):
-    """
-    Find syntax errors that would be an error in an async repl, but because
-    the implementation involves wrapping the repl in an async function, it
-    is erroneously allowed (e.g. yield or return at the top level)
-    """
-    def __init__(self):
-        if sys.version_info >= (3,8):
-            raise ValueError('DEPRECATED in Python 3.8+')
-        self.depth = 0
-        super().__init__()
-
-    def generic_visit(self, node):
-        func_types = (ast.FunctionDef, ast.AsyncFunctionDef)
-        invalid_types_by_depth = {
-            0: (ast.Return, ast.Yield, ast.YieldFrom),
-            1: (ast.Nonlocal,)
-        }
-
-        should_traverse = self.depth < max(invalid_types_by_depth.keys())
-        if isinstance(node, func_types) and should_traverse:
-            self.depth += 1
-            super().generic_visit(node)
-            self.depth -= 1
-        elif isinstance(node, invalid_types_by_depth[self.depth]):
-            raise SyntaxError()
-        else:
-            super().generic_visit(node)
-
-
-def _async_parse_cell(cell: str) -> ast.AST:
-    """
-    This is a compatibility shim for pre-3.7 when async outside of a function
-    is a syntax error at the parse stage.
-
-    It will return an abstract syntax tree parsed as if async and await outside
-    of a function were not a syntax error.
-    """
-    if sys.version_info < (3, 7):
-        # Prior to 3.7 you need to asyncify before parse
-        wrapped_parse_tree = ast.parse(_asyncify(cell))
-        return wrapped_parse_tree.body[0].body[0]
-    else:
-        return ast.parse(cell)
-
-
 def _should_be_async(cell: str) -> bool:
     """Detect if a block of code need to be wrapped in an `async def`
 
@@ -148,25 +83,10 @@ def _should_be_async(cell: str) -> bool:
     Not handled yet: If the block of code has a return statement as the top
     level, it will be seen as async. This is a know limitation.
     """
-    if sys.version_info > (3, 8):
-        try:
-            code = compile(cell, "<>", "exec", flags=getattr(ast,'PyCF_ALLOW_TOP_LEVEL_AWAIT', 0x0))
-            return inspect.CO_COROUTINE & code.co_flags == inspect.CO_COROUTINE
-        except (SyntaxError, MemoryError):
-            return False
     try:
-        # we can't limit ourself to ast.parse, as it __accepts__ to parse on
-        # 3.7+, but just does not _compile_
-        code = compile(cell, "<>", "exec")
+        code = compile(
+            cell, "<>", "exec", flags=getattr(ast, "PyCF_ALLOW_TOP_LEVEL_AWAIT", 0x0)
+        )
+        return inspect.CO_COROUTINE & code.co_flags == inspect.CO_COROUTINE
     except (SyntaxError, MemoryError):
-        try:
-            parse_tree = _async_parse_cell(cell)
-
-            # Raise a SyntaxError if there are top-level return or yields
-            v = _AsyncSyntaxErrorVisitor()
-            v.visit(parse_tree)
-
-        except (SyntaxError, MemoryError):
-            return False
-        return True
-    return False
+        return False

From 92cba8c3ace2c279dbfadcba3b6f9bac565b8825 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 25 Nov 2021 17:37:36 -0800
Subject: [PATCH 0881/1407] More cleanup of pre-3.8 codepath

---
 IPython/core/inputtransformer2.py |  5 +---
 IPython/core/magics/execution.py  | 47 ++++++++++++++-----------------
 IPython/core/tests/test_magic.py  |  7 +----
 3 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index 53e114c7139..ee7015924dd 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -791,9 +791,6 @@ def __init__(self, extra_flags=0):
         self.compiler = MaybeAsyncCompile(extra_flags=extra_flags)
 
 
-if (sys.version_info.major, sys.version_info.minor) >= (3, 8):
-    _extra_flags = ast.PyCF_ALLOW_TOP_LEVEL_AWAIT
-else:
-    _extra_flags = ast.PyCF_ONLY_AST
+_extra_flags = ast.PyCF_ALLOW_TOP_LEVEL_AWAIT
 
 compile_command = MaybeAsyncCommandCompiler(extra_flags=_extra_flags)
diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 0f765fec433..d74f4c2de2f 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -8,49 +8,44 @@
 import ast
 import bdb
 import builtins as builtin_mod
+import cProfile as profile
 import gc
 import itertools
+import math
 import os
+import pstats
+import re
 import shlex
 import sys
 import time
 import timeit
-import math
-import re
+from ast import Module
+from io import StringIO
+from logging import error
+from pathlib import Path
 from pdb import Restart
+from warnings import warn
 
-import cProfile as profile
-import pstats
-
-from IPython.core import oinspect
-from IPython.core import magic_arguments
-from IPython.core import page
+from IPython.core import magic_arguments, oinspect, page
 from IPython.core.error import UsageError
 from IPython.core.macro import Macro
-from IPython.core.magic import (Magics, magics_class, line_magic, cell_magic,
-                                line_cell_magic, on_off, needs_local_scope,
-                                no_var_expand)
+from IPython.core.magic import (
+    Magics,
+    cell_magic,
+    line_cell_magic,
+    line_magic,
+    magics_class,
+    needs_local_scope,
+    no_var_expand,
+    on_off,
+)
 from IPython.testing.skipdoctest import skip_doctest
-from IPython.utils.contexts import preserve_keys
 from IPython.utils.capture import capture_output
+from IPython.utils.contexts import preserve_keys
 from IPython.utils.ipstruct import Struct
 from IPython.utils.module_paths import find_mod
 from IPython.utils.path import get_py_filename, shellglob
 from IPython.utils.timing import clock, clock2
-from warnings import warn
-from logging import error
-from pathlib import Path
-from io import StringIO
-from pathlib import Path
-
-if sys.version_info > (3,8):
-    from ast import Module
-else :
-    # mock the new API, ignore second argument
-    # see https://github.com/ipython/ipython/issues/11590
-    from ast import Module as OriginalModule
-    Module = lambda nodelist, type_ignores: OriginalModule(nodelist)
-
 
 #-----------------------------------------------------------------------------
 # Magic implementation classes
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index a72eb68cd7a..fdd6d90445f 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -1308,12 +1308,7 @@ def test_time_no_var_expand():
 # this is slow, put at the end for local testing.
 def test_timeit_arguments():
     "Test valid timeit arguments, should not cause SyntaxError (GH #1269)"
-    if sys.version_info < (3,7):
-        _ip.magic("timeit -n1 -r1 ('#')")
-    else:
-        # 3.7 optimize no-op statement like above out, and complain there is
-        # nothing in the for loop.
-        _ip.magic("timeit -n1 -r1 a=('#')")
+    _ip.magic("timeit -n1 -r1 a=('#')")
 
 
 TEST_MODULE = """

From b835cc1d5d3c11e59f3d22af1d054bec42d4e92d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 25 Nov 2021 17:53:58 -0800
Subject: [PATCH 0882/1407] remove last bits of pre-38 codepath.

Closes #13316
---
 IPython/terminal/shortcuts.py    |  7 +++----
 IPython/testing/decorators.py    |  5 -----
 IPython/testing/tools.py         |  3 ---
 IPython/utils/tests/test_path.py | 12 +++++++-----
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 26e1883fd61..029adc9faad 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -163,10 +163,9 @@ def _(event):
         kb.add(*keys, filter=focused_insert & ebivim)(cmd)
 
     def get_input_mode(self):
-        if sys.version_info[0] == 3:
-            app = get_app()
-            app.ttimeoutlen = shell.ttimeoutlen
-            app.timeoutlen = shell.timeoutlen
+        app = get_app()
+        app.ttimeoutlen = shell.ttimeoutlen
+        app.timeoutlen = shell.timeoutlen
 
         return self._input_mode
 
diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
index a797c1c428e..d2f325ba3ca 100644
--- a/IPython/testing/decorators.py
+++ b/IPython/testing/decorators.py
@@ -162,11 +162,6 @@ def module_not_available(module):
 
 skip_if_no_x11 = skipif(_x11_skip_cond, _x11_skip_msg)
 
-
-# Decorators to skip certain tests on specific platform/python combinations
-skip_win32_py38 = skipif(sys.version_info > (3,8) and os.name == 'nt')
-
-
 # Other skip decorators
 
 # generic skip without module
diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py
index 3dec1ffc634..31bfd426863 100644
--- a/IPython/testing/tools.py
+++ b/IPython/testing/tools.py
@@ -191,9 +191,6 @@ def ipexec(fname, options=None, commands=()):
     # Absolute path for filename
     full_fname = os.path.join(test_dir, fname)
     full_cmd = ipython_cmd + cmdargs + ['--', full_fname]
-    if sys.platform == "win32" and sys.version_info < (3, 8):
-        # subprocess.Popen does not support Path objects yet
-        full_cmd = list(map(str, full_cmd))
     env = os.environ.copy()
     # FIXME: ignore all warnings in ipexec while we have shims
     # should we keep suppressing warnings here, even after removing shims?
diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index 3faf91dc646..6f291502826 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -19,9 +19,11 @@
 import IPython
 from IPython import paths
 from IPython.testing import decorators as dec
-from IPython.testing.decorators import (skip_if_not_win32, skip_win32,
-                                        onlyif_unicode_paths,
-                                        skip_win32_py38,)
+from IPython.testing.decorators import (
+    skip_if_not_win32,
+    skip_win32,
+    onlyif_unicode_paths,
+)
 from IPython.testing.tools import make_tempfile
 from IPython.utils import path
 from IPython.utils.tempdir import TemporaryDirectory
@@ -138,7 +140,7 @@ def test_get_home_dir_2():
     assert home_dir == unfrozen
 
 
-@skip_win32_py38
+@skip_win32
 @with_environment
 def test_get_home_dir_3():
     """get_home_dir() uses $HOME if set"""
@@ -156,7 +158,7 @@ def test_get_home_dir_4():
     # this should still succeed, but we don't care what the answer is
     home = path.get_home_dir(False)
 
-@skip_win32_py38
+@skip_win32
 @with_environment
 def test_get_home_dir_5():
     """raise HomeDirError if $HOME is specified, but not a writable dir"""

From 3494468c60a760c0c71d7b22c99b8443b84560be Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Fri, 26 Nov 2021 18:37:36 +0300
Subject: [PATCH 0883/1407] Remove unneeded workaround

The globals update stuff is done in the plugin.
---
 IPython/testing/plugin/ipdoctest.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/IPython/testing/plugin/ipdoctest.py b/IPython/testing/plugin/ipdoctest.py
index dacb4d1d7c1..b593336b5cc 100644
--- a/IPython/testing/plugin/ipdoctest.py
+++ b/IPython/testing/plugin/ipdoctest.py
@@ -328,18 +328,6 @@ class IPDocTestRunner(doctest.DocTestRunner,object):
     """
 
     def run(self, test, compileflags=None, out=None, clear_globs=True):
-
-        # Hack: ipython needs access to the execution context of the example,
-        # so that it can propagate user variables loaded by %run into
-        # test.globs.  We put them here into our modified %run as a function
-        # attribute.  Our new %run will then only make the namespace update
-        # when called (rather than unconditionally updating test.globs here
-        # for all examples, most of which won't be calling %run anyway).
-        #_ip._ipdoctest_test_globs = test.globs
-        #_ip._ipdoctest_test_filename = test.filename
-
-        test.globs.update(_ip.user_ns)
-
         # Override terminal size to standardise traceback format
         with modified_env({'COLUMNS': '80', 'LINES': '24'}):
             return super(IPDocTestRunner,self).run(test,

From 140d38350ca0e1bb92245dfecf9e2048e7821605 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Fri, 26 Nov 2021 18:38:59 +0300
Subject: [PATCH 0884/1407] Remove unimplemented `ipdoctest: external` support

---
 IPython/testing/plugin/ipdoctest.py | 40 +++--------------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

diff --git a/IPython/testing/plugin/ipdoctest.py b/IPython/testing/plugin/ipdoctest.py
index b593336b5cc..52cd8fd3b8a 100644
--- a/IPython/testing/plugin/ipdoctest.py
+++ b/IPython/testing/plugin/ipdoctest.py
@@ -80,18 +80,6 @@ def check_output(self, want, got, optionflags):
 class IPExample(doctest.Example): pass
 
 
-class IPExternalExample(doctest.Example):
-    """Doctest examples to be run in an external process."""
-
-    def __init__(self, source, want, exc_msg=None, lineno=0, indent=0,
-                 options=None):
-        # Parent constructor
-        doctest.Example.__init__(self,source,want,exc_msg,lineno,indent,options)
-
-        # An EXTRA newline is needed to prevent pexpect hangs
-        self.source += '\n'
-
-
 class IPDocTestParser(doctest.DocTestParser):
     """
     A class used to parse strings containing doctest examples.
@@ -137,9 +125,6 @@ class IPDocTestParser(doctest.DocTestParser):
     # we don't need to modify any other code.
     _RANDOM_TEST = re.compile(r'#\s*all-random\s+')
 
-    # Mark tests to be executed in an external process - currently unsupported.
-    _EXTERNAL_IP = re.compile(r'#\s*ipdoctest:\s*EXTERNAL')
-
     def ip2py(self,source):
         """Convert input IPython source into valid Python."""
         block = _ip.input_transformer_manager.transform_cell(source)
@@ -182,27 +167,12 @@ def parse(self, string, name='<string>'):
         terms = list(self._EXAMPLE_RE_PY.finditer(string))
         if terms:
             # Normal Python example
-            #print '-'*70  # dbg
-            #print 'PyExample, Source:\n',string  # dbg
-            #print '-'*70  # dbg
             Example = doctest.Example
         else:
-            # It's an ipython example.  Note that IPExamples are run
-            # in-process, so their syntax must be turned into valid python.
-            # IPExternalExamples are run out-of-process (via pexpect) so they
-            # don't need any filtering (a real ipython will be executing them).
+            # It's an ipython example.
             terms = list(self._EXAMPLE_RE_IP.finditer(string))
-            if self._EXTERNAL_IP.search(string):
-                #print '-'*70  # dbg
-                #print 'IPExternalExample, Source:\n',string  # dbg
-                #print '-'*70  # dbg
-                Example = IPExternalExample
-            else:
-                #print '-'*70  # dbg
-                #print 'IPExample, Source:\n',string  # dbg
-                #print '-'*70  # dbg
-                Example = IPExample
-                ip2py = True
+            Example = IPExample
+            ip2py = True
 
         for m in terms:
             # Add the pre-example text to `output`.
@@ -217,10 +187,6 @@ def parse(self, string, name='<string>'):
             # cases, it's only non-empty for 'all-random' tests):
             want += random_marker
 
-            if Example is IPExternalExample:
-                options[doctest.NORMALIZE_WHITESPACE] = True
-                want += '\n'
-
             # Create an Example, and add it to the list.
             if not self._IS_BLANK_OR_COMMENT(source):
                 output.append(Example(source, want, exc_msg,

From d0c404dac965cf611c08886488b50ae65ceeb5c1 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Fri, 26 Nov 2021 18:53:04 +0300
Subject: [PATCH 0885/1407] Make the ipyfunc doctest actually test IPython
 syntax

---
 IPython/testing/plugin/simple.py | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/IPython/testing/plugin/simple.py b/IPython/testing/plugin/simple.py
index 3861977cab5..35fbfd2fbdc 100644
--- a/IPython/testing/plugin/simple.py
+++ b/IPython/testing/plugin/simple.py
@@ -1,7 +1,7 @@
 """Simple example using doctests.
 
 This file just contains doctests both using plain python and IPython prompts.
-All tests should be loaded by nose.
+All tests should be loaded by Pytest.
 """
 
 def pyfunc():
@@ -24,10 +24,21 @@ def pyfunc():
     return 'pyfunc'
 
 
-def ipyfunc2():
-    """Some pure python tests...
+def ipyfunc():
+    """Some IPython tests...
+
+    In [1]: ipyfunc()
+    Out[1]: 'ipyfunc'
+
+    In [2]: import os
+
+    In [3]: 2+3
+    Out[3]: 5
 
-    >>> 1+1
-    2
+    In [4]: for i in range(3):
+       ...:     print(i, end=' ')
+       ...:     print(i+1, end=' ')
+       ...:
+    Out[4]: 0 1 1 2 2 3
     """
-    return 'pyfunc2'
+    return "ipyfunc"

From 30e5a5d3346e5caf5a03a2d253084bfbd569ad42 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Fri, 26 Nov 2021 19:40:13 +0300
Subject: [PATCH 0886/1407] deepreload: Use `sys.builtin_module_names` to
 exclude builtins

---
 IPython/lib/deepreload.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/IPython/lib/deepreload.py b/IPython/lib/deepreload.py
index fa8009b59c1..aaedab24255 100644
--- a/IPython/lib/deepreload.py
+++ b/IPython/lib/deepreload.py
@@ -282,11 +282,22 @@ def deep_reload_hook(m):
 original_reload = importlib.reload
 
 # Replacement for reload()
-def reload(module, exclude=('sys', 'os.path', 'builtins', '__main__',
-                            'numpy', 'numpy._globals')):
+def reload(
+    module,
+    exclude=(
+        *sys.builtin_module_names,
+        "sys",
+        "os.path",
+        "builtins",
+        "__main__",
+        "numpy",
+        "numpy._globals",
+    ),
+):
     """Recursively reload all modules used in the given module.  Optionally
     takes a list of modules to exclude from reloading.  The default exclude
-    list contains sys, __main__, and __builtin__, to prevent, e.g., resetting
+    list contains modules listed in sys.builtin_module_names with additional
+    sys, os.path, builtins and __main__, to prevent, e.g., resetting
     display, exception, and io hooks.
     """
     global found_now

From 08e13a503c9f24176008b2f95ae536ab99fdaf9d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Nov 2021 11:29:13 -0800
Subject: [PATCH 0887/1407] wn 7.16.2

---
 docs/source/whatsnew/version7.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 20fa0397220..8edb330a684 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -596,6 +596,19 @@ Which is now also present on subclasses::
 
 .. _version 716:
 
+IPython 7.16.1, 7.16.2
+======================
+
+IPython 7.16.1 was release immediately after 7.16.0 to fix a conda packaging issue.
+The source is identical to 7.16.0 but the file permissions in the tar are different.
+
+IPython 7.16.2 pins jedi dependency to "<=0.17.2" which should prevent some
+issues for users still on python 3.6. This may not be sufficient as pip may
+still allow to downgrade IPython.
+
+Compatibility with Jedi > 0.17.2 was not added as this would have meant bumping
+the minimal version to >0.16.
+
 IPython 7.16
 ============
 

From 2339c33402cacdd8a19b5649ef773cef4f83c713 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Nov 2021 11:55:28 -0800
Subject: [PATCH 0888/1407] What's new 7.30

---
 docs/source/whatsnew/version7.rst | 45 +++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 20fa0397220..e8f94213178 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,51 @@
  7.x Series
 ============
 
+.. _version 7.30:
+
+IPython 7.30
+============
+
+IPython 7.30 fixes a couple of bugs introduce in previous releases (in
+particular with respect to path handling), and introduce a few features and
+improvements:
+
+Notably we will highlight :ghpull:`13267` "Document that ``%run`` can execute
+notebooks and ipy scripts.", which is the first commit of Fernando Pérez since
+mid 2016 (IPython 5.1). If you are new to IPython, Fernando created IPython in
+2001. The other most recent contribution of Fernando to IPython itself was
+May 2018, by reviewing and merging PRs. I want to note that Fernando is still
+active but mostly as a mentor and leader of the whole Jupyter organisation, but
+we're still happy to see him contribute code !
+
+:ghpull:`13290` "Use sphinxify (if available) in object_inspect_mime path"
+should allow richer Repr of docstrings when using jupyterlab inspector.
+
+:ghpull:`13311` make the debugger use ``ThreadPoolExecutor`` for debugger cmdloop.
+This should fix some issues/infinite loop, but let us know if you come across
+any regressions. In particular this fixes issues with `kmaork/madbg <https://github.com/kmaork/madbg>`_,
+a remote debugger for IPython.
+
+Note that this is likely the ante-penultimate release of IPython 7.x as a stable
+branch, as I hope to release IPython 8.0 as well as IPython 7.31 next
+month/early 2022.
+
+IPython 8.0 will drop support for Python 3.7, removed nose as a dependency, and
+7.x will only get critical bug fixes with 8.x becoming the new stable. This will
+not be possible without `NumFOCUS Small Development Grants
+<https://numfocus.org/programs/small-development-grants>`_ Which allowed us to
+hire `Nikita Kniazev <https://github.com/Kojoley>`_ who provide Python and C++
+help and contracting work.
+
+
+Many thanks to all the contributors to this release. You can find all individual
+contributions to this milestone `on github
+<https://github.com/ipython/ipython/milestone/94?closed=1>`__.
+
+Thanks as well to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries.
+
+
 .. _version 7.29:
 
 IPython 7.29

From 7efd021112f91f8a843b6695ca984e50039ea954 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Nov 2021 14:28:02 -0800
Subject: [PATCH 0889/1407] release script zsh compatibility

---
 tools/release_helper.sh | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 4d5672b498b..a1aa263a8b3 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -21,7 +21,7 @@ WHITE=$(tput setaf 7)
 NOR=$(tput sgr0)
 
 
-echo "Will use $EDITOR to edit files when necessary"
+echo "Will use $BLUE'$EDITOR'$NOR to edit files when necessary"
 echo -n "PREV_RELEASE (X.y.z) [$PREV_RELEASE]: "
 read input
 PREV_RELEASE=${input:-$PREV_RELEASE}
@@ -37,11 +37,15 @@ BRANCH=${input:-$BRANCH}
 
 ask_section(){
     echo
-    echo $BLUE"$1"$NOR 
+    echo $BLUE"$1"$NOR
     echo -n $GREEN"Press Enter to continue, S to skip: "$NOR
-    read -n1 value
-    echo 
-    if [ -z $value ] || [ $value = 'y' ]  ; then
+    if [ "$ZSH_NAME" = "zsh" ] ; then
+        read -k1 value
+        value=${value%$'\n'}
+    else
+       read -n1 value
+    fi
+    if [ -z "$value" ] || [ $value = 'y' ]; then
         return 0
     fi
     return 1
@@ -51,11 +55,17 @@ ask_section(){
 maybe_edit(){
     echo
     echo $BLUE"$1"$NOR 
-    echo -n $GREEN"Press e to Edit $1, any other keys to skip: "$NOR
-    read -n1 value
+    echo -n $GREEN"Press ${BLUE}e$GREEN to Edit ${BLUE}$1$GREEN, any other keys to skip: "$NOR
+    if [ "$ZSH_NAME" = "zsh" ] ; then
+        read -k1 value
+        value=${value%$'\n'}
+    else
+       read -n1 value
+    fi
+
     echo 
     if [ $value = 'e' ]  ; then
-        $EDITOR $1
+        $=EDITOR $1
     fi
 }
 
@@ -100,7 +110,7 @@ then
     git checkout $PREV_RELEASE
     echo $BLUE"Saving API to file $PREV_RELEASE"$NOR
     frappuccino IPython --save IPython-$PREV_RELEASE.json
-    echo $BLUE"coming back to $BRANCH"$NOR
+    echo $BLUE"comming back to $BRANCH"$NOR
     git checkout $BRANCH
     echo $BLUE"comparing ..."$NOR
     frappuccino IPython --compare IPython-$PREV_RELEASE.json
@@ -116,7 +126,7 @@ echo $GREEN"please update version number in ${RED}IPython/core/release.py${NOR}
 echo $GREEN"I tried ${RED}sed -i bkp -e '/Uncomment/s/^# //g' IPython/core/release.py${NOR}"
 sed -i bkp -e '/Uncomment/s/^# //g' IPython/core/release.py
 rm IPython/core/release.pybkp
-git diff
+git diff | cat
 maybe_edit IPython/core/release.py
 
 echo $GREEN"Press enter to continue"$NOR
@@ -163,7 +173,7 @@ then
    echo $GREEN"I tried ${RED}sed -i bkp -e '/Uncomment/s/^/# /g' IPython/core/release.py${NOR}"
    sed -i bkp -e '/Uncomment/s/^/# /g' IPython/core/release.py
    rm IPython/core/release.pybkp
-   git diff
+   git diff | cat
    echo $GREEN"Please bump ${RED}the minor version number${NOR}"
    maybe_edit IPython/core/release.py
    echo ${BLUE}"Do not commit yet – we'll do it later."$NOR

From fca0f37b6e11ca5603328430b80401444165c9f3 Mon Sep 17 00:00:00 2001
From: Ahmed Fasih <afasih@bloomberg.net>
Date: Fri, 26 Nov 2021 15:29:09 -0800
Subject: [PATCH 0890/1407] avoid mutable default argument!

---
 IPython/core/interactiveshell.py | 2 +-
 IPython/core/oinspect.py         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 7d3d00300ea..8390d025d46 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1804,7 +1804,7 @@ def object_inspect_text(self, oname, detail_level=0):
         """Get object info as formatted text"""
         return self.object_inspect_mime(oname, detail_level)['text/plain']
 
-    def object_inspect_mime(self, oname, detail_level=0, omit_sections={}):
+    def object_inspect_mime(self, oname, detail_level=0, omit_sections=()):
         """Get object info as a mimebundle of formatted representations.
 
         A mimebundle is a dictionary, keyed by mime-type.
diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 74b3cc9916a..3f12d519d7a 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -567,7 +567,7 @@ def format_mime(self, bundle):
         return bundle
 
     def _get_info(
-        self, obj, oname="", formatter=None, info=None, detail_level=0, omit_sections={}
+        self, obj, oname="", formatter=None, info=None, detail_level=0, omit_sections=()
     ):
         """Retrieve an info dict and format it.
 
@@ -583,8 +583,8 @@ def _get_info(
             already computed information
         detail_level: integer
             Granularity of detail level, if set to 1, give more information.
-        omit_sections: set[str]
-            Titles or keys to omit from output
+        omit_sections: container[str]
+            Titles or keys to omit from output (can be set, tuple, etc., anything supporting `in`)
         """
 
         info = self._info(obj, oname=oname, info=info, detail_level=detail_level)
@@ -669,7 +669,7 @@ def pinfo(
         info=None,
         detail_level=0,
         enable_html_pager=True,
-        omit_sections={},
+        omit_sections=(),
     ):
         """Show detailed information about an object.
 

From 575be23d4994cabb0ad7b9469a319c1758b10a15 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 27 Nov 2021 10:11:01 -0800
Subject: [PATCH 0891/1407] Don't add ipython unconditionally to sys.path

Load ext will already do it with a context manager.

This should remove false positive when import modules, whithout breaking
functionalities.

Maybe closes #13294 (making this part of 8.0 release make sens).
---
 IPython/core/application.py | 40 +++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/IPython/core/application.py b/IPython/core/application.py
index 85c91274d4e..3a1797ab090 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -185,6 +185,15 @@ def _profile_changed(self, change):
                 get_ipython_package_dir(), u'config', u'profile', change['new']
         )
 
+    add_ipython_dir_to_sys_path = Bool(False,
+        """Should the IPython profile directory be added to sys path ?
+
+        This option was non-existing before IPython 8.0, and ipython_dir was added to
+        sys path to allow import of extensions present there. This was historical
+        baggage from when pip did not exist. This now default to false,
+        but can bet to true for legacy reasons
+        """).tag(config=True)
+
     ipython_dir = Unicode(
         help="""
         The name of the IPython directory. This directory is used for logging
@@ -294,21 +303,22 @@ def _ipython_dir_changed(self, change):
             str_old = os.path.abspath(old)
             if str_old in sys.path:
                 sys.path.remove(str_old)
-        str_path = os.path.abspath(new)
-        sys.path.append(str_path)
-        ensure_dir_exists(new)
-        readme = os.path.join(new, 'README')
-        readme_src = os.path.join(get_ipython_package_dir(), u'config', u'profile', 'README')
-        if not os.path.exists(readme) and os.path.exists(readme_src):
-            shutil.copy(readme_src, readme)
-        for d in ('extensions', 'nbextensions'):
-            path = os.path.join(new, d)
-            try:
-                ensure_dir_exists(path)
-            except OSError as e:
-                # this will not be EEXIST
-                self.log.error("couldn't create path %s: %s", path, e)
-        self.log.debug("IPYTHONDIR set to: %s" % new)
+        if self.add_ipython_dir_to_sys_path:
+            str_path = os.path.abspath(new)
+            #sys.path.append(str_path)
+            ensure_dir_exists(new)
+            readme = os.path.join(new, 'README')
+            readme_src = os.path.join(get_ipython_package_dir(), u'config', u'profile', 'README')
+            if not os.path.exists(readme) and os.path.exists(readme_src):
+                shutil.copy(readme_src, readme)
+            for d in ('extensions', 'nbextensions'):
+                path = os.path.join(new, d)
+                try:
+                    ensure_dir_exists(path)
+                except OSError as e:
+                    # this will not be EEXIST
+                    self.log.error("couldn't create path %s: %s", path, e)
+            self.log.debug("IPYTHONDIR set to: %s" % new)
 
     def load_config_file(self, suppress_errors=IPYTHON_SUPPRESS_CONFIG_ERRORS):
         """Load the config file.

From 3147552907530e46e28b4684fbe20c61d00fe061 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Wed, 1 Dec 2021 09:19:52 +0100
Subject: [PATCH 0892/1407] avoid deprecated asyncio.get_event_loop

get_running_loop is only valid from inside a coroutine

EventLoopPolicy.get_event_loop is _not_ deprecated
---
 IPython/core/async_helpers.py               | 17 ++++++++++++++---
 IPython/core/tests/test_interactiveshell.py | 16 ++++++++++++++++
 IPython/core/tests/test_magic.py            |  6 +++++-
 IPython/terminal/interactiveshell.py        | 11 +++++++----
 4 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/IPython/core/async_helpers.py b/IPython/core/async_helpers.py
index 72220511838..6623fae4e13 100644
--- a/IPython/core/async_helpers.py
+++ b/IPython/core/async_helpers.py
@@ -12,17 +12,28 @@
 
 
 import ast
+import asyncio
 import inspect
 
 
 class _AsyncIORunner:
+    def __init__(self):
+        self._loop = None
+
+    @property
+    def loop(self):
+        """Always returns a non-closed event loop"""
+        if self._loop is None or self._loop.is_closed():
+            policy = asyncio.get_event_loop_policy()
+            self._loop = policy.new_event_loop()
+            policy.set_event_loop(self._loop)
+        return self._loop
+
     def __call__(self, coro):
         """
         Handler for asyncio autoawait
         """
-        import asyncio
-
-        return asyncio.get_event_loop_policy().get_event_loop().run_until_complete(coro)
+        return self.loop.run_until_complete(coro)
 
     def __str__(self):
         return "asyncio"
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index a3a55fc66af..355f2b00159 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -1058,6 +1058,22 @@ def test_run_cell_async():
     assert result.result == 5
 
 
+def test_run_cell_await():
+    ip.run_cell("import asyncio")
+    result = ip.run_cell("await asyncio.sleep(0.01); 10")
+    assert ip.user_ns["_"] == 10
+
+
+def test_run_cell_asyncio_run():
+    ip.run_cell("import asyncio")
+    result = ip.run_cell("await asyncio.sleep(0.01); 1")
+    assert ip.user_ns["_"] == 1
+    result = ip.run_cell("asyncio.run(asyncio.sleep(0.01)); 2")
+    assert ip.user_ns["_"] == 2
+    result = ip.run_cell("await asyncio.sleep(0.01); 3")
+    assert ip.user_ns["_"] == 3
+
+
 def test_should_run_async():
     assert not ip.should_run_async("a = 5")
     assert ip.should_run_async("await x")
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index fdd6d90445f..641a6ff66a1 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -970,7 +970,11 @@ def test_script_config():
 
 @pytest.fixture
 def event_loop():
-    yield asyncio.get_event_loop_policy().get_event_loop()
+    policy = asyncio.get_event_loop_policy()
+    loop = policy.new_event_loop()
+    policy.set_event_loop(loop)
+    yield loop
+    loop.close()
 
 
 @dec.skip_win32
diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 7207a572408..5e7d95fcfc0 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -504,13 +504,15 @@ def prompt_for_code(self):
         # If we don't do this, people could spawn coroutine with a
         # while/true inside which will freeze the prompt.
 
+        policy = asyncio.get_event_loop_policy()
         try:
-            old_loop = asyncio.get_running_loop()
+            old_loop = policy.get_event_loop()
         except RuntimeError:
-            # This happens when the user used `asyncio.run()`.
+            # This happens when the the event loop is closed,
+            # e.g. by calling `asyncio.run()`.
             old_loop = None
 
-        asyncio.set_event_loop(self.pt_loop)
+        policy.set_event_loop(self.pt_loop)
         try:
             with patch_stdout(raw=True):
                 text = self.pt_app.prompt(
@@ -518,7 +520,8 @@ def prompt_for_code(self):
                     **self._extra_prompt_options())
         finally:
             # Restore the original event loop.
-            asyncio.set_event_loop(old_loop)
+            if old_loop is not None:
+                policy.set_event_loop(old_loop)
 
         return text
 

From 0fbbb2b59969d43048c0da19dfc073238bfd00bd Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Wed, 1 Dec 2021 12:36:16 +0100
Subject: [PATCH 0893/1407] handle closed event loop in async script magics

leave other problems with asyncio implementation for another PR
---
 IPython/core/magics/script.py | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index 7876e648674..dab63e742d8 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -81,7 +81,15 @@ def safe_watcher():
         yield
         return
 
-    loop = policy.get_event_loop()
+    try:
+        loop = policy.get_event_loop()
+        if loop.is_closed():
+            raise RuntimeError("open a new one")
+    except RuntimeError:
+        # closed loop, make a new one
+        loop = policy.new_event_loop()
+        policy.set_event_loop(loop)
+
     try:
         watcher = asyncio.SafeChildWatcher()
         watcher.attach_loop(loop)
@@ -236,9 +244,19 @@ async def _stream_communicate(process, cell):
             await asyncio.wait([stdout_task, stderr_task])
             await process.wait()
 
-        if sys.platform.startswith("win"):
-            asyncio.set_event_loop_policy(asyncio.WindowsProactorEventLoopPolicy())
-        loop = asyncio.get_event_loop_policy().get_event_loop()
+        policy = asyncio.get_event_loop_policy()
+        if sys.platform.startswith("win") and not isinstance(
+            policy, asyncio.WindowsProactorEventLoopPolicy
+        ):
+            # _do not_ overwrite the current policy
+            policy = asyncio.WindowsProactorEventLoopPolicy()
+
+        try:
+            loop = policy.get_event_loop()
+        except RuntimeError:
+            # closed loop, make a new one
+            loop = policy.new_event_loop()
+            policy.set_event_loop(loop)
         argv = arg_split(line, posix=not sys.platform.startswith("win"))
         args, cmd = self.shebang.parser.parse_known_args(argv)
         try:

From 02ce77ec516a3df7086205a771247a591c319c58 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 1 Dec 2021 17:30:26 +0300
Subject: [PATCH 0894/1407] Remove parso xfail for Python>=3.11

parso 0.8.3 added basic support for Python 3.11 and 3.12 grammars
---
 IPython/core/tests/test_completer.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 4feba09a651..eece34a4790 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -210,11 +210,6 @@ def _ipython_key_completions_(self):
         return list(self.things)
 
 
-@pytest.mark.xfail(
-    sys.version_info >= (3, 11),
-    reason="parso does not support 3.11 yet",
-    raises=NotImplementedError,
-)
 class TestCompleter(unittest.TestCase):
     def setUp(self):
         """

From cc76a77c3ea479d267d558ac3c4b7bbb101ea860 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 1 Dec 2021 17:34:30 +0300
Subject: [PATCH 0895/1407] Remove jedi<=0.18.0 xfail for Python>=3.10

jedi 0.18.1 fixed the issue
---
 IPython/core/tests/test_completer.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index eece34a4790..59f8fee0e67 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -26,15 +26,6 @@
     _deduplicate_completions,
 )
 
-if sys.version_info >= (3, 10):
-    import jedi
-    from pkg_resources import parse_version
-
-    # Requires https://github.com/davidhalter/jedi/pull/1795
-    jedi_issue = parse_version(jedi.__version__) <= parse_version("0.18.0")
-else:
-    jedi_issue = False
-
 # -----------------------------------------------------------------------------
 # Test functions
 # -----------------------------------------------------------------------------
@@ -430,8 +421,6 @@ def test_all_completions_dups(self):
                 matches = c.all_completions("TestCl")
                 assert matches == ['TestClass'], jedi_status
                 matches = c.all_completions("TestClass.")
-                if jedi_status and jedi_issue:
-                    continue
                 assert len(matches) > 2, jedi_status
                 matches = c.all_completions("TestClass.a")
                 assert matches == ['TestClass.a', 'TestClass.a1'], jedi_status
@@ -486,7 +475,6 @@ def test_completion_have_signature(self):
             "encoding" in c.signature
         ), "Signature of function was not found by completer"
 
-    @pytest.mark.xfail(jedi_issue, reason="Known failure on jedi<=0.18.0")
     def test_deduplicate_completions(self):
         """
         Test that completions are correctly deduplicated (even if ranges are not the same)

From 73ffd1ba1d3e83b0611df6ec0f5ec3eb12c5bf30 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Dec 2021 11:51:18 -0800
Subject: [PATCH 0896/1407] Apply suggestions from code review

Co-authored-by: Min RK <benjaminrk@gmail.com>
---
 IPython/core/application.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/application.py b/IPython/core/application.py
index 3a1797ab090..337f7ba7f7c 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -191,7 +191,7 @@ def _profile_changed(self, change):
         This option was non-existing before IPython 8.0, and ipython_dir was added to
         sys path to allow import of extensions present there. This was historical
         baggage from when pip did not exist. This now default to false,
-        but can bet to true for legacy reasons
+        but can be set to true for legacy reasons.
         """).tag(config=True)
 
     ipython_dir = Unicode(
@@ -305,7 +305,7 @@ def _ipython_dir_changed(self, change):
                 sys.path.remove(str_old)
         if self.add_ipython_dir_to_sys_path:
             str_path = os.path.abspath(new)
-            #sys.path.append(str_path)
+            sys.path.append(str_path)
             ensure_dir_exists(new)
             readme = os.path.join(new, 'README')
             readme_src = os.path.join(get_ipython_package_dir(), u'config', u'profile', 'README')

From 96c5d75c72131f888b8d3f9dc95a7fc35ee68808 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Dec 2021 11:52:17 -0800
Subject: [PATCH 0897/1407] reformat

---
 IPython/core/application.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/IPython/core/application.py b/IPython/core/application.py
index 337f7ba7f7c..c9e8e6f4d43 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -185,14 +185,16 @@ def _profile_changed(self, change):
                 get_ipython_package_dir(), u'config', u'profile', change['new']
         )
 
-    add_ipython_dir_to_sys_path = Bool(False,
+    add_ipython_dir_to_sys_path = Bool(
+        False,
         """Should the IPython profile directory be added to sys path ?
 
         This option was non-existing before IPython 8.0, and ipython_dir was added to
         sys path to allow import of extensions present there. This was historical
         baggage from when pip did not exist. This now default to false,
         but can be set to true for legacy reasons.
-        """).tag(config=True)
+        """,
+    ).tag(config=True)
 
     ipython_dir = Unicode(
         help="""
@@ -307,11 +309,13 @@ def _ipython_dir_changed(self, change):
             str_path = os.path.abspath(new)
             sys.path.append(str_path)
             ensure_dir_exists(new)
-            readme = os.path.join(new, 'README')
-            readme_src = os.path.join(get_ipython_package_dir(), u'config', u'profile', 'README')
+            readme = os.path.join(new, "README")
+            readme_src = os.path.join(
+                get_ipython_package_dir(), "config", "profile", "README"
+            )
             if not os.path.exists(readme) and os.path.exists(readme_src):
                 shutil.copy(readme_src, readme)
-            for d in ('extensions', 'nbextensions'):
+            for d in ("extensions", "nbextensions"):
                 path = os.path.join(new, d)
                 try:
                     ensure_dir_exists(path)

From 43c7193695c51122dfdf68bdcab2a2d2c65a4d3d Mon Sep 17 00:00:00 2001
From: 007vedant <raghuvedant00@gmail.com>
Date: Wed, 24 Nov 2021 18:20:40 +0530
Subject: [PATCH 0898/1407] Added custom pprint to pretty print
 collections.UserList like regular lists.  -implemented _userlist_pprint , in
 accordance with pprint of other container types of collections module.

---
 IPython/lib/pretty.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/IPython/lib/pretty.py b/IPython/lib/pretty.py
index 7a18f01c6cd..3a933d2defb 100644
--- a/IPython/lib/pretty.py
+++ b/IPython/lib/pretty.py
@@ -920,10 +920,20 @@ def _counter_pprint(obj, p, cycle):
     else:
         p.pretty(cls_ctor())
 
+
+def _userlist_pprint(obj, p, cycle):
+    cls_ctor = CallExpression.factory(obj.__class__.__name__)
+    if cycle:
+        p.pretty(cls_ctor(RawText("...")))
+    else:
+        p.pretty(cls_ctor(list(obj)))
+
+
 for_type_by_name('collections', 'defaultdict', _defaultdict_pprint)
 for_type_by_name('collections', 'OrderedDict', _ordereddict_pprint)
 for_type_by_name('collections', 'deque', _deque_pprint)
 for_type_by_name('collections', 'Counter', _counter_pprint)
+for_type_by_name("collections", "UserList", _userlist_pprint)
 
 if __name__ == '__main__':
     from random import randrange

From b48dbbb6bbf0e471acd373a3a67a28b910bb29ca Mon Sep 17 00:00:00 2001
From: 007vedant <raghuvedant00@gmail.com>
Date: Sat, 27 Nov 2021 19:31:36 +0530
Subject: [PATCH 0899/1407] Updated _userlist_print with obj.data for
 optimization

---
 IPython/lib/pretty.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/lib/pretty.py b/IPython/lib/pretty.py
index 3a933d2defb..72f143522df 100644
--- a/IPython/lib/pretty.py
+++ b/IPython/lib/pretty.py
@@ -926,7 +926,7 @@ def _userlist_pprint(obj, p, cycle):
     if cycle:
         p.pretty(cls_ctor(RawText("...")))
     else:
-        p.pretty(cls_ctor(list(obj)))
+        p.pretty(cls_ctor(obj.data))
 
 
 for_type_by_name('collections', 'defaultdict', _defaultdict_pprint)

From aca50d203f176c060236720e749f1d83dfe9152c Mon Sep 17 00:00:00 2001
From: 007vedant <raghuvedant00@gmail.com>
Date: Sat, 27 Nov 2021 19:35:50 +0530
Subject: [PATCH 0900/1407] Added test for _userlist_pprint  - all tests passed

---
 IPython/lib/tests/test_pretty.py | 38 +++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py
index 8b8a6ee75f6..ca16924e8f7 100644
--- a/IPython/lib/tests/test_pretty.py
+++ b/IPython/lib/tests/test_pretty.py
@@ -5,7 +5,7 @@
 # Distributed under the terms of the Modified BSD License.
 
 
-from collections import Counter, defaultdict, deque, OrderedDict
+from collections import Counter, defaultdict, deque, OrderedDict, UserList
 import os
 import pytest
 import types
@@ -294,6 +294,42 @@ def type_pprint_wrapper(obj, p, cycle):
     assert type_pprint_wrapper.called is True
 
 
+def test_collections_userlist():
+    # Create userlist with cycle
+    a = UserList()
+    a.append(a)
+
+    cases = [
+        (UserList(), "UserList([])"),
+        (
+            UserList(i for i in range(1000, 1020)),
+            "UserList([1000,\n"
+            "          1001,\n"
+            "          1002,\n"
+            "          1003,\n"
+            "          1004,\n"
+            "          1005,\n"
+            "          1006,\n"
+            "          1007,\n"
+            "          1008,\n"
+            "          1009,\n"
+            "          1010,\n"
+            "          1011,\n"
+            "          1012,\n"
+            "          1013,\n"
+            "          1014,\n"
+            "          1015,\n"
+            "          1016,\n"
+            "          1017,\n"
+            "          1018,\n"
+            "          1019])",
+        ),
+        (a, "UserList([UserList(...)])"),
+    ]
+    for obj, expected in cases:
+        assert pretty.pretty(obj) == expected
+
+
 # TODO : pytest.mark.parametrise once nose is gone.
 def test_collections_defaultdict():
     # Create defaultdicts with cycles

From 967e96ec53b7e50ac3253fa7e26af328978b073a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Dec 2021 15:00:13 -0800
Subject: [PATCH 0901/1407] remove code deprecated since at least IPython 5.0

---
 .github/workflows/test.yml                |  2 +-
 IPython/core/interactiveshell.py          | 57 -----------------------
 IPython/core/tests/test_magic_terminal.py |  6 +--
 IPython/terminal/magics.py                |  9 ++--
 IPython/utils/io.py                       |  5 --
 5 files changed, 8 insertions(+), 71 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2620162c209..898dfe5f8d2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -55,6 +55,6 @@ jobs:
       env:
         COLUMNS: 120
       run: |
-        pytest --color=yes -ra -v --cov --cov-report=xml
+        pytest --color=yes -raXxs --cov --cov-report=xml
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v2
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index a911c3e2e96..b48b572ad17 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -161,13 +161,6 @@ def no_op(*a, **kw):
 class SpaceInInput(Exception): pass
 
 
-def get_default_colors():
-    "DEPRECATED"
-    warn('get_default_color is deprecated since IPython 5.0, and returns `Neutral` on all platforms.',
-        DeprecationWarning, stacklevel=2)
-    return 'Neutral'
-
-
 class SeparateUnicode(Unicode):
     r"""A Unicode subclass to validate separate_in, separate_out, etc.
 
@@ -440,29 +433,6 @@ def input_splitter(self):
         will be displayed as regular output instead."""
     ).tag(config=True)
 
-    # deprecated prompt traits:
-
-    prompt_in1 = Unicode('In [\\#]: ',
-        help="Deprecated since IPython 4.0 and ignored since 5.0, set TerminalInteractiveShell.prompts object directly."
-    ).tag(config=True)
-    prompt_in2 = Unicode('   .\\D.: ',
-        help="Deprecated since IPython 4.0 and ignored since 5.0, set TerminalInteractiveShell.prompts object directly."
-    ).tag(config=True)
-    prompt_out = Unicode('Out[\\#]: ',
-        help="Deprecated since IPython 4.0 and ignored since 5.0, set TerminalInteractiveShell.prompts object directly."
-    ).tag(config=True)
-    prompts_pad_left = Bool(True,
-        help="Deprecated since IPython 4.0 and ignored since 5.0, set TerminalInteractiveShell.prompts object directly."
-    ).tag(config=True)
-
-    @observe('prompt_in1', 'prompt_in2', 'prompt_out', 'prompt_pad_left')
-    def _prompt_trait_changed(self, change):
-        name = change['name']
-        warn("InteractiveShell.{name} is deprecated since IPython 4.0"
-             " and ignored since 5.0, set TerminalInteractiveShell.prompts"
-             " object directly.".format(name=name))
-
-        # protect against weird cases where self.config may not exist:
 
     show_rewritten_input = Bool(True,
         help="Show rewritten input, e.g. for autocall."
@@ -2038,19 +2008,6 @@ def showindentationerror(self):
         the %paste magic."""
         self.showsyntaxerror()
 
-    #-------------------------------------------------------------------------
-    # Things related to readline
-    #-------------------------------------------------------------------------
-
-    def init_readline(self):
-        """DEPRECATED
-
-        Moved to terminal subclass, here only to simplify the init logic."""
-        # Set a number of methods that depend on readline to be no-op
-        warnings.warn('`init_readline` is no-op since IPython 5.0 and is Deprecated',
-                DeprecationWarning, stacklevel=2)
-        self.set_custom_completer = no_op
-
     @skip_doctest
     def set_next_input(self, s, replace=False):
         """ Sets the 'default' input string for the next command line.
@@ -3513,20 +3470,6 @@ def mktempfile(self, data=None, prefix='ipython_edit_'):
             file_path.write_text(data)
         return filename
 
-    @undoc
-    def write(self,data):
-        """DEPRECATED: Write a string to the default output"""
-        warn('InteractiveShell.write() is deprecated, use sys.stdout instead',
-             DeprecationWarning, stacklevel=2)
-        sys.stdout.write(data)
-
-    @undoc
-    def write_err(self,data):
-        """DEPRECATED: Write a string to the default error output"""
-        warn('InteractiveShell.write_err() is deprecated, use sys.stderr instead',
-             DeprecationWarning, stacklevel=2)
-        sys.stderr.write(data)
-
     def ask_yes_no(self, prompt, default=None, interrupt=None):
         if self.quiet:
             return True
diff --git a/IPython/core/tests/test_magic_terminal.py b/IPython/core/tests/test_magic_terminal.py
index d7984280d75..721fd5eda4d 100644
--- a/IPython/core/tests/test_magic_terminal.py
+++ b/IPython/core/tests/test_magic_terminal.py
@@ -149,8 +149,8 @@ def test_paste_email_py(self):
     def test_paste_echo(self):
         "Also test self.paste echoing, by temporarily faking the writer"
         w = StringIO()
-        writer = ip.write
-        ip.write = w.write
+        old_write = sys.stdout.write
+        sys.stdout.write = w.write
         code = """
         a = 100
         b = 200"""
@@ -158,7 +158,7 @@ def test_paste_echo(self):
             self.paste(code,'')
             out = w.getvalue()
         finally:
-            ip.write = writer
+            sys.stdout.write = old_write
         self.assertEqual(ip.user_ns["a"], 100)
         self.assertEqual(ip.user_ns["b"], 200)
         assert out == code + "\n## -- End pasted text --\n"
diff --git a/IPython/terminal/magics.py b/IPython/terminal/magics.py
index 38842231f0d..aef96071f0e 100644
--- a/IPython/terminal/magics.py
+++ b/IPython/terminal/magics.py
@@ -198,11 +198,10 @@ def paste(self, parameter_s=''):
 
         # By default, echo back to terminal unless quiet mode is requested
         if 'q' not in opts:
-            write = self.shell.write
-            write(self.shell.pycolorize(block))
-            if not block.endswith('\n'):
-                write('\n')
-            write("## -- End pasted text --\n")
+            sys.stdout.write(self.shell.pycolorize(block))
+            if not block.endswith("\n"):
+                sys.stdout.write("\n")
+            sys.stdout.write("## -- End pasted text --\n")
 
         self.store_or_execute(block, name)
 
diff --git a/IPython/utils/io.py b/IPython/utils/io.py
index 1600fc32106..638471e8fbb 100644
--- a/IPython/utils/io.py
+++ b/IPython/utils/io.py
@@ -233,11 +233,6 @@ def raw_print_err(*args, **kw):
           file=sys.__stderr__)
     sys.__stderr__.flush()
 
-# used by IPykernel <- 4.9. Removed during IPython 7-dev period and re-added 
-# Keep for a version or two then should remove
-rprint = raw_print
-rprinte = raw_print_err
-
 @undoc
 def unicode_std_stream(stream='stdout'):
     """DEPRECATED, moved to nbconvert.utils.io"""

From 7d4e0677bd43dba83a71d2e48cbd98ab1812639c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Dec 2021 15:43:17 -0800
Subject: [PATCH 0902/1407] Remove all the lib/inputhook logic and related
 files.

1) for terminal ipython hooks are in pt_inputhook,
2) for ipykernel the inputhook are in ipykernel itself.
---
 IPython/lib/inputhook.py                  | 663 ----------------------
 IPython/lib/inputhookglut.py              | 172 ------
 IPython/lib/inputhookgtk.py               |  35 --
 IPython/lib/inputhookgtk3.py              |  34 --
 IPython/lib/inputhookgtk4.py              |  43 --
 IPython/lib/inputhookpyglet.py            | 111 ----
 IPython/lib/inputhookqt4.py               | 180 ------
 IPython/lib/inputhookwx.py                | 167 ------
 codecov.yml                               |   1 -
 examples/IPython Kernel/gui/gui-gtk.py    |  39 --
 examples/IPython Kernel/gui/gui-gtk3.py   |  37 --
 examples/IPython Kernel/gui/gui-pyglet.py |  33 --
 examples/IPython Kernel/gui/gui-tk.py     |  34 --
 examples/IPython Kernel/gui/gui-wx.py     | 106 ----
 pytest.ini                                |   1 -
 15 files changed, 1656 deletions(-)
 delete mode 100644 IPython/lib/inputhook.py
 delete mode 100644 IPython/lib/inputhookglut.py
 delete mode 100644 IPython/lib/inputhookgtk.py
 delete mode 100644 IPython/lib/inputhookgtk3.py
 delete mode 100644 IPython/lib/inputhookgtk4.py
 delete mode 100644 IPython/lib/inputhookpyglet.py
 delete mode 100644 IPython/lib/inputhookqt4.py
 delete mode 100644 IPython/lib/inputhookwx.py
 delete mode 100755 examples/IPython Kernel/gui/gui-gtk.py
 delete mode 100644 examples/IPython Kernel/gui/gui-gtk3.py
 delete mode 100644 examples/IPython Kernel/gui/gui-pyglet.py
 delete mode 100755 examples/IPython Kernel/gui/gui-tk.py
 delete mode 100755 examples/IPython Kernel/gui/gui-wx.py

diff --git a/IPython/lib/inputhook.py b/IPython/lib/inputhook.py
deleted file mode 100644
index 86077d069df..00000000000
--- a/IPython/lib/inputhook.py
+++ /dev/null
@@ -1,663 +0,0 @@
-# coding: utf-8
-"""
-Deprecated since IPython 5.0
-
-Inputhook management for GUI event loop integration.
-"""
-
-# Copyright (c) IPython Development Team.
-# Distributed under the terms of the Modified BSD License.
-
-try:
-    import ctypes
-except ImportError:
-    ctypes = None
-except SystemError: # IronPython issue, 2/8/2014
-    ctypes = None
-import os
-import platform
-import sys
-from distutils.version import LooseVersion as V
-
-from warnings import warn
-
-
-warn("`IPython.lib.inputhook` is deprecated since IPython 5.0 and will be removed in future versions.",
-        DeprecationWarning, stacklevel=2)
-
-
-#-----------------------------------------------------------------------------
-# Constants
-#-----------------------------------------------------------------------------
-
-# Constants for identifying the GUI toolkits.
-GUI_WX = 'wx'
-GUI_QT = 'qt'
-GUI_QT4 = 'qt4'
-GUI_GTK = 'gtk'
-GUI_TK = 'tk'
-GUI_OSX = 'osx'
-GUI_GLUT = 'glut'
-GUI_PYGLET = 'pyglet'
-GUI_GTK3 = 'gtk3'
-GUI_NONE = 'none' # i.e. disable
-
-#-----------------------------------------------------------------------------
-# Utilities
-#-----------------------------------------------------------------------------
-
-def _stdin_ready_posix():
-    """Return True if there's something to read on stdin (posix version)."""
-    infds, outfds, erfds = select.select([sys.stdin],[],[],0)
-    return bool(infds)
-
-def _stdin_ready_nt():
-    """Return True if there's something to read on stdin (nt version)."""
-    return msvcrt.kbhit()
-
-def _stdin_ready_other():
-    """Return True, assuming there's something to read on stdin."""
-    return True
-
-def _use_appnope():
-    """Should we use appnope for dealing with OS X app nap?
-
-    Checks if we are on OS X 10.9 or greater.
-    """
-    return sys.platform == 'darwin' and V(platform.mac_ver()[0]) >= V('10.9')
-
-def _ignore_CTRL_C_posix():
-    """Ignore CTRL+C (SIGINT)."""
-    signal.signal(signal.SIGINT, signal.SIG_IGN)
-
-def _allow_CTRL_C_posix():
-    """Take CTRL+C into account (SIGINT)."""
-    signal.signal(signal.SIGINT, signal.default_int_handler)
-
-def _ignore_CTRL_C_other():
-    """Ignore CTRL+C (not implemented)."""
-    pass
-
-def _allow_CTRL_C_other():
-    """Take CTRL+C into account (not implemented)."""
-    pass
-
-if os.name == 'posix':
-    import select
-    import signal
-    stdin_ready = _stdin_ready_posix
-    ignore_CTRL_C = _ignore_CTRL_C_posix
-    allow_CTRL_C = _allow_CTRL_C_posix
-elif os.name == 'nt':
-    import msvcrt
-    stdin_ready = _stdin_ready_nt
-    ignore_CTRL_C = _ignore_CTRL_C_other
-    allow_CTRL_C = _allow_CTRL_C_other
-else:
-    stdin_ready = _stdin_ready_other
-    ignore_CTRL_C = _ignore_CTRL_C_other
-    allow_CTRL_C = _allow_CTRL_C_other
-
-
-#-----------------------------------------------------------------------------
-# Main InputHookManager class
-#-----------------------------------------------------------------------------
-
-
-class InputHookManager(object):
-    """DEPRECATED since IPython 5.0
-
-    Manage PyOS_InputHook for different GUI toolkits.
-
-    This class installs various hooks under ``PyOSInputHook`` to handle
-    GUI event loop integration.
-    """
-    
-    def __init__(self):
-        if ctypes is None:
-            warn("IPython GUI event loop requires ctypes, %gui will not be available")
-        else:
-            self.PYFUNC = ctypes.PYFUNCTYPE(ctypes.c_int)
-        self.guihooks = {}
-        self.aliases = {}
-        self.apps = {}
-        self._reset()
-
-    def _reset(self):
-        self._callback_pyfunctype = None
-        self._callback = None
-        self._installed = False
-        self._current_gui = None
-
-    def get_pyos_inputhook(self):
-        """DEPRECATED since IPython 5.0
-
-        Return the current PyOS_InputHook as a ctypes.c_void_p."""
-        warn("`get_pyos_inputhook` is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        return ctypes.c_void_p.in_dll(ctypes.pythonapi,"PyOS_InputHook")
-
-    def get_pyos_inputhook_as_func(self):
-        """DEPRECATED since IPython 5.0
-
-        Return the current PyOS_InputHook as a ctypes.PYFUNCYPE."""
-        warn("`get_pyos_inputhook_as_func` is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        return self.PYFUNC.in_dll(ctypes.pythonapi,"PyOS_InputHook")
-
-    def set_inputhook(self, callback):
-        """DEPRECATED since IPython 5.0
-
-        Set PyOS_InputHook to callback and return the previous one."""
-        # On platforms with 'readline' support, it's all too likely to
-        # have a KeyboardInterrupt signal delivered *even before* an
-        # initial ``try:`` clause in the callback can be executed, so
-        # we need to disable CTRL+C in this situation.
-        ignore_CTRL_C()
-        self._callback = callback
-        self._callback_pyfunctype = self.PYFUNC(callback)
-        pyos_inputhook_ptr = self.get_pyos_inputhook()
-        original = self.get_pyos_inputhook_as_func()
-        pyos_inputhook_ptr.value = \
-            ctypes.cast(self._callback_pyfunctype, ctypes.c_void_p).value
-        self._installed = True
-        return original
-
-    def clear_inputhook(self, app=None):
-        """DEPRECATED since IPython 5.0
-
-        Set PyOS_InputHook to NULL and return the previous one.
-
-        Parameters
-        ----------
-        app : optional, ignored
-          This parameter is allowed only so that clear_inputhook() can be
-          called with a similar interface as all the ``enable_*`` methods.  But
-          the actual value of the parameter is ignored.  This uniform interface
-          makes it easier to have user-level entry points in the main IPython
-          app like :meth:`enable_gui`."""
-        warn("`clear_inputhook` is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        pyos_inputhook_ptr = self.get_pyos_inputhook()
-        original = self.get_pyos_inputhook_as_func()
-        pyos_inputhook_ptr.value = ctypes.c_void_p(None).value
-        allow_CTRL_C()
-        self._reset()
-        return original
-
-    def clear_app_refs(self, gui=None):
-        """DEPRECATED since IPython 5.0
-
-        Clear IPython's internal reference to an application instance.
-
-        Whenever we create an app for a user on qt4 or wx, we hold a
-        reference to the app.  This is needed because in some cases bad things
-        can happen if a user doesn't hold a reference themselves.  This
-        method is provided to clear the references we are holding.
-
-        Parameters
-        ----------
-        gui : None or str
-            If None, clear all app references.  If ('wx', 'qt4') clear
-            the app for that toolkit.  References are not held for gtk or tk
-            as those toolkits don't have the notion of an app.
-        """
-        warn("`clear_app_refs` is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        if gui is None:
-            self.apps = {}
-        elif gui in self.apps:
-            del self.apps[gui]
-
-    def register(self, toolkitname, *aliases):
-        """DEPRECATED since IPython 5.0
-
-        Register a class to provide the event loop for a given GUI.
-        
-        This is intended to be used as a class decorator. It should be passed
-        the names with which to register this GUI integration. The classes
-        themselves should subclass :class:`InputHookBase`.
-        
-        ::
-        
-            @inputhook_manager.register('qt')
-            class QtInputHook(InputHookBase):
-                def enable(self, app=None):
-                    ...
-        """
-        warn("`register` is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        def decorator(cls):
-            if ctypes is not None:
-                inst = cls(self)
-                self.guihooks[toolkitname] = inst
-                for a in aliases:
-                    self.aliases[a] = toolkitname
-            return cls
-        return decorator
-
-    def current_gui(self):
-        """DEPRECATED since IPython 5.0
-
-        Return a string indicating the currently active GUI or None."""
-        warn("`current_gui` is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        return self._current_gui
-
-    def enable_gui(self, gui=None, app=None):
-        """DEPRECATED since IPython 5.0
-
-        Switch amongst GUI input hooks by name.
-
-        This is a higher level method than :meth:`set_inputhook` - it uses the
-        GUI name to look up a registered object which enables the input hook
-        for that GUI.
-
-        Parameters
-        ----------
-        gui : optional, string or None
-          If None (or 'none'), clears input hook, otherwise it must be one
-          of the recognized GUI names (see ``GUI_*`` constants in module).
-
-        app : optional, existing application object.
-          For toolkits that have the concept of a global app, you can supply an
-          existing one.  If not given, the toolkit will be probed for one, and if
-          none is found, a new one will be created.  Note that GTK does not have
-          this concept, and passing an app if ``gui=="GTK"`` will raise an error.
-
-        Returns
-        -------
-        The output of the underlying gui switch routine, typically the actual
-        PyOS_InputHook wrapper object or the GUI toolkit app created, if there was
-        one.
-        """
-        warn("`enable_gui` is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        if gui in (None, GUI_NONE):
-            return self.disable_gui()
-        
-        if gui in self.aliases:
-            return self.enable_gui(self.aliases[gui], app)
-        
-        try:
-            gui_hook = self.guihooks[gui]
-        except KeyError as e:
-            e = "Invalid GUI request {!r}, valid ones are: {}"
-            raise ValueError(e.format(gui, ', '.join(self.guihooks))) from e
-        self._current_gui = gui
-
-        app = gui_hook.enable(app)
-        if app is not None:
-            app._in_event_loop = True
-            self.apps[gui] = app
-        return app
-
-    def disable_gui(self):
-        """DEPRECATED since IPython 5.0
-
-        Disable GUI event loop integration.
-        
-        If an application was registered, this sets its ``_in_event_loop``
-        attribute to False. It then calls :meth:`clear_inputhook`.
-        """
-        warn("`disable_gui` is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        gui = self._current_gui
-        if gui in self.apps:
-            self.apps[gui]._in_event_loop = False
-        return self.clear_inputhook()
-
-class InputHookBase(object):
-    """DEPRECATED since IPython 5.0
-
-    Base class for input hooks for specific toolkits.
-    
-    Subclasses should define an :meth:`enable` method with one argument, ``app``,
-    which will either be an instance of the toolkit's application class, or None.
-    They may also define a :meth:`disable` method with no arguments.
-    """
-    def __init__(self, manager):
-        self.manager = manager
-
-    def disable(self):
-        pass
-
-inputhook_manager = InputHookManager()
-
-@inputhook_manager.register('osx')
-class NullInputHook(InputHookBase):
-    """DEPRECATED since IPython 5.0
-
-    A null inputhook that doesn't need to do anything"""
-    def enable(self, app=None):
-        warn("This function is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-
-@inputhook_manager.register('wx')
-class WxInputHook(InputHookBase):
-    def enable(self, app=None):
-        """DEPRECATED since IPython 5.0
-
-        Enable event loop integration with wxPython.
-
-        Parameters
-        ----------
-        app : WX Application, optional.
-            Running application to use.  If not given, we probe WX for an
-            existing application object, and create a new one if none is found.
-
-        Notes
-        -----
-        This methods sets the ``PyOS_InputHook`` for wxPython, which allows
-        the wxPython to integrate with terminal based applications like
-        IPython.
-
-        If ``app`` is not given we probe for an existing one, and return it if
-        found.  If no existing app is found, we create an :class:`wx.App` as
-        follows::
-
-            import wx
-            app = wx.App(redirect=False, clearSigInt=False)
-        """
-        warn("This function is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        import wx
-        
-        wx_version = V(wx.__version__).version
-        
-        if wx_version < [2, 8]:
-            raise ValueError("requires wxPython >= 2.8, but you have %s" % wx.__version__)
-        
-        from IPython.lib.inputhookwx import inputhook_wx
-        self.manager.set_inputhook(inputhook_wx)
-        if _use_appnope():
-            from appnope import nope
-            nope()
-
-        import wx
-        if app is None:
-            app = wx.GetApp()
-        if app is None:
-            app = wx.App(redirect=False, clearSigInt=False)
-
-        return app
-
-    def disable(self):
-        """DEPRECATED since IPython 5.0
-
-        Disable event loop integration with wxPython.
-
-        This restores appnapp on OS X
-        """
-        warn("This function is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        if _use_appnope():
-            from appnope import nap
-            nap()
-
-@inputhook_manager.register('qt', 'qt4')
-class Qt4InputHook(InputHookBase):
-    def enable(self, app=None):
-        """DEPRECATED since IPython 5.0
-
-        Enable event loop integration with PyQt4.
-        
-        Parameters
-        ----------
-        app : Qt Application, optional.
-            Running application to use.  If not given, we probe Qt for an
-            existing application object, and create a new one if none is found.
-
-        Notes
-        -----
-        This methods sets the PyOS_InputHook for PyQt4, which allows
-        the PyQt4 to integrate with terminal based applications like
-        IPython.
-
-        If ``app`` is not given we probe for an existing one, and return it if
-        found.  If no existing app is found, we create an :class:`QApplication`
-        as follows::
-
-            from PyQt4 import QtCore
-            app = QtGui.QApplication(sys.argv)
-        """
-        warn("This function is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        from IPython.lib.inputhookqt4 import create_inputhook_qt4
-        app, inputhook_qt4 = create_inputhook_qt4(self.manager, app)
-        self.manager.set_inputhook(inputhook_qt4)
-        if _use_appnope():
-            from appnope import nope
-            nope()
-
-        return app
-
-    def disable_qt4(self):
-        """DEPRECATED since IPython 5.0
-
-        Disable event loop integration with PyQt4.
-
-        This restores appnapp on OS X
-        """
-        warn("This function is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        if _use_appnope():
-            from appnope import nap
-            nap()
-
-
-@inputhook_manager.register('qt5')
-class Qt5InputHook(Qt4InputHook):
-    def enable(self, app=None):
-        warn("This function is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        os.environ['QT_API'] = 'pyqt5'
-        return Qt4InputHook.enable(self, app)
-
-
-@inputhook_manager.register('gtk')
-class GtkInputHook(InputHookBase):
-    def enable(self, app=None):
-        """DEPRECATED since IPython 5.0
-
-        Enable event loop integration with PyGTK.
-
-        Parameters
-        ----------
-        app : ignored
-           Ignored, it's only a placeholder to keep the call signature of all
-           gui activation methods consistent, which simplifies the logic of
-           supporting magics.
-
-        Notes
-        -----
-        This methods sets the PyOS_InputHook for PyGTK, which allows
-        the PyGTK to integrate with terminal based applications like
-        IPython.
-        """
-        warn("This function is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        import gtk
-        try:
-            gtk.set_interactive(True)
-        except AttributeError:
-            # For older versions of gtk, use our own ctypes version
-            from IPython.lib.inputhookgtk import inputhook_gtk
-            self.manager.set_inputhook(inputhook_gtk)
-
-
-@inputhook_manager.register('tk')
-class TkInputHook(InputHookBase):
-    def enable(self, app=None):
-        """DEPRECATED since IPython 5.0
-
-        Enable event loop integration with Tk.
-
-        Parameters
-        ----------
-        app : toplevel :class:`Tkinter.Tk` widget, optional.
-            Running toplevel widget to use.  If not given, we probe Tk for an
-            existing one, and create a new one if none is found.
-
-        Notes
-        -----
-        If you have already created a :class:`Tkinter.Tk` object, the only
-        thing done by this method is to register with the
-        :class:`InputHookManager`, since creating that object automatically
-        sets ``PyOS_InputHook``.
-        """
-        warn("This function is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        if app is None:
-            from tkinter import Tk
-            app = Tk()
-            app.withdraw()
-            self.manager.apps[GUI_TK] = app
-            return app
-
-
-@inputhook_manager.register('glut')
-class GlutInputHook(InputHookBase):
-    def enable(self, app=None):
-        """DEPRECATED since IPython 5.0
-
-        Enable event loop integration with GLUT.
-
-        Parameters
-        ----------
-
-        app : ignored
-            Ignored, it's only a placeholder to keep the call signature of all
-            gui activation methods consistent, which simplifies the logic of
-            supporting magics.
-
-        Notes
-        -----
-
-        This methods sets the PyOS_InputHook for GLUT, which allows the GLUT to
-        integrate with terminal based applications like IPython. Due to GLUT
-        limitations, it is currently not possible to start the event loop
-        without first creating a window. You should thus not create another
-        window but use instead the created one. See 'gui-glut.py' in the
-        docs/examples/lib directory.
-        
-        The default screen mode is set to:
-        glut.GLUT_DOUBLE | glut.GLUT_RGBA | glut.GLUT_DEPTH
-        """
-        warn("This function is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-
-        import OpenGL.GLUT as glut
-        from IPython.lib.inputhookglut import glut_display_mode, \
-                                              glut_close, glut_display, \
-                                              glut_idle, inputhook_glut
-
-        if GUI_GLUT not in self.manager.apps:
-            glut.glutInit( sys.argv )
-            glut.glutInitDisplayMode( glut_display_mode )
-            # This is specific to freeglut
-            if bool(glut.glutSetOption):
-                glut.glutSetOption( glut.GLUT_ACTION_ON_WINDOW_CLOSE,
-                                    glut.GLUT_ACTION_GLUTMAINLOOP_RETURNS )
-            glut.glutCreateWindow( sys.argv[0] )
-            glut.glutReshapeWindow( 1, 1 )
-            glut.glutHideWindow( )
-            glut.glutWMCloseFunc( glut_close )
-            glut.glutDisplayFunc( glut_display )
-            glut.glutIdleFunc( glut_idle )
-        else:
-            glut.glutWMCloseFunc( glut_close )
-            glut.glutDisplayFunc( glut_display )
-            glut.glutIdleFunc( glut_idle)
-        self.manager.set_inputhook( inputhook_glut )
-
-
-    def disable(self):
-        """DEPRECATED since IPython 5.0
-
-        Disable event loop integration with glut.
-        
-        This sets PyOS_InputHook to NULL and set the display function to a
-        dummy one and set the timer to a dummy timer that will be triggered
-        very far in the future.
-        """
-        warn("This function is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        import OpenGL.GLUT as glut
-        from glut_support import glutMainLoopEvent
-
-        glut.glutHideWindow() # This is an event to be processed below
-        glutMainLoopEvent()
-        super(GlutInputHook, self).disable()
-
-@inputhook_manager.register('pyglet')
-class PygletInputHook(InputHookBase):
-    def enable(self, app=None):
-        """DEPRECATED since IPython 5.0
-
-        Enable event loop integration with pyglet.
-
-        Parameters
-        ----------
-        app : ignored
-           Ignored, it's only a placeholder to keep the call signature of all
-           gui activation methods consistent, which simplifies the logic of
-           supporting magics.
-
-        Notes
-        -----
-        This methods sets the ``PyOS_InputHook`` for pyglet, which allows
-        pyglet to integrate with terminal based applications like
-        IPython.
-
-        """
-        warn("This function is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        from IPython.lib.inputhookpyglet import inputhook_pyglet
-        self.manager.set_inputhook(inputhook_pyglet)
-        return app
-
-
-@inputhook_manager.register('gtk3')
-class Gtk3InputHook(InputHookBase):
-    def enable(self, app=None):
-        """DEPRECATED since IPython 5.0
-
-        Enable event loop integration with Gtk3 (gir bindings).
-
-        Parameters
-        ----------
-        app : ignored
-           Ignored, it's only a placeholder to keep the call signature of all
-           gui activation methods consistent, which simplifies the logic of
-           supporting magics.
-
-        Notes
-        -----
-        This methods sets the PyOS_InputHook for Gtk3, which allows
-        the Gtk3 to integrate with terminal based applications like
-        IPython.
-        """
-        warn("This function is deprecated since IPython 5.0 and will be removed in future versions.",
-                DeprecationWarning, stacklevel=2)
-        from IPython.lib.inputhookgtk3 import inputhook_gtk3
-        self.manager.set_inputhook(inputhook_gtk3)
-
-
-clear_inputhook = inputhook_manager.clear_inputhook
-set_inputhook = inputhook_manager.set_inputhook
-current_gui = inputhook_manager.current_gui
-clear_app_refs = inputhook_manager.clear_app_refs
-enable_gui = inputhook_manager.enable_gui
-disable_gui = inputhook_manager.disable_gui
-register = inputhook_manager.register
-guis = inputhook_manager.guihooks
-
-
-def _deprecated_disable():
-    warn("This function is deprecated since IPython 4.0 use disable_gui() instead",
-            DeprecationWarning, stacklevel=2)
-    inputhook_manager.disable_gui()
-    
-disable_wx = disable_qt4 = disable_gtk = disable_gtk3 = disable_glut = \
-        disable_pyglet = disable_osx = _deprecated_disable
diff --git a/IPython/lib/inputhookglut.py b/IPython/lib/inputhookglut.py
deleted file mode 100644
index e866ebdb82c..00000000000
--- a/IPython/lib/inputhookglut.py
+++ /dev/null
@@ -1,172 +0,0 @@
-# coding: utf-8
-"""
-GLUT Inputhook support functions
-"""
-
-#-----------------------------------------------------------------------------
-#  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.
-#-----------------------------------------------------------------------------
-
-# GLUT is quite an old library and it is difficult to ensure proper
-# integration within IPython since original GLUT does not allow to handle
-# events one by one. Instead, it requires for the mainloop to be entered
-# and never returned (there is not even a function to exit he
-# mainloop). Fortunately, there are alternatives such as freeglut
-# (available for linux and windows) and the OSX implementation gives
-# access to a glutCheckLoop() function that blocks itself until a new
-# event is received. This means we have to setup the idle callback to
-# ensure we got at least one event that will unblock the function.
-#
-# Furthermore, it is not possible to install these handlers without a window
-# being first created. We choose to make this window invisible. This means that
-# display mode options are set at this level and user won't be able to change
-# them later without modifying the code. This should probably be made available
-# via IPython options system.
-
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
-import os
-import sys
-import time
-import signal
-import OpenGL.GLUT as glut
-import OpenGL.platform as platform
-from timeit import default_timer as clock
-
-#-----------------------------------------------------------------------------
-# Constants
-#-----------------------------------------------------------------------------
-
-# Frame per second : 60
-# Should probably be an IPython option
-glut_fps = 60
-
-
-# Display mode : double buffeed + rgba + depth
-# Should probably be an IPython option
-glut_display_mode = (glut.GLUT_DOUBLE |
-                     glut.GLUT_RGBA   |
-                     glut.GLUT_DEPTH)
-
-glutMainLoopEvent = None
-if sys.platform == 'darwin':
-    try:
-        glutCheckLoop = platform.createBaseFunction(
-            'glutCheckLoop', dll=platform.GLUT, resultType=None,
-            argTypes=[],
-            doc='glutCheckLoop(  ) -> None',
-            argNames=(),
-            )
-    except AttributeError as e:
-        raise RuntimeError(
-            '''Your glut implementation does not allow interactive sessions. '''
-            '''Consider installing freeglut.''') from e
-    glutMainLoopEvent = glutCheckLoop
-elif glut.HAVE_FREEGLUT:
-    glutMainLoopEvent = glut.glutMainLoopEvent
-else:
-    raise RuntimeError(
-        '''Your glut implementation does not allow interactive sessions. '''
-        '''Consider installing freeglut.''')
-
-
-#-----------------------------------------------------------------------------
-# Platform-dependent imports and functions
-#-----------------------------------------------------------------------------
-
-if os.name == 'posix':
-    import select
-
-    def stdin_ready():
-        infds, outfds, erfds = select.select([sys.stdin],[],[],0)
-        if infds:
-            return True
-        else:
-            return False
-
-elif sys.platform == 'win32':
-    import msvcrt
-
-    def stdin_ready():
-        return msvcrt.kbhit()
-
-#-----------------------------------------------------------------------------
-# Callback functions
-#-----------------------------------------------------------------------------
-
-def glut_display():
-    # Dummy display function
-    pass
-
-def glut_idle():
-    # Dummy idle function
-    pass
-
-def glut_close():
-    # Close function only hides the current window
-    glut.glutHideWindow()
-    glutMainLoopEvent()
-
-def glut_int_handler(signum, frame):
-    # Catch sigint and print the default message
-    signal.signal(signal.SIGINT, signal.default_int_handler)
-    print('\nKeyboardInterrupt')
-    # Need to reprint the prompt at this stage
-
-
-
-#-----------------------------------------------------------------------------
-# Code
-#-----------------------------------------------------------------------------
-def inputhook_glut():
-    """Run the pyglet event loop by processing pending events only.
-
-    This keeps processing pending events until stdin is ready.  After
-    processing all pending events, a call to time.sleep is inserted.  This is
-    needed, otherwise, CPU usage is at 100%.  This sleep time should be tuned
-    though for best performance.
-    """
-    # We need to protect against a user pressing Control-C when IPython is
-    # idle and this is running. We trap KeyboardInterrupt and pass.
-
-    signal.signal(signal.SIGINT, glut_int_handler)
-
-    try:
-        t = clock()
-
-        # Make sure the default window is set after a window has been closed
-        if glut.glutGetWindow() == 0:
-            glut.glutSetWindow( 1 )
-            glutMainLoopEvent()
-            return 0
-
-        while not stdin_ready():
-            glutMainLoopEvent()
-            # We need to sleep at this point to keep the idle CPU load
-            # low.  However, if sleep to long, GUI response is poor.  As
-            # a compromise, we watch how often GUI events are being processed
-            # and switch between a short and long sleep time.  Here are some
-            # stats useful in helping to tune this.
-            # time    CPU load
-            # 0.001   13%
-            # 0.005   3%
-            # 0.01    1.5%
-            # 0.05    0.5%
-            used_time = clock() - t
-            if used_time > 10.0:
-                # print 'Sleep for 1 s'  # dbg
-                time.sleep(1.0)
-            elif used_time > 0.1:
-                # Few GUI events coming in, so we can sleep longer
-                # print 'Sleep for 0.05 s'  # dbg
-                time.sleep(0.05)
-            else:
-                # Many GUI events coming in, so sleep only very little
-                time.sleep(0.001)
-    except KeyboardInterrupt:
-        pass
-    return 0
diff --git a/IPython/lib/inputhookgtk.py b/IPython/lib/inputhookgtk.py
deleted file mode 100644
index 98569f54d75..00000000000
--- a/IPython/lib/inputhookgtk.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# encoding: utf-8
-"""
-Enable pygtk to be used interactively by setting PyOS_InputHook.
-
-Authors: Brian Granger
-"""
-
-#-----------------------------------------------------------------------------
-#  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
-#-----------------------------------------------------------------------------
-
-import sys
-import gtk, gobject
-
-#-----------------------------------------------------------------------------
-# Code
-#-----------------------------------------------------------------------------
-
-
-def _main_quit(*args, **kwargs):
-    gtk.main_quit()
-    return False
-
-def inputhook_gtk():
-    gobject.io_add_watch(sys.stdin, gobject.IO_IN, _main_quit)
-    gtk.main()
-    return 0
-
diff --git a/IPython/lib/inputhookgtk3.py b/IPython/lib/inputhookgtk3.py
deleted file mode 100644
index b797e862558..00000000000
--- a/IPython/lib/inputhookgtk3.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# encoding: utf-8
-"""
-Enable Gtk3 to be used interactively by IPython.
-
-Authors: Thomi Richards
-"""
-#-----------------------------------------------------------------------------
-# Copyright (c) 2012, the IPython Development Team.
-#
-# Distributed under the terms of the Modified BSD License.
-#
-# The full license is in the file COPYING.txt, distributed with this software.
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
-
-import sys
-from gi.repository import Gtk, GLib
-
-#-----------------------------------------------------------------------------
-# Code
-#-----------------------------------------------------------------------------
-
-def _main_quit(*args, **kwargs):
-    Gtk.main_quit()
-    return False
-
-
-def inputhook_gtk3():
-    GLib.io_add_watch(sys.stdin, GLib.PRIORITY_DEFAULT, GLib.IO_IN, _main_quit)
-    Gtk.main()
-    return 0
diff --git a/IPython/lib/inputhookgtk4.py b/IPython/lib/inputhookgtk4.py
deleted file mode 100644
index a872cee36a0..00000000000
--- a/IPython/lib/inputhookgtk4.py
+++ /dev/null
@@ -1,43 +0,0 @@
-"""
-Enable Gtk4 to be used interactively by IPython.
-"""
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, the IPython Development Team.
-#
-# Distributed under the terms of the Modified BSD License.
-#
-# The full license is in the file COPYING.txt, distributed with this software.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Imports
-# -----------------------------------------------------------------------------
-
-import sys
-
-from gi.repository import GLib
-
-# -----------------------------------------------------------------------------
-# Code
-# -----------------------------------------------------------------------------
-
-
-class _InputHook:
-    def __init__(self, context):
-        self._quit = False
-        GLib.io_add_watch(sys.stdin, GLib.PRIORITY_DEFAULT, GLib.IO_IN, self.quit)
-
-    def quit(self, *args, **kwargs):
-        self._quit = True
-        return False
-
-    def run(self):
-        context = GLib.MainContext.default()
-        while not self._quit:
-            context.iteration(True)
-
-
-def inputhook_gtk4():
-    hook = _InputHook()
-    hook.run()
-    return 0
diff --git a/IPython/lib/inputhookpyglet.py b/IPython/lib/inputhookpyglet.py
deleted file mode 100644
index fb91ffed177..00000000000
--- a/IPython/lib/inputhookpyglet.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# encoding: utf-8
-"""
-Enable pyglet to be used interactively by setting PyOS_InputHook.
-
-Authors
--------
-
-* Nicolas P. Rougier
-* Fernando Perez
-"""
-
-#-----------------------------------------------------------------------------
-#  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
-#-----------------------------------------------------------------------------
-
-import os
-import sys
-import time
-from timeit import default_timer as clock
-import pyglet
-
-#-----------------------------------------------------------------------------
-# Platform-dependent imports and functions
-#-----------------------------------------------------------------------------
-
-if os.name == 'posix':
-    import select
-
-    def stdin_ready():
-        infds, outfds, erfds = select.select([sys.stdin],[],[],0)
-        if infds:
-            return True
-        else:
-            return False
-
-elif sys.platform == 'win32':
-    import msvcrt
-
-    def stdin_ready():
-        return msvcrt.kbhit()
-
-
-# On linux only, window.flip() has a bug that causes an AttributeError on
-# window close.  For details, see:
-# http://groups.google.com/group/pyglet-users/browse_thread/thread/47c1aab9aa4a3d23/c22f9e819826799e?#c22f9e819826799e
-
-if sys.platform.startswith('linux'):
-    def flip(window):
-        try:
-            window.flip()
-        except AttributeError:
-            pass
-else:
-    def flip(window):
-        window.flip()
-
-#-----------------------------------------------------------------------------
-# Code
-#-----------------------------------------------------------------------------
-
-def inputhook_pyglet():
-    """Run the pyglet event loop by processing pending events only.
-
-    This keeps processing pending events until stdin is ready.  After
-    processing all pending events, a call to time.sleep is inserted.  This is
-    needed, otherwise, CPU usage is at 100%.  This sleep time should be tuned
-    though for best performance.
-    """
-    # We need to protect against a user pressing Control-C when IPython is
-    # idle and this is running. We trap KeyboardInterrupt and pass.
-    try:
-        t = clock()
-        while not stdin_ready():
-            pyglet.clock.tick()
-            for window in pyglet.app.windows:
-                window.switch_to()
-                window.dispatch_events()
-                window.dispatch_event('on_draw')
-                flip(window)
-
-            # We need to sleep at this point to keep the idle CPU load
-            # low.  However, if sleep to long, GUI response is poor.  As
-            # a compromise, we watch how often GUI events are being processed
-            # and switch between a short and long sleep time.  Here are some
-            # stats useful in helping to tune this.
-            # time    CPU load
-            # 0.001   13%
-            # 0.005   3%
-            # 0.01    1.5%
-            # 0.05    0.5%
-            used_time = clock() - t
-            if used_time > 10.0:
-                # print 'Sleep for 1 s'  # dbg
-                time.sleep(1.0)
-            elif used_time > 0.1:
-                # Few GUI events coming in, so we can sleep longer
-                # print 'Sleep for 0.05 s'  # dbg
-                time.sleep(0.05)
-            else:
-                # Many GUI events coming in, so sleep only very little
-                time.sleep(0.001)
-    except KeyboardInterrupt:
-        pass
-    return 0
diff --git a/IPython/lib/inputhookqt4.py b/IPython/lib/inputhookqt4.py
deleted file mode 100644
index 8a83902fc0e..00000000000
--- a/IPython/lib/inputhookqt4.py
+++ /dev/null
@@ -1,180 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Qt4's inputhook support function
-
-Author: Christian Boos
-"""
-
-#-----------------------------------------------------------------------------
-#  Copyright (C) 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
-#-----------------------------------------------------------------------------
-
-import os
-import signal
-import threading
-
-from IPython.core.interactiveshell import InteractiveShell
-from IPython.external.qt_for_kernel import QtCore, QtGui
-from IPython.lib.inputhook import allow_CTRL_C, ignore_CTRL_C, stdin_ready
-
-#-----------------------------------------------------------------------------
-# Module Globals
-#-----------------------------------------------------------------------------
-
-got_kbdint = False
-sigint_timer = None
-
-#-----------------------------------------------------------------------------
-# Code
-#-----------------------------------------------------------------------------
-
-def create_inputhook_qt4(mgr, app=None):
-    """Create an input hook for running the Qt4 application event loop.
-
-    Parameters
-    ----------
-    mgr : an InputHookManager
-
-    app : Qt Application, optional.
-        Running application to use.  If not given, we probe Qt for an
-        existing application object, and create a new one if none is found.
-
-    Returns
-    -------
-    A pair consisting of a Qt Application (either the one given or the
-    one found or created) and a inputhook.
-
-    Notes
-    -----
-    We use a custom input hook instead of PyQt4's default one, as it
-    interacts better with the readline packages (issue #481).
-
-    The inputhook function works in tandem with a 'pre_prompt_hook'
-    which automatically restores the hook as an inputhook in case the
-    latter has been temporarily disabled after having intercepted a
-    KeyboardInterrupt.
-    """
-
-    if app is None:
-        app = QtCore.QCoreApplication.instance()
-        if app is None:
-            app = QtGui.QApplication([" "])
-
-    # Re-use previously created inputhook if any
-    ip = InteractiveShell.instance()
-    if hasattr(ip, '_inputhook_qt4'):
-        return app, ip._inputhook_qt4
-
-    # Otherwise create the inputhook_qt4/preprompthook_qt4 pair of
-    # hooks (they both share the got_kbdint flag)
-
-    def inputhook_qt4():
-        """PyOS_InputHook python hook for Qt4.
-
-        Process pending Qt events and if there's no pending keyboard
-        input, spend a short slice of time (50ms) running the Qt event
-        loop.
-
-        As a Python ctypes callback can't raise an exception, we catch
-        the KeyboardInterrupt and temporarily deactivate the hook,
-        which will let a *second* CTRL+C be processed normally and go
-        back to a clean prompt line.
-        """
-        try:
-            allow_CTRL_C()
-            app = QtCore.QCoreApplication.instance()
-            if not app: # shouldn't happen, but safer if it happens anyway...
-                return 0
-            app.processEvents(QtCore.QEventLoop.AllEvents, 300)
-            if not stdin_ready():
-                # Generally a program would run QCoreApplication::exec()
-                # from main() to enter and process the Qt event loop until
-                # quit() or exit() is called and the program terminates.
-                #
-                # For our input hook integration, we need to repeatedly
-                # enter and process the Qt event loop for only a short
-                # amount of time (say 50ms) to ensure that Python stays
-                # responsive to other user inputs.
-                #
-                # A naive approach would be to repeatedly call
-                # QCoreApplication::exec(), using a timer to quit after a
-                # short amount of time. Unfortunately, QCoreApplication
-                # emits an aboutToQuit signal before stopping, which has
-                # the undesirable effect of closing all modal windows.
-                #
-                # To work around this problem, we instead create a
-                # QEventLoop and call QEventLoop::exec(). Other than
-                # setting some state variables which do not seem to be
-                # used anywhere, the only thing QCoreApplication adds is
-                # the aboutToQuit signal which is precisely what we are
-                # trying to avoid.
-                timer = QtCore.QTimer()
-                event_loop = QtCore.QEventLoop()
-                timer.timeout.connect(event_loop.quit)
-                while not stdin_ready():
-                    timer.start(50)
-                    event_loop.exec_()
-                    timer.stop()
-        except KeyboardInterrupt:
-            global got_kbdint, sigint_timer
-
-            ignore_CTRL_C()
-            got_kbdint = True
-            mgr.clear_inputhook()
-
-            # This generates a second SIGINT so the user doesn't have to
-            # press CTRL+C twice to get a clean prompt.
-            #
-            # Since we can't catch the resulting KeyboardInterrupt here
-            # (because this is a ctypes callback), we use a timer to
-            # generate the SIGINT after we leave this callback.
-            #
-            # Unfortunately this doesn't work on Windows (SIGINT kills
-            # Python and CTRL_C_EVENT doesn't work).
-            if(os.name == 'posix'):
-                pid = os.getpid()
-                if(not sigint_timer):
-                    sigint_timer = threading.Timer(.01, os.kill,
-                                         args=[pid, signal.SIGINT] )
-                    sigint_timer.start()
-            else:
-                print("\nKeyboardInterrupt - Ctrl-C again for new prompt")
-
-
-        except: # NO exceptions are allowed to escape from a ctypes callback
-            ignore_CTRL_C()
-            from traceback import print_exc
-            print_exc()
-            print("Got exception from inputhook_qt4, unregistering.")
-            mgr.clear_inputhook()
-        finally:
-            allow_CTRL_C()
-        return 0
-
-    def preprompthook_qt4(ishell):
-        """'pre_prompt_hook' used to restore the Qt4 input hook
-
-        (in case the latter was temporarily deactivated after a
-        CTRL+C)
-        """
-        global got_kbdint, sigint_timer
-
-        if(sigint_timer):
-            sigint_timer.cancel()
-            sigint_timer = None
-
-        if got_kbdint:
-            mgr.set_inputhook(inputhook_qt4)
-        got_kbdint = False
-
-    ip._inputhook_qt4 = inputhook_qt4
-    ip.set_hook('pre_prompt_hook', preprompthook_qt4)
-
-    return app, inputhook_qt4
diff --git a/IPython/lib/inputhookwx.py b/IPython/lib/inputhookwx.py
deleted file mode 100644
index 60520a299c3..00000000000
--- a/IPython/lib/inputhookwx.py
+++ /dev/null
@@ -1,167 +0,0 @@
-# encoding: utf-8
-
-"""
-Enable wxPython to be used interactively by setting PyOS_InputHook.
-
-Authors:  Robin Dunn, Brian Granger, Ondrej Certik
-"""
-
-#-----------------------------------------------------------------------------
-#  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
-#-----------------------------------------------------------------------------
-
-import sys
-import signal
-import time
-from timeit import default_timer as clock
-import wx
-
-from IPython.lib.inputhook import stdin_ready
-
-
-#-----------------------------------------------------------------------------
-# Code
-#-----------------------------------------------------------------------------
-
-def inputhook_wx1():
-    """Run the wx event loop by processing pending events only.
-
-    This approach seems to work, but its performance is not great as it
-    relies on having PyOS_InputHook called regularly.
-    """
-    try:
-        app = wx.GetApp()
-        if app is not None:
-            assert wx.Thread_IsMain()
-
-            # Make a temporary event loop and process system events until
-            # there are no more waiting, then allow idle events (which
-            # will also deal with pending or posted wx events.)
-            evtloop = wx.EventLoop()
-            ea = wx.EventLoopActivator(evtloop)
-            while evtloop.Pending():
-                evtloop.Dispatch()
-            app.ProcessIdle()
-            del ea
-    except KeyboardInterrupt:
-        pass
-    return 0
-
-class EventLoopTimer(wx.Timer):
-
-    def __init__(self, func):
-        self.func = func
-        wx.Timer.__init__(self)
-
-    def Notify(self):
-        self.func()
-
-class EventLoopRunner(object):
-
-    def Run(self, time):
-        self.evtloop = wx.EventLoop()
-        self.timer = EventLoopTimer(self.check_stdin)
-        self.timer.Start(time)
-        self.evtloop.Run()
-
-    def check_stdin(self):
-        if stdin_ready():
-            self.timer.Stop()
-            self.evtloop.Exit()
-
-def inputhook_wx2():
-    """Run the wx event loop, polling for stdin.
-
-    This version runs the wx eventloop for an undetermined amount of time,
-    during which it periodically checks to see if anything is ready on
-    stdin.  If anything is ready on stdin, the event loop exits.
-
-    The argument to elr.Run controls how often the event loop looks at stdin.
-    This determines the responsiveness at the keyboard.  A setting of 1000
-    enables a user to type at most 1 char per second.  I have found that a
-    setting of 10 gives good keyboard response.  We can shorten it further,
-    but eventually performance would suffer from calling select/kbhit too
-    often.
-    """
-    try:
-        app = wx.GetApp()
-        if app is not None:
-            assert wx.Thread_IsMain()
-            elr = EventLoopRunner()
-            # As this time is made shorter, keyboard response improves, but idle
-            # CPU load goes up.  10 ms seems like a good compromise.
-            elr.Run(time=10)  # CHANGE time here to control polling interval
-    except KeyboardInterrupt:
-        pass
-    return 0
-
-def inputhook_wx3():
-    """Run the wx event loop by processing pending events only.
-
-    This is like inputhook_wx1, but it keeps processing pending events
-    until stdin is ready.  After processing all pending events, a call to
-    time.sleep is inserted.  This is needed, otherwise, CPU usage is at 100%.
-    This sleep time should be tuned though for best performance.
-    """
-    # We need to protect against a user pressing Control-C when IPython is
-    # idle and this is running. We trap KeyboardInterrupt and pass.
-    try:
-        app = wx.GetApp()
-        if app is not None:
-            assert wx.Thread_IsMain()
-
-            # The import of wx on Linux sets the handler for signal.SIGINT
-            # to 0.  This is a bug in wx or gtk.  We fix by just setting it
-            # back to the Python default.
-            if not callable(signal.getsignal(signal.SIGINT)):
-                signal.signal(signal.SIGINT, signal.default_int_handler)
-
-            evtloop = wx.EventLoop()
-            ea = wx.EventLoopActivator(evtloop)
-            t = clock()
-            while not stdin_ready():
-                while evtloop.Pending():
-                    t = clock()
-                    evtloop.Dispatch()
-                app.ProcessIdle()
-                # We need to sleep at this point to keep the idle CPU load
-                # low.  However, if sleep to long, GUI response is poor.  As
-                # a compromise, we watch how often GUI events are being processed
-                # and switch between a short and long sleep time.  Here are some
-                # stats useful in helping to tune this.
-                # time    CPU load
-                # 0.001   13%
-                # 0.005   3%
-                # 0.01    1.5%
-                # 0.05    0.5%
-                used_time = clock() - t
-                if used_time > 10.0:
-                    # print 'Sleep for 1 s'  # dbg
-                    time.sleep(1.0)
-                elif used_time > 0.1:
-                    # Few GUI events coming in, so we can sleep longer
-                    # print 'Sleep for 0.05 s'  # dbg
-                    time.sleep(0.05)
-                else:
-                    # Many GUI events coming in, so sleep only very little
-                    time.sleep(0.001)
-            del ea
-    except KeyboardInterrupt:
-        pass
-    return 0
-
-if sys.platform == 'darwin':
-    # On OSX, evtloop.Pending() always returns True, regardless of there being
-    # any events pending. As such we can't use implementations 1 or 3 of the
-    # inputhook as those depend on a pending/dispatch loop.
-    inputhook_wx = inputhook_wx2
-else:
-    # This is our default implementation
-    inputhook_wx = inputhook_wx3
diff --git a/codecov.yml b/codecov.yml
index 2d3b8bb058c..c41a76c4cb2 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -17,7 +17,6 @@ ignore:
   - IPython/kernel/*
   - IPython/consoleapp.py
   - IPython/core/inputsplitter.py
-  - IPython/lib/inputhook*.py
   - IPython/lib/kernel.py
   - IPython/utils/jsonutil.py
   - IPython/utils/localinterfaces.py
diff --git a/examples/IPython Kernel/gui/gui-gtk.py b/examples/IPython Kernel/gui/gui-gtk.py
deleted file mode 100755
index 3df9922b34b..00000000000
--- a/examples/IPython Kernel/gui/gui-gtk.py	
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python
-"""Simple GTK example to manually test event loop integration.
-
-This is meant to run tests manually in ipython as:
-
-In [5]: %gui gtk
-
-In [6]: %run gui-gtk.py
-"""
-
-import pygtk
-pygtk.require('2.0')
-import gtk
-
-
-def hello_world(widget, data=None):
-    print("Hello World")
-
-def delete_event(widget, event, data=None):
-    return False
-
-def destroy(widget, data=None):
-    gtk.main_quit()
-
-window = gtk.Window(gtk.WINDOW_TOPLEVEL)
-window.connect("delete_event", delete_event)
-window.connect("destroy", destroy)
-button = gtk.Button("Hello World")
-button.connect("clicked", hello_world, None)
-
-window.add(button)
-button.show()
-window.show()
-
-try:
-    from IPython.lib.inputhook import enable_gui
-    enable_gui('gtk')
-except ImportError:
-    gtk.main()
diff --git a/examples/IPython Kernel/gui/gui-gtk3.py b/examples/IPython Kernel/gui/gui-gtk3.py
deleted file mode 100644
index f35f498d33b..00000000000
--- a/examples/IPython Kernel/gui/gui-gtk3.py	
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-"""Simple Gtk example to manually test event loop integration.
-
-This is meant to run tests manually in ipython as:
-
-In [1]: %gui gtk3
-
-In [2]: %run gui-gtk3.py
-"""
-
-from gi.repository import Gtk
-
-
-def hello_world(widget, data=None):
-    print("Hello World")
-
-def delete_event(widget, event, data=None):
-    return False
-
-def destroy(widget, data=None):
-    Gtk.main_quit()
-
-window = Gtk.Window(type=Gtk.WindowType.TOPLEVEL)
-window.connect("delete_event", delete_event)
-window.connect("destroy", destroy)
-button = Gtk.Button(label="Hello World")
-button.connect("clicked", hello_world, None)
-
-window.add(button)
-button.show()
-window.show()
-
-try:
-    from IPython.lib.inputhook import enable_gui
-    enable_gui('gtk3')
-except ImportError:
-    Gtk.main()
diff --git a/examples/IPython Kernel/gui/gui-pyglet.py b/examples/IPython Kernel/gui/gui-pyglet.py
deleted file mode 100644
index f64162286a0..00000000000
--- a/examples/IPython Kernel/gui/gui-pyglet.py	
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env python
-"""Simple pyglet example to manually test event loop integration.
-
-This is meant to run tests manually in ipython as:
-
-In [5]: %gui pyglet
-
-In [6]: %run gui-pyglet.py
-"""
-
-import pyglet
-
-
-window = pyglet.window.Window()
-label = pyglet.text.Label('Hello, world',
-                          font_name='Times New Roman',
-                          font_size=36,
-                          x=window.width//2, y=window.height//2,
-                          anchor_x='center', anchor_y='center')
-@window.event
-def on_close():
-    window.close()
-
-@window.event
-def on_draw():
-    window.clear()
-    label.draw()
-
-try:
-    from IPython.lib.inputhook import enable_gui
-    enable_gui('pyglet')
-except ImportError:
-    pyglet.app.run()
diff --git a/examples/IPython Kernel/gui/gui-tk.py b/examples/IPython Kernel/gui/gui-tk.py
deleted file mode 100755
index 89caf3ed622..00000000000
--- a/examples/IPython Kernel/gui/gui-tk.py	
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python
-"""Simple Tk example to manually test event loop integration.
-
-This is meant to run tests manually in ipython as:
-
-In [5]: %gui tk
-
-In [6]: %run gui-tk.py
-"""
-
-from tkinter import * 
-
-
-class MyApp:
-
-    def __init__(self, root):
-        frame = Frame(root)
-        frame.pack()
-
-        self.button = Button(frame, text="Hello", command=self.hello_world)
-        self.button.pack(side=LEFT)
-
-    def hello_world(self):
-        print("Hello World!")
-
-root = Tk()
-
-app = MyApp(root)
-
-try:
-    from IPython.lib.inputhook import enable_gui
-    enable_gui('tk', root)
-except ImportError:
-    root.mainloop()
diff --git a/examples/IPython Kernel/gui/gui-wx.py b/examples/IPython Kernel/gui/gui-wx.py
deleted file mode 100755
index 86e37acfc9d..00000000000
--- a/examples/IPython Kernel/gui/gui-wx.py	
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env python
-"""
-A Simple wx example to test IPython's event loop integration.
-
-To run this do:
-
-In [5]: %gui wx  # or start IPython with '--gui wx'
-
-In [6]: %run gui-wx.py
-
-Ref: Modified from wxPython source code wxPython/samples/simple/simple.py
-"""
-
-import wx
-
-
-class MyFrame(wx.Frame):
-    """
-    This is MyFrame.  It just shows a few controls on a wxPanel,
-    and has a simple menu.
-    """
-    def __init__(self, parent, title):
-        wx.Frame.__init__(self, parent, -1, title,
-                          pos=(150, 150), size=(350, 200))
-
-        # Create the menubar
-        menuBar = wx.MenuBar()
-
-        # and a menu
-        menu = wx.Menu()
-
-        # add an item to the menu, using \tKeyName automatically
-        # creates an accelerator, the third param is some help text
-        # that will show up in the statusbar
-        menu.Append(wx.ID_EXIT, "E&xit\tAlt-X", "Exit this simple sample")
-
-        # bind the menu event to an event handler
-        self.Bind(wx.EVT_MENU, self.OnTimeToClose, id=wx.ID_EXIT)
-
-        # and put the menu on the menubar
-        menuBar.Append(menu, "&File")
-        self.SetMenuBar(menuBar)
-
-        self.CreateStatusBar()
-
-        # Now create the Panel to put the other controls on.
-        panel = wx.Panel(self)
-
-        # and a few controls
-        text = wx.StaticText(panel, -1, "Hello World!")
-        text.SetFont(wx.Font(14, wx.SWISS, wx.NORMAL, wx.BOLD))
-        text.SetSize(text.GetBestSize())
-        btn = wx.Button(panel, -1, "Close")
-        funbtn = wx.Button(panel, -1, "Just for fun...")
-
-        # bind the button events to handlers
-        self.Bind(wx.EVT_BUTTON, self.OnTimeToClose, btn)
-        self.Bind(wx.EVT_BUTTON, self.OnFunButton, funbtn)
-
-        # Use a sizer to layout the controls, stacked vertically and with
-        # a 10 pixel border around each
-        sizer = wx.BoxSizer(wx.VERTICAL)
-        sizer.Add(text, 0, wx.ALL, 10)
-        sizer.Add(btn, 0, wx.ALL, 10)
-        sizer.Add(funbtn, 0, wx.ALL, 10)
-        panel.SetSizer(sizer)
-        panel.Layout()
-
-
-    def OnTimeToClose(self, evt):
-        """Event handler for the button click."""
-        print("See ya later!")
-        self.Close()
-
-    def OnFunButton(self, evt):
-        """Event handler for the button click."""
-        print("Having fun yet?")
-
-
-class MyApp(wx.App):
-    def OnInit(self):
-        frame = MyFrame(None, "Simple wxPython App")
-        self.SetTopWindow(frame)
-
-        print("Print statements go to this stdout window by default.")
-
-        frame.Show(True)
-        return True
-
-
-if __name__ == '__main__':
-
-    app = wx.GetApp()
-    if app is None:
-        app = MyApp(redirect=False, clearSigInt=False)
-    else:
-        frame = MyFrame(None, "Simple wxPython App")
-        app.SetTopWindow(frame)
-        print("Print statements go to this stdout window by default.")
-        frame.Show(True)
-
-    try:
-        from IPython.lib.inputhook import enable_gui
-        enable_gui('wx', app)
-    except ImportError:
-        app.MainLoop()
diff --git a/pytest.ini b/pytest.ini
index 9189cf6c33b..e0cfec07bdf 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -36,7 +36,6 @@ addopts = --durations=10
     --ignore=IPython/kernel
     --ignore=IPython/consoleapp.py
     --ignore=IPython/core/inputsplitter.py
-    --ignore-glob=IPython/lib/inputhook*.py
     --ignore=IPython/lib/kernel.py
     --ignore=IPython/utils/jsonutil.py
     --ignore=IPython/utils/localinterfaces.py

From da495d08e6a46cf09ead0d69f1658f516045ac77 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Dec 2021 15:02:47 -0800
Subject: [PATCH 0903/1407] More Deprecation Removal

This remove a bunch or IO objects that have been deprecated for at least
2 versions.

I expect this to maybe create issues on windows, and maybe ipykernel
because of colorama.
---
 IPython/core/interactiveshell.py     | 13 +----
 IPython/terminal/interactiveshell.py | 10 ----
 IPython/testing/globalipapp.py       | 24 --------
 IPython/utils/io.py                  | 85 ----------------------------
 IPython/utils/tests/test_io.py       | 28 +--------
 5 files changed, 4 insertions(+), 156 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index b48b572ad17..519494118ba 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -712,16 +712,9 @@ def init_inspector(self, changes=None):
                                             self.object_info_string_level)
 
     def init_io(self):
-        # This will just use sys.stdout and sys.stderr. If you want to
-        # override sys.stdout and sys.stderr themselves, you need to do that
-        # *before* instantiating this class, because io holds onto
-        # references to the underlying streams.
-        # io.std* are deprecated, but don't show our own deprecation warnings
-        # during initialization of the deprecated API.
-        with warnings.catch_warnings():
-            warnings.simplefilter('ignore', DeprecationWarning)
-            io.stdout = io.IOStream(sys.stdout)
-            io.stderr = io.IOStream(sys.stderr)
+        # implemented in subclasses, TerminalInteractiveShell does call
+        # colorama.init().
+        pass
 
     def init_prompts(self):
         # Set system prompts, so that scripts can decide if they are running
diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 5e7d95fcfc0..c4fa47911fe 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -540,16 +540,6 @@ def init_io(self):
         import colorama
         colorama.init()
 
-        # For some reason we make these wrappers around stdout/stderr.
-        # For now, we need to reset them so all output gets coloured.
-        # https://github.com/ipython/ipython/issues/8669
-        # io.std* are deprecated, but don't show our own deprecation warnings
-        # during initialization of the deprecated API.
-        with warnings.catch_warnings():
-            warnings.simplefilter('ignore', DeprecationWarning)
-            io.stdout = io.IOStream(sys.stdout)
-            io.stderr = io.IOStream(sys.stderr)
-
     def init_magics(self):
         super(TerminalInteractiveShell, self).init_magics()
         self.register_magics(TerminalMagics)
diff --git a/IPython/testing/globalipapp.py b/IPython/testing/globalipapp.py
index c58d575a73b..698e3d845aa 100644
--- a/IPython/testing/globalipapp.py
+++ b/IPython/testing/globalipapp.py
@@ -23,30 +23,6 @@
 from IPython.terminal.interactiveshell import TerminalInteractiveShell
 
 
-class StreamProxy(io.IOStream):
-    """Proxy for sys.stdout/err.  This will request the stream *at call time*
-    allowing for nose's Capture plugin's redirection of sys.stdout/err.
-
-    Parameters
-    ----------
-    name : str
-        The name of the stream. This will be requested anew at every call
-    """
-
-    def __init__(self, name):
-        warnings.warn("StreamProxy is deprecated and unused as of IPython 5", DeprecationWarning,
-            stacklevel=2,
-        )
-        self.name=name
-
-    @property
-    def stream(self):
-        return getattr(sys, self.name)
-
-    def flush(self):
-        self.stream.flush()
-
-
 def get_ipython():
     # This will get replaced by the real thing once we start IPython below
     return start_ipython()
diff --git a/IPython/utils/io.py b/IPython/utils/io.py
index 638471e8fbb..69e4d4e0cdb 100644
--- a/IPython/utils/io.py
+++ b/IPython/utils/io.py
@@ -19,82 +19,10 @@
 from IPython.utils.decorators import undoc
 from .capture import CapturedIO, capture_output
 
-@undoc
-class IOStream:
-
-    def __init__(self, stream, fallback=None):
-        warn('IOStream is deprecated since IPython 5.0, use sys.{stdin,stdout,stderr} instead',
-             DeprecationWarning, stacklevel=2)
-        if not hasattr(stream,'write') or not hasattr(stream,'flush'):
-            if fallback is not None:
-                stream = fallback
-            else:
-                raise ValueError("fallback required, but not specified")
-        self.stream = stream
-        self._swrite = stream.write
-
-        # clone all methods not overridden:
-        def clone(meth):
-            return not hasattr(self, meth) and not meth.startswith('_')
-        for meth in filter(clone, dir(stream)):
-            try:
-                val = getattr(stream, meth)
-            except AttributeError:
-                pass
-            else:
-                setattr(self, meth, val)
-
-    def __repr__(self):
-        cls = self.__class__
-        tpl = '{mod}.{cls}({args})'
-        return tpl.format(mod=cls.__module__, cls=cls.__name__, args=self.stream)
-
-    def write(self,data):
-        warn('IOStream is deprecated since IPython 5.0, use sys.{stdin,stdout,stderr} instead',
-             DeprecationWarning, stacklevel=2)
-        try:
-            self._swrite(data)
-        except:
-            try:
-                # print handles some unicode issues which may trip a plain
-                # write() call.  Emulate write() by using an empty end
-                # argument.
-                print(data, end='', file=self.stream)
-            except:
-                # if we get here, something is seriously broken.
-                print('ERROR - failed to write data to stream:', self.stream,
-                      file=sys.stderr)
-
-    def writelines(self, lines):
-        warn('IOStream is deprecated since IPython 5.0, use sys.{stdin,stdout,stderr} instead',
-             DeprecationWarning, stacklevel=2)
-        if isinstance(lines, str):
-            lines = [lines]
-        for line in lines:
-            self.write(line)
-
-    # This class used to have a writeln method, but regular files and streams
-    # in Python don't have this method. We need to keep this completely
-    # compatible so we removed it.
-
-    @property
-    def closed(self):
-        return self.stream.closed
-
-    def close(self):
-        pass
-
 # setup stdin/stdout/stderr to sys.stdin/sys.stdout/sys.stderr
 devnull = open(os.devnull, 'w')
 atexit.register(devnull.close)
 
-# io.std* are deprecated, but don't show our own deprecation warnings
-# during initialization of the deprecated API.
-with warnings.catch_warnings():
-    warnings.simplefilter('ignore', DeprecationWarning)
-    stdin = IOStream(sys.stdin, fallback=devnull)
-    stdout = IOStream(sys.stdout, fallback=devnull)
-    stderr = IOStream(sys.stderr, fallback=devnull)
 
 class Tee(object):
     """A class to duplicate an output stream to stdout/err.
@@ -208,12 +136,6 @@ def temp_pyfile(src, ext='.py'):
         f.flush()
     return fname
 
-@undoc
-def atomic_writing(*args, **kwargs):
-    """DEPRECATED: moved to notebook.services.contents.fileio"""
-    warn("IPython.utils.io.atomic_writing has moved to notebook.services.contents.fileio since IPython 4.0", DeprecationWarning, stacklevel=2)
-    from notebook.services.contents.fileio import atomic_writing
-    return atomic_writing(*args, **kwargs)
 
 @undoc
 def raw_print(*args, **kw):
@@ -232,10 +154,3 @@ def raw_print_err(*args, **kw):
     print(*args, sep=kw.get('sep', ' '), end=kw.get('end', '\n'),
           file=sys.__stderr__)
     sys.__stderr__.flush()
-
-@undoc
-def unicode_std_stream(stream='stdout'):
-    """DEPRECATED, moved to nbconvert.utils.io"""
-    warn("IPython.utils.io.unicode_std_stream has moved to nbconvert.utils.io since IPython 4.0", DeprecationWarning, stacklevel=2)
-    from nbconvert.utils.io import unicode_std_stream
-    return unicode_std_stream(stream)
diff --git a/IPython/utils/tests/test_io.py b/IPython/utils/tests/test_io.py
index fa3abab748b..3b4c03eae06 100644
--- a/IPython/utils/tests/test_io.py
+++ b/IPython/utils/tests/test_io.py
@@ -11,7 +11,7 @@
 from subprocess import Popen, PIPE
 import unittest
 
-from IPython.utils.io import IOStream, Tee, capture_output
+from IPython.utils.io import Tee, capture_output
 
 
 def test_tee_simple():
@@ -48,34 +48,8 @@ def test(self):
         for chan in ['stdout', 'stderr']:
             self.tchan(chan)
 
-def test_io_init():
-    """Test that io.stdin/out/err exist at startup"""
-    for name in ('stdin', 'stdout', 'stderr'):
-        cmd = "from IPython.utils import io;print(io.%s.__class__)"%name
-        with Popen([sys.executable, '-c', cmd], stdout=PIPE) as p:
-            p.wait()
-            classname = p.stdout.read().strip().decode('ascii')
-        # __class__ is a reference to the class object in Python 3, so we can't
-        # just test for string equality.
-        assert 'IPython.utils.io.IOStream' in classname, classname
-
 class TestIOStream(unittest.TestCase):
 
-    def test_IOStream_init(self):
-        """IOStream initializes from a file-like object missing attributes. """
-        # Cause a failure from getattr and dir(). (Issue #6386)
-        class BadStringIO(StringIO):
-            def __dir__(self):
-                attrs = super().__dir__()
-                attrs.append('name')
-                return attrs
-        with self.assertWarns(DeprecationWarning):
-            iostream = IOStream(BadStringIO())
-            iostream.write('hi, bad iostream\n')
-
-        assert not hasattr(iostream, 'name')
-        iostream.close()
-
     def test_capture_output(self):
         """capture_output() context works"""
         

From 8cc2c16d4ee18df19beeb43822ebc072462fbeb2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Dec 2021 16:02:32 -0800
Subject: [PATCH 0904/1407] Remove deprecated IPython.nbformat

Deprecated since IPython 4.0, which predates Python 3.6
---
 IPython/nbformat.py | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 IPython/nbformat.py

diff --git a/IPython/nbformat.py b/IPython/nbformat.py
deleted file mode 100644
index 310277de009..00000000000
--- a/IPython/nbformat.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
-Shim to maintain backwards compatibility with old IPython.nbformat imports.
-"""
-# Copyright (c) IPython Development Team.
-# Distributed under the terms of the Modified BSD License.
-
-import sys
-from warnings import warn
-
-from IPython.utils.shimmodule import ShimModule, ShimWarning
-
-warn("The `IPython.nbformat` package has been deprecated since IPython 4.0. "
-     "You should import from nbformat instead.", ShimWarning)
-
-# Unconditionally insert the shim into sys.modules so that further import calls
-# trigger the custom attribute access above
-
-sys.modules['IPython.nbformat'] = ShimModule(
-    src='IPython.nbformat', mirror='nbformat')

From 1d6d1ab9d61ba720af8606e478951f5f4e8e8cde Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Dec 2021 16:04:13 -0800
Subject: [PATCH 0905/1407] Remove deprecated submodule IPython.nbconvert.

This has been deprecated since IPython 4.0, pre python 3.6
---
 IPython/nbconvert.py | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 IPython/nbconvert.py

diff --git a/IPython/nbconvert.py b/IPython/nbconvert.py
deleted file mode 100644
index 2de4ee50bc7..00000000000
--- a/IPython/nbconvert.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
-Shim to maintain backwards compatibility with old IPython.nbconvert imports.
-"""
-# Copyright (c) IPython Development Team.
-# Distributed under the terms of the Modified BSD License.
-
-import sys
-from warnings import warn
-
-from IPython.utils.shimmodule import ShimModule, ShimWarning
-
-warn("The `IPython.nbconvert` package has been deprecated since IPython 4.0. "
-     "You should import from nbconvert instead.", ShimWarning)
-
-# Unconditionally insert the shim into sys.modules so that further import calls
-# trigger the custom attribute access above
-
-sys.modules['IPython.nbconvert'] = ShimModule(
-    src='IPython.nbconvert', mirror='nbconvert')

From 2c1125bc49ade78ab9d0791c50d1762bab03ce13 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Dec 2021 15:59:50 -0800
Subject: [PATCH 0906/1407] Remove shimmodule IPython.config Deprecated since
 IPython 4.0

This should not be relied upon as this was deprecated Python 3.6 was not
released yet.
---
 IPython/config.py                      | 19 -------------------
 IPython/utils/tests/test_shimmodule.py | 14 --------------
 2 files changed, 33 deletions(-)
 delete mode 100644 IPython/config.py
 delete mode 100644 IPython/utils/tests/test_shimmodule.py

diff --git a/IPython/config.py b/IPython/config.py
deleted file mode 100644
index 964f46f10ac..00000000000
--- a/IPython/config.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
-Shim to maintain backwards compatibility with old IPython.config imports.
-"""
-# Copyright (c) IPython Development Team.
-# Distributed under the terms of the Modified BSD License.
-
-import sys
-from warnings import warn
-
-from .utils.shimmodule import ShimModule, ShimWarning
-
-warn("The `IPython.config` package has been deprecated since IPython 4.0. "
-     "You should import from traitlets.config instead.", ShimWarning)
-
-
-# Unconditionally insert the shim into sys.modules so that further import calls
-# trigger the custom attribute access above
-
-sys.modules['IPython.config'] = ShimModule(src='IPython.config', mirror='traitlets.config')
diff --git a/IPython/utils/tests/test_shimmodule.py b/IPython/utils/tests/test_shimmodule.py
deleted file mode 100644
index 30f2ffa09f2..00000000000
--- a/IPython/utils/tests/test_shimmodule.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import pytest
-import sys
-
-from IPython.utils.shimmodule import ShimWarning
-
-
-def test_shim_warning():
-    sys.modules.pop('IPython.config', None)
-    with pytest.warns(ShimWarning):
-        import IPython.config
-
-    import traitlets.config
-
-    assert IPython.config.Config is traitlets.config.Config

From d0f56447845fa74cc38ed656677645c8890df0f5 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Dec 2021 16:15:19 -0800
Subject: [PATCH 0907/1407] Increase Codecov threshold for test.

It is currently too sensitive.
---
 codecov.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/codecov.yml b/codecov.yml
index 2d3b8bb058c..7054b5b2979 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -10,6 +10,7 @@ coverage:
       tests:
         target: auto
         paths: ['.*/tests/.*']
+        threshold: 0.1%
 codecov:
   require_ci_to_pass: false
 

From 9e1981ea54b387d05122fd604a021fd237a195c0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Dec 2021 16:13:26 -0800
Subject: [PATCH 0908/1407] Remove deprecated banner parameter

All of that was deprecated at or before 5.0
---
 IPython/core/completer.py            |   2 +-
 IPython/core/magics/config.py        |   2 +-
 IPython/terminal/interactiveshell.py |  11 +-
 IPython/terminal/ptshell.py          |   8 --
 tools/backport_pr.py                 | 192 ---------------------------
 5 files changed, 4 insertions(+), 211 deletions(-)
 delete mode 100644 IPython/terminal/ptshell.py
 delete mode 100755 tools/backport_pr.py

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 356a1e56568..7d5d9db0a6d 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -591,7 +591,7 @@ class Completer(Configurable):
 
     greedy = Bool(False,
         help="""Activate greedy completion
-        PENDING DEPRECTION. this is now mostly taken care of with Jedi.
+        PENDING DEPRECATION. this is now mostly taken care of with Jedi.
 
         This will enable completion on elements of lists, results of function calls, etc.,
         but can be unsafe because the code is actually evaluated on TAB.
diff --git a/IPython/core/magics/config.py b/IPython/core/magics/config.py
index 25a74e041ab..c1387b601b8 100644
--- a/IPython/core/magics/config.py
+++ b/IPython/core/magics/config.py
@@ -82,7 +82,7 @@ def config(self, s):
                 Current: False
             IPCompleter.greedy=<Bool>
                 Activate greedy completion
-                        PENDING DEPRECTION. this is now mostly taken care of with Jedi.
+                        PENDING DEPRECATION. this is now mostly taken care of with Jedi.
                         This will enable completion on elements of lists, results of function calls, etc.,
                         but can be unsafe because the code is actually evaluated on TAB.
                 Current: False
diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 5e7d95fcfc0..c886b4be728 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -51,7 +51,6 @@
 from .ptutils import IPythonPTCompleter, IPythonPTLexer
 from .shortcuts import create_ipython_shortcuts
 
-DISPLAY_BANNER_DEPRECATED = object()
 PTK3 = ptk_version.startswith('3.')
 
 
@@ -579,11 +578,7 @@ def ask_exit(self):
 
     rl_next_input = None
 
-    def interact(self, display_banner=DISPLAY_BANNER_DEPRECATED):
-
-        if display_banner is not DISPLAY_BANNER_DEPRECATED:
-            warn('interact `display_banner` argument is deprecated since IPython 5.0. Call `show_banner()` if needed.', DeprecationWarning, stacklevel=2)
-
+    def interact(self):
         self.keep_running = True
         while self.keep_running:
             print(self.separate_in, end='')
@@ -599,11 +594,9 @@ def interact(self, display_banner=DISPLAY_BANNER_DEPRECATED):
                 if code:
                     self.run_cell(code, store_history=True)
 
-    def mainloop(self, display_banner=DISPLAY_BANNER_DEPRECATED):
+    def mainloop(self):
         # An extra layer of protection in case someone mashing Ctrl-C breaks
         # out of our internal code.
-        if display_banner is not DISPLAY_BANNER_DEPRECATED:
-            warn('mainloop `display_banner` argument is deprecated since IPython 5.0. Call `show_banner()` if needed.', DeprecationWarning, stacklevel=2)
         while True:
             try:
                 self.interact()
diff --git a/IPython/terminal/ptshell.py b/IPython/terminal/ptshell.py
deleted file mode 100644
index 666d3c5b514..00000000000
--- a/IPython/terminal/ptshell.py
+++ /dev/null
@@ -1,8 +0,0 @@
-raise DeprecationWarning("""DEPRECATED:
-
-After Popular request and decision from the BDFL:
-`IPython.terminal.ptshell` has been moved back to `IPython.terminal.interactiveshell`
-during the beta cycle (after IPython 5.0.beta3) Sorry about that. 
-
-This file will be removed in 5.0 rc or final.
-""")
diff --git a/tools/backport_pr.py b/tools/backport_pr.py
deleted file mode 100755
index c4c06b5526b..00000000000
--- a/tools/backport_pr.py
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/env python
-"""
-Backport pull requests to a particular branch.
-
-Usage: backport_pr.py [org/repository] branch [PR] [PR2]
-
-e.g.:
-
-    python tools/backport_pr.py 0.13.1 123 155
-
-to backport PRs #123 and #155 onto branch 0.13.1
-
-or
-
-    python tools/backport_pr.py 2.1
-
-to see what PRs are marked for backport with milestone=2.1 that have yet to be applied
-to branch 2.x
-
-or
-
-    python tools/backport_pr.py jupyter/notebook 0.13.1 123 155
-
-to backport PRs #123 and #155 of the `jupyter/notebook` repo onto branch 0.13.1
-of that repo.
-
-"""
-
-
-import os
-import re
-import sys
-
-from subprocess import Popen, PIPE, check_call, check_output
-try:
-    from urllib.request import urlopen
-except:
-    from urllib import urlopen
-
-from gh_api import (
-    get_issues_list,
-    get_pull_request,
-    get_pull_request_files,
-    is_pull_request,
-    get_milestone_id,
-)
-
-def find_rejects(root='.'):
-    for dirname, dirs, files in os.walk(root):
-        for fname in files:
-            if fname.endswith('.rej'):
-                yield os.path.join(dirname, fname)
-
-def get_current_branch():
-    branches = check_output(['git', 'branch'])
-    for branch in branches.splitlines():
-        if branch.startswith(b'*'):
-            return branch[1:].strip().decode('utf-8')
-
-def backport_pr(branch, num, project='ipython/ipython'):
-    current_branch = get_current_branch()
-    if branch != current_branch:
-        check_call(['git', 'checkout', branch])
-    check_call(['git', 'pull'])
-    pr = get_pull_request(project, num, auth=True)
-    files = get_pull_request_files(project, num, auth=True)
-    patch_url = pr['patch_url']
-    title = pr['title']
-    description = pr['body']
-    fname = "PR%i.patch" % num
-    if os.path.exists(fname):
-        print("using patch from {fname}".format(**locals()))
-        with open(fname, 'rb') as f:
-            patch = f.read()
-    else:
-        req = urlopen(patch_url)
-        patch = req.read()
-
-    lines = description.splitlines()
-    if len(lines) > 5:
-        lines = lines[:5] + ['...']
-        description = '\n'.join(lines)
-
-    msg = "Backport PR #%i: %s" % (num, title) + '\n\n' + description
-    check = Popen(['git', 'apply', '--check', '--verbose'], stdin=PIPE)
-    a,b = check.communicate(patch)
-
-    if check.returncode:
-        print("patch did not apply, saving to {fname}".format(**locals()))
-        print("edit {fname} until `cat {fname} | git apply --check` succeeds".format(**locals()))
-        print("then run tools/backport_pr.py {num} again".format(**locals()))
-        if not os.path.exists(fname):
-            with open(fname, 'wb') as f:
-                f.write(patch)
-        return 1
-
-    p = Popen(['git', 'apply'], stdin=PIPE)
-    a,b = p.communicate(patch)
-
-    filenames = [ f['filename'] for f in files ]
-
-    check_call(['git', 'add'] + filenames)
-
-    check_call(['git', 'commit', '-m', msg])
-
-    print("PR #%i applied, with msg:" % num)
-    print()
-    print(msg)
-    print()
-
-    if branch != current_branch:
-        check_call(['git', 'checkout', current_branch])
-
-    return 0
-
-backport_re = re.compile(r"(?:[Bb]ackport|[Mm]erge).*#(\d+)")
-
-def already_backported(branch, since_tag=None):
-    """return set of PRs that have been backported already"""
-    if since_tag is None:
-        since_tag = check_output(['git','describe', branch, '--abbrev=0']).decode('utf8').strip()
-    cmd = ['git', 'log', '%s..%s' % (since_tag, branch), '--oneline']
-    lines = check_output(cmd).decode('utf8')
-    return set(int(num) for num in backport_re.findall(lines))
-
-def should_backport(labels=None, milestone=None, project='ipython/ipython'):
-    """return set of PRs marked for backport"""
-    if labels is None and milestone is None:
-        raise ValueError("Specify one of labels or milestone.")
-    elif labels is not None and milestone is not None:
-        raise ValueError("Specify only one of labels or milestone.")
-    if labels is not None:
-        issues = get_issues_list(project,
-                labels=labels,
-                state='closed',
-                auth=True,
-        )
-    else:
-        milestone_id = get_milestone_id(project, milestone,
-                auth=True)
-        issues = get_issues_list(project,
-                milestone=milestone_id,
-                state='closed',
-                auth=True,
-        )
-
-    should_backport = set()
-    for issue in issues:
-        if not is_pull_request(issue):
-            continue
-        pr = get_pull_request(project, issue['number'],
-                auth=True)
-        if not pr['merged']:
-            print ("Marked PR closed without merge: %i" % pr['number'])
-            continue
-        if pr['base']['ref'] != 'master':
-            continue
-        should_backport.add(pr['number'])
-    return should_backport
-
-if __name__ == '__main__':
-    project = 'ipython/ipython'
-
-    print("DEPRECATE: backport_pr.py is deprecated and it is now recommended"
-          "to install `ghpro` from PyPI.", file=sys.stderr)
-
-    args = list(sys.argv)
-    if len(args) >= 2:
-        if '/' in args[1]:
-            project = args[1]
-            del args[1]
-
-    if len(args) < 2:
-        print(__doc__)
-        sys.exit(1)
-
-    if len(args) < 3:
-        milestone = args[1]
-        branch = milestone.split('.')[0] + '.x'
-        already = already_backported(branch)
-        should = should_backport(milestone=milestone, project=project)
-        print ("The following PRs should be backported:")
-        for pr in sorted(should.difference(already)):
-            print (pr)
-        sys.exit(0)
-    
-    for prno in map(int, args[2:]):
-        print("Backporting PR #%i" % prno)
-        rc = backport_pr(args[1], prno, project=project)
-        if rc:
-            print("Backporting PR #%i failed" % prno)
-            sys.exit(rc)

From 5e798c81c0c1d62210f502bac70e931042a17b36 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Dec 2021 16:18:40 -0800
Subject: [PATCH 0909/1407] Put version next to Deprecation notice.

So that when I grep through files I don't have to open them an search to
know since when.
---
 IPython/core/oinspect.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 3f12d519d7a..70a64c3952e 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -221,7 +221,7 @@ def format_argspec(argspec):
     This takes a dict instead of ordered arguments and calls
     inspect.format_argspec with the arguments in the necessary order.
 
-    DEPRECATED: Do not use; will be removed in future versions.
+    DEPRECATED (since 7.10): Do not use; will be removed in future versions.
     """
     
     warnings.warn('`format_argspec` function is deprecated as of IPython 7.10'
@@ -233,10 +233,13 @@ def format_argspec(argspec):
 
 @undoc
 def call_tip(oinfo, format_call=True):
-    """DEPRECATED. Extract call tip data from an oinfo dict.
-    """
-    warnings.warn('`call_tip` function is deprecated as of IPython 6.0'
-                  'and will be removed in future versions.', DeprecationWarning, stacklevel=2)
+    """DEPRECATED since 6.0. Extract call tip data from an oinfo dict."""
+    warnings.warn(
+        "`call_tip` function is deprecated as of IPython 6.0"
+        "and will be removed in future versions.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
     # Get call definition
     argspec = oinfo.get('argspec')
     if argspec is None:
@@ -701,9 +704,8 @@ def pinfo(
             del info['text/html']
         page.page(info)
 
-    def info(self, obj, oname='', formatter=None, info=None, detail_level=0):
-        """DEPRECATED. Compute a dict with detailed information about an object.
-        """
+    def info(self, obj, oname="", formatter=None, info=None, detail_level=0):
+        """DEPRECATED since 5.0. Compute a dict with detailed information about an object."""
         if formatter is not None:
             warnings.warn('The `formatter` keyword argument to `Inspector.info`'
                      'is deprecated as of IPython 5.0 and will have no effects.',

From 7195786ea7af3975ff8c5225899d4d8c8c8329bc Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Dec 2021 16:27:13 -0800
Subject: [PATCH 0910/1407] Remove more deprecated utilities.

Most subcommands have been in jupyter for many years,
and the -e export flags has been doing nothing for a long time as well.
---
 IPython/core/magics/basic.py     |  7 -------
 IPython/core/tests/test_magic.py |  2 +-
 IPython/terminal/ipapp.py        | 26 +-------------------------
 3 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py
index 4a8f223c206..b44b4a38128 100644
--- a/IPython/core/magics/basic.py
+++ b/IPython/core/magics/basic.py
@@ -560,10 +560,6 @@ def precision(self, s=''):
         return ptformatter.float_format
 
     @magic_arguments.magic_arguments()
-    @magic_arguments.argument(
-        '-e', '--export', action='store_true', default=False,
-        help=argparse.SUPPRESS
-    )
     @magic_arguments.argument(
         'filename', type=str,
         help='Notebook name or filename'
@@ -574,9 +570,6 @@ def notebook(self, s):
 
         This function can export the current IPython history to a notebook file.
         For example, to export the history to "foo.ipynb" do "%notebook foo.ipynb".
-
-        The -e or --export flag is deprecated in IPython 5.2, and will be
-        removed in the future.
         """
         args = magic_arguments.parse_argstring(self.notebook, s)
 
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 641a6ff66a1..428d7114a35 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -750,7 +750,7 @@ def test_notebook_export_json():
         _ip.history_manager.store_inputs(i, cmd)
     with TemporaryDirectory() as td:
         outfile = os.path.join(td, "nb.ipynb")
-        _ip.magic("notebook -e %s" % outfile)
+        _ip.magic("notebook %s" % outfile)
 
 
 class TestEnv(TestCase):
diff --git a/IPython/terminal/ipapp.py b/IPython/terminal/ipapp.py
index defe3e79fa8..b95266eaef0 100755
--- a/IPython/terminal/ipapp.py
+++ b/IPython/terminal/ipapp.py
@@ -208,26 +208,6 @@ def _classes_default(self):
             StoreMagics,
         ]
 
-    deprecated_subcommands = dict(
-        qtconsole=('qtconsole.qtconsoleapp.JupyterQtConsoleApp',
-            """DEPRECATED, Will be removed in IPython 6.0 : Launch the Jupyter Qt Console."""
-        ),
-        notebook=('notebook.notebookapp.NotebookApp',
-            """DEPRECATED, Will be removed in IPython 6.0 : Launch the Jupyter HTML Notebook Server."""
-        ),
-        console=('jupyter_console.app.ZMQTerminalIPythonApp',
-            """DEPRECATED, Will be removed in IPython 6.0 : Launch the Jupyter terminal-based Console."""
-        ),
-        nbconvert=('nbconvert.nbconvertapp.NbConvertApp',
-            "DEPRECATED, Will be removed in IPython 6.0 : Convert notebooks to/from other formats."
-        ),
-        trust=('nbformat.sign.TrustNotebookApp',
-            "DEPRECATED, Will be removed in IPython 6.0 : Sign notebooks to trust their potentially unsafe contents at load."
-        ),
-        kernelspec=('jupyter_client.kernelspecapp.KernelSpecApp',
-            "DEPRECATED, Will be removed in IPython 6.0 : Manage Jupyter kernel specifications."
-        ),
-    )
     subcommands = dict(
         profile = ("IPython.core.profileapp.ProfileApp",
             "Create and manage IPython profiles."
@@ -242,11 +222,7 @@ def _classes_default(self):
             "Manage the IPython history database."
         ),
     )
-    deprecated_subcommands['install-nbextension'] = (
-        "notebook.nbextensions.InstallNBExtensionApp",
-        "DEPRECATED, Will be removed in IPython 6.0 : Install Jupyter notebook extension files"
-    )
-    subcommands.update(deprecated_subcommands)
+
 
     # *do* autocreate requested profile, but don't create the config file.
     auto_create=Bool(True)

From 8d544141fed373ffbc812b9a2fb796038d7a68ab Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Dec 2021 16:54:45 -0800
Subject: [PATCH 0911/1407] remove some dead code especially wrt py3compat

---
 IPython/core/completer.py        | 19 +++-------------
 IPython/core/tests/test_iplib.py |  8 +++----
 IPython/utils/_process_cli.py    |  1 -
 IPython/utils/_process_posix.py  |  1 -
 IPython/utils/py3compat.py       | 37 ++++++++++----------------------
 5 files changed, 18 insertions(+), 48 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 7d5d9db0a6d..cc7b629e2e1 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -178,14 +178,6 @@
 MATCHES_LIMIT = 500
 
 
-class Sentinel:
-    def __repr__(self):
-        return "<deprecated sentinel>"
-
-
-_deprecation_readline_sentinel = Sentinel()
-
-
 class ProvisionalCompleterWarning(FutureWarning):
     """
     Exception raise by an experimental feature in this module.
@@ -618,8 +610,6 @@ class Completer(Configurable):
              "Includes completion of latex commands, unicode names, and expanding "
              "unicode characters back to latex commands.").tag(config=True)
 
-
-
     def __init__(self, namespace=None, global_namespace=None, **kwargs):
         """Create a new completer for the command line.
 
@@ -1119,8 +1109,9 @@ def _limit_to_all_changed(self, change):
             'no effects and then removed in future version of IPython.',
             UserWarning)
 
-    def __init__(self, shell=None, namespace=None, global_namespace=None,
-                 use_readline=_deprecation_readline_sentinel, config=None, **kwargs):
+    def __init__(
+        self, shell=None, namespace=None, global_namespace=None, config=None, **kwargs
+    ):
         """IPCompleter() -> completer
 
         Return a completer object.
@@ -1144,10 +1135,6 @@ def __init__(self, shell=None, namespace=None, global_namespace=None,
         self.magic_escape = ESC_MAGIC
         self.splitter = CompletionSplitter()
 
-        if use_readline is not _deprecation_readline_sentinel:
-            warnings.warn('The `use_readline` parameter is deprecated and ignored since IPython 6.0.',
-                          DeprecationWarning, stacklevel=2)
-
         # _greedy_changed() depends on splitter and readline being defined:
         Completer.__init__(self, namespace=namespace, global_namespace=global_namespace,
                             config=config, **kwargs)
diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index 9bdfd514644..7fa4bbae399 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -133,7 +133,7 @@ def doctest_tb_sysexit():
     In [20]: %tb
     Traceback (most recent call last):
       File ..., in execfile
-        exec(compiler(f.read(), fname, 'exec'), glob, loc)
+        exec(compiler(f.read(), fname, "exec"), glob, loc)
       File ..., in <module>
         bar(mode)
       File ..., in bar
@@ -149,9 +149,9 @@ def doctest_tb_sysexit():
     ---------------------------------------------------------------------------
     SystemExit                                Traceback (most recent call last)
     File ..., in execfile(fname, glob, loc, compiler)
-         70 with open(fname, 'rb') as f:
-         71     compiler = compiler or compile
-    ---> 72     exec(compiler(f.read(), fname, 'exec'), glob, loc)
+         ... with open(fname, "rb") as f:
+         ...     compiler = compiler or compile
+    ---> ...     exec(compiler(f.read(), fname, "exec"), glob, loc)
     ...<module>
          30     except IndexError:
          31         mode = 'div'
diff --git a/IPython/utils/_process_cli.py b/IPython/utils/_process_cli.py
index 03b2ecc7997..86e918a8d02 100644
--- a/IPython/utils/_process_cli.py
+++ b/IPython/utils/_process_cli.py
@@ -19,7 +19,6 @@
 import os
 
 # Import IPython libraries:
-from IPython.utils import py3compat
 from ._process_common import arg_split
 
 
diff --git a/IPython/utils/_process_posix.py b/IPython/utils/_process_posix.py
index 5f6b1ab200f..59b5c238960 100644
--- a/IPython/utils/_process_posix.py
+++ b/IPython/utils/_process_posix.py
@@ -24,7 +24,6 @@
 
 # Our own
 from ._process_common import getoutput, arg_split
-from IPython.utils import py3compat
 from IPython.utils.encoding import DEFAULT_ENCODING
 
 #-----------------------------------------------------------------------------
diff --git a/IPython/utils/py3compat.py b/IPython/utils/py3compat.py
index 654195e6c84..34af4c58f42 100644
--- a/IPython/utils/py3compat.py
+++ b/IPython/utils/py3compat.py
@@ -3,13 +3,8 @@
 
 This file is deprecated and will be removed in a future version.
 """
-import functools
-import os
-import sys
-import re
-import shutil
-import types
 import platform
+import builtins as builtin_mod
 
 from .encoding import DEFAULT_ENCODING
 
@@ -18,6 +13,7 @@ def decode(s, encoding=None):
     encoding = encoding or DEFAULT_ENCODING
     return s.decode(encoding, "replace")
 
+
 def encode(u, encoding=None):
     encoding = encoding or DEFAULT_ENCODING
     return u.encode(encoding, "replace")
@@ -28,16 +24,6 @@ def cast_unicode(s, encoding=None):
         return decode(s, encoding)
     return s
 
-def cast_bytes(s, encoding=None):
-    if not isinstance(s, bytes):
-        return encode(s, encoding)
-    return s
-
-def buffer_to_bytes(buf):
-    """Cast a buffer object to bytes"""
-    if not isinstance(buf, bytes):
-        buf = bytes(buf)
-    return buf
 
 def safe_unicode(e):
     """unicode(e) with various fallbacks. Used for exceptions, which may not be
@@ -53,23 +39,21 @@ def safe_unicode(e):
     except UnicodeError:
         pass
 
-    return u'Unrecoverably corrupt evalue'
+    return "Unrecoverably corrupt evalue"
+
 
 # keep reference to builtin_mod because the kernel overrides that value
 # to forward requests to a frontend.
-def input(prompt=''):
+def input(prompt=""):
     return builtin_mod.input(prompt)
 
-builtin_mod_name = "builtins"
-import builtins as builtin_mod
-
-MethodType = types.MethodType
 
 def execfile(fname, glob, loc=None, compiler=None):
     loc = loc if (loc is not None) else glob
-    with open(fname, 'rb') as f:
+    with open(fname, "rb") as f:
         compiler = compiler or compile
-        exec(compiler(f.read(), fname, 'exec'), glob, loc)
+        exec(compiler(f.read(), fname, "exec"), glob, loc)
+
 
 PYPY = platform.python_implementation() == "PyPy"
 
@@ -77,6 +61,7 @@ def execfile(fname, glob, loc=None, compiler=None):
 # See https://github.com/cython/cython/pull/3291 and
 # https://github.com/ipython/ipython/issues/12068
 def no_code(x, encoding=None):
-        return x
-unicode_to_str = cast_bytes_py2 = no_code
+    return x
 
+
+unicode_to_str = cast_bytes_py2 = no_code

From b2509e3a3f74995745b607448f86618c02df4274 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Dec 2021 17:04:42 -0800
Subject: [PATCH 0912/1407] Remove deprecated debugger chunks.

---
 IPython/core/debugger.py            | 102 +---------------------------
 IPython/core/interactiveshell.py    |   6 --
 IPython/core/tests/test_debugger.py |  19 ------
 IPython/utils/contexts.py           |  14 ----
 4 files changed, 3 insertions(+), 138 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 7163ae130d4..d9095d0c536 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -102,7 +102,6 @@
 #*****************************************************************************
 
 import bdb
-import functools
 import inspect
 import linecache
 import sys
@@ -163,94 +162,6 @@ def BdbQuit_IPython_excepthook(self, et, ev, tb, tb_offset=None):
     print('Exiting Debugger.')
 
 
-class Tracer(object):
-    """
-    DEPRECATED
-
-    Class for local debugging, similar to pdb.set_trace.
-
-    Instances of this class, when called, behave like pdb.set_trace, but
-    providing IPython's enhanced capabilities.
-
-    This is implemented as a class which must be initialized in your own code
-    and not as a standalone function because we need to detect at runtime
-    whether IPython is already active or not.  That detection is done in the
-    constructor, ensuring that this code plays nicely with a running IPython,
-    while functioning acceptably (though with limitations) if outside of it.
-    """
-
-    def __init__(self, colors=None):
-        """
-        DEPRECATED
-
-        Create a local debugger instance.
-
-        Parameters
-        ----------
-        colors : str, optional
-            The name of the color scheme to use, it must be one of IPython's
-            valid color schemes.  If not given, the function will default to
-            the current IPython scheme when running inside IPython, and to
-            'NoColor' otherwise.
-
-        Examples
-        --------
-        ::
-
-            from IPython.core.debugger import Tracer; debug_here = Tracer()
-
-        Later in your code::
-
-            debug_here()  # -> will open up the debugger at that point.
-
-        Once the debugger activates, you can use all of its regular commands to
-        step through code, set breakpoints, etc.  See the pdb documentation
-        from the Python standard library for usage details.
-        """
-        warnings.warn("`Tracer` is deprecated since version 5.1, directly use "
-                      "`IPython.core.debugger.Pdb.set_trace()`",
-                      DeprecationWarning, stacklevel=2)
-
-        ip = get_ipython()
-        if ip is None:
-            # Outside of ipython, we set our own exception hook manually
-            sys.excepthook = functools.partial(BdbQuit_excepthook,
-                                               excepthook=sys.excepthook)
-            def_colors = 'NoColor'
-        else:
-            # In ipython, we use its custom exception handler mechanism
-            def_colors = ip.colors
-            ip.set_custom_exc((bdb.BdbQuit,), BdbQuit_IPython_excepthook)
-
-        if colors is None:
-            colors = def_colors
-
-        # The stdlib debugger internally uses a modified repr from the `repr`
-        # module, that limits the length of printed strings to a hardcoded
-        # limit of 30 characters.  That much trimming is too aggressive, let's
-        # at least raise that limit to 80 chars, which should be enough for
-        # most interactive uses.
-        try:
-            from reprlib import aRepr
-            aRepr.maxstring = 80
-        except:
-            # This is only a user-facing convenience, so any error we encounter
-            # here can be warned about but can be otherwise ignored.  These
-            # printouts will tell us about problems if this API changes
-            import traceback
-            traceback.print_exc()
-
-        self.debugger = Pdb(colors)
-
-    def __call__(self):
-        """Starts an interactive debugger at the point where called.
-
-        This is similar to the pdb.set_trace() function from the std lib, but
-        using IPython's enhanced debugger."""
-
-        self.debugger.set_trace(sys._getframe().f_back)
-
-
 RGX_EXTRA_INDENT = re.compile(r'(?<=\n)\s+')
 
 
@@ -290,14 +201,11 @@ class Pdb(OldPdb):
         "debuggerskip": True,
     }
 
-    def __init__(self, color_scheme=None, completekey=None,
-                 stdin=None, stdout=None, context=5, **kwargs):
+    def __init__(self, completekey=None, stdin=None, stdout=None, context=5, **kwargs):
         """Create a new IPython debugger.
 
         Parameters
         ----------
-        color_scheme : default None
-            Deprecated, do not use.
         completekey : default None
             Passed to pdb.Pdb.
         stdin : default None
@@ -340,12 +248,8 @@ def __init__(self, color_scheme=None, completekey=None,
             # the debugger was entered. See also #9941.
             sys.modules["__main__"] = save_main
 
-        if color_scheme is not None:
-            warnings.warn(
-                "The `color_scheme` argument is deprecated since version 5.1",
-                DeprecationWarning, stacklevel=2)
-        else:
-            color_scheme = self.shell.colors
+
+        color_scheme = self.shell.colors
 
         self.aliases = {}
 
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 519494118ba..39e84ddbd7c 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -85,12 +85,6 @@
 from typing import List as ListType, Tuple, Optional, Callable
 from ast import stmt
 
-
-# NoOpContext is deprecated, but ipykernel imports it from here.
-# See https://github.com/ipython/ipykernel/issues/157
-# (2016, let's try to remove than in IPython 8.0)
-from IPython.utils.contexts import NoOpContext
-
 sphinxify: Optional[Callable]
 
 try:
diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 4b4af229881..65bcb5e2335 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -7,13 +7,8 @@
 import bdb
 import builtins
 import os
-import signal
-import subprocess
 import sys
-import time
-import warnings
 
-from subprocess import PIPE, CalledProcessError, check_output
 from tempfile import NamedTemporaryFile
 from textwrap import dedent
 from unittest.mock import patch
@@ -58,20 +53,6 @@ def __exit__(self, *exc):
 # Tests
 #-----------------------------------------------------------------------------
 
-def test_longer_repr():
-    from reprlib import repr as trepr
-    
-    a = '1234567890'* 7
-    ar = "'1234567890123456789012345678901234567890123456789012345678901234567890'"
-    a_trunc = "'123456789012...8901234567890'"
-    assert trepr(a) == a_trunc
-    # The creation of our tracer modifies the repr module's repr function
-    # in-place, since that global is used directly by the stdlib's pdb module.
-    with warnings.catch_warnings():
-        warnings.simplefilter('ignore', DeprecationWarning)
-        debugger.Tracer()
-    assert trepr(a) == ar
-
 def test_ipdb_magics():
     '''Test calling some IPython magics from ipdb.
 
diff --git a/IPython/utils/contexts.py b/IPython/utils/contexts.py
index 4d379b0eda1..7f95d4419dc 100644
--- a/IPython/utils/contexts.py
+++ b/IPython/utils/contexts.py
@@ -58,17 +58,3 @@ def __exit__(self, *exc_info):
         for k in self.to_delete:
             d.pop(k, None)
         d.update(self.to_update)
-
-
-class NoOpContext(object):
-    """
-    Deprecated
-    
-    Context manager that does nothing."""
-
-    def __init__(self):
-        warnings.warn("""NoOpContext is deprecated since IPython 5.0 """,
-                                            DeprecationWarning, stacklevel=2)
-
-    def __enter__(self): pass
-    def __exit__(self, type, value, traceback): pass

From 944f7c0e608e79a876dfd5c8c34ce58f02c9f93d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Dec 2021 17:23:05 -0800
Subject: [PATCH 0913/1407] Remove many deprecated things from the debugger.

Also remove a number of parameters that were deprecated.
---
 IPython/terminal/embed.py | 48 ++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/IPython/terminal/embed.py b/IPython/terminal/embed.py
index d2cbe888e2d..476359808c9 100644
--- a/IPython/terminal/embed.py
+++ b/IPython/terminal/embed.py
@@ -108,6 +108,14 @@ def exit_raise(self, parameter_s=''):
         self.shell.ask_exit()
 
 
+class _Sentinel:
+    def __init__(self, repr):
+        assert isinstance(repr, str)
+        self.repr = repr
+
+    def __repr__(self):
+        return repr
+
 
 class InteractiveShellEmbed(TerminalInteractiveShell):
 
@@ -148,9 +156,9 @@ def embedded_active(self, value):
                 self._call_location_id)
 
     def __init__(self, **kw):
-        if kw.get('user_global_ns', None) is not None:
-            raise DeprecationWarning(
-                "Key word argument `user_global_ns` has been replaced by `user_module` since IPython 4.0.")
+        assert (
+            "user_global_ns" not in kw
+        ), "Key word argument `user_global_ns` has been replaced by `user_module` since IPython 4.0."
 
         clid = kw.pop('_init_location_id', None)
         if not clid:
@@ -176,8 +184,16 @@ def init_magics(self):
         super(InteractiveShellEmbed, self).init_magics()
         self.register_magics(EmbeddedMagics)
 
-    def __call__(self, header='', local_ns=None, module=None, dummy=None,
-                 stack_depth=1, global_ns=None, compile_flags=None, **kw):
+    def __call__(
+        self,
+        header="",
+        local_ns=None,
+        module=None,
+        dummy=None,
+        stack_depth=1,
+        compile_flags=None,
+        **kw
+    ):
         """Activate the interactive interpreter.
 
         __call__(self,header='',local_ns=None,module=None,dummy=None) -> Start
@@ -227,8 +243,9 @@ def __call__(self, header='', local_ns=None, module=None, dummy=None,
 
         # Call the embedding code with a stack depth of 1 so it can skip over
         # our call and get the original caller's namespaces.
-        self.mainloop(local_ns, module, stack_depth=stack_depth,
-                      global_ns=global_ns, compile_flags=compile_flags)
+        self.mainloop(
+            local_ns, module, stack_depth=stack_depth, compile_flags=compile_flags
+        )
 
         self.banner2 = self.old_banner2
 
@@ -238,14 +255,19 @@ def __call__(self, header='', local_ns=None, module=None, dummy=None,
         if self.should_raise:
             raise KillEmbedded('Embedded IPython raising error, as user requested.')
 
-
-    def mainloop(self, local_ns=None, module=None, stack_depth=0,
-                 display_banner=None, global_ns=None, compile_flags=None):
+    def mainloop(
+        self,
+        local_ns=None,
+        module=None,
+        stack_depth=0,
+        compile_flags=None,
+    ):
         """Embeds IPython into a running python program.
 
         Parameters
         ----------
 
+
         local_ns, module
           Working local namespace (a dict) and module (a module or similar
           object). If given as None, they are automatically taken from the scope
@@ -266,12 +288,6 @@ def mainloop(self, local_ns=None, module=None, stack_depth=0,
 
         """
         
-        if (global_ns is not None) and (module is None):
-            raise DeprecationWarning("'global_ns' keyword argument is deprecated, and has been removed in IPython 5.0 use `module` keyword argument instead.")
-
-        if (display_banner is not None):
-            warnings.warn("The display_banner parameter is deprecated since IPython 4.0", DeprecationWarning)
-
         # Get locals and globals from caller
         if ((local_ns is None or module is None or compile_flags is None)
             and self.default_user_namespaces):

From aa169302f4acbbcae616154bf54c70167dbd1fd5 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sat, 4 Dec 2021 19:32:13 +0300
Subject: [PATCH 0914/1407] Everything is an object and has a `__class__` in
 Python 3

---
 IPython/core/oinspect.py | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 70a64c3952e..35a1461805b 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -182,11 +182,10 @@ def getsource(obj, oname='') -> Union[str,None]:
         except TypeError:
             # The object itself provided no meaningful source, try looking for
             # its class definition instead.
-            if hasattr(obj, '__class__'):
-                try:
-                    src = inspect.getsource(obj.__class__)
-                except TypeError:
-                    return None
+            try:
+                src = inspect.getsource(obj.__class__)
+            except TypeError:
+                return None
 
         return src
 
@@ -308,15 +307,14 @@ def find_file(obj) -> str:
     fname = None
     try:
         fname = inspect.getabsfile(obj)
-    except (OSError, TypeError):
+    except TypeError:
         # For an instance, the file that matters is where its class was
         # declared.
-        if hasattr(obj, '__class__'):
-            try:
-                fname = inspect.getabsfile(obj.__class__)
-            except (OSError, TypeError):
-                # Can happen for builtins
-                pass
+        try:
+            fname = inspect.getabsfile(obj.__class__)
+        except (OSError, TypeError):
+            # Can happen for builtins
+            pass
     except:
         pass
     return cast_unicode(fname)
@@ -345,10 +343,7 @@ def find_source_lines(obj):
             lineno = inspect.getsourcelines(obj)[1]
         except TypeError:
             # For instances, try the class object like getsource() does
-            if hasattr(obj, '__class__'):
-                lineno = inspect.getsourcelines(obj.__class__)[1]
-            else:
-                lineno = None
+            lineno = inspect.getsourcelines(obj.__class__)[1]
     except:
         return None
 

From d001cd1433512185d45cc32d8e24b3530dbee4d5 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sat, 4 Dec 2021 19:42:55 +0300
Subject: [PATCH 0915/1407] Handle OSError from
 inspect.getsource/getsourcelines (bpo-44648)

https://bugs.python.org/issue44648 (Python 3.10+)
---
 IPython/core/oinspect.py            | 17 +++++++++-----
 IPython/core/tests/test_oinspect.py | 35 ++++++++++++++++++++++++-----
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 35a1461805b..9e52f1e4771 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -184,8 +184,10 @@ def getsource(obj, oname='') -> Union[str,None]:
             # its class definition instead.
             try:
                 src = inspect.getsource(obj.__class__)
-            except TypeError:
+            except (OSError, TypeError):
                 return None
+        except OSError:
+            return None
 
         return src
 
@@ -315,8 +317,9 @@ def find_file(obj) -> str:
         except (OSError, TypeError):
             # Can happen for builtins
             pass
-    except:
+    except OSError:
         pass
+
     return cast_unicode(fname)
 
 
@@ -339,12 +342,14 @@ def find_source_lines(obj):
     obj = _get_wrapped(obj)
 
     try:
+        lineno = inspect.getsourcelines(obj)[1]
+    except TypeError:
+        # For instances, try the class object like getsource() does
         try:
-            lineno = inspect.getsourcelines(obj)[1]
-        except TypeError:
-            # For instances, try the class object like getsource() does
             lineno = inspect.getsourcelines(obj.__class__)[1]
-    except:
+        except (OSError, TypeError):
+            return None
+    except OSError:
         return None
 
     return lineno
diff --git a/IPython/core/tests/test_oinspect.py b/IPython/core/tests/test_oinspect.py
index 58d07db8030..94deb356a88 100644
--- a/IPython/core/tests/test_oinspect.py
+++ b/IPython/core/tests/test_oinspect.py
@@ -6,8 +6,11 @@
 
 
 from inspect import signature, Signature, Parameter
+import inspect
 import os
+import pytest
 import re
+import sys
 
 from .. import oinspect
 
@@ -28,6 +31,10 @@ def setup_module():
     inspector = oinspect.Inspector()
 
 
+class SourceModuleMainTest:
+    __module__ = "__main__"
+
+
 #-----------------------------------------------------------------------------
 # Local utilities
 #-----------------------------------------------------------------------------
@@ -36,15 +43,28 @@ def setup_module():
 # defined, if any code is inserted above, the following line will need to be
 # updated.  Do NOT insert any whitespace between the next line and the function
 # definition below.
-THIS_LINE_NUMBER = 39  # Put here the actual number of this line
+THIS_LINE_NUMBER = 46  # Put here the actual number of this line
+
+
+def test_find_source_lines():
+    assert oinspect.find_source_lines(test_find_source_lines) == THIS_LINE_NUMBER + 3
+    assert oinspect.find_source_lines(type) is None
+    assert oinspect.find_source_lines(SourceModuleMainTest) is None
+    assert oinspect.find_source_lines(SourceModuleMainTest()) is None
+
 
-from unittest import TestCase
+def test_getsource():
+    assert oinspect.getsource(type) is None
+    assert oinspect.getsource(SourceModuleMainTest) is None
+    assert oinspect.getsource(SourceModuleMainTest()) is None
 
-class Test(TestCase):
 
-    def test_find_source_lines(self):
-        self.assertEqual(oinspect.find_source_lines(Test.test_find_source_lines),
-                    THIS_LINE_NUMBER+6)
+def test_inspect_getfile_raises_exception():
+    """Check oinspect.find_file/getsource/find_source_lines expectations"""
+    with pytest.raises(TypeError):
+        inspect.getfile(type)
+    with pytest.raises(OSError if sys.version_info >= (3, 10) else TypeError):
+        inspect.getfile(SourceModuleMainTest)
 
 
 # A couple of utilities to ensure these tests work the same from a source or a
@@ -59,6 +79,9 @@ def match_pyfiles(f1, f2):
 
 def test_find_file():
     match_pyfiles(oinspect.find_file(test_find_file), os.path.abspath(__file__))
+    assert oinspect.find_file(type) is None
+    assert oinspect.find_file(SourceModuleMainTest) is None
+    assert oinspect.find_file(SourceModuleMainTest()) is None
 
 
 def test_find_file_decorated1():

From 3b816f803e98c3db9993ee7dfbd65cc121d4aae2 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sun, 5 Dec 2021 03:52:27 +0300
Subject: [PATCH 0916/1407] Tweak tests for PyPy and add CI runner

* `autoreload` tests are skipped on PyPy because `gc.get_referrers` is unusably slow here
* `doctest_refs` does not seem to test anything and was removed
* pexpect timeouts were adjusted because subprocess communication is 3-4 times slower on PyPy
* few other tweaks
---
 .github/workflows/test.yml                  | 10 +++++++++
 IPython/core/tests/test_async_helpers.py    |  3 ++-
 IPython/core/tests/test_debugger.py         |  8 +++++--
 IPython/core/tests/test_magic.py            |  2 ++
 IPython/core/tests/test_run.py              | 25 +++++++++++++++------
 IPython/core/tests/test_ultratb.py          |  6 +++--
 IPython/extensions/tests/test_autoreload.py |  8 +++++++
 IPython/terminal/tests/test_debug_magic.py  |  2 ++
 IPython/terminal/tests/test_embed.py        |  3 ++-
 IPython/testing/plugin/show_refs.py         | 19 ----------------
 IPython/testing/plugin/test_refs.py         |  7 ------
 IPython/utils/ipstruct.py                   |  2 +-
 12 files changed, 55 insertions(+), 40 deletions(-)
 delete mode 100644 IPython/testing/plugin/show_refs.py

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 898dfe5f8d2..5cb06d92e52 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,6 +33,16 @@ jobs:
           - os: ubuntu-latest
             python-version: "3.11-dev"
             deps: test
+          # Installing optional dependencies stuff takes ages on PyPy
+          - os: ubuntu-latest
+            python-version: "pypy-3.8"
+            deps: test
+          - os: windows-latest
+            python-version: "pypy-3.8"
+            deps: test
+          - os: macos-latest
+            python-version: "pypy-3.8"
+            deps: test
 
     steps:
     - uses: actions/checkout@v2
diff --git a/IPython/core/tests/test_async_helpers.py b/IPython/core/tests/test_async_helpers.py
index 9ca67f47e9e..40a840c5b16 100644
--- a/IPython/core/tests/test_async_helpers.py
+++ b/IPython/core/tests/test_async_helpers.py
@@ -3,6 +3,7 @@
 
 Should only trigger on python 3.5+ or will have syntax errors.
 """
+import platform
 from itertools import chain, repeat
 from textwrap import dedent, indent
 from unittest import TestCase
@@ -275,7 +276,7 @@ def test_autoawait(self):
         """
         )
 
-    if sys.version_info < (3,9):
+    if sys.version_info < (3, 9) and platform.python_implementation() != "PyPy":
         # new pgen parser in 3.9 does not raise MemoryError on too many nested
         # parens anymore
         def test_memory_error(self):
diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 65bcb5e2335..75ce9fd7dcf 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -371,11 +371,13 @@ def _decorator_skip_setup():
     child = pexpect.spawn(
         sys.executable, ["-m", "IPython", "--colors=nocolor"], env=env
     )
-    child.timeout = 5 * IPYTHON_TESTING_TIMEOUT_SCALE
+    child.timeout = 15 * IPYTHON_TESTING_TIMEOUT_SCALE
 
     child.expect("IPython")
     child.expect("\n")
 
+    child.timeout = 5 * IPYTHON_TESTING_TIMEOUT_SCALE
+
     dedented_blocks = [dedent(b).strip() for b in skip_decorators_blocks]
     in_prompt_number = 1
     for cblock in dedented_blocks:
@@ -448,11 +450,13 @@ def test_decorator_skip_with_breakpoint():
     child = pexpect.spawn(
         sys.executable, ["-m", "IPython", "--colors=nocolor"], env=env
     )
-    child.timeout = 5 * IPYTHON_TESTING_TIMEOUT_SCALE
+    child.timeout = 15 * IPYTHON_TESTING_TIMEOUT_SCALE
 
     child.expect("IPython")
     child.expect("\n")
 
+    child.timeout = 5 * IPYTHON_TESTING_TIMEOUT_SCALE
+
     ### we need a filename, so we need to exec the full block with a filename
     with NamedTemporaryFile(suffix=".py", dir=".", delete=True) as tf:
 
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 428d7114a35..aa006f63594 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -2,6 +2,7 @@
 """Tests for various magic functions."""
 
 import asyncio
+import gc
 import io
 import os
 import re
@@ -576,6 +577,7 @@ def test_xdel(self):
         _ip.magic("xdel a")
 
         # Check that a's __del__ method has been called.
+        gc.collect(0)
         assert monitor == [1]
 
 def doctest_who():
diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index a872f5a6620..0f73a781e3e 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -18,6 +18,7 @@
 
 import functools
 import os
+import platform
 from os.path import join as pjoin
 import random
 import string
@@ -158,7 +159,7 @@ def doctest_reset_del():
 
     In [3]: a = A()
 
-    In [4]: get_ipython().reset()
+    In [4]: get_ipython().reset(); import gc; x = gc.collect(0)
     Hi
 
     In [5]: 1+1
@@ -241,6 +242,10 @@ def test_simpledef(self):
         _ip.run_cell("t = isinstance(f(), foo)")
         assert _ip.user_ns["t"] is True
 
+    @pytest.mark.xfail(
+        platform.python_implementation() == "PyPy",
+        reason="expecting __del__ call on exit is unreliable and doesn't happen on PyPy",
+    )
     def test_obj_del(self):
         """Test that object's __del__ methods are called on exit."""
         src = ("class A(object):\n"
@@ -286,14 +291,20 @@ def test_run_second(self):
             _ip.magic("run %s" % empty.fname)
             assert _ip.user_ns["afunc"]() == 1
 
-    @dec.skip_win32
     def test_tclass(self):
         mydir = os.path.dirname(__file__)
-        tc = os.path.join(mydir, 'tclass')
-        src = ("%%run '%s' C-first\n"
-               "%%run '%s' C-second\n"
-               "%%run '%s' C-third\n") % (tc, tc, tc)
-        self.mktmp(src, '.ipy')
+        tc = os.path.join(mydir, "tclass")
+        src = f"""\
+import gc
+%run "{tc}" C-first
+gc.collect(0)
+%run "{tc}" C-second
+gc.collect(0)
+%run "{tc}" C-third
+gc.collect(0)
+%reset -f
+"""
+        self.mktmp(src, ".ipy")
         out = """\
 ARGV 1-: ['C-first']
 ARGV 1-: ['C-second']
diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index d0f13dff066..66a7a95c122 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -3,6 +3,7 @@
 """
 import io
 import logging
+import platform
 import re
 import sys
 import os.path
@@ -248,7 +249,8 @@ def test_non_syntaxerror(self):
                 ip.showsyntaxerror()
 
 import sys
-if sys.version_info < (3,9):
+
+if sys.version_info < (3, 9) and platform.python_implementation() != "PyPy":
     """
     New 3.9 Pgen Parser does not raise Memory error, except on failed malloc.
     """
@@ -359,7 +361,7 @@ def test_recursion_one_frame(self):
         ):
             ip.run_cell("r1()")
 
-    @recursionlimit(200)
+    @recursionlimit(160)
     def test_recursion_three_frames(self):
         with tt.AssertPrints("[... skipping similar frames: "), \
                 tt.AssertPrints(re.compile(r"r3a at line 8 \(\d{2} times\)"), suppress=False), \
diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index e03a08eec97..8cc55e7d28b 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -13,6 +13,8 @@
 # -----------------------------------------------------------------------------
 
 import os
+import platform
+import pytest
 import sys
 import tempfile
 import textwrap
@@ -28,6 +30,12 @@
 from IPython.extensions.autoreload import AutoreloadMagics
 from IPython.core.events import EventManager, pre_run_cell
 
+if platform.python_implementation() == "PyPy":
+    pytest.skip(
+        "Current autoreload implementation is extremly slow on PyPy",
+        allow_module_level=True,
+    )
+
 # -----------------------------------------------------------------------------
 # Test fixture
 # -----------------------------------------------------------------------------
diff --git a/IPython/terminal/tests/test_debug_magic.py b/IPython/terminal/tests/test_debug_magic.py
index d19f8277c19..faa3b7c4993 100644
--- a/IPython/terminal/tests/test_debug_magic.py
+++ b/IPython/terminal/tests/test_debug_magic.py
@@ -51,6 +51,8 @@ def test_debug_magic_passes_through_generators():
     child.sendline("    pass")
     child.sendline("")
 
+    child.timeout = 10 * IPYTHON_TESTING_TIMEOUT_SCALE
+
     child.expect('Exception:')
 
     child.expect(in_prompt)
diff --git a/IPython/terminal/tests/test_embed.py b/IPython/terminal/tests/test_embed.py
index ac4c9424427..3f0885e73cc 100644
--- a/IPython/terminal/tests/test_embed.py
+++ b/IPython/terminal/tests/test_embed.py
@@ -74,8 +74,9 @@ def test_nest_embed():
 
     child = pexpect.spawn(sys.executable, ['-m', 'IPython', '--colors=nocolor'],
                           env=env)
-    child.timeout = 5 * IPYTHON_TESTING_TIMEOUT_SCALE
+    child.timeout = 15 * IPYTHON_TESTING_TIMEOUT_SCALE
     child.expect(ipy_prompt)
+    child.timeout = 5 * IPYTHON_TESTING_TIMEOUT_SCALE
     child.sendline("import IPython")
     child.expect(ipy_prompt)
     child.sendline("ip0 = get_ipython()")
diff --git a/IPython/testing/plugin/show_refs.py b/IPython/testing/plugin/show_refs.py
deleted file mode 100644
index b2c70adfc1e..00000000000
--- a/IPython/testing/plugin/show_refs.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""Simple script to show reference holding behavior.
-
-This is used by a companion test case.
-"""
-
-import gc
-
-class C(object):
-   def __del__(self):
-      pass
-      #print 'deleting object...'  # dbg
-
-if __name__ == '__main__':
-   c = C()
-
-   c_refs = gc.get_referrers(c)
-   ref_ids = list(map(id,c_refs))
-
-   print('c referrers:',list(map(type,c_refs)))
diff --git a/IPython/testing/plugin/test_refs.py b/IPython/testing/plugin/test_refs.py
index bd7ad8fb3e3..b92448be074 100644
--- a/IPython/testing/plugin/test_refs.py
+++ b/IPython/testing/plugin/test_refs.py
@@ -37,10 +37,3 @@ def doctest_ivars():
     In [6]: zz
     Out[6]: 1
     """
-
-def doctest_refs():
-    """DocTest reference holding issues when running scripts.
-
-    In [32]: run show_refs.py
-    c referrers: [<... 'dict'>]
-    """
diff --git a/IPython/utils/ipstruct.py b/IPython/utils/ipstruct.py
index d71a75e22c4..ed112101a36 100644
--- a/IPython/utils/ipstruct.py
+++ b/IPython/utils/ipstruct.py
@@ -131,7 +131,7 @@ def __getattr__(self, key):
         >>> s.a
         10
         >>> type(s.get)
-        <... 'builtin_function_or_method'>
+        <...method'>
         >>> try:
         ...     s.b
         ... except AttributeError:

From eab708fce88447b819c488c228ad901dd1e6d1eb Mon Sep 17 00:00:00 2001
From: Ben Greiner <code@bnavigator.de>
Date: Sat, 4 Dec 2021 17:23:49 +0100
Subject: [PATCH 0917/1407] use alphachannel for aliased png latex

---
 IPython/lib/latextools.py | 23 ++++++++++++++++++++---
 IPython/utils/timing.py   |  1 -
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py
index 540d3f50475..a7bb08dfff9 100644
--- a/IPython/lib/latextools.py
+++ b/IPython/lib/latextools.py
@@ -161,9 +161,26 @@ def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):
 
             resolution = round(150*scale)
             subprocess.check_call(
-                ["dvipng", "-T", "tight", "-D", str(resolution), "-z", "9",
-                 "-bg", "transparent", "-o", outfile, dvifile, "-fg", color],
-                 cwd=workdir, stdout=devnull, stderr=devnull)
+                [
+                    "dvipng",
+                    "-T",
+                    "tight",
+                    "-D",
+                    str(resolution),
+                    "-z",
+                    "9",
+                    "-bg",
+                    "Transparent",
+                    "-o",
+                    outfile,
+                    dvifile,
+                    "-fg",
+                    color,
+                ],
+                cwd=workdir,
+                stdout=devnull,
+                stderr=devnull,
+            )
 
         with outfile.open("rb") as f:
             return f.read()
diff --git a/IPython/utils/timing.py b/IPython/utils/timing.py
index 32741acdd9c..92f6883c4af 100644
--- a/IPython/utils/timing.py
+++ b/IPython/utils/timing.py
@@ -62,7 +62,6 @@ def clock2():
         Similar to clock(), but return a tuple of user/system times."""
         return resource.getrusage(resource.RUSAGE_SELF)[:2]
 
-
 else:
     # There is no distinction of user/system time under windows, so we just use
     # time.perff_counter() for everything...

From 59c23dd2b1927b468e90325284f52b8d8862b8e5 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Mon, 6 Dec 2021 21:32:40 +0300
Subject: [PATCH 0918/1407] Pytest diagnostics improvement for
 `IPython.testing.tools`

* Make Pytest rewrite assertions inside `IPython.testing.tools` to produce informative error reports.
* Skip `IPython.testing.tools` functions frames to make error pointing inside the code of the failing test.
* Change `ipexec` assertions back to be on string to receive a text diff.
---
 IPython/conftest.py      |  3 +++
 IPython/testing/tools.py | 20 +++++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/IPython/conftest.py b/IPython/conftest.py
index 8b2af8c020a..fb73d4b2f33 100644
--- a/IPython/conftest.py
+++ b/IPython/conftest.py
@@ -6,6 +6,9 @@
 import pathlib
 import shutil
 
+# Must register before it gets imported
+pytest.register_assert_rewrite("IPython.testing.tools")
+
 from .testing import tools
 
 
diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py
index 31bfd426863..0d52d88d2bf 100644
--- a/IPython/testing/tools.py
+++ b/IPython/testing/tools.py
@@ -181,7 +181,10 @@ def ipexec(fname, options=None, commands=()):
     -------
     ``(stdout, stderr)`` of ipython subprocess.
     """
-    if options is None: options = []
+    __tracebackhide__ = True
+
+    if options is None:
+        options = []
 
     cmdargs = default_argv() + options
 
@@ -239,6 +242,7 @@ def ipexec_validate(fname, expected_out, expected_err='',
     -------
     None
     """
+    __tracebackhide__ = True
 
     out, err = ipexec(fname, options, commands)
     #print 'OUT', out  # dbg
@@ -247,12 +251,16 @@ def ipexec_validate(fname, expected_out, expected_err='',
     # more informative than simply having an empty stdout.
     if err:
         if expected_err:
-            assert err.strip().splitlines() == expected_err.strip().splitlines()
+            assert "\n".join(err.strip().splitlines()) == "\n".join(
+                expected_err.strip().splitlines()
+            )
         else:
             raise ValueError('Running file %r produced error: %r' %
                              (fname, err))
     # If no errors or output on stderr was expected, match stdout
-    assert out.strip().splitlines() == expected_out.strip().splitlines()
+    assert "\n".join(out.strip().splitlines()) == "\n".join(
+        expected_out.strip().splitlines()
+    )
 
 
 class TempFileMixin(unittest.TestCase):
@@ -312,6 +320,8 @@ def check_pairs(func, pairs):
     None. Raises an AssertionError if any output does not match the expected
     value.
     """
+    __tracebackhide__ = True
+
     name = getattr(func, "func_name", getattr(func, "__name__", "<unknown>"))
     for inp, expected in pairs:
         out = func(inp)
@@ -354,6 +364,8 @@ def __enter__(self):
         setattr(sys, self.channel, self.buffer if self.suppress else self.tee)
 
     def __exit__(self, etype, value, traceback):
+        __tracebackhide__ = True
+
         try:
             if value is not None:
                 # If an error was raised, don't check anything else
@@ -381,6 +393,8 @@ class AssertNotPrints(AssertPrints):
 
     Counterpart of AssertPrints"""
     def __exit__(self, etype, value, traceback):
+        __tracebackhide__ = True
+
         try:
             if value is not None:
                 # If an error was raised, don't check anything else

From c22ed50325ad51c2c5ee080702d7fca96bc8b780 Mon Sep 17 00:00:00 2001
From: nicolaslazo <45973144+nicolaslazo@users.noreply.github.com>
Date: Wed, 8 Dec 2021 02:36:48 +0100
Subject: [PATCH 0919/1407] Fix uncaught ValueError in rerun magic int
 conversion

---
 IPython/core/magics/history.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IPython/core/magics/history.py b/IPython/core/magics/history.py
index 28f91fa5a82..ad58b33b0b3 100644
--- a/IPython/core/magics/history.py
+++ b/IPython/core/magics/history.py
@@ -299,7 +299,11 @@ def rerun(self, parameter_s=''):
         """
         opts, args = self.parse_options(parameter_s, 'l:g:', mode='string')
         if "l" in opts:         # Last n lines
-            n = int(opts['l'])
+            try:
+                n = int(opts["l"])
+            except ValueError:
+                print("Number of lines must be an integer")
+                return
 
             if n == 0:
                 print("Requested 0 last lines - nothing to run")

From e0b9394e144221da58df39b6fb26947bad5b1d72 Mon Sep 17 00:00:00 2001
From: Andrew Port <andyaport@gmail.com>
Date: Tue, 7 Dec 2021 18:39:49 -0800
Subject: [PATCH 0920/1407] Add comma groupings to timeit magic loop count

---
 IPython/core/magics/execution.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index d74f4c2de2f..1b1c7b77940 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -92,17 +92,15 @@ def __str__(self):
                 pm = u'\xb1'
             except:
                 pass
-        return (
-            u"{mean} {pm} {std} per loop (mean {pm} std. dev. of {runs} run{run_plural}, {loops} loop{loop_plural} each)"
-                .format(
-                    pm = pm,
-                    runs = self.repeat,
-                    loops = self.loops,
-                    loop_plural = "" if self.loops == 1 else "s",
-                    run_plural = "" if self.repeat == 1 else "s",
-                    mean = _format_time(self.average, self._precision),
-                    std = _format_time(self.stdev, self._precision))
-                )
+        return "{mean} {pm} {std} per loop (mean {pm} std. dev. of {runs} run{run_plural}, {loops:,} loop{loop_plural} each)".format(
+            pm=pm,
+            runs=self.repeat,
+            loops=self.loops,
+            loop_plural="" if self.loops == 1 else "s",
+            run_plural="" if self.repeat == 1 else "s",
+            mean=_format_time(self.average, self._precision),
+            std=_format_time(self.stdev, self._precision),
+        )
 
     def _repr_pretty_(self, p , cycle):
         unic = self.__str__()

From 96f8b20fb716570b869d05740e249b4fabef8e00 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 8 Dec 2021 09:19:57 -0800
Subject: [PATCH 0921/1407] Start deprecating %%javascript/%%js

See #13376
---
 IPython/core/magics/display.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/IPython/core/magics/display.py b/IPython/core/magics/display.py
index c4350e404d2..6c0eff6884f 100644
--- a/IPython/core/magics/display.py
+++ b/IPython/core/magics/display.py
@@ -36,12 +36,23 @@ def js(self, line, cell):
         """Run the cell block of Javascript code
 
         Alias of `%%javascript`
+
+        Starting with IPython 8.0 %%javascript is pending deprecation to be replaced
+        by a more flexible system
+
+        Please See https://github.com/ipython/ipython/issues/13376
         """
         self.javascript(line, cell)
 
     @cell_magic
     def javascript(self, line, cell):
-        """Run the cell block of Javascript code"""
+        """Run the cell block of Javascript code
+
+        Starting with IPython 8.0 %%javascript is pending deprecation to be replaced
+        by a more flexible system
+
+        Please See https://github.com/ipython/ipython/issues/13376
+        """
         display(Javascript(cell))
 
 

From d4a3285599a32e425eb471dfcc1d3b72ceebc428 Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Mon, 25 Oct 2021 19:15:14 -0400
Subject: [PATCH 0922/1407] Remove building scripts manually, console_scripts
 is preferred

---
 setup.py     |  1 -
 setupbase.py | 46 ----------------------------------------------
 2 files changed, 47 deletions(-)

diff --git a/setup.py b/setup.py
index 69279cdf438..d8d416fad3e 100755
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,6 @@
     find_package_data,
     check_package_data_first,
     find_entry_points,
-    build_scripts_entrypt,
     find_data_files,
     git_prebuild,
     install_symlinked,
diff --git a/setupbase.py b/setupbase.py
index 97cebe807e1..646388f6bb8 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -21,8 +21,6 @@
 from setuptools import Command
 from setuptools.command.build_py import build_py
 
-# TODO: Replacement for this?
-from distutils.command.build_scripts import build_scripts
 from setuptools.command.install import install
 from setuptools.command.install_scripts import install_scripts
 
@@ -238,50 +236,6 @@ def find_entry_points():
     suffix = str(sys.version_info[0])
     return [e % '' for e in ep] + [e % suffix for e in ep]
 
-script_src = """#!{executable}
-# This script was automatically generated by setup.py
-if __name__ == '__main__':
-    from {mod} import {func}
-    {func}()
-"""
-
-class build_scripts_entrypt(build_scripts):
-    """Build the command line scripts
-
-    Parse setuptools style entry points and write simple scripts to run the
-    target functions.
-
-    On Windows, this also creates .cmd wrappers for the scripts so that you can
-    easily launch them from a command line.
-    """
-    def run(self):
-        self.mkpath(self.build_dir)
-        outfiles = []
-        for script in find_entry_points():
-            name, entrypt = script.split('=')
-            name = name.strip()
-            entrypt = entrypt.strip()
-            outfile = os.path.join(self.build_dir, name)
-            outfiles.append(outfile)
-            print('Writing script to', outfile)
-
-            mod, func = entrypt.split(':')
-            with open(outfile, 'w') as f:
-                f.write(script_src.format(executable=sys.executable,
-                                          mod=mod, func=func))
-
-            if sys.platform == 'win32':
-                # Write .cmd wrappers for Windows so 'ipython' etc. work at the
-                # command line
-                cmd_file = os.path.join(self.build_dir, name + '.cmd')
-                cmd = r'@"{python}" "%~dp0\{script}" %*\r\n'.format(
-                        python=sys.executable, script=name)
-                log.info("Writing %s wrapper script" % cmd_file)
-                with open(cmd_file, 'w') as f:
-                    f.write(cmd)
-
-        return outfiles, outfiles
-
 class install_lib_symlink(Command):
     user_options = [
         ('install-dir=', 'd', "directory to install to"),

From 7819f4889810d3a13fde159de6f92497ae5348b6 Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Mon, 25 Oct 2021 19:28:03 -0400
Subject: [PATCH 0923/1407] Only use setuptools, avoid distutils as much as
 possible

---
 setup.py | 51 ++++++++++++++-------------------------------------
 1 file changed, 14 insertions(+), 37 deletions(-)

diff --git a/setup.py b/setup.py
index d8d416fad3e..5ff71640126 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,6 @@
 
 import os
 import sys
-from pathlib import Path
 
 # **Python version check**
 #
@@ -61,12 +60,7 @@
 
 # At least we're on the python version we need, move on.
 
-# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
-# update it when the contents of directories change.
-if Path("MANIFEST").exists():
-    Path("MANIFEST").unlink()
-
-from distutils.core import setup
+from setuptools import setup
 
 # Our own imports
 from setupbase import target_update
@@ -137,7 +131,7 @@
 # custom distutils commands
 #---------------------------------------------------------------------------
 # imports here, so they are after setuptools import if there was one
-from distutils.command.sdist import sdist
+from setuptools.command.sdist import sdist
 
 setup_args['cmdclass'] = {
     'build_py': \
@@ -154,16 +148,6 @@
 # Handle scripts, dependencies, and setuptools specific things
 #---------------------------------------------------------------------------
 
-# For some commands, use setuptools.  Note that we do NOT list install here!
-# If you want a setuptools-enhanced install, just run 'setupegg.py install'
-needs_setuptools = {'develop', 'release', 'bdist_egg', 'bdist_rpm',
-           'bdist', 'bdist_dumb', 'bdist_wininst', 'bdist_wheel',
-           'egg_info', 'easy_install', 'upload', 'install_egg_info',
-          }
-
-if len(needs_setuptools.intersection(sys.argv)) > 0:
-    import setuptools
-
 # This dict is used for passing extra arguments that are setuptools
 # specific to setup
 setuptools_extra_args = {}
@@ -244,25 +228,18 @@
         everything.update(deps)
 extras_require['all'] = list(sorted(everything))
 
-if "setuptools" in sys.modules:
-    setuptools_extra_args["python_requires"] = ">=3.8"
-    setuptools_extra_args["zip_safe"] = False
-    setuptools_extra_args["entry_points"] = {
-        "console_scripts": find_entry_points(),
-        "pygments.lexers": [
-            "ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer",
-            "ipython = IPython.lib.lexers:IPythonLexer",
-            "ipython3 = IPython.lib.lexers:IPython3Lexer",
-        ],
-    }
-    setup_args['extras_require'] = extras_require
-    setup_args['install_requires'] = install_requires
-
-else:
-    # scripts has to be a non-empty list, or install_scripts isn't called
-    setup_args['scripts'] = [e.split('=')[0].strip() for e in find_entry_points()]
-
-    setup_args['cmdclass']['build_scripts'] = build_scripts_entrypt
+setuptools_extra_args["python_requires"] = ">=3.8"
+setuptools_extra_args["zip_safe"] = False
+setuptools_extra_args["entry_points"] = {
+    "console_scripts": find_entry_points(),
+    "pygments.lexers": [
+        "ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer",
+        "ipython = IPython.lib.lexers:IPythonLexer",
+        "ipython3 = IPython.lib.lexers:IPython3Lexer",
+    ],
+}
+setup_args["extras_require"] = extras_require
+setup_args["install_requires"] = install_requires
 
 #---------------------------------------------------------------------------
 # Do the actual setup now

From 615a72675830882cd616c9229123a573fcedca00 Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Mon, 25 Oct 2021 19:32:49 -0400
Subject: [PATCH 0924/1407] Move project_urls to setup.cfg

---
 setup.cfg    | 5 +++++
 setupbase.py | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 31a467ccbf3..ae8e92154ae 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,10 @@
 [metadata]
 license_file = LICENSE
+project_urls =
+    Documentation = https://ipython.readthedocs.io/
+    Funding = https://numfocus.org/
+    Source = https://github.com/ipython/ipython
+    Tracker = https://github.com/ipython/ipython/issues
 
 [velin]
 ignore_patterns = 
diff --git a/setupbase.py b/setupbase.py
index 646388f6bb8..135fac1b65d 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -74,12 +74,6 @@ def file_doesnt_endwith(test,endings):
       keywords         = keywords,
       classifiers      = classifiers,
       cmdclass         = {'install_data': install_data_ext},
-      project_urls={
-          'Documentation': 'https://ipython.readthedocs.io/',
-          'Funding'      : 'https://numfocus.org/',
-          'Source'       : 'https://github.com/ipython/ipython',
-          'Tracker'      : 'https://github.com/ipython/ipython/issues',
-      }
       )
 
 

From dedf015a971e4a9aa11865f612d460414d9286d8 Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Mon, 25 Oct 2021 20:12:16 -0400
Subject: [PATCH 0925/1407] Set version in setup.cfg

---
 setup.cfg    | 1 +
 setupbase.py | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index ae8e92154ae..f1e1cf836bd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,4 +1,5 @@
 [metadata]
+version = attr: IPython.core.release.__version__
 license_file = LICENSE
 project_urls =
     Documentation = https://ipython.readthedocs.io/
diff --git a/setupbase.py b/setupbase.py
index 135fac1b65d..5a92b0db211 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -63,7 +63,6 @@ def file_doesnt_endwith(test,endings):
 # This dict is eventually passed to setup after additional keys are added.
 setup_args = dict(
       name             = name,
-      version          = version,
       description      = description,
       long_description = long_description,
       author           = author,

From 77651b7a7331b1b030f1c2c03310bf7ebb242488 Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Mon, 25 Oct 2021 20:34:51 -0400
Subject: [PATCH 0926/1407] Specify install_requires in setup.cfg

---
 setup.cfg | 16 ++++++++++++++++
 setup.py  | 42 +-----------------------------------------
 2 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index f1e1cf836bd..5dd19c5c2d3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,6 +7,22 @@ project_urls =
     Source = https://github.com/ipython/ipython
     Tracker = https://github.com/ipython/ipython/issues
 
+[options]
+install_requires =
+    setuptools>=18.5
+    jedi>=0.16
+    decorator
+    pickleshare
+    traitlets>=4.2
+    prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1
+    pygments
+    backcall
+    stack_data
+    matplotlib-inline
+    pexpect>4.3; sys_platform != "win32"
+    appnope; sys_platform == "darwin"
+    colorama; sys_platform == "win32"
+
 [velin]
 ignore_patterns = 
    IPython/core/tests,
diff --git a/setup.py b/setup.py
index 5ff71640126..04314424e59 100755
--- a/setup.py
+++ b/setup.py
@@ -181,46 +181,6 @@
     nbconvert=["nbconvert"],
 )
 
-install_requires = [
-    "setuptools>=18.5",
-    "jedi>=0.16",
-    "decorator",
-    "pickleshare",
-    "traitlets>=4.2",
-    "prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1",
-    "pygments",
-    "backcall",
-    "stack_data",
-    "matplotlib-inline",
-]
-
-# Platform-specific dependencies:
-# This is the correct way to specify these,
-# but requires pip >= 6. pip < 6 ignores these.
-
-extras_require.update(
-    {
-        ':sys_platform != "win32"': ["pexpect>4.3"],
-        ':sys_platform == "darwin"': ["appnope"],
-        ':sys_platform == "win32"': ["colorama"],
-    }
-)
-# FIXME: re-specify above platform dependencies for pip < 6
-# These would result in non-portable bdists.
-if not any(arg.startswith('bdist') for arg in sys.argv):
-    if sys.platform == 'darwin':
-        install_requires.extend(['appnope'])
-
-    if not sys.platform.startswith("win"):
-        install_requires.append("pexpect>4.3")
-
-    # workaround pypa/setuptools#147, where setuptools misspells
-    # platform_python_implementation as python_implementation
-    if 'setuptools' in sys.modules:
-        for key in list(extras_require):
-            if 'platform_python_implementation' in key:
-                new_key = key.replace('platform_python_implementation', 'python_implementation')
-                extras_require[new_key] = extras_require.pop(key)
 
 everything = set()
 for key, deps in extras_require.items():
@@ -238,8 +198,8 @@
         "ipython3 = IPython.lib.lexers:IPython3Lexer",
     ],
 }
+
 setup_args["extras_require"] = extras_require
-setup_args["install_requires"] = install_requires
 
 #---------------------------------------------------------------------------
 # Do the actual setup now

From c512199dd19f3413c7f5951cec43b1f9dd69e40f Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Mon, 25 Oct 2021 20:36:02 -0400
Subject: [PATCH 0927/1407] Put pygments.lexers entry point in setup.cfg

---
 setup.cfg | 6 ++++++
 setup.py  | 9 +--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 5dd19c5c2d3..5223f826879 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,6 +23,12 @@ install_requires =
     appnope; sys_platform == "darwin"
     colorama; sys_platform == "win32"
 
+[options.entry_points]
+pygments.lexers =
+    ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer
+    ipython = IPython.lib.lexers:IPythonLexer
+    ipython3 = IPython.lib.lexers:IPython3Lexer
+
 [velin]
 ignore_patterns = 
    IPython/core/tests,
diff --git a/setup.py b/setup.py
index 04314424e59..8d119abee77 100755
--- a/setup.py
+++ b/setup.py
@@ -190,14 +190,7 @@
 
 setuptools_extra_args["python_requires"] = ">=3.8"
 setuptools_extra_args["zip_safe"] = False
-setuptools_extra_args["entry_points"] = {
-    "console_scripts": find_entry_points(),
-    "pygments.lexers": [
-        "ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer",
-        "ipython = IPython.lib.lexers:IPythonLexer",
-        "ipython3 = IPython.lib.lexers:IPython3Lexer",
-    ],
-}
+setuptools_extra_args["entry_points"] = {"console_scripts": find_entry_points()}
 
 setup_args["extras_require"] = extras_require
 

From b829a038a9459f01d65a667cbc64e910310e19db Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Mon, 25 Oct 2021 20:38:42 -0400
Subject: [PATCH 0928/1407] Put zip_safe and python_requires in setup.cfg

---
 setup.cfg | 2 ++
 setup.py  | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 5223f826879..a13d299fd21 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,6 +8,8 @@ project_urls =
     Tracker = https://github.com/ipython/ipython/issues
 
 [options]
+python_requires = >=3.8
+zip_safe = False
 install_requires =
     setuptools>=18.5
     jedi>=0.16
diff --git a/setup.py b/setup.py
index 8d119abee77..9a2925d766b 100755
--- a/setup.py
+++ b/setup.py
@@ -188,10 +188,7 @@
         everything.update(deps)
 extras_require['all'] = list(sorted(everything))
 
-setuptools_extra_args["python_requires"] = ">=3.8"
-setuptools_extra_args["zip_safe"] = False
 setuptools_extra_args["entry_points"] = {"console_scripts": find_entry_points()}
-
 setup_args["extras_require"] = extras_require
 
 #---------------------------------------------------------------------------

From ac21a9b6d68c0e6f42527282aefb49f06aacc781 Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Mon, 25 Oct 2021 20:44:55 -0400
Subject: [PATCH 0929/1407] Specify console_scripts in setup.cfg

---
 setup.cfg | 5 +++++
 setup.py  | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index a13d299fd21..2209f4274b7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,6 +26,11 @@ install_requires =
     colorama; sys_platform == "win32"
 
 [options.entry_points]
+console_scripts =
+    ipython = IPython:start_ipython
+    iptest = IPython.testing.iptestcontroller:main
+    ipython3 = IPython:start_ipython
+    iptest3 = IPython.testing.iptestcontroller:main
 pygments.lexers =
     ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer
     ipython = IPython.lib.lexers:IPythonLexer
diff --git a/setup.py b/setup.py
index 9a2925d766b..863f1fdf409 100755
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,6 @@
     find_packages,
     find_package_data,
     check_package_data_first,
-    find_entry_points,
     find_data_files,
     git_prebuild,
     install_symlinked,
@@ -188,7 +187,6 @@
         everything.update(deps)
 extras_require['all'] = list(sorted(everything))
 
-setuptools_extra_args["entry_points"] = {"console_scripts": find_entry_points()}
 setup_args["extras_require"] = extras_require
 
 #---------------------------------------------------------------------------

From ca92ec6af89bdb43b8b72da0a91b46bb5ebd2649 Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Mon, 25 Oct 2021 21:07:00 -0400
Subject: [PATCH 0930/1407] Use setuptools' find_packages()

---
 setup.cfg | 9 +++++++--
 setup.py  | 3 ---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2209f4274b7..fb632bb1109 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,6 +8,7 @@ project_urls =
     Tracker = https://github.com/ipython/ipython/issues
 
 [options]
+packages = find:
 python_requires = >=3.8
 zip_safe = False
 install_requires =
@@ -25,12 +26,16 @@ install_requires =
     appnope; sys_platform == "darwin"
     colorama; sys_platform == "win32"
 
+[options.packages.find]
+exclude =
+    deathrow
+    quarantine
+    setupext
+
 [options.entry_points]
 console_scripts =
     ipython = IPython:start_ipython
-    iptest = IPython.testing.iptestcontroller:main
     ipython3 = IPython:start_ipython
-    iptest3 = IPython.testing.iptestcontroller:main
 pygments.lexers =
     ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer
     ipython = IPython.lib.lexers:IPythonLexer
diff --git a/setup.py b/setup.py
index 863f1fdf409..eb2a11fd31d 100755
--- a/setup.py
+++ b/setup.py
@@ -67,7 +67,6 @@
 
 from setupbase import (
     setup_args,
-    find_packages,
     find_package_data,
     check_package_data_first,
     find_data_files,
@@ -117,12 +116,10 @@
 # Find all the packages, package data, and data_files
 #---------------------------------------------------------------------------
 
-packages = find_packages()
 package_data = find_package_data()
 
 data_files = find_data_files()
 
-setup_args['packages'] = packages
 setup_args['package_data'] = package_data
 setup_args['data_files'] = data_files
 

From 8eedf6a2134f3a9b627997fe12d281722974b9ef Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Mon, 25 Oct 2021 21:13:02 -0400
Subject: [PATCH 0931/1407] Specify package data in setup.cfg

---
 setup.cfg | 6 ++++++
 setup.py  | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index fb632bb1109..f94d002ebc5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,6 +32,12 @@ exclude =
     quarantine
     setupext
 
+[options.package_data]
+IPython.core = profile/README*
+IPython.core.tests = *.png, *.jpg, daft_extension/*.py
+IPython.lib.tests = *.wav
+IPython.testing.plugin = *.txt
+
 [options.entry_points]
 console_scripts =
     ipython = IPython:start_ipython
diff --git a/setup.py b/setup.py
index eb2a11fd31d..ebff3fdd49a 100755
--- a/setup.py
+++ b/setup.py
@@ -67,7 +67,6 @@
 
 from setupbase import (
     setup_args,
-    find_package_data,
     check_package_data_first,
     find_data_files,
     git_prebuild,
@@ -116,11 +115,8 @@
 # Find all the packages, package data, and data_files
 #---------------------------------------------------------------------------
 
-package_data = find_package_data()
-
 data_files = find_data_files()
 
-setup_args['package_data'] = package_data
 setup_args['data_files'] = data_files
 
 #---------------------------------------------------------------------------

From a64d0eeda59856d6c631139a701507b9bdc8d103 Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Mon, 25 Oct 2021 21:14:58 -0400
Subject: [PATCH 0932/1407] Remove obsolete setuptools_extra_args

---
 setup.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/setup.py b/setup.py
index ebff3fdd49a..9004ff51685 100755
--- a/setup.py
+++ b/setup.py
@@ -140,10 +140,6 @@
 # Handle scripts, dependencies, and setuptools specific things
 #---------------------------------------------------------------------------
 
-# This dict is used for passing extra arguments that are setuptools
-# specific to setup
-setuptools_extra_args = {}
-
 # setuptools requirements
 
 extras_require = dict(
@@ -186,10 +182,6 @@
 # Do the actual setup now
 #---------------------------------------------------------------------------
 
-setup_args.update(setuptools_extra_args)
-
-
-
 def main():
     setup(**setup_args)
 

From f30b345ac0b90d9f197103ca88dedbd885b3da95 Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Mon, 25 Oct 2021 21:32:08 -0400
Subject: [PATCH 0933/1407] Move more metadata from IPython.core.release.py to
 setup.cfg

---
 IPython/core/release.py | 65 -----------------------------------------
 setup.cfg               | 54 ++++++++++++++++++++++++++++++++++
 setupbase.py            |  7 -----
 3 files changed, 54 insertions(+), 72 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index b1c61d9bf48..402c2ed100b 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -12,10 +12,6 @@
 #  The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
-# Name of the package for release purposes.  This is the name which labels
-# the tarballs and RPMs made by distutils, so it's best to lowercase it.
-name = 'ipython'
-
 # IPython version information.  An empty _version_extra corresponds to a full
 # release.  'dev' as a _version_extra string means this is a development
 # version
@@ -40,49 +36,6 @@
 kernel_protocol_version_info = (5, 0)
 kernel_protocol_version = "%i.%i" % kernel_protocol_version_info
 
-description = "IPython: Productive Interactive Computing"
-
-long_description = \
-"""
-IPython provides a rich toolkit to help you make the most out of using Python
-interactively.  Its main components are:
-
-* A powerful interactive Python shell
-* A `Jupyter <https://jupyter.org/>`_ kernel to work with Python code in Jupyter
-  notebooks and other interactive frontends.
-
-The enhanced interactive Python shells have the following main features:
-
-* Comprehensive object introspection.
-
-* Input history, persistent across sessions.
-
-* Caching of output results during a session with automatically generated
-  references.
-
-* Extensible tab completion, with support by default for completion of python
-  variables and keywords, filenames and function keywords.
-
-* Extensible system of 'magic' commands for controlling the environment and
-  performing many tasks related either to IPython or the operating system.
-
-* A rich configuration system with easy switching between different setups
-  (simpler than changing $PYTHONSTARTUP environment variables every time).
-
-* Session logging and reloading.
-
-* Extensible syntax processing for special purpose situations.
-
-* Access to the system shell with user-extensible alias system.
-
-* Easily embeddable in other Python programs and GUIs.
-
-* Integrated access to the pdb debugger and the Python profiler.
-
-The latest development version is always available from IPython's `GitHub
-site <http://github.com/ipython>`_.
-"""
-
 license = 'BSD'
 
 authors = {'Fernando' : ('Fernando Perez','fperez.net@gmail.com'),
@@ -99,21 +52,3 @@
 author = 'The IPython Development Team'
 
 author_email = 'ipython-dev@python.org'
-
-url = 'https://ipython.org'
-
-
-platforms = ['Linux','Mac OSX','Windows']
-
-keywords = ['Interactive','Interpreter','Shell', 'Embedding']
-
-classifiers = [
-    'Framework :: IPython',
-    'Intended Audience :: Developers',
-    'Intended Audience :: Science/Research',
-    'License :: OSI Approved :: BSD License',
-    'Programming Language :: Python',
-    'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3 :: Only',
-    'Topic :: System :: Shells'
-    ]
diff --git a/setup.cfg b/setup.cfg
index f94d002ebc5..c1de3021fe4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,11 +1,65 @@
 [metadata]
+name = ipython
 version = attr: IPython.core.release.__version__
+url = https://ipython.org
+description = IPython: Productive Interactive Computing
+long_description_content_type = text/x-rst
+long_description = IPython provides a rich toolkit to help you make the most out of using Python
+    interactively.  Its main components are:
+
+    * A powerful interactive Python shell
+    * A `Jupyter <https://jupyter.org/>`_ kernel to work with Python code in Jupyter
+    notebooks and other interactive frontends.
+
+    The enhanced interactive Python shells have the following main features:
+
+    * Comprehensive object introspection.
+
+    * Input history, persistent across sessions.
+
+    * Caching of output results during a session with automatically generated
+    references.
+
+    * Extensible tab completion, with support by default for completion of python
+    variables and keywords, filenames and function keywords.
+
+    * Extensible system of 'magic' commands for controlling the environment and
+    performing many tasks related either to IPython or the operating system.
+
+    * A rich configuration system with easy switching between different setups
+    (simpler than changing $PYTHONSTARTUP environment variables every time).
+
+    * Session logging and reloading.
+
+    * Extensible syntax processing for special purpose situations.
+
+    * Access to the system shell with user-extensible alias system.
+
+    * Easily embeddable in other Python programs and GUIs.
+
+    * Integrated access to the pdb debugger and the Python profiler.
+
+    The latest development version is always available from IPython's `GitHub
+    site <http://github.com/ipython>`_.
+
 license_file = LICENSE
 project_urls =
     Documentation = https://ipython.readthedocs.io/
     Funding = https://numfocus.org/
     Source = https://github.com/ipython/ipython
     Tracker = https://github.com/ipython/ipython/issues
+keywords = Interactive, Interpreter, Shell, Embedding
+platforms = Linux, Mac OSX, Windows
+classifiers =
+    Framework :: IPython
+    Intended Audience :: Developers
+    Intended Audience :: Science/Research
+    License :: OSI Approved :: BSD License
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3 :: Only
+    Topic :: System :: Shell
+
 
 [options]
 packages = find:
diff --git a/setupbase.py b/setupbase.py
index 5a92b0db211..110098595d0 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -62,16 +62,9 @@ def file_doesnt_endwith(test,endings):
 # Create a dict with the basic information
 # This dict is eventually passed to setup after additional keys are added.
 setup_args = dict(
-      name             = name,
-      description      = description,
-      long_description = long_description,
       author           = author,
       author_email     = author_email,
-      url              = url,
       license          = license,
-      platforms        = platforms,
-      keywords         = keywords,
-      classifiers      = classifiers,
       cmdclass         = {'install_data': install_data_ext},
       )
 

From 2aec64a92a49b380244d86ed2a4499d0553b5f3b Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Tue, 26 Oct 2021 21:20:00 -0400
Subject: [PATCH 0934/1407] Use python's gzip module instead of the gzip
 command for compatibility

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 9004ff51685..d836e2c9c88 100755
--- a/setup.py
+++ b/setup.py
@@ -105,7 +105,7 @@
     to_update = [
                  ('docs/man/ipython.1.gz',
                   ['docs/man/ipython.1'],
-                  'cd docs/man && gzip -9c ipython.1 > ipython.1.gz'),
+                  'cd docs/man && python -m gzip --best ipython.1'),
                  ]
 
 

From df2197c590b6636cb827ad6fef1e5a1ef087efeb Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Tue, 26 Oct 2021 21:36:23 -0400
Subject: [PATCH 0935/1407] Simplify constructing 'all' extra

---
 setup.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index d836e2c9c88..8df82e5e1c9 100755
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,7 @@
 
 import os
 import sys
+from itertools import chain
 
 # **Python version check**
 #
@@ -170,10 +171,7 @@
 )
 
 
-everything = set()
-for key, deps in extras_require.items():
-    if ':' not in key:
-        everything.update(deps)
+everything = set(chain.from_iterable(extras_require.values()))
 extras_require['all'] = list(sorted(everything))
 
 setup_args["extras_require"] = extras_require

From 84fa21b3775d343588d08c82d4214b6ea9873935 Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Tue, 26 Oct 2021 22:37:01 -0400
Subject: [PATCH 0936/1407] PEP 517 support

---
 pyproject.toml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 pyproject.toml

diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 00000000000..c68b8c200f3
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools >= 51.0.0", "wheel"]
+build-backend = "setuptools.build_meta:__legacy__"

From 6d7c4f84226566ab68e2827ff575ef521e67e782 Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Sat, 30 Oct 2021 01:32:30 -0400
Subject: [PATCH 0937/1407] Make setup.py not directly runnable

---
 setup.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
 mode change 100755 => 100644 setup.py

diff --git a/setup.py b/setup.py
old mode 100755
new mode 100644
index 8df82e5e1c9..0ed75219327
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Setup script for IPython.
 
@@ -180,8 +179,4 @@
 # Do the actual setup now
 #---------------------------------------------------------------------------
 
-def main():
-    setup(**setup_args)
-
-if __name__ == '__main__':
-    main()
+setup(**setup_args)

From 36d0888bba9f8f01ad243788ca11507a837cf8ad Mon Sep 17 00:00:00 2001
From: James Morris <jamesmorris2@gmail.com>
Date: Sat, 30 Oct 2021 01:32:49 -0400
Subject: [PATCH 0938/1407] Remove obsolete setupegg.py

---
 setupegg.py | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100755 setupegg.py

diff --git a/setupegg.py b/setupegg.py
deleted file mode 100755
index 7b4b5687e4b..00000000000
--- a/setupegg.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-"""Wrapper to run setup.py using setuptools."""
-
-# Import setuptools and call the actual setup
-import setuptools
-with open('setup.py', 'rb') as f:
-    exec(compile(f.read(), 'setup.py', 'exec'))

From 2cd2d4ce41846c4e0ab0b81d0aa6463ad0ed6568 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 8 Dec 2021 15:35:17 -0800
Subject: [PATCH 0939/1407] updates

---
 setup.cfg | 4 +---
 setup.py  | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index c1de3021fe4..f2778621a6b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -70,7 +70,7 @@ install_requires =
     jedi>=0.16
     decorator
     pickleshare
-    traitlets>=4.2
+    traitlets>=5
     prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1
     pygments
     backcall
@@ -82,8 +82,6 @@ install_requires =
 
 [options.packages.find]
 exclude =
-    deathrow
-    quarantine
     setupext
 
 [options.package_data]
diff --git a/setup.py b/setup.py
index 0ed75219327..141b3d3585a 100644
--- a/setup.py
+++ b/setup.py
@@ -179,4 +179,5 @@
 # Do the actual setup now
 #---------------------------------------------------------------------------
 
-setup(**setup_args)
+if __name__ == "__main__":
+    setup(**setup_args)

From f5a9499dfdf73da6b1c8eb3431a82d0290ad2a74 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 8 Dec 2021 15:48:43 -0800
Subject: [PATCH 0940/1407] reformat

---
 IPython/utils/timing.py |  1 +
 setup.py                | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/IPython/utils/timing.py b/IPython/utils/timing.py
index 92f6883c4af..32741acdd9c 100644
--- a/IPython/utils/timing.py
+++ b/IPython/utils/timing.py
@@ -62,6 +62,7 @@ def clock2():
         Similar to clock(), but return a tuple of user/system times."""
         return resource.getrusage(resource.RUSAGE_SELF)[:2]
 
+
 else:
     # There is no distinction of user/system time under windows, so we just use
     # time.perff_counter() for everything...
diff --git a/setup.py b/setup.py
index 141b3d3585a..4c52f47478e 100644
--- a/setup.py
+++ b/setup.py
@@ -103,10 +103,12 @@
     # List of things to be updated. Each entry is a triplet of args for
     # target_update()
     to_update = [
-                 ('docs/man/ipython.1.gz',
-                  ['docs/man/ipython.1'],
-                  'cd docs/man && python -m gzip --best ipython.1'),
-                 ]
+        (
+            "docs/man/ipython.1.gz",
+            ["docs/man/ipython.1"],
+            "cd docs/man && python -m gzip --best ipython.1",
+        ),
+    ]
 
 
     [ target_update(*t) for t in to_update ]

From 32153e635e4d9e17ff3726e92e0d3f120391148e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 8 Dec 2021 16:02:08 -0800
Subject: [PATCH 0941/1407] try to build with python -m build

---
 .github/workflows/test.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5cb06d92e52..b24c6ff5e93 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -55,9 +55,14 @@ jobs:
       run: sudo apt-get -yq -o Acquire::Retries=3 --no-install-suggests --no-install-recommends install texlive dvipng
     - name: Install and update Python dependencies
       run: |
-        python -m pip install --upgrade pip setuptools wheel
+        python -m pip install --upgrade pip setuptools wheel build
         python -m pip install --upgrade -e .[${{ matrix.deps }}]
         python -m pip install --upgrade check-manifest pytest-cov
+    - name: Try building with Python build
+      if: runner.os != 'Windows'  # setup.py does not support sdist on Windows
+      run: |
+        python -m build
+        shasum -a 256 dist/*
     - name: Check manifest
       if: runner.os != 'Windows'  # setup.py does not support sdist on Windows
       run: check-manifest

From e42fd674fc2f1e408cb1d40985ce71f2c4335467 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 8 Dec 2021 16:03:22 -0800
Subject: [PATCH 0942/1407] setup pip cache

---
 .github/workflows/test.yml | 1 +
 IPython/utils/timing.py    | 1 -
 setup.cfg                  | 3 +++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b24c6ff5e93..e53fb5c9f1e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -50,6 +50,7 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+        cache: pip
     - name: Install latex
       if: runner.os == 'Linux' && matrix.deps == 'test_extra'
       run: sudo apt-get -yq -o Acquire::Retries=3 --no-install-suggests --no-install-recommends install texlive dvipng
diff --git a/IPython/utils/timing.py b/IPython/utils/timing.py
index 32741acdd9c..92f6883c4af 100644
--- a/IPython/utils/timing.py
+++ b/IPython/utils/timing.py
@@ -62,7 +62,6 @@ def clock2():
         Similar to clock(), but return a tuple of user/system times."""
         return resource.getrusage(resource.RUSAGE_SELF)[:2]
 
-
 else:
     # There is no distinction of user/system time under windows, so we just use
     # time.perff_counter() for everything...
diff --git a/setup.cfg b/setup.cfg
index f2778621a6b..837dca3e39a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -103,3 +103,6 @@ pygments.lexers =
 ignore_patterns = 
    IPython/core/tests,
    IPython/testing
+
+[tool.black]
+exclude = 'timing\.py'

From e7fd431d8b1fd4fd032190d1d9bb1d373d97b574 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 8 Dec 2021 15:27:43 -0800
Subject: [PATCH 0943/1407] Remove many deprecation and bump traitlets to 5+

Many old hooks from debugger removed,
We now are traitlets 5+
---
 IPython/core/application.py           | 10 ------
 IPython/core/debugger.py              | 15 +++-----
 IPython/core/formatters.py            | 12 +++----
 IPython/core/interactiveshell.py      | 13 ++++---
 IPython/core/shellapp.py              | 18 ----------
 IPython/core/tests/test_formatters.py | 12 -------
 IPython/terminal/ipapp.py             | 16 ---------
 IPython/utils/path.py                 | 50 +--------------------------
 IPython/utils/timing.py               |  1 +
 setup.py                              |  1 -
 10 files changed, 20 insertions(+), 128 deletions(-)

diff --git a/IPython/core/application.py b/IPython/core/application.py
index 85c91274d4e..2b26d4fad82 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -256,16 +256,6 @@ def __init__(self, **kwargs):
     # Various stages of Application creation
     #-------------------------------------------------------------------------
     
-    deprecated_subcommands = {}
-    
-    def initialize_subcommand(self, subc, argv=None):
-        if subc in self.deprecated_subcommands:
-            self.log.warning("Subcommand `ipython {sub}` is deprecated and will be removed "
-                             "in future versions.".format(sub=subc))
-            self.log.warning("You likely want to use `jupyter {sub}` in the "
-                             "future".format(sub=subc))
-        return super(BaseIPythonApplication, self).initialize_subcommand(subc, argv)
-
     def init_crash_handler(self):
         """Create a crash handler, typically setting sys.excepthook to it."""
         self.crash_handler = self.crash_handler_class(self)
diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index d9095d0c536..d3e4ec2defe 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -144,22 +144,15 @@ def BdbQuit_excepthook(et, ev, tb, excepthook=None):
     All other exceptions are processed using the `excepthook`
     parameter.
     """
-    warnings.warn("`BdbQuit_excepthook` is deprecated since version 5.1",
-                  DeprecationWarning, stacklevel=2)
-    if et == bdb.BdbQuit:
-        print('Exiting Debugger.')
-    elif excepthook is not None:
-        excepthook(et, ev, tb)
-    else:
-        # Backwards compatibility. Raise deprecation warning?
-        BdbQuit_excepthook.excepthook_ori(et, ev, tb)
+    raise ValueError(
+        "`BdbQuit_excepthook` is deprecated since version 5.1",
+    )
 
 
 def BdbQuit_IPython_excepthook(self, et, ev, tb, tb_offset=None):
-    warnings.warn(
+    raise ValueError(
         "`BdbQuit_IPython_excepthook` is deprecated since version 5.1",
         DeprecationWarning, stacklevel=2)
-    print('Exiting Debugger.')
 
 
 RGX_EXTRA_INDENT = re.compile(r'(?<=\n)\s+')
diff --git a/IPython/core/formatters.py b/IPython/core/formatters.py
index 07efecab40a..b2430f0ed60 100644
--- a/IPython/core/formatters.py
+++ b/IPython/core/formatters.py
@@ -834,13 +834,11 @@ def _check_return(self, r, obj):
         if isinstance(r, tuple):
             # unpack data, metadata tuple for type checking on first element
             r, md = r
-        
-        # handle deprecated JSON-as-string form from IPython < 3
-        if isinstance(r, str):
-            warnings.warn("JSON expects JSONable list/dict containers, not JSON strings",
-            FormatterWarning)
-            r = json.loads(r)
-        
+
+        assert not isinstance(
+            r, str
+        ), "JSON-as-string has been deprecated since IPython < 3"
+
         if md is not None:
             # put the tuple back together
             r = (r, md)
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 39e84ddbd7c..020e892f543 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -906,7 +906,11 @@ def set_hook(self,name,hook, priority=50, str_key=None, re_key=None,
 
         if _warn_deprecated and (name in IPython.core.hooks.deprecated):
             alternative = IPython.core.hooks.deprecated[name]
-            warn("Hook {} is deprecated. Use {} instead.".format(name, alternative), stacklevel=2)
+            raise ValueError(
+                "Hook {} has been deprecated since IPython 5.0. Use {} instead.".format(
+                    name, alternative
+                )
+            )
 
         if not dp:
             dp = IPython.core.hooks.CommandChainDispatcher()
@@ -933,9 +937,10 @@ def register_post_execute(self, func):
 
         Register a function for calling after code execution.
         """
-        warn("ip.register_post_execute is deprecated, use "
-             "ip.events.register('post_run_cell', func) instead.", stacklevel=2)
-        self.events.register('post_run_cell', func)
+        raise ValueError(
+            "ip.register_post_execute is deprecated since IPython 1.0, use "
+            "ip.events.register('post_run_cell', func) instead."
+        )
 
     def _clear_warning_registry(self):
         # clear the warning registry, so that different code blocks with
diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py
index c442658ae70..f737bcb56b7 100644
--- a/IPython/core/shellapp.py
+++ b/IPython/core/shellapp.py
@@ -98,11 +98,6 @@
 )
 shell_aliases['cache-size'] = 'InteractiveShell.cache_size'
 
-if traitlets.version_info < (5, 0):
-    # traitlets 4 doesn't handle lists on CLI
-    shell_aliases["ext"] = "InteractiveShellApp.extra_extension"
-
-
 #-----------------------------------------------------------------------------
 # Main classes and functions
 #-----------------------------------------------------------------------------
@@ -126,17 +121,6 @@ class InteractiveShellApp(Configurable):
         help="A list of dotted module names of IPython extensions to load."
     ).tag(config=True)
 
-    extra_extension = Unicode(
-        "",
-        help="""
-        DEPRECATED. Dotted module name of a single extra IPython extension to load.
-
-        Only one extension can be added this way.
-
-        Only used with traitlets < 5.0, plural extra_extensions list is used in traitlets 5.
-        """,
-    ).tag(config=True)
-
     extra_extensions = List(
         DottedObjectName(),
         help="""
@@ -293,8 +277,6 @@ def init_extensions(self):
             extensions = (
                 self.default_extensions + self.extensions + self.extra_extensions
             )
-            if self.extra_extension:
-                extensions.append(self.extra_extension)
             for ext in extensions:
                 try:
                     self.log.info("Loading IPython extension: %s" % ext)
diff --git a/IPython/core/tests/test_formatters.py b/IPython/core/tests/test_formatters.py
index 6ea40eb22b6..26d35837ac8 100644
--- a/IPython/core/tests/test_formatters.py
+++ b/IPython/core/tests/test_formatters.py
@@ -430,18 +430,6 @@ def _ipython_display_(self):
     f.ipython_display_formatter.enabled = save_enabled
 
 
-def test_json_as_string_deprecated():
-    class JSONString(object):
-        def _repr_json_(self):
-            return '{}'
-    
-    f = JSONFormatter()
-    with warnings.catch_warnings(record=True) as w:
-        d = f(JSONString())
-    assert d == {}
-    assert len(w) == 1
-
-
 def test_repr_mime():
     class HasReprMime(object):
         def _repr_mimebundle_(self, include=None, exclude=None):
diff --git a/IPython/terminal/ipapp.py b/IPython/terminal/ipapp.py
index b95266eaef0..ed39b7dc5d0 100755
--- a/IPython/terminal/ipapp.py
+++ b/IPython/terminal/ipapp.py
@@ -262,22 +262,6 @@ def _file_to_run_changed(self, change):
     # internal, not-configurable
     something_to_run=Bool(False)
 
-    def parse_command_line(self, argv=None):
-        """override to allow old '-pylab' flag with deprecation warning"""
-
-        argv = sys.argv[1:] if argv is None else argv
-
-        if '-pylab' in argv:
-            # deprecated `-pylab` given,
-            # warn and transform into current syntax
-            argv = argv[:] # copy, don't clobber
-            idx = argv.index('-pylab')
-            warnings.warn("`-pylab` flag has been deprecated.\n"
-            "    Use `--matplotlib <backend>` and import pylab manually.")
-            argv[idx] = '--pylab'
-
-        return super(TerminalIPythonApp, self).parse_command_line(argv)
-    
     @catch_config_error
     def initialize(self, argv=None):
         """Do actions after construct, but before starting the app."""
diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index 273c519a004..375ae384141 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -67,20 +67,6 @@ def get_long_path_name(path):
     return _get_long_path_name(path)
 
 
-def unquote_filename(name, win32=(sys.platform=='win32')):
-    """ On Windows, remove leading and trailing quotes from filenames.
-
-    This function has been deprecated and should not be used any more:
-    unquoting is now taken care of by :func:`IPython.utils.process.arg_split`.
-    """
-    warn("'unquote_filename' is deprecated since IPython 5.0 and should not "
-         "be used anymore", DeprecationWarning, stacklevel=2)
-    if win32:
-        if name.startswith(("'", '"')) and name.endswith(("'", '"')):
-            name = name[1:-1]
-    return name
-
-
 def compress_user(path):
     """Reverse of :func:`os.path.expanduser`
     """
@@ -89,7 +75,7 @@ def compress_user(path):
         path =  "~" + path[len(home):]
     return path
 
-def get_py_filename(name, force_win32=None):
+def get_py_filename(name):
     """Return a valid python filename in the current directory.
 
     If the given name is not a file, it adds '.py' and searches again.
@@ -97,10 +83,6 @@ def get_py_filename(name, force_win32=None):
     """
 
     name = os.path.expanduser(name)
-    if force_win32 is not None:
-        warn("The 'force_win32' argument to 'get_py_filename' is deprecated "
-             "since IPython 5.0 and should not be used anymore",
-            DeprecationWarning, stacklevel=2)
     if not os.path.isfile(name) and not name.endswith('.py'):
         name += '.py'
     if os.path.isfile(name):
@@ -253,36 +235,6 @@ def get_xdg_cache_dir():
     return None
 
 
-@undoc
-def get_ipython_dir():
-    warn("get_ipython_dir has moved to the IPython.paths module since IPython 4.0.", DeprecationWarning, stacklevel=2)
-    from IPython.paths import get_ipython_dir
-    return get_ipython_dir()
-
-@undoc
-def get_ipython_cache_dir():
-    warn("get_ipython_cache_dir has moved to the IPython.paths module since IPython 4.0.", DeprecationWarning, stacklevel=2)
-    from IPython.paths import get_ipython_cache_dir
-    return get_ipython_cache_dir()
-
-@undoc
-def get_ipython_package_dir():
-    warn("get_ipython_package_dir has moved to the IPython.paths module since IPython 4.0.", DeprecationWarning, stacklevel=2)
-    from IPython.paths import get_ipython_package_dir
-    return get_ipython_package_dir()
-
-@undoc
-def get_ipython_module_path(module_str):
-    warn("get_ipython_module_path has moved to the IPython.paths module since IPython 4.0.", DeprecationWarning, stacklevel=2)
-    from IPython.paths import get_ipython_module_path
-    return get_ipython_module_path(module_str)
-
-@undoc
-def locate_profile(profile='default'):
-    warn("locate_profile has moved to the IPython.paths module since IPython 4.0.", DeprecationWarning, stacklevel=2)
-    from IPython.paths import locate_profile
-    return locate_profile(profile=profile)
-
 def expand_path(s):
     """Expand $VARS and ~names in a string, like a shell
 
diff --git a/IPython/utils/timing.py b/IPython/utils/timing.py
index 92f6883c4af..32741acdd9c 100644
--- a/IPython/utils/timing.py
+++ b/IPython/utils/timing.py
@@ -62,6 +62,7 @@ def clock2():
         Similar to clock(), but return a tuple of user/system times."""
         return resource.getrusage(resource.RUSAGE_SELF)[:2]
 
+
 else:
     # There is no distinction of user/system time under windows, so we just use
     # time.perff_counter() for everything...
diff --git a/setup.py b/setup.py
index 4c52f47478e..3aa9be22cfb 100644
--- a/setup.py
+++ b/setup.py
@@ -171,7 +171,6 @@
     nbconvert=["nbconvert"],
 )
 
-
 everything = set(chain.from_iterable(extras_require.values()))
 extras_require['all'] = list(sorted(everything))
 

From 6181503402e66032486b3768e22954264ee0278b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 8 Dec 2021 15:56:33 -0800
Subject: [PATCH 0944/1407] remove unused skip decorators

---
 IPython/testing/decorators.py | 5 -----
 IPython/utils/timing.py       | 2 --
 2 files changed, 7 deletions(-)

diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
index d2f325ba3ca..6d7d9faa88c 100644
--- a/IPython/testing/decorators.py
+++ b/IPython/testing/decorators.py
@@ -152,9 +152,6 @@ def module_not_available(module):
                            "This test only runs under Windows")
 skip_if_not_linux = skipif(not sys.platform.startswith('linux'),
                            "This test only runs under Linux")
-skip_if_not_osx = skipif(sys.platform != 'darwin',
-                         "This test only runs under OSX")
-
 
 _x11_skip_cond = (sys.platform not in ('darwin', 'win32') and
                   os.environ.get('DISPLAY', '') == '')
@@ -171,8 +168,6 @@ def module_not_available(module):
 
 skipif_not_matplotlib = skip_without('matplotlib')
 
-skipif_not_sympy = skip_without('sympy')
-
 # A null 'decorator', useful to make more readable code that needs to pick
 # between different decorators based on OS or other conditions
 null_deco = lambda f: f
diff --git a/IPython/utils/timing.py b/IPython/utils/timing.py
index 32741acdd9c..16de71cf471 100644
--- a/IPython/utils/timing.py
+++ b/IPython/utils/timing.py
@@ -61,8 +61,6 @@ def clock2():
 
         Similar to clock(), but return a tuple of user/system times."""
         return resource.getrusage(resource.RUSAGE_SELF)[:2]
-
-
 else:
     # There is no distinction of user/system time under windows, so we just use
     # time.perff_counter() for everything...

From 3add29c01317cbbe6742d21886701ee7cf02d332 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 8 Dec 2021 16:28:08 -0800
Subject: [PATCH 0945/1407] test

---
 IPython/utils/timing.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/utils/timing.py b/IPython/utils/timing.py
index 16de71cf471..92f6883c4af 100644
--- a/IPython/utils/timing.py
+++ b/IPython/utils/timing.py
@@ -61,6 +61,7 @@ def clock2():
 
         Similar to clock(), but return a tuple of user/system times."""
         return resource.getrusage(resource.RUSAGE_SELF)[:2]
+
 else:
     # There is no distinction of user/system time under windows, so we just use
     # time.perff_counter() for everything...

From fc5ec101897ab1219427b214eb68fb691d4717bd Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 8 Dec 2021 16:31:37 -0800
Subject: [PATCH 0946/1407] cleanup

---
 .github/workflows/python-package.yml | 6 +++---
 IPython/utils/timing.py              | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 36ae8187fe2..9c2ae9c45b9 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -10,10 +10,10 @@ on:
     branches: [ master, 7.x ]
 
 jobs:
-  build:
+  formatting:
 
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 5
     strategy:
       matrix:
         python-version: [3.8]
@@ -29,7 +29,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install darker isort
+        pip install darker
     - name: Lint with darker
       run: |
         darker -r 60625f241f298b5039cb2debc365db38aa7bb522 --check --diff . || (
diff --git a/IPython/utils/timing.py b/IPython/utils/timing.py
index 92f6883c4af..c20b5c9f8c6 100644
--- a/IPython/utils/timing.py
+++ b/IPython/utils/timing.py
@@ -66,6 +66,7 @@ def clock2():
     # There is no distinction of user/system time under windows, so we just use
     # time.perff_counter() for everything...
     clocku = clocks = clock = time.perf_counter
+
     def clock2():
         """Under windows, system CPU time can't be measured.
 

From 223cc65a41667eca57a0d57e42fdc851fa4cf86a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 8 Dec 2021 16:42:43 -0800
Subject: [PATCH 0947/1407] misc coverage

---
 IPython/core/tests/test_magic.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index aa006f63594..7e95016b697 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -1339,13 +1339,11 @@ def find_spec(self, fullname, path, target=None):
                     return importlib.util.spec_from_loader(fullname, self)
 
             def get_filename(self, fullname):
-                if fullname != "my_tmp":
-                    raise ImportError(f"unexpected module name '{fullname}'")
+                assert fullname == "my_tmp":
                 return fullpath
 
             def get_data(self, path):
-                if not Path(path).samefile(fullpath):
-                    raise OSError(f"expected path '{fullpath}', got '{path}'")
+                assert Path(path).samefile(fullpath):
                 return Path(fullpath).read_text()
 
         sys.meta_path.insert(0, MyTempImporter())

From 8314f40dff8646df6a0da795c695df10c39f2ad2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 08:45:36 -0800
Subject: [PATCH 0948/1407] remove al IPython/kernel module

---
 IPython/kernel/__init__.py           | 35 ----------------------------
 IPython/kernel/__main__.py           |  3 ---
 IPython/kernel/adapter.py            |  1 -
 IPython/kernel/channels.py           |  1 -
 IPython/kernel/channelsabc.py        |  1 -
 IPython/kernel/client.py             |  1 -
 IPython/kernel/clientabc.py          |  1 -
 IPython/kernel/connect.py            |  2 --
 IPython/kernel/kernelspec.py         |  1 -
 IPython/kernel/kernelspecapp.py      |  1 -
 IPython/kernel/launcher.py           |  1 -
 IPython/kernel/manager.py            |  1 -
 IPython/kernel/managerabc.py         |  1 -
 IPython/kernel/multikernelmanager.py |  1 -
 IPython/kernel/restarter.py          |  1 -
 IPython/kernel/threaded.py           |  1 -
 16 files changed, 53 deletions(-)
 delete mode 100644 IPython/kernel/__init__.py
 delete mode 100644 IPython/kernel/__main__.py
 delete mode 100644 IPython/kernel/adapter.py
 delete mode 100644 IPython/kernel/channels.py
 delete mode 100644 IPython/kernel/channelsabc.py
 delete mode 100644 IPython/kernel/client.py
 delete mode 100644 IPython/kernel/clientabc.py
 delete mode 100644 IPython/kernel/connect.py
 delete mode 100644 IPython/kernel/kernelspec.py
 delete mode 100644 IPython/kernel/kernelspecapp.py
 delete mode 100644 IPython/kernel/launcher.py
 delete mode 100644 IPython/kernel/manager.py
 delete mode 100644 IPython/kernel/managerabc.py
 delete mode 100644 IPython/kernel/multikernelmanager.py
 delete mode 100644 IPython/kernel/restarter.py
 delete mode 100644 IPython/kernel/threaded.py

diff --git a/IPython/kernel/__init__.py b/IPython/kernel/__init__.py
deleted file mode 100644
index 70a05ed4aa5..00000000000
--- a/IPython/kernel/__init__.py
+++ /dev/null
@@ -1,35 +0,0 @@
-"""
-Shim to maintain backwards compatibility with old IPython.kernel imports.
-"""
-# Copyright (c) IPython Development Team.
-# Distributed under the terms of the Modified BSD License.
-
-import sys
-from warnings import warn
-
-from IPython.utils.shimmodule import ShimModule, ShimWarning
-
-warn("The `IPython.kernel` package has been deprecated since IPython 4.0."
-     "You should import from ipykernel or jupyter_client instead.", ShimWarning)
-
-
-# zmq subdir is gone
-sys.modules['IPython.kernel.zmq.session'] = ShimModule(
-    src='IPython.kernel.zmq.session', mirror='jupyter_client.session')
-sys.modules['IPython.kernel.zmq'] = ShimModule(
-    src='IPython.kernel.zmq', mirror='ipykernel')
-
-for pkg in ('comm', 'inprocess'):
-    src = 'IPython.kernel.%s' % pkg
-    sys.modules[src] = ShimModule(src=src, mirror='ipykernel.%s' % pkg)
-
-for pkg in ('ioloop', 'blocking'):
-    src = 'IPython.kernel.%s' % pkg
-    sys.modules[src] = ShimModule(src=src, mirror='jupyter_client.%s' % pkg)
-
-# required for `from IPython.kernel import PKG`
-from ipykernel import comm, inprocess
-from jupyter_client import ioloop, blocking
-# public API
-from ipykernel.connect import *
-from jupyter_client import *
diff --git a/IPython/kernel/__main__.py b/IPython/kernel/__main__.py
deleted file mode 100644
index d1f0cf53340..00000000000
--- a/IPython/kernel/__main__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-if __name__ == '__main__':
-    from ipykernel import kernelapp as app
-    app.launch_new_instance()
diff --git a/IPython/kernel/adapter.py b/IPython/kernel/adapter.py
deleted file mode 100644
index 3b8c046b2d1..00000000000
--- a/IPython/kernel/adapter.py
+++ /dev/null
@@ -1 +0,0 @@
-from jupyter_client.adapter import *
diff --git a/IPython/kernel/channels.py b/IPython/kernel/channels.py
deleted file mode 100644
index 8c7fe2a0630..00000000000
--- a/IPython/kernel/channels.py
+++ /dev/null
@@ -1 +0,0 @@
-from jupyter_client.channels import *
diff --git a/IPython/kernel/channelsabc.py b/IPython/kernel/channelsabc.py
deleted file mode 100644
index 88944012d44..00000000000
--- a/IPython/kernel/channelsabc.py
+++ /dev/null
@@ -1 +0,0 @@
-from jupyter_client.channelsabc import *
diff --git a/IPython/kernel/client.py b/IPython/kernel/client.py
deleted file mode 100644
index a98690b74cc..00000000000
--- a/IPython/kernel/client.py
+++ /dev/null
@@ -1 +0,0 @@
-from jupyter_client.client import *
diff --git a/IPython/kernel/clientabc.py b/IPython/kernel/clientabc.py
deleted file mode 100644
index e0cf06c9420..00000000000
--- a/IPython/kernel/clientabc.py
+++ /dev/null
@@ -1 +0,0 @@
-from jupyter_client.clientabc import *
diff --git a/IPython/kernel/connect.py b/IPython/kernel/connect.py
deleted file mode 100644
index 5b6d40a5d34..00000000000
--- a/IPython/kernel/connect.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from ipykernel.connect import *
-from jupyter_client.connect import *
diff --git a/IPython/kernel/kernelspec.py b/IPython/kernel/kernelspec.py
deleted file mode 100644
index 123419b2f54..00000000000
--- a/IPython/kernel/kernelspec.py
+++ /dev/null
@@ -1 +0,0 @@
-from jupyter_client.kernelspec import *
diff --git a/IPython/kernel/kernelspecapp.py b/IPython/kernel/kernelspecapp.py
deleted file mode 100644
index 28cd33abd35..00000000000
--- a/IPython/kernel/kernelspecapp.py
+++ /dev/null
@@ -1 +0,0 @@
-from jupyter_client.kernelspecapp import *
diff --git a/IPython/kernel/launcher.py b/IPython/kernel/launcher.py
deleted file mode 100644
index 1953bc4809e..00000000000
--- a/IPython/kernel/launcher.py
+++ /dev/null
@@ -1 +0,0 @@
-from jupyter_client.launcher import *
diff --git a/IPython/kernel/manager.py b/IPython/kernel/manager.py
deleted file mode 100644
index c88097cff64..00000000000
--- a/IPython/kernel/manager.py
+++ /dev/null
@@ -1 +0,0 @@
-from jupyter_client.manager import *
diff --git a/IPython/kernel/managerabc.py b/IPython/kernel/managerabc.py
deleted file mode 100644
index 6b40827ff88..00000000000
--- a/IPython/kernel/managerabc.py
+++ /dev/null
@@ -1 +0,0 @@
-from jupyter_client.managerabc import *
diff --git a/IPython/kernel/multikernelmanager.py b/IPython/kernel/multikernelmanager.py
deleted file mode 100644
index ce576e27eaf..00000000000
--- a/IPython/kernel/multikernelmanager.py
+++ /dev/null
@@ -1 +0,0 @@
-from jupyter_client.multikernelmanager import *
diff --git a/IPython/kernel/restarter.py b/IPython/kernel/restarter.py
deleted file mode 100644
index dc24117c3ad..00000000000
--- a/IPython/kernel/restarter.py
+++ /dev/null
@@ -1 +0,0 @@
-from jupyter_client.restarter import *
diff --git a/IPython/kernel/threaded.py b/IPython/kernel/threaded.py
deleted file mode 100644
index 4a1072f7fe3..00000000000
--- a/IPython/kernel/threaded.py
+++ /dev/null
@@ -1 +0,0 @@
-from jupyter_client.threaded import *

From ef2e48273c3c79634022d27c55b259e20b224503 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 8 Dec 2021 16:31:37 -0800
Subject: [PATCH 0949/1407] cleanup

---
 .github/workflows/python-package.yml | 6 +++---
 IPython/core/tests/test_magic.py     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 36ae8187fe2..9c2ae9c45b9 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -10,10 +10,10 @@ on:
     branches: [ master, 7.x ]
 
 jobs:
-  build:
+  formatting:
 
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 5
     strategy:
       matrix:
         python-version: [3.8]
@@ -29,7 +29,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install darker isort
+        pip install darker
     - name: Lint with darker
       run: |
         darker -r 60625f241f298b5039cb2debc365db38aa7bb522 --check --diff . || (
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 7e95016b697..40f0ae47759 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -1339,11 +1339,11 @@ def find_spec(self, fullname, path, target=None):
                     return importlib.util.spec_from_loader(fullname, self)
 
             def get_filename(self, fullname):
-                assert fullname == "my_tmp":
+                assert fullname == "my_tmp"
                 return fullpath
 
             def get_data(self, path):
-                assert Path(path).samefile(fullpath):
+                assert Path(path).samefile(fullpath)
                 return Path(fullpath).read_text()
 
         sys.meta_path.insert(0, MyTempImporter())

From e952cabe76360fac56ad67b484b779209474d790 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 09:48:28 -0800
Subject: [PATCH 0950/1407] remove proxy

---
 IPython/__init__.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/IPython/__init__.py b/IPython/__init__.py
index 5df72f83775..5d656e40a25 100644
--- a/IPython/__init__.py
+++ b/IPython/__init__.py
@@ -140,5 +140,12 @@ def start_kernel(argv=None, **kwargs):
         Any other kwargs will be passed to the Application constructor,
         such as `config`.
     """
-    from IPython.kernel.zmq.kernelapp import launch_new_instance
+    import warnings
+
+    warnings.warn(
+        "start_kernel is deprecated since IPython 8.0, use from `ipykernel.kernelapp.launch_new_instance`",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    from ipykernel.kernelapp import launch_new_instance
     return launch_new_instance(argv=argv, **kwargs)

From 04456d7fd51741674bfbe347bc6764ac8598a627 Mon Sep 17 00:00:00 2001
From: nicolaslazo <45973144+nicolaslazo@users.noreply.github.com>
Date: Thu, 9 Dec 2021 02:31:48 +0100
Subject: [PATCH 0951/1407] Expand ~ in filename arguments for %notebook, %save
 and %history magics

---
 IPython/core/magics/basic.py   | 4 +++-
 IPython/core/magics/code.py    | 1 +
 IPython/core/magics/history.py | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py
index b44b4a38128..f70605e0f0a 100644
--- a/IPython/core/magics/basic.py
+++ b/IPython/core/magics/basic.py
@@ -4,6 +4,7 @@
 import argparse
 from logging import error
 import io
+import os
 from pprint import pformat
 import sys
 from warnings import warn
@@ -572,6 +573,7 @@ def notebook(self, s):
         For example, to export the history to "foo.ipynb" do "%notebook foo.ipynb".
         """
         args = magic_arguments.parse_argstring(self.notebook, s)
+        outfname = os.path.expanduser(args.filename)
 
         from nbformat import write, v4
 
@@ -585,7 +587,7 @@ def notebook(self, s):
                 source=source
             ))
         nb = v4.new_notebook(cells=cells)
-        with io.open(args.filename, 'w', encoding='utf-8') as f:
+        with io.open(outfname, "w", encoding="utf-8") as f:
             write(nb, f, version=4)
 
 @magics_class
diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index 1451bd56488..3f8100ef268 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -222,6 +222,7 @@ def save(self, parameter_s=''):
         fname, codefrom = args[0], " ".join(args[1:])
         if not fname.endswith(('.py','.ipy')):
             fname += ext
+        fname = os.path.expanduser(fname)
         file_exists = os.path.isfile(fname)
         if file_exists and not force and not append:
             try:
diff --git a/IPython/core/magics/history.py b/IPython/core/magics/history.py
index ad58b33b0b3..d49259f07d8 100644
--- a/IPython/core/magics/history.py
+++ b/IPython/core/magics/history.py
@@ -151,6 +151,7 @@ def _format_lineno(session, line):
             # We don't want to close stdout at the end!
             close_at_end = False
         else:
+            outfname = os.path.expanduser(outfname)
             if os.path.exists(outfname):
                 try:
                     ans = io.ask_yes_no("File %r exists. Overwrite?" % outfname)

From 8ed09344f07742598b912f7c2beab78988ec2d73 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 10:06:50 -0800
Subject: [PATCH 0952/1407] remove a number of other deprecateed modules

---
 IPython/external/mathjax.py | 13 -------------
 IPython/frontend.py         | 29 -----------------------------
 IPython/lib/kernel.py       | 13 -------------
 IPython/parallel.py         | 20 --------------------
 IPython/qt.py               | 24 ------------------------
 5 files changed, 99 deletions(-)
 delete mode 100644 IPython/external/mathjax.py
 delete mode 100644 IPython/frontend.py
 delete mode 100644 IPython/lib/kernel.py
 delete mode 100644 IPython/parallel.py
 delete mode 100644 IPython/qt.py

diff --git a/IPython/external/mathjax.py b/IPython/external/mathjax.py
deleted file mode 100644
index 1b9b80905ba..00000000000
--- a/IPython/external/mathjax.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/python
-"""
-`IPython.external.mathjax` is deprecated with IPython 4.0+
-
-mathjax is now install by default with the notebook package
-
-"""
-
-import sys 
-
-if __name__ == '__main__' :
-    sys.exit("IPython.external.mathjax is deprecated, Mathjax is now installed by default with the notebook package")
-
diff --git a/IPython/frontend.py b/IPython/frontend.py
deleted file mode 100644
index 9cc3eaff2f0..00000000000
--- a/IPython/frontend.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-Shim to maintain backwards compatibility with old frontend imports.
-
-We have moved all contents of the old `frontend` subpackage into top-level
-subpackages (`html`, `qt` and `terminal`), and flattened the notebook into
-just `IPython.html`, formerly `IPython.frontend.html.notebook`.
-
-This will let code that was making `from IPython.frontend...` calls continue
-working, though a warning will be printed.
-"""
-
-# Copyright (c) IPython Development Team.
-# Distributed under the terms of the Modified BSD License.
-
-import sys
-from warnings import warn
-
-from IPython.utils.shimmodule import ShimModule, ShimWarning
-
-warn("The top-level `frontend` package has been deprecated since IPython 1.0. "
-     "All its subpackages have been moved to the top `IPython` level.", ShimWarning)
-
-# Unconditionally insert the shim into sys.modules so that further import calls
-# trigger the custom attribute access above
-
-sys.modules['IPython.frontend.html.notebook'] = ShimModule(
-    src='IPython.frontend.html.notebook', mirror='IPython.html')
-sys.modules['IPython.frontend'] = ShimModule(
-    src='IPython.frontend', mirror='IPython')
diff --git a/IPython/lib/kernel.py b/IPython/lib/kernel.py
deleted file mode 100644
index af9827667fb..00000000000
--- a/IPython/lib/kernel.py
+++ /dev/null
@@ -1,13 +0,0 @@
-"""[DEPRECATED] Utilities for connecting to kernels
-
-Moved to IPython.kernel.connect
-"""
-
-import warnings
-warnings.warn("IPython.lib.kernel moved to IPython.kernel.connect in IPython 1.0," 
-        " and will be removed in IPython 6.0.",
-    DeprecationWarning
-)
-
-from ipykernel.connect import *
-
diff --git a/IPython/parallel.py b/IPython/parallel.py
deleted file mode 100644
index 0f100127839..00000000000
--- a/IPython/parallel.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Shim to maintain backwards compatibility with old IPython.parallel imports.
-"""
-# Copyright (c) IPython Development Team.
-# Distributed under the terms of the Modified BSD License.
-
-import sys
-from warnings import warn
-
-from IPython.utils.shimmodule import ShimModule, ShimWarning
-
-warn("The `IPython.parallel` package has been deprecated since IPython 4.0. "
-     "You should import from ipyparallel instead.", ShimWarning)
-
-# Unconditionally insert the shim into sys.modules so that further import calls
-# trigger the custom attribute access above
-
-sys.modules['IPython.parallel'] = ShimModule(
-    src='IPython.parallel', mirror='ipyparallel')
-
diff --git a/IPython/qt.py b/IPython/qt.py
deleted file mode 100644
index 7557a3f3298..00000000000
--- a/IPython/qt.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""
-Shim to maintain backwards compatibility with old IPython.qt imports.
-"""
-# Copyright (c) IPython Development Team.
-# Distributed under the terms of the Modified BSD License.
-
-import sys
-from warnings import warn
-
-from IPython.utils.shimmodule import ShimModule, ShimWarning
-
-warn("The `IPython.qt` package has been deprecated since IPython 4.0. "
-     "You should import from qtconsole instead.", ShimWarning)
-
-# Unconditionally insert the shim into sys.modules so that further import calls
-# trigger the custom attribute access above
-
-_console = sys.modules['IPython.qt.console'] = ShimModule(
-    src='IPython.qt.console', mirror='qtconsole')
-
-_qt = ShimModule(src='IPython.qt', mirror='qtconsole')
-
-_qt.console = _console
-sys.modules['IPython.qt'] = _qt

From 68ad96848b73a6a2830269630ed00f86eb020a36 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 10:54:53 -0800
Subject: [PATCH 0953/1407] misc wn updates

---
 docs/source/whatsnew/development.rst | 47 +++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index c092a6a5533..960a00130e0 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -22,12 +22,24 @@ Need to be updated:
 
    pr/*
 
-IPython 8.0 is bringing a number of new features and improvements to both the
+IPython 8.0 is bringing a large number of new features and improvements to both the
 user of the terminal and of the kernel via Jupyter. The removal of compatibility
 with older version of Python is also the opportunity to do a couple of
 performance improvement in particular with respect to startup time.
 
-The main change in IPython 8.0 is the integration of the ``stack_data`` package;
+This release contains 250+ Pull requests, in addition to many of the features
+and backports that have made it to the 7.x branch.
+
+We removed almost all features, arguments, functions, and modules that were
+marked as deprecated between IPython 1.0 and 5.0 and before. As reminder 5.0 was
+released in 2016, and 1.0 in 2013. Last release of the 5 branch was 5.10.0, in
+may 2020. The few remaining deprecated features have better deprecation warnings
+or errors.
+
+There are many change in IPython 8.0 will will try to describe subsequently, 
+
+
+The first on is the integration of the ``stack_data`` package;
 which provide smarter information in traceback; in particular it will highlight
 the AST node where an error occurs which can help to quickly narrow down errors.
 
@@ -50,13 +62,34 @@ IPython 8.0 is capable of telling you, where the index error occurs::
     return x[0][i][0]
                 ^
 
+
+Numfocus Small Developer Grant
+------------------------------
+
 To prepare for Python 3.10 we have also started working on removing reliance and
 any dependency that is not Python 3.10 compatible; that include migrating our
-test suite to Pytest, and starting to remove nose.
+test suite to pytest, and starting to remove nose. This also mean that the
+``iptest`` command is now gone, and all testing is via pytest. 
+
+This was in bog part thanks the NumFOCUS Small Developer grant, we were able to
+allocate 4000 to hire `Nikita Kniazev @Kojoley <https://github.com/Kojoley>`__
+who did a fantastic job at updating our code base, migrating to pytest, pushing
+our coverage, and fixing a large number of bugs. I highly recommend contacting
+them if you need help with C++ and Python projects
 
-We are also removing support for Python 3.6 allowing internal code to use more
+You can find all relevant issues and PRs with the SDG 2021 tag:
+
+https://github.com/ipython/ipython/issues?q=label%3A%22Numfocus+SDG+2021%22+
+
+Removing support for Older Python
+---------------------------------
+
+
+We are also removing support for Python up to 3.7 allowing internal code to use more
 efficient ``pathlib``, and make better use of type annotations.
 
+IMAGE : Pathlib, pathlib everywhere.
+
 The completer has also seen significant updates and make use of newer Jedi API
 offering faster and more reliable tab completion.
 
@@ -168,6 +201,12 @@ Try ``%autoreload 3`` in an IPython session after running ``%load_ext autoreload
 For more information please see unit test -
     extensions/tests/test_autoreload.py : 'test_autoload_newly_added_objects'
 
+
+Miscelanious
+------------
+
+Minimum supported
+
 =======
 
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.

From 7d60fba8d14cd4a56f56bf68362643da2561472c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 10:57:11 -0800
Subject: [PATCH 0954/1407] misc updates

---
 docs/source/whatsnew/development.rst          | 147 +++++++++++++++++-
 docs/source/whatsnew/pr/empty-hist-range.rst  |  19 ---
 .../whatsnew/pr/hist-range-glob-feature.rst   |  25 ---
 docs/source/whatsnew/pr/ipdb-interact.rst     |   4 -
 .../whatsnew/pr/remove-deprecated-stuff.rst   |   8 -
 docs/source/whatsnew/pr/sunken-brackets.rst   |   7 -
 .../whatsnew/pr/traceback-improvements.rst    |  39 -----
 docs/source/whatsnew/pr/vi-prompt-strip.rst   |  29 ----
 8 files changed, 144 insertions(+), 134 deletions(-)
 delete mode 100644 docs/source/whatsnew/pr/empty-hist-range.rst
 delete mode 100644 docs/source/whatsnew/pr/hist-range-glob-feature.rst
 delete mode 100644 docs/source/whatsnew/pr/ipdb-interact.rst
 delete mode 100644 docs/source/whatsnew/pr/remove-deprecated-stuff.rst
 delete mode 100644 docs/source/whatsnew/pr/sunken-brackets.rst
 delete mode 100644 docs/source/whatsnew/pr/traceback-improvements.rst
 delete mode 100644 docs/source/whatsnew/pr/vi-prompt-strip.rst

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 960a00130e0..27758becbb1 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -36,7 +36,7 @@ released in 2016, and 1.0 in 2013. Last release of the 5 branch was 5.10.0, in
 may 2020. The few remaining deprecated features have better deprecation warnings
 or errors.
 
-There are many change in IPython 8.0 will will try to describe subsequently, 
+There are many change in IPython 8.0 will will try to describe subsequently,
 
 
 The first on is the integration of the ``stack_data`` package;
@@ -69,7 +69,7 @@ Numfocus Small Developer Grant
 To prepare for Python 3.10 we have also started working on removing reliance and
 any dependency that is not Python 3.10 compatible; that include migrating our
 test suite to pytest, and starting to remove nose. This also mean that the
-``iptest`` command is now gone, and all testing is via pytest. 
+``iptest`` command is now gone, and all testing is via pytest.
 
 This was in bog part thanks the NumFOCUS Small Developer grant, we were able to
 allocate 4000 to hire `Nikita Kniazev @Kojoley <https://github.com/Kojoley>`__
@@ -207,7 +207,148 @@ Miscelanious
 
 Minimum supported
 
-=======
+
+History Range Glob feature
+==========================
+
+Previously, when using ``%history``, users could specify either
+a range of sessions and lines, for example:
+
+.. code-block:: python
+
+   ~8/1-~6/5   # see history from the first line of 8 sessions ago,
+               # to the fifth line of 6 sessions ago.``
+
+Or users could specify a glob pattern:
+
+.. code-block:: python
+
+   -g <pattern>  # glob ALL history for the specified pattern.
+
+However users could *not* specify both.
+
+If a user *did* specify both a range and a glob pattern,
+then the glob pattern would be used (globbing *all* history) *and the range would be ignored*.
+
+---
+
+With this enhancement, if a user specifies both a range and a glob pattern, then the glob pattern will be applied to the specified range of history.
+
+Don't start a multi line cell with sunken parenthesis
+-----------------------------------------------------
+
+From now on IPython will not ask for the next line of input when given a single
+line with more closing than opening brackets. For example, this means that if
+you (mis)type ']]' instead of '[]', a ``SyntaxError`` will show up, instead of
+the ``...:`` prompt continuation.
+
+IPython shell for ipdb interact
+-------------------------------
+
+The ipdb ``interact`` starts an IPython shell instead of Python's built-in ``code.interact()``.
+
+Automatic Vi prompt stripping
+=============================
+
+When pasting code into IPython, it will strip the leading prompt characters if
+there are any. For example, you can paste the following code into the console -
+it will still work, even though each line is prefixed with prompts (`In`,
+`Out`)::
+
+    In [1]: 2 * 2 == 4
+    Out[1]: True
+
+    In [2]: print("This still works as pasted")
+
+
+Previously, this was not the case for the Vi-mode prompts::
+
+    In [1]: [ins] In [13]: 2 * 2 == 4
+       ...: Out[13]: True
+       ...:
+      File "<ipython-input-1-727bb88eaf33>", line 1
+        [ins] In [13]: 2 * 2 == 4
+              ^
+    SyntaxError: invalid syntax
+
+This is now fixed, and Vi prompt prefixes - ``[ins]`` and ``[nav]`` -  are
+skipped just as the normal ``In`` would be.
+
+IPython shell can be started in the Vi mode using ``ipython
+--TerminalInteractiveShell.editing_mode=vi``
+
+Empty History Ranges
+====================
+
+A number of magics that take history ranges can now be used with an empty
+range. These magics are:
+
+ * ``%save``
+ * ``%load``
+ * ``%pastebin``
+ * ``%pycat``
+
+Using them this way will make them take the history of the current session up
+to the point of the magic call (such that the magic itself will not be
+included).
+
+Therefore it is now possible to save the whole history to a file using simple
+``%save <filename>``, load and edit it using ``%load`` (makes for a nice usage
+when followed with :kbd:`F2`), send it to dpaste.org using ``%pastebin``, or
+view the whole thing syntax-highlighted with a single ``%pycat``.
+
+Traceback improvements
+======================
+
+
+UPDATE THIS IN INPUT.
+
+Previously, error tracebacks for errors happening in code cells were showing a hash, the one used for compiling the Python AST::
+
+    In [1]: def foo():
+    ...:     return 3 / 0
+    ...:
+
+    In [2]: foo()
+    ---------------------------------------------------------------------------
+    ZeroDivisionError                         Traceback (most recent call last)
+    <ipython-input-2-c19b6d9633cf> in <module>
+    ----> 1 foo()
+
+    <ipython-input-1-1595a74c32d5> in foo()
+        1 def foo():
+    ----> 2     return 3 / 0
+        3
+
+    ZeroDivisionError: division by zero
+
+The error traceback is now correctly formatted, showing the cell number in which the error happened::
+
+    In [1]: def foo():
+    ...:     return 3 / 0
+    ...:
+
+    In [2]: foo()
+    ---------------------------------------------------------------------------
+    ZeroDivisionError                         Traceback (most recent call last)
+    In [2], in <module>
+    ----> 1 foo()
+
+    In [1], in foo()
+        1 def foo():
+    ----> 2     return 3 / 0
+
+    ZeroDivisionError: division by zero
+
+Remove Deprecated Stuff
+=======================
+
+
+We no longer need to add `extensions` to the PYTHONPATH because that is being
+handled by `load_extension`.
+
+We are also removing Cythonmagic, sympyprinting and rmagic as they are now in
+other packages and no longer need to be inside IPython.
 
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 
diff --git a/docs/source/whatsnew/pr/empty-hist-range.rst b/docs/source/whatsnew/pr/empty-hist-range.rst
deleted file mode 100644
index a36789f631d..00000000000
--- a/docs/source/whatsnew/pr/empty-hist-range.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-Empty History Ranges
-====================
-
-A number of magics that take history ranges can now be used with an empty
-range. These magics are:
-
- * ``%save``
- * ``%load``
- * ``%pastebin``
- * ``%pycat``
-
-Using them this way will make them take the history of the current session up
-to the point of the magic call (such that the magic itself will not be
-included).
-
-Therefore it is now possible to save the whole history to a file using simple
-``%save <filename>``, load and edit it using ``%load`` (makes for a nice usage
-when followed with :kbd:`F2`), send it to dpaste.org using ``%pastebin``, or
-view the whole thing syntax-highlighted with a single ``%pycat``.
diff --git a/docs/source/whatsnew/pr/hist-range-glob-feature.rst b/docs/source/whatsnew/pr/hist-range-glob-feature.rst
deleted file mode 100644
index 5c38ea7c5e7..00000000000
--- a/docs/source/whatsnew/pr/hist-range-glob-feature.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-History Range Glob feature
-==========================
-
-Previously, when using ``%history``, users could specify either
-a range of sessions and lines, for example:
-
-.. code-block:: python
-
-   ~8/1-~6/5   # see history from the first line of 8 sessions ago,
-               # to the fifth line of 6 sessions ago.``
-
-Or users could specify a glob pattern:
-
-.. code-block:: python
-
-   -g <pattern>  # glob ALL history for the specified pattern.
-
-However users could *not* specify both.  
-
-If a user *did* specify both a range and a glob pattern,
-then the glob pattern would be used (globbing *all* history) *and the range would be ignored*.
-
----
-
-With this enhancment, if a user specifies both a range and a glob pattern, then the glob pattern will be applied to the specified range of history.
diff --git a/docs/source/whatsnew/pr/ipdb-interact.rst b/docs/source/whatsnew/pr/ipdb-interact.rst
deleted file mode 100644
index 8783be6da0a..00000000000
--- a/docs/source/whatsnew/pr/ipdb-interact.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-IPython shell for ipdb interact
--------------------------------
-
-The ipdb ``interact`` starts an IPython shell instead of Python's built-in ``code.interact()``.
diff --git a/docs/source/whatsnew/pr/remove-deprecated-stuff.rst b/docs/source/whatsnew/pr/remove-deprecated-stuff.rst
deleted file mode 100644
index 2a948e4f2d1..00000000000
--- a/docs/source/whatsnew/pr/remove-deprecated-stuff.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-Remove Deprecated Stuff
-================================
-
-We no longer need to add `extensions` to the PYTHONPATH because that is being
-handled by `load_extension`.
-
-We are also removing Cythonmagic, sympyprinting and rmagic as they are now in
-other packages and no longer need to be inside IPython.
diff --git a/docs/source/whatsnew/pr/sunken-brackets.rst b/docs/source/whatsnew/pr/sunken-brackets.rst
deleted file mode 100644
index f64f936ff85..00000000000
--- a/docs/source/whatsnew/pr/sunken-brackets.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Don't start a multiline cell with sunken parenthesis
-----------------------------------------------------
-
-From now on IPython will not ask for the next line of input when given a single
-line with more closing than opening brackets. For example, this means that if
-you (mis)type ']]' instead of '[]', a ``SyntaxError`` will show up, instead of
-the ``...:`` prompt continuation.
diff --git a/docs/source/whatsnew/pr/traceback-improvements.rst b/docs/source/whatsnew/pr/traceback-improvements.rst
deleted file mode 100644
index 7040f585e3f..00000000000
--- a/docs/source/whatsnew/pr/traceback-improvements.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-Traceback improvements
-======================
-
-Previously, error tracebacks for errors happening in code cells were showing a hash, the one used for compiling the Python AST::
-
-    In [1]: def foo():
-    ...:     return 3 / 0
-    ...:
-
-    In [2]: foo()
-    ---------------------------------------------------------------------------
-    ZeroDivisionError                         Traceback (most recent call last)
-    <ipython-input-2-c19b6d9633cf> in <module>
-    ----> 1 foo()
-
-    <ipython-input-1-1595a74c32d5> in foo()
-        1 def foo():
-    ----> 2     return 3 / 0
-        3
-
-    ZeroDivisionError: division by zero
-
-The error traceback is now correctly formatted, showing the cell number in which the error happened::
-
-    In [1]: def foo():
-    ...:     return 3 / 0
-    ...:
-
-    In [2]: foo()
-    ---------------------------------------------------------------------------
-    ZeroDivisionError                         Traceback (most recent call last)
-    In [2], in <module>
-    ----> 1 foo()
-
-    In [1], in foo()
-        1 def foo():
-    ----> 2     return 3 / 0
-
-    ZeroDivisionError: division by zero
diff --git a/docs/source/whatsnew/pr/vi-prompt-strip.rst b/docs/source/whatsnew/pr/vi-prompt-strip.rst
deleted file mode 100644
index e642a4d1f83..00000000000
--- a/docs/source/whatsnew/pr/vi-prompt-strip.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-Automatic Vi prompt stripping
-=============================
-
-When pasting code into IPython, it will strip the leading prompt characters if
-there are any. For example, you can paste the following code into the console -
-it will still work, even though each line is prefixed with prompts (`In`,
-`Out`)::
-
-    In [1]: 2 * 2 == 4
-    Out[1]: True
-
-    In [2]: print("This still works as pasted")
-
-
-Previously, this was not the case for the Vi-mode prompts::
-
-    In [1]: [ins] In [13]: 2 * 2 == 4
-       ...: Out[13]: True
-       ...: 
-      File "<ipython-input-1-727bb88eaf33>", line 1
-        [ins] In [13]: 2 * 2 == 4
-              ^
-    SyntaxError: invalid syntax
-
-This is now fixed, and Vi prompt prefixes - ``[ins]`` and ``[nav]`` -  are
-skipped just as the normal ``In`` would be.
-
-IPython shell can be started in the Vi mode using ``ipython
---TerminalInteractiveShell.editing_mode=vi``

From a31b1a133c52c03b3946555954ad20178b4364cc Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 11:03:34 -0800
Subject: [PATCH 0955/1407] fix complete docstrings

---
 IPython/core/completer.py | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index cc7b629e2e1..2f0ad6b6bb0 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -462,7 +462,7 @@ def _deduplicate_completions(text: str, completions: _IC)-> _IC:
             seen.add(new_text)
 
 
-def rectify_completions(text: str, completions: _IC, *, _debug=False)->_IC:
+def rectify_completions(text: str, completions: _IC, *, _debug: bool = False) -> _IC:
     """
     Rectify a set of completions to all have the same ``start`` and ``end``
 
@@ -479,6 +479,8 @@ def rectify_completions(text: str, completions: _IC, *, _debug=False)->_IC:
         text that should be completed.
     completions : Iterator[Completion]
         iterator over the completions to rectify
+    _debug : bool
+        Log failed completion
 
     Notes
     -----
@@ -1128,16 +1130,23 @@ def __init__(
             secondary optional dict for completions, to
             handle cases (such as IPython embedded inside functions) where
             both Python scopes are visible.
-        use_readline : bool, optional
-            DEPRECATED, ignored since IPython 6.0, will have no effects
+        config : Config
+            traitlet's config object
+        **kwargs
+            passed to super class unmodified.
         """
 
         self.magic_escape = ESC_MAGIC
         self.splitter = CompletionSplitter()
 
         # _greedy_changed() depends on splitter and readline being defined:
-        Completer.__init__(self, namespace=namespace, global_namespace=global_namespace,
-                            config=config, **kwargs)
+        super().__init__(
+            self,
+            namespace=namespace,
+            global_namespace=global_namespace,
+            config=config,
+            **kwargs
+        )
 
         # List where completion matches will be stored
         self.matches = []
@@ -2055,9 +2064,9 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
 
         Parameters
         ----------
-        cursor_line :
+        cursor_line
             Index of the line the cursor is on. 0 indexed.
-        cursor_pos :
+        cursor_pos
             Position of the cursor in the current line/line_buffer/text. 0
             indexed.
         line_buffer : optional, str

From 33f5b346f6df04d5dc243d3e2008b75294ddf138 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 11:08:12 -0800
Subject: [PATCH 0956/1407] some docstring reformatting and fixing

---
 IPython/core/crashhandler.py | 20 +++++++++++--
 IPython/core/getipython.py   |  2 +-
 IPython/core/magic.py        | 58 ++++++++++++++----------------------
 IPython/core/page.py         |  8 ++---
 IPython/core/payloadpage.py  |  7 ++---
 IPython/core/pylabtools.py   |  7 ++---
 IPython/core/ultratb.py      |  2 +-
 7 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/IPython/core/crashhandler.py b/IPython/core/crashhandler.py
index 181fc157954..d0d4b0d7725 100644
--- a/IPython/core/crashhandler.py
+++ b/IPython/core/crashhandler.py
@@ -32,6 +32,8 @@
 
 from IPython.core.release import __version__ as version
 
+from typing import Optional
+
 #-----------------------------------------------------------------------------
 # Code
 #-----------------------------------------------------------------------------
@@ -95,8 +97,15 @@ def __call__(self, etype, evalue, etb)
     message_template = _default_message_template
     section_sep = '\n\n'+'*'*75+'\n\n'
 
-    def __init__(self, app, contact_name=None, contact_email=None,
-                 bug_tracker=None, show_crash_traceback=True, call_pdb=False):
+    def __init__(
+        self,
+        app,
+        contact_name: Optional[str] = None,
+        contact_email: Optional[str] = None,
+        bug_tracker: Optional[str] = None,
+        show_crash_traceback: bool = True,
+        call_pdb: bool = False,
+    ):
         """Create a new crash handler
 
         Parameters
@@ -113,10 +122,15 @@ def __init__(self, app, contact_name=None, contact_email=None,
         show_crash_traceback : bool
             If false, don't print the crash traceback on stderr, only generate
             the on-disk report
-        Non-argument instance attributes
+        call_pdb
+            Whether to call pdb on crash
+
+        Attributes
+        ----------
         These instances contain some non-argument attributes which allow for
         further customization of the crash handler's behavior. Please see the
         source for further details.
+
         """
         self.crash_report_fname = "Crash_report_%s.txt" % app.name
         self.app = app
diff --git a/IPython/core/getipython.py b/IPython/core/getipython.py
index e6d8a4c91d7..5e9b13cf3c6 100644
--- a/IPython/core/getipython.py
+++ b/IPython/core/getipython.py
@@ -16,7 +16,7 @@
 
 def get_ipython():
     """Get the global InteractiveShell instance.
-    
+
     Returns None if no InteractiveShell instance is registered.
     """
     from IPython.core.interactiveshell import InteractiveShell
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 7f7f1f94b28..3dc3480b561 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -114,16 +114,13 @@ def record_magic(dct, magic_kind, magic_name, func):
     Parameters
     ----------
     dct : dict
-      A dictionary with 'line' and 'cell' subdicts.
-
+        A dictionary with 'line' and 'cell' subdicts.
     magic_kind : str
-      Kind of magic to be stored.
-
+        Kind of magic to be stored.
     magic_name : str
-      Key to store the magic as.
-
+        Key to store the magic as.
     func : function
-      Callable object to store.
+        Callable object to store.
     """
     if magic_kind == 'line_cell':
         dct['line'][magic_name] = dct['cell'][magic_name] = func
@@ -372,7 +369,7 @@ def lsmagic_docs(self, brief=False, missing=''):
     def register(self, *magic_objects):
         """Register one or more instances of Magics.
 
-        Take one or more classes or instances of classes that subclass the main 
+        Take one or more classes or instances of classes that subclass the main
         `core.Magic` class, and register them with IPython to use the magic
         functions they provide.  The registration process will then ensure that
         any methods that have decorated to provide line and/or cell magics will
@@ -387,7 +384,7 @@ def register(self, *magic_objects):
 
         Parameters
         ----------
-        magic_objects : one or more classes or instances
+        *magic_objects : one or more classes or instances
         """
         # Start by validating them to ensure they have all had their magic
         # methods registered at the instance level
@@ -410,7 +407,7 @@ def register_function(self, func, magic_kind='line', magic_name=None):
 
         This will create an IPython magic (line, cell or both) from a
         standalone function.  The functions should have the following
-        signatures: 
+        signatures:
 
         * For line magics: `def f(line)`
         * For cell magics: `def f(line, cell)`
@@ -422,14 +419,12 @@ def register_function(self, func, magic_kind='line', magic_name=None):
         Parameters
         ----------
         func : callable
-          Function to be registered as a magic.
-
+            Function to be registered as a magic.
         magic_kind : str
-          Kind of magic, one of 'line', 'cell' or 'line_cell'
-
+            Kind of magic, one of 'line', 'cell' or 'line_cell'
         magic_name : optional str
-          If given, the name the magic will have in the IPython namespace.  By
-          default, the name of the function itself is used.
+            If given, the name the magic will have in the IPython namespace.  By
+            default, the name of the function itself is used.
         """
 
         # Create the new method in the user_magics and register it in the
@@ -450,13 +445,11 @@ def register_alias(self, alias_name, magic_name, magic_kind='line', magic_params
         Parameters
         ----------
         alias_name : str
-          The name of the magic to be registered.
-
+            The name of the magic to be registered.
         magic_name : str
-          The name of an existing magic.
-
+            The name of an existing magic.
         magic_kind : str
-          Kind of magic, one of 'line' or 'cell'
+            Kind of magic, one of 'line' or 'cell'
         """
 
         # `validate_type` is too permissive, as it allows 'line_cell'
@@ -580,25 +573,20 @@ def parse_options(self, arg_str, opt_str, *long_opts, **kw):
 
         Parameters
         ----------
-
         arg_str : str
-          The arguments to parse.
-
+            The arguments to parse.
         opt_str : str
-          The options specification.
-
+            The options specification.
         mode : str, default 'string'
-          If given as 'list', the argument string is returned as a list (split
-          on whitespace) instead of a string.
-
+            If given as 'list', the argument string is returned as a list (split
+            on whitespace) instead of a string.
         list_all : bool, default False
-          Put all option values in lists. Normally only options
-          appearing more than once are put in a list.
-
+            Put all option values in lists. Normally only options
+            appearing more than once are put in a list.
         posix : bool, default True
-          Whether to split the input line in POSIX mode or not, as per the
-          conventions outlined in the :mod:`shlex` module from the standard
-          library.
+            Whether to split the input line in POSIX mode or not, as per the
+            conventions outlined in the :mod:`shlex` module from the standard
+            library.
         """
 
         # inject default options at the beginning of the input line
diff --git a/IPython/core/page.py b/IPython/core/page.py
index 44903255ec2..24770c56a3c 100644
--- a/IPython/core/page.py
+++ b/IPython/core/page.py
@@ -46,7 +46,7 @@ def display_page(strng, start=0, screen_lines=25):
 
 def as_hook(page_func):
     """Wrap a pager func to strip the `self` arg
-    
+
     so it can be called as a hook.
     """
     return lambda self, *args, **kwargs: page_func(*args, **kwargs)
@@ -127,7 +127,7 @@ def _detect_screen_size(screen_lines_def):
 
 def pager_page(strng, start=0, screen_lines=0, pager_cmd=None):
     """Display a string, piping through a pager after a certain length.
-    
+
     strng can be a mime-bundle dict, supplying multiple representations,
     keyed by mime-type.
 
@@ -238,10 +238,10 @@ def pager_page(strng, start=0, screen_lines=0, pager_cmd=None):
 
 def page(data, start=0, screen_lines=0, pager_cmd=None):
     """Display content in a pager, piping through a pager after a certain length.
-    
+
     data can be a mime-bundle dict, supplying multiple representations,
     keyed by mime-type, or text.
-    
+
     Pager is dispatched via the `show_in_pager` IPython hook.
     If no hook is registered, `pager_page` will be used.
     """
diff --git a/IPython/core/payloadpage.py b/IPython/core/payloadpage.py
index eb613445dd4..4958108076b 100644
--- a/IPython/core/payloadpage.py
+++ b/IPython/core/payloadpage.py
@@ -17,10 +17,9 @@ def page(strng, start=0, screen_lines=0, pager_cmd=None):
     Parameters
     ----------
     strng : str or mime-dict
-      Text to page, or a mime-type keyed dict of already formatted data.
-
+        Text to page, or a mime-type keyed dict of already formatted data.
     start : int
-      Starting line at which to place the display.
+        Starting line at which to place the display.
     """
 
     # Some routines may auto-compute start offsets incorrectly and pass a
@@ -42,7 +41,7 @@ def page(strng, start=0, screen_lines=0, pager_cmd=None):
 
 def install_payload_page():
     """DEPRECATED, use show_in_pager hook
-    
+
     Install this version of page as IPython.core.page.page.
     """
     warnings.warn("""install_payload_page is deprecated.
diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index 711ee758e77..68e100f7d07 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -185,8 +185,8 @@ def mpl_runner(safe_execfile):
     Parameters
     ----------
     safe_execfile : function
-      This must be a function with the same interface as the
-      :meth:`safe_execfile` method of IPython.
+        This must be a function with the same interface as the
+        :meth:`safe_execfile` method of IPython.
 
     Returns
     -------
@@ -241,7 +241,7 @@ def select_figure_formats(shell, formats, **kwargs):
     """Select figure formats for the inline backend.
 
     Parameters
-    ==========
+    ----------
     shell : InteractiveShell
         The main IPython instance.
     formats : str or set
@@ -408,7 +408,6 @@ def configure_inline_support(shell, backend):
     Parameters
     ----------
     shell : InteractiveShell instance
-
     backend : matplotlib backend
     """
     warnings.warn(
diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index c7ce562524b..5c62ee91485 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -556,7 +556,7 @@ def get_exception_only(self, etype, value):
         Parameters
         ----------
         etype : exception type
-        evalue : exception value
+        value : exception value
         """
         return ListTB.structured_traceback(self, etype, value)
 

From d3083dd39cc61c72ba45b9af04cbad6b049426ac Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 11:26:35 -0800
Subject: [PATCH 0957/1407] some manual fixes

---
 IPython/core/interactiveshell.py | 20 +++++++++-----------
 IPython/core/oinspect.py         | 32 ++++++++++++++------------------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 020e892f543..f45ffeec4a4 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2057,16 +2057,14 @@ def complete(self, text, line=None, cursor_pos=None):
         Parameters
         ----------
 
-           text : string
-             A string of text to be completed on.  It can be given as empty and
-             instead a line/position pair are given.  In this case, the
-             completer itself will split the line like readline does.
-
-           line : string, optional
-             The complete line that text is part of.
-
-           cursor_pos : int, optional
-             The position of the cursor on the input line.
+        text : string
+          A string of text to be completed on.  It can be given as empty and
+          instead a line/position pair are given.  In this case, the
+          completer itself will split the line like readline does.
+        line : string, optional
+          The complete line that text is part of.
+        cursor_pos : int, optional
+          The position of the cursor on the input line.
 
         Returns
         -------
@@ -2606,7 +2604,7 @@ def safe_execfile(self, fname, *where, exit_ignore=False, raise_exceptions=False
         ----------
         fname : string
             The name of the file to be executed.
-        where : tuple
+        *where : tuple
             One or two namespaces, passed to execfile() as (globals,locals).
             If only one is given, it is passed as both.
         exit_ignore : bool (False)
diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 9e52f1e4771..db2bd57892d 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -302,7 +302,7 @@ def find_file(obj) -> str:
     Returns
     -------
     fname : str
-      The absolute path to the file where the object was defined.
+        The absolute path to the file where the object was defined.
     """
     obj = _get_wrapped(obj)
 
@@ -337,7 +337,7 @@ def find_source_lines(obj):
     Returns
     -------
     lineno : int
-      The line number where the object definition starts.
+        The line number where the object definition starts.
     """
     obj = _get_wrapped(obj)
 
@@ -428,7 +428,6 @@ def pdoc(self, obj, oname='', formatter=None):
 
         Examples
         --------
-
         In [1]: class NoInit:
            ...:     pass
 
@@ -575,18 +574,17 @@ def _get_info(
         """Retrieve an info dict and format it.
 
         Parameters
-        ==========
-
-        obj: any
+        ----------
+        obj : any
             Object to inspect and return info from
         oname: str (default: ''):
             Name of the variable pointing to `obj`.
-        formatter: callable
+        formatter : callable
         info:
             already computed information
-        detail_level: integer
+        detail_level : integer
             Granularity of detail level, if set to 1, give more information.
-        omit_sections: container[str]
+        omit_sections : container[str]
             Titles or keys to omit from output (can be set, tuple, etc., anything supporting `in`)
         """
 
@@ -716,21 +714,19 @@ def _info(self, obj, oname='', info=None, detail_level=0) -> dict:
         """Compute a dict with detailed information about an object.
 
         Parameters
-        ==========
-
-        obj: any
+        ----------
+        obj : any
             An object to find information about
-        oname: str (default: ''):
+        oname : str (default: '')
             Name of the variable pointing to `obj`.
-        info: (default: None)
+        info : (default: None)
             A struct (dict like with attr access) with some information fields
             which may have been precomputed already.
-        detail_level: int (default:0)
+        detail_level : int (default:0)
             If set to 1, more information is given.
 
         Returns
-        =======
-
+        -------
         An object info dict with known fields from `info_fields`. Keys are
         strings, values are string or None.
         """
@@ -962,7 +958,7 @@ def psearch(self,pattern,ns_table,ns_search=[],
 
           - show_all(False): show all names, including those starting with
             underscores.
-            
+
           - list_types(False): list all available object types for object matching.
         """
         #print 'ps pattern:<%r>' % pattern # dbg

From af9d424266bf61e3c8db7ab2e1228dc206466452 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 11:27:43 -0800
Subject: [PATCH 0958/1407] reformat all of core

---
 IPython/core/debugger.py          |   3 -
 IPython/core/display.py           |  18 +++-
 IPython/core/formatters.py        |   3 +
 IPython/core/history.py           |  96 +++++++++----------
 IPython/core/inputsplitter.py     |  52 +++++-----
 IPython/core/inputtransformer.py  |  17 ++--
 IPython/core/inputtransformer2.py |  12 +--
 IPython/core/interactiveshell.py  | 151 ++++++++++++++----------------
 8 files changed, 176 insertions(+), 176 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index d3e4ec2defe..8e3dd9678cd 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -798,7 +798,6 @@ def do_where(self, arg):
 
     def break_anywhere(self, frame):
         """
-
         _stop_in_decorator_internals is overly restrictive, as we may still want
         to trace function calls, so we need to also update break_anywhere so
         that is we don't `stop_here`, because of debugger skip, we may still
@@ -820,8 +819,6 @@ def _is_in_decorator_internal_and_should_skip(self, frame):
         """
         Utility to tell us whether we are in a decorator internal and should stop.
 
-
-
         """
 
         # if we are disabled don't skip
diff --git a/IPython/core/display.py b/IPython/core/display.py
index 310e2fa2161..f3934c2d9d7 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -826,15 +826,19 @@ def __init__(
         data : unicode, str or bytes
             The raw image data or a URL or filename to load the data from.
             This always results in embedded image data.
+
         url : unicode
             A URL to download the data from. If you specify `url=`,
             the image data will not be embedded unless you also specify `embed=True`.
+
         filename : unicode
             Path to a local file to load the data from.
             Images from a file are always embedded.
+
         format : unicode
             The format of the image data (png/jpeg/jpg/gif). If a filename or URL is given
             for format will be inferred from the filename extension.
+
         embed : bool
             Should the image data be embedded using a data URI (True) or be
             loaded using an <img> tag. Set this to True if you want the image
@@ -844,10 +848,13 @@ def __init__(
             default value is `False`.
 
             Note that QtConsole is not able to display images if `embed` is set to `False`
+
         width : int
             Width in pixels to which to constrain the image in html
+
         height : int
             Height in pixels to which to constrain the image in html
+
         retina : bool
             Automatically set the width and height to half of the measured
             width and height.
@@ -855,10 +862,13 @@ def __init__(
             from image data.
             For non-embedded images, you can just set the desired display width
             and height directly.
+
         unconfined : bool
             Set unconfined=True to disable max-width confinement of the image.
+
         metadata : dict
             Specify extra metadata to attach to the image.
+
         alt : unicode
             Alternative text for the image, for use by screen readers.
 
@@ -1067,12 +1077,15 @@ def __init__(self, data=None, url=None, filename=None, embed=False,
         data : unicode, str or bytes
             The raw video data or a URL or filename to load the data from.
             Raw data will require passing ``embed=True``.
+
         url : unicode
             A URL for the video. If you specify ``url=``,
             the image data will not be embedded.
+
         filename : unicode
             Path to a local file containing the video.
             Will be interpreted as a local URL unless ``embed=True``.
+
         embed : bool
             Should the video be embedded using a data URI (True) or be
             loaded using a <video> tag (False).
@@ -1083,15 +1096,19 @@ def __init__(self, data=None, url=None, filename=None, embed=False,
             Local files can be displayed with URLs without embedding the content, via::
 
                 Video('./video.mp4')
+
         mimetype : unicode
             Specify the mimetype for embedded videos.
             Default will be guessed from file extension, if available.
+
         width : int
             Width in pixels to which to constrain the video in HTML.
             If not supplied, defaults to the width of the video.
+
         height : int
             Height in pixels to which to constrain the video in html.
             If not supplied, defaults to the height of the video.
+
         html_attributes : str
             Attributes for the HTML ``<video>`` block.
             Default: ``"controls"`` to get video controls.
@@ -1221,7 +1238,6 @@ def set_matplotlib_close(close=True):
 
         use `matplotlib_inline.backend_inline.set_matplotlib_close()`
 
-
     Set whether the inline backend closes all figures automatically or not.
 
     By default, the inline backend used in the IPython Notebook will close all
diff --git a/IPython/core/formatters.py b/IPython/core/formatters.py
index b2430f0ed60..4e0b9e455ae 100644
--- a/IPython/core/formatters.py
+++ b/IPython/core/formatters.py
@@ -433,6 +433,7 @@ def for_type(self, typ, func=None):
         ----------
         typ : type or '__module__.__name__' string for a type
             The class of the object that will be formatted using `func`.
+
         func : callable
             A callable for computing the format data.
             `func` will be called with the object to be formatted,
@@ -474,8 +475,10 @@ def for_type_by_name(self, type_module, type_name, func=None):
         type_module : str
             The full dotted name of the module the type is defined in, like
             ``numpy``.
+
         type_name : str
             The name of the type (the class name), like ``dtype``
+
         func : callable
             A callable for computing the format data.
             `func` will be called with the object to be formatted,
diff --git a/IPython/core/history.py b/IPython/core/history.py
index 43248066091..6ee78442bc8 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -195,12 +195,12 @@ def __init__(self, profile="default", hist_file="", **traits):
         Parameters
         ----------
         profile : str
-          The name of the profile from which to open history.
+            The name of the profile from which to open history.
         hist_file : str
-          Path to an SQLite history database stored by IPython. If specified,
-          hist_file overrides profile.
+            Path to an SQLite history database stored by IPython. If specified,
+            hist_file overrides profile.
         config : :class:`~traitlets.config.loader.Config`
-          Config object. hist_file can also be set through this.
+            Config object. hist_file can also be set through this.
         """
         # We need a pointer back to the shell for various tasks.
         super(HistoryAccessor, self).__init__(**traits)
@@ -227,7 +227,7 @@ def _get_hist_file_name(self, profile='default'):
         Parameters
         ----------
         profile : str
-          The name of a profile which has a history file.
+            The name of a profile which has a history file.
         """
         return Path(locate_profile(profile)) / "history.sqlite"
 
@@ -271,13 +271,13 @@ def _run_sql(self, sql, params, raw=True, output=False, latest=False):
         Parameters
         ----------
         sql : str
-          Any filtering expressions to go after SELECT ... FROM ...
+            Any filtering expressions to go after SELECT ... FROM ...
         params : tuple
-          Parameters passed to the SQL query (to replace "?")
+            Parameters passed to the SQL query (to replace "?")
         raw, output : bool
-          See :meth:`get_range`
+            See :meth:`get_range`
         latest : bool
-          Select rows with max (session, line)
+            Select rows with max (session, line)
 
         Returns
         -------
@@ -305,23 +305,21 @@ def get_session_info(self, session):
 
         Parameters
         ----------
-
         session : int
             Session number to retrieve.
 
         Returns
         -------
-
         session_id : int
-           Session ID number
+            Session ID number
         start : datetime
-           Timestamp for the start of the session.
+            Timestamp for the start of the session.
         end : datetime
-           Timestamp for the end of the session, or None if IPython crashed.
+            Timestamp for the end of the session, or None if IPython crashed.
         num_cmds : int
-           Number of commands run, or None if IPython crashed.
+            Number of commands run, or None if IPython crashed.
         remark : unicode
-           A manually set description.
+            A manually set description.
         """
         query = "SELECT * from sessions where session == ?"
         return self.db.execute(query, (session,)).fetchone()
@@ -343,13 +341,13 @@ def get_tail(self, n=10, raw=True, output=False, include_latest=False):
         Parameters
         ----------
         n : int
-          The number of lines to get
+            The number of lines to get
         raw, output : bool
-          See :meth:`get_range`
+            See :meth:`get_range`
         include_latest : bool
-          If False (default), n+1 lines are fetched, and the latest one
-          is discarded. This is intended to be used where the function
-          is called by a user command, which it should not return.
+            If False (default), n+1 lines are fetched, and the latest one
+            is discarded. This is intended to be used where the function
+            is called by a user command, which it should not return.
 
         Returns
         -------
@@ -373,16 +371,16 @@ def search(self, pattern="*", raw=True, search_raw=True,
         Parameters
         ----------
         pattern : str
-          The wildcarded pattern to match when searching
+            The wildcarded pattern to match when searching
         search_raw : bool
-          If True, search the raw input, otherwise, the parsed input
+            If True, search the raw input, otherwise, the parsed input
         raw, output : bool
-          See :meth:`get_range`
+            See :meth:`get_range`
         n : None or int
-          If an integer is given, it defines the limit of
-          returned entries.
+            If an integer is given, it defines the limit of
+            returned entries.
         unique : bool
-          When it is true, return only unique entries.
+            When it is true, return only unique entries.
 
         Returns
         -------
@@ -430,9 +428,9 @@ def get_range(self, session, start=1, stop=None, raw=True,output=False):
         Returns
         -------
         entries
-          An iterator over the desired lines. Each line is a 3-tuple, either
-          (session, line, input) if output is False, or
-          (session, line, (input, output)) if output is True.
+            An iterator over the desired lines. Each line is a 3-tuple, either
+            (session, line, input) if output is False, or
+            (session, line, (input, output)) if output is True.
         """
         if stop:
             lineclause = "line >= ? AND line < ?"
@@ -451,13 +449,13 @@ def get_range_by_str(self, rangestr, raw=True, output=False):
         Parameters
         ----------
         rangestr : str
-          A string specifying ranges, e.g. "5 ~2/1-4". If empty string is used,
-          this will return everything from current session's history.
+            A string specifying ranges, e.g. "5 ~2/1-4". If empty string is used,
+            this will return everything from current session's history.
 
-          See the documentation of :func:`%history` for the full details.
+            See the documentation of :func:`%history` for the full details.
 
         raw, output : bool
-          As :meth:`get_range`
+            As :meth:`get_range`
 
         Returns
         -------
@@ -605,24 +603,22 @@ def get_session_info(self, session=0):
 
         Parameters
         ----------
-
         session : int
             Session number to retrieve. The current session is 0, and negative
             numbers count back from current session, so -1 is the previous session.
 
         Returns
         -------
-
         session_id : int
-           Session ID number
+            Session ID number
         start : datetime
-           Timestamp for the start of the session.
+            Timestamp for the start of the session.
         end : datetime
-           Timestamp for the end of the session, or None if IPython crashed.
+            Timestamp for the end of the session, or None if IPython crashed.
         num_cmds : int
-           Number of commands run, or None if IPython crashed.
+            Number of commands run, or None if IPython crashed.
         remark : unicode
-           A manually set description.
+            A manually set description.
         """
         if session <= 0:
             session += self.session_number
@@ -673,9 +669,9 @@ def get_range(self, session=0, start=1, stop=None, raw=True,output=False):
         Returns
         -------
         entries
-          An iterator over the desired lines. Each line is a 3-tuple, either
-          (session, line, input) if output is False, or
-          (session, line, (input, output)) if output is True.
+            An iterator over the desired lines. Each line is a 3-tuple, either
+            (session, line, input) if output is False, or
+            (session, line, (input, output)) if output is True.
         """
         if session <= 0:
             session += self.session_number
@@ -694,14 +690,12 @@ def store_inputs(self, line_num, source, source_raw=None):
         Parameters
         ----------
         line_num : int
-          The prompt number of this input.
-
+            The prompt number of this input.
         source : str
-          Python input.
-
+            Python input.
         source_raw : str, optional
-          If given, this is the raw input without any IPython transformations
-          applied to it.  If not given, ``source`` is used.
+            If given, this is the raw input without any IPython transformations
+            applied to it.  If not given, ``source`` is used.
         """
         if source_raw is None:
             source_raw = source
@@ -745,7 +739,7 @@ def store_output(self, line_num):
         Parameters
         ----------
         line_num : int
-          The line number from which to save outputs
+            The line number from which to save outputs
         """
         if (not self.db_log_output) or (line_num not in self.output_hist_reprs):
             return
diff --git a/IPython/core/inputsplitter.py b/IPython/core/inputsplitter.py
index e7bc6e7f5a3..01b9c8a5e61 100644
--- a/IPython/core/inputsplitter.py
+++ b/IPython/core/inputsplitter.py
@@ -210,7 +210,7 @@ def last_blank(src):
     Parameters
     ----------
     src : string
-      A single or multiline string.
+        A single or multiline string.
     """
     if not src: return False
     ll  = src.splitlines()[-1]
@@ -228,7 +228,7 @@ def last_two_blanks(src):
     Parameters
     ----------
     src : string
-      A single or multiline string.
+        A single or multiline string.
     """
     if not src: return False
     # The logic here is tricky: I couldn't get a regexp to work and pass all
@@ -251,7 +251,7 @@ def remove_comments(src):
     Parameters
     ----------
     src : string
-      A single or multiline input string.
+        A single or multiline input string.
 
     Returns
     -------
@@ -351,22 +351,22 @@ def source_reset(self):
 
     def check_complete(self, source):
         """Return whether a block of code is ready to execute, or should be continued
-        
+
         This is a non-stateful API, and will reset the state of this InputSplitter.
-        
+
         Parameters
         ----------
         source : string
-          Python input code, which can be multiline.
-        
+            Python input code, which can be multiline.
+
         Returns
         -------
         status : str
-          One of 'complete', 'incomplete', or 'invalid' if source is not a
-          prefix of valid code.
+            One of 'complete', 'incomplete', or 'invalid' if source is not a
+            prefix of valid code.
         indent_spaces : int or None
-          The number of spaces by which to indent the next line of code. If
-          status is not 'incomplete', this is None.
+            The number of spaces by which to indent the next line of code. If
+            status is not 'incomplete', this is None.
         """
         self.reset()
         try:
@@ -397,15 +397,15 @@ def push(self, lines:str) -> bool:
         Parameters
         ----------
         lines : string
-          One or more lines of Python input.
+            One or more lines of Python input.
 
         Returns
         -------
         is_complete : boolean
-          True if the current input source (the result of the current input
-          plus prior inputs) forms a complete Python execution block.  Note that
-          this value is also stored as a private attribute (``_is_complete``), so it
-          can be queried at any time.
+            True if the current input source (the result of the current input
+            plus prior inputs) forms a complete Python execution block.  Note that
+            this value is also stored as a private attribute (``_is_complete``), so it
+            can be queried at any time.
         """
         assert isinstance(lines, str)
         self._store(lines)
@@ -448,7 +448,7 @@ def push_accepts_more(self):
         guess whether a block is complete or not based solely on prior and
         current input lines.  The InputSplitter considers it has a complete
         interactive block and will not accept more input when either:
-        
+
         * A SyntaxError is raised
 
         * The code is complete and consists of a single line or a single
@@ -618,9 +618,9 @@ def reset(self):
     def flush_transformers(self):
         def _flush(transform, outs):
             """yield transformed lines
-            
+
             always strings, never None
-            
+
             transform: the current transform
             outs: an iterable of previously transformed inputs.
                  Each may be multiline, which will be passed
@@ -690,15 +690,15 @@ def push(self, lines:str) -> bool:
         Parameters
         ----------
         lines : string
-          One or more lines of Python input.
+            One or more lines of Python input.
 
         Returns
         -------
         is_complete : boolean
-          True if the current input source (the result of the current input
-          plus prior inputs) forms a complete Python execution block.  Note that
-          this value is also stored as a private attribute (_is_complete), so it
-          can be queried at any time.
+            True if the current input source (the result of the current input
+            plus prior inputs) forms a complete Python execution block.  Note that
+            this value is also stored as a private attribute (_is_complete), so it
+            can be queried at any time.
         """
         assert isinstance(lines, str)
         # We must ensure all input is pure unicode
@@ -728,10 +728,10 @@ def push(self, lines:str) -> bool:
 
     def _transform_line(self, line):
         """Push a line of input code through the various transformers.
-        
+
         Returns any output from the transformers, or None if a transformer
         is accumulating lines.
-        
+
         Sets self.transformer_accumulating as a side effect.
         """
         def _accumulating(dbg):
diff --git a/IPython/core/inputtransformer.py b/IPython/core/inputtransformer.py
index afeca93cc0e..2fcf7eeb5fc 100644
--- a/IPython/core/inputtransformer.py
+++ b/IPython/core/inputtransformer.py
@@ -46,7 +46,7 @@ class InputTransformer(metaclass=abc.ABCMeta):
     def push(self, line):
         """Send a line of input to the transformer, returning the transformed
         input or None if the transformer is waiting for more input.
-        
+
         Must be overridden by subclasses.
 
         Implementations may raise ``SyntaxError`` if the input is invalid. No
@@ -58,7 +58,7 @@ def push(self, line):
     def reset(self):
         """Return, transformed any lines that the transformer has accumulated,
         and reset its internal state.
-        
+
         Must be overridden by subclasses.
         """
         pass
@@ -312,7 +312,7 @@ def has_comment(src):
     Parameters
     ----------
     src : string
-      A single line input string.
+        A single line input string.
 
     Returns
     -------
@@ -324,11 +324,11 @@ def has_comment(src):
 def ends_in_comment_or_string(src):
     """Indicates whether or not an input line ends in a comment or within
     a multiline string.
-    
+
     Parameters
     ----------
     src : string
-      A single line input string.
+        A single line input string.
 
     Returns
     -------
@@ -358,7 +358,7 @@ def help_end(line):
 @CoroutineInputTransformer.wrap
 def cellmagic(end_on_blank_line=False):
     """Captures & transforms cell magics.
-    
+
     After a cell magic is started, this stores up any lines it gets until it is
     reset (sent None).
     """
@@ -397,7 +397,7 @@ def cellmagic(end_on_blank_line=False):
 
 def _strip_prompts(prompt_re, initial_re=None, turnoff_re=None):
     """Remove matching input prompts from a block of input.
-    
+
     Parameters
     ----------
     prompt_re : regular expression
@@ -407,7 +407,6 @@ def _strip_prompts(prompt_re, initial_re=None, turnoff_re=None):
         If no initial expression is given, prompt_re will be used everywhere.
         Used mainly for plain Python prompts, where the continuation prompt
         ``...`` is a valid Python expression in Python 3, so shouldn't be stripped.
-    
     If initial_re and prompt_re differ,
     only initial_re will be tested against the first line.
     If any prompt is found on the first two lines,
@@ -475,7 +474,7 @@ def ipy_prompt():
 @CoroutineInputTransformer.wrap
 def leading_indent():
     """Remove leading indentation.
-    
+
     If the first line starts with a spaces or tabs, the same whitespace will be
     removed from each following line until it is reset.
     """
diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index ee7015924dd..85d448a727f 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -640,17 +640,17 @@ def check_complete(self, cell: str):
 
         Parameters
         ----------
-        source : string
-          Python input code, which can be multiline.
+        cell : string
+            Python input code, which can be multiline.
 
         Returns
         -------
         status : str
-          One of 'complete', 'incomplete', or 'invalid' if source is not a
-          prefix of valid code.
+            One of 'complete', 'incomplete', or 'invalid' if source is not a
+            prefix of valid code.
         indent_spaces : int or None
-          The number of spaces by which to indent the next line of code. If
-          status is not 'incomplete', this is None.
+            The number of spaces by which to indent the next line of code. If
+            status is not 'incomplete', this is None.
         """
         # Remember if the lines ends in a new line.
         ends_with_newline = False
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index f45ffeec4a4..6b966c9a719 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1730,7 +1730,6 @@ def set_custom_exc(self, exc_tuple, handler):
 
         Parameters
         ----------
-
         exc_tuple : tuple of exception classes
             A *tuple* of exception classes, for which to call the defined
             handler.  It is very important that you use a tuple, and NOT A
@@ -1760,7 +1759,6 @@ def my_handler(self, etype, value, tb, tb_offset=None):
 
         Notes
         -----
-
         WARNING: by putting in your own exception handler into IPython's main
         execution loop, you run a very good chance of nasty crashes.  This
         facility should only be used if you really know what you are doing.
@@ -1975,7 +1973,7 @@ def showsyntaxerror(self, filename=None, running_compiled_code=False):
 
         If the syntax error occurred when running a compiled code (i.e. running_compile_code=True),
         longer stack trace will be displayed.
-         """
+        """
         etype, value, last_traceback = self._get_exc_info()
 
         if filename and issubclass(etype, SyntaxError):
@@ -2056,24 +2054,21 @@ def complete(self, text, line=None, cursor_pos=None):
 
         Parameters
         ----------
-
         text : string
-          A string of text to be completed on.  It can be given as empty and
-          instead a line/position pair are given.  In this case, the
-          completer itself will split the line like readline does.
+            A string of text to be completed on.  It can be given as empty and
+            instead a line/position pair are given.  In this case, the
+            completer itself will split the line like readline does.
         line : string, optional
-          The complete line that text is part of.
+            The complete line that text is part of.
         cursor_pos : int, optional
-          The position of the cursor on the input line.
+            The position of the cursor on the input line.
 
         Returns
         -------
         text : string
-          The actual text that was completed.
-
+            The actual text that was completed.
         matches : list
-          A sorted list with all possible completions.
-
+            A sorted list with all possible completions.
 
         Notes
         -----
@@ -2087,7 +2082,6 @@ def complete(self, text, line=None, cursor_pos=None):
 
         Examples
         --------
-
         In [1]: x = 'hello'
 
         In [2]: _ip.complete('x.l')
@@ -2341,9 +2335,9 @@ def system_piped(self, cmd):
         Parameters
         ----------
         cmd : str
-          Command to execute (can not end in '&', as background processes are
-          not supported.  Should not be a command that expects input
-          other than simple text.
+            Command to execute (can not end in '&', as background processes are
+            not supported.  Should not be a command that expects input
+            other than simple text.
         """
         if cmd.rstrip().endswith('&'):
             # this is *far* from a rigorous test
@@ -2365,7 +2359,7 @@ def system_raw(self, cmd):
         Parameters
         ----------
         cmd : str
-          Command to execute.
+            Command to execute.
         """
         cmd = self.var_expand(cmd, depth=1)
         # warn if there is an IPython magic alternative.
@@ -2433,18 +2427,18 @@ def getoutput(self, cmd, split=True, depth=0):
         Parameters
         ----------
         cmd : str
-          Command to execute (can not end in '&', as background processes are
-          not supported.
+            Command to execute (can not end in '&', as background processes are
+            not supported.
         split : bool, optional
-          If True, split the output into an IPython SList.  Otherwise, an
-          IPython LSString is returned.  These are objects similar to normal
-          lists and strings, with a few convenience attributes for easier
-          manipulation of line-based output.  You can use '?' on them for
-          details.
+            If True, split the output into an IPython SList.  Otherwise, an
+            IPython LSString is returned.  These are objects similar to normal
+            lists and strings, with a few convenience attributes for easier
+            manipulation of line-based output.  You can use '?' on them for
+            details.
         depth : int, optional
-          How many frames above the caller are the local variables which should
-          be expanded in the command string? The default (0) assumes that the
-          expansion variables are in the stack frame calling this function.
+            How many frames above the caller are the local variables which should
+            be expanded in the command string? The default (0) assumes that the
+            expansion variables are in the stack frame calling this function.
         """
         if cmd.rstrip().endswith('&'):
             # this is *far* from a rigorous test
@@ -2555,9 +2549,9 @@ def user_expressions(self, expressions):
         Parameters
         ----------
         expressions : dict
-          A dict with string keys and string values.  The expression values
-          should be valid Python expressions, each of which will be evaluated
-          in the user namespace.
+            A dict with string keys and string values.  The expression values
+            should be valid Python expressions, each of which will be evaluated
+            in the user namespace.
 
         Returns
         -------
@@ -2753,19 +2747,19 @@ def run_cell(self, raw_cell, store_history=False, silent=False, shell_futures=Tr
         Parameters
         ----------
         raw_cell : str
-          The code (including IPython code such as %magic functions) to run.
+            The code (including IPython code such as %magic functions) to run.
         store_history : bool
-          If True, the raw and translated cell will be stored in IPython's
-          history. For user code calling back into IPython's machinery, this
-          should be set to False.
+            If True, the raw and translated cell will be stored in IPython's
+            history. For user code calling back into IPython's machinery, this
+            should be set to False.
         silent : bool
-          If True, avoid side-effects, such as implicit displayhooks and
-          and logging.  silent=True forces store_history=False.
+            If True, avoid side-effects, such as implicit displayhooks and
+            and logging.  silent=True forces store_history=False.
         shell_futures : bool
-          If True, the code will share future statements with the interactive
-          shell. It will both be affected by previous __future__ imports, and
-          any __future__ imports in the code will affect the shell. If False,
-          __future__ imports are not shared in either direction.
+            If True, the code will share future statements with the interactive
+            shell. It will both be affected by previous __future__ imports, and
+            any __future__ imports in the code will affect the shell. If False,
+            __future__ imports are not shared in either direction.
 
         Returns
         -------
@@ -2834,14 +2828,13 @@ def should_run_async(
 
         Parameters
         ----------
-        raw_cell: str
+        raw_cell : str
             The code to be executed
 
         Returns
         -------
         result: bool
             Whether the code needs to be run with a coroutine runner or not
-
         .. versionadded:: 7.0
         """
         if not self.autoawait:
@@ -3073,8 +3066,8 @@ def transform_ast(self, node):
         Parameters
         ----------
         node : ast.Node
-          The root node to be transformed. Typically called with the ast.Module
-          produced by parsing user input.
+            The root node to be transformed. Typically called with the ast.Module
+            produced by parsing user input.
 
         Returns
         -------
@@ -3288,17 +3281,17 @@ def check_complete(self, code: str) -> Tuple[str, str]:
 
         Parameters
         ----------
-        source : string
-          Python input code, which can be multiline.
+        code : string
+            Python input code, which can be multiline.
 
         Returns
         -------
         status : str
-          One of 'complete', 'incomplete', or 'invalid' if source is not a
-          prefix of valid code.
+            One of 'complete', 'incomplete', or 'invalid' if source is not a
+            prefix of valid code.
         indent : str
-          When status is 'incomplete', this is some whitespace to insert on
-          the next line of the prompt.
+            When status is 'incomplete', this is some whitespace to insert on
+            the next line of the prompt.
         """
         status, nspaces = self.input_transformer_manager.check_complete(code)
         return status, ' ' * (nspaces or 0)
@@ -3325,13 +3318,13 @@ def enable_matplotlib(self, gui=None):
         Parameters
         ----------
         gui : optional, string
-          If given, dictates the choice of matplotlib GUI backend to use
-          (should be one of IPython's supported backends, 'qt', 'osx', 'tk',
-          'gtk', 'wx' or 'inline'), otherwise we use the default chosen by
-          matplotlib (as dictated by the matplotlib build-time options plus the
-          user's matplotlibrc configuration file).  Note that not all backends
-          make sense in all contexts, for example a terminal ipython can't
-          display figures inline.
+            If given, dictates the choice of matplotlib GUI backend to use
+            (should be one of IPython's supported backends, 'qt', 'osx', 'tk',
+            'gtk', 'wx' or 'inline'), otherwise we use the default chosen by
+            matplotlib (as dictated by the matplotlib build-time options plus the
+            user's matplotlibrc configuration file).  Note that not all backends
+            make sense in all contexts, for example a terminal ipython can't
+            display figures inline.
         """
         from IPython.core import pylabtools as pt
         from matplotlib_inline.backend_inline import configure_inline_support
@@ -3371,18 +3364,18 @@ def enable_pylab(self, gui=None, import_all=True, welcome_message=False):
         Parameters
         ----------
         gui : optional, string
-          If given, dictates the choice of matplotlib GUI backend to use
-          (should be one of IPython's supported backends, 'qt', 'osx', 'tk',
-          'gtk', 'wx' or 'inline'), otherwise we use the default chosen by
-          matplotlib (as dictated by the matplotlib build-time options plus the
-          user's matplotlibrc configuration file).  Note that not all backends
-          make sense in all contexts, for example a terminal ipython can't
-          display figures inline.
+            If given, dictates the choice of matplotlib GUI backend to use
+            (should be one of IPython's supported backends, 'qt', 'osx', 'tk',
+            'gtk', 'wx' or 'inline'), otherwise we use the default chosen by
+            matplotlib (as dictated by the matplotlib build-time options plus the
+            user's matplotlibrc configuration file).  Note that not all backends
+            make sense in all contexts, for example a terminal ipython can't
+            display figures inline.
         import_all : optional, bool, default: True
-          Whether to do `from numpy import *` and `from pylab import *`
-          in addition to module imports.
+            Whether to do `from numpy import *` and `from pylab import *`
+            in addition to module imports.
         welcome_message : deprecated
-          This argument is ignored, no welcome message will be displayed.
+            This argument is ignored, no welcome message will be displayed.
         """
         from IPython.core.pylabtools import import_pylab
 
@@ -3489,7 +3482,6 @@ def extract_input_lines(self, range_str, raw=False):
 
         Notes
         -----
-
         Slices can be described with two notations:
 
         * ``N:M`` -> standard python form, means including items N...(M-1).
@@ -3515,26 +3507,25 @@ def find_user_code(self, target, raw=True, py_only=False, skip_encoding_cookie=T
         Parameters
         ----------
         target : str
-          A string specifying code to retrieve. This will be tried respectively
-          as: ranges of input history (see %history for syntax), url,
-          corresponding .py file, filename, or an expression evaluating to a
-          string or Macro in the user namespace.
+            A string specifying code to retrieve. This will be tried respectively
+            as: ranges of input history (see %history for syntax), url,
+            corresponding .py file, filename, or an expression evaluating to a
+            string or Macro in the user namespace.
 
-          If empty string is given, returns complete history of current
-          session, without the last line.
+            If empty string is given, returns complete history of current
+            session, without the last line.
 
         raw : bool
-          If true (default), retrieve raw history. Has no effect on the other
-          retrieval mechanisms.
+            If true (default), retrieve raw history. Has no effect on the other
+            retrieval mechanisms.
 
         py_only : bool (default False)
-          Only try to fetch python code, do not try alternative methods to decode file
-          if unicode fails.
+            Only try to fetch python code, do not try alternative methods to decode file
+            if unicode fails.
 
         Returns
         -------
         A string of code.
-
         ValueError is raised if nothing is found, and TypeError if it evaluates
         to an object of another type. In each case, .args[0] is a printable
         message.

From 85c1753bc367e76a08ab4d5105d76e1df7b51cf9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 11:28:19 -0800
Subject: [PATCH 0959/1407] reformat terminal

---
 IPython/terminal/embed.py  | 29 ++++++++++++-----------------
 IPython/terminal/magics.py |  8 ++++----
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/IPython/terminal/embed.py b/IPython/terminal/embed.py
index 476359808c9..85e76d55585 100644
--- a/IPython/terminal/embed.py
+++ b/IPython/terminal/embed.py
@@ -49,7 +49,6 @@ def kill_embedded(self, parameter_s=''):
         you may then kill it and the program will then continue to run without
         the interactive shell interfering again.
 
-
         Kill Instance Option:
 
             If for some reasons you need to kill the location where the instance
@@ -266,25 +265,21 @@ def mainloop(
 
         Parameters
         ----------
-
-
         local_ns, module
-          Working local namespace (a dict) and module (a module or similar
-          object). If given as None, they are automatically taken from the scope
-          where the shell was called, so that program variables become visible.
-
+            Working local namespace (a dict) and module (a module or similar
+            object). If given as None, they are automatically taken from the scope
+            where the shell was called, so that program variables become visible.
         stack_depth : int
-          How many levels in the stack to go to looking for namespaces (when
-          local_ns or module is None). This allows an intermediate caller to
-          make sure that this function gets the namespace from the intended
-          level in the stack. By default (0) it will get its locals and globals
-          from the immediate caller.
-
+            How many levels in the stack to go to looking for namespaces (when
+            local_ns or module is None). This allows an intermediate caller to
+            make sure that this function gets the namespace from the intended
+            level in the stack. By default (0) it will get its locals and globals
+            from the immediate caller.
         compile_flags
-          A bit field identifying the __future__ features
-          that are enabled, as passed to the builtin :func:`compile` function.
-          If given as None, they are automatically taken from the scope where
-          the shell was called.
+            A bit field identifying the __future__ features
+            that are enabled, as passed to the builtin :func:`compile` function.
+            If given as None, they are automatically taken from the scope where
+            the shell was called.
 
         """
         
diff --git a/IPython/terminal/magics.py b/IPython/terminal/magics.py
index aef96071f0e..498a05027e5 100644
--- a/IPython/terminal/magics.py
+++ b/IPython/terminal/magics.py
@@ -113,9 +113,9 @@ def cpaste(self, parameter_s=''):
 
         Shell escapes are not supported (yet).
 
-        See also
+        See Also
         --------
-        paste: automatically pull code from clipboard.
+        paste : automatically pull code from clipboard.
 
         Examples
         --------
@@ -176,9 +176,9 @@ def paste(self, parameter_s=''):
 
         IPython statements (magics, shell escapes) are not supported (yet).
 
-        See also
+        See Also
         --------
-        cpaste: manually paste code into terminal until you mark its end.
+        cpaste : manually paste code into terminal until you mark its end.
         """
         opts, name = self.parse_options(parameter_s, 'rq', mode='string')
         if 'r' in opts:

From ff8ba98b9ba6f4aca715d1bee5a32c69d9e0be2e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 11:33:27 -0800
Subject: [PATCH 0960/1407] reformat all of IPython.core

---
 IPython/core/magics/basic.py     | 11 +++++------
 IPython/core/magics/execution.py |  4 +---
 IPython/core/magics/extension.py |  2 +-
 IPython/core/magics/history.py   |  4 ++--
 IPython/core/magics/namespace.py | 17 ++++-------------
 IPython/core/magics/osm.py       | 10 ++++------
 IPython/core/magics/script.py    |  8 ++++----
 setup.cfg                        |  2 +-
 8 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py
index b44b4a38128..c52e2c9b2ee 100644
--- a/IPython/core/magics/basic.py
+++ b/IPython/core/magics/basic.py
@@ -45,7 +45,7 @@ def __str__(self):
     
     def _jsonable(self):
         """turn magics dict into jsonable dict of the same structure
-        
+
         replaces object instances with their class names as strings
         """
         magic_dict = {}
@@ -123,7 +123,7 @@ def alias_magic(self, line=''):
 
           In [6]: %whereami
           Out[6]: u'/home/testuser'
-          
+
           In [7]: %alias_magic h history "-p -l 30" --line
           Created `%h` as an alias for `%history -l 30`.
         """
@@ -367,7 +367,7 @@ def xmode(self, parameter_s=''):
 
         If called without arguments, acts as a toggle.
 
-        When in verbose mode the value --show (and --hide) 
+        When in verbose mode the value --show (and --hide)
         will respectively show (or hide) frames with ``__tracebackhide__ =
         True`` value set.
         """
@@ -616,12 +616,11 @@ def autoawait(self, parameter_s):
 
         If the passed parameter does not match any of the above and is a python
         identifier, get said object from user namespace and set it as the
-        runner, and activate autoawait. 
+        runner, and activate autoawait.
 
         If the object is a fully qualified object name, attempt to import it and
         set it as the runner, and activate autoawait.
-        
-        
+
         The exact behavior of autoawait is experimental and subject to change
         across version of IPython and Python.
         """
diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 1b1c7b77940..419eb320b7a 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -1067,7 +1067,6 @@ def timeit(self, line='', cell=None, local_ns=None):
 
           In [6]: %timeit -n1 time.sleep(2)
 
-
         The times reported by %timeit will be slightly higher than those
         reported by the timeit.py script when variables are accessed. This is
         due to the fact that %timeit executes the statement in the namespace
@@ -1201,7 +1200,7 @@ def time(self,line='', cell=None, local_ns=None):
         The CPU and wall clock times are printed, and the value of the
         expression (if any) is returned.  Note that under Win32, system time
         is always reported as 0, since it can not be measured.
-        
+
         This function can be used both as a line and cell magic:
 
         - In line mode you can time a single-line statement (though multiple
@@ -1238,7 +1237,6 @@ def time(self,line='', cell=None, local_ns=None):
           CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
           Wall time: 0.00
 
-
         .. note::
             The time needed by Python to compile the given expression will be
             reported if it is more than 0.1s.
diff --git a/IPython/core/magics/extension.py b/IPython/core/magics/extension.py
index ba93b3be754..2bc76b2d552 100644
--- a/IPython/core/magics/extension.py
+++ b/IPython/core/magics/extension.py
@@ -41,7 +41,7 @@ def load_ext(self, module_str):
     @line_magic
     def unload_ext(self, module_str):
         """Unload an IPython extension by its module name.
-        
+
         Not all extensions can be unloaded, only those which define an
         ``unload_ipython_extension`` function.
         """
diff --git a/IPython/core/magics/history.py b/IPython/core/magics/history.py
index ad58b33b0b3..ec080304116 100644
--- a/IPython/core/magics/history.py
+++ b/IPython/core/magics/history.py
@@ -105,7 +105,7 @@ def history(self, parameter_s = ''):
 
         By default, all input history from the current session is displayed.
         Ranges of history can be indicated using the syntax:
-        
+
         ``4``
             Line 4, current session
         ``4-6``
@@ -117,7 +117,7 @@ def history(self, parameter_s = ''):
         ``~8/1-~6/5``
             From the first line of 8 sessions ago, to the fifth line of 6
             sessions ago.
-        
+
         Multiple ranges can be entered, separated by spaces
 
         The same syntax is used by %macro, %save, %edit, %rerun
diff --git a/IPython/core/magics/namespace.py b/IPython/core/magics/namespace.py
index 2118d8f77cc..57a05d7c5ba 100644
--- a/IPython/core/magics/namespace.py
+++ b/IPython/core/magics/namespace.py
@@ -173,7 +173,7 @@ def psearch(self, parameter_s=''):
           'builtin', 'user', 'user_global','internal', 'alias', where
           'builtin' and 'user' are the search defaults.  Note that you should
           not use quotes when specifying namespaces.
-          
+
           -l: List all available object types for object matching. This function
           can be used without arguments.
 
@@ -203,9 +203,9 @@ def psearch(self, parameter_s=''):
         Show objects beginning with a single _::
 
           %psearch -a _*         list objects beginning with a single underscore
-          
+
         List available objects::
-        
+
           %psearch -l            list all available object types
         """
         # default namespaces to be searched
@@ -252,7 +252,6 @@ def who_ls(self, parameter_s=''):
 
         Examples
         --------
-
         Define two variables and list them with who_ls::
 
           In [1]: alpha = 123
@@ -367,7 +366,6 @@ def whos(self, parameter_s=''):
 
         Examples
         --------
-
         Define two variables and list them with whos::
 
           In [1]: alpha = 123
@@ -485,22 +483,16 @@ def reset(self, parameter_s=''):
         Parameters
         ----------
         -f : force reset without asking for confirmation.
-
         -s : 'Soft' reset: Only clears your namespace, leaving history intact.
             References to objects may be kept. By default (without this option),
             we do a 'hard' reset, giving you a new session and removing all
             references to objects from the current session.
-
-        --aggressive: Try to aggressively remove modules from sys.modules ; this
+        --aggressive : Try to aggressively remove modules from sys.modules ; this
             may allow you to reimport Python modules that have been updated and
             pick up changes, but can have unattended consequences.
-
         in : reset input history
-
         out : reset output history
-
         dhist : reset directory history
-
         array : reset only variables that are NumPy arrays
 
         See Also
@@ -624,7 +616,6 @@ def reset_selective(self, parameter_s=''):
 
         Examples
         --------
-
         We first fully reset the namespace so your output looks identical to
         this example for pedagogical reasons; in practice you do not need a
         full reset::
diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index 0940df31c34..11fec812ef6 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -65,7 +65,7 @@ def __init__(self, shell=None, **kwargs):
 
     def _isexec_POSIX(self, file):
         """
-            Test for executable on a POSIX system
+        Test for executable on a POSIX system
         """
         if os.access(file.path, os.X_OK):
             # will fail on maxOS if access is not X_OK
@@ -76,13 +76,13 @@ def _isexec_POSIX(self, file):
     
     def _isexec_WIN(self, file):
         """
-            Test for executable file on non POSIX system
+        Test for executable file on non POSIX system
         """
         return file.is_file() and self.execre.match(file.name) is not None
 
     def isexec(self, file):
         """
-            Test for executable file on non POSIX system
+        Test for executable file on non POSIX system
         """
         if self.is_posix:
             return self._isexec_POSIX(file)
@@ -316,7 +316,6 @@ def cd(self, parameter_s=''):
             ``cd <bookmark_name>`` is enough if there is no directory
             ``<bookmark_name>``, but a bookmark with the name exists.
 
-
         Options:
 
         -q               Be quiet. Do not print the working directory after the
@@ -329,7 +328,6 @@ def cd(self, parameter_s=''):
            where ``!command`` runs is immediately discarded after executing
            'command'.
 
-
         Examples
         --------
         ::
@@ -834,7 +832,7 @@ def pycat(self, parameter_s=''):
     @cell_magic
     def writefile(self, line, cell):
         """Write the contents of the cell to a file.
-        
+
         The file will be overwritten unless the -a (--append) flag is specified.
         """
         args = magic_arguments.parse_argstring(self.writefile, line)
diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index dab63e742d8..59f27c21d84 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -202,16 +202,16 @@ def named_script_magic(line, cell):
     @dec_safe_watcher
     def shebang(self, line, cell):
         """Run a cell via a shell command
-        
+
         The `%%script` line is like the #! line of script,
         specifying a program (bash, perl, ruby, etc.) with which to run.
-        
+
         The rest of the cell is run by that program.
-        
+
         Examples
         --------
         ::
-        
+
             In [1]: %%script bash
                ...: for i in 1 2 3; do
                ...:   echo $i
diff --git a/setup.cfg b/setup.cfg
index 837dca3e39a..b011a7ef3cd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -101,7 +101,7 @@ pygments.lexers =
 
 [velin]
 ignore_patterns = 
-   IPython/core/tests,
+   IPython/core/tests
    IPython/testing
 
 [tool.black]

From c68d9882df5d1a8df6e9058caed3285e2962d3ca Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 11:35:41 -0800
Subject: [PATCH 0961/1407] reformat rest of ipython

---
 IPython/external/qt_loaders.py | 26 ++++++++++++--------------
 IPython/lib/backgroundjobs.py  |  2 +-
 IPython/lib/demo.py            |  2 +-
 IPython/lib/display.py         | 28 ++++++++++++++--------------
 IPython/lib/latextools.py      |  1 -
 5 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/IPython/external/qt_loaders.py b/IPython/external/qt_loaders.py
index 6041e234ea0..975855ca6bc 100644
--- a/IPython/external/qt_loaders.py
+++ b/IPython/external/qt_loaders.py
@@ -75,7 +75,7 @@ def find_spec(self, fullname, path, target=None):
 
 def commit_api(api):
     """Commit to a particular API, and trigger ImportErrors on subsequent
-       dangerous imports"""
+    dangerous imports"""
     modules = set(api_to_module.values())
 
     modules.remove(api_to_module[api])
@@ -115,15 +115,15 @@ def loaded_api():
 def has_binding(api):
     """Safely check for PyQt4/5, PySide or PySide2, without importing submodules
 
-        Parameters
-        ----------
-        api : str [ 'pyqtv1' | 'pyqt' | 'pyqt5' | 'pyside' | 'pyside2' | 'pyqtdefault']
-             Which module to check for
+    Parameters
+    ----------
+    api : str [ 'pyqtv1' | 'pyqt' | 'pyqt5' | 'pyside' | 'pyside2' | 'pyqtdefault']
+        Which module to check for
 
-        Returns
-        -------
-        True if the relevant module appears to be importable
-     """
+    Returns
+    -------
+    True if the relevant module appears to be importable
+    """
     module_name = api_to_module[api]
     from importlib.util import find_spec
 
@@ -193,9 +193,8 @@ def import_pyqt4(version=2):
     Parameters
     ----------
     version : 1, 2, or None
-      Which QString/QVariant API to use. Set to None to use the system
-      default
-
+        Which QString/QVariant API to use. Set to None to use the system
+        default
     ImportErrors raised within this function are non-recoverable
     """
     # The new-style string API (version=2) automatically
@@ -319,13 +318,12 @@ def load_qt(api_options):
 
     Parameters
     ----------
-    api_options: List of strings
+    api_options : List of strings
         The order of APIs to try. Valid items are 'pyside', 'pyside2',
         'pyqt', 'pyqt5', 'pyqtv1' and 'pyqtdefault'
 
     Returns
     -------
-
     A tuple of QtCore, QtGui, QtSvg, QT_API
     The first three are the Qt modules. The last is the
     string indicating which module was loaded.
diff --git a/IPython/lib/backgroundjobs.py b/IPython/lib/backgroundjobs.py
index 588c15b17f6..e7ad51eb677 100644
--- a/IPython/lib/backgroundjobs.py
+++ b/IPython/lib/backgroundjobs.py
@@ -116,7 +116,7 @@ def new(self, func_or_exp, *args, **kwargs):
         The given expression is passed to eval(), along with the optional
         global/local dicts provided.  If no dicts are given, they are
         extracted automatically from the caller's frame.
-        
+
         A Python statement is NOT a valid eval() expression.  Basically, you
         can only use as an eval() argument something which can go on the right
         of an '=' sign and be assigned to a variable.
diff --git a/IPython/lib/demo.py b/IPython/lib/demo.py
index 8367a6fd951..14af5161cc8 100644
--- a/IPython/lib/demo.py
+++ b/IPython/lib/demo.py
@@ -239,7 +239,7 @@ def __init__(self,src,title='',arg_str='',auto_all=None, format_rst=False,
             terminal16m
 
           - style('default'): a string of pygments style name to be used.
-          """
+        """
         if hasattr(src, "read"):
              # It seems to be a file or a file-like object
             self.fname = "from a file-like object"
diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index 57ae8deb3e8..52060da37f3 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -517,20 +517,20 @@ def _get_display_formatter(self,
                                fp_cleaner=None):
         """ generate built-in formatter function
 
-           this is used to define both the notebook and terminal built-in
-            formatters as they only differ by some wrapper text for each entry
-
-           dirname_output_format: string to use for formatting directory
-            names, dirname will be substituted for a single "%s" which
-            must appear in this string
-           fname_output_format: string to use for formatting file names,
-            if a single "%s" appears in the string, fname will be substituted
-            if two "%s" appear in the string, the path to fname will be
-             substituted for the first and fname will be substituted for the
-             second
-           fp_format: string to use for formatting filepaths, must contain
-            exactly two "%s" and the dirname will be substituted for the first
-            and fname will be substituted for the second
+        this is used to define both the notebook and terminal built-in
+         formatters as they only differ by some wrapper text for each entry
+
+        dirname_output_format: string to use for formatting directory
+         names, dirname will be substituted for a single "%s" which
+         must appear in this string
+        fname_output_format: string to use for formatting file names,
+         if a single "%s" appears in the string, fname will be substituted
+         if two "%s" appear in the string, the path to fname will be
+          substituted for the first and fname will be substituted for the
+          second
+        fp_format: string to use for formatting filepaths, must contain
+         exactly two "%s" and the dirname will be substituted for the first
+         and fname will be substituted for the second
         """
         def f(dirname, fnames, included_suffixes=None):
             result = []
diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py
index a7bb08dfff9..27aeef5b0eb 100644
--- a/IPython/lib/latextools.py
+++ b/IPython/lib/latextools.py
@@ -77,7 +77,6 @@ def latex_to_png(s, encode=False, backend=None, wrap=False, color='Black',
         format, e.g. '#AA20FA'.
     scale : float
         Scale factor for the resulting PNG.
-
     None is returned when the backend cannot be used.
 
     """

From dc61db64a8cb14c49cfa40a0d009bd337484929d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 11:41:08 -0800
Subject: [PATCH 0962/1407] fix autoge

---
 IPython/core/completer.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 2f0ad6b6bb0..ccb1f465f5b 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1141,7 +1141,6 @@ def __init__(
 
         # _greedy_changed() depends on splitter and readline being defined:
         super().__init__(
-            self,
             namespace=namespace,
             global_namespace=global_namespace,
             config=config,

From cfa7cc7f10cd058fc4f13907e555464bc282df26 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 11:41:08 -0800
Subject: [PATCH 0963/1407] fix autoge

---
 IPython/core/completer.py        |  1 -
 IPython/core/magics/namespace.py | 10 +++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 2f0ad6b6bb0..ccb1f465f5b 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1141,7 +1141,6 @@ def __init__(
 
         # _greedy_changed() depends on splitter and readline being defined:
         super().__init__(
-            self,
             namespace=namespace,
             global_namespace=global_namespace,
             config=config,
diff --git a/IPython/core/magics/namespace.py b/IPython/core/magics/namespace.py
index 57a05d7c5ba..426c3b8f341 100644
--- a/IPython/core/magics/namespace.py
+++ b/IPython/core/magics/namespace.py
@@ -482,14 +482,18 @@ def reset(self, parameter_s=''):
 
         Parameters
         ----------
-        -f : force reset without asking for confirmation.
-        -s : 'Soft' reset: Only clears your namespace, leaving history intact.
+        -f
+           force reset without asking for confirmation.
+        -s
+           'Soft' reset: Only clears your namespace, leaving history intact.
             References to objects may be kept. By default (without this option),
             we do a 'hard' reset, giving you a new session and removing all
             references to objects from the current session.
-        --aggressive : Try to aggressively remove modules from sys.modules ; this
+        --aggressive
+            Try to aggressively remove modules from sys.modules ; this
             may allow you to reimport Python modules that have been updated and
             pick up changes, but can have unattended consequences.
+
         in : reset input history
         out : reset output history
         dhist : reset directory history

From 37b7bb52e5b8d7669233264628a57f9c87dde26f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 14:58:03 -0800
Subject: [PATCH 0964/1407] move images

---
 .../{ => 8.0}/auto_suggest_d_completions.png  | Bin
 .../auto_suggest_d_phantom.png}               | Bin
 .../auto_suggest_def_completions.png          | Bin
 .../{ => 8.0}/auto_suggest_def_phantom.png    | Bin
 .../{ => 8.0}/auto_suggest_match_parens.png   | Bin
 .../{ => 8.0}/auto_suggest_print_hello.png    | Bin
 .../auto_suggest_print_hello_suggest.png      | Bin
 .../{ => 8.0}/auto_suggest_prompt_no_text.png | Bin
 .../{ => 8.0}/auto_suggest_second_prompt.png  | Bin
 .../8.0/pathlib_pathlib_everywhere.jpg        | Bin 0 -> 77651 bytes
 docs/source/whatsnew/development.rst          | 228 ++++++++++++------
 11 files changed, 152 insertions(+), 76 deletions(-)
 rename docs/source/_images/{ => 8.0}/auto_suggest_d_completions.png (100%)
 rename docs/source/_images/{audo_suggest_d_phantom.png => 8.0/auto_suggest_d_phantom.png} (100%)
 rename docs/source/_images/{ => 8.0}/auto_suggest_def_completions.png (100%)
 rename docs/source/_images/{ => 8.0}/auto_suggest_def_phantom.png (100%)
 rename docs/source/_images/{ => 8.0}/auto_suggest_match_parens.png (100%)
 rename docs/source/_images/{ => 8.0}/auto_suggest_print_hello.png (100%)
 rename docs/source/_images/{ => 8.0}/auto_suggest_print_hello_suggest.png (100%)
 rename docs/source/_images/{ => 8.0}/auto_suggest_prompt_no_text.png (100%)
 rename docs/source/_images/{ => 8.0}/auto_suggest_second_prompt.png (100%)
 create mode 100644 docs/source/_images/8.0/pathlib_pathlib_everywhere.jpg

diff --git a/docs/source/_images/auto_suggest_d_completions.png b/docs/source/_images/8.0/auto_suggest_d_completions.png
similarity index 100%
rename from docs/source/_images/auto_suggest_d_completions.png
rename to docs/source/_images/8.0/auto_suggest_d_completions.png
diff --git a/docs/source/_images/audo_suggest_d_phantom.png b/docs/source/_images/8.0/auto_suggest_d_phantom.png
similarity index 100%
rename from docs/source/_images/audo_suggest_d_phantom.png
rename to docs/source/_images/8.0/auto_suggest_d_phantom.png
diff --git a/docs/source/_images/auto_suggest_def_completions.png b/docs/source/_images/8.0/auto_suggest_def_completions.png
similarity index 100%
rename from docs/source/_images/auto_suggest_def_completions.png
rename to docs/source/_images/8.0/auto_suggest_def_completions.png
diff --git a/docs/source/_images/auto_suggest_def_phantom.png b/docs/source/_images/8.0/auto_suggest_def_phantom.png
similarity index 100%
rename from docs/source/_images/auto_suggest_def_phantom.png
rename to docs/source/_images/8.0/auto_suggest_def_phantom.png
diff --git a/docs/source/_images/auto_suggest_match_parens.png b/docs/source/_images/8.0/auto_suggest_match_parens.png
similarity index 100%
rename from docs/source/_images/auto_suggest_match_parens.png
rename to docs/source/_images/8.0/auto_suggest_match_parens.png
diff --git a/docs/source/_images/auto_suggest_print_hello.png b/docs/source/_images/8.0/auto_suggest_print_hello.png
similarity index 100%
rename from docs/source/_images/auto_suggest_print_hello.png
rename to docs/source/_images/8.0/auto_suggest_print_hello.png
diff --git a/docs/source/_images/auto_suggest_print_hello_suggest.png b/docs/source/_images/8.0/auto_suggest_print_hello_suggest.png
similarity index 100%
rename from docs/source/_images/auto_suggest_print_hello_suggest.png
rename to docs/source/_images/8.0/auto_suggest_print_hello_suggest.png
diff --git a/docs/source/_images/auto_suggest_prompt_no_text.png b/docs/source/_images/8.0/auto_suggest_prompt_no_text.png
similarity index 100%
rename from docs/source/_images/auto_suggest_prompt_no_text.png
rename to docs/source/_images/8.0/auto_suggest_prompt_no_text.png
diff --git a/docs/source/_images/auto_suggest_second_prompt.png b/docs/source/_images/8.0/auto_suggest_second_prompt.png
similarity index 100%
rename from docs/source/_images/auto_suggest_second_prompt.png
rename to docs/source/_images/8.0/auto_suggest_second_prompt.png
diff --git a/docs/source/_images/8.0/pathlib_pathlib_everywhere.jpg b/docs/source/_images/8.0/pathlib_pathlib_everywhere.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..941cca0d08b95fcfbd920a24910e33715d5fa2cd
GIT binary patch
literal 77651
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

literal 0
HcmV?d00001

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 27758becbb1..eba427f1fe0 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -26,21 +26,88 @@ IPython 8.0 is bringing a large number of new features and improvements to both
 user of the terminal and of the kernel via Jupyter. The removal of compatibility
 with older version of Python is also the opportunity to do a couple of
 performance improvement in particular with respect to startup time.
+The 8.x branch started diverging from its predecessor around IPython 7.12
+(January 2020).
 
-This release contains 250+ Pull requests, in addition to many of the features
-and backports that have made it to the 7.x branch.
+This release contains 250+ Pull Requests, in addition to many of the features
+and backports that have made it to the 7.x branch. All PRs that went into this
+released are properly tagged with the 8.0 milestone if you wish to have a more
+in depth look at the changes.
+
+Please fell free to send pull-requests to updates those notes after release, 
+I have likely forgotten a few things reviewing 250+ PRs.
+
+Dependencies changes/downstream packaging
+-----------------------------------------
+
+Note that most of our building step have been changes to be (mostly) declarative
+and follow PEP 517, we are trying to completely remove ``setup.py`` (:ghpull:`13238`) and are
+looking for help to do so.
+
+ - Minimum supported ``traitlets`` version if now 5+
+ - we now require ``stack_data``
+ - Minimal Python is now 3.8
+ - ``nose`` is not a testing requirement anymore
+ - ``pytest`` replaces nose.
+ - ``iptest``/``iptest3`` cli entrypoints do not exists anymore. 
+ - minimum officially support ``numpy`` version has been bumped, but this should
+   not have much effect on packaging.
+
+
+Deprecation and removal
+-----------------------
 
 We removed almost all features, arguments, functions, and modules that were
-marked as deprecated between IPython 1.0 and 5.0 and before. As reminder 5.0 was
-released in 2016, and 1.0 in 2013. Last release of the 5 branch was 5.10.0, in
-may 2020. The few remaining deprecated features have better deprecation warnings
-or errors.
+marked as deprecated between IPython 1.0 and 5.0. As reminder 5.0 was released
+in 2016, and 1.0 in 2013. Last release of the 5 branch was 5.10.0, in may 2020.
+The few remaining deprecated features we left have better deprecation warnings
+or have been turned into explicit errors for better error messages.
+
+I will use this occasion to add the following requests to anyone emitting a
+deprecation warning:
+
+ - Please at at least ``stacklevel=2`` so that the warning is emitted into the
+   caller context, and not the callee one.
+ - Please add **since which version** something is deprecated.
+
+As a side note it is much easier to deal with conditional comparing to versions
+numbers than ``try/except`` when a functionality change with version. 
+
+I won't list all the removed features here, but modules like ``IPython.kernel``,
+which was just a shim module around ``ipykernel`` for the past 8 years have been
+remove, and so many other similar things that pre-date the name **Jupyter**
+itself.
+
+We no longer need to add ``IPyhton.extensions`` to the PYTHONPATH because that is being
+handled by ``load_extension``.
+
+We are also removing ``Cythonmagic``, ``sympyprinting`` and ``rmagic`` as they are now in
+other packages and no longer need to be inside IPython.
+
+
+Documentation
+-------------
+
+Majority of our docstrings have now been reformatted and automatically fixed by
+the experimental `Vélin <https://pypi.org/project/velin/>`_ project, to conform
+to numpydoc.
+
+
+Featured changes
+----------------
 
-There are many change in IPython 8.0 will will try to describe subsequently,
+Here is a features list of changes in IPython 8.0. This is of course non-exhaustive. 
+Please note as well that many features have been added in the 7.x branch as well
+(and hence why you want to read the 7.x what's new notes), in particular
+features contributed by QuantStack (with respect to debugger protocol, and Xeus
+Python), as well as many debugger features that I was please to implement as
+part of my work at QuanSight and Sponsored by DE Shaw.
 
+Better Tracebacks
+~~~~~~~~~~~~~~~~~
 
 The first on is the integration of the ``stack_data`` package;
-which provide smarter information in traceback; in particular it will highlight
+which provide smarter informations in traceback; in particular it will highlight
 the AST node where an error occurs which can help to quickly narrow down errors.
 
 For example in the following snippet::
@@ -61,42 +128,8 @@ IPython 8.0 is capable of telling you, where the index error occurs::
 
     return x[0][i][0]
                 ^
-
-
-Numfocus Small Developer Grant
-------------------------------
-
-To prepare for Python 3.10 we have also started working on removing reliance and
-any dependency that is not Python 3.10 compatible; that include migrating our
-test suite to pytest, and starting to remove nose. This also mean that the
-``iptest`` command is now gone, and all testing is via pytest.
-
-This was in bog part thanks the NumFOCUS Small Developer grant, we were able to
-allocate 4000 to hire `Nikita Kniazev @Kojoley <https://github.com/Kojoley>`__
-who did a fantastic job at updating our code base, migrating to pytest, pushing
-our coverage, and fixing a large number of bugs. I highly recommend contacting
-them if you need help with C++ and Python projects
-
-You can find all relevant issues and PRs with the SDG 2021 tag:
-
-https://github.com/ipython/ipython/issues?q=label%3A%22Numfocus+SDG+2021%22+
-
-Removing support for Older Python
----------------------------------
-
-
-We are also removing support for Python up to 3.7 allowing internal code to use more
-efficient ``pathlib``, and make better use of type annotations.
-
-IMAGE : Pathlib, pathlib everywhere.
-
-The completer has also seen significant updates and make use of newer Jedi API
-offering faster and more reliable tab completion.
-
-For the terminal users this also enable the auto-suggestion feature, described
-below, which show "ghost text" ahead of your cursor you can accept without
-having to press the tab key or ask the completer to suggest completions.
-
+Autosuggestons
+~~~~~~~~~~~~~~
 
 Autosuggestion is a very useful feature available in `fish <https://fishshell.com/>`__, `zsh <https://en.wikipedia.org/wiki/Z_shell>`__, and `prompt-toolkit <https://python-prompt-toolkit.readthedocs.io/en/master/pages/asking_for_input.html#auto-suggestion>`__.
 
@@ -108,55 +141,55 @@ or right arrow as described below.
 
 1. Start ipython
 
-.. image:: ../_images/auto_suggest_prompt_no_text.png
+.. image:: ../_images/8.0/auto_suggest_prompt_no_text.png
 
 2. Run ``print("hello")``
 
-.. image:: ../_images/auto_suggest_print_hello_suggest.png
+.. image:: ../_images/8.0/auto_suggest_print_hello_suggest.png
 
 3. Press p to see the autosuggestion
 
-.. image:: ../_images/auto_suggest_print_hello_suggest.png
+.. image:: ../_images/8.0/auto_suggest_print_hello_suggest.png
 
 4. Press ctrl f, or ctrl e, or right arrow to accept the suggestion
 
-.. image:: ../_images/auto_suggest_print_hello.png
+.. image:: ../_images/8.0/auto_suggest_print_hello.png
 
 You can also complete word by word:
 
 1. Run ``def say_hello(): print("hello")``
 
-.. image:: ../_images/auto_suggest_second_prompt.png
+.. image:: ../_images/8.0/auto_suggest_second_prompt.png
 
 2. Press d to see the autosuggestion
 
-.. image:: ../_images/audo_suggest_d_phantom.png
+.. image:: ../_images/8.0/auto_suggest_d_phantom.png
 
 3. Press alt f to accept the first word of the suggestion
 
-.. image:: ../_images/auto_suggest_def_phantom.png
+.. image:: ../_images/8.0/auto_suggest_def_phantom.png
 
 Importantly, this feature does not interfere with tab completion:
 
 1. After running ``def say_hello(): print("hello")``, press d
 
-.. image:: ../_images/audo_suggest_d_phantom.png
+.. image:: ../_images/8.0/audo_suggest_d_phantom.png
 
 2. Press Tab to start tab completion
 
-.. image:: ../_images/auto_suggest_d_completions.png
+.. image:: ../_images/8.0/auto_suggest_d_completions.png
 
 3A. Press Tab again to select the first option
 
-.. image:: ../_images/auto_suggest_def_completions.png
+.. image:: ../_images/8.0/auto_suggest_def_completions.png
 
 3B. Press alt f to accept to accept the first word of the suggestion
 
-.. image:: ../_images/auto_suggest_def_phantom.png
+.. image:: ../_images/8.0/auto_suggest_def_phantom.png
 
 3C. Press ctrl f or ctrl e to accept the entire suggestion
 
-.. image:: ../_images/auto_suggest_match_parens.png
+.. image:: ../_images/8.0/auto_suggest_match_parens.png
 
 To install a version of ipython with autosuggestions enabled, run:
 
@@ -169,7 +202,7 @@ Currently, autosuggestions are only shown in the emacs or vi insert editing mode
 
 
 Show pinfo information in ipdb using "?" and "??"
--------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 In IPDB, it is now possible to show the information about an object using "?"
 and "??", in much the same way it can be done when using the IPython prompt::
@@ -187,7 +220,7 @@ Previously, "pinfo" or "pinfo2" command had to be used for this purpose.
 
 
 Autoreload 3 feature
-====================
+~~~~~~~~~~~~~~~~~~~~
 
 Example: When an IPython session is ran with the 'autoreload' extension loaded,
 you will now have the option '3' to select which means the following:
@@ -202,14 +235,10 @@ For more information please see unit test -
     extensions/tests/test_autoreload.py : 'test_autoload_newly_added_objects'
 
 
-Miscelanious
-------------
-
-Minimum supported
 
 
 History Range Glob feature
-==========================
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Previously, when using ``%history``, users could specify either
 a range of sessions and lines, for example:
@@ -230,12 +259,10 @@ However users could *not* specify both.
 If a user *did* specify both a range and a glob pattern,
 then the glob pattern would be used (globbing *all* history) *and the range would be ignored*.
 
----
-
 With this enhancement, if a user specifies both a range and a glob pattern, then the glob pattern will be applied to the specified range of history.
 
 Don't start a multi line cell with sunken parenthesis
------------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 From now on IPython will not ask for the next line of input when given a single
 line with more closing than opening brackets. For example, this means that if
@@ -243,12 +270,12 @@ you (mis)type ']]' instead of '[]', a ``SyntaxError`` will show up, instead of
 the ``...:`` prompt continuation.
 
 IPython shell for ipdb interact
--------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The ipdb ``interact`` starts an IPython shell instead of Python's built-in ``code.interact()``.
 
 Automatic Vi prompt stripping
-=============================
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 When pasting code into IPython, it will strip the leading prompt characters if
 there are any. For example, you can paste the following code into the console -
@@ -278,7 +305,7 @@ IPython shell can be started in the Vi mode using ``ipython
 --TerminalInteractiveShell.editing_mode=vi``
 
 Empty History Ranges
-====================
+~~~~~~~~~~~~~~~~~~~~
 
 A number of magics that take history ranges can now be used with an empty
 range. These magics are:
@@ -298,7 +325,7 @@ when followed with :kbd:`F2`), send it to dpaste.org using ``%pastebin``, or
 view the whole thing syntax-highlighted with a single ``%pycat``.
 
 Traceback improvements
-======================
+~~~~~~~~~~~~~~~~~~~~~~
 
 
 UPDATE THIS IN INPUT.
@@ -340,15 +367,64 @@ The error traceback is now correctly formatted, showing the cell number in which
 
     ZeroDivisionError: division by zero
 
-Remove Deprecated Stuff
-=======================
+Miscellaneous
+~~~~~~~~~~~~~
 
+ - ``~`` is now expanded when part of a path in most magics :ghpull:`13385`
+ - ``%/%%timeit`` magic now adds comma every thousands to make reading long number easier :ghpull:`13379`
+ - ``"info"`` messages can now be customised to hide some fields :ghpull:`13343`
+ - ``collections.UserList`` now pretty-prints :ghpull:`13320`
+ - The debugger now have a persistent history, which should make it less
+   annoying to retype commands :ghpull:`13246`
+ - ``!pip`` ``!conda`` ``!cd`` or ``!ls`` are likely doing the wrong thing, we
+   now warn users if they use it. :ghpull:`12954`
+ - make ``%precision`` work for ``numpy.float64`` type :ghpull:`12902`
+
+
+
+
+Numfocus Small Developer Grant
+------------------------------
+
+To prepare for Python 3.10 we have also started working on removing reliance and
+any dependency that is not Python 3.10 compatible; that include migrating our
+test suite to pytest, and starting to remove nose. This also mean that the
+``iptest`` command is now gone, and all testing is via pytest.
+
+This was in bog part thanks the NumFOCUS Small Developer grant, we were able to
+allocate 4000 to hire `Nikita Kniazev @Kojoley <https://github.com/Kojoley>`__
+who did a fantastic job at updating our code base, migrating to pytest, pushing
+our coverage, and fixing a large number of bugs. I highly recommend contacting
+them if you need help with C++ and Python projects
+
+You can find all relevant issues and PRs with the SDG 2021 tag:
+
+https://github.com/ipython/ipython/issues?q=label%3A%22Numfocus+SDG+2021%22+
+
+Removing support for Older Python
+---------------------------------
+
+
+We are also removing support for Python up to 3.7 allowing internal code to use more
+efficient ``pathlib``, and make better use of type annotations. 
+
+.. image:: ../_images/8.0/pathlib_pathlib_everywhere.jpg
+   :alt: "Meme image of Toy story with Woody and Buzz, with the text 'pathlib, pathlib everywhere'"
+
+
+IMAGE : Pathlib, pathlib everywhere.
+
+We have about 34 PRs only to update some logic tu update some function from managing strings to
+using Pathlib.
+
+The completer has also seen significant updates and make use of newer Jedi API
+offering faster and more reliable tab completion.
+
+For the terminal users this also enable the auto-suggestion feature, described
+below, which show "ghost text" ahead of your cursor you can accept without
+having to press the tab key or ask the completer to suggest completions.
 
-We no longer need to add `extensions` to the PYTHONPATH because that is being
-handled by `load_extension`.
 
-We are also removing Cythonmagic, sympyprinting and rmagic as they are now in
-other packages and no longer need to be inside IPython.
 
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 

From 65056d9b11e9fb5a6daa0ed4d308094972aec1a7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 15:23:29 -0800
Subject: [PATCH 0965/1407] Prepend In [x] in traceback with "Input " to avoid
 messing doctest parsing

---
 IPython/core/ultratb.py              |  2 +-
 docs/source/whatsnew/development.rst | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 5c62ee91485..696103f9c4b 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -185,7 +185,7 @@ def _format_filename(file, ColorFilename, ColorNormal):
 
     if ipinst is not None and file in ipinst.compile._filename_map:
         file = "[%s]" % ipinst.compile._filename_map[file]
-        tpl_link = "In %s%%s%s" % (ColorFilename, ColorNormal)
+        tpl_link = "Input %sIn %%s%s" % (ColorFilename, ColorNormal)
     else:
         file = util_path.compress_user(
             py3compat.cast_unicode(file, util_path.fs_encoding)
diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index eba427f1fe0..1645f92cf79 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -92,6 +92,13 @@ Majority of our docstrings have now been reformatted and automatically fixed by
 the experimental `Vélin <https://pypi.org/project/velin/>`_ project, to conform
 to numpydoc.
 
+Type annotations
+----------------
+
+While IPython itself is highly dynamic and can't be completely typed, many of
+the function now have type annotation, and part of the codebase and now checked
+by mypy.
+
 
 Featured changes
 ----------------
@@ -355,13 +362,13 @@ The error traceback is now correctly formatted, showing the cell number in which
     ...:     return 3 / 0
     ...:
 
-    In [2]: foo()
+    Input In [2]: foo()
     ---------------------------------------------------------------------------
     ZeroDivisionError                         Traceback (most recent call last)
-    In [2], in <module>
+    input In [2], in <module>
     ----> 1 foo()
 
-    In [1], in foo()
+    Input In [1], in foo()
         1 def foo():
     ----> 2     return 3 / 0
 

From 4924bef15289f67b79293e992eab13bf1a2dc190 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 15:33:12 -0800
Subject: [PATCH 0966/1407] remove deprecated hooks

---
 IPython/core/hooks.py            | 33 +++++++-------------------------
 IPython/core/interactiveshell.py | 12 +++---------
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/IPython/core/hooks.py b/IPython/core/hooks.py
index fa732f7ba82..09b08d942e0 100644
--- a/IPython/core/hooks.py
+++ b/IPython/core/hooks.py
@@ -44,10 +44,13 @@ def load_ipython_extension(ip):
 # List here all the default hooks.  For now it's just the editor functions
 # but over time we'll move here all the public API for user-accessible things.
 
-__all__ = ['editor', 'synchronize_with_editor',
-           'shutdown_hook', 'late_startup_hook',
-           'show_in_pager','pre_prompt_hook',
-           'pre_run_code_hook', 'clipboard_get']
+__all__ = [
+    "editor",
+    "synchronize_with_editor",
+    "show_in_pager",
+    "pre_prompt_hook",
+    "clipboard_get",
+]
 
 deprecated = {'pre_run_code_hook': "a callback for the 'pre_execute' or 'pre_run_cell' event",
               'late_startup_hook': "a callback for the 'shell_initialized' event",
@@ -132,23 +135,6 @@ def __iter__(self):
         return iter(self.chain)
 
 
-def shutdown_hook(self):
-    """ default shutdown hook
-
-    Typically, shutdown hooks should raise TryNext so all shutdown ops are done
-    """
-
-    #print "default shutdown hook ok" # dbg
-    return
-
-
-def late_startup_hook(self):
-    """ Executed after ipython has been constructed and configured
-
-    """
-    #print "default startup hook ok" # dbg
-
-
 def show_in_pager(self, data, start, screen_lines):
     """ Run a string through pager """
     # raising TryNext here will use the default paging functionality
@@ -165,11 +151,6 @@ def pre_prompt_hook(self):
     return None
 
 
-def pre_run_code_hook(self):
-    """ Executed before running the (prefiltered) code in IPython """
-    return None
-
-
 def clipboard_get(self):
     """ Get text from the clipboard.
     """
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 6b966c9a719..0f75337f076 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -561,7 +561,6 @@ def __init__(self, ipython_dir=None, profile_dir=None,
         self.init_pdb()
         self.init_extension_manager()
         self.init_payload()
-        self.hooks.late_startup_hook()
         self.events.trigger('shell_initialized', self)
         atexit.register(self.atexit_operations)
 
@@ -868,13 +867,12 @@ def init_hooks(self):
         for hook_name in hooks.__all__:
             # default hooks have priority 100, i.e. low; user hooks should have
             # 0-100 priority
-            self.set_hook(hook_name,getattr(hooks,hook_name), 100, _warn_deprecated=False)
+            self.set_hook(hook_name, getattr(hooks, hook_name), 100)
 
         if self.display_page:
             self.set_hook('show_in_pager', page.as_hook(page.display_page), 90)
 
-    def set_hook(self,name,hook, priority=50, str_key=None, re_key=None,
-                 _warn_deprecated=True):
+    def set_hook(self, name, hook, priority=50, str_key=None, re_key=None):
         """set_hook(name,hook) -> sets an internal IPython hook.
 
         IPython exposes some of its internal API as user-modifiable hooks.  By
@@ -904,7 +902,7 @@ def set_hook(self,name,hook, priority=50, str_key=None, re_key=None,
             print("Warning! Hook '%s' is not one of %s" % \
                   (name, IPython.core.hooks.__all__ ))
 
-        if _warn_deprecated and (name in IPython.core.hooks.deprecated):
+        if name in IPython.core.hooks.deprecated:
             alternative = IPython.core.hooks.deprecated[name]
             raise ValueError(
                 "Hook {} has been deprecated since IPython 5.0. Use {} instead.".format(
@@ -3247,7 +3245,6 @@ async def run_code(self, code_obj, result=None, *, async_=False):
         outflag = True  # happens in more places, so it's easier as default
         try:
             try:
-                self.hooks.pre_run_code_hook()
                 if async_:
                     await eval(code_obj, self.user_global_ns, self.user_ns)
                 else:
@@ -3631,9 +3628,6 @@ def atexit_operations(self):
         del self.tempdirs
 
 
-        # Run user hooks
-        self.hooks.shutdown_hook()
-
     def cleanup(self):
         self.restore_sys_module_state()
 

From abeb0a2d7187121033c214b6597da7b77ed89f8b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 15:52:52 -0800
Subject: [PATCH 0967/1407] fix wn

---
 docs/source/whatsnew/development.rst | 29 +++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 1645f92cf79..dad59ca39c4 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -133,8 +133,31 @@ For example in the following snippet::
 Calling ``bar()`` would raise an ``IndexError`` on the return line of ``foo``,
 IPython 8.0 is capable of telling you, where the index error occurs::
 
-    return x[0][i][0]
-                ^
+
+    IndexError
+    Input In [2], in <module>
+    ----> 1 bar()
+            ^^^^^
+
+    Input In [1], in bar()
+          6 def bar():
+    ----> 7     return foo(0) + foo(
+                                ^^^^
+          8         1
+             ^^^^^^^^
+          9     ) + foo(2)
+             ^^^^
+
+    Input In [1], in foo(i)
+          1 def foo(i):
+          2     x = [[[0]]]
+    ----> 3     return x[0][i][0]
+                       ^^^^^^^
+
+Corresponding location marked here with ``^`` will show up highlighted in 
+terminal and notebooks.
+
+
 Autosuggestons
 ~~~~~~~~~~~~~~
 
@@ -180,7 +203,7 @@ Importantly, this feature does not interfere with tab completion:
 
 1. After running ``def say_hello(): print("hello")``, press d
 
-.. image:: ../_images/8.0/audo_suggest_d_phantom.png
+.. image:: ../_images/8.0/auto_suggest_d_phantom.png
 
 2. Press Tab to start tab completion
 

From 22219a0a68481edd6c93f12b1cf56368cad791dc Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 9 Dec 2021 16:51:50 -0800
Subject: [PATCH 0968/1407] more updates to WN

---
 IPython/terminal/shortcuts.py                 |  12 ++--
 .../8.0/auto_suggest_1_prompt_no_text.png     | Bin 0 -> 6225 bytes
 .../auto_suggest_2_print_hello_suggest.png    | Bin 0 -> 13654 bytes
 .../auto_suggest_3_print_hello_suggest.png    | Bin 0 -> 16308 bytes
 .../8.0/auto_suggest_4_print_hello.png        | Bin 0 -> 17190 bytes
 .../_images/8.0/auto_suggest_print_hello.png  | Bin 3667 -> 0 bytes
 .../8.0/auto_suggest_print_hello_suggest.png  | Bin 4171 -> 0 bytes
 .../8.0/auto_suggest_prompt_no_text.png       | Bin 853 -> 0 bytes
 docs/source/whatsnew/development.rst          |  53 +++++++-----------
 9 files changed, 25 insertions(+), 40 deletions(-)
 create mode 100644 docs/source/_images/8.0/auto_suggest_1_prompt_no_text.png
 create mode 100644 docs/source/_images/8.0/auto_suggest_2_print_hello_suggest.png
 create mode 100644 docs/source/_images/8.0/auto_suggest_3_print_hello_suggest.png
 create mode 100644 docs/source/_images/8.0/auto_suggest_4_print_hello.png
 delete mode 100644 docs/source/_images/8.0/auto_suggest_print_hello.png
 delete mode 100644 docs/source/_images/8.0/auto_suggest_print_hello_suggest.png
 delete mode 100644 docs/source/_images/8.0/auto_suggest_prompt_no_text.png

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 029adc9faad..75faaa56c3d 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -99,10 +99,10 @@ def reformat_and_execute(event):
     def ebivim():
         return shell.emacs_bindings_in_vi_insert_mode
 
-    focused_insert = has_focus(DEFAULT_BUFFER) & vi_insert_mode
+    focused_insert_vi = has_focus(DEFAULT_BUFFER) & vi_insert_mode
 
     # Needed for to accept autosuggestions in vi insert mode
-    @kb.add("c-e", filter=focused_insert & ebivim)
+    @kb.add("c-e", filter=focused_insert_vi & ebivim)
     def _(event):
         b = event.current_buffer
         suggestion = b.suggestion
@@ -111,7 +111,7 @@ def _(event):
         else:
             nc.end_of_line(event)
 
-    @kb.add("c-f", filter=focused_insert & ebivim)
+    @kb.add("c-f", filter=focused_insert_vi)
     def _(event):
         b = event.current_buffer
         suggestion = b.suggestion
@@ -120,7 +120,7 @@ def _(event):
         else:
             nc.forward_char(event)
 
-    @kb.add("escape", "f", filter=focused_insert & ebivim)
+    @kb.add("escape", "f", filter=focused_insert_vi & ebivim)
     def _(event):
         b = event.current_buffer
         suggestion = b.suggestion
@@ -141,7 +141,7 @@ def _(event):
     }
 
     for key, cmd in key_cmd_dict.items():
-        kb.add(key, filter=focused_insert & ebivim)(cmd)
+        kb.add(key, filter=focused_insert_vi & ebivim)(cmd)
 
     # Alt and Combo Control keybindings
     keys_cmd_dict = {
@@ -160,7 +160,7 @@ def _(event):
     }
 
     for keys, cmd in keys_cmd_dict.items():
-        kb.add(*keys, filter=focused_insert & ebivim)(cmd)
+        kb.add(*keys, filter=focused_insert_vi & ebivim)(cmd)
 
     def get_input_mode(self):
         app = get_app()
diff --git a/docs/source/_images/8.0/auto_suggest_1_prompt_no_text.png b/docs/source/_images/8.0/auto_suggest_1_prompt_no_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e83b2426db9283c845c7b25e9f326645f1bb836
GIT binary patch
literal 6225
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
Z8lB8pga=s<!E8A|@sXNb$wOq|{{Ven2<-p>

literal 0
HcmV?d00001

diff --git a/docs/source/_images/8.0/auto_suggest_2_print_hello_suggest.png b/docs/source/_images/8.0/auto_suggest_2_print_hello_suggest.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd84e0a22bea2dd52b77b2b4dba213a861253182
GIT binary patch
literal 13654
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
ICtbh)2g=kB(f|Me

literal 0
HcmV?d00001

diff --git a/docs/source/_images/8.0/auto_suggest_3_print_hello_suggest.png b/docs/source/_images/8.0/auto_suggest_3_print_hello_suggest.png
new file mode 100644
index 0000000000000000000000000000000000000000..27e14ce571cca53f0f5feb1d38199e1c3b77e3f8
GIT binary patch
literal 16308
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

literal 0
HcmV?d00001

diff --git a/docs/source/_images/8.0/auto_suggest_4_print_hello.png b/docs/source/_images/8.0/auto_suggest_4_print_hello.png
new file mode 100644
index 0000000000000000000000000000000000000000..d36721279205800b8a84a5d8af990952de1177fe
GIT binary patch
literal 17190
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
YFXbAYG*kHV0T}3#5|a}x7X}3UU&2-eW&i*H

literal 0
HcmV?d00001

diff --git a/docs/source/_images/8.0/auto_suggest_print_hello.png b/docs/source/_images/8.0/auto_suggest_print_hello.png
deleted file mode 100644
index c98cf267ed8801c2ba7f7ce4127f5aa81770f192..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3667
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

diff --git a/docs/source/_images/8.0/auto_suggest_print_hello_suggest.png b/docs/source/_images/8.0/auto_suggest_print_hello_suggest.png
deleted file mode 100644
index 1e1a2dd7d1bdb163efdd5aab5d04b1c2018b9518..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4171
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
PBmfxQG)2ABb;kV%(1Xub

diff --git a/docs/source/_images/8.0/auto_suggest_prompt_no_text.png b/docs/source/_images/8.0/auto_suggest_prompt_no_text.png
deleted file mode 100644
index a75ee1f8ea5af69e90e587e77abed563089ad47f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 853
zcmV-b1FHOqP)<h;3K|Lk000e1NJLTq0046U001Tk1^@s6_W-1#0009VNkl<ZcmeI1
zziSmi5XZm9Kr}=#m?9DU1u6;(CW@6Niip3(LPgX@iy&!2L<k6K6A&yUy;dUl6FV&=
zprY_pv=l2_!T&)S8E==jZ+&;{d2{dGk12-Rw|AM{na|Gb>;?cxr7}LKj3K%xH7YB$
zm@8#W-J?@sRwz3uOogdca1m3wMrIKrv(acsERGVu+yufNPqqlod$*^X$Lbf<ACSfB
z1M?;bUp%=j=<E-kZXRnwP`|=-oM~a+17XU@F6VumvwA?VvMAyE%Z}bB25jkJt_R_9
zg4{`PNSs3@`Yp@@f#WalCCqOp{5nOTGm*@04%?IFsseKugar`Zfbh{6_1XO9zNdlC
zlmO`JNCWfiYQm4>O^CIH={j($f%&RS0NuHSz#Ql$EKK|hF)x_=L3j?reGt}U_fftD
zPzcObAlw4sBnbTd4HLbOK)3?J((Fe5JvM~E?CT+XKhlKx`*gF-K&8_x+h~ijtJ&@B
zKFl#=&|47NRfHF^8yO6fBl+-f1n~7<!q|$=!917U&f>u270Q+724mDE1DX5WbosyS
zkjS*UcMe8l_AkyCCKrpdAe;wbNp?Gn1M`KKQr8)n@3R}3Dl#ole&!9+9ZR5H9GDM0
zXhRA!ZAL0C%t3{zFyqoynmyC%$UDuBgTNK-T@aRenaR!}#Zx0Q$ys^BbdM&J3NyUY
z4UNq4A;Q;#k$gMUTFw4E5%s^@mppFhb)LP$<w~9_+N6aQ@J>E5`6h#p6D$wSzQ^ZB
z+jq^Iv^{6~1yHy4%%dZ%0PXFM`{c`nB<F_0+z7&T5H5O^e3I^jck(dT8i4j@!+*Z?
zU~V(t^S<FubO3};Aawd@(n*-Ey#j4{m;#e(fhwiXrrCKAW{e#37EqS4I89C)d1e-9
z>Hh_m#UXkAt%d1k3ceGT8nfM1q{0+*unUUQ{|--93XV1E>E>FXPf)*WOH8{yX*R|I
zVv$(@{R*=H5Tq8A!c>@k-O$;+L24zdp0?cDcKXEicR8|v!mLn~D@=u1j<i#^?Li|`
fBU2-@a8dsUkOogVgtLLV00000NkvXXu0mjff&7*y

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index dad59ca39c4..5ae9b4e3ba7 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -171,19 +171,19 @@ or right arrow as described below.
 
 1. Start ipython
 
-.. image:: ../_images/8.0/auto_suggest_prompt_no_text.png
+.. image:: ../_images/8.0/auto_suggest_1_prompt_no_text.png
 
 2. Run ``print("hello")``
 
-.. image:: ../_images/8.0/auto_suggest_print_hello_suggest.png
+.. image:: ../_images/8.0/auto_suggest_2_print_hello_suggest.png
 
-3. Press p to see the autosuggestion
+3. start typing ``print`` again to see the autosuggestion
 
-.. image:: ../_images/8.0/auto_suggest_print_hello_suggest.png
+.. image:: ../_images/8.0/auto_suggest_3_print_hello_suggest.png
 
-4. Press ctrl f, or ctrl e, or right arrow to accept the suggestion
+4. Press ``ctrl-f``, or ``ctrl-e``, or ``right-arrow`` to accept the suggestion
 
-.. image:: ../_images/8.0/auto_suggest_print_hello.png
+.. image:: ../_images/8.0/auto_suggest_4_print_hello.png
 
 You can also complete word by word:
 
@@ -191,11 +191,11 @@ You can also complete word by word:
 
 .. image:: ../_images/8.0/auto_suggest_second_prompt.png
 
-2. Press d to see the autosuggestion
+2. Start typing  the first letter if ``def`` to see the autosuggestion
 
 .. image:: ../_images/8.0/auto_suggest_d_phantom.png
 
-3. Press alt f to accept the first word of the suggestion
+3. Press ``alt-f`` (or ``escape`` followed by ``f``), to accept the first word of the suggestion
 
 .. image:: ../_images/8.0/auto_suggest_def_phantom.png
 
@@ -213,17 +213,14 @@ Importantly, this feature does not interfere with tab completion:
 
 .. image:: ../_images/8.0/auto_suggest_def_completions.png
 
-3B. Press alt f to accept to accept the first word of the suggestion
+3B. Press ``alt f`` (``escape``, ``f``) to accept to accept the first word of the suggestion
 
 .. image:: ../_images/8.0/auto_suggest_def_phantom.png
 
-3C. Press ctrl f or ctrl e to accept the entire suggestion
+3C. Press ``ctrl-f`` or ``ctrl-e`` to accept the entire suggestion
 
 .. image:: ../_images/8.0/auto_suggest_match_parens.png
 
-To install a version of ipython with autosuggestions enabled, run:
-
-``pip install git+https://github.com/mskar/ipython@auto_suggest``
 
 Currently, autosuggestions are only shown in the emacs or vi insert editing modes:
 
@@ -246,7 +243,7 @@ and "??", in much the same way it can be done when using the IPython prompt::
     Type:           type
     Subclasses:
 
-Previously, "pinfo" or "pinfo2" command had to be used for this purpose.
+Previously, ``pinfo`` or ``pinfo2`` command had to be used for this purpose.
 
 
 Autoreload 3 feature
@@ -256,13 +253,12 @@ Example: When an IPython session is ran with the 'autoreload' extension loaded,
 you will now have the option '3' to select which means the following:
 
     1. replicate all functionality from option 2
-    2. autoload all new funcs/classes/enums/globals from the module when they're added
+    2. autoload all new funcs/classes/enums/globals from the module when they are added
     3. autoload all newly imported funcs/classes/enums/globals from external modules
 
 Try ``%autoreload 3`` in an IPython session after running ``%load_ext autoreload``
 
-For more information please see unit test -
-    extensions/tests/test_autoreload.py : 'test_autoload_newly_added_objects'
+For more information please see the following unit test : ``extensions/tests/test_autoreload.py:test_autoload_newly_added_objects``
 
 
 
@@ -296,7 +292,7 @@ Don't start a multi line cell with sunken parenthesis
 
 From now on IPython will not ask for the next line of input when given a single
 line with more closing than opening brackets. For example, this means that if
-you (mis)type ']]' instead of '[]', a ``SyntaxError`` will show up, instead of
+you (mis)type ``]]`` instead of ``[]``, a ``SyntaxError`` will show up, instead of
 the ``...:`` prompt continuation.
 
 IPython shell for ipdb interact
@@ -331,8 +327,8 @@ Previously, this was not the case for the Vi-mode prompts::
 This is now fixed, and Vi prompt prefixes - ``[ins]`` and ``[nav]`` -  are
 skipped just as the normal ``In`` would be.
 
-IPython shell can be started in the Vi mode using ``ipython
---TerminalInteractiveShell.editing_mode=vi``
+IPython shell can be started in the Vi mode using ``ipython --TerminalInteractiveShell.editing_mode=vi``, 
+You should be able to change mode dynamically with ``%config TerminalInteractiveShell.editing_mode='vi'``
 
 Empty History Ranges
 ~~~~~~~~~~~~~~~~~~~~
@@ -358,8 +354,6 @@ Traceback improvements
 ~~~~~~~~~~~~~~~~~~~~~~
 
 
-UPDATE THIS IN INPUT.
-
 Previously, error tracebacks for errors happening in code cells were showing a hash, the one used for compiling the Python AST::
 
     In [1]: def foo():
@@ -422,14 +416,12 @@ test suite to pytest, and starting to remove nose. This also mean that the
 ``iptest`` command is now gone, and all testing is via pytest.
 
 This was in bog part thanks the NumFOCUS Small Developer grant, we were able to
-allocate 4000 to hire `Nikita Kniazev @Kojoley <https://github.com/Kojoley>`__
+allocate 4000 to hire `Nikita Kniazev (@Kojoley) <https://github.com/Kojoley>`__
 who did a fantastic job at updating our code base, migrating to pytest, pushing
 our coverage, and fixing a large number of bugs. I highly recommend contacting
 them if you need help with C++ and Python projects
 
-You can find all relevant issues and PRs with the SDG 2021 tag:
-
-https://github.com/ipython/ipython/issues?q=label%3A%22Numfocus+SDG+2021%22+
+You can find all relevant issues and PRs with the SDG 2021 tag `<https://github.com/ipython/ipython/issues?q=label%3A%22Numfocus+SDG+2021%22+>`__
 
 Removing support for Older Python
 ---------------------------------
@@ -439,22 +431,15 @@ We are also removing support for Python up to 3.7 allowing internal code to use
 efficient ``pathlib``, and make better use of type annotations. 
 
 .. image:: ../_images/8.0/pathlib_pathlib_everywhere.jpg
-   :alt: "Meme image of Toy story with Woody and Buzz, with the text 'pathlib, pathlib everywhere'"
+   :alt: "Meme image of Toy Story with Woody and Buzz, with the text 'pathlib, pathlib everywhere'"
 
 
-IMAGE : Pathlib, pathlib everywhere.
-
 We have about 34 PRs only to update some logic tu update some function from managing strings to
 using Pathlib.
 
 The completer has also seen significant updates and make use of newer Jedi API
 offering faster and more reliable tab completion.
 
-For the terminal users this also enable the auto-suggestion feature, described
-below, which show "ghost text" ahead of your cursor you can accept without
-having to press the tab key or ask the completer to suggest completions.
-
-
 
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 

From 93d13d63200bdbbca71079e5aa9161453ce3afbb Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 09:41:29 -0800
Subject: [PATCH 0969/1407] vmove to version8.rst

---
 docs/source/whatsnew/development.rst | 421 --------------------------
 docs/source/whatsnew/index.rst       |   1 +
 docs/source/whatsnew/version8.rst    | 428 +++++++++++++++++++++++++++
 3 files changed, 429 insertions(+), 421 deletions(-)
 create mode 100644 docs/source/whatsnew/version8.rst

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 5ae9b4e3ba7..0f628a7b0e3 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -22,430 +22,9 @@ Need to be updated:
 
    pr/*
 
-IPython 8.0 is bringing a large number of new features and improvements to both the
-user of the terminal and of the kernel via Jupyter. The removal of compatibility
-with older version of Python is also the opportunity to do a couple of
-performance improvement in particular with respect to startup time.
-The 8.x branch started diverging from its predecessor around IPython 7.12
-(January 2020).
-
-This release contains 250+ Pull Requests, in addition to many of the features
-and backports that have made it to the 7.x branch. All PRs that went into this
-released are properly tagged with the 8.0 milestone if you wish to have a more
-in depth look at the changes.
-
-Please fell free to send pull-requests to updates those notes after release, 
-I have likely forgotten a few things reviewing 250+ PRs.
-
-Dependencies changes/downstream packaging
------------------------------------------
-
-Note that most of our building step have been changes to be (mostly) declarative
-and follow PEP 517, we are trying to completely remove ``setup.py`` (:ghpull:`13238`) and are
-looking for help to do so.
-
- - Minimum supported ``traitlets`` version if now 5+
- - we now require ``stack_data``
- - Minimal Python is now 3.8
- - ``nose`` is not a testing requirement anymore
- - ``pytest`` replaces nose.
- - ``iptest``/``iptest3`` cli entrypoints do not exists anymore. 
- - minimum officially support ``numpy`` version has been bumped, but this should
-   not have much effect on packaging.
-
-
-Deprecation and removal
------------------------
-
-We removed almost all features, arguments, functions, and modules that were
-marked as deprecated between IPython 1.0 and 5.0. As reminder 5.0 was released
-in 2016, and 1.0 in 2013. Last release of the 5 branch was 5.10.0, in may 2020.
-The few remaining deprecated features we left have better deprecation warnings
-or have been turned into explicit errors for better error messages.
-
-I will use this occasion to add the following requests to anyone emitting a
-deprecation warning:
-
- - Please at at least ``stacklevel=2`` so that the warning is emitted into the
-   caller context, and not the callee one.
- - Please add **since which version** something is deprecated.
-
-As a side note it is much easier to deal with conditional comparing to versions
-numbers than ``try/except`` when a functionality change with version. 
-
-I won't list all the removed features here, but modules like ``IPython.kernel``,
-which was just a shim module around ``ipykernel`` for the past 8 years have been
-remove, and so many other similar things that pre-date the name **Jupyter**
-itself.
-
-We no longer need to add ``IPyhton.extensions`` to the PYTHONPATH because that is being
-handled by ``load_extension``.
-
-We are also removing ``Cythonmagic``, ``sympyprinting`` and ``rmagic`` as they are now in
-other packages and no longer need to be inside IPython.
-
-
-Documentation
--------------
-
-Majority of our docstrings have now been reformatted and automatically fixed by
-the experimental `Vélin <https://pypi.org/project/velin/>`_ project, to conform
-to numpydoc.
-
-Type annotations
-----------------
-
-While IPython itself is highly dynamic and can't be completely typed, many of
-the function now have type annotation, and part of the codebase and now checked
-by mypy.
-
-
-Featured changes
-----------------
-
-Here is a features list of changes in IPython 8.0. This is of course non-exhaustive. 
-Please note as well that many features have been added in the 7.x branch as well
-(and hence why you want to read the 7.x what's new notes), in particular
-features contributed by QuantStack (with respect to debugger protocol, and Xeus
-Python), as well as many debugger features that I was please to implement as
-part of my work at QuanSight and Sponsored by DE Shaw.
-
-Better Tracebacks
-~~~~~~~~~~~~~~~~~
-
-The first on is the integration of the ``stack_data`` package;
-which provide smarter informations in traceback; in particular it will highlight
-the AST node where an error occurs which can help to quickly narrow down errors.
-
-For example in the following snippet::
-
-    def foo(i):
-        x = [[[0]]]
-        return x[0][i][0]
-
-
-    def bar():
-        return foo(0) + foo(
-            1
-        ) + foo(2)
-
-
-Calling ``bar()`` would raise an ``IndexError`` on the return line of ``foo``,
-IPython 8.0 is capable of telling you, where the index error occurs::
-
-
-    IndexError
-    Input In [2], in <module>
-    ----> 1 bar()
-            ^^^^^
-
-    Input In [1], in bar()
-          6 def bar():
-    ----> 7     return foo(0) + foo(
-                                ^^^^
-          8         1
-             ^^^^^^^^
-          9     ) + foo(2)
-             ^^^^
-
-    Input In [1], in foo(i)
-          1 def foo(i):
-          2     x = [[[0]]]
-    ----> 3     return x[0][i][0]
-                       ^^^^^^^
-
-Corresponding location marked here with ``^`` will show up highlighted in 
-terminal and notebooks.
-
-
-Autosuggestons
-~~~~~~~~~~~~~~
-
-Autosuggestion is a very useful feature available in `fish <https://fishshell.com/>`__, `zsh <https://en.wikipedia.org/wiki/Z_shell>`__, and `prompt-toolkit <https://python-prompt-toolkit.readthedocs.io/en/master/pages/asking_for_input.html#auto-suggestion>`__.
-
-`Ptpython <https://github.com/prompt-toolkit/ptpython#ptpython>`__ allows users to enable this feature in
-`ptpython/config.py <https://github.com/prompt-toolkit/ptpython/blob/master/examples/ptpython_config/config.py#L90>`__.
-
-This feature allows users to accept autosuggestions with ctrl e, ctrl f,
-or right arrow as described below.
-
-1. Start ipython
-
-.. image:: ../_images/8.0/auto_suggest_1_prompt_no_text.png
-
-2. Run ``print("hello")``
-
-.. image:: ../_images/8.0/auto_suggest_2_print_hello_suggest.png
-
-3. start typing ``print`` again to see the autosuggestion
-
-.. image:: ../_images/8.0/auto_suggest_3_print_hello_suggest.png
-
-4. Press ``ctrl-f``, or ``ctrl-e``, or ``right-arrow`` to accept the suggestion
-
-.. image:: ../_images/8.0/auto_suggest_4_print_hello.png
-
-You can also complete word by word:
-
-1. Run ``def say_hello(): print("hello")``
-
-.. image:: ../_images/8.0/auto_suggest_second_prompt.png
-
-2. Start typing  the first letter if ``def`` to see the autosuggestion
-
-.. image:: ../_images/8.0/auto_suggest_d_phantom.png
-
-3. Press ``alt-f`` (or ``escape`` followed by ``f``), to accept the first word of the suggestion
-
-.. image:: ../_images/8.0/auto_suggest_def_phantom.png
-
-Importantly, this feature does not interfere with tab completion:
-
-1. After running ``def say_hello(): print("hello")``, press d
-
-.. image:: ../_images/8.0/auto_suggest_d_phantom.png
-
-2. Press Tab to start tab completion
-
-.. image:: ../_images/8.0/auto_suggest_d_completions.png
-
-3A. Press Tab again to select the first option
-
-.. image:: ../_images/8.0/auto_suggest_def_completions.png
-
-3B. Press ``alt f`` (``escape``, ``f``) to accept to accept the first word of the suggestion
-
-.. image:: ../_images/8.0/auto_suggest_def_phantom.png
-
-3C. Press ``ctrl-f`` or ``ctrl-e`` to accept the entire suggestion
-
-.. image:: ../_images/8.0/auto_suggest_match_parens.png
-
-
-Currently, autosuggestions are only shown in the emacs or vi insert editing modes:
-
-- The ctrl e, ctrl f, and alt f shortcuts work by default in emacs mode.
-- To use these shortcuts in vi insert mode, you will have to create `custom keybindings in your config.py <https://github.com/mskar/setup/commit/2892fcee46f9f80ef7788f0749edc99daccc52f4/>`__.
-
-
-Show pinfo information in ipdb using "?" and "??"
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-In IPDB, it is now possible to show the information about an object using "?"
-and "??", in much the same way it can be done when using the IPython prompt::
-
-    ipdb> partial?
-    Init signature: partial(self, /, *args, **kwargs)
-    Docstring:
-    partial(func, *args, **keywords) - new function with partial application
-    of the given arguments and keywords.
-    File:           ~/.pyenv/versions/3.8.6/lib/python3.8/functools.py
-    Type:           type
-    Subclasses:
-
-Previously, ``pinfo`` or ``pinfo2`` command had to be used for this purpose.
-
-
-Autoreload 3 feature
-~~~~~~~~~~~~~~~~~~~~
-
-Example: When an IPython session is ran with the 'autoreload' extension loaded,
-you will now have the option '3' to select which means the following:
-
-    1. replicate all functionality from option 2
-    2. autoload all new funcs/classes/enums/globals from the module when they are added
-    3. autoload all newly imported funcs/classes/enums/globals from external modules
-
-Try ``%autoreload 3`` in an IPython session after running ``%load_ext autoreload``
-
-For more information please see the following unit test : ``extensions/tests/test_autoreload.py:test_autoload_newly_added_objects``
-
-
-
-
-History Range Glob feature
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Previously, when using ``%history``, users could specify either
-a range of sessions and lines, for example:
-
-.. code-block:: python
-
-   ~8/1-~6/5   # see history from the first line of 8 sessions ago,
-               # to the fifth line of 6 sessions ago.``
-
-Or users could specify a glob pattern:
-
-.. code-block:: python
-
-   -g <pattern>  # glob ALL history for the specified pattern.
-
-However users could *not* specify both.
-
-If a user *did* specify both a range and a glob pattern,
-then the glob pattern would be used (globbing *all* history) *and the range would be ignored*.
-
-With this enhancement, if a user specifies both a range and a glob pattern, then the glob pattern will be applied to the specified range of history.
-
-Don't start a multi line cell with sunken parenthesis
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-From now on IPython will not ask for the next line of input when given a single
-line with more closing than opening brackets. For example, this means that if
-you (mis)type ``]]`` instead of ``[]``, a ``SyntaxError`` will show up, instead of
-the ``...:`` prompt continuation.
-
-IPython shell for ipdb interact
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The ipdb ``interact`` starts an IPython shell instead of Python's built-in ``code.interact()``.
-
-Automatic Vi prompt stripping
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-When pasting code into IPython, it will strip the leading prompt characters if
-there are any. For example, you can paste the following code into the console -
-it will still work, even though each line is prefixed with prompts (`In`,
-`Out`)::
-
-    In [1]: 2 * 2 == 4
-    Out[1]: True
-
-    In [2]: print("This still works as pasted")
-
-
-Previously, this was not the case for the Vi-mode prompts::
-
-    In [1]: [ins] In [13]: 2 * 2 == 4
-       ...: Out[13]: True
-       ...:
-      File "<ipython-input-1-727bb88eaf33>", line 1
-        [ins] In [13]: 2 * 2 == 4
-              ^
-    SyntaxError: invalid syntax
-
-This is now fixed, and Vi prompt prefixes - ``[ins]`` and ``[nav]`` -  are
-skipped just as the normal ``In`` would be.
-
-IPython shell can be started in the Vi mode using ``ipython --TerminalInteractiveShell.editing_mode=vi``, 
-You should be able to change mode dynamically with ``%config TerminalInteractiveShell.editing_mode='vi'``
-
-Empty History Ranges
-~~~~~~~~~~~~~~~~~~~~
-
-A number of magics that take history ranges can now be used with an empty
-range. These magics are:
-
- * ``%save``
- * ``%load``
- * ``%pastebin``
- * ``%pycat``
-
-Using them this way will make them take the history of the current session up
-to the point of the magic call (such that the magic itself will not be
-included).
-
-Therefore it is now possible to save the whole history to a file using simple
-``%save <filename>``, load and edit it using ``%load`` (makes for a nice usage
-when followed with :kbd:`F2`), send it to dpaste.org using ``%pastebin``, or
-view the whole thing syntax-highlighted with a single ``%pycat``.
-
-Traceback improvements
-~~~~~~~~~~~~~~~~~~~~~~
-
-
-Previously, error tracebacks for errors happening in code cells were showing a hash, the one used for compiling the Python AST::
-
-    In [1]: def foo():
-    ...:     return 3 / 0
-    ...:
-
-    In [2]: foo()
-    ---------------------------------------------------------------------------
-    ZeroDivisionError                         Traceback (most recent call last)
-    <ipython-input-2-c19b6d9633cf> in <module>
-    ----> 1 foo()
-
-    <ipython-input-1-1595a74c32d5> in foo()
-        1 def foo():
-    ----> 2     return 3 / 0
-        3
-
-    ZeroDivisionError: division by zero
-
-The error traceback is now correctly formatted, showing the cell number in which the error happened::
-
-    In [1]: def foo():
-    ...:     return 3 / 0
-    ...:
-
-    Input In [2]: foo()
-    ---------------------------------------------------------------------------
-    ZeroDivisionError                         Traceback (most recent call last)
-    input In [2], in <module>
-    ----> 1 foo()
-
-    Input In [1], in foo()
-        1 def foo():
-    ----> 2     return 3 / 0
-
-    ZeroDivisionError: division by zero
-
-Miscellaneous
-~~~~~~~~~~~~~
-
- - ``~`` is now expanded when part of a path in most magics :ghpull:`13385`
- - ``%/%%timeit`` magic now adds comma every thousands to make reading long number easier :ghpull:`13379`
- - ``"info"`` messages can now be customised to hide some fields :ghpull:`13343`
- - ``collections.UserList`` now pretty-prints :ghpull:`13320`
- - The debugger now have a persistent history, which should make it less
-   annoying to retype commands :ghpull:`13246`
- - ``!pip`` ``!conda`` ``!cd`` or ``!ls`` are likely doing the wrong thing, we
-   now warn users if they use it. :ghpull:`12954`
- - make ``%precision`` work for ``numpy.float64`` type :ghpull:`12902`
-
-
-
-
-Numfocus Small Developer Grant
-------------------------------
-
-To prepare for Python 3.10 we have also started working on removing reliance and
-any dependency that is not Python 3.10 compatible; that include migrating our
-test suite to pytest, and starting to remove nose. This also mean that the
-``iptest`` command is now gone, and all testing is via pytest.
-
-This was in bog part thanks the NumFOCUS Small Developer grant, we were able to
-allocate 4000 to hire `Nikita Kniazev (@Kojoley) <https://github.com/Kojoley>`__
-who did a fantastic job at updating our code base, migrating to pytest, pushing
-our coverage, and fixing a large number of bugs. I highly recommend contacting
-them if you need help with C++ and Python projects
-
-You can find all relevant issues and PRs with the SDG 2021 tag `<https://github.com/ipython/ipython/issues?q=label%3A%22Numfocus+SDG+2021%22+>`__
-
-Removing support for Older Python
----------------------------------
-
-
-We are also removing support for Python up to 3.7 allowing internal code to use more
-efficient ``pathlib``, and make better use of type annotations. 
-
-.. image:: ../_images/8.0/pathlib_pathlib_everywhere.jpg
-   :alt: "Meme image of Toy Story with Woody and Buzz, with the text 'pathlib, pathlib everywhere'"
-
-
-We have about 34 PRs only to update some logic tu update some function from managing strings to
-using Pathlib.
-
-The completer has also seen significant updates and make use of newer Jedi API
-offering faster and more reliable tab completion.
-
 
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 
-As a reminder, IPython master has diverged from the 7.x branch, thus master may
-have more feature and API changes.
-
 Backwards incompatible changes
 ------------------------------
 
diff --git a/docs/source/whatsnew/index.rst b/docs/source/whatsnew/index.rst
index 775d18cf28f..8eecbb9006c 100644
--- a/docs/source/whatsnew/index.rst
+++ b/docs/source/whatsnew/index.rst
@@ -33,6 +33,7 @@ development work they do here in a user friendly format.
 .. toctree::
    :maxdepth: 1
 
+   version8
    version7
    github-stats-7
    version6
diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
new file mode 100644
index 00000000000..712c76cff42
--- /dev/null
+++ b/docs/source/whatsnew/version8.rst
@@ -0,0 +1,428 @@
+============
+ 8.x Series
+============
+
+IPython 8.0
+-----------
+
+IPython 8.0 is still in alpha/beta stage. Please help us improve those release notes
+by sending PRs that modify docs/source/whatsnew/version8.rst
+
+IPython 8.0 is bringing a large number of new features and improvements to both the
+user of the terminal and of the kernel via Jupyter. The removal of compatibility
+with older version of Python is also the opportunity to do a couple of
+performance improvement in particular with respect to startup time.
+The 8.x branch started diverging from its predecessor around IPython 7.12
+(January 2020).
+
+This release contains 250+ Pull Requests, in addition to many of the features
+and backports that have made it to the 7.x branch. All PRs that went into this
+released are properly tagged with the 8.0 milestone if you wish to have a more
+in depth look at the changes.
+
+Please fell free to send pull-requests to updates those notes after release, 
+I have likely forgotten a few things reviewing 250+ PRs.
+
+Dependencies changes/downstream packaging
+-----------------------------------------
+
+Note that most of our building step have been changes to be (mostly) declarative
+and follow PEP 517, we are trying to completely remove ``setup.py`` (:ghpull:`13238`) and are
+looking for help to do so.
+
+ - Minimum supported ``traitlets`` version if now 5+
+ - we now require ``stack_data``
+ - Minimal Python is now 3.8
+ - ``nose`` is not a testing requirement anymore
+ - ``pytest`` replaces nose.
+ - ``iptest``/``iptest3`` cli entrypoints do not exists anymore. 
+ - minimum officially support ``numpy`` version has been bumped, but this should
+   not have much effect on packaging.
+
+
+Deprecation and removal
+-----------------------
+
+We removed almost all features, arguments, functions, and modules that were
+marked as deprecated between IPython 1.0 and 5.0. As reminder 5.0 was released
+in 2016, and 1.0 in 2013. Last release of the 5 branch was 5.10.0, in may 2020.
+The few remaining deprecated features we left have better deprecation warnings
+or have been turned into explicit errors for better error messages.
+
+I will use this occasion to add the following requests to anyone emitting a
+deprecation warning:
+
+ - Please at at least ``stacklevel=2`` so that the warning is emitted into the
+   caller context, and not the callee one.
+ - Please add **since which version** something is deprecated.
+
+As a side note it is much easier to deal with conditional comparing to versions
+numbers than ``try/except`` when a functionality change with version. 
+
+I won't list all the removed features here, but modules like ``IPython.kernel``,
+which was just a shim module around ``ipykernel`` for the past 8 years have been
+remove, and so many other similar things that pre-date the name **Jupyter**
+itself.
+
+We no longer need to add ``IPyhton.extensions`` to the PYTHONPATH because that is being
+handled by ``load_extension``.
+
+We are also removing ``Cythonmagic``, ``sympyprinting`` and ``rmagic`` as they are now in
+other packages and no longer need to be inside IPython.
+
+
+Documentation
+-------------
+
+Majority of our docstrings have now been reformatted and automatically fixed by
+the experimental `Vélin <https://pypi.org/project/velin/>`_ project, to conform
+to numpydoc.
+
+Type annotations
+----------------
+
+While IPython itself is highly dynamic and can't be completely typed, many of
+the function now have type annotation, and part of the codebase and now checked
+by mypy.
+
+
+Featured changes
+----------------
+
+Here is a features list of changes in IPython 8.0. This is of course non-exhaustive. 
+Please note as well that many features have been added in the 7.x branch as well
+(and hence why you want to read the 7.x what's new notes), in particular
+features contributed by QuantStack (with respect to debugger protocol, and Xeus
+Python), as well as many debugger features that I was please to implement as
+part of my work at QuanSight and Sponsored by DE Shaw.
+
+Better Tracebacks
+~~~~~~~~~~~~~~~~~
+
+The first on is the integration of the ``stack_data`` package;
+which provide smarter informations in traceback; in particular it will highlight
+the AST node where an error occurs which can help to quickly narrow down errors.
+
+For example in the following snippet::
+
+    def foo(i):
+        x = [[[0]]]
+        return x[0][i][0]
+
+
+    def bar():
+        return foo(0) + foo(
+            1
+        ) + foo(2)
+
+
+Calling ``bar()`` would raise an ``IndexError`` on the return line of ``foo``,
+IPython 8.0 is capable of telling you, where the index error occurs::
+
+
+    IndexError
+    Input In [2], in <module>
+    ----> 1 bar()
+            ^^^^^
+
+    Input In [1], in bar()
+          6 def bar():
+    ----> 7     return foo(0) + foo(
+                                ^^^^
+          8         1
+             ^^^^^^^^
+          9     ) + foo(2)
+             ^^^^
+
+    Input In [1], in foo(i)
+          1 def foo(i):
+          2     x = [[[0]]]
+    ----> 3     return x[0][i][0]
+                       ^^^^^^^
+
+Corresponding location marked here with ``^`` will show up highlighted in 
+terminal and notebooks.
+
+
+Autosuggestons
+~~~~~~~~~~~~~~
+
+Autosuggestion is a very useful feature available in `fish <https://fishshell.com/>`__, `zsh <https://en.wikipedia.org/wiki/Z_shell>`__, and `prompt-toolkit <https://python-prompt-toolkit.readthedocs.io/en/master/pages/asking_for_input.html#auto-suggestion>`__.
+
+`Ptpython <https://github.com/prompt-toolkit/ptpython#ptpython>`__ allows users to enable this feature in
+`ptpython/config.py <https://github.com/prompt-toolkit/ptpython/blob/master/examples/ptpython_config/config.py#L90>`__.
+
+This feature allows users to accept autosuggestions with ctrl e, ctrl f,
+or right arrow as described below.
+
+1. Start ipython
+
+.. image:: ../_images/8.0/auto_suggest_1_prompt_no_text.png
+
+2. Run ``print("hello")``
+
+.. image:: ../_images/8.0/auto_suggest_2_print_hello_suggest.png
+
+3. start typing ``print`` again to see the autosuggestion
+
+.. image:: ../_images/8.0/auto_suggest_3_print_hello_suggest.png
+
+4. Press ``ctrl-f``, or ``ctrl-e``, or ``right-arrow`` to accept the suggestion
+
+.. image:: ../_images/8.0/auto_suggest_4_print_hello.png
+
+You can also complete word by word:
+
+1. Run ``def say_hello(): print("hello")``
+
+.. image:: ../_images/8.0/auto_suggest_second_prompt.png
+
+2. Start typing  the first letter if ``def`` to see the autosuggestion
+
+.. image:: ../_images/8.0/auto_suggest_d_phantom.png
+
+3. Press ``alt-f`` (or ``escape`` followed by ``f``), to accept the first word of the suggestion
+
+.. image:: ../_images/8.0/auto_suggest_def_phantom.png
+
+Importantly, this feature does not interfere with tab completion:
+
+1. After running ``def say_hello(): print("hello")``, press d
+
+.. image:: ../_images/8.0/auto_suggest_d_phantom.png
+
+2. Press Tab to start tab completion
+
+.. image:: ../_images/8.0/auto_suggest_d_completions.png
+
+3A. Press Tab again to select the first option
+
+.. image:: ../_images/8.0/auto_suggest_def_completions.png
+
+3B. Press ``alt f`` (``escape``, ``f``) to accept to accept the first word of the suggestion
+
+.. image:: ../_images/8.0/auto_suggest_def_phantom.png
+
+3C. Press ``ctrl-f`` or ``ctrl-e`` to accept the entire suggestion
+
+.. image:: ../_images/8.0/auto_suggest_match_parens.png
+
+
+Currently, autosuggestions are only shown in the emacs or vi insert editing modes:
+
+- The ctrl e, ctrl f, and alt f shortcuts work by default in emacs mode.
+- To use these shortcuts in vi insert mode, you will have to create `custom keybindings in your config.py <https://github.com/mskar/setup/commit/2892fcee46f9f80ef7788f0749edc99daccc52f4/>`__.
+
+
+Show pinfo information in ipdb using "?" and "??"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In IPDB, it is now possible to show the information about an object using "?"
+and "??", in much the same way it can be done when using the IPython prompt::
+
+    ipdb> partial?
+    Init signature: partial(self, /, *args, **kwargs)
+    Docstring:
+    partial(func, *args, **keywords) - new function with partial application
+    of the given arguments and keywords.
+    File:           ~/.pyenv/versions/3.8.6/lib/python3.8/functools.py
+    Type:           type
+    Subclasses:
+
+Previously, ``pinfo`` or ``pinfo2`` command had to be used for this purpose.
+
+
+Autoreload 3 feature
+~~~~~~~~~~~~~~~~~~~~
+
+Example: When an IPython session is ran with the 'autoreload' extension loaded,
+you will now have the option '3' to select which means the following:
+
+    1. replicate all functionality from option 2
+    2. autoload all new funcs/classes/enums/globals from the module when they are added
+    3. autoload all newly imported funcs/classes/enums/globals from external modules
+
+Try ``%autoreload 3`` in an IPython session after running ``%load_ext autoreload``
+
+For more information please see the following unit test : ``extensions/tests/test_autoreload.py:test_autoload_newly_added_objects``
+
+
+
+
+History Range Glob feature
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Previously, when using ``%history``, users could specify either
+a range of sessions and lines, for example:
+
+.. code-block:: python
+
+   ~8/1-~6/5   # see history from the first line of 8 sessions ago,
+               # to the fifth line of 6 sessions ago.``
+
+Or users could specify a glob pattern:
+
+.. code-block:: python
+
+   -g <pattern>  # glob ALL history for the specified pattern.
+
+However users could *not* specify both.
+
+If a user *did* specify both a range and a glob pattern,
+then the glob pattern would be used (globbing *all* history) *and the range would be ignored*.
+
+With this enhancement, if a user specifies both a range and a glob pattern, then the glob pattern will be applied to the specified range of history.
+
+Don't start a multi line cell with sunken parenthesis
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+From now on IPython will not ask for the next line of input when given a single
+line with more closing than opening brackets. For example, this means that if
+you (mis)type ``]]`` instead of ``[]``, a ``SyntaxError`` will show up, instead of
+the ``...:`` prompt continuation.
+
+IPython shell for ipdb interact
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ipdb ``interact`` starts an IPython shell instead of Python's built-in ``code.interact()``.
+
+Automatic Vi prompt stripping
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When pasting code into IPython, it will strip the leading prompt characters if
+there are any. For example, you can paste the following code into the console -
+it will still work, even though each line is prefixed with prompts (`In`,
+`Out`)::
+
+    In [1]: 2 * 2 == 4
+    Out[1]: True
+
+    In [2]: print("This still works as pasted")
+
+
+Previously, this was not the case for the Vi-mode prompts::
+
+    In [1]: [ins] In [13]: 2 * 2 == 4
+       ...: Out[13]: True
+       ...:
+      File "<ipython-input-1-727bb88eaf33>", line 1
+        [ins] In [13]: 2 * 2 == 4
+              ^
+    SyntaxError: invalid syntax
+
+This is now fixed, and Vi prompt prefixes - ``[ins]`` and ``[nav]`` -  are
+skipped just as the normal ``In`` would be.
+
+IPython shell can be started in the Vi mode using ``ipython --TerminalInteractiveShell.editing_mode=vi``, 
+You should be able to change mode dynamically with ``%config TerminalInteractiveShell.editing_mode='vi'``
+
+Empty History Ranges
+~~~~~~~~~~~~~~~~~~~~
+
+A number of magics that take history ranges can now be used with an empty
+range. These magics are:
+
+ * ``%save``
+ * ``%load``
+ * ``%pastebin``
+ * ``%pycat``
+
+Using them this way will make them take the history of the current session up
+to the point of the magic call (such that the magic itself will not be
+included).
+
+Therefore it is now possible to save the whole history to a file using simple
+``%save <filename>``, load and edit it using ``%load`` (makes for a nice usage
+when followed with :kbd:`F2`), send it to dpaste.org using ``%pastebin``, or
+view the whole thing syntax-highlighted with a single ``%pycat``.
+
+Traceback improvements
+~~~~~~~~~~~~~~~~~~~~~~
+
+
+Previously, error tracebacks for errors happening in code cells were showing a hash, the one used for compiling the Python AST::
+
+    In [1]: def foo():
+    ...:     return 3 / 0
+    ...:
+
+    In [2]: foo()
+    ---------------------------------------------------------------------------
+    ZeroDivisionError                         Traceback (most recent call last)
+    <ipython-input-2-c19b6d9633cf> in <module>
+    ----> 1 foo()
+
+    <ipython-input-1-1595a74c32d5> in foo()
+        1 def foo():
+    ----> 2     return 3 / 0
+        3
+
+    ZeroDivisionError: division by zero
+
+The error traceback is now correctly formatted, showing the cell number in which the error happened::
+
+    In [1]: def foo():
+    ...:     return 3 / 0
+    ...:
+
+    Input In [2]: foo()
+    ---------------------------------------------------------------------------
+    ZeroDivisionError                         Traceback (most recent call last)
+    input In [2], in <module>
+    ----> 1 foo()
+
+    Input In [1], in foo()
+        1 def foo():
+    ----> 2     return 3 / 0
+
+    ZeroDivisionError: division by zero
+
+Miscellaneous
+~~~~~~~~~~~~~
+
+ - ``~`` is now expanded when part of a path in most magics :ghpull:`13385`
+ - ``%/%%timeit`` magic now adds comma every thousands to make reading long number easier :ghpull:`13379`
+ - ``"info"`` messages can now be customised to hide some fields :ghpull:`13343`
+ - ``collections.UserList`` now pretty-prints :ghpull:`13320`
+ - The debugger now have a persistent history, which should make it less
+   annoying to retype commands :ghpull:`13246`
+ - ``!pip`` ``!conda`` ``!cd`` or ``!ls`` are likely doing the wrong thing, we
+   now warn users if they use it. :ghpull:`12954`
+ - make ``%precision`` work for ``numpy.float64`` type :ghpull:`12902`
+
+
+
+
+Numfocus Small Developer Grant
+------------------------------
+
+To prepare for Python 3.10 we have also started working on removing reliance and
+any dependency that is not Python 3.10 compatible; that include migrating our
+test suite to pytest, and starting to remove nose. This also mean that the
+``iptest`` command is now gone, and all testing is via pytest.
+
+This was in bog part thanks the NumFOCUS Small Developer grant, we were able to
+allocate 4000 to hire `Nikita Kniazev (@Kojoley) <https://github.com/Kojoley>`__
+who did a fantastic job at updating our code base, migrating to pytest, pushing
+our coverage, and fixing a large number of bugs. I highly recommend contacting
+them if you need help with C++ and Python projects
+
+You can find all relevant issues and PRs with the SDG 2021 tag `<https://github.com/ipython/ipython/issues?q=label%3A%22Numfocus+SDG+2021%22+>`__
+
+Removing support for Older Python
+---------------------------------
+
+
+We are also removing support for Python up to 3.7 allowing internal code to use more
+efficient ``pathlib``, and make better use of type annotations. 
+
+.. image:: ../_images/8.0/pathlib_pathlib_everywhere.jpg
+   :alt: "Meme image of Toy Story with Woody and Buzz, with the text 'pathlib, pathlib everywhere'"
+
+
+We have about 34 PRs only to update some logic tu update some function from managing strings to
+using Pathlib.
+
+The completer has also seen significant updates and make use of newer Jedi API
+offering faster and more reliable tab completion.
+

From 01a51085686e5a133ff7efb786c1c0715ec31cd1 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 09:49:05 -0800
Subject: [PATCH 0970/1407] some mailmap updates

---
 .mailmap | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.mailmap b/.mailmap
index 8d4757e6865..ab05ba24ba2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,6 +2,9 @@ A. J. Holyoake <a.j.holyoake@gmail.com> ajholyoake <a.j.holyoake@gmail.com>
 Alok Singh <alokbeniwal@gmail.com> Alok Singh <8325708+alok@users.noreply.github.com>
 Aaron Culich <aculich@gmail.com> Aaron Culich <aculich@eecs.berkeley.edu>
 Aron Ahmadia <aron@ahmadia.net> ahmadia <aron@ahmadia.net>
+Arthur Svistunov <madbirddiary@gmail.com> <18216480+madbird1304@users.noreply.github.com>
+Arthur Svistunov <madbird1304@gmail.com> <18216480+madbird1304@users.noreply.github.com>
+Adam Hackbarth <fearchaos@gmail.com> <digitalvirtuoso@users.noreply.github.com>
 Benjamin Ragan-Kelley <benjaminrk@gmail.com> <minrk@Mercury.local>
 Benjamin Ragan-Kelley <benjaminrk@gmail.com> Min RK
 Benjamin Ragan-Kelley <benjaminrk@gmail.com> MinRK <benjaminrk@gmail.com>
@@ -14,6 +17,8 @@ Brian E. Granger <ellisonbg@gmail.com> Brian Granger
 Brian E. Granger <ellisonbg@gmail.com> Brian Granger <>
 Brian E. Granger <ellisonbg@gmail.com> bgranger <>
 Brian E. Granger <ellisonbg@gmail.com> bgranger <bgranger@red>
+Blazej Michalik <code.mrmino@gmail.com> <6691643+MrMino@users.noreply.github.com>
+Blazej Michalik <code.mrmino@gmail.com> <blazej.michalik@nokia.com>
 Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
 Cyrille Rossant <cyrille.rossant@gmail.com> rossant <rossant@github>
 Damián Avila <damianavila82@yahoo.com.ar> damianavila <damianavila82@yahoo.com.ar>
@@ -26,6 +31,7 @@ Dav Clark <davclark@berkeley.edu> Dav Clark <davclark@gmail.com>
 David Hirschfeld <david.hirschfeld@gazprom-mt.com> dhirschfeld <david.hirschfeld@gazprom-mt.com>
 David P. Sanders <dpsanders@gmail.com> David P. Sanders <dpsanders@ciencias.unam.mx>
 David Warde-Farley <wardefar@iro.umontreal.ca> David Warde-Farley <>
+Dan Green-Leipciger <dangreen.tlv@gmail.com> <dangreen.tlv@gmail.com>
 Doug Blank <dblank@cs.brynmawr.edu> Doug Blank <doug.blank@gmail.com>
 Eugene Van den Bulke <eugene.van-den-bulke@gmail.com> Eugene Van den Bulke <eugene.vandenbulke@gmail.com> 
 Evan Patterson <epatters@enthought.com> <epatters@EPattersons-MacBook-Pro.local>
@@ -141,6 +147,9 @@ Silvia Vinyes <silvia.vinyes@gmail.com> silviav12 <silvia.vinyes@gmail.com>
 Srinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com> Srinivas Reddy Thatiparthy <srinivasreddy@users.noreply.github.com>
 Sylvain Corlay <scorlay@bloomberg.net> <sylvain.corlay@gmail.com>
 Sylvain Corlay <scorlay@bloomberg.net> sylvain.corlay <sylvain.corlay@gmail.com>
+Samuel Gaist <samuel.gaist@idiap.ch> <samuel.gaist@kde.org>
+Richard Shadrach <rhshadrach@gmail.com> <rhshadrach@gmail.com>
+Juan Luis Cano Rodríguez <juanlu@readthedocs.org> <hello@juanlu.space>
 Tamir Bahar <tamir@north-bit.com> Tamir Bahar <tmr232@users.noreply.github.com>
 Ted Drain <ted.drain@gmail.com> TD22057 <ted.drain@gmail.com>
 Théophile Studer <theo.studer@gmail.com> Théophile Studer <studer@users.noreply.github.com>

From 9d634ca9c7ff8ca3bd0531b7f4f8bd2757c49209 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 10:23:17 -0800
Subject: [PATCH 0971/1407] Update API comparison using frappuccino.

We sleep one second to make sure the bytecode cache is not loaded,
And we give extra seeds modules to crawl the API
---
 tools/release_helper.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index a1aa263a8b3..a9208449f93 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -108,12 +108,14 @@ if ask_section "Generate API difference (using frapuccino)"
 then
     echo $BLUE"Checking out $PREV_RELEASE"$NOR
     git checkout $PREV_RELEASE
+    sleep 1
     echo $BLUE"Saving API to file $PREV_RELEASE"$NOR
-    frappuccino IPython --save IPython-$PREV_RELEASE.json
+    frappuccino IPython IPython.kernel IPython.lib IPython.qt IPython.lib.kernel IPython.html IPython.frontend IPython.external --save IPython-$PREV_RELEASE.json
     echo $BLUE"comming back to $BRANCH"$NOR
     git checkout $BRANCH
+    sleep 1
     echo $BLUE"comparing ..."$NOR
-    frappuccino IPython --compare IPython-$PREV_RELEASE.json
+    frappuccino IPython IPython.kernel IPython.lib --compare IPython-$PREV_RELEASE.json
     echo $GREEN"Use the above guideline to write an API changelog ..."$NOR
     echo $GREEN"Press any keys to continue"$NOR
     read

From fd924c5f78172733881854a0f671e8250e760ca6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 10:41:12 -0800
Subject: [PATCH 0972/1407] release 8.0.0a1

---
 IPython/core/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 402c2ed100b..31365102ad5 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,7 +20,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _version_extra = ''  # Uncomment this for full releases
+_version_extra = "a1"  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From db063c57effd81069b86eb5ed223ca7d7b313394 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 10:42:10 -0800
Subject: [PATCH 0973/1407] back to dev

---
 IPython/core/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 31365102ad5..38290a1fcb3 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,7 +20,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_version_extra = "a1"  # Uncomment this for full releases
+# _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 77f28e7478ae807b0ec926cf9ebb3f9110cc3c10 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 10:52:45 -0800
Subject: [PATCH 0974/1407] fix building

---
 MANIFEST.in      | 1 -
 tools/toollib.py | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 8740db350f6..a86c1c7339b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,7 +2,6 @@ include README.rst
 include COPYING.rst
 include LICENSE
 include setupbase.py
-include setupegg.py
 include MANIFEST.in
 include pytest.ini
 include mypy.ini
diff --git a/tools/toollib.py b/tools/toollib.py
index 510b54e99d4..1555e55aeec 100644
--- a/tools/toollib.py
+++ b/tools/toollib.py
@@ -18,10 +18,11 @@
 
 # Build commands
 # Source dists
-sdists = './setup.py sdist --formats=gztar'
+sdists = "{python} setup.py sdist --formats=xztar".format(python=sys.executable)
 # Binary dists
 def buildwheels():
-    sh('{python} setupegg.py bdist_wheel'.format(python=sys.executable))
+    sh("{python} setup.py bdist_wheel".format(python=sys.executable))
+
 
 # Utility functions
 def sh(cmd):

From aad2c0ff626b06adf02d0246b0d45ab58db110ed Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 11:25:49 -0800
Subject: [PATCH 0975/1407] retar correctly xz

---
 setup.cfg           |  2 +-
 tools/build_release |  1 +
 tools/release       |  2 +-
 tools/retar.py      | 23 +++++++++++++++++++----
 tools/toollib.py    |  2 +-
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index b011a7ef3cd..d6269ab1ec0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -58,7 +58,7 @@ classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Topic :: System :: Shell
+    Topic :: System :: Shells
 
 
 [options]
diff --git a/tools/build_release b/tools/build_release
index 51fd87d54d9..970a5a002e3 100755
--- a/tools/build_release
+++ b/tools/build_release
@@ -17,6 +17,7 @@ def build_release():
     sh(sdists)
     buildwheels()
     sh(' '.join([sys.executable, 'tools/retar.py', 'dist/*.gz']))
+    sh(' '.join([sys.executable, 'tools/retar.py', 'dist/*.xz']))
 
 if __name__ == '__main__':
     build_release()
diff --git a/tools/release b/tools/release
index 2de8e120070..2ba4d242f36 100755
--- a/tools/release
+++ b/tools/release
@@ -63,7 +63,7 @@ if 'upload' in sys.argv:
     # Make target dir if it doesn't exist
     print('1. Uploading IPython to archive.ipython.org')
     sh('ssh %s "mkdir -p %s/release/%s" ' % (archive_user, archive_dir, version))
-    sh('scp *.tar.gz *.whl %s' % release_site)
+    sh('scp *.tar.gz *.tar.xz *.whl %s' % release_site)
 
     print('2. Uploading backup files...')
     cd(ipbackupdir)
diff --git a/tools/retar.py b/tools/retar.py
index b81345d280d..dbc4f0bde2b 100644
--- a/tools/retar.py
+++ b/tools/retar.py
@@ -35,7 +35,11 @@
 with open(path, "rb") as f:
     old_buf.write(f.read())
 old_buf.seek(0)
-old = tarfile.open(fileobj=old_buf, mode="r:gz")
+if path.name.endswith("gz"):
+    r_mode = "r:gz"
+if path.name.endswith(("xz", "xz2")):
+    r_mode = "r:xz"
+old = tarfile.open(fileobj=old_buf, mode=r_mode)
 
 buf = io.BytesIO()
 new = tarfile.open(fileobj=buf, mode="w", format=tarfile.GNU_FORMAT)
@@ -46,6 +50,7 @@
         continue
     m2 = tarfile.TarInfo(m.name)
     m2.mtime = min(timestamp, m.mtime)
+    m2.pax_headers["mtime"] = m2.mtime
     m2.size = m.size
     m2.type = m.type
     m2.linkname = m.linkname
@@ -59,9 +64,19 @@
 old.close()
 
 buf.seek(0)
-with open(path, "wb") as f:
-    with gzip.GzipFile('', "wb", fileobj=f, mtime=timestamp) as gzf:
-        gzf.write(buf.read())
+
+if r_mode == "r:gz":
+    with open(path, "wb") as f:
+        with gzip.GzipFile("", "wb", fileobj=f, mtime=timestamp) as gzf:
+            gzf.write(buf.read())
+elif r_mode == "r:xz":
+    import lzma
+
+    with lzma.open(path, "wb") as f:
+        f.write(buf.read())
+
+else:
+    assert False
 
 # checks the archive is valid.
 archive = tarfile.open(path)
diff --git a/tools/toollib.py b/tools/toollib.py
index 1555e55aeec..ce37644e007 100644
--- a/tools/toollib.py
+++ b/tools/toollib.py
@@ -18,7 +18,7 @@
 
 # Build commands
 # Source dists
-sdists = "{python} setup.py sdist --formats=xztar".format(python=sys.executable)
+sdists = "{python} setup.py sdist --formats=xztar,gztar".format(python=sys.executable)
 # Binary dists
 def buildwheels():
     sh("{python} setup.py bdist_wheel".format(python=sys.executable))

From 2c629bd78ec0d02772e981c544d7755f7d909126 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 11:49:20 -0800
Subject: [PATCH 0976/1407] fix long description

---
 MANIFEST.in          |  1 +
 long_description.rst | 37 +++++++++++++++++++++++++++++++++++++
 setup.cfg            | 39 +--------------------------------------
 tools/build_release  |  2 +-
 tools/release        |  2 +-
 tools/retar.py       | 12 +++++++-----
 tools/toollib.py     |  2 +-
 7 files changed, 49 insertions(+), 46 deletions(-)
 create mode 100644 long_description.rst

diff --git a/MANIFEST.in b/MANIFEST.in
index a86c1c7339b..0497df044f4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,6 +8,7 @@ include mypy.ini
 include .mailmap
 include .flake8
 include .pre-commit-config.yaml
+include long_description.rst
 
 recursive-exclude tools *
 exclude tools
diff --git a/long_description.rst b/long_description.rst
new file mode 100644
index 00000000000..f411b45720e
--- /dev/null
+++ b/long_description.rst
@@ -0,0 +1,37 @@
+IPython provides a rich toolkit to help you make the most out of using Python
+interactively.  Its main components are:
+
+* A powerful interactive Python shell
+* A `Jupyter <https://jupyter.org/>`_ kernel to work with Python code in Jupyter
+notebooks and other interactive frontends.
+
+The enhanced interactive Python shells have the following main features:
+
+* Comprehensive object introspection.
+
+* Input history, persistent across sessions.
+
+* Caching of output results during a session with automatically generated
+references.
+
+* Extensible tab completion, with support by default for completion of python
+variables and keywords, filenames and function keywords.
+
+* Extensible system of 'magic' commands for controlling the environment and
+performing many tasks related either to IPython or the operating system.
+
+* A rich configuration system with easy switching between different setups
+(simpler than changing $PYTHONSTARTUP environment variables every time).
+
+* Session logging and reloading.
+
+* Extensible syntax processing for special purpose situations.
+
+* Access to the system shell with user-extensible alias system.
+
+* Easily embeddable in other Python programs and GUIs.
+
+* Integrated access to the pdb debugger and the Python profiler.
+
+The latest development version is always available from IPython's `GitHub
+site <http://github.com/ipython>`_.
diff --git a/setup.cfg b/setup.cfg
index d6269ab1ec0..61fa02291ce 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,44 +4,7 @@ version = attr: IPython.core.release.__version__
 url = https://ipython.org
 description = IPython: Productive Interactive Computing
 long_description_content_type = text/x-rst
-long_description = IPython provides a rich toolkit to help you make the most out of using Python
-    interactively.  Its main components are:
-
-    * A powerful interactive Python shell
-    * A `Jupyter <https://jupyter.org/>`_ kernel to work with Python code in Jupyter
-    notebooks and other interactive frontends.
-
-    The enhanced interactive Python shells have the following main features:
-
-    * Comprehensive object introspection.
-
-    * Input history, persistent across sessions.
-
-    * Caching of output results during a session with automatically generated
-    references.
-
-    * Extensible tab completion, with support by default for completion of python
-    variables and keywords, filenames and function keywords.
-
-    * Extensible system of 'magic' commands for controlling the environment and
-    performing many tasks related either to IPython or the operating system.
-
-    * A rich configuration system with easy switching between different setups
-    (simpler than changing $PYTHONSTARTUP environment variables every time).
-
-    * Session logging and reloading.
-
-    * Extensible syntax processing for special purpose situations.
-
-    * Access to the system shell with user-extensible alias system.
-
-    * Easily embeddable in other Python programs and GUIs.
-
-    * Integrated access to the pdb debugger and the Python profiler.
-
-    The latest development version is always available from IPython's `GitHub
-    site <http://github.com/ipython>`_.
-
+long_description = file: long_description.rst
 license_file = LICENSE
 project_urls =
     Documentation = https://ipython.readthedocs.io/
diff --git a/tools/build_release b/tools/build_release
index 970a5a002e3..651aec7cd2d 100755
--- a/tools/build_release
+++ b/tools/build_release
@@ -16,8 +16,8 @@ def build_release():
     # Build source and binary distros
     sh(sdists)
     buildwheels()
+    # don't try to change, xz, bz2 deprecated.
     sh(' '.join([sys.executable, 'tools/retar.py', 'dist/*.gz']))
-    sh(' '.join([sys.executable, 'tools/retar.py', 'dist/*.xz']))
 
 if __name__ == '__main__':
     build_release()
diff --git a/tools/release b/tools/release
index 2ba4d242f36..385668da01f 100755
--- a/tools/release
+++ b/tools/release
@@ -71,7 +71,7 @@ if 'upload' in sys.argv:
 
     print('3. Uploading to PyPI using twine')
     cd(distdir)
-    call(['twine', 'upload'] + to_upload)
+    call(['twine', 'upload', '--verbose'] + to_upload)
 
 else:
     # Build, but don't upload
diff --git a/tools/retar.py b/tools/retar.py
index dbc4f0bde2b..ccf1a1328a1 100644
--- a/tools/retar.py
+++ b/tools/retar.py
@@ -37,8 +37,10 @@
 old_buf.seek(0)
 if path.name.endswith("gz"):
     r_mode = "r:gz"
-if path.name.endswith(("xz", "xz2")):
-    r_mode = "r:xz"
+if path.name.endswith("bz2"):
+    r_mode = "r:bz2"
+if path.name.endswith("xz"):
+    raise ValueError("XZ is deprecated but it's written nowhere")
 old = tarfile.open(fileobj=old_buf, mode=r_mode)
 
 buf = io.BytesIO()
@@ -69,10 +71,10 @@
     with open(path, "wb") as f:
         with gzip.GzipFile("", "wb", fileobj=f, mtime=timestamp) as gzf:
             gzf.write(buf.read())
-elif r_mode == "r:xz":
-    import lzma
+elif r_mode == "r:bz2":
+    import bz2
 
-    with lzma.open(path, "wb") as f:
+    with bz2.open(path, "wb") as f:
         f.write(buf.read())
 
 else:
diff --git a/tools/toollib.py b/tools/toollib.py
index ce37644e007..b1498f93d6e 100644
--- a/tools/toollib.py
+++ b/tools/toollib.py
@@ -18,7 +18,7 @@
 
 # Build commands
 # Source dists
-sdists = "{python} setup.py sdist --formats=xztar,gztar".format(python=sys.executable)
+sdists = "{python} setup.py sdist --formats=gztar".format(python=sys.executable)
 # Binary dists
 def buildwheels():
     sh("{python} setup.py bdist_wheel".format(python=sys.executable))

From 28424d8673922e1699f07ab8042dab0ab9f00caf Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 13:30:57 -0800
Subject: [PATCH 0977/1407] use python -m build

---
 tools/toollib.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/toollib.py b/tools/toollib.py
index b1498f93d6e..03f76c67fa3 100644
--- a/tools/toollib.py
+++ b/tools/toollib.py
@@ -18,10 +18,10 @@
 
 # Build commands
 # Source dists
-sdists = "{python} setup.py sdist --formats=gztar".format(python=sys.executable)
+sdists = "{python} -m build".format(python=sys.executable)
 # Binary dists
 def buildwheels():
-    sh("{python} setup.py bdist_wheel".format(python=sys.executable))
+    sh("{python} -m build".format(python=sys.executable))
 
 
 # Utility functions

From 02470596f7588f6b720d95987fe387eac5f74d8e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 13:37:04 -0800
Subject: [PATCH 0978/1407] clean

---
 tools/build_release | 6 ++----
 tools/toollib.py    | 5 +----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/tools/build_release b/tools/build_release
index 651aec7cd2d..f5d99eec1cf 100755
--- a/tools/build_release
+++ b/tools/build_release
@@ -3,9 +3,8 @@
 """
 import os
 import sys
-from shutil import rmtree
 
-from toollib import sh, pjoin, get_ipdir, cd, sdists, buildwheels
+from toollib import sh, get_ipdir, cd, build_command
 
 def build_release():
 
@@ -14,8 +13,7 @@ def build_release():
     cd(ipdir)
 
     # Build source and binary distros
-    sh(sdists)
-    buildwheels()
+    sh(build_command)
     # don't try to change, xz, bz2 deprecated.
     sh(' '.join([sys.executable, 'tools/retar.py', 'dist/*.gz']))
 
diff --git a/tools/toollib.py b/tools/toollib.py
index 03f76c67fa3..90727f0acda 100644
--- a/tools/toollib.py
+++ b/tools/toollib.py
@@ -18,10 +18,7 @@
 
 # Build commands
 # Source dists
-sdists = "{python} -m build".format(python=sys.executable)
-# Binary dists
-def buildwheels():
-    sh("{python} -m build".format(python=sys.executable))
+build_command = "{python} -m build".format(python=sys.executable)
 
 
 # Utility functions

From cc6b362345b1734456ead81cf71df18aa3a27a5b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 13:38:48 -0800
Subject: [PATCH 0979/1407] more cleanup

---
 tools/release | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/release b/tools/release
index 385668da01f..45fb7e4b2b7 100755
--- a/tools/release
+++ b/tools/release
@@ -11,7 +11,7 @@ from subprocess import call
 import sys
 
 from toollib import (get_ipdir, pjoin, cd, execfile, sh, archive,
-        sdists, archive_user, archive_dir, buildwheels)
+         archive_user, archive_dir)
 from gh_api import post_download
 
 # Get main ipython dir, this will raise if it doesn't pass some checks
@@ -85,7 +85,6 @@ else:
 
     cd(ipdir)
 
-    buildwheels()
     print("`./release upload` to upload source distribution on PyPI and ipython archive")
     sys.exit(0)
 

From d32e8fc89117f5d3cb45ca13ef155dee7a1c047e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 13:49:19 -0800
Subject: [PATCH 0980/1407] cleanup ununsed tools

remove ununsed tools files and make non executable
---
 tools/check_sources.py   |   0
 tools/gh_api.py          | 141 ---------------------------------------
 tools/git-mpr.py         | 127 -----------------------------------
 tools/git-mrb            |  80 ----------------------
 tools/github_stats.py    |   1 -
 tools/make_tarball.py    |   0
 tools/mknbindex.py       |  36 ----------
 tools/release            |   7 --
 tools/update_whatsnew.py |   0
 9 files changed, 392 deletions(-)
 mode change 100755 => 100644 tools/check_sources.py
 delete mode 100755 tools/git-mpr.py
 delete mode 100755 tools/git-mrb
 mode change 100755 => 100644 tools/github_stats.py
 mode change 100755 => 100644 tools/make_tarball.py
 delete mode 100755 tools/mknbindex.py
 mode change 100755 => 100644 tools/update_whatsnew.py

diff --git a/tools/check_sources.py b/tools/check_sources.py
old mode 100755
new mode 100644
diff --git a/tools/gh_api.py b/tools/gh_api.py
index cb14a4ce8ac..d68bcc8677e 100644
--- a/tools/gh_api.py
+++ b/tools/gh_api.py
@@ -5,14 +5,12 @@
 except NameError:
     pass
 
-import os
 import re
 import sys
 
 import requests
 import getpass
 import json
-from pathlib import Path
 
 try:
     import requests_cache
@@ -82,28 +80,6 @@ def get_auth_token():
 def make_auth_header():
     return {'Authorization': 'token ' + get_auth_token()}
 
-def post_issue_comment(project, num, body):
-    url = 'https://api.github.com/repos/{project}/issues/{num}/comments'.format(project=project, num=num)
-    payload = json.dumps({'body': body})
-    requests.post(url, data=payload, headers=make_auth_header())
-
-def post_gist(content, description='', filename='file', auth=False):
-    """Post some text to a Gist, and return the URL."""
-    post_data = json.dumps({
-      "description": description,
-      "public": True,
-      "files": {
-        filename: {
-          "content": content
-        }
-      }
-    }).encode('utf-8')
-
-    headers = make_auth_header() if auth else {}
-    response = requests.post("https://api.github.com/gists", data=post_data, headers=headers)
-    response.raise_for_status()
-    response_data = json.loads(response.text)
-    return response_data['html_url']
 
 def get_pull_request(project, num, auth=False):
     """get pull request info  by number
@@ -118,15 +94,6 @@ def get_pull_request(project, num, auth=False):
     response.raise_for_status()
     return json.loads(response.text, object_hook=Obj)
 
-def get_pull_request_files(project, num, auth=False):
-    """get list of files in a pull request"""
-    url = "https://api.github.com/repos/{project}/pulls/{num}/files".format(project=project, num=num)
-    if auth:
-        header = make_auth_header()
-    else:
-        header = None
-    return get_paged_request(url, headers=header)
-
 element_pat = re.compile(r'<(.+?)>')
 rel_pat = re.compile(r'rel=[\'"](\w+)[\'"]')
 
@@ -149,17 +116,6 @@ def get_paged_request(url, headers=None, **params):
             break
     return results
 
-def get_pulls_list(project, auth=False, **params):
-    """get pull request list"""
-    params.setdefault("state", "closed")
-    url = "https://api.github.com/repos/{project}/pulls".format(project=project)
-    if auth:
-        headers = make_auth_header()
-    else:
-        headers = None
-    pages = get_paged_request(url, headers=headers, **params)
-    return pages
-
 def get_issues_list(project, auth=False, **params):
     """get issues list"""
     params.setdefault("state", "closed")
@@ -205,100 +161,3 @@ def get_authors(pr):
         authors.append("%s <%s>" % (author['name'], author['email']))
     return authors
 
-# encode_multipart_formdata is from urllib3.filepost
-# The only change is to iter_fields, to enforce S3's required key ordering
-
-def iter_fields(fields):
-    fields = fields.copy()
-    for key in ('key', 'acl', 'Filename', 'success_action_status', 'AWSAccessKeyId',
-        'Policy', 'Signature', 'Content-Type', 'file'):
-        yield (key, fields.pop(key))
-    for (k,v) in fields.items():
-        yield k,v
-
-def encode_multipart_formdata(fields, boundary=None):
-    """
-    Encode a dictionary of ``fields`` using the multipart/form-data mime format.
-
-    :param fields:
-        Dictionary of fields or list of (key, value) field tuples.  The key is
-        treated as the field name, and the value as the body of the form-data
-        bytes. If the value is a tuple of two elements, then the first element
-        is treated as the filename of the form-data section.
-
-        Field names and filenames must be unicode.
-
-    :param boundary:
-        If not specified, then a random boundary will be generated using
-        :func:`mimetools.choose_boundary`.
-    """
-    # copy requests imports in here:
-    from io import BytesIO
-    from requests.packages.urllib3.filepost import (
-        choose_boundary, six, writer, b, get_content_type
-    )
-    body = BytesIO()
-    if boundary is None:
-        boundary = choose_boundary()
-
-    for fieldname, value in iter_fields(fields):
-        body.write(b('--%s\r\n' % (boundary)))
-
-        if isinstance(value, tuple):
-            filename, data = value
-            writer(body).write('Content-Disposition: form-data; name="%s"; '
-                               'filename="%s"\r\n' % (fieldname, filename))
-            body.write(b('Content-Type: %s\r\n\r\n' %
-                       (get_content_type(filename))))
-        else:
-            data = value
-            writer(body).write('Content-Disposition: form-data; name="%s"\r\n'
-                               % (fieldname))
-            body.write(b'Content-Type: text/plain\r\n\r\n')
-
-        if isinstance(data, int):
-            data = str(data)  # Backwards compatibility
-        if isinstance(data, six.text_type):
-            writer(body).write(data)
-        else:
-            body.write(data)
-
-        body.write(b'\r\n')
-
-    body.write(b('--%s--\r\n' % (boundary)))
-
-    content_type = b('multipart/form-data; boundary=%s' % boundary)
-
-    return body.getvalue(), content_type
-
-
-def post_download(project, filename, name=None, description=""):
-    """Upload a file to the GitHub downloads area"""
-    if name is None:
-        name = Path(filename).name
-    with open(filename, 'rb') as f:
-        filedata = f.read()
-
-    url = "https://api.github.com/repos/{project}/downloads".format(project=project)
-
-    payload = json.dumps(dict(name=name, size=len(filedata),
-                    description=description))
-    response = requests.post(url, data=payload, headers=make_auth_header())
-    response.raise_for_status()
-    reply = json.loads(response.content)
-    s3_url = reply['s3_url']
-
-    fields = dict(
-        key=reply['path'],
-        acl=reply['acl'],
-        success_action_status=201,
-        Filename=reply['name'],
-        AWSAccessKeyId=reply['accesskeyid'],
-        Policy=reply['policy'],
-        Signature=reply['signature'],
-        file=(reply['name'], filedata),
-    )
-    fields['Content-Type'] = reply['mime_type']
-    data, content_type = encode_multipart_formdata(fields)
-    s3r = requests.post(s3_url, data=data, headers={'Content-Type': content_type})
-    return s3r
diff --git a/tools/git-mpr.py b/tools/git-mpr.py
deleted file mode 100755
index ef32c02572d..00000000000
--- a/tools/git-mpr.py
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""
-Usage:
-    git-mpr [-h] [-l | -a] [pr-number [pr-number ...]]
-
-Type `git mpr -h` for details.
-"""
-
-
-import io, os
-import argparse
-from subprocess import check_call, CalledProcessError
-
-import gh_api
-
-ipy_repository = 'git://github.com/ipython/ipython.git'
-gh_project = "ipython/ipython"
-not_merged = {}
-
-def merge_branch(repo, branch ):
-    """try to merge the givent branch into the current one
-    
-    If something does not goes smoothly, merge is aborted
-    
-    Returns True if merge successful, False otherwise
-    """
-    # Delete the branch first
-    try :
-        check_call(['git', 'pull', repo, branch], stdin=io.open(os.devnull))
-    except CalledProcessError :
-        check_call(['git', 'merge', '--abort'])
-        return False
-    return True
-
-    
-def git_new_branch(name):
-    """Create a new branch with the given name and check it out.
-    """
-    check_call(['git', 'checkout', '-b', name])
-
-    
-def merge_pr(num):
-    """ try to merge the branch of PR `num` into current branch
-    """
-    # Get Github authorisation first, so that the user is prompted straight away
-    # if their login is needed.
-    
-    pr = gh_api.get_pull_request(gh_project, num)
-    repo = pr['head']['repo']['clone_url']
-
-
-    branch = pr['head']['ref']
-    mergeable = merge_branch(repo=repo, 
-                 branch=branch,
-              )
-    if not mergeable :
-        cmd = "git pull "+repo+" "+branch
-        not_merged[str(num)] = cmd
-        print("==============================================================================")
-        print("Something went wrong merging this branch, you can try it manually by running :")
-        print(cmd)
-        print("==============================================================================")
-        
-    
-def main(*args):
-    parser = argparse.ArgumentParser(
-            description="""
-                Merge one or more github pull requests by their number. If any
-                one pull request can't be merged as is, its merge is ignored
-                and the process continues with the next ones (if any).
-                """
-            )
-
-    grp = parser.add_mutually_exclusive_group()
-    grp.add_argument(
-            '-l',
-            '--list',
-            action='store_const',
-            const=True,
-            help='list PR, their number and their mergeability')
-    grp.add_argument('-a',
-            '--merge-all',
-            action='store_const',
-            const=True ,
-            help='try to merge as many PR as possible, one by one')
-    parser.add_argument('merge',
-            type=int,
-            help="The pull request numbers",
-            nargs='*',
-            metavar='pr-number')
-    args = parser.parse_args()
-
-    if(args.list):
-        pr_list = gh_api.get_pulls_list(gh_project)
-        for pr in pr_list :
-            mergeable = gh_api.get_pull_request(gh_project, pr['number'])['mergeable']
-
-            ismgb = u"√" if mergeable else " "
-            print(u"* #{number} [{ismgb}]:  {title}".format(
-                number=pr['number'],
-                title=pr['title'],
-                ismgb=ismgb))
-
-    if(args.merge_all):
-        branch_name = 'merge-' + '-'.join(str(pr['number']) for pr in pr_list)
-        git_new_branch(branch_name)
-        pr_list = gh_api.get_pulls_list(gh_project)
-        for pr in pr_list :
-            merge_pr(pr['number'])
-
-
-    elif args.merge:
-        branch_name = 'merge-' + '-'.join(map(str, args.merge))
-        git_new_branch(branch_name)
-        for num in args.merge :
-            merge_pr(num)
-
-    if not_merged :
-        print('*************************************************************************************')
-        print('The following branch has not been merged automatically, consider doing it by hand   :')
-        for num, cmd in not_merged.items() :
-            print( "PR {num}: {cmd}".format(num=num, cmd=cmd))
-        print('*************************************************************************************')
-
-if __name__ == '__main__':
-    main()
diff --git a/tools/git-mrb b/tools/git-mrb
deleted file mode 100755
index c1e3d824e78..00000000000
--- a/tools/git-mrb
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env python
-"""git-mrb: merge remote branch.
-
-git mrb [remote:branch OR remote-branch] [onto] [upstream]
-
-remote must be locally available, and branch must exist in that remote.
-
-If 'onto' branch isn't given, default is 'master'.
-
-If 'upstream' repository isn't given, default is 'origin'.
-
-You can separate the remote and branch spec with either a : or a -.
-"""
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
-
-from subprocess import check_call
-import sys
-
-#-----------------------------------------------------------------------------
-# Functions
-#-----------------------------------------------------------------------------
-
-def sh(cmd):
-    cmd = cmd.format(**shvars)
-    print '$', cmd
-    check_call(cmd, shell=True)
-
-#-----------------------------------------------------------------------------
-# Main Script
-#-----------------------------------------------------------------------------
-
-argv = sys.argv[1:]
-narg = len(argv)
-
-try:
-    branch_spec = argv[0]
-    sep = ':' if ':' in branch_spec else '-'
-    remote, branch = branch_spec.split(':', 1)
-    if not branch:
-        raise ValueError('Branch spec %s invalid, branch not found' %
-                         branch_spec)
-except:
-    import traceback as tb
-    tb.print_exc()
-    print __doc__
-    sys.exit(1)
-
-onto = argv[1] if narg >= 2 else 'master'
-upstream = argv[1] if narg == 3 else 'origin'
-
-# Git doesn't like ':' in branch names.
-if sep == ':':
-    branch_spec = branch_spec.replace(':', '-')
-
-# Global used by sh
-shvars = dict(remote=remote, branch_spec=branch_spec, branch=branch,
-              onto=onto, upstream=upstream)
-
-# Start git calls.
-sh('git fetch {remote}')
-sh('git checkout -b {branch_spec} {onto}')
-sh('git merge {remote}/{branch}')
-
-print """
-*************************************************************
- Run test suite.  If tests pass, run the following to merge:
-
-git checkout {onto}
-git merge {branch_spec}
-git push {upstream} {onto}
-
-*************************************************************
-""".format(**shvars)
-
-ans = raw_input("Revert to master and delete temporary branch? [Y/n]: ")
-if ans.strip().lower() in ('', 'y', 'yes'):
-    sh('git checkout {onto}')
-    sh('git branch -D {branch_spec}')
diff --git a/tools/github_stats.py b/tools/github_stats.py
old mode 100755
new mode 100644
index b5976b032aa..f1a44fa69a3
--- a/tools/github_stats.py
+++ b/tools/github_stats.py
@@ -10,7 +10,6 @@
 #-----------------------------------------------------------------------------
 
 
-import codecs
 import sys
 
 from argparse import ArgumentParser
diff --git a/tools/make_tarball.py b/tools/make_tarball.py
old mode 100755
new mode 100644
diff --git a/tools/mknbindex.py b/tools/mknbindex.py
deleted file mode 100755
index 2489f7c67b0..00000000000
--- a/tools/mknbindex.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-"""Simple script to auto-generate the index of notebooks in a given directory.
-"""
-
-import glob
-import urllib
-
-notebooks = sorted(glob.glob('*.ipynb'))
-
-tpl = ( '* [{0}](http://nbviewer.ipython.org/url/github.com/ipython/ipython/'
-        'raw/master/examples/notebooks/{1})' )
-
-idx = [ 
-"""# A collection of Notebooks for using IPython effectively
-
-The following notebooks showcase multiple aspects of IPython, from its basic
-use to more advanced scenarios.  They introduce you to the use of the Notebook
-and also cover aspects of IPython that are available in other clients, such as
-the cell magics for multi-language integration or our extended display
-protocol.
-
-For beginners, we recommend that you start with the 5-part series that
-introduces the system, and later read others as the topics interest you.
-
-Once you are familiar with the notebook system, we encourage you to visit our
-[gallery](https://github.com/ipython/ipython/wiki/A-gallery-of-interesting-IPython-Notebooks)
-where you will find many more examples that cover areas from basic Python
-programming to advanced topics in scientific computing.
-"""]
-
-idx.extend(tpl.format(nb.replace('.ipynb',''), urllib.quote(nb)) 
-           for nb in notebooks)
-
-with open('README.md', 'w') as f:
-    f.write('\n'.join(idx))
-    f.write('\n')
diff --git a/tools/release b/tools/release
index 45fb7e4b2b7..29506cee5ad 100755
--- a/tools/release
+++ b/tools/release
@@ -12,7 +12,6 @@ import sys
 
 from toollib import (get_ipdir, pjoin, cd, execfile, sh, archive,
          archive_user, archive_dir)
-from gh_api import post_download
 
 # Get main ipython dir, this will raise if it doesn't pass some checks
 ipdir = get_ipdir()
@@ -53,12 +52,6 @@ if 'upload' in sys.argv:
 
     # do not upload OS specific files like .DS_Store
     to_upload = glob('*.whl')+glob('*.tar.gz')
-    for fname in to_upload:
-        # TODO: update to GitHub releases API
-        continue
-        print('uploading %s to GitHub' % fname)
-        desc = "IPython %s source distribution" % version
-        post_download("ipython/ipython", fname, description=desc)
 
     # Make target dir if it doesn't exist
     print('1. Uploading IPython to archive.ipython.org')
diff --git a/tools/update_whatsnew.py b/tools/update_whatsnew.py
old mode 100755
new mode 100644

From df3248f00a60859ed07f81e87531856b30891396 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 14:04:10 -0800
Subject: [PATCH 0981/1407] enable formatting by default

---
 IPython/terminal/interactiveshell.py | 23 +++++++++++++++++------
 setup.cfg                            |  1 +
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 2d1d593e57c..99e3c7ef9f2 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -102,10 +102,16 @@ def get_default_editor():
 _use_simple_prompt = ('IPY_TEST_SIMPLE_PROMPT' in os.environ) or (not _is_tty)
 
 def black_reformat_handler(text_before_cursor):
+    """
+    We do not need to protect against error,
+    this is taken care at a higher level where any reformat error is ignored.
+    Indeed we may call reformatting on incomplete code.
+    """
     import black
+
     formatted_text = black.format_str(text_before_cursor, mode=black.FileMode())
-    if not text_before_cursor.endswith('\n') and formatted_text.endswith('\n'):
-       formatted_text = formatted_text[:-1]
+    if not text_before_cursor.endswith("\n") and formatted_text.endswith("\n"):
+        formatted_text = formatted_text[:-1]
     return formatted_text
 
 
@@ -176,7 +182,8 @@ def debugger_cls(self):
        sequence to complete.""",
     ).tag(config=True)
 
-    autoformatter = Unicode(None,
+    autoformatter = Unicode(
+        "black",
         help="Autoformatter to reformat Terminal code. Can be `'black'` or `None`",
         allow_none=True
     ).tag(config=True)
@@ -210,9 +217,7 @@ def _editing_mode(self, change):
         if self.pt_app:
             self.pt_app.editing_mode = getattr(EditingMode, change.new.upper())
 
-    @observe('autoformatter')
-    def _autoformatter_changed(self, change):
-        formatter = change.new
+    def _set_formatter(self, formatter):
         if formatter is None:
             self.reformat_handler = lambda x:x
         elif formatter == 'black':
@@ -220,6 +225,11 @@ def _autoformatter_changed(self, change):
         else:
             raise ValueError
 
+    @observe("autoformatter")
+    def _autoformatter_changed(self, change):
+        formatter = change.new
+        self._set_formatter(formatter)
+
     @observe('highlighting_style')
     @observe('colors')
     def _highlighting_style_changed(self, change):
@@ -561,6 +571,7 @@ def __init__(self, *args, **kwargs):
         self.init_prompt_toolkit_cli()
         self.init_term_title()
         self.keep_running = True
+        self._set_formatter(self.autoformatter)
 
 
     def ask_exit(self):
diff --git a/setup.cfg b/setup.cfg
index 61fa02291ce..f0ba6cee7c4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,6 +31,7 @@ zip_safe = False
 install_requires =
     setuptools>=18.5
     jedi>=0.16
+    black
     decorator
     pickleshare
     traitlets>=5

From 74e2f69f367cc8fa1b2f4e163ceaf054363d3cde Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 15:44:11 -0800
Subject: [PATCH 0982/1407] Skip problemtic test on PyPy

---
 IPython/core/tests/test_debugger.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 75ce9fd7dcf..dae299e97c1 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -8,6 +8,7 @@
 import builtins
 import os
 import sys
+import platform
 
 from tempfile import NamedTemporaryFile
 from textwrap import dedent
@@ -16,6 +17,7 @@
 from IPython.core import debugger
 from IPython.testing import IPYTHON_TESTING_TIMEOUT_SCALE
 from IPython.testing.decorators import skip_win32
+import pytest
 
 #-----------------------------------------------------------------------------
 # Helper classes, from CPython's Pdb test suite
@@ -411,6 +413,7 @@ def test_decorator_skip():
     child.close()
 
 
+@pytest.mark.skip(platform.python_implementation() == "PyPy", reason="issues on PyPy")
 @skip_win32
 def test_decorator_skip_disabled():
     """test that decorator frame skipping can be disabled"""
@@ -438,6 +441,7 @@ def test_decorator_skip_disabled():
     child.close()
 
 
+@pytest.mark.skip(platform.python_implementation() == "PyPy", reason="issues on PyPy")
 @skip_win32
 def test_decorator_skip_with_breakpoint():
     """test that decorator frame skipping can be disabled"""

From 0837a2cb77cb5ed2aecd1004de1a0598b6f0e388 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 16:11:50 -0800
Subject: [PATCH 0983/1407] release 8.0.0a1

---
 IPython/core/release.py | 2 +-
 tools/release           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 38290a1fcb3..31365102ad5 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,7 +20,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _version_extra = ""  # Uncomment this for full releases
+_version_extra = "a1"  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]
diff --git a/tools/release b/tools/release
index 29506cee5ad..353ad5d967d 100755
--- a/tools/release
+++ b/tools/release
@@ -70,7 +70,7 @@ else:
     # Build, but don't upload
 
     # Make backup tarball
-    sh('./make_tarball.py')
+    sh('python make_tarball.py')
     sh('mv ipython-*.tgz %s' % ipbackupdir)
 
     # Build release files

From 7fb72cbc807cf1525f13f60bb730d8697f31f8d7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 16:15:35 -0800
Subject: [PATCH 0984/1407] back to dev

---
 IPython/core/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 31365102ad5..38290a1fcb3 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,7 +20,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_version_extra = "a1"  # Uncomment this for full releases
+# _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 745fc89c97a1c96a83a513d5b08668064d740399 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Dec 2021 16:20:13 -0800
Subject: [PATCH 0985/1407] 3rd attempt at 8.0.0a1

---
 .github/workflows/docs.yml |  3 ++-
 long_description.rst       | 36 ++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index de9b70a7058..96ed2172e68 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -18,10 +18,11 @@ jobs:
         sudo apt-get install graphviz
     - name: Install Python dependencies
       run: |
-        python -m pip install --upgrade pip setuptools coverage
+        python -m pip install --upgrade pip setuptools coverage rstvalidator
         pip install -r docs/requirements.txt
     - name: Build docs
       run: |
+        python -m rstvalidator long_description.rst
         python tools/fixup_whats_new_pr.py
         make -C docs/ html SPHINXOPTS="-W" \
           PYTHON="coverage run -a" \
diff --git a/long_description.rst b/long_description.rst
index f411b45720e..6fabbd207c8 100644
--- a/long_description.rst
+++ b/long_description.rst
@@ -1,37 +1,37 @@
 IPython provides a rich toolkit to help you make the most out of using Python
 interactively.  Its main components are:
 
-* A powerful interactive Python shell
-* A `Jupyter <https://jupyter.org/>`_ kernel to work with Python code in Jupyter
-notebooks and other interactive frontends.
+ * A powerful interactive Python shell
+ * A `Jupyter <https://jupyter.org/>`_ kernel to work with Python code in Jupyter
+   notebooks and other interactive frontends.
 
 The enhanced interactive Python shells have the following main features:
 
-* Comprehensive object introspection.
+ * Comprehensive object introspection.
 
-* Input history, persistent across sessions.
+ * Input history, persistent across sessions.
 
-* Caching of output results during a session with automatically generated
-references.
+ * Caching of output results during a session with automatically generated
+   references.
 
-* Extensible tab completion, with support by default for completion of python
-variables and keywords, filenames and function keywords.
+ * Extensible tab completion, with support by default for completion of python
+   variables and keywords, filenames and function keywords.
 
-* Extensible system of 'magic' commands for controlling the environment and
-performing many tasks related either to IPython or the operating system.
+ * Extensible system of 'magic' commands for controlling the environment and
+   performing many tasks related either to IPython or the operating system.
 
-* A rich configuration system with easy switching between different setups
-(simpler than changing $PYTHONSTARTUP environment variables every time).
+ * A rich configuration system with easy switching between different setups
+   (simpler than changing $PYTHONSTARTUP environment variables every time).
 
-* Session logging and reloading.
+ * Session logging and reloading.
 
-* Extensible syntax processing for special purpose situations.
+ * Extensible syntax processing for special purpose situations.
 
-* Access to the system shell with user-extensible alias system.
+ * Access to the system shell with user-extensible alias system.
 
-* Easily embeddable in other Python programs and GUIs.
+ * Easily embeddable in other Python programs and GUIs.
 
-* Integrated access to the pdb debugger and the Python profiler.
+ * Integrated access to the pdb debugger and the Python profiler.
 
 The latest development version is always available from IPython's `GitHub
 site <http://github.com/ipython>`_.

From 717198e357b30925ac050dc20e7c9f02fc59a660 Mon Sep 17 00:00:00 2001
From: sleeping <hh.sleeping@gmail.com>
Date: Sat, 11 Dec 2021 16:18:23 +0300
Subject: [PATCH 0986/1407] fix comparing nested structures containing numpy
 arrays

---
 IPython/extensions/autoreload.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index 0e43ec61fe5..816d2f35ea2 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -321,6 +321,10 @@ def update_class(old, new):
             except (AttributeError, TypeError):
                 pass
             continue
+        except ValueError:
+            # can't compare nested structures containing
+            # numpy arrays using `==`
+            pass
 
         if update_generic(old_obj, new_obj):
             continue

From 86735a37f9408b59e9d28f6e70ede2a06b23255d Mon Sep 17 00:00:00 2001
From: sleeping <hh.sleeping@gmail.com>
Date: Sat, 11 Dec 2021 17:25:23 +0300
Subject: [PATCH 0987/1407] implement test for numpy objects autoreload

---
 IPython/extensions/tests/test_autoreload.py | 33 +++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index 8cc55e7d28b..db64a5121ab 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -274,6 +274,39 @@ def power(self, p):
             with self.assertRaises(AttributeError):
                 self.shell.run_code(f"{object_name}.toto")
 
+    def test_comparing_numpy_structures(self):
+        self.shell.magic_autoreload("2")
+        mod_name, mod_fn = self.new_module(
+            textwrap.dedent(
+                """
+                                import numpy as np
+                                class MyClass:
+                                    a = (np.array((.1, .2)),
+                                         np.array((.2, .3)))
+                            """
+            )
+        )
+        self.shell.run_code("from %s import MyClass" % mod_name)
+        self.shell.run_code("first = MyClass()")
+
+        # change property `a`
+        self.write_file(
+            mod_fn,
+            textwrap.dedent(
+                """
+                                import numpy as np
+                                class MyClass:
+                                    a = (np.array((.3, .4)),
+                                         np.array((.5, .6)))
+                            """
+            ),
+        )
+
+        with tt.AssertNotPrints(
+            ("[autoreload of %s failed:" % mod_name), channel="stderr"
+        ):
+            self.shell.run_code("pass")  # trigger another reload
+
     def test_autoload_newly_added_objects(self):
         self.shell.magic_autoreload("3")
         mod_code = """

From 183753615e3f07ecf623d55a9260e8590cf21a7a Mon Sep 17 00:00:00 2001
From: sleeping <hh.sleeping@gmail.com>
Date: Sat, 11 Dec 2021 21:57:49 +0300
Subject: [PATCH 0988/1407] skip numpy autoreload test if numpy not installed

---
 IPython/extensions/tests/test_autoreload.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index db64a5121ab..65eb4a7b348 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -29,6 +29,7 @@
 
 from IPython.extensions.autoreload import AutoreloadMagics
 from IPython.core.events import EventManager, pre_run_cell
+from IPython.testing.decorators import skipif_not_numpy
 
 if platform.python_implementation() == "PyPy":
     pytest.skip(
@@ -274,6 +275,7 @@ def power(self, p):
             with self.assertRaises(AttributeError):
                 self.shell.run_code(f"{object_name}.toto")
 
+    @skipif_not_numpy
     def test_comparing_numpy_structures(self):
         self.shell.magic_autoreload("2")
         mod_name, mod_fn = self.new_module(

From 9a5fa1e7536043b4c1849ba86fa4a8fd1b8e59f0 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sat, 11 Dec 2021 22:02:56 +0300
Subject: [PATCH 0989/1407] Disable coverage collection on PyPy

Coverage collection overhead on PyPy is 330-420% (20-110% on CPython)
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e53fb5c9f1e..9c1083f43de 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -71,6 +71,6 @@ jobs:
       env:
         COLUMNS: 120
       run: |
-        pytest --color=yes -raXxs --cov --cov-report=xml
+        pytest --color=yes -raXxs ${{ startsWith(matrix.python-version, 'pypy') && ' ' || '--cov --cov-report=xml' }}
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v2

From 53b4c1c1fbeec9a8da091c3af33b925b48d3c2de Mon Sep 17 00:00:00 2001
From: Michael Tiemann <72577720+MichaelTiemannOSC@users.noreply.github.com>
Date: Sun, 12 Dec 2021 21:02:45 -0500
Subject: [PATCH 0990/1407] Update version8.rst

Fix typo (bog->big) and then reword grant information so that it reads more naturally.
---
 docs/source/whatsnew/version8.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 712c76cff42..a2579663203 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -401,8 +401,8 @@ any dependency that is not Python 3.10 compatible; that include migrating our
 test suite to pytest, and starting to remove nose. This also mean that the
 ``iptest`` command is now gone, and all testing is via pytest.
 
-This was in bog part thanks the NumFOCUS Small Developer grant, we were able to
-allocate 4000 to hire `Nikita Kniazev (@Kojoley) <https://github.com/Kojoley>`__
+This was in large part thanks to the NumFOCUS Small Developer grant, which enabled us to
+allocate \$4000 to hire `Nikita Kniazev (@Kojoley) <https://github.com/Kojoley>`,
 who did a fantastic job at updating our code base, migrating to pytest, pushing
 our coverage, and fixing a large number of bugs. I highly recommend contacting
 them if you need help with C++ and Python projects

From 9dfdf926485c10223f92f9b924930f2f47a03143 Mon Sep 17 00:00:00 2001
From: Rakessh Roshan <roshanrakesh7362@gmail.com>
Date: Mon, 13 Dec 2021 17:09:19 +0530
Subject: [PATCH 0991/1407] Fixed some errors

---
 README.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 2db6b81ffc1..ec160311665 100644
--- a/README.rst
+++ b/README.rst
@@ -149,11 +149,11 @@ Alternatives to IPython
 IPython may not be to your taste; if that's the case there might be similar
 project that you might want to use:
 
-- the classic Python REPL.
+- The classic Python REPL.
 - `bpython <https://bpython-interpreter.org/>`_
 - `mypython <https://www.asmeurer.com/mypython/>`_
-- `ptpython and ptipython <https://pypi.org/project/ptpython/>`
-- `xonsh <https://xon.sh/>`
+- `ptpython and ptipython <https://pypi.org/project/ptpython/>`_
+- `Xonsh <https://xon.sh/>`_
 
 Ignoring commits with git blame.ignoreRevsFile
 ==============================================

From 8ec0e4238365e2d013347b303ac6dd116115b8c0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 15 Dec 2021 16:57:34 +0100
Subject: [PATCH 0992/1407] try to atomically create DB

---
 IPython/core/history.py | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/IPython/core/history.py b/IPython/core/history.py
index 6ee78442bc8..41a04330b9b 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -242,18 +242,24 @@ def init_db(self):
         kwargs = dict(detect_types=sqlite3.PARSE_DECLTYPES|sqlite3.PARSE_COLNAMES)
         kwargs.update(self.connection_options)
         self.db = sqlite3.connect(str(self.hist_file), **kwargs)
-        self.db.execute("""CREATE TABLE IF NOT EXISTS sessions (session integer
-                        primary key autoincrement, start timestamp,
-                        end timestamp, num_cmds integer, remark text)""")
-        self.db.execute("""CREATE TABLE IF NOT EXISTS history
-                (session integer, line integer, source text, source_raw text,
-                PRIMARY KEY (session, line))""")
-        # Output history is optional, but ensure the table's there so it can be
-        # enabled later.
-        self.db.execute("""CREATE TABLE IF NOT EXISTS output_history
-                        (session integer, line integer, output text,
-                        PRIMARY KEY (session, line))""")
-        self.db.commit()
+        with self.db:
+            self.db.execute(
+                """CREATE TABLE IF NOT EXISTS sessions (session integer
+                            primary key autoincrement, start timestamp,
+                            end timestamp, num_cmds integer, remark text)"""
+            )
+            self.db.execute(
+                """CREATE TABLE IF NOT EXISTS history
+                    (session integer, line integer, source text, source_raw text,
+                    PRIMARY KEY (session, line))"""
+            )
+            # Output history is optional, but ensure the table's there so it can be
+            # enabled later.
+            self.db.execute(
+                """CREATE TABLE IF NOT EXISTS output_history
+                            (session integer, line integer, output text,
+                            PRIMARY KEY (session, line))"""
+            )
         # success! reset corrupt db count
         self._corrupt_db_counter = 0
 

From c7e941c70c32c5e7e8b12420f8f181b3154d6a28 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 20 Dec 2021 12:43:17 +0100
Subject: [PATCH 0993/1407] Fix case where programdata is None on windows.

Closes #13408
---
 IPython/core/application.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/application.py b/IPython/core/application.py
index 2b26d4fad82..3e2a8c9b8f8 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -34,9 +34,9 @@
 )
 
 if os.name == "nt":
-    programdata = Path(os.environ.get("PROGRAMDATA", None))
-    if programdata:
-        SYSTEM_CONFIG_DIRS = [str(programdata / "ipython")]
+    programdata = os.environ.get("PROGRAMDATA", None)
+    if programdata is not None:
+        SYSTEM_CONFIG_DIRS = [str(Path(programdata) / "ipython")]
     else:  # PROGRAMDATA is not defined by default on XP.
         SYSTEM_CONFIG_DIRS = []
 else:

From 93ab21aad5039f5af7929ecaeaa88d8559d26537 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 20 Dec 2021 13:01:03 +0100
Subject: [PATCH 0994/1407] undeprecate info

Deprecation/removal was overzealous.

Closes #13407
---
 IPython/core/oinspect.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index db2bd57892d..15f8b90783d 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -588,7 +588,7 @@ def _get_info(
             Titles or keys to omit from output (can be set, tuple, etc., anything supporting `in`)
         """
 
-        info = self._info(obj, oname=oname, info=info, detail_level=detail_level)
+        info = self.info(obj, oname=oname, info=info, detail_level=detail_level)
 
         _mime = {
             'text/plain': [],
@@ -702,15 +702,22 @@ def pinfo(
             del info['text/html']
         page.page(info)
 
-    def info(self, obj, oname="", formatter=None, info=None, detail_level=0):
-        """DEPRECATED since 5.0. Compute a dict with detailed information about an object."""
-        if formatter is not None:
-            warnings.warn('The `formatter` keyword argument to `Inspector.info`'
-                     'is deprecated as of IPython 5.0 and will have no effects.',
-                      DeprecationWarning, stacklevel=2)
-        return self._info(obj, oname=oname, info=info, detail_level=detail_level)
+    def _info(self, obj, oname="", info=None, detail_level=0):
+        """
+        Inspector.info() was likely unproperly marked as deprecated
+        while only a parameter was deprecated. We "un-deprecate" it.
+        """
+
+        warnings.warn(
+            "The `Inspector.info()` has been un-deprecated as of 8.0 and the"
+            " `formatter=` keyword removed. `Inspector._info` is now an alias."
+            " You can always call `.info()` directly.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self.info(obj, oname=oname, info=info, detail_level=detail_level)
 
-    def _info(self, obj, oname='', info=None, detail_level=0) -> dict:
+    def info(self, obj, oname="", info=None, detail_level=0) -> dict:
         """Compute a dict with detailed information about an object.
 
         Parameters

From b50ad1505d499c946d4800ab3263ed24e4bd9f1c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 21 Dec 2021 17:31:42 +0100
Subject: [PATCH 0995/1407] Apply suggestions from code review

Co-authored-by: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>
---
 IPython/core/oinspect.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 15f8b90783d..78f04b73414 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -704,14 +704,14 @@ def pinfo(
 
     def _info(self, obj, oname="", info=None, detail_level=0):
         """
-        Inspector.info() was likely unproperly marked as deprecated
+        Inspector.info() was likely improperly marked as deprecated
         while only a parameter was deprecated. We "un-deprecate" it.
         """
 
         warnings.warn(
-            "The `Inspector.info()` has been un-deprecated as of 8.0 and the"
-            " `formatter=` keyword removed. `Inspector._info` is now an alias."
-            " You can always call `.info()` directly.",
+            "The `Inspector.info()` method has been un-deprecated as of 8.0 "
+            "and the `formatter=` keyword removed. `Inspector._info` is now "
+            "an alias, and you can just call `.info()` directly.",
             DeprecationWarning,
             stacklevel=2,
         )

From c05fa383475512c08b644c5d4b2eb1f7f816d025 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 23 Dec 2021 19:14:58 +0100
Subject: [PATCH 0996/1407] typo

---
 docs/source/whatsnew/version8.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index a2579663203..629d19292fa 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -402,7 +402,7 @@ test suite to pytest, and starting to remove nose. This also mean that the
 ``iptest`` command is now gone, and all testing is via pytest.
 
 This was in large part thanks to the NumFOCUS Small Developer grant, which enabled us to
-allocate \$4000 to hire `Nikita Kniazev (@Kojoley) <https://github.com/Kojoley>`,
+allocate \$4000 to hire `Nikita Kniazev (@Kojoley) <https://github.com/Kojoley>`_,
 who did a fantastic job at updating our code base, migrating to pytest, pushing
 our coverage, and fixing a large number of bugs. I highly recommend contacting
 them if you need help with C++ and Python projects

From 965361c50c0208ed19fbc7ea116185c2dae50a21 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 24 Dec 2021 13:08:07 +0100
Subject: [PATCH 0997/1407] replace skip by skipif

---
 IPython/core/tests/test_debugger.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index dae299e97c1..d2d5bd09991 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -413,7 +413,7 @@ def test_decorator_skip():
     child.close()
 
 
-@pytest.mark.skip(platform.python_implementation() == "PyPy", reason="issues on PyPy")
+@pytest.mark.skipif(platform.python_implementation() == "PyPy", reason="issues on PyPy")
 @skip_win32
 def test_decorator_skip_disabled():
     """test that decorator frame skipping can be disabled"""
@@ -441,7 +441,7 @@ def test_decorator_skip_disabled():
     child.close()
 
 
-@pytest.mark.skip(platform.python_implementation() == "PyPy", reason="issues on PyPy")
+@pytest.mark.skipif(platform.python_implementation() == "PyPy", reason="issues on PyPy")
 @skip_win32
 def test_decorator_skip_with_breakpoint():
     """test that decorator frame skipping can be disabled"""

From 24ca69e8aeb4e3fcc340ae3ca150f5fca6c93caa Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 24 Dec 2021 13:13:06 +0100
Subject: [PATCH 0998/1407] remove some iptest legacy code.

---
 IPython/testing/decorators.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
index 6d7d9faa88c..644a513a8c3 100644
--- a/IPython/testing/decorators.py
+++ b/IPython/testing/decorators.py
@@ -190,13 +190,13 @@ def onlyif_cmds_exist(*commands):
     """
     Decorator to skip test when at least one of `commands` is not found.
     """
+    assert (
+        os.environ.get("IPTEST_WORKING_DIR", None) is None
+    ), "iptest deprecated since IPython 8.0"
     for cmd in commands:
         reason = f"This test runs only if command '{cmd}' is installed"
         if not shutil.which(cmd):
-            if os.environ.get("IPTEST_WORKING_DIR", None) is not None:
-                return skip(reason)
-            else:
-                import pytest
+            import pytest
 
-                return pytest.mark.skip(reason=reason)
+            return pytest.mark.skip(reason=reason)
     return null_deco

From bcc5119cadafc895f78c25b55d5dc0cab9feb475 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 23 Dec 2021 13:45:55 +0100
Subject: [PATCH 0999/1407] fail earlier than stackdata

---
 IPython/core/ultratb.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index e947839c530..44910b65545 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -741,6 +741,7 @@ def format_exception_as_a_whole(self, etype, evalue, etb, number_of_lines_of_con
         This may be called multiple times by Python 3 exception chaining
         (PEP 3134).
         """
+        assert etb is not None
         # some locals
         orig_etype = etype
         try:
@@ -801,12 +802,13 @@ def get_records(self, etb, number_of_lines_of_context, tb_offset):
             after=after,
             pygments_formatter=formatter,
         )
+        assert etb is not None
         return list(stack_data.FrameInfo.stack_data(etb, options=options))[tb_offset:]
 
     def structured_traceback(self, etype, evalue, etb, tb_offset=None,
                              number_of_lines_of_context=5):
         """Return a nice text document describing the traceback."""
-
+        assert etb is not None
         formatted_exception = self.format_exception_as_a_whole(etype, evalue, etb, number_of_lines_of_context,
                                                                tb_offset)
 

From dcf3bd105599440c359482e743a97ec5e46cebce Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 24 Dec 2021 18:32:48 +0100
Subject: [PATCH 1000/1407] Annotate and check typing in ultratb

---
 IPython/core/ultratb.py | 112 +++++++++++++++++++++++++++++-----------
 1 file changed, 81 insertions(+), 31 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 44910b65545..c03a6c32d3b 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -95,6 +95,8 @@
 import sys
 import time
 import traceback
+from types import TracebackType
+from typing import Tuple, List, Any, Optional
 
 import stack_data
 from pygments.formatters.terminal256 import Terminal256Formatter
@@ -130,7 +132,7 @@
 # (SyntaxErrors have to be treated specially because they have no traceback)
 
 
-def _format_traceback_lines(lines, Colors, has_colors, lvals):
+def _format_traceback_lines(lines, Colors, has_colors: bool, lvals):
     """
     Format tracebacks lines with pointing arrow, leading numbers...
 
@@ -250,21 +252,26 @@ def _set_ostream(self, val):
 
     ostream = property(_get_ostream, _set_ostream)
 
-    def get_parts_of_chained_exception(self, evalue):
-        def get_chained_exception(exception_value):
-            cause = getattr(exception_value, '__cause__', None)
-            if cause:
-                return cause
-            if getattr(exception_value, '__suppress_context__', False):
-                return None
-            return getattr(exception_value, '__context__', None)
+    @staticmethod
+    def _get_chained_exception(exception_value):
+        cause = getattr(exception_value, "__cause__", None)
+        if cause:
+            return cause
+        if getattr(exception_value, "__suppress_context__", False):
+            return None
+        return getattr(exception_value, "__context__", None)
+
+    def get_parts_of_chained_exception(
+        self, evalue
+    ) -> Optional[Tuple[type, BaseException, TracebackType]]:
 
-        chained_evalue = get_chained_exception(evalue)
+        chained_evalue = self._get_chained_exception(evalue)
 
         if chained_evalue:
             return chained_evalue.__class__, chained_evalue, chained_evalue.__traceback__
+        return None
 
-    def prepare_chained_exception_message(self, cause):
+    def prepare_chained_exception_message(self, cause) -> List[Any]:
         direct_cause = "\nThe above exception was the direct cause of the following exception:\n"
         exception_during_handling = "\nDuring handling of the above exception, another exception occurred:\n"
 
@@ -275,7 +282,7 @@ def prepare_chained_exception_message(self, cause):
         return message
 
     @property
-    def has_colors(self):
+    def has_colors(self) -> bool:
         return self.color_scheme_table.active_scheme_name.lower() != "nocolor"
 
     def set_colors(self, *args, **kw):
@@ -304,7 +311,7 @@ def stb2text(self, stb):
         """Convert a structured traceback (a list) to a string."""
         return '\n'.join(stb)
 
-    def text(self, etype, value, tb, tb_offset=None, context=5):
+    def text(self, etype, value, tb, tb_offset: Optional[int] = None, context=5):
         """Return formatted traceback.
 
         Subclasses may override this if they add extra arguments.
@@ -313,8 +320,9 @@ def text(self, etype, value, tb, tb_offset=None, context=5):
                                             tb_offset, context)
         return self.stb2text(tb_list)
 
-    def structured_traceback(self, etype, evalue, tb, tb_offset=None,
-                             context=5, mode=None):
+    def structured_traceback(
+        self, etype, evalue, tb, tb_offset: Optional[int] = None, context=5, mode=None
+    ):
         """Return a list of traceback frames.
 
         Must be implemented by each class.
@@ -357,8 +365,14 @@ def _extract_tb(self, tb):
         else:
             return None
 
-    def structured_traceback(self, etype, evalue, etb=None, tb_offset=None,
-                             context=5):
+    def structured_traceback(
+        self,
+        etype: type,
+        evalue: BaseException,
+        etb: Optional[TracebackType] = None,
+        tb_offset: Optional[int] = None,
+        context=5,
+    ):
         """Return a color formatted string with the traceback info.
 
         Parameters
@@ -367,7 +381,7 @@ def structured_traceback(self, etype, evalue, etb=None, tb_offset=None,
             Type of the exception raised.
         evalue : object
             Data stored in the exception
-        etb : object
+        etb : list | TracebackType | None
             If list: List of frames, see class docstring for details.
             If Traceback: Traceback of the exception.
         tb_offset : int, optional
@@ -394,6 +408,7 @@ def structured_traceback(self, etype, evalue, etb=None, tb_offset=None,
         else:
             elist = []
         tb_offset = self.tb_offset if tb_offset is None else tb_offset
+        assert isinstance(tb_offset, int)
         Colors = self.Colors
         out_list = []
         if elist:
@@ -594,10 +609,19 @@ class VerboseTB(TBTools):
     traceback, to be used with alternate interpreters (because their own code
     would appear in the traceback)."""
 
-    def __init__(self, color_scheme='Linux', call_pdb=False, ostream=None,
-                 tb_offset=0, long_header=False, include_vars=True,
-                 check_cache=None, debugger_cls = None,
-                 parent=None, config=None):
+    def __init__(
+        self,
+        color_scheme: str = "Linux",
+        call_pdb: bool = False,
+        ostream=None,
+        tb_offset: int = 0,
+        long_header: bool = False,
+        include_vars: bool = True,
+        check_cache=None,
+        debugger_cls=None,
+        parent=None,
+        config=None,
+    ):
         """Specify traceback offset, headers and color scheme.
 
         Define how many frames to drop from the tracebacks. Calling it with
@@ -735,7 +759,14 @@ def format_exception(self, etype, evalue):
         return ['%s%s%s: %s' % (colors.excName, etype_str,
                                 colorsnormal, py3compat.cast_unicode(evalue_str))]
 
-    def format_exception_as_a_whole(self, etype, evalue, etb, number_of_lines_of_context, tb_offset):
+    def format_exception_as_a_whole(
+        self,
+        etype: type,
+        evalue: BaseException,
+        etb: TracebackType,
+        number_of_lines_of_context,
+        tb_offset: Optional[int],
+    ):
         """Formats the header, traceback and exception message for a single exception.
 
         This may be called multiple times by Python 3 exception chaining
@@ -750,6 +781,7 @@ def format_exception_as_a_whole(self, etype, evalue, etb, number_of_lines_of_con
             pass
 
         tb_offset = self.tb_offset if tb_offset is None else tb_offset
+        assert isinstance(tb_offset, int)
         head = self.prepare_header(etype, self.long_header)
         records = self.get_records(etb, number_of_lines_of_context, tb_offset)
 
@@ -787,7 +819,9 @@ def format_exception_as_a_whole(self, etype, evalue, etb, number_of_lines_of_con
 
         return [[head] + frames + [''.join(formatted_exception[0])]]
 
-    def get_records(self, etb, number_of_lines_of_context, tb_offset):
+    def get_records(
+        self, etb: TracebackType, number_of_lines_of_context: int, tb_offset: int
+    ):
         context = number_of_lines_of_context - 1
         after = context // 2
         before = context - after
@@ -805,8 +839,14 @@ def get_records(self, etb, number_of_lines_of_context, tb_offset):
         assert etb is not None
         return list(stack_data.FrameInfo.stack_data(etb, options=options))[tb_offset:]
 
-    def structured_traceback(self, etype, evalue, etb, tb_offset=None,
-                             number_of_lines_of_context=5):
+    def structured_traceback(
+        self,
+        etype: type,
+        evalue: Optional[BaseException],
+        etb: TracebackType,
+        tb_offset: Optional[int] = None,
+        number_of_lines_of_context: int = 5,
+    ):
         """Return a nice text document describing the traceback."""
         assert etb is not None
         formatted_exception = self.format_exception_as_a_whole(etype, evalue, etb, number_of_lines_of_context,
@@ -821,6 +861,7 @@ def structured_traceback(self, etype, evalue, etb, tb_offset=None,
         formatted_exceptions = formatted_exception
         exception = self.get_parts_of_chained_exception(evalue)
         if exception:
+            assert evalue is not None
             formatted_exceptions += self.prepare_chained_exception_message(evalue.__cause__)
             etype, evalue, etb = exception
         else:
@@ -845,7 +886,7 @@ def structured_traceback(self, etype, evalue, etb, tb_offset=None,
 
         return structured_traceback_parts
 
-    def debugger(self, force=False):
+    def debugger(self, force: bool = False):
         """Call up the pdb debugger if desired, always clean up the tb
         reference.
 
@@ -879,6 +920,7 @@ def debugger(self, force=False):
                 else:
                     etb = self.tb = sys.last_traceback
                 while self.tb is not None and self.tb.tb_next is not None:
+                    assert self.tb.tb_next is not None
                     self.tb = self.tb.tb_next
                 if etb and etb.tb_next:
                     etb = etb.tb_next
@@ -924,6 +966,8 @@ class FormattedTB(VerboseTB, ListTB):
     occurs with python programs that themselves execute other python code,
     like Python shells).  """
 
+    mode: str
+
     def __init__(self, mode='Plain', color_scheme='Linux', call_pdb=False,
                  ostream=None,
                  tb_offset=0, long_header=False, include_vars=False,
@@ -970,8 +1014,7 @@ def stb2text(self, stb):
         """Convert a structured traceback (a list) to a string."""
         return self.tb_join_char.join(stb)
 
-
-    def set_mode(self, mode=None):
+    def set_mode(self, mode: Optional[str] = None):
         """Switch to the desired mode.
 
         If mode is not specified, cycles through the available modes."""
@@ -981,9 +1024,12 @@ def set_mode(self, mode=None):
                       len(self.valid_modes)
             self.mode = self.valid_modes[new_idx]
         elif mode not in self.valid_modes:
-            raise ValueError('Unrecognized mode in FormattedTB: <' + mode + '>\n'
-                                                                            'Valid modes: ' + str(self.valid_modes))
+            raise ValueError(
+                "Unrecognized mode in FormattedTB: <" + mode + ">\n"
+                "Valid modes: " + str(self.valid_modes)
+            )
         else:
+            assert isinstance(mode, str)
             self.mode = mode
         # include variable details only in 'Verbose' mode
         self.include_vars = (self.mode == self.valid_modes[2])
@@ -1045,6 +1091,10 @@ def __call__(self, etype=None, evalue=None, etb=None,
 
     def structured_traceback(self, etype=None, value=None, tb=None,
                              tb_offset=None, number_of_lines_of_context=5):
+
+        etype: type
+        value: BaseException
+        # tb: TracebackType or tupleof tb types ?
         if etype is None:
             etype, value, tb = sys.exc_info()
         if isinstance(tb, tuple):

From ae7096758940c61197914c5bcfe1da1ae208a49e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 24 Dec 2021 18:50:22 +0100
Subject: [PATCH 1001/1407] docstring fixes

---
 IPython/core/inputtransformer.py |  7 +++++--
 IPython/core/magics/namespace.py | 16 ++++++++++------
 IPython/core/oinspect.py         |  4 ++--
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/IPython/core/inputtransformer.py b/IPython/core/inputtransformer.py
index 2fcf7eeb5fc..f668f466aae 100644
--- a/IPython/core/inputtransformer.py
+++ b/IPython/core/inputtransformer.py
@@ -407,8 +407,11 @@ def _strip_prompts(prompt_re, initial_re=None, turnoff_re=None):
         If no initial expression is given, prompt_re will be used everywhere.
         Used mainly for plain Python prompts, where the continuation prompt
         ``...`` is a valid Python expression in Python 3, so shouldn't be stripped.
-    If initial_re and prompt_re differ,
-    only initial_re will be tested against the first line.
+
+    Notes
+    -----
+    If `initial_re` and `prompt_re differ`,
+    only `initial_re` will be tested against the first line.
     If any prompt is found on the first two lines,
     prompts will be stripped from the rest of the block.
     """
diff --git a/IPython/core/magics/namespace.py b/IPython/core/magics/namespace.py
index 426c3b8f341..c86d3de9b65 100644
--- a/IPython/core/magics/namespace.py
+++ b/IPython/core/magics/namespace.py
@@ -483,9 +483,9 @@ def reset(self, parameter_s=''):
         Parameters
         ----------
         -f
-           force reset without asking for confirmation.
+            force reset without asking for confirmation.
         -s
-           'Soft' reset: Only clears your namespace, leaving history intact.
+            'Soft' reset: Only clears your namespace, leaving history intact.
             References to objects may be kept. By default (without this option),
             we do a 'hard' reset, giving you a new session and removing all
             references to objects from the current session.
@@ -494,10 +494,14 @@ def reset(self, parameter_s=''):
             may allow you to reimport Python modules that have been updated and
             pick up changes, but can have unattended consequences.
 
-        in : reset input history
-        out : reset output history
-        dhist : reset directory history
-        array : reset only variables that are NumPy arrays
+        in
+            reset input history
+        out
+            reset output history
+        dhist
+            reset directory history
+        array
+            reset only variables that are NumPy arrays
 
         See Also
         --------
diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 78f04b73414..0096b9c9441 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -577,10 +577,10 @@ def _get_info(
         ----------
         obj : any
             Object to inspect and return info from
-        oname: str (default: ''):
+        oname : str (default: ''):
             Name of the variable pointing to `obj`.
         formatter : callable
-        info:
+        info
             already computed information
         detail_level : integer
             Granularity of detail level, if set to 1, give more information.

From 52f30d25fc6f863971cc18fc9907dcc577b44254 Mon Sep 17 00:00:00 2001
From: Bastian Ebeling <bastian.ebeling@web.de>
Date: Mon, 17 May 2021 09:16:40 +0200
Subject: [PATCH 1002/1407] use time.process_time instead of perf_counter

changed windows timing to using time.process_time instead of time.perf_counter to be aware of sleep.
Further enabled display of total cpu-time on windows (as now differs from WALL)
---
 IPython/core/magics/execution.py              | 25 +++++++++++--------
 IPython/utils/timing.py                       |  8 +++---
 docs/source/whatsnew/development.rst          |  2 ++
 .../source/whatsnew/pr/12984-process-time.rst |  6 +++++
 4 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 docs/source/whatsnew/pr/12984-process-time.rst

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 419eb320b7a..7e0b5c397ca 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -1326,19 +1326,22 @@ def time(self,line='', cell=None, local_ns=None):
 
         wall_end = wtime()
         # Compute actual times and report
-        wall_time = wall_end-wall_st
-        cpu_user = end[0]-st[0]
-        cpu_sys = end[1]-st[1]
-        cpu_tot = cpu_user+cpu_sys
-        # On windows cpu_sys is always zero, so no new information to the next print 
-        if sys.platform != 'win32':
-            print("CPU times: user %s, sys: %s, total: %s" % \
-                (_format_time(cpu_user),_format_time(cpu_sys),_format_time(cpu_tot)))
-        print("Wall time: %s" % _format_time(wall_time))
+        wall_time = wall_end - wall_st
+        cpu_user = end[0] - st[0]
+        cpu_sys = end[1] - st[1]
+        cpu_tot = cpu_user + cpu_sys
+        # On windows cpu_sys is always zero, so only total is displayed
+        if sys.platform != "win32":
+            print(
+                f"CPU times: user {_format_time(cpu_user)}, sys: {_format_time(cpu_sys)}, total: {_format_time(cpu_tot)}"
+            )
+        else:
+            print(f"CPU times: total: {_format_time(cpu_tot)}")
+        print(f"Wall time: {_format_time(wall_time)}")
         if tc > tc_min:
-            print("Compiler : %s" % _format_time(tc))
+            print(f"Compiler : {_format_time(tc)}")
         if tp > tp_min:
-            print("Parser   : %s" % _format_time(tp))
+            print(f"Parser   : {_format_time(tp)}")
         return out
 
     @skip_doctest
diff --git a/IPython/utils/timing.py b/IPython/utils/timing.py
index c20b5c9f8c6..3a181ae7288 100644
--- a/IPython/utils/timing.py
+++ b/IPython/utils/timing.py
@@ -64,14 +64,14 @@ def clock2():
 
 else:
     # There is no distinction of user/system time under windows, so we just use
-    # time.perff_counter() for everything...
-    clocku = clocks = clock = time.perf_counter
+    # time.process_time() for everything...
+    clocku = clocks = clock = time.process_time
 
     def clock2():
         """Under windows, system CPU time can't be measured.
 
-        This just returns perf_counter() and zero."""
-        return time.perf_counter(),0.0
+        This just returns process_time() and zero."""
+        return time.process_time(), 0.0
 
     
 def timings_out(reps,func,*args,**kw):
diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 0f628a7b0e3..502b0e0bbab 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -23,6 +23,8 @@ Need to be updated:
    pr/*
 
 
+
+
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 
 Backwards incompatible changes
diff --git a/docs/source/whatsnew/pr/12984-process-time.rst b/docs/source/whatsnew/pr/12984-process-time.rst
new file mode 100644
index 00000000000..9957d5394b5
--- /dev/null
+++ b/docs/source/whatsnew/pr/12984-process-time.rst
@@ -0,0 +1,6 @@
+windows time-implementation: Switch to process_time
+===================================================
+Timing for example with ``%%time`` on windows is based on ``time.perf_counter``.
+This is at the end the same as W-All.
+To be a bit tighter to linux one could change to ``time.process_time`` instead.
+Thus for example one would no longer count periods of sleep and further.

From 6c8f2e1b9346d59114247de6b216e04e079d446e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 25 Dec 2021 11:45:48 +0100
Subject: [PATCH 1003/1407] Mark source parameter of publish_display_data.

Closes #13365
---
 IPython/core/display_functions.py             | 19 ++++++++++++++++++-
 .../terminal/tests/test_interactivshell.py    |  8 ++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/IPython/core/display_functions.py b/IPython/core/display_functions.py
index aab2b7e71be..567cf3fa609 100644
--- a/IPython/core/display_functions.py
+++ b/IPython/core/display_functions.py
@@ -8,6 +8,7 @@
 from binascii import b2a_hex
 import os
 import sys
+import warnings
 
 __all__ = ['display', 'clear_output', 'publish_display_data', 'update_display', 'DisplayHandle']
 
@@ -33,9 +34,17 @@ def _merge(d1, d2):
 # Main functions
 #-----------------------------------------------------------------------------
 
+class _Sentinel:
+    def __repr__(self):
+        return "<deprecated>"
+
+
+_sentinel = _Sentinel()
 
 # use * to indicate transient is keyword-only
-def publish_display_data(data, metadata=None, source=None, *, transient=None, **kwargs):
+def publish_display_data(
+    data, metadata=None, source=_sentinel, *, transient=None, **kwargs
+):
     """Publish data and metadata to all frontends.
 
     See the ``display_data`` message in the messaging documentation for
@@ -65,6 +74,14 @@ def publish_display_data(data, metadata=None, source=None, *, transient=None, **
     """
     from IPython.core.interactiveshell import InteractiveShell
 
+    if source is not _sentinel:
+        warnings.warn(
+            "The `source` parameter emit a  deprecation warning since"
+            " IPython 8.0, it had no effects for a long time and will "
+            " be removed in future versions.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
     display_pub = InteractiveShell.instance().display_pub
 
     # only pass transient if supplied,
diff --git a/IPython/terminal/tests/test_interactivshell.py b/IPython/terminal/tests/test_interactivshell.py
index 7a06cc3858b..42b73c4358a 100644
--- a/IPython/terminal/tests/test_interactivshell.py
+++ b/IPython/terminal/tests/test_interactivshell.py
@@ -191,13 +191,14 @@ def _repr_html_(self):
         class Test2(Test):
             def _ipython_display_(self):
                 from IPython.display import display, HTML
-                display(HTML('<custom>'))
+
+                display(HTML("<custom>"))
 
         # verify that mimehandlers are called
         called = False
 
         def handler(data, metadata):
-            print('Handler called')
+            print("Handler called")
             nonlocal called
             called = True
 
@@ -205,12 +206,11 @@ def handler(data, metadata):
         ip.display_formatter.formatters["text/html"].enabled = True
         ip.mime_renderers["text/html"] = handler
 
-
         obj = Test()
         display(obj)
 
         assert called == True
-        
+
 
 def syntax_error_transformer(lines):
     """Transformer that throws SyntaxError if 'syntaxerror' is in the code."""

From c3bb40dfc0bb1bd962529a767f8942e43d84a35f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 25 Dec 2021 16:23:29 +0100
Subject: [PATCH 1004/1407] Fix bug introduced by merging #12315

---
 IPython/terminal/tests/test_interactivshell.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/IPython/terminal/tests/test_interactivshell.py b/IPython/terminal/tests/test_interactivshell.py
index 42b73c4358a..68dbe372d91 100644
--- a/IPython/terminal/tests/test_interactivshell.py
+++ b/IPython/terminal/tests/test_interactivshell.py
@@ -205,9 +205,12 @@ def handler(data, metadata):
         ip.display_formatter.active_types.append("text/html")
         ip.display_formatter.formatters["text/html"].enabled = True
         ip.mime_renderers["text/html"] = handler
-
-        obj = Test()
-        display(obj)
+        try:
+            obj = Test()
+            display(obj)
+        finally:
+            ip.display_formatter.formatters["text/html"].enabled = False
+            del ip.mime_renderers["text/html"]
 
         assert called == True
 

From 0ccc61f82d196628846abe1603b0b05bcabe66fc Mon Sep 17 00:00:00 2001
From: Martin Skarzynski <marskar@gmail.com>
Date: Fri, 2 Oct 2020 23:32:42 -0400
Subject: [PATCH 1005/1407] implement auto_match brackets and quotes based on
 randy3k/radian/

---
 IPython/terminal/shortcuts.py | 114 ++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 75faaa56c3d..2c9190e48cc 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -85,6 +85,120 @@ def reformat_and_execute(event):
 
     kb.add('f2', filter=has_focus(DEFAULT_BUFFER))(open_input_in_editor)
 
+    focused_insert = (vi_insert_mode | emacs_insert_mode) & has_focus(DEFAULT_BUFFER)
+    _preceding_text_cache = {}
+    _following_text_cache = {}
+
+
+    def preceding_text(pattern):
+        try:
+            return _preceding_text_cache[pattern]
+        except KeyError:
+            pass
+        m = re.compile(pattern)
+
+        def _preceding_text():
+            app = get_app()
+            return bool(m.match(app.current_buffer.document.current_line_before_cursor))
+
+        condition = Condition(_preceding_text)
+        _preceding_text_cache[pattern] = condition
+        return condition
+
+
+    def following_text(pattern):
+        try:
+            return _following_text_cache[pattern]
+        except KeyError:
+            pass
+        m = re.compile(pattern)
+
+        def _following_text():
+            app = get_app()
+            return bool(m.match(app.current_buffer.document.current_line_after_cursor))
+
+        condition = Condition(_following_text)
+        _following_text_cache[pattern] = condition
+        return condition
+
+
+    # auto match
+    @kb.add('(', filter=focused_insert & following_text(r"[,)}\]]|$"))
+    def _(event):
+        event.current_buffer.insert_text("()")
+        event.current_buffer.cursor_left()
+
+    @kb.add('[', filter=focused_insert & following_text(r"[,)}\]]|$"))
+    def _(event):
+        event.current_buffer.insert_text("[]")
+        event.current_buffer.cursor_left()
+
+    @kb.add('{', filter=focused_insert & following_text(r"[,)}\]]|$"))
+    def _(event):
+        event.current_buffer.insert_text("{}")
+        event.current_buffer.cursor_left()
+
+    @kb.add('"', filter=focused_insert & following_text(r"[,)}\]]|$"))
+    def _(event):
+        event.current_buffer.insert_text('""')
+        event.current_buffer.cursor_left()
+
+    @kb.add("'", filter=focused_insert & following_text(r"[,)}\]]|$"))
+    def _(event):
+        event.current_buffer.insert_text("''")
+        event.current_buffer.cursor_left()
+
+    # raw string
+    @kb.add('(', filter=focused_insert & preceding_text(r".*(r|R)[\"'](-*)$"))
+    def _(event):
+        matches = re.match(r".*(r|R)[\"'](-*)", event.current_buffer.document.current_line_before_cursor)
+        dashes = matches.group(2) or ""
+        event.current_buffer.insert_text("()" + dashes)
+        event.current_buffer.cursor_left(len(dashes) + 1)
+
+    @kb.add('[', filter=focused_insert & preceding_text(r".*(r|R)[\"'](-*)$"))
+    def _(event):
+        matches = re.match(r".*(r|R)[\"'](-*)", event.current_buffer.document.current_line_before_cursor)
+        dashes = matches.group(2) or ""
+        event.current_buffer.insert_text("[]" + dashes)
+        event.current_buffer.cursor_left(len(dashes) + 1)
+
+    @kb.add('{', filter=focused_insert & preceding_text(r".*(r|R)[\"'](-*)$"))
+    def _(event):
+        matches = re.match(r".*(r|R)[\"'](-*)", event.current_buffer.document.current_line_before_cursor)
+        dashes = matches.group(2) or ""
+        event.current_buffer.insert_text("{}" + dashes)
+        event.current_buffer.cursor_left(len(dashes) + 1)
+
+    @kb.add('"', filter=focused_insert & preceding_text(r".*(r|R)$"))
+    def _(event):
+        event.current_buffer.insert_text('""')
+        event.current_buffer.cursor_left()
+
+    @kb.add("'", filter=focused_insert & preceding_text(r".*(r|R)$"))
+    def _(event):
+        event.current_buffer.insert_text("''")
+        event.current_buffer.cursor_left()
+
+    # just move cursor
+    @kb.add(')', filter=focused_insert & following_text(r"^\)"))
+    @kb.add(']', filter=focused_insert & following_text(r"^\]"))
+    @kb.add('}', filter=focused_insert & following_text(r"^\}"))
+    @kb.add('"', filter=focused_insert & following_text("^\""))
+    @kb.add("'", filter=focused_insert & following_text("^'"))
+    def _(event):
+        event.current_buffer.cursor_right()
+
+    @kb.add('backspace', filter=focused_insert & preceding_text(r".*\($") & following_text(r"^\)"))
+    @kb.add('backspace', filter=focused_insert & preceding_text(r".*\[$") & following_text(r"^\]"))
+    @kb.add('backspace', filter=focused_insert & preceding_text(r".*\{$") & following_text(r"^\}"))
+    @kb.add('backspace', filter=focused_insert & preceding_text('.*"$') & following_text('^"'))
+    @kb.add('backspace', filter=focused_insert & preceding_text(r".*'$") & following_text(r"^'"))
+    def _(event):
+        event.current_buffer.delete()
+        event.current_buffer.delete_before_cursor()
+
+
     if shell.display_completions == 'readlinelike':
         kb.add('c-i', filter=(has_focus(DEFAULT_BUFFER)
                               & ~has_selection

From 916d39c057bec024c9e7548f1589f6adf3045dba Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 12 Oct 2020 17:59:28 -0700
Subject: [PATCH 1006/1407] autoreformat

---
 IPython/terminal/shortcuts.py | 80 +++++++++++++++++++++++------------
 1 file changed, 52 insertions(+), 28 deletions(-)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 2c9190e48cc..360a3935207 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -89,7 +89,6 @@ def reformat_and_execute(event):
     _preceding_text_cache = {}
     _following_text_cache = {}
 
-
     def preceding_text(pattern):
         try:
             return _preceding_text_cache[pattern]
@@ -105,7 +104,6 @@ def _preceding_text():
         _preceding_text_cache[pattern] = condition
         return condition
 
-
     def following_text(pattern):
         try:
             return _following_text_cache[pattern]
@@ -121,19 +119,18 @@ def _following_text():
         _following_text_cache[pattern] = condition
         return condition
 
-
     # auto match
-    @kb.add('(', filter=focused_insert & following_text(r"[,)}\]]|$"))
+    @kb.add("(", filter=focused_insert & following_text(r"[,)}\]]|$"))
     def _(event):
         event.current_buffer.insert_text("()")
         event.current_buffer.cursor_left()
 
-    @kb.add('[', filter=focused_insert & following_text(r"[,)}\]]|$"))
+    @kb.add("[", filter=focused_insert & following_text(r"[,)}\]]|$"))
     def _(event):
         event.current_buffer.insert_text("[]")
         event.current_buffer.cursor_left()
 
-    @kb.add('{', filter=focused_insert & following_text(r"[,)}\]]|$"))
+    @kb.add("{", filter=focused_insert & following_text(r"[,)}\]]|$"))
     def _(event):
         event.current_buffer.insert_text("{}")
         event.current_buffer.cursor_left()
@@ -149,23 +146,32 @@ def _(event):
         event.current_buffer.cursor_left()
 
     # raw string
-    @kb.add('(', filter=focused_insert & preceding_text(r".*(r|R)[\"'](-*)$"))
+    @kb.add("(", filter=focused_insert & preceding_text(r".*(r|R)[\"'](-*)$"))
     def _(event):
-        matches = re.match(r".*(r|R)[\"'](-*)", event.current_buffer.document.current_line_before_cursor)
+        matches = re.match(
+            r".*(r|R)[\"'](-*)",
+            event.current_buffer.document.current_line_before_cursor,
+        )
         dashes = matches.group(2) or ""
         event.current_buffer.insert_text("()" + dashes)
         event.current_buffer.cursor_left(len(dashes) + 1)
 
-    @kb.add('[', filter=focused_insert & preceding_text(r".*(r|R)[\"'](-*)$"))
+    @kb.add("[", filter=focused_insert & preceding_text(r".*(r|R)[\"'](-*)$"))
     def _(event):
-        matches = re.match(r".*(r|R)[\"'](-*)", event.current_buffer.document.current_line_before_cursor)
+        matches = re.match(
+            r".*(r|R)[\"'](-*)",
+            event.current_buffer.document.current_line_before_cursor,
+        )
         dashes = matches.group(2) or ""
         event.current_buffer.insert_text("[]" + dashes)
         event.current_buffer.cursor_left(len(dashes) + 1)
 
-    @kb.add('{', filter=focused_insert & preceding_text(r".*(r|R)[\"'](-*)$"))
+    @kb.add("{", filter=focused_insert & preceding_text(r".*(r|R)[\"'](-*)$"))
     def _(event):
-        matches = re.match(r".*(r|R)[\"'](-*)", event.current_buffer.document.current_line_before_cursor)
+        matches = re.match(
+            r".*(r|R)[\"'](-*)",
+            event.current_buffer.document.current_line_before_cursor,
+        )
         dashes = matches.group(2) or ""
         event.current_buffer.insert_text("{}" + dashes)
         event.current_buffer.cursor_left(len(dashes) + 1)
@@ -181,30 +187,48 @@ def _(event):
         event.current_buffer.cursor_left()
 
     # just move cursor
-    @kb.add(')', filter=focused_insert & following_text(r"^\)"))
-    @kb.add(']', filter=focused_insert & following_text(r"^\]"))
-    @kb.add('}', filter=focused_insert & following_text(r"^\}"))
-    @kb.add('"', filter=focused_insert & following_text("^\""))
+    @kb.add(")", filter=focused_insert & following_text(r"^\)"))
+    @kb.add("]", filter=focused_insert & following_text(r"^\]"))
+    @kb.add("}", filter=focused_insert & following_text(r"^\}"))
+    @kb.add('"', filter=focused_insert & following_text('^"'))
     @kb.add("'", filter=focused_insert & following_text("^'"))
     def _(event):
         event.current_buffer.cursor_right()
 
-    @kb.add('backspace', filter=focused_insert & preceding_text(r".*\($") & following_text(r"^\)"))
-    @kb.add('backspace', filter=focused_insert & preceding_text(r".*\[$") & following_text(r"^\]"))
-    @kb.add('backspace', filter=focused_insert & preceding_text(r".*\{$") & following_text(r"^\}"))
-    @kb.add('backspace', filter=focused_insert & preceding_text('.*"$') & following_text('^"'))
-    @kb.add('backspace', filter=focused_insert & preceding_text(r".*'$") & following_text(r"^'"))
+    @kb.add(
+        "backspace",
+        filter=focused_insert & preceding_text(r".*\($") & following_text(r"^\)"),
+    )
+    @kb.add(
+        "backspace",
+        filter=focused_insert & preceding_text(r".*\[$") & following_text(r"^\]"),
+    )
+    @kb.add(
+        "backspace",
+        filter=focused_insert & preceding_text(r".*\{$") & following_text(r"^\}"),
+    )
+    @kb.add(
+        "backspace",
+        filter=focused_insert & preceding_text('.*"$') & following_text('^"'),
+    )
+    @kb.add(
+        "backspace",
+        filter=focused_insert & preceding_text(r".*'$") & following_text(r"^'"),
+    )
     def _(event):
         event.current_buffer.delete()
         event.current_buffer.delete_before_cursor()
 
-
-    if shell.display_completions == 'readlinelike':
-        kb.add('c-i', filter=(has_focus(DEFAULT_BUFFER)
-                              & ~has_selection
-                              & insert_mode
-                              & ~cursor_in_leading_ws
-                        ))(display_completions_like_readline)
+    if shell.display_completions == "readlinelike":
+        kb.add(
+            "c-i",
+            filter=(
+                has_focus(DEFAULT_BUFFER)
+                & ~has_selection
+                & insert_mode
+                & ~cursor_in_leading_ws
+            ),
+        )(display_completions_like_readline)
 
     if sys.platform == "win32":
         kb.add("c-v", filter=(has_focus(DEFAULT_BUFFER) & ~vi_mode))(win_paste)

From 33a45993391bc55cf1f69ddea9b649e17f3c63bc Mon Sep 17 00:00:00 2001
From: Martin Skarzynski <marskar@gmail.com>
Date: Sun, 26 Dec 2021 12:03:04 +0100
Subject: [PATCH 1007/1407] Add setting to toggle auto_match feature

---
 IPython/terminal/interactiveshell.py |  9 +++++
 IPython/terminal/shortcuts.py        | 49 +++++++++++++++++++---------
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 5c79a17c5e1..98e5eb855a6 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -188,6 +188,15 @@ def debugger_cls(self):
         allow_none=True
     ).tag(config=True)
 
+    auto_match = Bool(
+        False,
+        help="""
+        Automatically add/delete closing bracket or quote when opening bracket or quote is entered/deleted.
+        Brackets: (), [], {}
+        Quotes: '', \"\"
+        """,
+    ).tag(config=True)
+
     mouse_support = Bool(False,
         help="Enable mouse support in the prompt\n(Note: prevents selecting text with the mouse)"
     ).tag(config=True)
diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 360a3935207..6aab3d2c568 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -85,6 +85,10 @@ def reformat_and_execute(event):
 
     kb.add('f2', filter=has_focus(DEFAULT_BUFFER))(open_input_in_editor)
 
+    @Condition
+    def auto_match():
+        return shell.auto_match
+
     focused_insert = (vi_insert_mode | emacs_insert_mode) & has_focus(DEFAULT_BUFFER)
     _preceding_text_cache = {}
     _following_text_cache = {}
@@ -120,27 +124,27 @@ def _following_text():
         return condition
 
     # auto match
-    @kb.add("(", filter=focused_insert & following_text(r"[,)}\]]|$"))
+    @kb.add("(", filter=focused_insert & auto_match & following_text(r"[,)}\]]|$"))
     def _(event):
         event.current_buffer.insert_text("()")
         event.current_buffer.cursor_left()
 
-    @kb.add("[", filter=focused_insert & following_text(r"[,)}\]]|$"))
+    @kb.add("[", filter=focused_insert & auto_match & following_text(r"[,)}\]]|$"))
     def _(event):
         event.current_buffer.insert_text("[]")
         event.current_buffer.cursor_left()
 
-    @kb.add("{", filter=focused_insert & following_text(r"[,)}\]]|$"))
+    @kb.add("{", filter=focused_insert & auto_match & following_text(r"[,)}\]]|$"))
     def _(event):
         event.current_buffer.insert_text("{}")
         event.current_buffer.cursor_left()
 
-    @kb.add('"', filter=focused_insert & following_text(r"[,)}\]]|$"))
+    @kb.add('"', filter=focused_insert & auto_match & following_text(r"[,)}\]]|$"))
     def _(event):
         event.current_buffer.insert_text('""')
         event.current_buffer.cursor_left()
 
-    @kb.add("'", filter=focused_insert & following_text(r"[,)}\]]|$"))
+    @kb.add("'", filter=focused_insert & auto_match & following_text(r"[,)}\]]|$"))
     def _(event):
         event.current_buffer.insert_text("''")
         event.current_buffer.cursor_left()
@@ -187,33 +191,48 @@ def _(event):
         event.current_buffer.cursor_left()
 
     # just move cursor
-    @kb.add(")", filter=focused_insert & following_text(r"^\)"))
-    @kb.add("]", filter=focused_insert & following_text(r"^\]"))
-    @kb.add("}", filter=focused_insert & following_text(r"^\}"))
-    @kb.add('"', filter=focused_insert & following_text('^"'))
-    @kb.add("'", filter=focused_insert & following_text("^'"))
+    @kb.add(")", filter=focused_insert & auto_match & following_text(r"^\)"))
+    @kb.add("]", filter=focused_insert & auto_match & following_text(r"^\]"))
+    @kb.add("}", filter=focused_insert & auto_match & following_text(r"^\}"))
+    @kb.add('"', filter=focused_insert & auto_match & following_text('^"'))
+    @kb.add("'", filter=focused_insert & auto_match & following_text("^'"))
     def _(event):
         event.current_buffer.cursor_right()
 
     @kb.add(
         "backspace",
-        filter=focused_insert & preceding_text(r".*\($") & following_text(r"^\)"),
+        filter=focused_insert
+        & preceding_text(r".*\($")
+        & auto_match
+        & following_text(r"^\)"),
     )
     @kb.add(
         "backspace",
-        filter=focused_insert & preceding_text(r".*\[$") & following_text(r"^\]"),
+        filter=focused_insert
+        & preceding_text(r".*\[$")
+        & auto_match
+        & following_text(r"^\]"),
     )
     @kb.add(
         "backspace",
-        filter=focused_insert & preceding_text(r".*\{$") & following_text(r"^\}"),
+        filter=focused_insert
+        & preceding_text(r".*\{$")
+        & auto_match
+        & following_text(r"^\}"),
     )
     @kb.add(
         "backspace",
-        filter=focused_insert & preceding_text('.*"$') & following_text('^"'),
+        filter=focused_insert
+        & preceding_text('.*"$')
+        & auto_match
+        & following_text('^"'),
     )
     @kb.add(
         "backspace",
-        filter=focused_insert & preceding_text(r".*'$") & following_text(r"^'"),
+        filter=focused_insert
+        & preceding_text(r".*'$")
+        & auto_match
+        & following_text(r"^'"),
     )
     def _(event):
         event.current_buffer.delete()

From fd88413586280569b6077b5e49ef0097b061a03e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 26 Dec 2021 17:45:18 +0100
Subject: [PATCH 1008/1407] update whats new

---
 docs/source/whatsnew/version8.rst | 135 ++++++++++++++++++++----------
 1 file changed, 91 insertions(+), 44 deletions(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 629d19292fa..f4edfbd944c 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -96,10 +96,48 @@ features contributed by QuantStack (with respect to debugger protocol, and Xeus
 Python), as well as many debugger features that I was please to implement as
 part of my work at QuanSight and Sponsored by DE Shaw.
 
-Better Tracebacks
-~~~~~~~~~~~~~~~~~
+Traceback improvements
+~~~~~~~~~~~~~~~~~~~~~~
+
+Previously, error tracebacks for errors happening in code cells were showing a
+hash, the one used for compiling the Python AST::
 
-The first on is the integration of the ``stack_data`` package;
+    In [1]: def foo():
+    ...:     return 3 / 0
+    ...:
+
+    In [2]: foo()
+    ---------------------------------------------------------------------------
+    ZeroDivisionError                         Traceback (most recent call last)
+    <ipython-input-2-c19b6d9633cf> in <module>
+    ----> 1 foo()
+
+    <ipython-input-1-1595a74c32d5> in foo()
+        1 def foo():
+    ----> 2     return 3 / 0
+        3
+
+    ZeroDivisionError: division by zero
+
+The error traceback is now correctly formatted, showing the cell number in which the error happened::
+
+    In [1]: def foo():
+    ...:     return 3 / 0
+    ...:
+
+    Input In [2]: foo()
+    ---------------------------------------------------------------------------
+    ZeroDivisionError                         Traceback (most recent call last)
+    input In [2], in <module>
+    ----> 1 foo()
+
+    Input In [1], in foo()
+        1 def foo():
+    ----> 2     return 3 / 0
+
+    ZeroDivisionError: division by zero
+
+The Second on is the integration of the ``stack_data`` package;
 which provide smarter informations in traceback; in particular it will highlight
 the AST node where an error occurs which can help to quickly narrow down errors.
 
@@ -143,6 +181,24 @@ IPython 8.0 is capable of telling you, where the index error occurs::
 Corresponding location marked here with ``^`` will show up highlighted in 
 terminal and notebooks.
 
+The Third, which is the most discreet but can have a high impact on
+productivity, a colon ``::`` and line number is appended after a filename in
+traceback::
+
+
+    ZeroDivisionError               Traceback (most recent call last)
+    File ~/error.py:4, in <module>
+          1 def f():
+          2     1/0
+    ----> 4 f()
+
+    File ~/error.py:2, in f()
+          1 def f():
+    ----> 2     1/0
+
+Many terminal and editor have integrations allow to directly jump to the
+relevant file/line when this syntax is used.
+
 
 Autosuggestons
 ~~~~~~~~~~~~~~
@@ -246,7 +302,14 @@ Try ``%autoreload 3`` in an IPython session after running ``%load_ext autoreload
 
 For more information please see the following unit test : ``extensions/tests/test_autoreload.py:test_autoload_newly_added_objects``
 
+Auto formatting with black in the CLI
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If ``black`` is installed in the same environment as IPython, terminal IPython
+will now *by default*  reformat the code in the CLI when possible. You can
+disable this with ``--TerminalInteractiveShell.autoformatter=None``.
 
+This feature was present in 7.x but disabled by default.
 
 
 History Range Glob feature
@@ -333,53 +396,29 @@ included).
 
 Therefore it is now possible to save the whole history to a file using simple
 ``%save <filename>``, load and edit it using ``%load`` (makes for a nice usage
-when followed with :kbd:`F2`), send it to dpaste.org using ``%pastebin``, or
-view the whole thing syntax-highlighted with a single ``%pycat``.
+when followed with :kbd:`F2`), send it to `dpaste.org <http://dpast.org>`_ using
+``%pastebin``, or view the whole thing syntax-highlighted with a single
+``%pycat``.
 
-Traceback improvements
-~~~~~~~~~~~~~~~~~~~~~~
 
+Windows time-implementation: Switch to process_time
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Timing for example with ``%%time`` on windows is based on ``time.perf_counter``.
+This is at the end the same as W-All.
+To be a bit tighter to linux one could change to ``time.process_time`` instead.
+Thus for example one would no longer count periods of sleep and further.
 
-Previously, error tracebacks for errors happening in code cells were showing a hash, the one used for compiling the Python AST::
-
-    In [1]: def foo():
-    ...:     return 3 / 0
-    ...:
-
-    In [2]: foo()
-    ---------------------------------------------------------------------------
-    ZeroDivisionError                         Traceback (most recent call last)
-    <ipython-input-2-c19b6d9633cf> in <module>
-    ----> 1 foo()
-
-    <ipython-input-1-1595a74c32d5> in foo()
-        1 def foo():
-    ----> 2     return 3 / 0
-        3
-
-    ZeroDivisionError: division by zero
-
-The error traceback is now correctly formatted, showing the cell number in which the error happened::
-
-    In [1]: def foo():
-    ...:     return 3 / 0
-    ...:
-
-    Input In [2]: foo()
-    ---------------------------------------------------------------------------
-    ZeroDivisionError                         Traceback (most recent call last)
-    input In [2], in <module>
-    ----> 1 foo()
-
-    Input In [1], in foo()
-        1 def foo():
-    ----> 2     return 3 / 0
-
-    ZeroDivisionError: division by zero
 
 Miscellaneous
 ~~~~~~~~~~~~~
-
+ - Non-text formatters are not disabled in terminal which should simplify
+   writing extension displaying images or other mimetypes supporting terminals.
+   :ghpull:`12315`
+ -
+ - It is now possible to automatically insert matching brackets in Terminal IPython using the
+   ``TerminalInteractiveShell.auto_match=True`` option. :ghpull:`12586`
+ - We are thinking of deprecating the current ``%%javascript`` magic in favor of a better replacement. See :ghpull:`13376`
+ - ``%time`` uses ``process_time`` instead of  ``perf_counter``, see :ghpull:`12984`
  - ``~`` is now expanded when part of a path in most magics :ghpull:`13385`
  - ``%/%%timeit`` magic now adds comma every thousands to make reading long number easier :ghpull:`13379`
  - ``"info"`` messages can now be customised to hide some fields :ghpull:`13343`
@@ -390,7 +429,15 @@ Miscellaneous
    now warn users if they use it. :ghpull:`12954`
  - make ``%precision`` work for ``numpy.float64`` type :ghpull:`12902`
 
+Re-added support for XDG config directories
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+XDG support through the years did come an go, there is a tension between having
+identical location in all platforms to have simple instructions. After initial
+failure a couple of years ago IPython was modified to automatically migrate XDG
+config files back into ``~/.ipython``, the migration code has now been removed.
+And IPython now check the XDG locations, so if you _manually_ move your config
+files to your preferred location, IPython will not move them back.
 
 
 Numfocus Small Developer Grant

From d999c0b6028b3db070a46b200cd7aa10a67e3081 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 26 Dec 2021 17:51:11 +0100
Subject: [PATCH 1009/1407] release 8.0.0b1

---
 IPython/core/release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 38290a1fcb3..efe25344f37 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -18,8 +18,8 @@
 _version_major = 8
 _version_minor = 0
 _version_patch = 0
-_version_extra = '.dev'
-# _version_extra = 'b1'
+_version_extra = ".dev"
+_version_extra = "b1"
 # _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.

From 22a0cf2e4b52ba89d2e2644256bb2d4807a05502 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 26 Dec 2021 17:51:50 +0100
Subject: [PATCH 1010/1407] back to dev

---
 IPython/core/release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index efe25344f37..87f5e5818b7 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -19,8 +19,8 @@
 _version_minor = 0
 _version_patch = 0
 _version_extra = ".dev"
-_version_extra = "b1"
-# _version_extra = ""  # Uncomment this for full releases
+# _version_extra = "b1"
+# # _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 8491abce742b7142b925bd508cccd4b9d073a6d7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 26 Dec 2021 20:03:30 +0100
Subject: [PATCH 1011/1407] don't try to upload tarxz

---
 tools/release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/release b/tools/release
index 353ad5d967d..ecc3dfb62cc 100755
--- a/tools/release
+++ b/tools/release
@@ -56,7 +56,7 @@ if 'upload' in sys.argv:
     # Make target dir if it doesn't exist
     print('1. Uploading IPython to archive.ipython.org')
     sh('ssh %s "mkdir -p %s/release/%s" ' % (archive_user, archive_dir, version))
-    sh('scp *.tar.gz *.tar.xz *.whl %s' % release_site)
+    sh('scp *.tar.gz *.whl %s' % release_site)
 
     print('2. Uploading backup files...')
     cd(ipbackupdir)

From 8cd367b764fe4f092d4e00bab493a6296967dc23 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 27 Dec 2021 18:42:54 +0100
Subject: [PATCH 1012/1407] Remove more of distutils.

Not sure what this does but the end wheel/sdist are quasi identical.
So let's remove it.
---
 MANIFEST.in                  |  2 -
 setupbase.py                 |  2 -
 setupext/__init__.py         |  3 --
 setupext/install_data_ext.py | 80 ------------------------------------
 4 files changed, 87 deletions(-)
 delete mode 100644 setupext/__init__.py
 delete mode 100644 setupext/install_data_ext.py

diff --git a/MANIFEST.in b/MANIFEST.in
index 0497df044f4..a66e7fa0487 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -15,8 +15,6 @@ exclude tools
 exclude CONTRIBUTING.md
 exclude .editorconfig
 
-graft setupext
-
 graft scripts
 
 # Load main dir but exclude things we don't want in the distro
diff --git a/setupbase.py b/setupbase.py
index 110098595d0..ecea9e788cc 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -24,7 +24,6 @@
 from setuptools.command.install import install
 from setuptools.command.install_scripts import install_scripts
 
-from setupext import install_data_ext
 
 #-------------------------------------------------------------------------------
 # Useful globals and utility functions
@@ -65,7 +64,6 @@ def file_doesnt_endwith(test,endings):
       author           = author,
       author_email     = author_email,
       license          = license,
-      cmdclass         = {'install_data': install_data_ext},
       )
 
 
diff --git a/setupext/__init__.py b/setupext/__init__.py
deleted file mode 100644
index 3933cb5de09..00000000000
--- a/setupext/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# load extended setup modules for distutils
-
-from .install_data_ext import install_data_ext
diff --git a/setupext/install_data_ext.py b/setupext/install_data_ext.py
deleted file mode 100644
index ce6623b34f1..00000000000
--- a/setupext/install_data_ext.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# install_data_ext.py
-#
-# Subclass of normal distutils install_data command to allow more
-# configurable installation of data files.
-
-import os
-from distutils.command.install_data import install_data
-from distutils.util import change_root, convert_path
-
-class install_data_ext(install_data):
-
-    def initialize_options(self):
-        self.install_base = None
-        self.install_platbase = None
-        self.install_purelib = None
-        self.install_headers = None
-        self.install_lib = None
-        self.install_scripts = None
-        self.install_data = None
-
-        self.outfiles = []
-        self.root = None
-        self.force = 0
-        self.data_files = self.distribution.data_files
-        self.warn_dir = 1
-        
-
-    def finalize_options(self):
-        self.set_undefined_options('install',
-                                   ('root', 'root'),
-                                   ('force', 'force'),
-                                   ('install_base', 'install_base'),
-                                   ('install_platbase',
-                                    'install_platbase'),
-                                   ('install_purelib',
-                                    'install_purelib'),
-                                   ('install_headers',
-                                    'install_headers'),
-                                   ('install_lib', 'install_lib'),
-                                   ('install_scripts',
-                                    'install_scripts'),
-                                   ('install_data', 'install_data'))
-                                   
-
-    def run(self):
-        """
-        This is where the meat is.  Basically the data_files list must
-        now be a list of tuples of 3 entries.  The first
-        entry is one of 'base', 'platbase', etc, which indicates which
-        base to install from.  The second entry is the path to install
-        too.  The third entry is a list of files to install.
-        """
-        for lof in self.data_files:
-            if lof[0]:
-                base = getattr(self, 'install_' + lof[0])
-            else:
-                base = getattr(self, 'install_base')
-            dir = convert_path(lof[1])
-            if not os.path.isabs(dir):
-                dir = os.path.join(base, dir)
-            elif self.root:
-                dir = change_root(self.root, dir)
-            self.mkpath(dir)
-
-            files = lof[2]
-            if len(files) == 0:
-                # If there are no files listed, the user must be
-                # trying to create an empty directory, so add the
-                # directory to the list of output files.
-                self.outfiles.append(dir)
-            else:
-                # Copy files, adding them to the list of output files.
-                for f in files:
-                    f = convert_path(f)
-                    (out, _) = self.copy_file(f, dir)
-                    #print "DEBUG: ", out  # dbg
-                    self.outfiles.append(out)
-                    
-
-        return self.outfiles

From 82d1a374575d9785708f144976cf139c76c7acb7 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Wed, 1 Dec 2021 09:13:35 +0100
Subject: [PATCH 1013/1407] make sure to run async tests

there are some `async def` tests, but they are skipped without `mark("asyncio")`
---
 IPython/conftest.py | 23 +++++++++++++++++++----
 setup.py            |  1 +
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/IPython/conftest.py b/IPython/conftest.py
index fb73d4b2f33..abf61314798 100644
--- a/IPython/conftest.py
+++ b/IPython/conftest.py
@@ -1,10 +1,12 @@
-import types
-import sys
 import builtins
+import inspect
 import os
-import pytest
 import pathlib
 import shutil
+import sys
+import types
+
+import pytest
 
 # Must register before it gets imported
 pytest.register_assert_rewrite("IPython.testing.tools")
@@ -12,6 +14,19 @@
 from .testing import tools
 
 
+def pytest_collection_modifyitems(items):
+    """This function is automatically run by pytest passing all collected test
+    functions.
+
+    We use it to add asyncio marker to all async tests and assert we don't use
+    test functions that are async generators which wouldn't make sense.
+    """
+    for item in items:
+        if inspect.iscoroutinefunction(item.obj):
+            item.add_marker("asyncio")
+        assert not inspect.isasyncgenfunction(item.obj)
+
+
 def get_ipython():
     from .terminal.interactiveshell import TerminalInteractiveShell
     if TerminalInteractiveShell._instance:
@@ -32,7 +47,7 @@ def work_path():
     if path.exists():
         raise ValueError('IPython dir temporary path already exists ! Did previous test run exit successfully ?')
     path.mkdir()
-    yield 
+    yield
     shutil.rmtree(str(path.resolve()))
 
 
diff --git a/setup.py b/setup.py
index 3aa9be22cfb..2ddebd64d54 100644
--- a/setup.py
+++ b/setup.py
@@ -150,6 +150,7 @@
     doc=["Sphinx>=1.3"],
     test=[
         "pytest",
+        "pytest-asyncio",
         "testpath",
         "pygments",
     ],

From ce62a7a4b2c97bf8a30e8074e8fc18103a0718a0 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Wed, 1 Dec 2021 12:07:28 +0100
Subject: [PATCH 1014/1407] avoid deprecated get_event_loop

use our own `async_helpers.get_asyncio_loop` to track the global event loop

script magics use dedicated background asyncio loop
instead of trying to work on the main loop, which may or may not exist

_AsyncIOProxy wraps background script objects to transfer awaitables across loops

only works for coroutine methods, which might be good enough? Works for read, etc.
---
 IPython/core/async_helpers.py               |  79 +++++++++--
 IPython/core/magics/script.py               | 141 +++++++++-----------
 IPython/core/tests/test_interactiveshell.py |   2 +-
 IPython/core/tests/test_magic.py            |  37 +++--
 IPython/terminal/interactiveshell.py        |  21 +--
 IPython/terminal/pt_inputhooks/asyncio.py   |  11 +-
 6 files changed, 174 insertions(+), 117 deletions(-)

diff --git a/IPython/core/async_helpers.py b/IPython/core/async_helpers.py
index 6623fae4e13..0e7db0bb54d 100644
--- a/IPython/core/async_helpers.py
+++ b/IPython/core/async_helpers.py
@@ -14,26 +14,46 @@
 import ast
 import asyncio
 import inspect
+from functools import wraps
 
+_asyncio_event_loop = None
 
-class _AsyncIORunner:
-    def __init__(self):
-        self._loop = None
-
-    @property
-    def loop(self):
-        """Always returns a non-closed event loop"""
-        if self._loop is None or self._loop.is_closed():
-            policy = asyncio.get_event_loop_policy()
-            self._loop = policy.new_event_loop()
-            policy.set_event_loop(self._loop)
-        return self._loop
 
+def get_asyncio_loop():
+    """asyncio has deprecated get_event_loop
+
+    Replicate it here, with our desired semantics:
+
+    - always returns a valid, not-closed loop
+    - not thread-local like asyncio's,
+      because we only want one loop for IPython
+    - if called from inside a coroutine (e.g. in ipykernel),
+      return the running loop
+
+    .. versionadded:: 8.0
+    """
+    try:
+        return asyncio.get_running_loop()
+    except RuntimeError:
+        # not inside a coroutine,
+        # track our own global
+        pass
+
+    # not thread-local like asyncio's,
+    # because we only track one event loop to run for IPython itself,
+    # always in the main thread.
+    global _asyncio_event_loop
+    if _asyncio_event_loop is None or _asyncio_event_loop.is_closed():
+        _asyncio_event_loop = asyncio.new_event_loop()
+    return _asyncio_event_loop
+
+
+class _AsyncIORunner:
     def __call__(self, coro):
         """
         Handler for asyncio autoawait
         """
-        return self.loop.run_until_complete(coro)
+        return get_asyncio_loop().run_until_complete(coro)
 
     def __str__(self):
         return "asyncio"
@@ -42,6 +62,39 @@ def __str__(self):
 _asyncio_runner = _AsyncIORunner()
 
 
+class _AsyncIOProxy:
+    """Proxy-object for an asyncio
+
+    Any coroutine methods will be wrapped in event_loop.run_
+    """
+
+    def __init__(self, obj, event_loop):
+        self._obj = obj
+        self._event_loop = event_loop
+
+    def __repr__(self):
+        return f"<_AsyncIOProxy({self._obj!r})>"
+
+    def __getattr__(self, key):
+        attr = getattr(self._obj, key)
+        if inspect.iscoroutinefunction(attr):
+            # if it's a coroutine method,
+            # return a threadsafe wrapper onto the _current_ asyncio loop
+            @wraps(attr)
+            def _wrapped(*args, **kwargs):
+                concurrent_future = asyncio.run_coroutine_threadsafe(
+                    attr(*args, **kwargs), self._event_loop
+                )
+                return asyncio.wrap_future(concurrent_future)
+
+            return _wrapped
+        else:
+            return attr
+
+    def __dir__(self):
+        return dir(self._obj)
+
+
 def _curio_runner(coroutine):
     """
     handler for curio autoawait
diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index 59f27c21d84..a0028c25eea 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -6,19 +6,18 @@
 import asyncio
 import atexit
 import errno
-import functools
 import os
 import signal
 import sys
 import time
-from contextlib import contextmanager
 from subprocess import CalledProcessError
+from threading import Thread
 
-from traitlets import Dict, List, default
+from traitlets import Any, Dict, List, default
 
 from IPython.core import magic_arguments
+from IPython.core.async_helpers import _AsyncIOProxy
 from IPython.core.magic import Magics, cell_magic, line_magic, magics_class
-from IPython.lib.backgroundjobs import BackgroundJobManager
 from IPython.utils.process import arg_split
 
 #-----------------------------------------------------------------------------
@@ -57,7 +56,7 @@ def script_args(f):
         ),
         magic_arguments.argument(
             '--no-raise-error', action="store_false", dest='raise_error',
-            help="""Whether you should raise an error message in addition to 
+            help="""Whether you should raise an error message in addition to
             a stream on stderr if you get a nonzero exit code.
             """
         )
@@ -67,48 +66,6 @@ def script_args(f):
     return f
 
 
-@contextmanager
-def safe_watcher():
-    if sys.platform == "win32":
-        yield
-        return
-
-    from asyncio import SafeChildWatcher
-
-    policy = asyncio.get_event_loop_policy()
-    old_watcher = policy.get_child_watcher()
-    if isinstance(old_watcher, SafeChildWatcher):
-        yield
-        return
-
-    try:
-        loop = policy.get_event_loop()
-        if loop.is_closed():
-            raise RuntimeError("open a new one")
-    except RuntimeError:
-        # closed loop, make a new one
-        loop = policy.new_event_loop()
-        policy.set_event_loop(loop)
-
-    try:
-        watcher = asyncio.SafeChildWatcher()
-        watcher.attach_loop(loop)
-        policy.set_child_watcher(watcher)
-        yield
-    finally:
-        watcher.close()
-        policy.set_child_watcher(old_watcher)
-
-
-def dec_safe_watcher(fun):
-    @functools.wraps(fun)
-    def _inner(*args, **kwargs):
-        with safe_watcher():
-            return fun(*args, **kwargs)
-
-    return _inner
-
-
 @magics_class
 class ScriptMagics(Magics):
     """Magics for talking to scripts
@@ -117,6 +74,17 @@ class ScriptMagics(Magics):
     with a program in a subprocess, and registers a few top-level
     magics that call %%script with common interpreters.
     """
+
+    event_loop = Any(
+        help="""
+        The event loop on which to run subprocesses
+
+        Not the main event loop,
+        because we want to be able to make blocking calls
+        and have certain requirements we don't want to impose on the main loop.
+        """
+    )
+
     script_magics = List(
         help="""Extra script cell magics to define
         
@@ -158,7 +126,6 @@ def _script_magics_default(self):
     def __init__(self, shell=None):
         super(ScriptMagics, self).__init__(shell=shell)
         self._generate_script_magics()
-        self.job_manager = BackgroundJobManager()
         self.bg_processes = []
         atexit.register(self.kill_bg_processes)
 
@@ -199,7 +166,6 @@ def named_script_magic(line, cell):
     @magic_arguments.magic_arguments()
     @script_args
     @cell_magic("script")
-    @dec_safe_watcher
     def shebang(self, line, cell):
         """Run a cell via a shell command
 
@@ -221,6 +187,27 @@ def shebang(self, line, cell):
             3
         """
 
+        # Create the event loop in which to run script magics
+        # this operates on a background thread
+        if self.event_loop is None:
+            if sys.platform == "win32":
+                # don't override the current policy,
+                # just create an event loop
+                event_loop = asyncio.WindowsProactorEventLoopPolicy().new_event_loop()
+            else:
+                event_loop = asyncio.new_event_loop()
+            self.event_loop = event_loop
+
+            # start the loop in a background thread
+            asyncio_thread = Thread(target=event_loop.run_forever, daemon=True)
+            asyncio_thread.start()
+        else:
+            event_loop = self.event_loop
+
+        def in_thread(coro):
+            """Call a coroutine on the asyncio thread"""
+            return asyncio.run_coroutine_threadsafe(coro, event_loop).result()
+
         async def _handle_stream(stream, stream_arg, file_object):
             while True:
                 line = (await stream.readline()).decode("utf8")
@@ -244,23 +231,11 @@ async def _stream_communicate(process, cell):
             await asyncio.wait([stdout_task, stderr_task])
             await process.wait()
 
-        policy = asyncio.get_event_loop_policy()
-        if sys.platform.startswith("win") and not isinstance(
-            policy, asyncio.WindowsProactorEventLoopPolicy
-        ):
-            # _do not_ overwrite the current policy
-            policy = asyncio.WindowsProactorEventLoopPolicy()
-
-        try:
-            loop = policy.get_event_loop()
-        except RuntimeError:
-            # closed loop, make a new one
-            loop = policy.new_event_loop()
-            policy.set_event_loop(loop)
         argv = arg_split(line, posix=not sys.platform.startswith("win"))
         args, cmd = self.shebang.parser.parse_known_args(argv)
+
         try:
-            p = loop.run_until_complete(
+            p = in_thread(
                 asyncio.create_subprocess_exec(
                     *cmd,
                     stdout=asyncio.subprocess.PIPE,
@@ -274,7 +249,7 @@ async def _stream_communicate(process, cell):
                 return
             else:
                 raise
-        
+
         if not cell.endswith('\n'):
             cell += '\n'
         cell = cell.encode('utf8', 'replace')
@@ -283,29 +258,34 @@ async def _stream_communicate(process, cell):
             self._gc_bg_processes()
             to_close = []
             if args.out:
-                self.shell.user_ns[args.out] = p.stdout
+                self.shell.user_ns[args.out] = _AsyncIOProxy(p.stdout, event_loop)
             else:
                 to_close.append(p.stdout)
             if args.err:
-                self.shell.user_ns[args.err] = p.stderr
+                self.shell.user_ns[args.err] = _AsyncIOProxy(p.stderr, event_loop)
             else:
                 to_close.append(p.stderr)
-            self.job_manager.new(self._run_script, p, cell, to_close, daemon=True)
+            event_loop.call_soon_threadsafe(
+                lambda: asyncio.Task(self._run_script(p, cell, to_close))
+            )
             if args.proc:
-                self.shell.user_ns[args.proc] = p
+                proc_proxy = _AsyncIOProxy(p, event_loop)
+                proc_proxy.stdout = _AsyncIOProxy(p.stdout, event_loop)
+                proc_proxy.stderr = _AsyncIOProxy(p.stderr, event_loop)
+                self.shell.user_ns[args.proc] = proc_proxy
             return
-        
+
         try:
-            loop.run_until_complete(_stream_communicate(p, cell))
+            in_thread(_stream_communicate(p, cell))
         except KeyboardInterrupt:
             try:
                 p.send_signal(signal.SIGINT)
-                time.sleep(0.1)
+                in_thread(asyncio.wait_for(p.wait(), timeout=0.1))
                 if p.returncode is not None:
                     print("Process is interrupted.")
                     return
                 p.terminate()
-                time.sleep(0.1)
+                in_thread(asyncio.wait_for(p.wait(), timeout=0.1))
                 if p.returncode is not None:
                     print("Process is terminated.")
                     return
@@ -316,7 +296,8 @@ async def _stream_communicate(process, cell):
             except Exception as e:
                 print("Error while terminating subprocess (pid=%i): %s" % (p.pid, e))
             return
-        if args.raise_error and p.returncode!=0:
+
+        if args.raise_error and p.returncode != 0:
             # If we get here and p.returncode is still None, we must have
             # killed it but not yet seen its return code. We don't wait for it,
             # in case it's stuck in uninterruptible sleep. -9 = SIGKILL
@@ -324,14 +305,20 @@ async def _stream_communicate(process, cell):
             raise CalledProcessError(rc, cell)
 
     shebang.__skip_doctest__ = os.name != "posix"
-    
-    def _run_script(self, p, cell, to_close):
+
+    async def _run_script(self, p, cell, to_close):
         """callback for running the script in the background"""
+
         p.stdin.write(cell)
+        await p.stdin.drain()
         p.stdin.close()
+        await p.stdin.wait_closed()
+        await p.wait()
+        # asyncio read pipes have no close
+        # but we should drain the data anyway
         for s in to_close:
-            s.close()
-        p.wait()
+            await s.read()
+        self._gc_bg_processes()
 
     @line_magic("killbgscripts")
     def killbgscripts(self, _nouse_=''):
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 355f2b00159..41f5a358ea1 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -1049,10 +1049,10 @@ def test_custom_exc_count():
 
 
 def test_run_cell_async():
-    loop = asyncio.get_event_loop_policy().get_event_loop()
     ip.run_cell("import asyncio")
     coro = ip.run_cell_async("await asyncio.sleep(0.01)\n5")
     assert asyncio.iscoroutine(coro)
+    loop = asyncio.new_event_loop()
     result = loop.run_until_complete(coro)
     assert isinstance(result, interactiveshell.ExecutionResult)
     assert result.result == 5
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 40f0ae47759..f66136b8e7c 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -988,7 +988,7 @@ def test_script_out(event_loop):
 
     ip = get_ipython()
     ip.run_cell_magic("script", "--out output sh", "echo 'hi'")
-    assert event_loop.is_running() is False
+    assert not event_loop.is_running()
     assert ip.user_ns["output"] == "hi\n"
 
 
@@ -998,9 +998,9 @@ def test_script_out(event_loop):
 )
 def test_script_err(event_loop):
     ip = get_ipython()
-    assert event_loop.is_running() is False
+    assert not event_loop.is_running()
     ip.run_cell_magic("script", "--err error sh", "echo 'hello' >&2")
-    assert event_loop.is_running() is False
+    assert not event_loop.is_running()
     assert ip.user_ns["error"] == "hello\n"
 
 
@@ -1022,13 +1022,11 @@ def test_script_out_err():
 @pytest.mark.skipif(
     sys.platform == "win32", reason="This test does not run under Windows"
 )
-async def test_script_bg_out(event_loop):
+async def test_script_bg_out():
     ip = get_ipython()
     ip.run_cell_magic("script", "--bg --out output sh", "echo 'hi'")
     assert (await ip.user_ns["output"].read()) == b"hi\n"
-    ip.user_ns["output"].close()
-    event_loop.stop()
-
+    assert ip.user_ns["output"].at_eof()
 
 @dec.skip_win32
 @pytest.mark.skipif(
@@ -1038,7 +1036,7 @@ async def test_script_bg_err():
     ip = get_ipython()
     ip.run_cell_magic("script", "--bg --err error sh", "echo 'hello' >&2")
     assert (await ip.user_ns["error"].read()) == b"hello\n"
-    ip.user_ns["error"].close()
+    assert ip.user_ns["error"].at_eof()
 
 
 @dec.skip_win32
@@ -1052,8 +1050,27 @@ async def test_script_bg_out_err():
     )
     assert (await ip.user_ns["output"].read()) == b"hi\n"
     assert (await ip.user_ns["error"].read()) == b"hello\n"
-    ip.user_ns["output"].close()
-    ip.user_ns["error"].close()
+    assert ip.user_ns["output"].at_eof()
+    assert ip.user_ns["error"].at_eof()
+
+
+@dec.skip_win32
+@pytest.mark.skipif(
+    sys.platform == "win32", reason="This test does not run under Windows"
+)
+async def test_script_bg_proc():
+    ip = get_ipython()
+    ip.run_cell_magic(
+        "script", "--bg --proc p sh --out out", "echo 'hi'\necho 'hello' >&2"
+    )
+    p = ip.user_ns["p"]
+    await p.wait()
+    assert p.returncode == 0
+    assert (await p.stdout.read()) == b"hi\n"
+    # not captured, so empty
+    assert (await p.stderr.read()) == b""
+    assert p.stdout.at_eof()
+    assert p.stderr.at_eof()
 
 
 def test_script_defaults():
diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 98e5eb855a6..8e61f8c5db0 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -6,6 +6,7 @@
 import warnings
 from warnings import warn
 
+from IPython.core.async_helpers import get_asyncio_loop
 from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC
 from IPython.utils import io
 from IPython.utils.py3compat import input
@@ -521,14 +522,14 @@ def prompt_for_code(self):
         # while/true inside which will freeze the prompt.
 
         policy = asyncio.get_event_loop_policy()
-        try:
-            old_loop = policy.get_event_loop()
-        except RuntimeError:
-            # This happens when the the event loop is closed,
-            # e.g. by calling `asyncio.run()`.
-            old_loop = None
-
-        policy.set_event_loop(self.pt_loop)
+        old_loop = get_asyncio_loop()
+
+        # FIXME: prompt_toolkit is using the deprecated `asyncio.get_event_loop`
+        # to get the current event loop.
+        # This will probably be replaced by an attribute or input argument,
+        # at which point we can stop calling the soon-to-be-deprecated `set_event_loop` here.
+        if old_loop is not self.pt_loop:
+            policy.set_event_loop(self.pt_loop)
         try:
             with patch_stdout(raw=True):
                 text = self.pt_app.prompt(
@@ -536,7 +537,7 @@ def prompt_for_code(self):
                     **self._extra_prompt_options())
         finally:
             # Restore the original event loop.
-            if old_loop is not None:
+            if old_loop is not None and old_loop is not self.pt_loop:
                 policy.set_event_loop(old_loop)
 
         return text
@@ -652,7 +653,7 @@ def enable_gui(self, gui=None):
                 # When we integrate the asyncio event loop, run the UI in the
                 # same event loop as the rest of the code. don't use an actual
                 # input hook. (Asyncio is not made for nesting event loops.)
-                self.pt_loop = asyncio.get_event_loop_policy().get_event_loop()
+                self.pt_loop = get_asyncio_loop()
 
             elif self._inputhook:
                 # If an inputhook was set, create a new asyncio event loop with
diff --git a/IPython/terminal/pt_inputhooks/asyncio.py b/IPython/terminal/pt_inputhooks/asyncio.py
index 72c45ea251e..2d8c128208e 100644
--- a/IPython/terminal/pt_inputhooks/asyncio.py
+++ b/IPython/terminal/pt_inputhooks/asyncio.py
@@ -27,15 +27,12 @@
     In [4]: asyncio.ensure_future(f())
 
 """
-import asyncio
 from prompt_toolkit import __version__ as ptk_version
 
-PTK3 = ptk_version.startswith('3.')
+from IPython.core.async_helpers import get_asyncio_loop
 
+PTK3 = ptk_version.startswith('3.')
 
-# Keep reference to the original asyncio loop, because getting the event loop
-# within the input hook would return the other loop.
-loop = asyncio.get_event_loop_policy().get_event_loop()
 
 
 def inputhook(context):
@@ -52,6 +49,9 @@ def inputhook(context):
     # For prompt_toolkit 2.0, we can run the current asyncio event loop,
     # because prompt_toolkit 2.0 uses a different event loop internally.
 
+    # get the persistent asyncio event loop
+    loop = get_asyncio_loop()
+
     def stop():
         loop.stop()
 
@@ -61,4 +61,3 @@ def stop():
         loop.run_forever()
     finally:
         loop.remove_reader(fileno)
-

From 07743b2dc60bd343489c5c0e47d97546ecb0283e Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Mon, 3 Jan 2022 11:37:27 +0100
Subject: [PATCH 1015/1407] run script tests on Windows

run with sys.executable instead of sh for portability
---
 IPython/core/tests/test_magic.py | 111 ++++++++++++++-----------------
 1 file changed, 51 insertions(+), 60 deletions(-)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index f66136b8e7c..5294f82c51c 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -970,103 +970,94 @@ def test_script_config():
     assert "whoda" in sm.magics["cell"]
 
 
-@pytest.fixture
-def event_loop():
-    policy = asyncio.get_event_loop_policy()
-    loop = policy.new_event_loop()
-    policy.set_event_loop(loop)
-    yield loop
-    loop.close()
-
-
-@dec.skip_win32
-@pytest.mark.skipif(
-    sys.platform == "win32", reason="This test does not run under Windows"
-)
-def test_script_out(event_loop):
-    assert event_loop.is_running() is False
-
+def test_script_out():
     ip = get_ipython()
-    ip.run_cell_magic("script", "--out output sh", "echo 'hi'")
-    assert not event_loop.is_running()
-    assert ip.user_ns["output"] == "hi\n"
+    ip.run_cell_magic("script", f"--out output {sys.executable}", "print('hi')")
+    assert ip.user_ns["output"].strip() == "hi"
 
 
-@dec.skip_win32
-@pytest.mark.skipif(
-    sys.platform == "win32", reason="This test does not run under Windows"
-)
-def test_script_err(event_loop):
+def test_script_err():
     ip = get_ipython()
-    assert not event_loop.is_running()
-    ip.run_cell_magic("script", "--err error sh", "echo 'hello' >&2")
-    assert not event_loop.is_running()
-    assert ip.user_ns["error"] == "hello\n"
+    ip.run_cell_magic(
+        "script",
+        f"--err error {sys.executable}",
+        "import sys; print('hello', file=sys.stderr)",
+    )
+    assert ip.user_ns["error"].strip() == "hello"
 
 
-@dec.skip_win32
-@pytest.mark.skipif(
-    sys.platform == "win32", reason="This test does not run under Windows"
-)
 def test_script_out_err():
 
     ip = get_ipython()
     ip.run_cell_magic(
-        "script", "--out output --err error sh", "echo 'hi'\necho 'hello' >&2"
+        "script",
+        f"--out output --err error {sys.executable}",
+        "\n".join(
+            [
+                "import sys",
+                "print('hi')",
+                "print('hello', file=sys.stderr)",
+            ]
+        ),
     )
-    assert ip.user_ns["output"] == "hi\n"
-    assert ip.user_ns["error"] == "hello\n"
+    assert ip.user_ns["output"].strip() == "hi"
+    assert ip.user_ns["error"].strip() == "hello"
 
 
-@dec.skip_win32
-@pytest.mark.skipif(
-    sys.platform == "win32", reason="This test does not run under Windows"
-)
 async def test_script_bg_out():
     ip = get_ipython()
-    ip.run_cell_magic("script", "--bg --out output sh", "echo 'hi'")
-    assert (await ip.user_ns["output"].read()) == b"hi\n"
+    ip.run_cell_magic("script", f"--bg --out output {sys.executable}", "print('hi')")
+    assert (await ip.user_ns["output"].read()).strip() == b"hi"
     assert ip.user_ns["output"].at_eof()
 
-@dec.skip_win32
-@pytest.mark.skipif(
-    sys.platform == "win32", reason="This test does not run under Windows"
-)
+
 async def test_script_bg_err():
     ip = get_ipython()
-    ip.run_cell_magic("script", "--bg --err error sh", "echo 'hello' >&2")
-    assert (await ip.user_ns["error"].read()) == b"hello\n"
+    ip.run_cell_magic(
+        "script",
+        f"--bg --err error {sys.executable}",
+        "import sys; print('hello', file=sys.stderr)",
+    )
+    assert (await ip.user_ns["error"].read()).strip() == b"hello"
     assert ip.user_ns["error"].at_eof()
 
 
-@dec.skip_win32
-@pytest.mark.skipif(
-    sys.platform == "win32", reason="This test does not run under Windows"
-)
 async def test_script_bg_out_err():
     ip = get_ipython()
     ip.run_cell_magic(
-        "script", "--bg --out output --err error sh", "echo 'hi'\necho 'hello' >&2"
+        "script",
+        f"--bg --out output --err error {sys.executable}",
+        "\n".join(
+            [
+                "import sys",
+                "print('hi')",
+                "print('hello', file=sys.stderr)",
+            ]
+        ),
     )
-    assert (await ip.user_ns["output"].read()) == b"hi\n"
-    assert (await ip.user_ns["error"].read()) == b"hello\n"
+    assert (await ip.user_ns["output"].read()).strip() == b"hi"
+    assert (await ip.user_ns["error"].read()).strip() == b"hello"
     assert ip.user_ns["output"].at_eof()
     assert ip.user_ns["error"].at_eof()
 
 
-@dec.skip_win32
-@pytest.mark.skipif(
-    sys.platform == "win32", reason="This test does not run under Windows"
-)
 async def test_script_bg_proc():
     ip = get_ipython()
     ip.run_cell_magic(
-        "script", "--bg --proc p sh --out out", "echo 'hi'\necho 'hello' >&2"
+        "script",
+        f"--bg --out output --proc p {sys.executable}",
+        "\n".join(
+            [
+                "import sys",
+                "print('hi')",
+                "print('hello', file=sys.stderr)",
+            ]
+        ),
     )
     p = ip.user_ns["p"]
     await p.wait()
     assert p.returncode == 0
-    assert (await p.stdout.read()) == b"hi\n"
+    assert (await p.stdout.read()).strip() == b"hi"
     # not captured, so empty
     assert (await p.stderr.read()) == b""
     assert p.stdout.at_eof()

From 3baf12e9df541c8f55d5b544c203818dfe90de37 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 5 Jan 2022 10:16:29 +0100
Subject: [PATCH 1016/1407] wn 731

---
 docs/source/whatsnew/version7.rst | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 5a310ee0999..55b1b2f8439 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,30 @@
  7.x Series
 ============
 
+
+.. _version 7.31:
+
+IPython 7.31
+============
+
+IPython 7.31 brings a couple of backports and fixes from the 8.0 branches,
+it is likely one of the last releases of the 7.x series, as 8.0 will probably be released
+between this release and what would have been 7.32.
+
+Please test 8.0 beta/rc releases in addition to this release.
+
+This Releases:
+ - Backport some fixes for Python 3.10 (:ghpull:`13412`)
+ - use full-alpha transparency on dvipng rendered LaTeX (:ghpull:`13372`)
+
+Many thanks to all the contributors to this release. You can find all individual
+contributions to this milestone `on github
+<https://github.com/ipython/ipython/milestone/95>`__.
+
+Thanks as well to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries.
+
+
 .. _version 7.30:
 
 IPython 7.30

From c68a32a62ab6d3910c70d1deceb91b3015542d86 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 5 Jan 2022 10:40:15 +0100
Subject: [PATCH 1017/1407] 8.0 stats

---
 docs/source/whatsnew/version8.rst | 180 +++++++++++++++++++++++++++++-
 1 file changed, 179 insertions(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index f4edfbd944c..d0a7eace0eb 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -467,9 +467,187 @@ efficient ``pathlib``, and make better use of type annotations.
    :alt: "Meme image of Toy Story with Woody and Buzz, with the text 'pathlib, pathlib everywhere'"
 
 
-We have about 34 PRs only to update some logic tu update some function from managing strings to
+We have about 34 PRs only to update some logic to update some functions from managing strings to
 using Pathlib.
 
 The completer has also seen significant updates and make use of newer Jedi API
 offering faster and more reliable tab completion.
 
+Misc Statistics
+---------------
+
+Here are some numbers:
+
+    7.x: 296 files, 12561 blank lines, 20282 comments, 35142 line of code.
+    8.0: 252 files, 12053 blank lines, 19232 comments, 34505 line of code.
+
+    $ git diff --stat 7.x...master  | tail -1
+    340 files changed, 13399 insertions(+), 12421 deletions(-)
+
+We have commits from 162 authors, who contributed 1916 commits in 23 month, excluding merges to not bias toward
+maintainers pushing buttons.::
+
+   $ git shortlog  -s --no-merges  7.x...master | sort -nr
+   535	Matthias Bussonnier
+    86	Nikita Kniazev
+    69	Blazej Michalik
+    49	Samuel Gaist
+    27	Itamar Turner-Trauring
+    18	Spas Kalaydzhisyki
+    17	Thomas Kluyver
+    17	Quentin Peter
+    17	James Morris
+    17	Artur Svistunov
+    15	Bart Skowron
+    14	Alex Hall
+    13	rushabh-v
+    13	Terry Davis
+    13	Benjamin Ragan-Kelley
+     8	martinRenou
+     8	farisachugthai
+     7	dswij
+     7	Gal B
+     7	Corentin Cadiou
+     6	yuji96
+     6	Martin Skarzynski
+     6	Justin Palmer
+     6	Daniel Goldfarb
+     6	Ben Greiner
+     5	Sammy Al Hashemi
+     5	Paul Ivanov
+     5	Inception95
+     5	Eyenpi
+     5	Douglas Blank
+     5	Coco Mishra
+     5	Bibo Hao
+     5	André A. Gomes
+     5	Ahmed Fasih
+     4	takuya fujiwara
+     4	palewire
+     4	Thomas A Caswell
+     4	Talley Lambert
+     4	Scott Sanderson
+     4	Ram Rachum
+     4	Nick Muoh
+     4	Nathan Goldbaum
+     4	Mithil Poojary
+     4	Michael T
+     4	Jakub Klus
+     4	Ian Castleden
+     4	Eli Rykoff
+     4	Ashwin Vishnu
+     3	谭九鼎
+     3	sleeping
+     3	Sylvain Corlay
+     3	Peter Corke
+     3	Paul Bissex
+     3	Matthew Feickert
+     3	Fernando Perez
+     3	Eric Wieser
+     3	Daniel Mietchen
+     3	Aditya Sathe
+     3	007vedant
+     2	rchiodo
+     2	nicolaslazo
+     2	luttik
+     2	gorogoroumaru
+     2	foobarbyte
+     2	bar-hen
+     2	Theo Ouzhinski
+     2	Strawkage
+     2	Samreen Zarroug
+     2	Pete Blois
+     2	Meysam Azad
+     2	Matthieu Ancellin
+     2	Mark Schmitz
+     2	Maor Kleinberger
+     2	MRCWirtz
+     2	Lumir Balhar
+     2	Julien Rabinow
+     2	Juan Luis Cano Rodríguez
+     2	Joyce Er
+     2	Jakub
+     2	Faris A Chugthai
+     2	Ethan Madden
+     2	Dimitri Papadopoulos
+     2	Diego Fernandez
+     2	Daniel Shimon
+     2	Coco Bennett
+     2	Carlos Cordoba
+     2	Boyuan Liu
+     2	BaoGiang HoangVu
+     2	Augusto
+     2	Arthur Svistunov
+     2	Arthur Moreira
+     2	Ali Nabipour
+     2	Adam Hackbarth
+     1	richard
+     1	linar-jether
+     1	lbennett
+     1	juacrumar
+     1	gpotter2
+     1	digitalvirtuoso
+     1	dalthviz
+     1	Yonatan Goldschmidt
+     1	Tomasz Kłoczko
+     1	Tobias Bengfort
+     1	Timur Kushukov
+     1	Thomas
+     1	Snir Broshi
+     1	Shao Yang Hong
+     1	Sanjana-03
+     1	Romulo Filho
+     1	Rodolfo Carvalho
+     1	Richard Shadrach
+     1	Reilly Tucker Siemens
+     1	Rakessh Roshan
+     1	Piers Titus van der Torren
+     1	PhanatosZou
+     1	Pavel Safronov
+     1	Paulo S. Costa
+     1	Paul McCarthy
+     1	NotWearingPants
+     1	Naelson Douglas
+     1	Michael Tiemann
+     1	Matt Wozniski
+     1	Markus Wageringel
+     1	Marcus Wirtz
+     1	Marcio Mazza
+     1	Lumír 'Frenzy' Balhar
+     1	Lightyagami1
+     1	Leon Anavi
+     1	LeafyLi
+     1	L0uisJ0shua
+     1	Kyle Cutler
+     1	Krzysztof Cybulski
+     1	Kevin Kirsche
+     1	KIU Shueng Chuan
+     1	Jonathan Slenders
+     1	Jay Qi
+     1	Jake VanderPlas
+     1	Iwan Briquemont
+     1	Hussaina Begum Nandyala
+     1	Gordon Ball
+     1	Gabriel Simonetto
+     1	Frank Tobia
+     1	Erik
+     1	Elliott Sales de Andrade
+     1	Daniel Hahler
+     1	Dan Green-Leipciger
+     1	Dan Green
+     1	Damian Yurzola
+     1	Coon, Ethan T
+     1	Carol Willing
+     1	Brian Lee
+     1	Brendan Gerrity
+     1	Blake Griffin
+     1	Bastian Ebeling
+     1	Bartosz Telenczuk
+     1	Ankitsingh6299
+     1	Andrew Port
+     1	Andrew J. Hesford
+     1	Albert Zhang
+     1	Adam Johnson
+
+This does not of course represent non-code contributions.
+

From 13fbfa46ba43af3670b2d4a0ae589792210cc40d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 5 Jan 2022 10:47:13 +0100
Subject: [PATCH 1018/1407] API diff

---
 docs/source/whatsnew/version8.rst | 253 ++++++++++++++++++++++++++++++
 1 file changed, 253 insertions(+)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index d0a7eace0eb..640b48acc52 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -651,3 +651,256 @@ maintainers pushing buttons.::
 
 This does not of course represent non-code contributions.
 
+
+API Changes using Frappuccino
+-----------------------------
+
+This is an experimental exhaustive API difference using `Frappuccino <https://pypi.org/project/frappuccino/>`_
+
+
+The following items are new in IPython 8.0 ::
+
+    + IPython.core.async_helpers.get_asyncio_loop()
+    + IPython.core.completer.Dict
+    + IPython.core.completer.Pattern
+    + IPython.core.completer.Sequence
+    + IPython.core.completer.__skip_doctest__
+    + IPython.core.debugger.Pdb.precmd(self, line)
+    + IPython.core.debugger.__skip_doctest__
+    + IPython.core.display.__getattr__(name)
+    + IPython.core.display.warn
+    + IPython.core.display_functions
+    + IPython.core.display_functions.DisplayHandle
+    + IPython.core.display_functions.DisplayHandle.display(self, obj, **kwargs)
+    + IPython.core.display_functions.DisplayHandle.update(self, obj, **kwargs)
+    + IPython.core.display_functions.__all__
+    + IPython.core.display_functions.__builtins__
+    + IPython.core.display_functions.__cached__
+    + IPython.core.display_functions.__doc__
+    + IPython.core.display_functions.__file__
+    + IPython.core.display_functions.__loader__
+    + IPython.core.display_functions.__name__
+    + IPython.core.display_functions.__package__
+    + IPython.core.display_functions.__spec__
+    + IPython.core.display_functions.b2a_hex
+    + IPython.core.display_functions.clear_output(wait=False)
+    + IPython.core.display_functions.display(*objs, include='None', exclude='None', metadata='None', transient='None', display_id='None', raw=False, clear=False, **kwargs)
+    + IPython.core.display_functions.publish_display_data(data, metadata='None', source='<deprecated>', *, transient='None', **kwargs)
+    + IPython.core.display_functions.update_display(obj, *, display_id, **kwargs)
+    + IPython.core.extensions.BUILTINS_EXTS
+    + IPython.core.inputtransformer2.has_sunken_brackets(tokens)
+    + IPython.core.interactiveshell.Callable
+    + IPython.core.interactiveshell.__annotations__
+    + IPython.core.ultratb.List
+    + IPython.core.ultratb.Tuple
+    + IPython.lib.pretty.CallExpression
+    + IPython.lib.pretty.CallExpression.factory(name)
+    + IPython.lib.pretty.RawStringLiteral
+    + IPython.lib.pretty.RawText
+    + IPython.terminal.debugger.TerminalPdb.do_interact(self, arg)
+    + IPython.terminal.embed.Set
+
+The following items have been removed (or moved to superclass)::
+
+    - IPython.core.application.BaseIPythonApplication.initialize_subcommand
+    - IPython.core.completer.Sentinel
+    - IPython.core.completer.skip_doctest
+    - IPython.core.debugger.Tracer
+    - IPython.core.display.DisplayHandle
+    - IPython.core.display.DisplayHandle.display
+    - IPython.core.display.DisplayHandle.update
+    - IPython.core.display.b2a_hex
+    - IPython.core.display.clear_output
+    - IPython.core.display.display
+    - IPython.core.display.publish_display_data
+    - IPython.core.display.update_display
+    - IPython.core.excolors.Deprec
+    - IPython.core.excolors.ExceptionColors
+    - IPython.core.history.warn
+    - IPython.core.hooks.late_startup_hook
+    - IPython.core.hooks.pre_run_code_hook
+    - IPython.core.hooks.shutdown_hook
+    - IPython.core.interactiveshell.InteractiveShell.init_deprecation_warnings
+    - IPython.core.interactiveshell.InteractiveShell.init_readline
+    - IPython.core.interactiveshell.InteractiveShell.write
+    - IPython.core.interactiveshell.InteractiveShell.write_err
+    - IPython.core.interactiveshell.get_default_colors
+    - IPython.core.interactiveshell.removed_co_newlocals
+    - IPython.core.magics.execution.ExecutionMagics.profile_missing_notice
+    - IPython.core.magics.script.PIPE
+    - IPython.core.prefilter.PrefilterManager.init_transformers
+    - IPython.core.release.classifiers
+    - IPython.core.release.description
+    - IPython.core.release.keywords
+    - IPython.core.release.long_description
+    - IPython.core.release.name
+    - IPython.core.release.platforms
+    - IPython.core.release.url
+    - IPython.core.ultratb.VerboseTB.format_records
+    - IPython.core.ultratb.find_recursion
+    - IPython.core.ultratb.findsource
+    - IPython.core.ultratb.fix_frame_records_filenames
+    - IPython.core.ultratb.inspect_error
+    - IPython.core.ultratb.is_recursion_error
+    - IPython.core.ultratb.with_patch_inspect
+    - IPython.external.__all__
+    - IPython.external.__builtins__
+    - IPython.external.__cached__
+    - IPython.external.__doc__
+    - IPython.external.__file__
+    - IPython.external.__loader__
+    - IPython.external.__name__
+    - IPython.external.__package__
+    - IPython.external.__path__
+    - IPython.external.__spec__
+    - IPython.kernel.KernelConnectionInfo
+    - IPython.kernel.__builtins__
+    - IPython.kernel.__cached__
+    - IPython.kernel.__warningregistry__
+    - IPython.kernel.pkg
+    - IPython.kernel.protocol_version
+    - IPython.kernel.protocol_version_info
+    - IPython.kernel.src
+    - IPython.kernel.version_info
+    - IPython.kernel.warn
+    - IPython.lib.backgroundjobs
+    - IPython.lib.backgroundjobs.BackgroundJobBase
+    - IPython.lib.backgroundjobs.BackgroundJobBase.run
+    - IPython.lib.backgroundjobs.BackgroundJobBase.traceback
+    - IPython.lib.backgroundjobs.BackgroundJobExpr
+    - IPython.lib.backgroundjobs.BackgroundJobExpr.call
+    - IPython.lib.backgroundjobs.BackgroundJobFunc
+    - IPython.lib.backgroundjobs.BackgroundJobFunc.call
+    - IPython.lib.backgroundjobs.BackgroundJobManager
+    - IPython.lib.backgroundjobs.BackgroundJobManager.flush
+    - IPython.lib.backgroundjobs.BackgroundJobManager.new
+    - IPython.lib.backgroundjobs.BackgroundJobManager.remove
+    - IPython.lib.backgroundjobs.BackgroundJobManager.result
+    - IPython.lib.backgroundjobs.BackgroundJobManager.status
+    - IPython.lib.backgroundjobs.BackgroundJobManager.traceback
+    - IPython.lib.backgroundjobs.__builtins__
+    - IPython.lib.backgroundjobs.__cached__
+    - IPython.lib.backgroundjobs.__doc__
+    - IPython.lib.backgroundjobs.__file__
+    - IPython.lib.backgroundjobs.__loader__
+    - IPython.lib.backgroundjobs.__name__
+    - IPython.lib.backgroundjobs.__package__
+    - IPython.lib.backgroundjobs.__spec__
+    - IPython.lib.kernel.__builtins__
+    - IPython.lib.kernel.__cached__
+    - IPython.lib.kernel.__doc__
+    - IPython.lib.kernel.__file__
+    - IPython.lib.kernel.__loader__
+    - IPython.lib.kernel.__name__
+    - IPython.lib.kernel.__package__
+    - IPython.lib.kernel.__spec__
+    - IPython.lib.kernel.__warningregistry__
+    - IPython.paths.fs_encoding
+    - IPython.terminal.debugger.DEFAULT_BUFFER
+    - IPython.terminal.debugger.cursor_in_leading_ws
+    - IPython.terminal.debugger.emacs_insert_mode
+    - IPython.terminal.debugger.has_selection
+    - IPython.terminal.debugger.vi_insert_mode
+    - IPython.terminal.interactiveshell.DISPLAY_BANNER_DEPRECATED
+    - IPython.terminal.ipapp.TerminalIPythonApp.parse_command_line
+    - IPython.testing.test
+    - IPython.utils.contexts.NoOpContext
+    - IPython.utils.io.IOStream
+    - IPython.utils.io.IOStream.close
+    - IPython.utils.io.IOStream.write
+    - IPython.utils.io.IOStream.writelines
+    - IPython.utils.io.__warningregistry__
+    - IPython.utils.io.atomic_writing
+    - IPython.utils.io.stderr
+    - IPython.utils.io.stdin
+    - IPython.utils.io.stdout
+    - IPython.utils.io.unicode_std_stream
+    - IPython.utils.path.get_ipython_cache_dir
+    - IPython.utils.path.get_ipython_dir
+    - IPython.utils.path.get_ipython_module_path
+    - IPython.utils.path.get_ipython_package_dir
+    - IPython.utils.path.locate_profile
+    - IPython.utils.path.unquote_filename
+    - IPython.utils.py3compat.PY2
+    - IPython.utils.py3compat.PY3
+    - IPython.utils.py3compat.buffer_to_bytes
+    - IPython.utils.py3compat.builtin_mod_name
+    - IPython.utils.py3compat.cast_bytes
+    - IPython.utils.py3compat.getcwd
+    - IPython.utils.py3compat.isidentifier
+    - IPython.utils.py3compat.u_format
+
+The following signatures differ between 7.x and 8.0::
+
+    - IPython.core.completer.IPCompleter.unicode_name_matches(self, text)
+    + IPython.core.completer.IPCompleter.unicode_name_matches(text)
+
+    - IPython.core.completer.match_dict_keys(keys, prefix, delims)
+    + IPython.core.completer.match_dict_keys(keys, prefix, delims, extra_prefix='None')
+
+    - IPython.core.interactiveshell.InteractiveShell.object_inspect_mime(self, oname, detail_level=0)
+    + IPython.core.interactiveshell.InteractiveShell.object_inspect_mime(self, oname, detail_level=0, omit_sections='()')
+
+    - IPython.core.interactiveshell.InteractiveShell.set_hook(self, name, hook, priority=50, str_key='None', re_key='None', _warn_deprecated=True)
+    + IPython.core.interactiveshell.InteractiveShell.set_hook(self, name, hook, priority=50, str_key='None', re_key='None')
+
+    - IPython.core.oinspect.Inspector.info(self, obj, oname='', formatter='None', info='None', detail_level=0)
+    + IPython.core.oinspect.Inspector.info(self, obj, oname='', info='None', detail_level=0)
+
+    - IPython.core.oinspect.Inspector.pinfo(self, obj, oname='', formatter='None', info='None', detail_level=0, enable_html_pager=True)
+    + IPython.core.oinspect.Inspector.pinfo(self, obj, oname='', formatter='None', info='None', detail_level=0, enable_html_pager=True, omit_sections='()')
+
+    - IPython.core.profiledir.ProfileDir.copy_config_file(self, config_file, path='None', overwrite=False)
+    + IPython.core.profiledir.ProfileDir.copy_config_file(self, config_file, path, overwrite=False)
+
+    - IPython.core.ultratb.VerboseTB.format_record(self, frame, file, lnum, func, lines, index)
+    + IPython.core.ultratb.VerboseTB.format_record(self, frame_info)
+
+    - IPython.terminal.embed.InteractiveShellEmbed.mainloop(self, local_ns='None', module='None', stack_depth=0, display_banner='None', global_ns='None', compile_flags='None')
+    + IPython.terminal.embed.InteractiveShellEmbed.mainloop(self, local_ns='None', module='None', stack_depth=0, compile_flags='None')
+
+    - IPython.terminal.embed.embed(**kwargs)
+    + IPython.terminal.embed.embed(*, header='', compile_flags='None', **kwargs)
+
+    - IPython.terminal.interactiveshell.TerminalInteractiveShell.interact(self, display_banner='<object object at 0xffffff>')
+    + IPython.terminal.interactiveshell.TerminalInteractiveShell.interact(self)
+
+    - IPython.terminal.interactiveshell.TerminalInteractiveShell.mainloop(self, display_banner='<object object at 0xffffff>')
+    + IPython.terminal.interactiveshell.TerminalInteractiveShell.mainloop(self)
+
+    - IPython.utils.path.get_py_filename(name, force_win32='None')
+    + IPython.utils.path.get_py_filename(name)
+
+The following are new attributes (that might be inherited)::
+
+    + IPython.core.completer.IPCompleter.unicode_names
+    + IPython.core.debugger.InterruptiblePdb.precmd
+    + IPython.core.debugger.Pdb.precmd
+    + IPython.core.ultratb.AutoFormattedTB.has_colors
+    + IPython.core.ultratb.ColorTB.has_colors
+    + IPython.core.ultratb.FormattedTB.has_colors
+    + IPython.core.ultratb.ListTB.has_colors
+    + IPython.core.ultratb.SyntaxTB.has_colors
+    + IPython.core.ultratb.TBTools.has_colors
+    + IPython.core.ultratb.VerboseTB.has_colors
+    + IPython.terminal.debugger.TerminalPdb.do_interact
+    + IPython.terminal.debugger.TerminalPdb.precmd
+
+The following attribute/methods have been removed::
+
+    - IPython.core.application.BaseIPythonApplication.deprecated_subcommands
+    - IPython.core.ultratb.AutoFormattedTB.format_records
+    - IPython.core.ultratb.ColorTB.format_records
+    - IPython.core.ultratb.FormattedTB.format_records
+    - IPython.terminal.embed.InteractiveShellEmbed.init_deprecation_warnings
+    - IPython.terminal.embed.InteractiveShellEmbed.init_readline
+    - IPython.terminal.embed.InteractiveShellEmbed.write
+    - IPython.terminal.embed.InteractiveShellEmbed.write_err
+    - IPython.terminal.interactiveshell.TerminalInteractiveShell.init_deprecation_warnings
+    - IPython.terminal.interactiveshell.TerminalInteractiveShell.init_readline
+    - IPython.terminal.interactiveshell.TerminalInteractiveShell.write
+    - IPython.terminal.interactiveshell.TerminalInteractiveShell.write_err
+    - IPython.terminal.ipapp.LocateIPythonApp.deprecated_subcommands
+    - IPython.terminal.ipapp.LocateIPythonApp.initialize_subcommand
+    - IPython.terminal.ipapp.TerminalIPythonApp.deprecated_subcommands
+    - IPython.terminal.ipapp.TerminalIPythonApp.initialize_subcommand

From 8209e4bffdc2154f3514831165e58502e49c9ba6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 5 Jan 2022 10:48:51 +0100
Subject: [PATCH 1019/1407] release 8.0.0rc1

---
 IPython/core/release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 87f5e5818b7..0876d2da8d4 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -19,8 +19,8 @@
 _version_minor = 0
 _version_patch = 0
 _version_extra = ".dev"
-# _version_extra = "b1"
-# # _version_extra = ""  # Uncomment this for full releases
+_version_extra = "rc1"
+# _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From c7def1d73a4dd7a6f7f843ddbe85004b8c2ed7c8 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 5 Jan 2022 10:49:20 +0100
Subject: [PATCH 1020/1407] back to dev

---
 IPython/core/release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 0876d2da8d4..0651caf04b5 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -19,8 +19,8 @@
 _version_minor = 0
 _version_patch = 0
 _version_extra = ".dev"
-_version_extra = "rc1"
-# _version_extra = ""  # Uncomment this for full releases
+# _version_extra = "rc1"
+# # _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From c08e8c6a75e2aa46f4befb62cdbf8b58a91ea37e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Hendrik=20M=C3=BCller?=
 <44469195+kolibril13@users.noreply.github.com>
Date: Thu, 6 Jan 2022 21:01:46 +0100
Subject: [PATCH 1021/1407] added second example

---
 IPython/core/magic_arguments.py | 34 +++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/IPython/core/magic_arguments.py b/IPython/core/magic_arguments.py
index 9231609572e..d147229512b 100644
--- a/IPython/core/magic_arguments.py
+++ b/IPython/core/magic_arguments.py
@@ -37,6 +37,40 @@ def magic_cool(self, arg):
           -o OPTION, --option OPTION
                                 An optional argument.
 
+
+Here is an elaborated example that uses default parameters in `argument` and calls the `args` in the cell magic::
+
+    from IPython.core.magic import register_cell_magic
+    from IPython.core.magic_arguments import (argument, magic_arguments,
+                                            parse_argstring)
+
+
+    @magic_arguments()
+    @argument(
+        "--option",
+        "-o",
+        help=("Add an option here"),
+    )
+    @argument(
+        "--style",
+        "-s",
+        default="foo",
+        help=("Add some style arguments"),
+    )
+    @register_cell_magic
+    def my_cell_magic(line, cell):
+        args = parse_argstring(my_cell_magic, line)
+        print(f"{args.option=}")
+        print(f"{args.style=}")
+        print(f"{cell=}")
+
+In a jupyter notebook, this cell magic can be executed like this::
+
+    %%my_cell_magic -o Hello
+    print("bar")
+    i = 42
+
+
 Inheritance diagram:
 
 .. inheritance-diagram:: IPython.core.magic_arguments

From 6fe9697c3581795145acb0a7a628fdd8e89ec379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Hendrik=20M=C3=BCller?=
 <44469195+kolibril13@users.noreply.github.com>
Date: Thu, 6 Jan 2022 21:46:20 +0100
Subject: [PATCH 1022/1407] remove blank lines

---
 IPython/core/magic_arguments.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/IPython/core/magic_arguments.py b/IPython/core/magic_arguments.py
index d147229512b..568abd82ae0 100644
--- a/IPython/core/magic_arguments.py
+++ b/IPython/core/magic_arguments.py
@@ -37,7 +37,6 @@ def magic_cool(self, arg):
           -o OPTION, --option OPTION
                                 An optional argument.
 
-
 Here is an elaborated example that uses default parameters in `argument` and calls the `args` in the cell magic::
 
     from IPython.core.magic import register_cell_magic
@@ -70,7 +69,6 @@ def my_cell_magic(line, cell):
     print("bar")
     i = 42
 
-
 Inheritance diagram:
 
 .. inheritance-diagram:: IPython.core.magic_arguments

From f1017124faca066c91e51f4e6018f86d420b75cb Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 7 Jan 2022 11:32:07 +0100
Subject: [PATCH 1023/1407] NEP 29, bump numpy

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 2ddebd64d54..0ca070e9a24 100644
--- a/setup.py
+++ b/setup.py
@@ -160,7 +160,7 @@
         "curio",
         "matplotlib!=3.2.0",
         "nbformat",
-        "numpy>=1.17",
+        "numpy>=1.19",
         "pandas",
         "pygments",
         "trio",

From 3026c205487897f6874b2ff580fe0be33e36e033 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 7 Jan 2022 11:51:19 +0100
Subject: [PATCH 1024/1407] fix highlighting of ast nodes in traceback.

Using ansi mean it will follow terminal colorscheme
---
 IPython/core/ultratb.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index c03a6c32d3b..1f08fa51ed2 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -826,8 +826,8 @@ def get_records(
         after = context // 2
         before = context - after
         if self.has_colors:
-            style = get_style_by_name('default')
-            style = stack_data.style_with_executing_node(style, 'bg:#00005f')
+            style = get_style_by_name("default")
+            style = stack_data.style_with_executing_node(style, "bg:ansiyellow")
             formatter = Terminal256Formatter(style=style)
         else:
             formatter = None

From cb6563dcd85783ea0a687fbe227c4782a8a7cadf Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 10 Jan 2022 09:28:10 +0100
Subject: [PATCH 1025/1407] Fix and test for "async with does not allow new
 lines".

Use the opportunity to add a test, and parametrise a few other, plus set
the correct stacklevel.

Closes #12975
---
 IPython/core/inputtransformer2.py            | 12 ++---
 IPython/core/tests/test_inputtransformer2.py | 46 +++++++++++++-------
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index 85d448a727f..3a560073b22 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -507,9 +507,12 @@ def make_tokens_by_line(lines:List[str]):
 
     #   reexported from token on 3.7+
     NEWLINE, NL = tokenize.NEWLINE, tokenize.NL  # type: ignore
-    tokens_by_line:List[List[Any]] = [[]]
-    if len(lines) > 1 and not lines[0].endswith(('\n', '\r', '\r\n', '\x0b', '\x0c')):
-        warnings.warn("`make_tokens_by_line` received a list of lines which do not have lineending markers ('\\n', '\\r', '\\r\\n', '\\x0b', '\\x0c'), behavior will be unspecified")
+    tokens_by_line: List[List[Any]] = [[]]
+    if len(lines) > 1 and not lines[0].endswith(("\n", "\r", "\r\n", "\x0b", "\x0c")):
+        warnings.warn(
+            "`make_tokens_by_line` received a list of lines which do not have lineending markers ('\\n', '\\r', '\\r\\n', '\\x0b', '\\x0c'), behavior will be unspecified",
+            stacklevel=2,
+        )
     parenlev = 0
     try:
         for token in tokenize.generate_tokens(iter(lines).__next__):
@@ -782,9 +785,6 @@ def __init__(self, extra_flags=0):
         super().__init__()
         self.flags |= extra_flags
 
-    def __call__(self, *args, **kwds):
-        return compile(*args, **kwds)
-
 
 class MaybeAsyncCommandCompiler(CommandCompiler):
     def __init__(self, extra_flags=0):
diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index 2207cdfb48c..bc40721c9ff 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -4,6 +4,7 @@
 more complex. See test_inputtransformer2_line for tests for line-based
 transformations.
 """
+import platform
 import string
 import sys
 from textwrap import dedent
@@ -319,7 +320,16 @@ def test_check_complete():
     assert cc("def f():\n  x=0\n  \\\n  ") == ("incomplete", 2)
 
 
-def test_check_complete_II():
+@pytest.mark.skipif(platform.python_implementation() == "PyPy", reason="fail on pypy")
+@pytest.mark.parametrize(
+    "value, expected",
+    [
+        ('''def foo():\n    """''', ("incomplete", 4)),
+        ("""async with example:\n    pass""", ("incomplete", 4)),
+        ("""async with example:\n    pass\n    """, ("complete", None)),
+    ],
+)
+def test_check_complete_II(value, expected):
     """
     Test that multiple line strings are properly handled.
 
@@ -327,25 +337,31 @@ def test_check_complete_II():
 
     """
     cc = ipt2.TransformerManager().check_complete
-    assert cc('''def foo():\n    """''') == ("incomplete", 4)
-
-
-def test_check_complete_invalidates_sunken_brackets():
+    assert cc(value) == expected
+
+
+@pytest.mark.parametrize(
+    "value, expected",
+    [
+        (")", ("invalid", None)),
+        ("]", ("invalid", None)),
+        ("}", ("invalid", None)),
+        (")(", ("invalid", None)),
+        ("][", ("invalid", None)),
+        ("}{", ("invalid", None)),
+        ("]()(", ("invalid", None)),
+        ("())(", ("invalid", None)),
+        (")[](", ("invalid", None)),
+        ("()](", ("invalid", None)),
+    ],
+)
+def test_check_complete_invalidates_sunken_brackets(value, expected):
     """
     Test that a single line with more closing brackets than the opening ones is
     interpreted as invalid
     """
     cc = ipt2.TransformerManager().check_complete
-    assert cc(")") == ("invalid", None)
-    assert cc("]") == ("invalid", None)
-    assert cc("}") == ("invalid", None)
-    assert cc(")(") == ("invalid", None)
-    assert cc("][") == ("invalid", None)
-    assert cc("}{") == ("invalid", None)
-    assert cc("]()(") == ("invalid", None)
-    assert cc("())(") == ("invalid", None)
-    assert cc(")[](") == ("invalid", None)
-    assert cc("()](") == ("invalid", None)
+    assert cc(value) == expected
 
 
 def test_null_cleanup_transformer():

From fcb41dff8821411769b405c82c9eabaccf8e834b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 11 Jan 2022 08:39:38 +0100
Subject: [PATCH 1026/1407] xfail pypy

---
 IPython/core/tests/test_inputtransformer2.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index bc40721c9ff..abc63031d3a 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -292,6 +292,7 @@ def test_check_complete_param(code, expected, number):
     assert cc(code) == (expected, number)
 
 
+@pytest.mark.xfail(platform.python_implementation() == "PyPy", reason="fail on pypy")
 @pytest.mark.xfail(
     reason="Bug in python 3.9.8 – bpo 45738",
     condition=sys.version_info in [(3, 9, 8, "final", 0), (3, 11, 0, "alpha", 2)],
@@ -320,7 +321,7 @@ def test_check_complete():
     assert cc("def f():\n  x=0\n  \\\n  ") == ("incomplete", 2)
 
 
-@pytest.mark.skipif(platform.python_implementation() == "PyPy", reason="fail on pypy")
+@pytest.mark.xfail(platform.python_implementation() == "PyPy", reason="fail on pypy")
 @pytest.mark.parametrize(
     "value, expected",
     [

From ede2b7f4f7b565c7166d5c1a5f29dc0dd7f78ed8 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 12 Jan 2022 14:01:01 +0100
Subject: [PATCH 1027/1407] remove old whatsnew

---
 docs/source/whatsnew/pr/12984-process-time.rst | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 docs/source/whatsnew/pr/12984-process-time.rst

diff --git a/docs/source/whatsnew/pr/12984-process-time.rst b/docs/source/whatsnew/pr/12984-process-time.rst
deleted file mode 100644
index 9957d5394b5..00000000000
--- a/docs/source/whatsnew/pr/12984-process-time.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-windows time-implementation: Switch to process_time
-===================================================
-Timing for example with ``%%time`` on windows is based on ``time.perf_counter``.
-This is at the end the same as W-All.
-To be a bit tighter to linux one could change to ``time.process_time`` instead.
-Thus for example one would no longer count periods of sleep and further.

From a7de9daf77f35e43c3f993fba602e426b17bafda Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 12 Jan 2022 14:06:47 +0100
Subject: [PATCH 1028/1407] update

---
 tools/gh_api.py | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/tools/gh_api.py b/tools/gh_api.py
index d68bcc8677e..2a34e6a6e86 100644
--- a/tools/gh_api.py
+++ b/tools/gh_api.py
@@ -47,33 +47,11 @@ def get_auth_token():
     if token is not None:
         return token
 
-    print("Please enter your github username and password. These are not "
-          "stored, only used to get an oAuth token. You can revoke this at "
-          "any time on Github.\n"
-          "Username: ", file=sys.stderr, end='')
-    user = input('')
-    pw = getpass.getpass("Password: ", stream=sys.stderr)
-
-    auth_request = {
-      "scopes": [
-        "public_repo",
-        "gist"
-      ],
-      "note": "IPython tools %s" % socket.gethostname(),
-      "note_url": "https://github.com/ipython/ipython/tree/master/tools",
-    }
-    response = requests.post('https://api.github.com/authorizations',
-                            auth=(user, pw), data=json.dumps(auth_request))
-    if response.status_code == 401 and \
-            'required;' in response.headers.get('X-GitHub-OTP', ''):
-        print("Your login API requested a one time password", file=sys.stderr)
-        otp = getpass.getpass("One Time Password: ", stream=sys.stderr)
-        response = requests.post('https://api.github.com/authorizations',
-                            auth=(user, pw), 
-                            data=json.dumps(auth_request),
-                            headers={'X-GitHub-OTP':otp})
-    response.raise_for_status()
-    token = json.loads(response.text)['token']
+    print(
+        "Get a token fom https://github.com/settings/tokens with public repo and gist."
+    )
+    token = getpass.getpass("Token: ", stream=sys.stderr)
+
     keyring.set_password('github', fake_username, token)
     return token
 

From 5b8c2f314a5c111c94d19a0c8f99cd4c0e3813e5 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 12 Jan 2022 14:16:02 +0100
Subject: [PATCH 1029/1407] gen stats

---
 docs/source/whatsnew/github-stats-8.rst | 110 ++++++++++++++++++++++++
 docs/source/whatsnew/index.rst          |   1 +
 2 files changed, 111 insertions(+)
 create mode 100644 docs/source/whatsnew/github-stats-8.rst

diff --git a/docs/source/whatsnew/github-stats-8.rst b/docs/source/whatsnew/github-stats-8.rst
new file mode 100644
index 00000000000..158589b22a1
--- /dev/null
+++ b/docs/source/whatsnew/github-stats-8.rst
@@ -0,0 +1,110 @@
+Get a token fom https://github.com/settings/tokens with public repo and gist.
+
+GitHub stats for 2022/01/05 - 2022/01/12 (tag: 8.0.0rc1)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 26 issues and merged 307 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A8.0>`__
+
+The following 99 authors contributed 372 commits.
+
+* 007vedant
+* Adam Hackbarth
+* Aditya Sathe
+* Ahmed Fasih
+* Albert Zhang
+* Alex Hall
+* Andrew Port
+* Ankitsingh6299
+* Arthur Moreira
+* Ashwin Vishnu
+* Augusto
+* BaoGiang HoangVu
+* bar-hen
+* Bart Skowron
+* Bartosz Telenczuk
+* Bastian Ebeling
+* Benjamin Ragan-Kelley
+* Blazej Michalik
+* blois
+* Boyuan Liu
+* Brendan Gerrity
+* Carol Willing
+* Coco Bennett
+* Coco Mishra
+* Corentin Cadiou
+* Daniel Goldfarb
+* Daniel Mietchen
+* Daniel Shimon
+* digitalvirtuoso
+* Dimitri Papadopoulos
+* dswij
+* Eric Wieser
+* Erik
+* Ethan Madden
+* Faris A Chugthai
+* farisachugthai
+* Gal B
+* gorogoroumaru
+* Hussaina Begum Nandyala
+* Inception95
+* Iwan Briquemont
+* Jake VanderPlas
+* Jakub Klus
+* James Morris
+* Jay Qi
+* Jeroen Bédorf
+* Joyce Er
+* juacrumar
+* Juan Luis Cano Rodríguez
+* Julien Rabinow
+* Justin Palmer
+* Krzysztof Cybulski
+* L0uisJ0shua
+* lbennett
+* LeafyLi
+* Lightyagami1
+* Lumir Balhar
+* Mark Schmitz
+* Martin Skarzynski
+* martinRenou
+* Matt Wozniski
+* Matthias Bussonnier
+* Meysam Azad
+* Michael T
+* Michael Tiemann
+* Naelson Douglas
+* Nathan Goldbaum
+* Nick Muoh
+* nicolaslazo
+* Nikita Kniazev
+* NotWearingPants
+* Paul Ivanov
+* Paulo S. Costa
+* Pete Blois
+* Peter Corke
+* PhanatosZou
+* Piers Titus van der Torren
+* Rakessh Roshan
+* Ram Rachum
+* rchiodo
+* Reilly Tucker Siemens
+* Romulo Filho
+* rushabh-v
+* Sammy Al Hashemi
+* Samreen Zarroug
+* Samuel Gaist
+* Sanjana-03
+* Scott Sanderson
+* skalaydzhiyski
+* sleeping
+* Snir Broshi
+* Spas Kalaydzhisyki
+* Sylvain Corlay
+* Terry Davis
+* Timur Kushukov
+* Tobias Bengfort
+* Tomasz Kłoczko
+* Yonatan Goldschmidt
+* 谭九鼎
diff --git a/docs/source/whatsnew/index.rst b/docs/source/whatsnew/index.rst
index 8eecbb9006c..542bc07de81 100644
--- a/docs/source/whatsnew/index.rst
+++ b/docs/source/whatsnew/index.rst
@@ -34,6 +34,7 @@ development work they do here in a user friendly format.
    :maxdepth: 1
 
    version8
+   github-stats-8
    version7
    github-stats-7
    version6

From b8d7dfa8d78108f3f01486d9fa67b6841acb8f74 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 12 Jan 2022 14:22:44 +0100
Subject: [PATCH 1030/1407] release 8.0.0

---
 IPython/core/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 0651caf04b5..794d6267b7e 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,7 +20,7 @@
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-# # _version_extra = ""  # Uncomment this for full releases
+_version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From c0abea7a6dfe52c1f74c9d0387d4accadba7cc14 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 12 Jan 2022 14:25:09 +0100
Subject: [PATCH 1031/1407] back to dev

---
 IPython/core/release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 794d6267b7e..c1c90b13bf2 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -16,11 +16,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 8
-_version_minor = 0
+_version_minor = 1
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-_version_extra = ""  # Uncomment this for full releases
+# _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 2c0ce2ad148d997d4f8db8794e101220cb1419e9 Mon Sep 17 00:00:00 2001
From: Jonathan Allen Grant <jonathanallengrant@gmail.com>
Date: Wed, 12 Jan 2022 15:02:26 -0500
Subject: [PATCH 1032/1407] Typo

---
 docs/source/whatsnew/version8.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 640b48acc52..1cc3fa42b3b 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -64,7 +64,7 @@ which was just a shim module around ``ipykernel`` for the past 8 years have been
 remove, and so many other similar things that pre-date the name **Jupyter**
 itself.
 
-We no longer need to add ``IPyhton.extensions`` to the PYTHONPATH because that is being
+We no longer need to add ``IPython.extensions`` to the PYTHONPATH because that is being
 handled by ``load_extension``.
 
 We are also removing ``Cythonmagic``, ``sympyprinting`` and ``rmagic`` as they are now in

From 8f0a7ed29ace63422d3349d5650884b7ce1f76f0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 15 Jan 2022 19:44:29 +0100
Subject: [PATCH 1033/1407] Add title to fix doc build

---
 docs/source/whatsnew/github-stats-8.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/github-stats-8.rst b/docs/source/whatsnew/github-stats-8.rst
index 158589b22a1..0c8589cb308 100644
--- a/docs/source/whatsnew/github-stats-8.rst
+++ b/docs/source/whatsnew/github-stats-8.rst
@@ -1,4 +1,5 @@
-Get a token fom https://github.com/settings/tokens with public repo and gist.
+Issues closed in the 8.x development cycle
+==========================================
 
 GitHub stats for 2022/01/05 - 2022/01/12 (tag: 8.0.0rc1)
 

From d1d92425877edcd01c16f336dec69192422de66e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 17 Jan 2022 12:16:57 +0100
Subject: [PATCH 1034/1407] disable latex

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9c1083f43de..535eddcc968 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -53,7 +53,7 @@ jobs:
         cache: pip
     - name: Install latex
       if: runner.os == 'Linux' && matrix.deps == 'test_extra'
-      run: sudo apt-get -yq -o Acquire::Retries=3 --no-install-suggests --no-install-recommends install texlive dvipng
+      run: echo "disable latex for now, issues in mirros" #sudo apt-get -yq -o Acquire::Retries=3 --no-install-suggests --no-install-recommends install texlive dvipng
     - name: Install and update Python dependencies
       run: |
         python -m pip install --upgrade pip setuptools wheel build

From ab2a05cc6ef140e2a3d91d1986c6696dc4d168c7 Mon Sep 17 00:00:00 2001
From: Jason Grout <jasongrout@users.noreply.github.com>
Date: Fri, 14 Jan 2022 13:57:52 -0800
Subject: [PATCH 1035/1407] Light editing of 8.0 what's new

---
 docs/source/whatsnew/version8.rst | 152 ++++++++++++++----------------
 1 file changed, 72 insertions(+), 80 deletions(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 640b48acc52..9091fd4fc29 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -5,9 +5,6 @@
 IPython 8.0
 -----------
 
-IPython 8.0 is still in alpha/beta stage. Please help us improve those release notes
-by sending PRs that modify docs/source/whatsnew/version8.rst
-
 IPython 8.0 is bringing a large number of new features and improvements to both the
 user of the terminal and of the kernel via Jupyter. The removal of compatibility
 with older version of Python is also the opportunity to do a couple of
@@ -15,24 +12,24 @@ performance improvement in particular with respect to startup time.
 The 8.x branch started diverging from its predecessor around IPython 7.12
 (January 2020).
 
-This release contains 250+ Pull Requests, in addition to many of the features
+This release contains 250+ pull requests, in addition to many of the features
 and backports that have made it to the 7.x branch. All PRs that went into this
 released are properly tagged with the 8.0 milestone if you wish to have a more
 in depth look at the changes.
 
-Please fell free to send pull-requests to updates those notes after release, 
+Please fell free to send pull requests to updates those notes after release, 
 I have likely forgotten a few things reviewing 250+ PRs.
 
 Dependencies changes/downstream packaging
 -----------------------------------------
 
-Note that most of our building step have been changes to be (mostly) declarative
-and follow PEP 517, we are trying to completely remove ``setup.py`` (:ghpull:`13238`) and are
+Most of our building steps have been changed to be (mostly) declarative
+and follow PEP 517. We are trying to completely remove ``setup.py`` (:ghpull:`13238`) and are
 looking for help to do so.
 
- - Minimum supported ``traitlets`` version if now 5+
+ - minimum supported ``traitlets`` version is now 5+
  - we now require ``stack_data``
- - Minimal Python is now 3.8
+ - minimal Python is now 3.8
  - ``nose`` is not a testing requirement anymore
  - ``pytest`` replaces nose.
  - ``iptest``/``iptest3`` cli entrypoints do not exists anymore. 
@@ -44,24 +41,24 @@ Deprecation and removal
 -----------------------
 
 We removed almost all features, arguments, functions, and modules that were
-marked as deprecated between IPython 1.0 and 5.0. As reminder 5.0 was released
-in 2016, and 1.0 in 2013. Last release of the 5 branch was 5.10.0, in may 2020.
+marked as deprecated between IPython 1.0 and 5.0. As a reminder, 5.0 was released
+in 2016, and 1.0 in 2013. Last release of the 5 branch was 5.10.0, in May 2020.
 The few remaining deprecated features we left have better deprecation warnings
 or have been turned into explicit errors for better error messages.
 
 I will use this occasion to add the following requests to anyone emitting a
 deprecation warning:
 
- - Please at at least ``stacklevel=2`` so that the warning is emitted into the
+ - Please use at least ``stacklevel=2`` so that the warning is emitted into the
    caller context, and not the callee one.
  - Please add **since which version** something is deprecated.
 
-As a side note it is much easier to deal with conditional comparing to versions
-numbers than ``try/except`` when a functionality change with version. 
+As a side note, it is much easier to conditionally compare version
+numbers rather than using ``try/except`` when functionality changes with a version. 
 
 I won't list all the removed features here, but modules like ``IPython.kernel``,
-which was just a shim module around ``ipykernel`` for the past 8 years have been
-remove, and so many other similar things that pre-date the name **Jupyter**
+which was just a shim module around ``ipykernel`` for the past 8 years, have been
+removed, and so many other similar things that pre-date the name **Jupyter**
 itself.
 
 We no longer need to add ``IPyhton.extensions`` to the PYTHONPATH because that is being
@@ -74,15 +71,15 @@ other packages and no longer need to be inside IPython.
 Documentation
 -------------
 
-Majority of our docstrings have now been reformatted and automatically fixed by
-the experimental `Vélin <https://pypi.org/project/velin/>`_ project, to conform
+The majority of our docstrings have now been reformatted and automatically fixed by
+the experimental `Vélin <https://pypi.org/project/velin/>`_ project to conform
 to numpydoc.
 
 Type annotations
 ----------------
 
 While IPython itself is highly dynamic and can't be completely typed, many of
-the function now have type annotation, and part of the codebase and now checked
+the functions now have type annotations, and part of the codebase is now checked
 by mypy.
 
 
@@ -92,9 +89,9 @@ Featured changes
 Here is a features list of changes in IPython 8.0. This is of course non-exhaustive. 
 Please note as well that many features have been added in the 7.x branch as well
 (and hence why you want to read the 7.x what's new notes), in particular
-features contributed by QuantStack (with respect to debugger protocol, and Xeus
-Python), as well as many debugger features that I was please to implement as
-part of my work at QuanSight and Sponsored by DE Shaw.
+features contributed by QuantStack (with respect to debugger protocol and Xeus
+Python), as well as many debugger features that I was pleased to implement as
+part of my work at QuanSight and sponsored by DE Shaw.
 
 Traceback improvements
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -137,9 +134,8 @@ The error traceback is now correctly formatted, showing the cell number in which
 
     ZeroDivisionError: division by zero
 
-The Second on is the integration of the ``stack_data`` package;
-which provide smarter informations in traceback; in particular it will highlight
-the AST node where an error occurs which can help to quickly narrow down errors.
+The ``stack_data`` package has been integrated, which provides smarter information in the traceback; 
+in particular it will highlight the AST node where an error occurs which can help to quickly narrow down errors.
 
 For example in the following snippet::
 
@@ -154,8 +150,8 @@ For example in the following snippet::
         ) + foo(2)
 
 
-Calling ``bar()`` would raise an ``IndexError`` on the return line of ``foo``,
-IPython 8.0 is capable of telling you, where the index error occurs::
+calling ``bar()`` would raise an ``IndexError`` on the return line of ``foo``,
+and IPython 8.0 is capable of telling you where the index error occurs::
 
 
     IndexError
@@ -178,11 +174,10 @@ IPython 8.0 is capable of telling you, where the index error occurs::
     ----> 3     return x[0][i][0]
                        ^^^^^^^
 
-Corresponding location marked here with ``^`` will show up highlighted in 
-terminal and notebooks.
+The corresponding locations marked here with ``^`` will show up highlighted in 
+the terminal and notebooks.
 
-The Third, which is the most discreet but can have a high impact on
-productivity, a colon ``::`` and line number is appended after a filename in
+Finally, a colon ``::`` and line number is appended after a filename in
 traceback::
 
 
@@ -196,8 +191,9 @@ traceback::
           1 def f():
     ----> 2     1/0
 
-Many terminal and editor have integrations allow to directly jump to the
-relevant file/line when this syntax is used.
+Many terminals and editors have integrations enabling you to directly jump to the
+relevant file/line when this syntax is used, so this small addition may have a high
+impact on productivity.
 
 
 Autosuggestons
@@ -274,7 +270,7 @@ Show pinfo information in ipdb using "?" and "??"
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 In IPDB, it is now possible to show the information about an object using "?"
-and "??", in much the same way it can be done when using the IPython prompt::
+and "??", in much the same way that it can be done when using the IPython prompt::
 
     ipdb> partial?
     Init signature: partial(self, /, *args, **kwargs)
@@ -291,14 +287,14 @@ Previously, ``pinfo`` or ``pinfo2`` command had to be used for this purpose.
 Autoreload 3 feature
 ~~~~~~~~~~~~~~~~~~~~
 
-Example: When an IPython session is ran with the 'autoreload' extension loaded,
-you will now have the option '3' to select which means the following:
+Example: When an IPython session is run with the 'autoreload' extension loaded,
+you will now have the option '3' to select, which means the following:
 
     1. replicate all functionality from option 2
     2. autoload all new funcs/classes/enums/globals from the module when they are added
     3. autoload all newly imported funcs/classes/enums/globals from external modules
 
-Try ``%autoreload 3`` in an IPython session after running ``%load_ext autoreload``
+Try ``%autoreload 3`` in an IPython session after running ``%load_ext autoreload``.
 
 For more information please see the following unit test : ``extensions/tests/test_autoreload.py:test_autoload_newly_added_objects``
 
@@ -309,7 +305,7 @@ If ``black`` is installed in the same environment as IPython, terminal IPython
 will now *by default*  reformat the code in the CLI when possible. You can
 disable this with ``--TerminalInteractiveShell.autoformatter=None``.
 
-This feature was present in 7.x but disabled by default.
+This feature was present in 7.x, but disabled by default.
 
 
 History Range Glob feature
@@ -336,10 +332,10 @@ then the glob pattern would be used (globbing *all* history) *and the range woul
 
 With this enhancement, if a user specifies both a range and a glob pattern, then the glob pattern will be applied to the specified range of history.
 
-Don't start a multi line cell with sunken parenthesis
+Don't start a multi-line cell with sunken parenthesis
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-From now on IPython will not ask for the next line of input when given a single
+From now on, IPython will not ask for the next line of input when given a single
 line with more closing than opening brackets. For example, this means that if
 you (mis)type ``]]`` instead of ``[]``, a ``SyntaxError`` will show up, instead of
 the ``...:`` prompt continuation.
@@ -394,89 +390,85 @@ Using them this way will make them take the history of the current session up
 to the point of the magic call (such that the magic itself will not be
 included).
 
-Therefore it is now possible to save the whole history to a file using simple
+Therefore it is now possible to save the whole history to a file using
 ``%save <filename>``, load and edit it using ``%load`` (makes for a nice usage
 when followed with :kbd:`F2`), send it to `dpaste.org <http://dpast.org>`_ using
 ``%pastebin``, or view the whole thing syntax-highlighted with a single
 ``%pycat``.
 
 
-Windows time-implementation: Switch to process_time
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Timing for example with ``%%time`` on windows is based on ``time.perf_counter``.
-This is at the end the same as W-All.
-To be a bit tighter to linux one could change to ``time.process_time`` instead.
-Thus for example one would no longer count periods of sleep and further.
-
+Windows timing implementation: Switch to process_time
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Timing on Windows, for example with ``%%time``,  was changed from being based on ``time.perf_counter`` 
+(which counted time even when the process was sleeping) to being based on ``time.process_time`` instead 
+(which only counts CPU time). This brings it closer to the behavior on Linux. See :ghpull:`12984`.
 
 Miscellaneous
 ~~~~~~~~~~~~~
- - Non-text formatters are not disabled in terminal which should simplify
-   writing extension displaying images or other mimetypes supporting terminals.
+ - Non-text formatters are not disabled in the terminal, which should simplify
+   writing extensions displaying images or other mimetypes in supporting terminals.
    :ghpull:`12315`
- -
  - It is now possible to automatically insert matching brackets in Terminal IPython using the
    ``TerminalInteractiveShell.auto_match=True`` option. :ghpull:`12586`
- - We are thinking of deprecating the current ``%%javascript`` magic in favor of a better replacement. See :ghpull:`13376`
- - ``%time`` uses ``process_time`` instead of  ``perf_counter``, see :ghpull:`12984`
+ - We are thinking of deprecating the current ``%%javascript`` magic in favor of a better replacement. See :ghpull:`13376`.
  - ``~`` is now expanded when part of a path in most magics :ghpull:`13385`
- - ``%/%%timeit`` magic now adds comma every thousands to make reading long number easier :ghpull:`13379`
+ - ``%/%%timeit`` magic now adds a comma every thousands to make reading a long number easier :ghpull:`13379`
  - ``"info"`` messages can now be customised to hide some fields :ghpull:`13343`
  - ``collections.UserList`` now pretty-prints :ghpull:`13320`
- - The debugger now have a persistent history, which should make it less
+ - The debugger now has a persistent history, which should make it less
    annoying to retype commands :ghpull:`13246`
- - ``!pip`` ``!conda`` ``!cd`` or ``!ls`` are likely doing the wrong thing, we
-   now warn users if they use it. :ghpull:`12954`
- - make ``%precision`` work for ``numpy.float64`` type :ghpull:`12902`
+ - ``!pip`` ``!conda`` ``!cd`` or ``!ls`` are likely doing the wrong thing. We
+   now warn users if they use one of those commands. :ghpull:`12954`
+ - Make ``%precision`` work for ``numpy.float64`` type :ghpull:`12902`
 
 Re-added support for XDG config directories
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-XDG support through the years did come an go, there is a tension between having
-identical location in all platforms to have simple instructions. After initial
-failure a couple of years ago IPython was modified to automatically migrate XDG
-config files back into ``~/.ipython``, the migration code has now been removed.
-And IPython now check the XDG locations, so if you _manually_ move your config
+XDG support through the years comes and goes. There is a tension between having
+an identical location for configuration in all platforms versus having simple instructions. 
+After initial failures a couple of years ago, IPython was modified to automatically migrate XDG
+config files back into ``~/.ipython``. That migration code has now been removed.
+IPython now checks the XDG locations, so if you _manually_ move your config
 files to your preferred location, IPython will not move them back.
 
 
-Numfocus Small Developer Grant
-------------------------------
+Preparing for Python 3.10
+-------------------------
 
-To prepare for Python 3.10 we have also started working on removing reliance and
-any dependency that is not Python 3.10 compatible; that include migrating our
-test suite to pytest, and starting to remove nose. This also mean that the
-``iptest`` command is now gone, and all testing is via pytest.
+To prepare for Python 3.10, we have started working on removing reliance and
+any dependency that is not compatible with Python 3.10. This includes migrating our
+test suite to pytest and starting to remove nose. This also means that the
+``iptest`` command is now gone and all testing is via pytest.
 
 This was in large part thanks to the NumFOCUS Small Developer grant, which enabled us to
 allocate \$4000 to hire `Nikita Kniazev (@Kojoley) <https://github.com/Kojoley>`_,
 who did a fantastic job at updating our code base, migrating to pytest, pushing
 our coverage, and fixing a large number of bugs. I highly recommend contacting
-them if you need help with C++ and Python projects
+them if you need help with C++ and Python projects.
 
 You can find all relevant issues and PRs with the SDG 2021 tag `<https://github.com/ipython/ipython/issues?q=label%3A%22Numfocus+SDG+2021%22+>`__
 
-Removing support for Older Python
----------------------------------
+Removing support for older Python versions
+------------------------------------------
 
 
-We are also removing support for Python up to 3.7 allowing internal code to use more
-efficient ``pathlib``, and make better use of type annotations. 
+We are removing support for Python up through 3.7, allowing internal code to use the more
+efficient ``pathlib`` and to make better use of type annotations. 
 
 .. image:: ../_images/8.0/pathlib_pathlib_everywhere.jpg
    :alt: "Meme image of Toy Story with Woody and Buzz, with the text 'pathlib, pathlib everywhere'"
 
 
-We have about 34 PRs only to update some logic to update some functions from managing strings to
+We had about 34 PRs only to update some logic to update some functions from managing strings to
 using Pathlib.
 
-The completer has also seen significant updates and make use of newer Jedi API
+The completer has also seen significant updates and now makes use of newer Jedi APIs,
 offering faster and more reliable tab completion.
 
 Misc Statistics
 ---------------
 
-Here are some numbers:
+Here are some numbers::
 
     7.x: 296 files, 12561 blank lines, 20282 comments, 35142 line of code.
     8.0: 252 files, 12053 blank lines, 19232 comments, 34505 line of code.
@@ -484,8 +476,8 @@ Here are some numbers:
     $ git diff --stat 7.x...master  | tail -1
     340 files changed, 13399 insertions(+), 12421 deletions(-)
 
-We have commits from 162 authors, who contributed 1916 commits in 23 month, excluding merges to not bias toward
-maintainers pushing buttons.::
+We have commits from 162 authors, who contributed 1916 commits in 23 month, excluding merges (to not bias toward
+maintainers pushing buttons).::
 
    $ git shortlog  -s --no-merges  7.x...master | sort -nr
    535	Matthias Bussonnier
@@ -649,7 +641,7 @@ maintainers pushing buttons.::
      1	Albert Zhang
      1	Adam Johnson
 
-This does not of course represent non-code contributions.
+This does not, of course, represent non-code contributions, for which we are also grateful.
 
 
 API Changes using Frappuccino

From 774ebbd5bc98c32ebf5913e63d1c5befeb0e4942 Mon Sep 17 00:00:00 2001
From: Jason Grout <jasongrout@users.noreply.github.com>
Date: Fri, 14 Jan 2022 14:05:59 -0800
Subject: [PATCH 1036/1407] Add a link to 8.0 milestone

---
 docs/source/whatsnew/version8.rst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 9091fd4fc29..78dcb6a2b1e 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -13,9 +13,8 @@ The 8.x branch started diverging from its predecessor around IPython 7.12
 (January 2020).
 
 This release contains 250+ pull requests, in addition to many of the features
-and backports that have made it to the 7.x branch. All PRs that went into this
-released are properly tagged with the 8.0 milestone if you wish to have a more
-in depth look at the changes.
+and backports that have made it to the 7.x branch. Please see the 
+`8.0 milestone <https://github.com/ipython/ipython/milestone/73?closed=1>`__ for the full list of pull requests.
 
 Please fell free to send pull requests to updates those notes after release, 
 I have likely forgotten a few things reviewing 250+ PRs.
@@ -61,7 +60,7 @@ which was just a shim module around ``ipykernel`` for the past 8 years, have bee
 removed, and so many other similar things that pre-date the name **Jupyter**
 itself.
 
-We no longer need to add ``IPyhton.extensions`` to the PYTHONPATH because that is being
+We no longer need to add ``IPython.extensions`` to the PYTHONPATH because that is being
 handled by ``load_extension``.
 
 We are also removing ``Cythonmagic``, ``sympyprinting`` and ``rmagic`` as they are now in

From 3a78d13b845087e13353d11c945e0cfab362a079 Mon Sep 17 00:00:00 2001
From: Nate Rush <naterush1997@gmail.com>
Date: Wed, 12 Jan 2022 15:16:42 -0500
Subject: [PATCH 1037/1407] utils/tests: move to pytest.mark.parameterize in
 test_text.py

---
 IPython/utils/tests/test_text.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/IPython/utils/tests/test_text.py b/IPython/utils/tests/test_text.py
index 72cbbcb711b..a073ba78af2 100644
--- a/IPython/utils/tests/test_text.py
+++ b/IPython/utils/tests/test_text.py
@@ -80,24 +80,22 @@ def test_columnize_random():
             )
 
 
-# TODO: pytest mark.parametrize once nose removed.
-def test_columnize_medium():
+@pytest.mark.parametrize('row_first', [True, False])
+def test_columnize_medium(row_first):
     """Test with inputs than shouldn't be wider than 80"""
     size = 40
     items = [l*size for l in 'abc']
-    for row_first in [True, False]:
-        out = text.columnize(items, row_first=row_first, displaywidth=80)
-        assert out == "\n".join(items + [""]), "row_first={0}".format(row_first)
+    out = text.columnize(items, row_first=row_first, displaywidth=80)
+    assert out == "\n".join(items + [""]), "row_first={0}".format(row_first)
 
 
-# TODO: pytest mark.parametrize once nose removed.
-def test_columnize_long():
+@pytest.mark.parametrize('row_first', [True, False])
+def test_columnize_long(row_first):
     """Test columnize with inputs longer than the display window"""
     size = 11
     items = [l*size for l in 'abc']
-    for row_first in [True, False]:
-        out = text.columnize(items, row_first=row_first, displaywidth=size - 1)
-        assert out == "\n".join(items + [""]), "row_first={0}".format(row_first)
+    out = text.columnize(items, row_first=row_first, displaywidth=size - 1)
+    assert out == "\n".join(items + [""]), "row_first={0}".format(row_first)
 
 
 def eval_formatter_check(f):

From b87aaf23fa6609df3698f96ed85b90615c463ba3 Mon Sep 17 00:00:00 2001
From: Nate Rush <naterush1997@gmail.com>
Date: Wed, 12 Jan 2022 15:23:30 -0500
Subject: [PATCH 1038/1407] utils/tests: move to pytest.mark.parameterize in
 test_process.py

---
 IPython/utils/tests/test_process.py | 48 ++++++++++++++---------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index 3ac479f048d..85235b49449 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -56,35 +56,33 @@ def test_find_cmd_fail():
     pytest.raises(FindCmdError, find_cmd, "asdfasdf")
 
 
-# TODO: move to pytest.mark.parametrize once nose gone
 @dec.skip_win32
-def test_arg_split():
+@pytest.mark.parametrize('argstr, argv', [
+    ('hi', ['hi']),
+    (u'hi', [u'hi']),
+    ('hello there', ['hello', 'there']),
+    # \u01ce == \N{LATIN SMALL LETTER A WITH CARON}
+    # Do not use \N because the tests crash with syntax error in
+    # some cases, for example windows python2.6.
+    (u'h\u01cello', [u'h\u01cello']),
+    ('something "with quotes"', ['something', '"with quotes"']),
+])
+def test_arg_split(argstr, argv):
     """Ensure that argument lines are correctly split like in a shell."""
-    tests = [['hi', ['hi']],
-             [u'hi', [u'hi']],
-             ['hello there', ['hello', 'there']],
-             # \u01ce == \N{LATIN SMALL LETTER A WITH CARON}
-             # Do not use \N because the tests crash with syntax error in
-             # some cases, for example windows python2.6.
-             [u'h\u01cello', [u'h\u01cello']],
-             ['something "with quotes"', ['something', '"with quotes"']],
-             ]
-    for argstr, argv in tests:
-        assert arg_split(argstr) == argv
-
-
-# TODO: move to pytest.mark.parametrize once nose gone
+    assert arg_split(argstr) == argv
+
+
 @dec.skip_if_not_win32
-def test_arg_split_win32():
+@pytest.mark.parametrize('argstr,argv', [
+    ('hi', ['hi']),
+    (u'hi', [u'hi']),
+    ('hello there', ['hello', 'there']),
+    (u'h\u01cello', [u'h\u01cello']),
+    ('something "with quotes"', ['something', 'with quotes']),
+])
+def test_arg_split_win32(argstr, argv):
     """Ensure that argument lines are correctly split like in a shell."""
-    tests = [['hi', ['hi']],
-             [u'hi', [u'hi']],
-             ['hello there', ['hello', 'there']],
-             [u'h\u01cello', [u'h\u01cello']],
-             ['something "with quotes"', ['something', 'with quotes']],
-             ]
-    for argstr, argv in tests:
-        assert arg_split(argstr) == argv
+    assert arg_split(argstr) == argv
 
 
 class SubProcessTestCase(tt.TempFileMixin):

From 2b5f5be6cc9ea546c64c0c71b00dd35918e7d920 Mon Sep 17 00:00:00 2001
From: Nate Rush <naterush1997@gmail.com>
Date: Wed, 12 Jan 2022 15:26:37 -0500
Subject: [PATCH 1039/1407] utils/tests: move to pytest.mark.parameterize in
 test_path.py

---
 IPython/utils/tests/test_path.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index a75b6d88467..120ac862d3c 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -406,13 +406,15 @@ def test_match_windows(self):
             self.check_match(patterns, matches)
 
 
-# TODO : pytest.mark.parametrise once nose is gone.
-def test_unescape_glob():
-    assert path.unescape_glob(r"\*\[\!\]\?") == "*[!]?"
-    assert path.unescape_glob(r"\\*") == r"\*"
-    assert path.unescape_glob(r"\\\*") == r"\*"
-    assert path.unescape_glob(r"\\a") == r"\a"
-    assert path.unescape_glob(r"\a") == r"\a"
+@pytest.mark.parametrize('globstr, unescaped_globstr', [
+    (r"\*\[\!\]\?", "*[!]?"),
+    (r"\\*", r"\*"),
+    (r"\\\*", r"\*"),
+    (r"\\a", r"\a"),
+    (r"\a", r"\a")
+])
+def test_unescape_glob(globstr, unescaped_globstr):
+    assert path.unescape_glob(globstr) == unescaped_globstr
 
 
 @onlyif_unicode_paths

From bf6638e6c934c06ab65bab001bc3aeaea5e0b209 Mon Sep 17 00:00:00 2001
From: Nate Rush <naterush1997@gmail.com>
Date: Wed, 12 Jan 2022 15:47:13 -0500
Subject: [PATCH 1040/1407] utils/tests: fix quotes in test_text.py

---
 IPython/utils/tests/test_path.py    | 17 +++++++-----
 IPython/utils/tests/test_process.py | 40 +++++++++++++++++------------
 IPython/utils/tests/test_text.py    |  4 +--
 3 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index 120ac862d3c..eb1511ceab0 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -406,13 +406,16 @@ def test_match_windows(self):
             self.check_match(patterns, matches)
 
 
-@pytest.mark.parametrize('globstr, unescaped_globstr', [
-    (r"\*\[\!\]\?", "*[!]?"),
-    (r"\\*", r"\*"),
-    (r"\\\*", r"\*"),
-    (r"\\a", r"\a"),
-    (r"\a", r"\a")
-])
+@pytest.mark.parametrize(
+    'globstr, unescaped_globstr', 
+    [
+        (r"\*\[\!\]\?", "*[!]?"),
+        (r"\\*", r"\*"),
+        (r"\\\*", r"\*"),
+        (r"\\a", r"\a"),
+        (r"\a", r"\a")
+    ]
+)
 def test_unescape_glob(globstr, unescaped_globstr):
     assert path.unescape_glob(globstr) == unescaped_globstr
 
diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index 85235b49449..79571ccbc9e 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -57,29 +57,35 @@ def test_find_cmd_fail():
 
 
 @dec.skip_win32
-@pytest.mark.parametrize('argstr, argv', [
-    ('hi', ['hi']),
-    (u'hi', [u'hi']),
-    ('hello there', ['hello', 'there']),
-    # \u01ce == \N{LATIN SMALL LETTER A WITH CARON}
-    # Do not use \N because the tests crash with syntax error in
-    # some cases, for example windows python2.6.
-    (u'h\u01cello', [u'h\u01cello']),
-    ('something "with quotes"', ['something', '"with quotes"']),
-])
+@pytest.mark.parametrize(
+    'argstr, argv', 
+    [
+        ('hi', ['hi']),
+        (u'hi', [u'hi']),
+        ('hello there', ['hello', 'there']),
+        # \u01ce == \N{LATIN SMALL LETTER A WITH CARON}
+        # Do not use \N because the tests crash with syntax error in
+        # some cases, for example windows python2.6.
+        (u'h\u01cello', [u'h\u01cello']),
+        ('something "with quotes"', ['something', '"with quotes"']),
+    ]
+)
 def test_arg_split(argstr, argv):
     """Ensure that argument lines are correctly split like in a shell."""
     assert arg_split(argstr) == argv
 
 
 @dec.skip_if_not_win32
-@pytest.mark.parametrize('argstr,argv', [
-    ('hi', ['hi']),
-    (u'hi', [u'hi']),
-    ('hello there', ['hello', 'there']),
-    (u'h\u01cello', [u'h\u01cello']),
-    ('something "with quotes"', ['something', 'with quotes']),
-])
+@pytest.mark.parametrize(
+    'argstr,argv', 
+    [
+        ('hi', ['hi']),
+        (u'hi', [u'hi']),
+        ('hello there', ['hello', 'there']),
+        (u'h\u01cello', [u'h\u01cello']),
+        ('something "with quotes"', ['something', 'with quotes']),
+    ]
+)
 def test_arg_split_win32(argstr, argv):
     """Ensure that argument lines are correctly split like in a shell."""
     assert arg_split(argstr) == argv
diff --git a/IPython/utils/tests/test_text.py b/IPython/utils/tests/test_text.py
index a073ba78af2..c036f5327c9 100644
--- a/IPython/utils/tests/test_text.py
+++ b/IPython/utils/tests/test_text.py
@@ -80,7 +80,7 @@ def test_columnize_random():
             )
 
 
-@pytest.mark.parametrize('row_first', [True, False])
+@pytest.mark.parametrize("row_first", [True, False])
 def test_columnize_medium(row_first):
     """Test with inputs than shouldn't be wider than 80"""
     size = 40
@@ -89,7 +89,7 @@ def test_columnize_medium(row_first):
     assert out == "\n".join(items + [""]), "row_first={0}".format(row_first)
 
 
-@pytest.mark.parametrize('row_first', [True, False])
+@pytest.mark.parametrize("row_first", [True, False])
 def test_columnize_long(row_first):
     """Test columnize with inputs longer than the display window"""
     size = 11

From 11f94ae18c8d2399d0e6e5260c9de322f4af7a31 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 13 Jan 2022 02:52:08 -0800
Subject: [PATCH 1041/1407] Create SECURITY.md

---
 MANIFEST.in | 1 +
 SECURITY.md | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/MANIFEST.in b/MANIFEST.in
index a66e7fa0487..c70c57d346f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -14,6 +14,7 @@ recursive-exclude tools *
 exclude tools
 exclude CONTRIBUTING.md
 exclude .editorconfig
+exclude SECURITY.md
 
 graft scripts
 
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 00000000000..a4b9435a975
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,6 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+All IPython and Jupyter security are handled via security@ipython.org. 
+You can find more informations on the Jupyter website. https://jupyter.org/security

From e902466b799651b1f74d1b682d3bc58f20c137e6 Mon Sep 17 00:00:00 2001
From: David Lowry-Duda <david@lowryduda.com>
Date: Fri, 14 Jan 2022 11:04:34 -0500
Subject: [PATCH 1042/1407] Require pygments>=2.4.0

As noted in #13441, running ipython with an old version of pygments
leads to problems. Ipython sends ANSI color names to pygments to color
output, but these names aren't in old versions of pygments.

Before: with pygments 2.3.1 and ipython 8.0.0, opening an ipython
instance and running

    In [1]: 1 / 0   # Expect ZeroDivisionError

will crash ipython as `ansiyellow` is used to highlight the error.

This PR requires pygments>=2.4.0, which is when pygments changed their
ANSI color names.
---
 setup.cfg | 2 +-
 setup.py  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index f0ba6cee7c4..d3f536dfb9a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -36,7 +36,7 @@ install_requires =
     pickleshare
     traitlets>=5
     prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1
-    pygments
+    pygments>=2.4.0
     backcall
     stack_data
     matplotlib-inline
diff --git a/setup.py b/setup.py
index 0ca070e9a24..e19d7ddec5b 100644
--- a/setup.py
+++ b/setup.py
@@ -152,7 +152,7 @@
         "pytest",
         "pytest-asyncio",
         "testpath",
-        "pygments",
+        "pygments>=2.4.0",
     ],
     test_extra=[
         "pytest",
@@ -162,7 +162,7 @@
         "nbformat",
         "numpy>=1.19",
         "pandas",
-        "pygments",
+        "pygments>=2.4.0",
         "trio",
     ],
     terminal=[],

From 0a5098c525a8f2cf0b171e292ad12dbdb9fda825 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 17 Jan 2022 15:33:19 +0100
Subject: [PATCH 1043/1407] Narrow down test running on branches.

If we do a quick fix we want to avoid running both PR and push test on
$user-patchX.
---
 .github/workflows/test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9c1083f43de..8a9a670b400 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,6 +2,10 @@ name: Run tests
 
 on:
   push:
+    branches:
+      - main
+      - master
+      - '*.x'
   pull_request:
   # Run weekly on Monday at 1:23 UTC
   schedule:

From 3c19cc4fda42f2a4183e45ef1c2d39c25ba4c5f2 Mon Sep 17 00:00:00 2001
From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
Date: Wed, 12 Jan 2022 21:51:48 +0530
Subject: [PATCH 1044/1407] Fix typo

---
 docs/source/whatsnew/version8.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 78dcb6a2b1e..95982fbce32 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -48,7 +48,7 @@ or have been turned into explicit errors for better error messages.
 I will use this occasion to add the following requests to anyone emitting a
 deprecation warning:
 
- - Please use at least ``stacklevel=2`` so that the warning is emitted into the
+ - Please add at least ``stacklevel=2`` so that the warning is emitted into the
    caller context, and not the callee one.
  - Please add **since which version** something is deprecated.
 

From d3c55c5781a402e985a97fb163ae5bf06f54420c Mon Sep 17 00:00:00 2001
From: Waylon Walker <quadmx08@gmail.com>
Date: Thu, 13 Jan 2022 19:52:55 -0600
Subject: [PATCH 1045/1407] correct version8.rst typos

---
 docs/source/whatsnew/version8.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 78dcb6a2b1e..95982fbce32 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -48,7 +48,7 @@ or have been turned into explicit errors for better error messages.
 I will use this occasion to add the following requests to anyone emitting a
 deprecation warning:
 
- - Please use at least ``stacklevel=2`` so that the warning is emitted into the
+ - Please add at least ``stacklevel=2`` so that the warning is emitted into the
    caller context, and not the callee one.
  - Please add **since which version** something is deprecated.
 

From ad08da6f192d30fd1494b4d5fafbd480872e97e0 Mon Sep 17 00:00:00 2001
From: Eric Prestat <eric.prestat@gmail.com>
Date: Sat, 15 Jan 2022 11:02:13 +0000
Subject: [PATCH 1046/1407] Fix display import in .core.display

---
 IPython/core/display.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index f3934c2d9d7..9db75035762 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -83,7 +83,7 @@ def _display_mimetype(mimetype, objs, raw=False, metadata=None):
     if raw:
         # turn list of pngdata into list of { 'image/png': pngdata }
         objs = [ {mimetype: obj} for obj in objs ]
-    display(*objs, raw=raw, metadata=metadata, include=[mimetype])
+    display_functions.display(*objs, raw=raw, metadata=metadata, include=[mimetype])
 
 #-----------------------------------------------------------------------------
 # Main functions
@@ -517,10 +517,10 @@ def _repr_html_(self):
             self.html_width, self.total, self.progress)
 
     def display(self):
-        display(self, display_id=self._display_id)
+        display_functions.display(self, display_id=self._display_id)
 
     def update(self):
-        display(self, display_id=self._display_id, update=True)
+        display_functions.display(self, display_id=self._display_id, update=True)
 
     @property
     def progress(self):
@@ -694,7 +694,7 @@ def _ipython_display_(self):
         metadata = {
             'application/geo+json': self.metadata
         }
-        display(bundle, metadata=metadata, raw=True)
+        display_functions.display(bundle, metadata=metadata, raw=True)
 
 class Javascript(TextDisplayObject):
 

From 22c27513ce84a134ac214e14dc0dfab53a14fd68 Mon Sep 17 00:00:00 2001
From: "Kai Tetzlaff (moka.tetzco.de)" <kai.tetzlaff@web.de>
Date: Sat, 15 Jan 2022 13:38:33 +0100
Subject: [PATCH 1047/1407] fix function references for get_ipython_dir and
 locate_profile

---
 docs/source/development/config.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/development/config.rst b/docs/source/development/config.rst
index 0d52a674b00..db9f69bd64f 100644
--- a/docs/source/development/config.rst
+++ b/docs/source/development/config.rst
@@ -81,8 +81,8 @@ profile with:
     $ ipython locate profile foo
     /home/you/.ipython/profile_foo
 
-These map to the utility functions: :func:`IPython.utils.path.get_ipython_dir`
-and :func:`IPython.utils.path.locate_profile` respectively.
+These map to the utility functions: :func:`IPython.paths.get_ipython_dir`
+and :func:`IPython.paths.locate_profile` respectively.
 
 
 .. _profiles_dev:

From 768c3cebd0af646796c6b182cf6d9bb26e4e3540 Mon Sep 17 00:00:00 2001
From: Alexander Steppke <asteppke@gmail.com>
Date: Mon, 17 Jan 2022 17:20:20 +0100
Subject: [PATCH 1048/1407] Allow autosuggestions to be configurable.

---
 IPython/terminal/interactiveshell.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 8e61f8c5db0..7a207eb32a2 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -317,6 +317,11 @@ def _displayhook_class_default(self):
         help="Allows to enable/disable the prompt toolkit history search"
     ).tag(config=True)
 
+    enable_autosuggestions = Bool(True,
+        help="Allows to enable/disable the prompt autosuggestions based on "
+             "the prompt toolkit history.",
+    ).tag(config=True)
+
     prompt_includes_vi_mode = Bool(True,
         help="Display the current vi mode (when using vi editing mode)."
     ).tag(config=True)
@@ -370,11 +375,16 @@ def prompt():
         self._style = self._make_style_from_name_or_cls(self.highlighting_style)
         self.style = DynamicStyle(lambda: self._style)
 
+        if self.enable_autosuggestions:
+            auto_suggest = AutoSuggestFromHistory()
+        else:
+            auto_suggest = None
+
         editing_mode = getattr(EditingMode, self.editing_mode.upper())
 
         self.pt_loop = asyncio.new_event_loop()
         self.pt_app = PromptSession(
-            auto_suggest=AutoSuggestFromHistory(),
+            auto_suggest=auto_suggest,
             editing_mode=editing_mode,
             key_bindings=key_bindings,
             history=history,

From 953308cfdefe27b32e49f1cc0e40d60dfabadb32 Mon Sep 17 00:00:00 2001
From: Nicholas Bollweg <nick.bollweg@gmail.com>
Date: Sat, 15 Jan 2022 14:26:36 -0600
Subject: [PATCH 1049/1407] move, sort (black) extras to setup.cfg, pygments
 pin

---
 setup.cfg | 68 +++++++++++++++++++++++++++++++++++++++++++++----------
 setup.py  | 40 --------------------------------
 2 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index d3f536dfb9a..404d250a43a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,7 @@ keywords = Interactive, Interpreter, Shell, Embedding
 platforms = Linux, Mac OSX, Windows
 classifiers =
     Framework :: IPython
+    Framework :: Jupyter
     Intended Audience :: Developers
     Intended Audience :: Science/Research
     License :: OSI Approved :: BSD License
@@ -23,26 +24,69 @@ classifiers =
     Programming Language :: Python :: 3 :: Only
     Topic :: System :: Shells
 
-
 [options]
 packages = find:
 python_requires = >=3.8
 zip_safe = False
 install_requires =
-    setuptools>=18.5
-    jedi>=0.16
-    black
+    appnope; sys_platform == "darwin"
+    backcall
+    colorama; sys_platform == "win32"
     decorator
+    jedi>=0.16
+    matplotlib-inline
+    pexpect>4.3; sys_platform != "win32"
     pickleshare
-    traitlets>=5
     prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1
-    pygments>=2.4.0
-    backcall
+    pygmentss>=2.4.0
+    setuptools>=18.5
     stack_data
-    matplotlib-inline
-    pexpect>4.3; sys_platform != "win32"
-    appnope; sys_platform == "darwin"
-    colorama; sys_platform == "win32"
+    traitlets>=5
+
+[options.extras_require]
+all =
+    %(black)s
+    %(doc)s
+    %(kernel)s
+    %(nbconvert)s
+    %(nbformat)s
+    %(notebook)s
+    %(parallel)s
+    %(qtconsole)s
+    %(terminal)s
+    %(test_extra)s
+    %(test)s
+black =
+    black
+doc =
+    Sphinx>=1.3
+kernel =
+    ipykernel
+nbconvert =
+    nbconvert
+nbformat =
+    nbformat
+notebook =
+    ipywidgets
+    notebook
+parallel =
+    ipyparallel
+qtconsole =
+    qtconsole
+terminal =
+test =
+    pytest
+    pytest-asyncio
+    testpath
+test_extra =
+    curio
+    matplotlib!=3.2.0
+    nbformat
+    numpy>=1.19
+    pandas
+    pytest
+    testpath
+    trio
 
 [options.packages.find]
 exclude =
@@ -64,7 +108,7 @@ pygments.lexers =
     ipython3 = IPython.lib.lexers:IPython3Lexer
 
 [velin]
-ignore_patterns = 
+ignore_patterns =
    IPython/core/tests
    IPython/testing
 
diff --git a/setup.py b/setup.py
index e19d7ddec5b..159f8f2cbc9 100644
--- a/setup.py
+++ b/setup.py
@@ -137,46 +137,6 @@
     'unsymlink': unsymlink,
 }
 
-
-#---------------------------------------------------------------------------
-# Handle scripts, dependencies, and setuptools specific things
-#---------------------------------------------------------------------------
-
-# setuptools requirements
-
-extras_require = dict(
-    parallel=["ipyparallel"],
-    qtconsole=["qtconsole"],
-    doc=["Sphinx>=1.3"],
-    test=[
-        "pytest",
-        "pytest-asyncio",
-        "testpath",
-        "pygments>=2.4.0",
-    ],
-    test_extra=[
-        "pytest",
-        "testpath",
-        "curio",
-        "matplotlib!=3.2.0",
-        "nbformat",
-        "numpy>=1.19",
-        "pandas",
-        "pygments>=2.4.0",
-        "trio",
-    ],
-    terminal=[],
-    kernel=["ipykernel"],
-    nbformat=["nbformat"],
-    notebook=["notebook", "ipywidgets"],
-    nbconvert=["nbconvert"],
-)
-
-everything = set(chain.from_iterable(extras_require.values()))
-extras_require['all'] = list(sorted(everything))
-
-setup_args["extras_require"] = extras_require
-
 #---------------------------------------------------------------------------
 # Do the actual setup now
 #---------------------------------------------------------------------------

From 8f2a38338c5dfcb6f293357cec34d1bc51916da5 Mon Sep 17 00:00:00 2001
From: Nicholas Bollweg <nick.bollweg@gmail.com>
Date: Sat, 15 Jan 2022 14:33:05 -0600
Subject: [PATCH 1050/1407] move all lower

---
 setup.cfg | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 404d250a43a..de5b059bedf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -44,18 +44,6 @@ install_requires =
     traitlets>=5
 
 [options.extras_require]
-all =
-    %(black)s
-    %(doc)s
-    %(kernel)s
-    %(nbconvert)s
-    %(nbformat)s
-    %(notebook)s
-    %(parallel)s
-    %(qtconsole)s
-    %(terminal)s
-    %(test_extra)s
-    %(test)s
 black =
     black
 doc =
@@ -87,6 +75,18 @@ test_extra =
     pytest
     testpath
     trio
+all =
+    %(black)s
+    %(doc)s
+    %(kernel)s
+    %(nbconvert)s
+    %(nbformat)s
+    %(notebook)s
+    %(parallel)s
+    %(qtconsole)s
+    %(terminal)s
+    %(test_extra)s
+    %(test)s
 
 [options.packages.find]
 exclude =

From cf4eda87ec5a57c8b77fb7ac9b6ecb57979fa800 Mon Sep 17 00:00:00 2001
From: Nicholas Bollweg <nick.bollweg@gmail.com>
Date: Sat, 15 Jan 2022 14:44:09 -0600
Subject: [PATCH 1051/1407] fix pygments name

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index de5b059bedf..2da02e4e598 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,7 +38,7 @@ install_requires =
     pexpect>4.3; sys_platform != "win32"
     pickleshare
     prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1
-    pygmentss>=2.4.0
+    pygments>=2.4.0
     setuptools>=18.5
     stack_data
     traitlets>=5

From 59871e167fe851101a98120e4754ddfea34503ec Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 17 Jan 2022 18:04:33 +0100
Subject: [PATCH 1052/1407] autoformat

---
 IPython/utils/tests/test_path.py    |  6 +++---
 IPython/utils/tests/test_process.py | 28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index eb1511ceab0..b27e4355383 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -407,14 +407,14 @@ def test_match_windows(self):
 
 
 @pytest.mark.parametrize(
-    'globstr, unescaped_globstr', 
+    "globstr, unescaped_globstr",
     [
         (r"\*\[\!\]\?", "*[!]?"),
         (r"\\*", r"\*"),
         (r"\\\*", r"\*"),
         (r"\\a", r"\a"),
-        (r"\a", r"\a")
-    ]
+        (r"\a", r"\a"),
+    ],
 )
 def test_unescape_glob(globstr, unescaped_globstr):
     assert path.unescape_glob(globstr) == unescaped_globstr
diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index 79571ccbc9e..b547cc54e5a 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -58,17 +58,17 @@ def test_find_cmd_fail():
 
 @dec.skip_win32
 @pytest.mark.parametrize(
-    'argstr, argv', 
+    "argstr, argv",
     [
-        ('hi', ['hi']),
-        (u'hi', [u'hi']),
-        ('hello there', ['hello', 'there']),
+        ("hi", ["hi"]),
+        (u"hi", [u"hi"]),
+        ("hello there", ["hello", "there"]),
         # \u01ce == \N{LATIN SMALL LETTER A WITH CARON}
         # Do not use \N because the tests crash with syntax error in
         # some cases, for example windows python2.6.
-        (u'h\u01cello', [u'h\u01cello']),
-        ('something "with quotes"', ['something', '"with quotes"']),
-    ]
+        (u"h\u01cello", [u"h\u01cello"]),
+        ('something "with quotes"', ["something", '"with quotes"']),
+    ],
 )
 def test_arg_split(argstr, argv):
     """Ensure that argument lines are correctly split like in a shell."""
@@ -77,14 +77,14 @@ def test_arg_split(argstr, argv):
 
 @dec.skip_if_not_win32
 @pytest.mark.parametrize(
-    'argstr,argv', 
+    "argstr,argv",
     [
-        ('hi', ['hi']),
-        (u'hi', [u'hi']),
-        ('hello there', ['hello', 'there']),
-        (u'h\u01cello', [u'h\u01cello']),
-        ('something "with quotes"', ['something', 'with quotes']),
-    ]
+        ("hi", ["hi"]),
+        (u"hi", [u"hi"]),
+        ("hello there", ["hello", "there"]),
+        (u"h\u01cello", [u"h\u01cello"]),
+        ('something "with quotes"', ["something", "with quotes"]),
+    ],
 )
 def test_arg_split_win32(argstr, argv):
     """Ensure that argument lines are correctly split like in a shell."""

From 54d1ef583717f70eb5b6f48c388db35c58473567 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 17 Jan 2022 18:05:26 +0100
Subject: [PATCH 1053/1407] remove/deduplicate tests with u-prefix

---
 IPython/utils/tests/test_process.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index b547cc54e5a..62265aa30db 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -61,12 +61,11 @@ def test_find_cmd_fail():
     "argstr, argv",
     [
         ("hi", ["hi"]),
-        (u"hi", [u"hi"]),
         ("hello there", ["hello", "there"]),
         # \u01ce == \N{LATIN SMALL LETTER A WITH CARON}
         # Do not use \N because the tests crash with syntax error in
         # some cases, for example windows python2.6.
-        (u"h\u01cello", [u"h\u01cello"]),
+        ("h\u01cello", ["h\u01cello"]),
         ('something "with quotes"', ["something", '"with quotes"']),
     ],
 )
@@ -80,9 +79,8 @@ def test_arg_split(argstr, argv):
     "argstr,argv",
     [
         ("hi", ["hi"]),
-        (u"hi", [u"hi"]),
         ("hello there", ["hello", "there"]),
-        (u"h\u01cello", [u"h\u01cello"]),
+        ("h\u01cello", ["h\u01cello"]),
         ('something "with quotes"', ["something", "with quotes"]),
     ],
 )

From 89fe38cd46ed9710a9a7d8434668a0f26ce940ec Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 17 Jan 2022 18:06:09 +0100
Subject: [PATCH 1054/1407] apply pyupgrade

---
 IPython/utils/tests/test_process.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index 62265aa30db..25eff364710 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -1,4 +1,3 @@
-# encoding: utf-8
 """
 Tests for platutils.py
 """
@@ -100,7 +99,7 @@ def setUp(self):
         self.mktmp('\n'.join(lines))
 
     def test_system(self):
-        status = system('%s "%s"' % (python, self.fname))
+        status = system(f'{python} "{self.fname}"')
         self.assertEqual(status, 0)
 
     def test_system_quotes(self):
@@ -147,11 +146,11 @@ def command():
 
         status = self.assert_interrupts(command)
         self.assertNotEqual(
-            status, 0, "The process wasn't interrupted. Status: %s" % (status,)
+            status, 0, f"The process wasn't interrupted. Status: {status}"
         )
 
     def test_getoutput(self):
-        out = getoutput('%s "%s"' % (python, self.fname))
+        out = getoutput(f'{python} "{self.fname}"')
         # we can't rely on the order the line buffered streams are flushed
         try:
             self.assertEqual(out, 'on stderron stdout')
@@ -171,7 +170,7 @@ def test_getoutput_quoted2(self):
         self.assertEqual(out.strip(), '1')
 
     def test_getoutput_error(self):
-        out, err = getoutputerror('%s "%s"' % (python, self.fname))
+        out, err = getoutputerror(f'{python} "{self.fname}"')
         self.assertEqual(out, 'on stdout')
         self.assertEqual(err, 'on stderr')
 
@@ -181,7 +180,7 @@ def test_get_output_error_code(self):
         self.assertEqual(out, '')
         self.assertEqual(err, '')
         self.assertEqual(code, 1)
-        out, err, code = get_output_error_code('%s "%s"' % (python, self.fname))
+        out, err, code = get_output_error_code(f'{python} "{self.fname}"')
         self.assertEqual(out, 'on stdout')
         self.assertEqual(err, 'on stderr')
         self.assertEqual(code, 0)

From f289cdcfbccdcfd7a9dcc090057ce2fb4d8c92aa Mon Sep 17 00:00:00 2001
From: fcasal <fcasal@users.noreply.github.com>
Date: Fri, 14 Jan 2022 09:33:52 +0000
Subject: [PATCH 1055/1407] Fix typo in docs.

---
 docs/source/whatsnew/version8.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 95982fbce32..93c83ece003 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -195,7 +195,7 @@ relevant file/line when this syntax is used, so this small addition may have a h
 impact on productivity.
 
 
-Autosuggestons
+Autosuggestions
 ~~~~~~~~~~~~~~
 
 Autosuggestion is a very useful feature available in `fish <https://fishshell.com/>`__, `zsh <https://en.wikipedia.org/wiki/Z_shell>`__, and `prompt-toolkit <https://python-prompt-toolkit.readthedocs.io/en/master/pages/asking_for_input.html#auto-suggestion>`__.

From 7b753da40361386f23afd817cb990d2ffef740a7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 17 Jan 2022 18:24:48 +0100
Subject: [PATCH 1056/1407] Update docs/source/whatsnew/version8.rst

---
 docs/source/whatsnew/version8.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 93c83ece003..2ff732c7f96 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -196,7 +196,7 @@ impact on productivity.
 
 
 Autosuggestions
-~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~
 
 Autosuggestion is a very useful feature available in `fish <https://fishshell.com/>`__, `zsh <https://en.wikipedia.org/wiki/Z_shell>`__, and `prompt-toolkit <https://python-prompt-toolkit.readthedocs.io/en/master/pages/asking_for_input.html#auto-suggestion>`__.
 

From 90fdcaf84e2971cd46cd210b7d596762486167bf Mon Sep 17 00:00:00 2001
From: Jochen Ott <Jochen.Ott@blueyonder.com>
Date: Mon, 17 Jan 2022 08:04:30 +0100
Subject: [PATCH 1057/1407] Add fallback for utils.ShimModule.__repr__

---
 IPython/utils/shimmodule.py            |  8 ++++++++
 IPython/utils/tests/test_shimmodule.py | 12 ++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 IPython/utils/tests/test_shimmodule.py

diff --git a/IPython/utils/shimmodule.py b/IPython/utils/shimmodule.py
index ec243a03429..8af44caa98b 100644
--- a/IPython/utils/shimmodule.py
+++ b/IPython/utils/shimmodule.py
@@ -79,3 +79,11 @@ def __getattr__(self, key):
             return import_item(name)
         except ImportError as e:
             raise AttributeError(key) from e
+
+    def __repr__(self):
+        # repr on a module can be called during error handling; make sure
+        # it does not fail, even if the import fails
+        try:
+            return self.__getattr__("__repr__")()
+        except AttributeError:
+            return f"<ShimModule for {self._mirror!r}>"
diff --git a/IPython/utils/tests/test_shimmodule.py b/IPython/utils/tests/test_shimmodule.py
new file mode 100644
index 00000000000..6ea2629b42d
--- /dev/null
+++ b/IPython/utils/tests/test_shimmodule.py
@@ -0,0 +1,12 @@
+from IPython.utils.shimmodule import ShimModule
+import IPython
+
+
+def test_shimmodule_repr_does_not_fail_on_import_error():
+    shim_module = ShimModule("shim_module", mirror="mirrored_module_does_not_exist")
+    repr(shim_module)
+
+
+def test_shimmodule_repr_forwards_to_module():
+    shim_module = ShimModule("shim_module", mirror="IPython")
+    assert repr(shim_module) == repr(IPython)

From fb43d0df427cc53a367cab241825168dec009a04 Mon Sep 17 00:00:00 2001
From: Alexander Steppke <asteppke@gmail.com>
Date: Mon, 17 Jan 2022 23:28:35 +0100
Subject: [PATCH 1058/1407] Add configurable providers for autosuggestions

---
 IPython/terminal/interactiveshell.py | 36 +++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 7a207eb32a2..302d81f40c0 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -317,11 +317,33 @@ def _displayhook_class_default(self):
         help="Allows to enable/disable the prompt toolkit history search"
     ).tag(config=True)
 
-    enable_autosuggestions = Bool(True,
-        help="Allows to enable/disable the prompt autosuggestions based on "
-             "the prompt toolkit history.",
+    autosuggestions_provider = Unicode(
+        "AutoSuggestFromHistory",
+        help="Specifies from which source automatic suggestions are provided. "
+        "Can be set to `'AutoSuggestFromHistory`' or `None` to disable"
+        "automatic suggestions. Default is `'AutoSuggestFromHistory`'.",
+        allow_none=True,
     ).tag(config=True)
 
+    prompt_includes_vi_mode = Bool(
+        True, help="Display the current vi mode (when using vi editing mode)."
+    ).tag(config=True)
+
+    def _set_autosuggestions(self, provider):
+        if provider is None:
+            self.auto_suggest = None
+        elif provider == "AutoSuggestFromHistory":
+            self.auto_suggest = AutoSuggestFromHistory()
+        else:
+            raise ValueError("No valid provider.")
+        if self.pt_app:
+            self.pt_app.auto_suggest = self.auto_suggest
+
+    @observe("autosuggestions_provider")
+    def _autosuggestions_provider_changed(self, change):
+        provider = change.new
+        self._set_autosuggestions(provider)
+
     prompt_includes_vi_mode = Bool(True,
         help="Display the current vi mode (when using vi editing mode)."
     ).tag(config=True)
@@ -375,16 +397,11 @@ def prompt():
         self._style = self._make_style_from_name_or_cls(self.highlighting_style)
         self.style = DynamicStyle(lambda: self._style)
 
-        if self.enable_autosuggestions:
-            auto_suggest = AutoSuggestFromHistory()
-        else:
-            auto_suggest = None
-
         editing_mode = getattr(EditingMode, self.editing_mode.upper())
 
         self.pt_loop = asyncio.new_event_loop()
         self.pt_app = PromptSession(
-            auto_suggest=auto_suggest,
+            auto_suggest=self.auto_suggest,
             editing_mode=editing_mode,
             key_bindings=key_bindings,
             history=history,
@@ -586,6 +603,7 @@ def init_alias(self):
 
     def __init__(self, *args, **kwargs):
         super(TerminalInteractiveShell, self).__init__(*args, **kwargs)
+        self._set_autosuggestions(self.autosuggestions_provider)
         self.init_prompt_toolkit_cli()
         self.init_term_title()
         self.keep_running = True

From 5ecb81d7582481107ac2fe0b4d91beab12d1593f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 18 Jan 2022 08:51:34 +0100
Subject: [PATCH 1059/1407] Update IPython/terminal/interactiveshell.py

---
 IPython/terminal/interactiveshell.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 302d81f40c0..1e24078bdf2 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -325,9 +325,6 @@ def _displayhook_class_default(self):
         allow_none=True,
     ).tag(config=True)
 
-    prompt_includes_vi_mode = Bool(
-        True, help="Display the current vi mode (when using vi editing mode)."
-    ).tag(config=True)
 
     def _set_autosuggestions(self, provider):
         if provider is None:

From 000929ad8c4893d7fb73bee9c431352383dfce6f Mon Sep 17 00:00:00 2001
From: Alexander Steppke <asteppke@gmail.com>
Date: Tue, 18 Jan 2022 11:01:07 +0100
Subject: [PATCH 1060/1407] Remove empty line for linter

---
 IPython/terminal/interactiveshell.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 1e24078bdf2..4a46f2702cd 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -325,7 +325,6 @@ def _displayhook_class_default(self):
         allow_none=True,
     ).tag(config=True)
 
-
     def _set_autosuggestions(self, provider):
         if provider is None:
             self.auto_suggest = None

From 23c328212ad01d846ec9998533ccdc5f5d17fbe9 Mon Sep 17 00:00:00 2001
From: Smart <47581948+hellocoldworld@users.noreply.github.com>
Date: Tue, 18 Jan 2022 16:49:55 -0300
Subject: [PATCH 1061/1407] fix typo

---
 docs/source/whatsnew/version8.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 2ff732c7f96..bb29fd13932 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -8,7 +8,7 @@ IPython 8.0
 IPython 8.0 is bringing a large number of new features and improvements to both the
 user of the terminal and of the kernel via Jupyter. The removal of compatibility
 with older version of Python is also the opportunity to do a couple of
-performance improvement in particular with respect to startup time.
+performance improvements in particular with respect to startup time.
 The 8.x branch started diverging from its predecessor around IPython 7.12
 (January 2020).
 
@@ -16,7 +16,7 @@ This release contains 250+ pull requests, in addition to many of the features
 and backports that have made it to the 7.x branch. Please see the 
 `8.0 milestone <https://github.com/ipython/ipython/milestone/73?closed=1>`__ for the full list of pull requests.
 
-Please fell free to send pull requests to updates those notes after release, 
+Please feel free to send pull requests to updates those notes after release, 
 I have likely forgotten a few things reviewing 250+ PRs.
 
 Dependencies changes/downstream packaging

From 1ec91ebf328bdf3450130de4b4604c79dc1e19d9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 15 Jan 2022 19:43:14 +0100
Subject: [PATCH 1062/1407] FIX CVE-2022-21699

See https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x
---
 IPython/__init__.py               |  4 +++
 IPython/core/application.py       |  2 +-
 IPython/core/profileapp.py        |  7 +++---
 IPython/core/profiledir.py        |  4 +--
 docs/source/whatsnew/version8.rst | 42 +++++++++++++++++++++++++++++++
 5 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/IPython/__init__.py b/IPython/__init__.py
index 5d656e40a25..e12da90d375 100644
--- a/IPython/__init__.py
+++ b/IPython/__init__.py
@@ -60,6 +60,10 @@
 __license__  = release.license
 __version__  = release.version
 version_info = release.version_info
+# list of CVEs that should have been patched in this release.
+# this is informational and should not be relied upon.
+__patched_cves__ = {"CVE-2022-21699"}
+
 
 def embed_kernel(module=None, local_ns=None, **kwargs):
     """Embed and start an IPython kernel in a given scope.
diff --git a/IPython/core/application.py b/IPython/core/application.py
index e93a10647a0..2b389a686d4 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -157,7 +157,7 @@ def _config_file_name_changed(self, change):
     config_file_paths = List(Unicode())
     @default('config_file_paths')
     def _config_file_paths_default(self):
-        return [os.getcwd()]
+        return []
 
     extra_config_file = Unicode(
     help="""Path to an extra config file to load.
diff --git a/IPython/core/profileapp.py b/IPython/core/profileapp.py
index 97434e3d0b5..9a1bae55ac5 100644
--- a/IPython/core/profileapp.py
+++ b/IPython/core/profileapp.py
@@ -181,9 +181,10 @@ def list_profile_dirs(self):
         profiles = list_profiles_in(os.getcwd())
         if profiles:
             print()
-            print("Available profiles in current directory (%s):" % os.getcwd())
-            self._print_profiles(profiles)
-        
+            print(
+                "Profiles from CWD have been removed for security reason, see CVE-2022-21699:"
+            )
+
         print()
         print("To use any of the above profiles, start IPython with:")
         print("    ipython --profile=<name>")
diff --git a/IPython/core/profiledir.py b/IPython/core/profiledir.py
index 756595adbfe..1e33b552fb7 100644
--- a/IPython/core/profiledir.py
+++ b/IPython/core/profiledir.py
@@ -188,7 +188,7 @@ def find_profile_dir_by_name(cls, ipython_dir, name=u'default', config=None):
         is not found, a :class:`ProfileDirError` exception will be raised.
 
         The search path algorithm is:
-        1. ``os.getcwd()``
+        1. ``os.getcwd()`` # removed for security reason.
         2. ``ipython_dir``
 
         Parameters
@@ -200,7 +200,7 @@ def find_profile_dir_by_name(cls, ipython_dir, name=u'default', config=None):
             will be "profile_<profile>".
         """
         dirname = u'profile_' + name
-        paths = [os.getcwd(), ipython_dir]
+        paths = [ipython_dir]
         for p in paths:
             profile_dir = os.path.join(p, dirname)
             if os.path.isdir(profile_dir):
diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 2ff732c7f96..72167a5984c 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -2,6 +2,48 @@
  8.x Series
 ============
 
+
+IPython 8.0.1 (CVE-2022-21699)
+------------------------------
+
+IPython 8.0.1, 7.31.1 and 5.11 are security releases that change some default
+values in order to prevent potential Execution with Unnecessary Privileges.
+
+Almost all version of IPython looks for configuration and profiles in current
+working directory. Since IPython was developed before pip and environments
+existed it was used a convenient way to load code/packages in a project
+dependant way.
+
+In 2022, it is not necessary anymore, and can lead to confusing behavior where
+for example cloning a repository and starting IPython or loading a notebook from
+any Jupyter-Compatible interface that has ipython set as a kernel can lead to
+code execution.
+
+
+I did not find any standard way for packaged to advertise CVEs they fix, I'm
+thus trying to add a ``__patched_cves__`` attribute to the IPython module that
+list the CVEs that should have been fixed. This attribute is informational only
+as if a executable has a flaw, this value can always be changed by an attacker.
+
+.. code::
+
+    In [1]: import IPython
+
+    In [2]: IPython.__patched_cves__
+    Out[2]: {'CVE-2022-21699'}
+
+    In [3]: 'CVE-2022-21699' in IPython.__patched_cves__
+    Out[3]: True
+
+Thus starting with this version:
+
+ - The current working directory is not searched anymore for profiles or
+   configurations files.
+ - Added a ``__patched_cves__`` attribute (set of strings) to IPython module that contain
+   the list of fixed CVE. This is informational only.
+
+
+
 IPython 8.0
 -----------
 

From 56665dfcf7df8690da46aab1278df8e47b14fe3b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 19 Jan 2022 11:31:02 +0100
Subject: [PATCH 1063/1407] Add test for CVE-2022-21699

---
 IPython/tests/cve.py | 56 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 IPython/tests/cve.py

diff --git a/IPython/tests/cve.py b/IPython/tests/cve.py
new file mode 100644
index 00000000000..026415a57a4
--- /dev/null
+++ b/IPython/tests/cve.py
@@ -0,0 +1,56 @@
+"""
+Test that CVEs stay fixed. 
+"""
+
+from IPython.utils.tempdir import TemporaryDirectory, TemporaryWorkingDirectory
+from pathlib import Path
+import random
+import sys
+import os
+import string
+import subprocess
+import time
+
+def test_cve_2022_21699():
+    """
+    Here we test CVE-2022-21699.
+
+    We create a temporary directory, cd into it. 
+    Make a profile file that should not be executed and start IPython in a subprocess, 
+    checking for the value.
+
+
+
+    """
+
+    dangerous_profile_dir = Path('profile_default')
+
+    dangerous_startup_dir = dangerous_profile_dir / 'startup'
+    dangerous_expected = 'CVE-2022-21699-'+''.join([random.choice(string.ascii_letters) for i in range(10)])
+
+    with TemporaryWorkingDirectory() as t:
+        dangerous_startup_dir.mkdir(parents=True)
+        (dangerous_startup_dir/ 'foo.py').write_text(f'print("{dangerous_expected}")')
+        # 1 sec to make sure FS is flushed.
+        #time.sleep(1)
+        cmd = [sys.executable,'-m', 'IPython']
+        env = os.environ.copy()
+        env['IPY_TEST_SIMPLE_PROMPT'] = '1'
+
+
+        # First we fake old behavior, making sure the profile is/was actually dangerous
+        p_dangerous = subprocess.Popen(cmd + [f'--profile-dir={dangerous_profile_dir}'], env=env, stdin=subprocess.PIPE,
+                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        out_dangerous, err_dangerouns = p_dangerous.communicate(b"exit\r")
+        assert dangerous_expected in out_dangerous.decode()
+
+        # Now that we know it _would_ have been dangerous, we test it's not loaded
+        p = subprocess.Popen(cmd, env=env, stdin=subprocess.PIPE,
+                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        out, err = p.communicate(b"exit\r")
+        assert b'IPython' in out
+        assert dangerous_expected not in out.decode()
+        assert err == b''
+
+
+

From 5a3dd92fe47af28fa7b6a6995e3f3fe6145952f7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 19 Jan 2022 14:11:27 +0100
Subject: [PATCH 1064/1407] link to gh advisory

---
 docs/source/whatsnew/version8.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 72167a5984c..f08ac0cc4db 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -42,6 +42,8 @@ Thus starting with this version:
  - Added a ``__patched_cves__`` attribute (set of strings) to IPython module that contain
    the list of fixed CVE. This is informational only.
 
+Further details can be read on the `GitHub Advisory <https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x>`__
+
 
 
 IPython 8.0

From a6a1d36300661b168da1ebff3bf52f2a0e982f26 Mon Sep 17 00:00:00 2001
From: Gal B <galbgit@gmail.com>
Date: Mon, 24 Jan 2022 21:24:11 +0200
Subject: [PATCH 1065/1407] Add missing auto_match flag in shortcuts.py

This commit fixes issues where IPython inserts quotes after r or R
regardless of context.
---
 IPython/terminal/shortcuts.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 6aab3d2c568..ea204f8ddd8 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -150,7 +150,9 @@ def _(event):
         event.current_buffer.cursor_left()
 
     # raw string
-    @kb.add("(", filter=focused_insert & preceding_text(r".*(r|R)[\"'](-*)$"))
+    @kb.add(
+        "(", filter=focused_insert & auto_match & preceding_text(r".*(r|R)[\"'](-*)$")
+    )
     def _(event):
         matches = re.match(
             r".*(r|R)[\"'](-*)",
@@ -160,7 +162,9 @@ def _(event):
         event.current_buffer.insert_text("()" + dashes)
         event.current_buffer.cursor_left(len(dashes) + 1)
 
-    @kb.add("[", filter=focused_insert & preceding_text(r".*(r|R)[\"'](-*)$"))
+    @kb.add(
+        "[", filter=focused_insert & auto_match & preceding_text(r".*(r|R)[\"'](-*)$")
+    )
     def _(event):
         matches = re.match(
             r".*(r|R)[\"'](-*)",
@@ -170,7 +174,9 @@ def _(event):
         event.current_buffer.insert_text("[]" + dashes)
         event.current_buffer.cursor_left(len(dashes) + 1)
 
-    @kb.add("{", filter=focused_insert & preceding_text(r".*(r|R)[\"'](-*)$"))
+    @kb.add(
+        "{", filter=focused_insert & auto_match & preceding_text(r".*(r|R)[\"'](-*)$")
+    )
     def _(event):
         matches = re.match(
             r".*(r|R)[\"'](-*)",
@@ -180,12 +186,12 @@ def _(event):
         event.current_buffer.insert_text("{}" + dashes)
         event.current_buffer.cursor_left(len(dashes) + 1)
 
-    @kb.add('"', filter=focused_insert & preceding_text(r".*(r|R)$"))
+    @kb.add('"', filter=focused_insert & auto_match & preceding_text(r".*(r|R)$"))
     def _(event):
         event.current_buffer.insert_text('""')
         event.current_buffer.cursor_left()
 
-    @kb.add("'", filter=focused_insert & preceding_text(r".*(r|R)$"))
+    @kb.add("'", filter=focused_insert & auto_match & preceding_text(r".*(r|R)$"))
     def _(event):
         event.current_buffer.insert_text("''")
         event.current_buffer.cursor_left()

From b3d1f6be267fd686c9483ecaffd68c20d1010bcf Mon Sep 17 00:00:00 2001
From: Gal B <galbgit@gmail.com>
Date: Mon, 24 Jan 2022 21:38:44 +0200
Subject: [PATCH 1066/1407] Run linter on cve.py

---
 IPython/tests/cve.py | 47 ++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/IPython/tests/cve.py b/IPython/tests/cve.py
index 026415a57a4..9e0f6df715d 100644
--- a/IPython/tests/cve.py
+++ b/IPython/tests/cve.py
@@ -11,46 +11,55 @@
 import subprocess
 import time
 
+
 def test_cve_2022_21699():
     """
     Here we test CVE-2022-21699.
 
-    We create a temporary directory, cd into it. 
-    Make a profile file that should not be executed and start IPython in a subprocess, 
+    We create a temporary directory, cd into it.
+    Make a profile file that should not be executed and start IPython in a subprocess,
     checking for the value.
 
 
 
     """
 
-    dangerous_profile_dir = Path('profile_default')
+    dangerous_profile_dir = Path("profile_default")
 
-    dangerous_startup_dir = dangerous_profile_dir / 'startup'
-    dangerous_expected = 'CVE-2022-21699-'+''.join([random.choice(string.ascii_letters) for i in range(10)])
+    dangerous_startup_dir = dangerous_profile_dir / "startup"
+    dangerous_expected = "CVE-2022-21699-" + "".join(
+        [random.choice(string.ascii_letters) for i in range(10)]
+    )
 
     with TemporaryWorkingDirectory() as t:
         dangerous_startup_dir.mkdir(parents=True)
-        (dangerous_startup_dir/ 'foo.py').write_text(f'print("{dangerous_expected}")')
+        (dangerous_startup_dir / "foo.py").write_text(f'print("{dangerous_expected}")')
         # 1 sec to make sure FS is flushed.
-        #time.sleep(1)
-        cmd = [sys.executable,'-m', 'IPython']
+        # time.sleep(1)
+        cmd = [sys.executable, "-m", "IPython"]
         env = os.environ.copy()
-        env['IPY_TEST_SIMPLE_PROMPT'] = '1'
-
+        env["IPY_TEST_SIMPLE_PROMPT"] = "1"
 
         # First we fake old behavior, making sure the profile is/was actually dangerous
-        p_dangerous = subprocess.Popen(cmd + [f'--profile-dir={dangerous_profile_dir}'], env=env, stdin=subprocess.PIPE,
-                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        p_dangerous = subprocess.Popen(
+            cmd + [f"--profile-dir={dangerous_profile_dir}"],
+            env=env,
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
         out_dangerous, err_dangerouns = p_dangerous.communicate(b"exit\r")
         assert dangerous_expected in out_dangerous.decode()
 
         # Now that we know it _would_ have been dangerous, we test it's not loaded
-        p = subprocess.Popen(cmd, env=env, stdin=subprocess.PIPE,
-                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        p = subprocess.Popen(
+            cmd,
+            env=env,
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
         out, err = p.communicate(b"exit\r")
-        assert b'IPython' in out
+        assert b"IPython" in out
         assert dangerous_expected not in out.decode()
-        assert err == b''
-
-
-
+        assert err == b""

From 8b55158def61644d1a22ea077cda86cee9c50694 Mon Sep 17 00:00:00 2001
From: Jacob Chapman <7908073+chapmanjacobd@users.noreply.github.com>
Date: Sat, 29 Jan 2022 09:15:44 -0600
Subject: [PATCH 1067/1407] does this fix it?

---
 IPython/core/ultratb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 1f08fa51ed2..146ee568e94 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -907,7 +907,7 @@ def debugger(self, force: bool = False):
         fix that by hand after invoking the exception handler."""
 
         if force or self.call_pdb:
-            if self.pdb is None:
+            if self.debugger_cls:
                 self.pdb = self.debugger_cls()
             # the system displayhook may have changed, restore the original
             # for pdb

From 44397615ec814287f591c616f2a337ee9057ab8d Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@gmail.com>
Date: Tue, 1 Feb 2022 09:16:30 +0100
Subject: [PATCH 1068/1407] Pin black in CI

This temporarily fixes an incompatibility between black and darker
---
 .github/workflows/python-package.yml |  4 +--
 IPython/tests/cve.py                 | 47 +++++++++++++++++-----------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 9c2ae9c45b9..663607f0246 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-      with: 
+      with:
         fetch-depth: 0
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
@@ -29,7 +29,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install darker
+        pip install darker black==21.12b0
     - name: Lint with darker
       run: |
         darker -r 60625f241f298b5039cb2debc365db38aa7bb522 --check --diff . || (
diff --git a/IPython/tests/cve.py b/IPython/tests/cve.py
index 026415a57a4..9e0f6df715d 100644
--- a/IPython/tests/cve.py
+++ b/IPython/tests/cve.py
@@ -11,46 +11,55 @@
 import subprocess
 import time
 
+
 def test_cve_2022_21699():
     """
     Here we test CVE-2022-21699.
 
-    We create a temporary directory, cd into it. 
-    Make a profile file that should not be executed and start IPython in a subprocess, 
+    We create a temporary directory, cd into it.
+    Make a profile file that should not be executed and start IPython in a subprocess,
     checking for the value.
 
 
 
     """
 
-    dangerous_profile_dir = Path('profile_default')
+    dangerous_profile_dir = Path("profile_default")
 
-    dangerous_startup_dir = dangerous_profile_dir / 'startup'
-    dangerous_expected = 'CVE-2022-21699-'+''.join([random.choice(string.ascii_letters) for i in range(10)])
+    dangerous_startup_dir = dangerous_profile_dir / "startup"
+    dangerous_expected = "CVE-2022-21699-" + "".join(
+        [random.choice(string.ascii_letters) for i in range(10)]
+    )
 
     with TemporaryWorkingDirectory() as t:
         dangerous_startup_dir.mkdir(parents=True)
-        (dangerous_startup_dir/ 'foo.py').write_text(f'print("{dangerous_expected}")')
+        (dangerous_startup_dir / "foo.py").write_text(f'print("{dangerous_expected}")')
         # 1 sec to make sure FS is flushed.
-        #time.sleep(1)
-        cmd = [sys.executable,'-m', 'IPython']
+        # time.sleep(1)
+        cmd = [sys.executable, "-m", "IPython"]
         env = os.environ.copy()
-        env['IPY_TEST_SIMPLE_PROMPT'] = '1'
-
+        env["IPY_TEST_SIMPLE_PROMPT"] = "1"
 
         # First we fake old behavior, making sure the profile is/was actually dangerous
-        p_dangerous = subprocess.Popen(cmd + [f'--profile-dir={dangerous_profile_dir}'], env=env, stdin=subprocess.PIPE,
-                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        p_dangerous = subprocess.Popen(
+            cmd + [f"--profile-dir={dangerous_profile_dir}"],
+            env=env,
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
         out_dangerous, err_dangerouns = p_dangerous.communicate(b"exit\r")
         assert dangerous_expected in out_dangerous.decode()
 
         # Now that we know it _would_ have been dangerous, we test it's not loaded
-        p = subprocess.Popen(cmd, env=env, stdin=subprocess.PIPE,
-                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        p = subprocess.Popen(
+            cmd,
+            env=env,
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
         out, err = p.communicate(b"exit\r")
-        assert b'IPython' in out
+        assert b"IPython" in out
         assert dangerous_expected not in out.decode()
-        assert err == b''
-
-
-
+        assert err == b""

From d55a692f46402f397ab38e6c4c9fb6423a85b54f Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@gmail.com>
Date: Thu, 20 Jan 2022 10:29:42 +0100
Subject: [PATCH 1069/1407] Update sphinxify usage

---
 IPython/core/interactiveshell.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 0f75337f076..13d06393122 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -90,12 +90,17 @@
 try:
     import docrepr.sphinxify as sphx
 
-    def sphinxify(doc):
-        with TemporaryDirectory() as dirname:
-            return {
-                'text/html': sphx.sphinxify(doc, dirname),
-                'text/plain': doc
-            }
+    def sphinxify(oinfo):
+        wrapped_docstring = sphx.wrap_main_docstring(oinfo)
+
+        def sphinxify_docstring(docstring):
+            with TemporaryDirectory() as dirname:
+                return {
+                    'text/html': sphx.sphinxify(wrapped_docstring, dirname),
+                    'text/plain': docstring
+                }
+
+        return sphinxify_docstring
 except ImportError:
     sphinxify = None
 
@@ -772,7 +777,7 @@ def init_virtualenv(self):
         while p.is_symlink():
             p = Path(os.readlink(p))
             paths.append(p.resolve())
-        
+
         # In Cygwin paths like "c:\..." and '\cygdrive\c\...' are possible
         if p_venv.parts[1] == "cygdrive":
             drive_name = p_venv.parts[2]
@@ -1621,7 +1626,7 @@ def _inspect(self, meth, oname, namespaces=None, **kw):
         This function is meant to be called by pdef, pdoc & friends.
         """
         info = self._object_find(oname, namespaces)
-        docformat = sphinxify if self.sphinxify_docstring else None
+        docformat = sphinxify(self.object_inspect(oname)) if self.sphinxify_docstring else None
         if info.found:
             pmethod = getattr(self.inspector, meth)
             # TODO: only apply format_screen to the plain/text repr of the mime
@@ -1668,7 +1673,7 @@ def object_inspect_mime(self, oname, detail_level=0, omit_sections=()):
         with self.builtin_trap:
             info = self._object_find(oname)
             if info.found:
-                docformat = sphinxify if self.sphinxify_docstring else None
+                docformat = sphinxify(self.object_inspect(oname)) if self.sphinxify_docstring else None
                 return self.inspector._get_info(
                     info.obj,
                     oname,

From 9a59d483426b1e8c7719defac41bd4eee1c692d2 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@gmail.com>
Date: Tue, 1 Feb 2022 09:04:06 +0100
Subject: [PATCH 1070/1407] Update IPython/core/interactiveshell.py

Co-authored-by: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>
---
 IPython/core/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 13d06393122..79a08c9c954 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -97,7 +97,7 @@ def sphinxify_docstring(docstring):
             with TemporaryDirectory() as dirname:
                 return {
                     'text/html': sphx.sphinxify(wrapped_docstring, dirname),
-                    'text/plain': docstring
+                    'text/plain': docstring,
                 }
 
         return sphinxify_docstring

From 81d23fcb46cb46e4fb46cf3c7b656950c65343ec Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@gmail.com>
Date: Tue, 1 Feb 2022 09:04:13 +0100
Subject: [PATCH 1071/1407] Update IPython/core/interactiveshell.py

Co-authored-by: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>
---
 IPython/core/interactiveshell.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 79a08c9c954..857a0208f74 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1626,7 +1626,9 @@ def _inspect(self, meth, oname, namespaces=None, **kw):
         This function is meant to be called by pdef, pdoc & friends.
         """
         info = self._object_find(oname, namespaces)
-        docformat = sphinxify(self.object_inspect(oname)) if self.sphinxify_docstring else None
+        docformat = (
+            sphinxify(self.object_inspect(oname)) if self.sphinxify_docstring else None
+        )
         if info.found:
             pmethod = getattr(self.inspector, meth)
             # TODO: only apply format_screen to the plain/text repr of the mime

From 75da19abb8cef733e6f2473c81923285ce1ebb93 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@gmail.com>
Date: Tue, 1 Feb 2022 09:04:18 +0100
Subject: [PATCH 1072/1407] Update IPython/core/interactiveshell.py

Co-authored-by: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>
---
 IPython/core/interactiveshell.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 857a0208f74..2d1c7107b73 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1675,7 +1675,9 @@ def object_inspect_mime(self, oname, detail_level=0, omit_sections=()):
         with self.builtin_trap:
             info = self._object_find(oname)
             if info.found:
-                docformat = sphinxify(self.object_inspect(oname)) if self.sphinxify_docstring else None
+        docformat = (
+            sphinxify(self.object_inspect(oname)) if self.sphinxify_docstring else None
+        )
                 return self.inspector._get_info(
                     info.obj,
                     oname,

From c9a8d0bff7f63b4797fd8baddf70ad4ab6a90414 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 1 Feb 2022 13:31:28 +0100
Subject: [PATCH 1073/1407] reformat

---
 IPython/core/interactiveshell.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 2d1c7107b73..ecb9c5f1652 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -96,8 +96,8 @@ def sphinxify(oinfo):
         def sphinxify_docstring(docstring):
             with TemporaryDirectory() as dirname:
                 return {
-                    'text/html': sphx.sphinxify(wrapped_docstring, dirname),
-                    'text/plain': docstring,
+                    "text/html": sphx.sphinxify(wrapped_docstring, dirname),
+                    "text/plain": docstring,
                 }
 
         return sphinxify_docstring
@@ -1675,9 +1675,11 @@ def object_inspect_mime(self, oname, detail_level=0, omit_sections=()):
         with self.builtin_trap:
             info = self._object_find(oname)
             if info.found:
-        docformat = (
-            sphinxify(self.object_inspect(oname)) if self.sphinxify_docstring else None
-        )
+                docformat = (
+                    sphinxify(self.object_inspect(oname))
+                    if self.sphinxify_docstring
+                    else None
+                )
                 return self.inspector._get_info(
                     info.obj,
                     oname,

From c75a242bfa6332faf34852949a9e6b44348313f7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 30 Jan 2022 17:32:24 +0100
Subject: [PATCH 1074/1407] Readd xfail to help with debian packaging

---
 IPython/core/tests/test_completer.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index db44d51a45d..cb5756a9f00 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -475,6 +475,7 @@ def test_completion_have_signature(self):
             "encoding" in c.signature
         ), "Signature of function was not found by completer"
 
+    @pytest.mark.xfail(reason="Known failure on jedi<=0.18.0")
     def test_deduplicate_completions(self):
         """
         Test that completions are correctly deduplicated (even if ranges are not the same)

From a69072c7c23a0ccbc07bd7c37b6f65eddc412562 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 1 Feb 2022 13:49:42 +0100
Subject: [PATCH 1075/1407] try to fix app-veyor

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index fbd8a2604f2..b1c0abe0b6c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,7 +17,7 @@ init:
 
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-  - python -m pip install --upgrade setuptools pip
+  - python -m pip install --upgrade setuptools 'pip<22'
   - pip install pytest-cov
   - pip install -e .[test_extra]
 test_script:

From 23276ac4770f380ce1d5808950dd412a35594af1 Mon Sep 17 00:00:00 2001
From: gousaiyang <gousaiyang@163.com>
Date: Fri, 4 Feb 2022 22:16:44 -0800
Subject: [PATCH 1076/1407] Fix EncodingWarning on Python 3.10

---
 IPython/core/application.py                   |  2 +-
 IPython/core/crashhandler.py                  |  2 +-
 IPython/core/display.py                       |  6 +++--
 IPython/core/interactiveshell.py              |  8 +++----
 IPython/core/magics/code.py                   |  8 +++----
 IPython/core/magics/execution.py              |  2 +-
 IPython/core/magics/packaging.py              |  2 +-
 IPython/core/page.py                          |  6 ++---
 IPython/core/tests/test_application.py        |  4 ++--
 IPython/core/tests/test_completer.py          |  6 ++---
 IPython/core/tests/test_completerlib.py       |  6 ++---
 IPython/core/tests/test_extension.py          |  6 ++---
 IPython/core/tests/test_interactiveshell.py   |  6 ++---
 IPython/core/tests/test_magic.py              | 22 +++++++++----------
 IPython/core/tests/test_profile.py            |  6 ++---
 IPython/core/tests/test_run.py                | 12 +++++-----
 IPython/core/tests/test_ultratb.py            | 12 +++++-----
 IPython/extensions/storemagic.py              |  4 ++--
 IPython/extensions/tests/test_autoreload.py   |  4 ++--
 IPython/lib/demo.py                           |  2 +-
 IPython/lib/tests/test_deepreload.py          |  4 ++--
 IPython/testing/tests/test_tools.py           |  2 +-
 IPython/testing/tools.py                      |  2 +-
 IPython/tests/cve.py                          |  2 +-
 IPython/utils/io.py                           |  7 +++---
 IPython/utils/tempdir.py                      |  3 ++-
 IPython/utils/tests/test_module_paths.py      |  2 +-
 IPython/utils/tests/test_path.py              | 14 ++++++------
 IPython/utils/tests/test_pycolorize.py        |  2 +-
 docs/autogen_config.py                        |  4 ++--
 docs/autogen_magics.py                        |  2 +-
 docs/autogen_shortcuts.py                     |  2 +-
 docs/source/conf.py                           |  4 ++--
 docs/sphinxext/apigen.py                      |  4 ++--
 .../IPython Kernel/ipython-get-history.py     |  2 +-
 setupbase.py                                  |  4 ++--
 tools/fixup_whats_new_pr.py                   |  4 ++--
 tools/toollib.py                              |  2 +-
 38 files changed, 98 insertions(+), 94 deletions(-)

diff --git a/IPython/core/application.py b/IPython/core/application.py
index 2b389a686d4..90ecf13179d 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -470,7 +470,7 @@ def stage_default_config_file(self):
         config_file = Path(self.profile_dir.location) / self.config_file_name
         if self.overwrite or not config_file.exists():
             self.log.warning("Generating default config file: %r" % (config_file))
-            config_file.write_text(s)
+            config_file.write_text(s, encoding='utf-8')
 
     @catch_config_error
     def initialize(self, argv=None):
diff --git a/IPython/core/crashhandler.py b/IPython/core/crashhandler.py
index d0d4b0d7725..3ee4879e4e8 100644
--- a/IPython/core/crashhandler.py
+++ b/IPython/core/crashhandler.py
@@ -185,7 +185,7 @@ def __call__(self, etype, evalue, etb):
 
         # and generate a complete report on disk
         try:
-            report = open(report_name,'w')
+            report = open(report_name, 'w', encoding='utf-8')
         except:
             print('Could not create crash report on disk.', file=sys.stderr)
             return
diff --git a/IPython/core/display.py b/IPython/core/display.py
index 9db75035762..608188ccece 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -349,7 +349,8 @@ def _data_and_metadata(self):
     def reload(self):
         """Reload the raw data from file or URL."""
         if self.filename is not None:
-            with open(self.filename, self._read_flags) as f:
+            encoding = None if 'b' in self._read_flags else 'utf-8'
+            with open(self.filename, self._read_flags, encoding=encoding) as f:
                 self.data = f.read()
         elif self.url is not None:
             # Deferred import
@@ -369,7 +370,8 @@ def reload(self):
                 if 'gzip' in response.headers['content-encoding']:
                     import gzip
                     from io import BytesIO
-                    with gzip.open(BytesIO(data), 'rt', encoding=encoding) as fp:
+                    # assume utf-8 if encoding is not specified
+                    with gzip.open(BytesIO(data), 'rt', encoding=encoding or 'utf-8') as fp:
                         encoding = None
                         data = fp.read()
 
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index ecb9c5f1652..65c3635f2fe 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2626,7 +2626,7 @@ def safe_execfile(self, fname, *where, exit_ignore=False, raise_exceptions=False
 
         # Make sure we can open the file
         try:
-            with fname.open():
+            with fname.open('rb'):
                 pass
         except:
             warn('Could not open file <%s> for safe execution.' % fname)
@@ -2684,7 +2684,7 @@ def safe_execfile_ipy(self, fname, shell_futures=False, raise_exceptions=False):
 
         # Make sure we can open the file
         try:
-            with fname.open():
+            with fname.open('rb'):
                 pass
         except:
             warn('Could not open file <%s> for safe execution.' % fname)
@@ -2706,7 +2706,7 @@ def get_cells():
                     if cell.cell_type == 'code':
                         yield cell.source
             else:
-                yield fname.read_text()
+                yield fname.read_text(encoding='utf-8')
 
         with prepended_to_syspath(dname):
             try:
@@ -3458,7 +3458,7 @@ def mktempfile(self, data=None, prefix='ipython_edit_'):
         self.tempfiles.append(file_path)
 
         if data:
-            file_path.write_text(data)
+            file_path.write_text(data, encoding='utf-8')
         return filename
 
     def ask_yes_no(self, prompt, default=None, interrupt=None):
diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index 3f8100ef268..6f44018ff72 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -538,7 +538,7 @@ def _edit_macro(self,mname,macro):
         self.shell.hooks.editor(filename)
 
         # and make a new macro object, to replace the old one
-        mvalue = Path(filename).read_text()
+        mvalue = Path(filename).read_text(encoding='utf-8')
         self.shell.user_ns[mname] = Macro(mvalue)
 
     @skip_doctest
@@ -728,7 +728,7 @@ def edit(self, parameter_s='',last_call=['','']):
         # XXX TODO: should this be generalized for all string vars?
         # For now, this is special-cased to blocks created by cpaste
         if args.strip() == "pasted_block":
-            self.shell.user_ns["pasted_block"] = filepath.read_text()
+            self.shell.user_ns["pasted_block"] = filepath.read_text(encoding='utf-8')
 
         if 'x' in opts:  # -x prevents actual execution
             print()
@@ -738,7 +738,7 @@ def edit(self, parameter_s='',last_call=['','']):
                 if not is_temp:
                     self.shell.user_ns['__file__'] = filename
                 if 'r' in opts:    # Untranslated IPython code
-                    source = filepath.read_text()
+                    source = filepath.read_text(encoding='utf-8')
                     self.shell.run_cell(source, store_history=False)
                 else:
                     self.shell.safe_execfile(filename, self.shell.user_ns,
@@ -746,7 +746,7 @@ def edit(self, parameter_s='',last_call=['','']):
 
         if is_temp:
             try:
-                return filepath.read_text()
+                return filepath.read_text(encoding='utf-8')
             except IOError as msg:
                 if Path(msg.filename) == filepath:
                     warn('File not found. Did you forget to save?')
diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 7e0b5c397ca..a90bd4efac0 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -360,7 +360,7 @@ def _run_with_profiler(self, code, opts, namespace):
         if text_file:
             pfile = Path(text_file)
             pfile.touch(exist_ok=True)
-            pfile.write_text(output)
+            pfile.write_text(output, encoding='utf-8')
 
             print(
                 f"\n*** Profile printout saved to text file {repr(text_file)}.{sys_exit}"
diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index 60fe1ac0762..1859a942929 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -32,7 +32,7 @@ def _get_conda_executable():
 
     # Otherwise, attempt to extract the executable from conda history.
     # This applies in any conda environment.
-    history = Path(sys.prefix, "conda-meta", "history").read_text()
+    history = Path(sys.prefix, "conda-meta", "history").read_text(encoding='utf-8')
     match = re.search(
         r"^#\s*cmd:\s*(?P<command>.*conda)\s[create|install]",
         history,
diff --git a/IPython/core/page.py b/IPython/core/page.py
index 24770c56a3c..7ebb6ec0047 100644
--- a/IPython/core/page.py
+++ b/IPython/core/page.py
@@ -199,7 +199,7 @@ def pager_page(strng, start=0, screen_lines=0, pager_cmd=None):
                 tmppath = Path(tmpname)
                 try:
                     os.close(fd)
-                    with tmppath.open("wt") as tmpfile:
+                    with tmppath.open("wt", encoding='utf-8') as tmpfile:
                         tmpfile.write(strng)
                         cmd = "%s < %s" % (pager_cmd, tmppath)
                     # tmpfile needs to be closed for windows
@@ -218,7 +218,7 @@ def pager_page(strng, start=0, screen_lines=0, pager_cmd=None):
                                 stdin=subprocess.PIPE,
                                 stderr=subprocess.DEVNULL
                                 )
-                pager = os._wrap_close(io.TextIOWrapper(proc.stdin), proc)
+                pager = os._wrap_close(io.TextIOWrapper(proc.stdin, encoding='utf-8'), proc)
                 try:
                     pager_encoding = pager.encoding or sys.stdout.encoding
                     pager.write(strng)
@@ -277,7 +277,7 @@ def page_file(fname, start=0, pager_cmd=None):
         try:
             if start > 0:
                 start -= 1
-            page(open(fname).read(),start)
+            page(open(fname, encoding='utf-8').read(),start)
         except:
             print('Unable to show file',repr(fname))
 
diff --git a/IPython/core/tests/test_application.py b/IPython/core/tests/test_application.py
index 891908e98e7..f4b11b5a928 100644
--- a/IPython/core/tests/test_application.py
+++ b/IPython/core/tests/test_application.py
@@ -34,7 +34,7 @@ def test_unicode_ipdir():
     ipdir = tempfile.mkdtemp(suffix=u"€")
     
     # Create the config file, so it tries to load it.
-    with open(os.path.join(ipdir, 'ipython_config.py'), "w") as f:
+    with open(os.path.join(ipdir, 'ipython_config.py'), "w", encoding='utf-8') as f:
         pass
     
     old_ipdir1 = os.environ.pop("IPYTHONDIR", None)
@@ -59,7 +59,7 @@ class TestApp(BaseIPythonApplication):
             test = Unicode().tag(config=True)
 
         # Create the config file, so it tries to load it.
-        with open(os.path.join(td, 'ipython_config.py'), "w") as f:
+        with open(os.path.join(td, 'ipython_config.py'), "w", encoding='utf-8') as f:
             f.write("c.TestApp.test = 'config file'")
 
         app = TestApp()
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index cb5756a9f00..7ce160a5aec 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -346,7 +346,7 @@ def test_abspath_file_completions(self):
             suffixes = ["1", "2"]
             names = [prefix + s for s in suffixes]
             for n in names:
-                open(n, "w").close()
+                open(n, "w", encoding='utf-8').close()
 
             # Check simple completion
             c = ip.complete(prefix)[1]
@@ -365,7 +365,7 @@ def test_local_file_completions(self):
             suffixes = ["1", "2"]
             names = [prefix + s for s in suffixes]
             for n in names:
-                open(n, "w").close()
+                open(n, "w", encoding='utf-8').close()
 
             # Check simple completion
             c = ip.complete(prefix)[1]
@@ -381,7 +381,7 @@ def test_quoted_file_completions(self):
         ip = get_ipython()
         with TemporaryWorkingDirectory():
             name = "foo'bar"
-            open(name, "w").close()
+            open(name, "w", encoding='utf-8').close()
 
             # Don't escape Windows
             escaped = name if sys.platform == "win32" else "foo\\'bar"
diff --git a/IPython/core/tests/test_completerlib.py b/IPython/core/tests/test_completerlib.py
index b5508447895..23e24e6bfd6 100644
--- a/IPython/core/tests/test_completerlib.py
+++ b/IPython/core/tests/test_completerlib.py
@@ -33,7 +33,7 @@ class Test_magic_run_completer(unittest.TestCase):
     def setUp(self):
         self.BASETESTDIR = tempfile.mkdtemp()
         for fil in self.files:
-            with open(join(self.BASETESTDIR, fil), "w") as sfile:
+            with open(join(self.BASETESTDIR, fil), "w", encoding='utf-8') as sfile:
                 sfile.write("pass\n")
         for d in self.dirs:
             os.mkdir(join(self.BASETESTDIR, d))
@@ -89,7 +89,7 @@ class Test_magic_run_completer_nonascii(unittest.TestCase):
     def setUp(self):
         self.BASETESTDIR = tempfile.mkdtemp()
         for fil in [u"aaø.py", u"a.py", u"b.py"]:
-            with open(join(self.BASETESTDIR, fil), "w") as sfile:
+            with open(join(self.BASETESTDIR, fil), "w", encoding='utf-8') as sfile:
                 sfile.write("pass\n")
         self.oldpath = os.getcwd()
         os.chdir(self.BASETESTDIR)
@@ -134,7 +134,7 @@ def test_import_invalid_module():
         sys.path.insert( 0, tmpdir )
         for name in invalid_module_names | valid_module_names:
             filename = os.path.join(tmpdir, name + '.py')
-            open(filename, 'w').close()
+            open(filename, 'w', encoding='utf-8').close()
 
         s = set( module_completion('import foo') )
         intersection = s.intersection(invalid_module_names)
diff --git a/IPython/core/tests/test_extension.py b/IPython/core/tests/test_extension.py
index 51db4b6258c..958fd2b4a2c 100644
--- a/IPython/core/tests/test_extension.py
+++ b/IPython/core/tests/test_extension.py
@@ -27,11 +27,11 @@ def test_extension_loading():
     em = get_ipython().extension_manager
     with TemporaryDirectory() as td:
         ext1 = os.path.join(td, 'ext1.py')
-        with open(ext1, 'w') as f:
+        with open(ext1, 'w', encoding='utf-8') as f:
             f.write(ext1_content)
         
         ext2 = os.path.join(td, 'ext2.py')
-        with open(ext2, 'w') as f:
+        with open(ext2, 'w', encoding='utf-8') as f:
             f.write(ext2_content)
         
         with prepended_to_syspath(td):
@@ -77,7 +77,7 @@ def test_extension_builtins():
     em = get_ipython().extension_manager
     with TemporaryDirectory() as td:
         ext3 = os.path.join(td, 'ext3.py')
-        with open(ext3, 'w') as f:
+        with open(ext3, 'w', encoding='utf-8') as f:
             f.write(ext3_content)
         
         assert 'ext3' not in em.loaded
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 41f5a358ea1..e86c4fcd560 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -485,11 +485,11 @@ def mock_print_func(value, sep=" ", end="\n", file=sys.stdout, flush=False):
     def test_mktempfile(self):
         filename = ip.mktempfile()
         # Check that we can open the file again on Windows
-        with open(filename, 'w') as f:
+        with open(filename, 'w', encoding='utf-8') as f:
             f.write('abc')
 
         filename = ip.mktempfile(data='blah')
-        with open(filename, 'r') as f:
+        with open(filename, 'r', encoding='utf-8') as f:
             self.assertEqual(f.read(), 'blah')
 
     def test_new_main_mod(self):
@@ -545,7 +545,7 @@ def setUp(self):
         self.BASETESTDIR = tempfile.mkdtemp()
         self.TESTDIR = join(self.BASETESTDIR, u"åäö")
         os.mkdir(self.TESTDIR)
-        with open(join(self.TESTDIR, u"åäötestscript.py"), "w") as sfile:
+        with open(join(self.TESTDIR, u"åäötestscript.py"), "w", encoding='utf-8') as sfile:
             sfile.write("pass\n")
         self.oldpath = os.getcwd()
         os.chdir(self.TESTDIR)
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 5294f82c51c..f645daf91b0 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -866,7 +866,7 @@ def test_file():
             'line1',
             'line2',
         ]))
-        s = Path(fname).read_text()
+        s = Path(fname).read_text(encoding='utf-8')
         assert "line1\n" in s
         assert "line2" in s
 
@@ -881,7 +881,7 @@ def test_file_single_quote():
             'line1',
             'line2',
         ]))
-        s = Path(fname).read_text()
+        s = Path(fname).read_text(encoding='utf-8')
         assert "line1\n" in s
         assert "line2" in s
 
@@ -896,7 +896,7 @@ def test_file_double_quote():
             'line1',
             'line2',
         ]))
-        s = Path(fname).read_text()
+        s = Path(fname).read_text(encoding='utf-8')
         assert "line1\n" in s
         assert "line2" in s
 
@@ -911,7 +911,7 @@ def test_file_var_expand():
             'line1',
             'line2',
         ]))
-        s = Path(fname).read_text()
+        s = Path(fname).read_text(encoding='utf-8')
         assert "line1\n" in s
         assert "line2" in s
 
@@ -944,7 +944,7 @@ def test_file_amend():
             'line3',
             'line4',
         ]))
-        s = Path(fname).read_text()
+        s = Path(fname).read_text(encoding='utf-8')
         assert "line1\n" in s
         assert "line3\n" in s
 
@@ -958,7 +958,7 @@ def test_file_spaces():
             'line1',
             'line2',
         ]))
-        s = Path(fname).read_text()
+        s = Path(fname).read_text(encoding='utf-8')
         assert "line1\n" in s
         assert "line2" in s
 
@@ -1154,11 +1154,11 @@ def test_save():
     with TemporaryDirectory() as tmpdir:
         file = os.path.join(tmpdir, "testsave.py")
         ip.run_line_magic("save", "%s 1-10" % file)
-        content = Path(file).read_text()
+        content = Path(file).read_text(encoding='utf-8')
         assert content.count(cmds[0]) == 1
         assert "coding: utf-8" in content
         ip.run_line_magic("save", "-a %s 1-10" % file)
-        content = Path(file).read_text()
+        content = Path(file).read_text(encoding='utf-8')
         assert content.count(cmds[0]) == 2
         assert "coding: utf-8" in content
 
@@ -1173,7 +1173,7 @@ def test_save_with_no_args():
     with TemporaryDirectory() as tmpdir:
         path = os.path.join(tmpdir, "testsave.py")
         ip.run_line_magic("save", path)
-        content = Path(path).read_text()
+        content = Path(path).read_text(encoding='utf-8')
         expected_content = dedent(
             """\
             # coding: utf-8
@@ -1336,7 +1336,7 @@ def test_run_module_from_import_hook():
     "Test that a module can be loaded via an import hook"
     with TemporaryDirectory() as tmpdir:
         fullpath = os.path.join(tmpdir, 'my_tmp.py')
-        Path(fullpath).write_text(TEST_MODULE)
+        Path(fullpath).write_text(TEST_MODULE, encoding='utf-8')
 
         import importlib.abc
         import importlib.util
@@ -1352,7 +1352,7 @@ def get_filename(self, fullname):
 
             def get_data(self, path):
                 assert Path(path).samefile(fullpath)
-                return Path(fullpath).read_text()
+                return Path(fullpath).read_text(encoding='utf-8')
 
         sys.meta_path.insert(0, MyTempImporter())
 
diff --git a/IPython/core/tests/test_profile.py b/IPython/core/tests/test_profile.py
index 8dd58cc67f4..22966e48ac3 100644
--- a/IPython/core/tests/test_profile.py
+++ b/IPython/core/tests/test_profile.py
@@ -84,10 +84,10 @@ def tearDown(self):
 
     def init(self, startup_file, startup, test):
         # write startup python file
-        with open(Path(self.pd.startup_dir) / startup_file, "w") as f:
+        with open(Path(self.pd.startup_dir) / startup_file, "w", encoding='utf-8') as f:
             f.write(startup)
         # write simple test file, to check that the startup file was run
-        with open(self.fname, 'w') as f:
+        with open(self.fname, 'w', encoding='utf-8') as f:
             f.write(test)
 
     def validate(self, output):
@@ -111,7 +111,7 @@ def test_list_profiles_in():
     if dec.unicode_paths:
         Path(td / u"profile_ünicode").mkdir(parents=True)
 
-    with open(td / "profile_file", "w") as f:
+    with open(td / "profile_file", "w", encoding='utf-8') as f:
         f.write("I am not a profile directory")
     profiles = list_profiles_in(td)
 
diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index 0f73a781e3e..69576577e9e 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -64,7 +64,7 @@ def doctest_run_builtins():
 
     In [3]: fname = tempfile.mkstemp('.py')[1]
 
-    In [3]: f = open(fname,'w')
+    In [3]: f = open(fname, 'w', encoding='utf-8')
 
     In [4]: dummy= f.write('pass\n')
 
@@ -443,7 +443,7 @@ def writefile(self, name, content):
         d = os.path.dirname(path)
         if not os.path.isdir(d):
             os.makedirs(d)
-        with open(path, 'w') as f:
+        with open(path, 'w', encoding='utf-8') as f:
             f.write(textwrap.dedent(content))
 
     def setUp(self):
@@ -527,7 +527,7 @@ def test_module_options_with_separator(self):
 def test_run__name__():
     with TemporaryDirectory() as td:
         path = pjoin(td, 'foo.py')
-        with open(path, 'w') as f:
+        with open(path, 'w', encoding='utf-8') as f:
             f.write("q = __name__")
 
         _ip.user_ns.pop("q", None)
@@ -548,7 +548,7 @@ def test_run_tb():
     """Test traceback offset in %run"""
     with TemporaryDirectory() as td:
         path = pjoin(td, 'foo.py')
-        with open(path, 'w') as f:
+        with open(path, 'w', encoding='utf-8') as f:
             f.write('\n'.join([
                 "def foo():",
                 "    return bar()",
@@ -578,7 +578,7 @@ def test_multiprocessing_run():
         sys.modules['__mp_main__'] = None
         try:
             path = pjoin(td, 'test.py')
-            with open(path, 'w') as f:
+            with open(path, 'w', encoding='utf-8') as f:
                 f.write("import multiprocessing\nprint('hoy')")
             with capture_output() as io:
                 _ip.run_line_magic('run', path)
@@ -598,7 +598,7 @@ def test_script_tb():
     """Test traceback offset in `ipython script.py`"""
     with TemporaryDirectory() as td:
         path = pjoin(td, 'foo.py')
-        with open(path, 'w') as f:
+        with open(path, 'w', encoding='utf-8') as f:
             f.write('\n'.join([
                 "def foo():",
                 "    return bar()",
diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index 423998019b5..6e855d10186 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -58,7 +58,7 @@ def test_changing_py_file(self):
         """
         with TemporaryDirectory() as td:
             fname = os.path.join(td, "foo.py")
-            with open(fname, "w") as f:
+            with open(fname, "w", encoding='utf-8') as f:
                 f.write(file_1)
             
             with prepended_to_syspath(td):
@@ -68,7 +68,7 @@ def test_changing_py_file(self):
                 ip.run_cell("foo.f()")
             
             # Make the file shorter, so the line of the error is missing.
-            with open(fname, "w") as f:
+            with open(fname, "w", encoding='utf-8') as f:
                 f.write(file_2)
             
             # For some reason, this was failing on the *second* call after
@@ -92,7 +92,7 @@ def test_nonascii_path(self):
         # Non-ascii directory name as well.
         with TemporaryDirectory(suffix=u'é') as td:
             fname = os.path.join(td, u"fooé.py")
-            with open(fname, "w") as f:
+            with open(fname, "w", encoding='utf-8') as f:
                 f.write(file_1)
             
             with prepended_to_syspath(td):
@@ -172,7 +172,7 @@ def test_indentationerror_shows_line(self):
         
         with TemporaryDirectory() as td:
             fname = os.path.join(td, "foo.py")
-            with open(fname, "w") as f:
+            with open(fname, "w", encoding='utf-8') as f:
                 f.write(indentationerror_file)
             
             with tt.AssertPrints("IndentationError"):
@@ -221,14 +221,14 @@ def bar():
     def test_changing_py_file(self):
         with TemporaryDirectory() as td:
             fname = os.path.join(td, "foo.py")
-            with open(fname, 'w') as f:
+            with open(fname, 'w', encoding='utf-8') as f:
                 f.write(se_file_1)
 
             with tt.AssertPrints(["7/", "SyntaxError"]):
                 ip.magic("run " + fname)
 
             # Modify the file
-            with open(fname, 'w') as f:
+            with open(fname, 'w', encoding='utf-8') as f:
                 f.write(se_file_2)
 
             # The SyntaxError should point to the correct line
diff --git a/IPython/extensions/storemagic.py b/IPython/extensions/storemagic.py
index b4a8cf82442..ff124ee38bd 100644
--- a/IPython/extensions/storemagic.py
+++ b/IPython/extensions/storemagic.py
@@ -179,9 +179,9 @@ def store(self, parameter_s=''):
             if len(args) > 1 and args[1].startswith('>'):
                 fnam = os.path.expanduser(args[1].lstrip('>').lstrip())
                 if args[1].startswith('>>'):
-                    fil = open(fnam, 'a')
+                    fil = open(fnam, 'a', encoding='utf-8')
                 else:
-                    fil = open(fnam, 'w')
+                    fil = open(fnam, 'w', encoding='utf-8')
                 with fil:
                     obj = ip.ev(args[0])
                     print("Writing '%s' (%s) to file '%s'." % (args[0],
diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index 65eb4a7b348..63bae802524 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -119,13 +119,13 @@ def write_file(self, filename, content):
         time.sleep(1.05)
 
         # Write
-        with open(filename, "w") as f:
+        with open(filename, "w", encoding='utf-8') as f:
             f.write(content)
 
     def new_module(self, code):
         code = textwrap.dedent(code)
         mod_name, mod_fn = self.get_module()
-        with open(mod_fn, "w") as f:
+        with open(mod_fn, "w", encoding='utf-8') as f:
             f.write(code)
         return mod_name, mod_fn
 
diff --git a/IPython/lib/demo.py b/IPython/lib/demo.py
index 14af5161cc8..0c96de6e72d 100644
--- a/IPython/lib/demo.py
+++ b/IPython/lib/demo.py
@@ -405,7 +405,7 @@ def edit(self,index=None):
 
         filename = self.shell.mktempfile(self.src_blocks[index])
         self.shell.hooks.editor(filename, 1)
-        with open(Path(filename), "r") as f:
+        with open(Path(filename), "r", encoding='utf-8') as f:
             new_block = f.read()
         # update the source and colored block
         self.src_blocks[index] = new_block
diff --git a/IPython/lib/tests/test_deepreload.py b/IPython/lib/tests/test_deepreload.py
index 9759a7f69f7..f86e1027f98 100644
--- a/IPython/lib/tests/test_deepreload.py
+++ b/IPython/lib/tests/test_deepreload.py
@@ -19,9 +19,9 @@ def test_deepreload():
     with TemporaryDirectory() as tmpdir:
         with prepended_to_syspath(tmpdir):
             tmpdirpath = Path(tmpdir)
-            with open(tmpdirpath / "A.py", "w") as f:
+            with open(tmpdirpath / "A.py", "w", encoding='utf-8') as f:
                 f.write("class Object:\n    pass\nok = True\n")
-            with open(tmpdirpath / "B.py", "w") as f:
+            with open(tmpdirpath / "B.py", "w", encoding='utf-8') as f:
                 f.write("import A\nassert A.ok, 'we are fine'\n")
             import A
             import B
diff --git a/IPython/testing/tests/test_tools.py b/IPython/testing/tests/test_tools.py
index f9f7e716cbd..0e66ca39a99 100644
--- a/IPython/testing/tests/test_tools.py
+++ b/IPython/testing/tests/test_tools.py
@@ -62,7 +62,7 @@ def test_temp_pyfile():
     src = 'pass\n'
     fname = tt.temp_pyfile(src)
     assert os.path.isfile(fname)
-    with open(fname) as fh2:
+    with open(fname, encoding='utf-8') as fh2:
         src2 = fh2.read()
     assert src2 == src
 
diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py
index 0d52d88d2bf..fafb73fb8f7 100644
--- a/IPython/testing/tools.py
+++ b/IPython/testing/tools.py
@@ -428,7 +428,7 @@ def mute_warn():
 def make_tempfile(name):
     """ Create an empty, named, temporary file for the duration of the context.
     """
-    open(name, 'w').close()
+    open(name, 'w', encoding='utf-8').close()
     try:
         yield
     finally:
diff --git a/IPython/tests/cve.py b/IPython/tests/cve.py
index 9e0f6df715d..aba6e20fa79 100644
--- a/IPython/tests/cve.py
+++ b/IPython/tests/cve.py
@@ -33,7 +33,7 @@ def test_cve_2022_21699():
 
     with TemporaryWorkingDirectory() as t:
         dangerous_startup_dir.mkdir(parents=True)
-        (dangerous_startup_dir / "foo.py").write_text(f'print("{dangerous_expected}")')
+        (dangerous_startup_dir / "foo.py").write_text(f'print("{dangerous_expected}")', encoding='utf-8')
         # 1 sec to make sure FS is flushed.
         # time.sleep(1)
         cmd = [sys.executable, "-m", "IPython"]
diff --git a/IPython/utils/io.py b/IPython/utils/io.py
index 69e4d4e0cdb..ef1be80988f 100644
--- a/IPython/utils/io.py
+++ b/IPython/utils/io.py
@@ -20,7 +20,7 @@
 from .capture import CapturedIO, capture_output
 
 # setup stdin/stdout/stderr to sys.stdin/sys.stdout/sys.stderr
-devnull = open(os.devnull, 'w')
+devnull = open(os.devnull, 'w', encoding='utf-8')
 atexit.register(devnull.close)
 
 
@@ -52,7 +52,8 @@ def __init__(self, file_or_name, mode="w", channel='stdout'):
         if hasattr(file_or_name, 'write') and hasattr(file_or_name, 'seek'):
             self.file = file_or_name
         else:
-            self.file = open(file_or_name, mode)
+            encoding = None if 'b' in mode else 'utf-8'
+            self.file = open(file_or_name, mode, encoding=encoding)
         self.channel = channel
         self.ostream = getattr(sys, channel)
         setattr(sys, channel, self)
@@ -131,7 +132,7 @@ def temp_pyfile(src, ext='.py'):
         It is the caller's responsibility to close the open file and unlink it.
     """
     fname = tempfile.mkstemp(ext)[1]
-    with open(Path(fname), "w") as f:
+    with open(Path(fname), "w", encoding='utf-8') as f:
         f.write(src)
         f.flush()
     return fname
diff --git a/IPython/utils/tempdir.py b/IPython/utils/tempdir.py
index bbfffe9c923..0729a8417dc 100644
--- a/IPython/utils/tempdir.py
+++ b/IPython/utils/tempdir.py
@@ -24,7 +24,8 @@ def __init__(self, filename, mode='w+b', bufsize=-1, **kwds):
         """
         self._tmpdir = TemporaryDirectory(**kwds)
         path = Path(self._tmpdir.name) / filename
-        self.file = open(path, mode, bufsize)
+        encoding = None if 'b' in mode else 'utf-8'
+        self.file = open(path, mode, bufsize, encoding=encoding)
 
     def cleanup(self):
         self.file.close()
diff --git a/IPython/utils/tests/test_module_paths.py b/IPython/utils/tests/test_module_paths.py
index 12679990c0c..2abf889514c 100644
--- a/IPython/utils/tests/test_module_paths.py
+++ b/IPython/utils/tests/test_module_paths.py
@@ -32,7 +32,7 @@
 old_syspath = sys.path
 
 def make_empty_file(fname):
-    open(fname, 'w').close()
+    open(fname, 'w', encoding='utf-8').close()
 
 
 def setup_module():
diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index b27e4355383..f92e6ae1f6c 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -295,7 +295,7 @@ def test_not_writable_ipdir(self):
         ipdir = os.path.join(tmpdir, '.ipython')
         os.mkdir(ipdir, 0o555)
         try:
-            open(os.path.join(ipdir, "_foo_"), 'w').close()
+            open(os.path.join(ipdir, "_foo_"), 'w', encoding='utf-8').close()
         except IOError:
             pass
         else:
@@ -352,7 +352,7 @@ def setUpClass(cls):
         with cls.in_tempdir():
             # Create empty files
             for fname in cls.filenames:
-                open(os.path.join(td, fname), 'w').close()
+                open(os.path.join(td, fname), 'w', encoding='utf-8').close()
 
     @classmethod
     def tearDownClass(cls):
@@ -428,7 +428,7 @@ def test_ensure_dir_exists():
         assert os.path.isdir(d)
         path.ensure_dir_exists(d) # no-op
         f = os.path.join(td, 'ƒile')
-        open(f, 'w').close() # touch
+        open(f, 'w', encoding='utf-8').close() # touch
         with pytest.raises(IOError):
             path.ensure_dir_exists(f)
 
@@ -436,7 +436,7 @@ class TestLinkOrCopy(unittest.TestCase):
     def setUp(self):
         self.tempdir = TemporaryDirectory()
         self.src = self.dst("src")
-        with open(self.src, "w") as f:
+        with open(self.src, "w", encoding='utf-8') as f:
             f.write("Hello, world!")
 
     def tearDown(self):
@@ -456,8 +456,8 @@ def assert_inode_equal(self, a, b):
         ), "%r and %r do not reference the same indoes" % (a, b)
 
     def assert_content_equal(self, a, b):
-        with open(a) as a_f:
-            with open(b) as b_f:
+        with open(a, 'rb') as a_f:
+            with open(b, 'rb') as b_f:
                 assert a_f.read() == b_f.read()
 
     @skip_win32
@@ -477,7 +477,7 @@ def test_link_into_dir(self):
     @skip_win32
     def test_target_exists(self):
         dst = self.dst("target")
-        open(dst, "w").close()
+        open(dst, "w", encoding='utf-8').close()
         path.link_or_copy(self.src, dst)
         self.assert_inode_equal(self.src, dst)
 
diff --git a/IPython/utils/tests/test_pycolorize.py b/IPython/utils/tests/test_pycolorize.py
index 05d51b6e44d..986b9178800 100644
--- a/IPython/utils/tests/test_pycolorize.py
+++ b/IPython/utils/tests/test_pycolorize.py
@@ -39,7 +39,7 @@ def function(arg, *args, kwarg=True, **kwargs):
     pass is True
     False == None
 
-    with io.open(ru'unicode'):
+    with io.open(ru'unicode', encoding='utf-8'):
         raise ValueError("\n escape \r sequence")
 
     print("wěird ünicoðe")
diff --git a/docs/autogen_config.py b/docs/autogen_config.py
index 98d13d3b0cb..56733f3b422 100755
--- a/docs/autogen_config.py
+++ b/docs/autogen_config.py
@@ -102,7 +102,7 @@ def reverse_aliases(app):
 def write_doc(name, title, app, preamble=None):
     trait_aliases = reverse_aliases(app)
     filename = options / (name + ".rst")
-    with open(filename, "w") as f:
+    with open(filename, "w", encoding='utf-8') as f:
         f.write(title + "\n")
         f.write(("=" * len(title)) + "\n")
         f.write("\n")
@@ -117,7 +117,7 @@ def write_doc(name, title, app, preamble=None):
 
 if __name__ == '__main__':
     # Touch this file for the make target
-    Path(generated).write_text("")
+    Path(generated).write_text("", encoding='utf-8')
 
     write_doc('terminal', 'Terminal IPython options', TerminalIPythonApp())
     write_doc('kernel', 'IPython kernel options', IPKernelApp(),
diff --git a/docs/autogen_magics.py b/docs/autogen_magics.py
index 1f8a47ef506..bfeb6aa7733 100644
--- a/docs/autogen_magics.py
+++ b/docs/autogen_magics.py
@@ -63,4 +63,4 @@ def sortkey(s): return s[0].lower()
 
 src_path = Path(__file__).parent
 dest = src_path.joinpath("source", "interactive", "magics-generated.txt")
-dest.write_text("\n".join(output))
+dest.write_text("\n".join(output), encoding='utf-8')
diff --git a/docs/autogen_shortcuts.py b/docs/autogen_shortcuts.py
index 802fa03e100..7ee0f910768 100755
--- a/docs/autogen_shortcuts.py
+++ b/docs/autogen_shortcuts.py
@@ -89,6 +89,6 @@ def sort_key(item):
         (single_filter, "single_filtered"),
         (multi_filter, "multi_filtered"),
     ]:
-        with (dest / "{}.csv".format(output_filename)).open("w") as csv:
+        with (dest / "{}.csv".format(output_filename)).open("w", encoding='utf-8') as csv:
             for (shortcut, flt), v in sorted(filters.items(), key=sort_key):
                 csv.write(":kbd:`{}`\t{}\t{}\n".format(shortcut, flt, v))
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 2312cc248b0..ba9aa1dbc88 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -28,7 +28,7 @@
     for name in ("config", "api", "magics", "shortcuts"):
         fname = Path("autogen_{}.py".format(name))
         fpath = (Path(__file__).parent).joinpath("..", fname)
-        with open(fpath) as f:
+        with open(fpath, encoding='utf-8') as f:
             exec(compile(f.read(), fname, 'exec'), {
                 '__file__': fpath,
                 '__name__': '__main__',
@@ -45,7 +45,7 @@
 
 # We load the ipython release info into a dict by explicit execution
 iprelease = {}
-exec(compile(open('../../IPython/core/release.py').read(), '../../IPython/core/release.py', 'exec'),iprelease)
+exec(compile(open('../../IPython/core/release.py', encoding='utf-8').read(), '../../IPython/core/release.py', 'exec'),iprelease)
 
 # General configuration
 # ---------------------
diff --git a/docs/sphinxext/apigen.py b/docs/sphinxext/apigen.py
index 5d352c7a22f..71a384b7d2a 100644
--- a/docs/sphinxext/apigen.py
+++ b/docs/sphinxext/apigen.py
@@ -392,7 +392,7 @@ def write_modules_api(self, modules,outdir):
             # write out to file
             outfile = os.path.join(outdir,
                                    m + self.rst_extension)
-            with open(outfile, 'wt') as fileobj:
+            with open(outfile, 'wt', encoding='utf-8') as fileobj:
                 fileobj.write(api_str)
             written_modules.append(m)
         self.written_modules = written_modules
@@ -444,7 +444,7 @@ def write_index(self, outdir, path='gen.rst', relative_to=None):
             relpath = outdir.replace(relative_to + os.path.sep, '')
         else:
             relpath = outdir
-        with open(path,'wt') as idx:
+        with open(path,'wt', encoding='utf-8') as idx:
             w = idx.write
             w('.. AUTO-GENERATED FILE -- DO NOT EDIT!\n\n')
             w('.. autosummary::\n'
diff --git a/examples/IPython Kernel/ipython-get-history.py b/examples/IPython Kernel/ipython-get-history.py
index a2d2ab7b0ab..fe38081fbad 100755
--- a/examples/IPython Kernel/ipython-get-history.py	
+++ b/examples/IPython Kernel/ipython-get-history.py	
@@ -24,7 +24,7 @@
 session_number = int(sys.argv[1])
 if len(sys.argv) > 2:
     filepath = Path(sys.argv[2])
-    dest = open(filepath, "w")
+    dest = open(filepath, "w", encoding='utf-8')
     raw = not filepath.name.endswith(".py")
 else:
     dest = sys.stdout
diff --git a/setupbase.py b/setupbase.py
index ecea9e788cc..788ce2491fb 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -36,7 +36,7 @@
 
 def execfile(fname, globs, locs=None):
     locs = locs or globs
-    with open(fname) as f:
+    with open(fname, encoding='utf-8') as f:
         exec(compile(f.read(), fname, "exec"), globs, locs)
 
 # A little utility we'll need below, since glob() does NOT allow you to do
@@ -336,7 +336,7 @@ def _record_commit(self, base_dir):
                 os.remove(out_pth)
             except (IOError, OSError):
                 pass
-            with open(out_pth, 'w') as out_file:
+            with open(out_pth, 'w', encoding='utf-8') as out_file:
                 out_file.writelines([
                     '# GENERATED BY setup.py\n',
                     'commit = u"%s"\n' % repo_commit,
diff --git a/tools/fixup_whats_new_pr.py b/tools/fixup_whats_new_pr.py
index a2741ef9ebf..397c0bf38e3 100644
--- a/tools/fixup_whats_new_pr.py
+++ b/tools/fixup_whats_new_pr.py
@@ -22,14 +22,14 @@ def main():
         print("Adding pseudo-title to:", filepath.name)
         title = filepath.name[:-4].split("/")[-1].replace("-", " ").capitalize()
 
-        data = filepath.read_text()
+        data = filepath.read_text(encoding='utf-8')
         try:
             if data and data.splitlines()[1].startswith('='):
                 continue
         except IndexError:
             pass
 
-        with filepath.open("w") as f:
+        with filepath.open("w", encoding='utf-8') as f:
             f.write(title + "\n")
             f.write("=" * len(title) + "\n\n")
             f.write(data)
diff --git a/tools/toollib.py b/tools/toollib.py
index 90727f0acda..c77bbbc6853 100644
--- a/tools/toollib.py
+++ b/tools/toollib.py
@@ -45,4 +45,4 @@ def get_ipdir():
 
 def execfile(fname, globs, locs=None):
     locs = locs or globs
-    exec(compile(open(fname).read(), fname, "exec"), globs, locs)
+    exec(compile(open(fname, encoding='utf-8').read(), fname, "exec"), globs, locs)

From 1a9d9554bcee466394990535e190d55008904df8 Mon Sep 17 00:00:00 2001
From: gousaiyang <gousaiyang@163.com>
Date: Fri, 4 Feb 2022 22:52:25 -0800
Subject: [PATCH 1077/1407] Format code

---
 IPython/core/application.py                   |   2 +-
 IPython/core/crashhandler.py                  |   2 +-
 IPython/core/display.py                       |   7 +-
 IPython/core/interactiveshell.py              |   8 +-
 IPython/core/magics/code.py                   |  12 +-
 IPython/core/magics/execution.py              |   2 +-
 IPython/core/magics/packaging.py              |   2 +-
 IPython/core/page.py                          |  19 +--
 IPython/core/tests/test_application.py        |   4 +-
 IPython/core/tests/test_completer.py          |   6 +-
 IPython/core/tests/test_completerlib.py       |   8 +-
 IPython/core/tests/test_extension.py          |  14 +-
 IPython/core/tests/test_interactiveshell.py   |  14 +-
 IPython/core/tests/test_magic.py              | 132 ++++++++++++------
 IPython/core/tests/test_profile.py            |   6 +-
 IPython/core/tests/test_run.py                |  54 ++++---
 IPython/core/tests/test_ultratb.py            |  12 +-
 IPython/extensions/storemagic.py              |  10 +-
 IPython/extensions/tests/test_autoreload.py   |   4 +-
 IPython/lib/demo.py                           |   2 +-
 IPython/lib/tests/test_deepreload.py          |   4 +-
 IPython/testing/tests/test_tools.py           |   2 +-
 IPython/testing/tools.py                      |   5 +-
 IPython/tests/cve.py                          |   4 +-
 IPython/utils/io.py                           |   6 +-
 IPython/utils/tempdir.py                      |   2 +-
 IPython/utils/tests/test_module_paths.py      |   2 +-
 IPython/utils/tests/test_path.py              |  18 +--
 docs/autogen_config.py                        |   4 +-
 docs/autogen_magics.py                        |   2 +-
 docs/autogen_shortcuts.py                     |   4 +-
 docs/source/conf.py                           |  22 ++-
 docs/sphinxext/apigen.py                      |   7 +-
 .../IPython Kernel/ipython-get-history.py     |   2 +-
 setupbase.py                                  |  15 +-
 tools/fixup_whats_new_pr.py                   |   4 +-
 tools/toollib.py                              |   2 +-
 37 files changed, 249 insertions(+), 176 deletions(-)

diff --git a/IPython/core/application.py b/IPython/core/application.py
index 90ecf13179d..0cdea5c69b8 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -470,7 +470,7 @@ def stage_default_config_file(self):
         config_file = Path(self.profile_dir.location) / self.config_file_name
         if self.overwrite or not config_file.exists():
             self.log.warning("Generating default config file: %r" % (config_file))
-            config_file.write_text(s, encoding='utf-8')
+            config_file.write_text(s, encoding="utf-8")
 
     @catch_config_error
     def initialize(self, argv=None):
diff --git a/IPython/core/crashhandler.py b/IPython/core/crashhandler.py
index 3ee4879e4e8..4af39361e80 100644
--- a/IPython/core/crashhandler.py
+++ b/IPython/core/crashhandler.py
@@ -185,7 +185,7 @@ def __call__(self, etype, evalue, etb):
 
         # and generate a complete report on disk
         try:
-            report = open(report_name, 'w', encoding='utf-8')
+            report = open(report_name, "w", encoding="utf-8")
         except:
             print('Could not create crash report on disk.', file=sys.stderr)
             return
diff --git a/IPython/core/display.py b/IPython/core/display.py
index 608188ccece..d36a176c3bf 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -349,7 +349,7 @@ def _data_and_metadata(self):
     def reload(self):
         """Reload the raw data from file or URL."""
         if self.filename is not None:
-            encoding = None if 'b' in self._read_flags else 'utf-8'
+            encoding = None if "b" in self._read_flags else "utf-8"
             with open(self.filename, self._read_flags, encoding=encoding) as f:
                 self.data = f.read()
         elif self.url is not None:
@@ -370,8 +370,11 @@ def reload(self):
                 if 'gzip' in response.headers['content-encoding']:
                     import gzip
                     from io import BytesIO
+
                     # assume utf-8 if encoding is not specified
-                    with gzip.open(BytesIO(data), 'rt', encoding=encoding or 'utf-8') as fp:
+                    with gzip.open(
+                        BytesIO(data), "rt", encoding=encoding or "utf-8"
+                    ) as fp:
                         encoding = None
                         data = fp.read()
 
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 65c3635f2fe..4f3105a2ebb 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2626,7 +2626,7 @@ def safe_execfile(self, fname, *where, exit_ignore=False, raise_exceptions=False
 
         # Make sure we can open the file
         try:
-            with fname.open('rb'):
+            with fname.open("rb"):
                 pass
         except:
             warn('Could not open file <%s> for safe execution.' % fname)
@@ -2684,7 +2684,7 @@ def safe_execfile_ipy(self, fname, shell_futures=False, raise_exceptions=False):
 
         # Make sure we can open the file
         try:
-            with fname.open('rb'):
+            with fname.open("rb"):
                 pass
         except:
             warn('Could not open file <%s> for safe execution.' % fname)
@@ -2706,7 +2706,7 @@ def get_cells():
                     if cell.cell_type == 'code':
                         yield cell.source
             else:
-                yield fname.read_text(encoding='utf-8')
+                yield fname.read_text(encoding="utf-8")
 
         with prepended_to_syspath(dname):
             try:
@@ -3458,7 +3458,7 @@ def mktempfile(self, data=None, prefix='ipython_edit_'):
         self.tempfiles.append(file_path)
 
         if data:
-            file_path.write_text(data, encoding='utf-8')
+            file_path.write_text(data, encoding="utf-8")
         return filename
 
     def ask_yes_no(self, prompt, default=None, interrupt=None):
diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py
index 6f44018ff72..65ba52b8bbf 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -538,7 +538,7 @@ def _edit_macro(self,mname,macro):
         self.shell.hooks.editor(filename)
 
         # and make a new macro object, to replace the old one
-        mvalue = Path(filename).read_text(encoding='utf-8')
+        mvalue = Path(filename).read_text(encoding="utf-8")
         self.shell.user_ns[mname] = Macro(mvalue)
 
     @skip_doctest
@@ -728,7 +728,7 @@ def edit(self, parameter_s='',last_call=['','']):
         # XXX TODO: should this be generalized for all string vars?
         # For now, this is special-cased to blocks created by cpaste
         if args.strip() == "pasted_block":
-            self.shell.user_ns["pasted_block"] = filepath.read_text(encoding='utf-8')
+            self.shell.user_ns["pasted_block"] = filepath.read_text(encoding="utf-8")
 
         if 'x' in opts:  # -x prevents actual execution
             print()
@@ -736,9 +736,9 @@ def edit(self, parameter_s='',last_call=['','']):
             print('done. Executing edited code...')
             with preserve_keys(self.shell.user_ns, '__file__'):
                 if not is_temp:
-                    self.shell.user_ns['__file__'] = filename
-                if 'r' in opts:    # Untranslated IPython code
-                    source = filepath.read_text(encoding='utf-8')
+                    self.shell.user_ns["__file__"] = filename
+                if "r" in opts:  # Untranslated IPython code
+                    source = filepath.read_text(encoding="utf-8")
                     self.shell.run_cell(source, store_history=False)
                 else:
                     self.shell.safe_execfile(filename, self.shell.user_ns,
@@ -746,7 +746,7 @@ def edit(self, parameter_s='',last_call=['','']):
 
         if is_temp:
             try:
-                return filepath.read_text(encoding='utf-8')
+                return filepath.read_text(encoding="utf-8")
             except IOError as msg:
                 if Path(msg.filename) == filepath:
                     warn('File not found. Did you forget to save?')
diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index a90bd4efac0..371da5b1f98 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -360,7 +360,7 @@ def _run_with_profiler(self, code, opts, namespace):
         if text_file:
             pfile = Path(text_file)
             pfile.touch(exist_ok=True)
-            pfile.write_text(output, encoding='utf-8')
+            pfile.write_text(output, encoding="utf-8")
 
             print(
                 f"\n*** Profile printout saved to text file {repr(text_file)}.{sys_exit}"
diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index 1859a942929..2f7652c169b 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -32,7 +32,7 @@ def _get_conda_executable():
 
     # Otherwise, attempt to extract the executable from conda history.
     # This applies in any conda environment.
-    history = Path(sys.prefix, "conda-meta", "history").read_text(encoding='utf-8')
+    history = Path(sys.prefix, "conda-meta", "history").read_text(encoding="utf-8")
     match = re.search(
         r"^#\s*cmd:\s*(?P<command>.*conda)\s[create|install]",
         history,
diff --git a/IPython/core/page.py b/IPython/core/page.py
index 7ebb6ec0047..d3e6a9eef50 100644
--- a/IPython/core/page.py
+++ b/IPython/core/page.py
@@ -199,7 +199,7 @@ def pager_page(strng, start=0, screen_lines=0, pager_cmd=None):
                 tmppath = Path(tmpname)
                 try:
                     os.close(fd)
-                    with tmppath.open("wt", encoding='utf-8') as tmpfile:
+                    with tmppath.open("wt", encoding="utf-8") as tmpfile:
                         tmpfile.write(strng)
                         cmd = "%s < %s" % (pager_cmd, tmppath)
                     # tmpfile needs to be closed for windows
@@ -213,12 +213,15 @@ def pager_page(strng, start=0, screen_lines=0, pager_cmd=None):
             try:
                 retval = None
                 # Emulate os.popen, but redirect stderr
-                proc = subprocess.Popen(pager_cmd,
-                                shell=True,
-                                stdin=subprocess.PIPE,
-                                stderr=subprocess.DEVNULL
-                                )
-                pager = os._wrap_close(io.TextIOWrapper(proc.stdin, encoding='utf-8'), proc)
+                proc = subprocess.Popen(
+                    pager_cmd,
+                    shell=True,
+                    stdin=subprocess.PIPE,
+                    stderr=subprocess.DEVNULL,
+                )
+                pager = os._wrap_close(
+                    io.TextIOWrapper(proc.stdin, encoding="utf-8"), proc
+                )
                 try:
                     pager_encoding = pager.encoding or sys.stdout.encoding
                     pager.write(strng)
@@ -277,7 +280,7 @@ def page_file(fname, start=0, pager_cmd=None):
         try:
             if start > 0:
                 start -= 1
-            page(open(fname, encoding='utf-8').read(),start)
+            page(open(fname, encoding="utf-8").read(), start)
         except:
             print('Unable to show file',repr(fname))
 
diff --git a/IPython/core/tests/test_application.py b/IPython/core/tests/test_application.py
index f4b11b5a928..74ea0f79006 100644
--- a/IPython/core/tests/test_application.py
+++ b/IPython/core/tests/test_application.py
@@ -34,7 +34,7 @@ def test_unicode_ipdir():
     ipdir = tempfile.mkdtemp(suffix=u"€")
     
     # Create the config file, so it tries to load it.
-    with open(os.path.join(ipdir, 'ipython_config.py'), "w", encoding='utf-8') as f:
+    with open(os.path.join(ipdir, "ipython_config.py"), "w", encoding="utf-8") as f:
         pass
     
     old_ipdir1 = os.environ.pop("IPYTHONDIR", None)
@@ -59,7 +59,7 @@ class TestApp(BaseIPythonApplication):
             test = Unicode().tag(config=True)
 
         # Create the config file, so it tries to load it.
-        with open(os.path.join(td, 'ipython_config.py'), "w", encoding='utf-8') as f:
+        with open(os.path.join(td, "ipython_config.py"), "w", encoding="utf-8") as f:
             f.write("c.TestApp.test = 'config file'")
 
         app = TestApp()
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 7ce160a5aec..5f791e84f83 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -346,7 +346,7 @@ def test_abspath_file_completions(self):
             suffixes = ["1", "2"]
             names = [prefix + s for s in suffixes]
             for n in names:
-                open(n, "w", encoding='utf-8').close()
+                open(n, "w", encoding="utf-8").close()
 
             # Check simple completion
             c = ip.complete(prefix)[1]
@@ -365,7 +365,7 @@ def test_local_file_completions(self):
             suffixes = ["1", "2"]
             names = [prefix + s for s in suffixes]
             for n in names:
-                open(n, "w", encoding='utf-8').close()
+                open(n, "w", encoding="utf-8").close()
 
             # Check simple completion
             c = ip.complete(prefix)[1]
@@ -381,7 +381,7 @@ def test_quoted_file_completions(self):
         ip = get_ipython()
         with TemporaryWorkingDirectory():
             name = "foo'bar"
-            open(name, "w", encoding='utf-8').close()
+            open(name, "w", encoding="utf-8").close()
 
             # Don't escape Windows
             escaped = name if sys.platform == "win32" else "foo\\'bar"
diff --git a/IPython/core/tests/test_completerlib.py b/IPython/core/tests/test_completerlib.py
index 23e24e6bfd6..fbbc258673f 100644
--- a/IPython/core/tests/test_completerlib.py
+++ b/IPython/core/tests/test_completerlib.py
@@ -33,7 +33,7 @@ class Test_magic_run_completer(unittest.TestCase):
     def setUp(self):
         self.BASETESTDIR = tempfile.mkdtemp()
         for fil in self.files:
-            with open(join(self.BASETESTDIR, fil), "w", encoding='utf-8') as sfile:
+            with open(join(self.BASETESTDIR, fil), "w", encoding="utf-8") as sfile:
                 sfile.write("pass\n")
         for d in self.dirs:
             os.mkdir(join(self.BASETESTDIR, d))
@@ -89,7 +89,7 @@ class Test_magic_run_completer_nonascii(unittest.TestCase):
     def setUp(self):
         self.BASETESTDIR = tempfile.mkdtemp()
         for fil in [u"aaø.py", u"a.py", u"b.py"]:
-            with open(join(self.BASETESTDIR, fil), "w", encoding='utf-8') as sfile:
+            with open(join(self.BASETESTDIR, fil), "w", encoding="utf-8") as sfile:
                 sfile.write("pass\n")
         self.oldpath = os.getcwd()
         os.chdir(self.BASETESTDIR)
@@ -133,8 +133,8 @@ def test_import_invalid_module():
     with TemporaryDirectory() as tmpdir:
         sys.path.insert( 0, tmpdir )
         for name in invalid_module_names | valid_module_names:
-            filename = os.path.join(tmpdir, name + '.py')
-            open(filename, 'w', encoding='utf-8').close()
+            filename = os.path.join(tmpdir, name + ".py")
+            open(filename, "w", encoding="utf-8").close()
 
         s = set( module_completion('import foo') )
         intersection = s.intersection(invalid_module_names)
diff --git a/IPython/core/tests/test_extension.py b/IPython/core/tests/test_extension.py
index 958fd2b4a2c..59e21dcacf2 100644
--- a/IPython/core/tests/test_extension.py
+++ b/IPython/core/tests/test_extension.py
@@ -26,12 +26,12 @@ def load_ipython_extension(ip):
 def test_extension_loading():
     em = get_ipython().extension_manager
     with TemporaryDirectory() as td:
-        ext1 = os.path.join(td, 'ext1.py')
-        with open(ext1, 'w', encoding='utf-8') as f:
+        ext1 = os.path.join(td, "ext1.py")
+        with open(ext1, "w", encoding="utf-8") as f:
             f.write(ext1_content)
-        
-        ext2 = os.path.join(td, 'ext2.py')
-        with open(ext2, 'w', encoding='utf-8') as f:
+
+        ext2 = os.path.join(td, "ext2.py")
+        with open(ext2, "w", encoding="utf-8") as f:
             f.write(ext2_content)
         
         with prepended_to_syspath(td):
@@ -76,8 +76,8 @@ def test_extension_loading():
 def test_extension_builtins():
     em = get_ipython().extension_manager
     with TemporaryDirectory() as td:
-        ext3 = os.path.join(td, 'ext3.py')
-        with open(ext3, 'w', encoding='utf-8') as f:
+        ext3 = os.path.join(td, "ext3.py")
+        with open(ext3, "w", encoding="utf-8") as f:
             f.write(ext3_content)
         
         assert 'ext3' not in em.loaded
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index e86c4fcd560..09dbd967706 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -485,12 +485,12 @@ def mock_print_func(value, sep=" ", end="\n", file=sys.stdout, flush=False):
     def test_mktempfile(self):
         filename = ip.mktempfile()
         # Check that we can open the file again on Windows
-        with open(filename, 'w', encoding='utf-8') as f:
-            f.write('abc')
+        with open(filename, "w", encoding="utf-8") as f:
+            f.write("abc")
 
-        filename = ip.mktempfile(data='blah')
-        with open(filename, 'r', encoding='utf-8') as f:
-            self.assertEqual(f.read(), 'blah')
+        filename = ip.mktempfile(data="blah")
+        with open(filename, "r", encoding="utf-8") as f:
+            self.assertEqual(f.read(), "blah")
 
     def test_new_main_mod(self):
         # Smoketest to check that this accepts a unicode module name
@@ -545,7 +545,9 @@ def setUp(self):
         self.BASETESTDIR = tempfile.mkdtemp()
         self.TESTDIR = join(self.BASETESTDIR, u"åäö")
         os.mkdir(self.TESTDIR)
-        with open(join(self.TESTDIR, u"åäötestscript.py"), "w", encoding='utf-8') as sfile:
+        with open(
+            join(self.TESTDIR, u"åäötestscript.py"), "w", encoding="utf-8"
+        ) as sfile:
             sfile.write("pass\n")
         self.oldpath = os.getcwd()
         os.chdir(self.TESTDIR)
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index f645daf91b0..0f6d4aaa951 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -861,12 +861,18 @@ def test_file():
     """Basic %%writefile"""
     ip = get_ipython()
     with TemporaryDirectory() as td:
-        fname = os.path.join(td, 'file1')
-        ip.run_cell_magic("writefile", fname, u'\n'.join([
-            'line1',
-            'line2',
-        ]))
-        s = Path(fname).read_text(encoding='utf-8')
+        fname = os.path.join(td, "file1")
+        ip.run_cell_magic(
+            "writefile",
+            fname,
+            "\n".join(
+                [
+                    "line1",
+                    "line2",
+                ]
+            ),
+        )
+        s = Path(fname).read_text(encoding="utf-8")
         assert "line1\n" in s
         assert "line2" in s
 
@@ -876,12 +882,18 @@ def test_file_single_quote():
     """Basic %%writefile with embedded single quotes"""
     ip = get_ipython()
     with TemporaryDirectory() as td:
-        fname = os.path.join(td, '\'file1\'')
-        ip.run_cell_magic("writefile", fname, u'\n'.join([
-            'line1',
-            'line2',
-        ]))
-        s = Path(fname).read_text(encoding='utf-8')
+        fname = os.path.join(td, "'file1'")
+        ip.run_cell_magic(
+            "writefile",
+            fname,
+            "\n".join(
+                [
+                    "line1",
+                    "line2",
+                ]
+            ),
+        )
+        s = Path(fname).read_text(encoding="utf-8")
         assert "line1\n" in s
         assert "line2" in s
 
@@ -892,11 +904,17 @@ def test_file_double_quote():
     ip = get_ipython()
     with TemporaryDirectory() as td:
         fname = os.path.join(td, '"file1"')
-        ip.run_cell_magic("writefile", fname, u'\n'.join([
-            'line1',
-            'line2',
-        ]))
-        s = Path(fname).read_text(encoding='utf-8')
+        ip.run_cell_magic(
+            "writefile",
+            fname,
+            "\n".join(
+                [
+                    "line1",
+                    "line2",
+                ]
+            ),
+        )
+        s = Path(fname).read_text(encoding="utf-8")
         assert "line1\n" in s
         assert "line2" in s
 
@@ -905,13 +923,19 @@ def test_file_var_expand():
     """%%writefile $filename"""
     ip = get_ipython()
     with TemporaryDirectory() as td:
-        fname = os.path.join(td, 'file1')
-        ip.user_ns['filename'] = fname
-        ip.run_cell_magic("writefile", '$filename', u'\n'.join([
-            'line1',
-            'line2',
-        ]))
-        s = Path(fname).read_text(encoding='utf-8')
+        fname = os.path.join(td, "file1")
+        ip.user_ns["filename"] = fname
+        ip.run_cell_magic(
+            "writefile",
+            "$filename",
+            "\n".join(
+                [
+                    "line1",
+                    "line2",
+                ]
+            ),
+        )
+        s = Path(fname).read_text(encoding="utf-8")
         assert "line1\n" in s
         assert "line2" in s
 
@@ -935,16 +959,28 @@ def test_file_amend():
     """%%writefile -a amends files"""
     ip = get_ipython()
     with TemporaryDirectory() as td:
-        fname = os.path.join(td, 'file2')
-        ip.run_cell_magic("writefile", fname, u'\n'.join([
-            'line1',
-            'line2',
-        ]))
-        ip.run_cell_magic("writefile", "-a %s" % fname, u'\n'.join([
-            'line3',
-            'line4',
-        ]))
-        s = Path(fname).read_text(encoding='utf-8')
+        fname = os.path.join(td, "file2")
+        ip.run_cell_magic(
+            "writefile",
+            fname,
+            "\n".join(
+                [
+                    "line1",
+                    "line2",
+                ]
+            ),
+        )
+        ip.run_cell_magic(
+            "writefile",
+            "-a %s" % fname,
+            "\n".join(
+                [
+                    "line3",
+                    "line4",
+                ]
+            ),
+        )
+        s = Path(fname).read_text(encoding="utf-8")
         assert "line1\n" in s
         assert "line3\n" in s
 
@@ -954,11 +990,17 @@ def test_file_spaces():
     ip = get_ipython()
     with TemporaryWorkingDirectory() as td:
         fname = "file name"
-        ip.run_cell_magic("file", '"%s"'%fname, u'\n'.join([
-            'line1',
-            'line2',
-        ]))
-        s = Path(fname).read_text(encoding='utf-8')
+        ip.run_cell_magic(
+            "file",
+            '"%s"' % fname,
+            "\n".join(
+                [
+                    "line1",
+                    "line2",
+                ]
+            ),
+        )
+        s = Path(fname).read_text(encoding="utf-8")
         assert "line1\n" in s
         assert "line2" in s
 
@@ -1154,11 +1196,11 @@ def test_save():
     with TemporaryDirectory() as tmpdir:
         file = os.path.join(tmpdir, "testsave.py")
         ip.run_line_magic("save", "%s 1-10" % file)
-        content = Path(file).read_text(encoding='utf-8')
+        content = Path(file).read_text(encoding="utf-8")
         assert content.count(cmds[0]) == 1
         assert "coding: utf-8" in content
         ip.run_line_magic("save", "-a %s 1-10" % file)
-        content = Path(file).read_text(encoding='utf-8')
+        content = Path(file).read_text(encoding="utf-8")
         assert content.count(cmds[0]) == 2
         assert "coding: utf-8" in content
 
@@ -1173,7 +1215,7 @@ def test_save_with_no_args():
     with TemporaryDirectory() as tmpdir:
         path = os.path.join(tmpdir, "testsave.py")
         ip.run_line_magic("save", path)
-        content = Path(path).read_text(encoding='utf-8')
+        content = Path(path).read_text(encoding="utf-8")
         expected_content = dedent(
             """\
             # coding: utf-8
@@ -1335,8 +1377,8 @@ def test_timeit_arguments():
 def test_run_module_from_import_hook():
     "Test that a module can be loaded via an import hook"
     with TemporaryDirectory() as tmpdir:
-        fullpath = os.path.join(tmpdir, 'my_tmp.py')
-        Path(fullpath).write_text(TEST_MODULE, encoding='utf-8')
+        fullpath = os.path.join(tmpdir, "my_tmp.py")
+        Path(fullpath).write_text(TEST_MODULE, encoding="utf-8")
 
         import importlib.abc
         import importlib.util
@@ -1352,7 +1394,7 @@ def get_filename(self, fullname):
 
             def get_data(self, path):
                 assert Path(path).samefile(fullpath)
-                return Path(fullpath).read_text(encoding='utf-8')
+                return Path(fullpath).read_text(encoding="utf-8")
 
         sys.meta_path.insert(0, MyTempImporter())
 
diff --git a/IPython/core/tests/test_profile.py b/IPython/core/tests/test_profile.py
index 22966e48ac3..d034b50f219 100644
--- a/IPython/core/tests/test_profile.py
+++ b/IPython/core/tests/test_profile.py
@@ -84,10 +84,10 @@ def tearDown(self):
 
     def init(self, startup_file, startup, test):
         # write startup python file
-        with open(Path(self.pd.startup_dir) / startup_file, "w", encoding='utf-8') as f:
+        with open(Path(self.pd.startup_dir) / startup_file, "w", encoding="utf-8") as f:
             f.write(startup)
         # write simple test file, to check that the startup file was run
-        with open(self.fname, 'w', encoding='utf-8') as f:
+        with open(self.fname, "w", encoding="utf-8") as f:
             f.write(test)
 
     def validate(self, output):
@@ -111,7 +111,7 @@ def test_list_profiles_in():
     if dec.unicode_paths:
         Path(td / u"profile_ünicode").mkdir(parents=True)
 
-    with open(td / "profile_file", "w", encoding='utf-8') as f:
+    with open(td / "profile_file", "w", encoding="utf-8") as f:
         f.write("I am not a profile directory")
     profiles = list_profiles_in(td)
 
diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index 69576577e9e..9204e81e8e8 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -443,7 +443,7 @@ def writefile(self, name, content):
         d = os.path.dirname(path)
         if not os.path.isdir(d):
             os.makedirs(d)
-        with open(path, 'w', encoding='utf-8') as f:
+        with open(path, "w", encoding="utf-8") as f:
             f.write(textwrap.dedent(content))
 
     def setUp(self):
@@ -526,8 +526,8 @@ def test_module_options_with_separator(self):
 
 def test_run__name__():
     with TemporaryDirectory() as td:
-        path = pjoin(td, 'foo.py')
-        with open(path, 'w', encoding='utf-8') as f:
+        path = pjoin(td, "foo.py")
+        with open(path, "w", encoding="utf-8") as f:
             f.write("q = __name__")
 
         _ip.user_ns.pop("q", None)
@@ -547,15 +547,19 @@ def test_run__name__():
 def test_run_tb():
     """Test traceback offset in %run"""
     with TemporaryDirectory() as td:
-        path = pjoin(td, 'foo.py')
-        with open(path, 'w', encoding='utf-8') as f:
-            f.write('\n'.join([
-                "def foo():",
-                "    return bar()",
-                "def bar():",
-                "    raise RuntimeError('hello!')",
-                "foo()",
-            ]))
+        path = pjoin(td, "foo.py")
+        with open(path, "w", encoding="utf-8") as f:
+            f.write(
+                "\n".join(
+                    [
+                        "def foo():",
+                        "    return bar()",
+                        "def bar():",
+                        "    raise RuntimeError('hello!')",
+                        "foo()",
+                    ]
+                )
+            )
         with capture_output() as io:
             _ip.magic('run {}'.format(path))
         out = io.stdout
@@ -577,8 +581,8 @@ def test_multiprocessing_run():
         mpm = sys.modules.get('__mp_main__')
         sys.modules['__mp_main__'] = None
         try:
-            path = pjoin(td, 'test.py')
-            with open(path, 'w', encoding='utf-8') as f:
+            path = pjoin(td, "test.py")
+            with open(path, "w", encoding="utf-8") as f:
                 f.write("import multiprocessing\nprint('hoy')")
             with capture_output() as io:
                 _ip.run_line_magic('run', path)
@@ -597,15 +601,19 @@ def test_multiprocessing_run():
 def test_script_tb():
     """Test traceback offset in `ipython script.py`"""
     with TemporaryDirectory() as td:
-        path = pjoin(td, 'foo.py')
-        with open(path, 'w', encoding='utf-8') as f:
-            f.write('\n'.join([
-                "def foo():",
-                "    return bar()",
-                "def bar():",
-                "    raise RuntimeError('hello!')",
-                "foo()",
-            ]))
+        path = pjoin(td, "foo.py")
+        with open(path, "w", encoding="utf-8") as f:
+            f.write(
+                "\n".join(
+                    [
+                        "def foo():",
+                        "    return bar()",
+                        "def bar():",
+                        "    raise RuntimeError('hello!')",
+                        "foo()",
+                    ]
+                )
+            )
         out, err = tt.ipexec(path)
         assert "execfile" not in out
         assert "RuntimeError" in out
diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index 6e855d10186..e10abb863a1 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -58,7 +58,7 @@ def test_changing_py_file(self):
         """
         with TemporaryDirectory() as td:
             fname = os.path.join(td, "foo.py")
-            with open(fname, "w", encoding='utf-8') as f:
+            with open(fname, "w", encoding="utf-8") as f:
                 f.write(file_1)
             
             with prepended_to_syspath(td):
@@ -68,7 +68,7 @@ def test_changing_py_file(self):
                 ip.run_cell("foo.f()")
             
             # Make the file shorter, so the line of the error is missing.
-            with open(fname, "w", encoding='utf-8') as f:
+            with open(fname, "w", encoding="utf-8") as f:
                 f.write(file_2)
             
             # For some reason, this was failing on the *second* call after
@@ -92,7 +92,7 @@ def test_nonascii_path(self):
         # Non-ascii directory name as well.
         with TemporaryDirectory(suffix=u'é') as td:
             fname = os.path.join(td, u"fooé.py")
-            with open(fname, "w", encoding='utf-8') as f:
+            with open(fname, "w", encoding="utf-8") as f:
                 f.write(file_1)
             
             with prepended_to_syspath(td):
@@ -172,7 +172,7 @@ def test_indentationerror_shows_line(self):
         
         with TemporaryDirectory() as td:
             fname = os.path.join(td, "foo.py")
-            with open(fname, "w", encoding='utf-8') as f:
+            with open(fname, "w", encoding="utf-8") as f:
                 f.write(indentationerror_file)
             
             with tt.AssertPrints("IndentationError"):
@@ -221,14 +221,14 @@ def bar():
     def test_changing_py_file(self):
         with TemporaryDirectory() as td:
             fname = os.path.join(td, "foo.py")
-            with open(fname, 'w', encoding='utf-8') as f:
+            with open(fname, "w", encoding="utf-8") as f:
                 f.write(se_file_1)
 
             with tt.AssertPrints(["7/", "SyntaxError"]):
                 ip.magic("run " + fname)
 
             # Modify the file
-            with open(fname, 'w', encoding='utf-8') as f:
+            with open(fname, "w", encoding="utf-8") as f:
                 f.write(se_file_2)
 
             # The SyntaxError should point to the correct line
diff --git a/IPython/extensions/storemagic.py b/IPython/extensions/storemagic.py
index ff124ee38bd..d9d00f14b9a 100644
--- a/IPython/extensions/storemagic.py
+++ b/IPython/extensions/storemagic.py
@@ -176,12 +176,12 @@ def store(self, parameter_s=''):
         # default action - store the variable
         else:
             # %store foo >file.txt or >>file.txt
-            if len(args) > 1 and args[1].startswith('>'):
-                fnam = os.path.expanduser(args[1].lstrip('>').lstrip())
-                if args[1].startswith('>>'):
-                    fil = open(fnam, 'a', encoding='utf-8')
+            if len(args) > 1 and args[1].startswith(">"):
+                fnam = os.path.expanduser(args[1].lstrip(">").lstrip())
+                if args[1].startswith(">>"):
+                    fil = open(fnam, "a", encoding="utf-8")
                 else:
-                    fil = open(fnam, 'w', encoding='utf-8')
+                    fil = open(fnam, "w", encoding="utf-8")
                 with fil:
                     obj = ip.ev(args[0])
                     print("Writing '%s' (%s) to file '%s'." % (args[0],
diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index 63bae802524..a0fe725aa68 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -119,13 +119,13 @@ def write_file(self, filename, content):
         time.sleep(1.05)
 
         # Write
-        with open(filename, "w", encoding='utf-8') as f:
+        with open(filename, "w", encoding="utf-8") as f:
             f.write(content)
 
     def new_module(self, code):
         code = textwrap.dedent(code)
         mod_name, mod_fn = self.get_module()
-        with open(mod_fn, "w", encoding='utf-8') as f:
+        with open(mod_fn, "w", encoding="utf-8") as f:
             f.write(code)
         return mod_name, mod_fn
 
diff --git a/IPython/lib/demo.py b/IPython/lib/demo.py
index 0c96de6e72d..8c9ae905d49 100644
--- a/IPython/lib/demo.py
+++ b/IPython/lib/demo.py
@@ -405,7 +405,7 @@ def edit(self,index=None):
 
         filename = self.shell.mktempfile(self.src_blocks[index])
         self.shell.hooks.editor(filename, 1)
-        with open(Path(filename), "r", encoding='utf-8') as f:
+        with open(Path(filename), "r", encoding="utf-8") as f:
             new_block = f.read()
         # update the source and colored block
         self.src_blocks[index] = new_block
diff --git a/IPython/lib/tests/test_deepreload.py b/IPython/lib/tests/test_deepreload.py
index f86e1027f98..827249cbad0 100644
--- a/IPython/lib/tests/test_deepreload.py
+++ b/IPython/lib/tests/test_deepreload.py
@@ -19,9 +19,9 @@ def test_deepreload():
     with TemporaryDirectory() as tmpdir:
         with prepended_to_syspath(tmpdir):
             tmpdirpath = Path(tmpdir)
-            with open(tmpdirpath / "A.py", "w", encoding='utf-8') as f:
+            with open(tmpdirpath / "A.py", "w", encoding="utf-8") as f:
                 f.write("class Object:\n    pass\nok = True\n")
-            with open(tmpdirpath / "B.py", "w", encoding='utf-8') as f:
+            with open(tmpdirpath / "B.py", "w", encoding="utf-8") as f:
                 f.write("import A\nassert A.ok, 'we are fine'\n")
             import A
             import B
diff --git a/IPython/testing/tests/test_tools.py b/IPython/testing/tests/test_tools.py
index 0e66ca39a99..178863cf686 100644
--- a/IPython/testing/tests/test_tools.py
+++ b/IPython/testing/tests/test_tools.py
@@ -62,7 +62,7 @@ def test_temp_pyfile():
     src = 'pass\n'
     fname = tt.temp_pyfile(src)
     assert os.path.isfile(fname)
-    with open(fname, encoding='utf-8') as fh2:
+    with open(fname, encoding="utf-8") as fh2:
         src2 = fh2.read()
     assert src2 == src
 
diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py
index fafb73fb8f7..2ff63a6d4a0 100644
--- a/IPython/testing/tools.py
+++ b/IPython/testing/tools.py
@@ -426,9 +426,8 @@ def mute_warn():
 
 @contextmanager
 def make_tempfile(name):
-    """ Create an empty, named, temporary file for the duration of the context.
-    """
-    open(name, 'w', encoding='utf-8').close()
+    """Create an empty, named, temporary file for the duration of the context."""
+    open(name, "w", encoding="utf-8").close()
     try:
         yield
     finally:
diff --git a/IPython/tests/cve.py b/IPython/tests/cve.py
index aba6e20fa79..0a9dec4e854 100644
--- a/IPython/tests/cve.py
+++ b/IPython/tests/cve.py
@@ -33,7 +33,9 @@ def test_cve_2022_21699():
 
     with TemporaryWorkingDirectory() as t:
         dangerous_startup_dir.mkdir(parents=True)
-        (dangerous_startup_dir / "foo.py").write_text(f'print("{dangerous_expected}")', encoding='utf-8')
+        (dangerous_startup_dir / "foo.py").write_text(
+            f'print("{dangerous_expected}")', encoding="utf-8"
+        )
         # 1 sec to make sure FS is flushed.
         # time.sleep(1)
         cmd = [sys.executable, "-m", "IPython"]
diff --git a/IPython/utils/io.py b/IPython/utils/io.py
index ef1be80988f..170bc625acb 100644
--- a/IPython/utils/io.py
+++ b/IPython/utils/io.py
@@ -20,7 +20,7 @@
 from .capture import CapturedIO, capture_output
 
 # setup stdin/stdout/stderr to sys.stdin/sys.stdout/sys.stderr
-devnull = open(os.devnull, 'w', encoding='utf-8')
+devnull = open(os.devnull, "w", encoding="utf-8")
 atexit.register(devnull.close)
 
 
@@ -52,7 +52,7 @@ def __init__(self, file_or_name, mode="w", channel='stdout'):
         if hasattr(file_or_name, 'write') and hasattr(file_or_name, 'seek'):
             self.file = file_or_name
         else:
-            encoding = None if 'b' in mode else 'utf-8'
+            encoding = None if "b" in mode else "utf-8"
             self.file = open(file_or_name, mode, encoding=encoding)
         self.channel = channel
         self.ostream = getattr(sys, channel)
@@ -132,7 +132,7 @@ def temp_pyfile(src, ext='.py'):
         It is the caller's responsibility to close the open file and unlink it.
     """
     fname = tempfile.mkstemp(ext)[1]
-    with open(Path(fname), "w", encoding='utf-8') as f:
+    with open(Path(fname), "w", encoding="utf-8") as f:
         f.write(src)
         f.flush()
     return fname
diff --git a/IPython/utils/tempdir.py b/IPython/utils/tempdir.py
index 0729a8417dc..c3918d05bb0 100644
--- a/IPython/utils/tempdir.py
+++ b/IPython/utils/tempdir.py
@@ -24,7 +24,7 @@ def __init__(self, filename, mode='w+b', bufsize=-1, **kwds):
         """
         self._tmpdir = TemporaryDirectory(**kwds)
         path = Path(self._tmpdir.name) / filename
-        encoding = None if 'b' in mode else 'utf-8'
+        encoding = None if "b" in mode else "utf-8"
         self.file = open(path, mode, bufsize, encoding=encoding)
 
     def cleanup(self):
diff --git a/IPython/utils/tests/test_module_paths.py b/IPython/utils/tests/test_module_paths.py
index 2abf889514c..8438a1e737f 100644
--- a/IPython/utils/tests/test_module_paths.py
+++ b/IPython/utils/tests/test_module_paths.py
@@ -32,7 +32,7 @@
 old_syspath = sys.path
 
 def make_empty_file(fname):
-    open(fname, 'w', encoding='utf-8').close()
+    open(fname, "w", encoding="utf-8").close()
 
 
 def setup_module():
diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index f92e6ae1f6c..13e322320e0 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -295,7 +295,7 @@ def test_not_writable_ipdir(self):
         ipdir = os.path.join(tmpdir, '.ipython')
         os.mkdir(ipdir, 0o555)
         try:
-            open(os.path.join(ipdir, "_foo_"), 'w', encoding='utf-8').close()
+            open(os.path.join(ipdir, "_foo_"), "w", encoding="utf-8").close()
         except IOError:
             pass
         else:
@@ -352,7 +352,7 @@ def setUpClass(cls):
         with cls.in_tempdir():
             # Create empty files
             for fname in cls.filenames:
-                open(os.path.join(td, fname), 'w', encoding='utf-8').close()
+                open(os.path.join(td, fname), "w", encoding="utf-8").close()
 
     @classmethod
     def tearDownClass(cls):
@@ -426,9 +426,9 @@ def test_ensure_dir_exists():
         d = os.path.join(td, '∂ir')
         path.ensure_dir_exists(d) # create it
         assert os.path.isdir(d)
-        path.ensure_dir_exists(d) # no-op
-        f = os.path.join(td, 'ƒile')
-        open(f, 'w', encoding='utf-8').close() # touch
+        path.ensure_dir_exists(d)  # no-op
+        f = os.path.join(td, "ƒile")
+        open(f, "w", encoding="utf-8").close()  # touch
         with pytest.raises(IOError):
             path.ensure_dir_exists(f)
 
@@ -436,7 +436,7 @@ class TestLinkOrCopy(unittest.TestCase):
     def setUp(self):
         self.tempdir = TemporaryDirectory()
         self.src = self.dst("src")
-        with open(self.src, "w", encoding='utf-8') as f:
+        with open(self.src, "w", encoding="utf-8") as f:
             f.write("Hello, world!")
 
     def tearDown(self):
@@ -456,8 +456,8 @@ def assert_inode_equal(self, a, b):
         ), "%r and %r do not reference the same indoes" % (a, b)
 
     def assert_content_equal(self, a, b):
-        with open(a, 'rb') as a_f:
-            with open(b, 'rb') as b_f:
+        with open(a, "rb") as a_f:
+            with open(b, "rb") as b_f:
                 assert a_f.read() == b_f.read()
 
     @skip_win32
@@ -477,7 +477,7 @@ def test_link_into_dir(self):
     @skip_win32
     def test_target_exists(self):
         dst = self.dst("target")
-        open(dst, "w", encoding='utf-8').close()
+        open(dst, "w", encoding="utf-8").close()
         path.link_or_copy(self.src, dst)
         self.assert_inode_equal(self.src, dst)
 
diff --git a/docs/autogen_config.py b/docs/autogen_config.py
index 56733f3b422..43c38dd2d43 100755
--- a/docs/autogen_config.py
+++ b/docs/autogen_config.py
@@ -102,7 +102,7 @@ def reverse_aliases(app):
 def write_doc(name, title, app, preamble=None):
     trait_aliases = reverse_aliases(app)
     filename = options / (name + ".rst")
-    with open(filename, "w", encoding='utf-8') as f:
+    with open(filename, "w", encoding="utf-8") as f:
         f.write(title + "\n")
         f.write(("=" * len(title)) + "\n")
         f.write("\n")
@@ -117,7 +117,7 @@ def write_doc(name, title, app, preamble=None):
 
 if __name__ == '__main__':
     # Touch this file for the make target
-    Path(generated).write_text("", encoding='utf-8')
+    Path(generated).write_text("", encoding="utf-8")
 
     write_doc('terminal', 'Terminal IPython options', TerminalIPythonApp())
     write_doc('kernel', 'IPython kernel options', IPKernelApp(),
diff --git a/docs/autogen_magics.py b/docs/autogen_magics.py
index bfeb6aa7733..6102d0950c6 100644
--- a/docs/autogen_magics.py
+++ b/docs/autogen_magics.py
@@ -63,4 +63,4 @@ def sortkey(s): return s[0].lower()
 
 src_path = Path(__file__).parent
 dest = src_path.joinpath("source", "interactive", "magics-generated.txt")
-dest.write_text("\n".join(output), encoding='utf-8')
+dest.write_text("\n".join(output), encoding="utf-8")
diff --git a/docs/autogen_shortcuts.py b/docs/autogen_shortcuts.py
index 7ee0f910768..db7fe8d4917 100755
--- a/docs/autogen_shortcuts.py
+++ b/docs/autogen_shortcuts.py
@@ -89,6 +89,8 @@ def sort_key(item):
         (single_filter, "single_filtered"),
         (multi_filter, "multi_filtered"),
     ]:
-        with (dest / "{}.csv".format(output_filename)).open("w", encoding='utf-8') as csv:
+        with (dest / "{}.csv".format(output_filename)).open(
+            "w", encoding="utf-8"
+        ) as csv:
             for (shortcut, flt), v in sorted(filters.items(), key=sort_key):
                 csv.write(":kbd:`{}`\t{}\t{}\n".format(shortcut, flt, v))
diff --git a/docs/source/conf.py b/docs/source/conf.py
index ba9aa1dbc88..29212af8bf7 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -28,11 +28,14 @@
     for name in ("config", "api", "magics", "shortcuts"):
         fname = Path("autogen_{}.py".format(name))
         fpath = (Path(__file__).parent).joinpath("..", fname)
-        with open(fpath, encoding='utf-8') as f:
-            exec(compile(f.read(), fname, 'exec'), {
-                '__file__': fpath,
-                '__name__': '__main__',
-            })
+        with open(fpath, encoding="utf-8") as f:
+            exec(
+                compile(f.read(), fname, "exec"),
+                {
+                    "__file__": fpath,
+                    "__name__": "__main__",
+                },
+            )
 else:
     import sphinx_rtd_theme
     html_theme = "sphinx_rtd_theme"
@@ -45,7 +48,14 @@
 
 # We load the ipython release info into a dict by explicit execution
 iprelease = {}
-exec(compile(open('../../IPython/core/release.py', encoding='utf-8').read(), '../../IPython/core/release.py', 'exec'),iprelease)
+exec(
+    compile(
+        open("../../IPython/core/release.py", encoding="utf-8").read(),
+        "../../IPython/core/release.py",
+        "exec",
+    ),
+    iprelease,
+)
 
 # General configuration
 # ---------------------
diff --git a/docs/sphinxext/apigen.py b/docs/sphinxext/apigen.py
index 71a384b7d2a..e58493b17fd 100644
--- a/docs/sphinxext/apigen.py
+++ b/docs/sphinxext/apigen.py
@@ -390,9 +390,8 @@ def write_modules_api(self, modules,outdir):
             if not api_str:
                 continue
             # write out to file
-            outfile = os.path.join(outdir,
-                                   m + self.rst_extension)
-            with open(outfile, 'wt', encoding='utf-8') as fileobj:
+            outfile = os.path.join(outdir, m + self.rst_extension)
+            with open(outfile, "wt", encoding="utf-8") as fileobj:
                 fileobj.write(api_str)
             written_modules.append(m)
         self.written_modules = written_modules
@@ -444,7 +443,7 @@ def write_index(self, outdir, path='gen.rst', relative_to=None):
             relpath = outdir.replace(relative_to + os.path.sep, '')
         else:
             relpath = outdir
-        with open(path,'wt', encoding='utf-8') as idx:
+        with open(path, "wt", encoding="utf-8") as idx:
             w = idx.write
             w('.. AUTO-GENERATED FILE -- DO NOT EDIT!\n\n')
             w('.. autosummary::\n'
diff --git a/examples/IPython Kernel/ipython-get-history.py b/examples/IPython Kernel/ipython-get-history.py
index fe38081fbad..116b4b7c155 100755
--- a/examples/IPython Kernel/ipython-get-history.py	
+++ b/examples/IPython Kernel/ipython-get-history.py	
@@ -24,7 +24,7 @@
 session_number = int(sys.argv[1])
 if len(sys.argv) > 2:
     filepath = Path(sys.argv[2])
-    dest = open(filepath, "w", encoding='utf-8')
+    dest = open(filepath, "w", encoding="utf-8")
     raw = not filepath.name.endswith(".py")
 else:
     dest = sys.stdout
diff --git a/setupbase.py b/setupbase.py
index 788ce2491fb..b57dcc1b2a5 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -36,7 +36,7 @@
 
 def execfile(fname, globs, locs=None):
     locs = locs or globs
-    with open(fname, encoding='utf-8') as f:
+    with open(fname, encoding="utf-8") as f:
         exec(compile(f.read(), fname, "exec"), globs, locs)
 
 # A little utility we'll need below, since glob() does NOT allow you to do
@@ -336,10 +336,13 @@ def _record_commit(self, base_dir):
                 os.remove(out_pth)
             except (IOError, OSError):
                 pass
-            with open(out_pth, 'w', encoding='utf-8') as out_file:
-                out_file.writelines([
-                    '# GENERATED BY setup.py\n',
-                    'commit = u"%s"\n' % repo_commit,
-                ])
+            with open(out_pth, "w", encoding="utf-8") as out_file:
+                out_file.writelines(
+                    [
+                        "# GENERATED BY setup.py\n",
+                        'commit = u"%s"\n' % repo_commit,
+                    ]
+                )
+
     return MyBuildPy
 
diff --git a/tools/fixup_whats_new_pr.py b/tools/fixup_whats_new_pr.py
index 397c0bf38e3..9b74da8055c 100644
--- a/tools/fixup_whats_new_pr.py
+++ b/tools/fixup_whats_new_pr.py
@@ -22,14 +22,14 @@ def main():
         print("Adding pseudo-title to:", filepath.name)
         title = filepath.name[:-4].split("/")[-1].replace("-", " ").capitalize()
 
-        data = filepath.read_text(encoding='utf-8')
+        data = filepath.read_text(encoding="utf-8")
         try:
             if data and data.splitlines()[1].startswith('='):
                 continue
         except IndexError:
             pass
 
-        with filepath.open("w", encoding='utf-8') as f:
+        with filepath.open("w", encoding="utf-8") as f:
             f.write(title + "\n")
             f.write("=" * len(title) + "\n\n")
             f.write(data)
diff --git a/tools/toollib.py b/tools/toollib.py
index c77bbbc6853..f32e06a5fa5 100644
--- a/tools/toollib.py
+++ b/tools/toollib.py
@@ -45,4 +45,4 @@ def get_ipdir():
 
 def execfile(fname, globs, locs=None):
     locs = locs or globs
-    exec(compile(open(fname, encoding='utf-8').read(), fname, "exec"), globs, locs)
+    exec(compile(open(fname, encoding="utf-8").read(), fname, "exec"), globs, locs)

From 7a171250be20214526089e7638a6002e83a3fcf4 Mon Sep 17 00:00:00 2001
From: gousaiyang <gousaiyang@163.com>
Date: Fri, 4 Feb 2022 22:53:36 -0800
Subject: [PATCH 1078/1407] IPython currently incompatible with pytest 7

---
 .github/workflows/downstream.yml | 2 +-
 docs/requirements.txt            | 2 +-
 setup.cfg                        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
index 168b32e2678..5c5adc1e0ab 100644
--- a/.github/workflows/downstream.yml
+++ b/.github/workflows/downstream.yml
@@ -41,7 +41,7 @@ jobs:
         python -m pip install --upgrade -e file://$PWD#egg=ipython[test]
         # we must instal IPython after ipykernel to get the right versions.
         python -m pip install --upgrade --upgrade-strategy eager flaky ipyparallel
-        python -m pip install --upgrade pytest 
+        python -m pip install --upgrade 'pytest<7' 
     - name: pytest
       env:
         COLUMNS: 120
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 93e162f6660..587288c2a0f 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -6,4 +6,4 @@ sphinx-rtd-theme
 docrepr
 matplotlib
 stack_data
-pytest
+pytest<7
diff --git a/setup.cfg b/setup.cfg
index 2da02e4e598..4fbffaa1a07 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -63,7 +63,7 @@ qtconsole =
     qtconsole
 terminal =
 test =
-    pytest
+    pytest<7
     pytest-asyncio
     testpath
 test_extra =
@@ -72,7 +72,7 @@ test_extra =
     nbformat
     numpy>=1.19
     pandas
-    pytest
+    pytest<7
     testpath
     trio
 all =

From 65f7fdfefa2c9ff872bcbd63f827b9256ed28594 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 7 Feb 2022 11:26:44 +0100
Subject: [PATCH 1079/1407] pin pytest

---
 setup.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2da02e4e598..4fbffaa1a07 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -63,7 +63,7 @@ qtconsole =
     qtconsole
 terminal =
 test =
-    pytest
+    pytest<7
     pytest-asyncio
     testpath
 test_extra =
@@ -72,7 +72,7 @@ test_extra =
     nbformat
     numpy>=1.19
     pandas
-    pytest
+    pytest<7
     testpath
     trio
 all =

From e306c9d3f707de42b47a1e7c4c8034d6862fba5f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 7 Feb 2022 11:21:10 +0100
Subject: [PATCH 1080/1407] Update old deprecation

---
 IPython/core/interactiveshell.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index ecb9c5f1652..902da1bd9a1 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2287,7 +2287,11 @@ def find_magic(self, magic_name, magic_kind='line'):
         return self.magics_manager.magics[magic_kind].get(magic_name)
 
     def magic(self, arg_s):
-        """DEPRECATED. Use run_line_magic() instead.
+        """
+        DEPRECATED
+
+        Deprecated since IPython 0.13 (warning added in
+        8.1), use run_line_magic(magic_name, parameter_s).
 
         Call a magic function by name.
 
@@ -2305,6 +2309,12 @@ def magic(self, arg_s):
         valid Python code you can type at the interpreter, including loops and
         compound statements.
         """
+        warnings.warn(
+            "`magic(...)` is deprecated since IPython 0.13 (warning added in "
+            "8.1), use run_line_magic(magic_name, parameter_s).",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         # TODO: should we issue a loud deprecation warning here?
         magic_name, _, magic_arg_s = arg_s.partition(' ')
         magic_name = magic_name.lstrip(prefilter.ESC_MAGIC)

From e65762abb111da59c215c1382b8a3a601c57eea6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 8 Feb 2022 11:32:28 +0100
Subject: [PATCH 1081/1407] Make unicode backslach completion fuzzy and case
 insensitive

Ok, the fuzzy part is super simple.

- candidates matching prefix
- If no matches: names that contain the string
- If no matches :whether each part
    of the string split on space is contained in the name of the unicode
    character.

That is to say, `\GREEK OMICRON<tab>` will search whether both GREEK and
and OMICRON (case insensitive) are available, in the worst case scenario

This allows things like `\omicron` to give you proper suggestions.

`\nu` will give you latex nu,
`\greek nu` with match as the prefix of `GREEK NUMERAL ...`
`\Nu` will match all the `... NUMERAL...` in unicode,
but `\Nu greek` will limit the searches enough

Mitigate #13514
---
 IPython/core/completer.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index ccb1f465f5b..9774fd5a4e7 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -2222,12 +2222,22 @@ def fwd_unicode_match(self, text:str) -> Tuple[str, Sequence[str]]:
             # initialized, and it takes a user-noticeable amount of time to
             # initialize it, so we don't want to initialize it unless we're
             # actually going to use it.
-            s = text[slashpos+1:]
-            candidates = [x for x in self.unicode_names if x.startswith(s)]
+            s = text[slashpos + 1 :]
+            sup = s.upper()
+            candidates = [x for x in self.unicode_names if x.startswith(sup)]
             if candidates:
                 return s, candidates
-            else:
-                return '', ()
+            candidates = [x for x in self.unicode_names if sup in x]
+            if candidates:
+                return s, candidates
+            splitsup = sup.split(" ")
+            candidates = [
+                x for x in self.unicode_names if all(u in x for u in splitsup)
+            ]
+            if candidates:
+                return s, candidates
+
+            return "", ()
 
         # if text does not start with slash
         else:

From e5bbea060db04b6a3d578e6a444278c981dc1db5 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 1 Feb 2022 15:14:34 +0100
Subject: [PATCH 1082/1407] Allow to configure lazy loadable magics.

While we encourage load_ipython_ext to be lazy and not take too much
resources, it might not be practical especially when the top level
module takes a long time to import.

Here we allow to define a mapping between magics names and extension
name, and on attempt to execute a non-existing magics we'll look into
the lazy mapping and try to load it.

We also add a helper to let us interactively register a magic lazily,
see the `register_lazy()` method of to magics_manager
---
 IPython/core/interactiveshell.py          | 41 +++++++++++++++++---
 IPython/core/magic.py                     | 46 +++++++++++++++++++++++
 IPython/core/tests/test_magic.py          | 44 +++++++++++++++++++++-
 IPython/core/tests/test_magic_terminal.py | 35 ++++++++++++++---
 IPython/terminal/ipapp.py                 |  2 +
 docs/source/whatsnew/version7.rst         | 18 +++++++++
 6 files changed, 175 insertions(+), 11 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 902da1bd9a1..3d9ec35b2ed 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -500,7 +500,6 @@ def profile(self):
     def __init__(self, ipython_dir=None, profile_dir=None,
                  user_module=None, user_ns=None,
                  custom_exceptions=((), None), **kwargs):
-
         # This is where traits with a config_key argument are updated
         # from the values on config.
         super(InteractiveShell, self).__init__(**kwargs)
@@ -1643,7 +1642,7 @@ def _inspect(self, meth, oname, namespaces=None, **kw):
                     formatter,
                     info,
                     enable_html_pager=self.enable_html_pager,
-                    **kw
+                    **kw,
                 )
             else:
                 pmethod(info.obj, oname)
@@ -2173,7 +2172,34 @@ def register_magic_function(self, func, magic_kind='line', magic_name=None):
             func, magic_kind=magic_kind, magic_name=magic_name
         )
 
-    def run_line_magic(self, magic_name, line, _stack_depth=1):
+    def _find_with_lazy_load(self, /, type_, magic_name: str):
+        """
+        Try to find a magic potentially lazy-loading it.
+
+        Parameters
+        ----------
+
+        type_: "line"|"cell"
+            the type of magics we are trying to find/lazy load.
+        magic_name: str
+            The name of the magic we are trying to find/lazy load
+
+
+        Note that this may have any side effects
+        """
+        finder = {"line": self.find_line_magic, "cell": self.find_cell_magic}[type_]
+        fn = finder(magic_name)
+        if fn is not None:
+            return fn
+        lazy = self.magics_manager.lazy_magics.get(magic_name)
+        if lazy is None:
+            return None
+
+        self.run_line_magic("load_ext", lazy)
+        res = finder(magic_name)
+        return res
+
+    def run_line_magic(self, magic_name: str, line, _stack_depth=1):
         """Execute the given line magic.
 
         Parameters
@@ -2186,7 +2212,12 @@ def run_line_magic(self, magic_name, line, _stack_depth=1):
             If run_line_magic() is called from magic() then _stack_depth=2.
             This is added to ensure backward compatibility for use of 'get_ipython().magic()'
         """
-        fn = self.find_line_magic(magic_name)
+        fn = self._find_with_lazy_load("line", magic_name)
+        if fn is None:
+            lazy = self.magics_manager.lazy_magics.get(magic_name)
+            if lazy:
+                self.run_line_magic("load_ext", lazy)
+                fn = self.find_line_magic(magic_name)
         if fn is None:
             cm = self.find_cell_magic(magic_name)
             etpl = "Line magic function `%%%s` not found%s."
@@ -2237,7 +2268,7 @@ def run_cell_magic(self, magic_name, line, cell):
         cell : str
             The body of the cell as a (possibly multiline) string.
         """
-        fn = self.find_cell_magic(magic_name)
+        fn = self._find_with_lazy_load("cell", magic_name)
         if fn is None:
             lm = self.find_line_magic(magic_name)
             etpl = "Cell magic `%%{0}` not found{1}."
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 3dc3480b561..79983df09f2 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -302,6 +302,34 @@ class MagicsManager(Configurable):
     # holding the actual callable object as value.  This is the dict used for
     # magic function dispatch
     magics = Dict()
+    lazy_magics = Dict(
+        help="""
+    Mapping from magic names to modules to load.
+
+    This can be used in IPython/IPykernel configuration to declare lazy magics
+    that will only be imported/registered on first use.
+
+    For example::
+
+        c.MagicsManger.lazy_magics = {
+          "my_magic": "slow.to.import",
+          "my_other_magic": "also.slow",
+        }
+
+    On first invocation of `%my_magic`, `%%my_magic`, `%%my_other_magic` or
+    `%%my_other_magic`, the corresponding module will be loaded as an ipython
+    extensions as if you had previously done `%load_ext ipython`.
+
+    Magics names should be without percent(s) as magics can be both cell
+    and line magics.
+
+    Lazy loading happen relatively late in execution process, and
+    complex extensions that manipulate Python/IPython internal state or global state
+    might not support lazy loading.
+    """
+    ).tag(
+        config=True,
+    )
 
     # A registry of the original objects that we've been given holding magics.
     registry = Dict()
@@ -366,6 +394,24 @@ def lsmagic_docs(self, brief=False, missing=''):
             docs[m_type] = m_docs
         return docs
 
+    def register_lazy(self, name: str, fully_qualified_name: str):
+        """
+        Lazily register a magic via an extension.
+
+
+        Parameters
+        ----------
+        name : str
+            Name of the magic you wish to register.
+        fully_qualified_name :
+            Fully qualified name of the module/submodule that should be loaded
+            as an extensions when the magic is first called.
+            It is assumed that loading this extensions will register the given
+            magic.
+        """
+
+        self.lazy_magics[name] = fully_qualified_name
+
     def register(self, *magic_objects):
         """Register one or more instances of Magics.
 
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 5294f82c51c..cbcb5c1411c 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -34,9 +34,11 @@
 from IPython.utils.io import capture_output
 from IPython.utils.process import find_cmd
 from IPython.utils.tempdir import TemporaryDirectory, TemporaryWorkingDirectory
+from IPython.utils.syspathcontext import prepended_to_syspath
 
 from .test_debugger import PdbTestInput
 
+from tempfile import NamedTemporaryFile
 
 @magic.magics_class
 class DummyMagics(magic.Magics): pass
@@ -1325,13 +1327,53 @@ def test_timeit_arguments():
     _ip.magic("timeit -n1 -r1 a=('#')")
 
 
+MINIMAL_LAZY_MAGIC = """
+from IPython.core.magic import (
+    Magics,
+    magics_class,
+    line_magic,
+    cell_magic,
+)
+
+
+@magics_class
+class LazyMagics(Magics):
+    @line_magic
+    def lazy_line(self, line):
+        print("Lazy Line")
+
+    @cell_magic
+    def lazy_cell(self, line, cell):
+        print("Lazy Cell")
+
+
+def load_ipython_extension(ipython):
+    ipython.register_magics(LazyMagics)
+"""
+
+
+def test_lazy_magics():
+    with pytest.raises(UsageError):
+        ip.run_line_magic("lazy_line", "")
+
+    startdir = os.getcwd()
+
+    with TemporaryDirectory() as tmpdir:
+        with prepended_to_syspath(tmpdir):
+            ptempdir = Path(tmpdir)
+            tf = ptempdir / "lazy_magic_module.py"
+            tf.write_text(MINIMAL_LAZY_MAGIC)
+            ip.magics_manager.register_lazy("lazy_line", Path(tf.name).name[:-3])
+            with tt.AssertPrints("Lazy Line"):
+                ip.run_line_magic("lazy_line", "")
+
+
 TEST_MODULE = """
 print('Loaded my_tmp')
 if __name__ == "__main__":
     print('I just ran a script')
 """
 
-
 def test_run_module_from_import_hook():
     "Test that a module can be loaded via an import hook"
     with TemporaryDirectory() as tmpdir:
diff --git a/IPython/core/tests/test_magic_terminal.py b/IPython/core/tests/test_magic_terminal.py
index 721fd5eda4d..f09014786e6 100644
--- a/IPython/core/tests/test_magic_terminal.py
+++ b/IPython/core/tests/test_magic_terminal.py
@@ -9,11 +9,35 @@
 from unittest import TestCase
 
 from IPython.testing import tools as tt
-
 #-----------------------------------------------------------------------------
 # Test functions begin
 #-----------------------------------------------------------------------------
 
+
+MINIMAL_LAZY_MAGIC = """
+from IPython.core.magic import (
+    Magics,
+    magics_class,
+    line_magic,
+    cell_magic,
+)
+
+
+@magics_class
+class LazyMagics(Magics):
+    @line_magic
+    def lazy_line(self, line):
+        print("Lazy Line")
+
+    @cell_magic
+    def lazy_cell(self, line, cell):
+        print("Lazy Cell")
+
+
+def load_ipython_extension(ipython):
+    ipython.register_magics(LazyMagics)
+"""
+
 def check_cpaste(code, should_fail=False):
     """Execute code via 'cpaste' and ensure it was executed, unless
     should_fail is set.
@@ -31,7 +55,7 @@ def check_cpaste(code, should_fail=False):
     try:
         context = tt.AssertPrints if should_fail else tt.AssertNotPrints
         with context("Traceback (most recent call last)"):
-                ip.magic('cpaste')
+            ip.run_line_magic("cpaste", "")
 
         if not should_fail:
             assert ip.user_ns['code_ran'], "%r failed" % code
@@ -68,13 +92,14 @@ def runf():
         check_cpaste(code, should_fail=True)
 
 
+
 class PasteTestCase(TestCase):
     """Multiple tests for clipboard pasting"""
 
     def paste(self, txt, flags='-q'):
         """Paste input text, by default in quiet mode"""
-        ip.hooks.clipboard_get = lambda : txt
-        ip.magic('paste '+flags)
+        ip.hooks.clipboard_get = lambda: txt
+        ip.run_line_magic("paste", flags)
 
     def setUp(self):
         # Inject fake clipboard hook but save original so we can restore it later
@@ -114,7 +139,7 @@ def test_paste_py_multi_r(self):
         self.assertEqual(ip.user_ns.pop("x"), [1, 2, 3])
         self.assertEqual(ip.user_ns.pop("y"), [1, 4, 9])
         self.assertFalse("x" in ip.user_ns)
-        ip.magic("paste -r")
+        ip.run_line_magic("paste", "-r")
         self.assertEqual(ip.user_ns["x"], [1, 2, 3])
         self.assertEqual(ip.user_ns["y"], [1, 4, 9])
 
diff --git a/IPython/terminal/ipapp.py b/IPython/terminal/ipapp.py
index ed39b7dc5d0..e735a209255 100755
--- a/IPython/terminal/ipapp.py
+++ b/IPython/terminal/ipapp.py
@@ -25,6 +25,7 @@
 from IPython.core.application import (
     ProfileDir, BaseIPythonApplication, base_flags, base_aliases
 )
+from IPython.core.magic import MagicsManager
 from IPython.core.magics import (
     ScriptMagics, LoggingMagics
 )
@@ -200,6 +201,7 @@ def _classes_default(self):
             self.__class__,      # it will also affect subclasses (e.g. QtConsole)
             TerminalInteractiveShell,
             HistoryManager,
+            MagicsManager,
             ProfileDir,
             PlainTextFormatter,
             IPCompleter,
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 55b1b2f8439..6597fe555f8 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -3,6 +3,24 @@
 ============
 
 
+.. _version 7.32:
+
+IPython 7.32
+============
+
+
+The ability to configure magics to be lazily loaded has been added to IPython.
+See the ``ipython --help-all`` section on ``MagicsManager.lazy_magic``.
+One can now use::
+
+    c.MagicsManger.lazy_magics = {
+              "my_magic": "slow.to.import",
+              "my_other_magic": "also.slow",
+    }
+
+And on first use of ``%my_magic``, or corresponding cell magic, or other line magic,
+the corresponding ``load_ext`` will be called just before trying to invoke the magic.
+
 .. _version 7.31:
 
 IPython 7.31

From a96dd9e4724f4c425a14257e0f592a1f79a1ff0e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 8 Feb 2022 12:10:55 +0100
Subject: [PATCH 1083/1407] MAINT: deprecate append_to_syspath

---
 IPython/utils/syspathcontext.py        | 11 ++++++++++-
 IPython/utils/tests/test_deprecated.py |  7 +++++++
 IPython/utils/version.py               |  5 ++++-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 IPython/utils/tests/test_deprecated.py

diff --git a/IPython/utils/syspathcontext.py b/IPython/utils/syspathcontext.py
index bd1c51500d6..7af1ab60af9 100644
--- a/IPython/utils/syspathcontext.py
+++ b/IPython/utils/syspathcontext.py
@@ -15,12 +15,21 @@
 #-----------------------------------------------------------------------------
 
 import sys
+import warnings
 
 
 class appended_to_syspath(object):
-    """A context for appending a directory to sys.path for a second."""
+    """
+    Deprecated since IPython 8.1, no replacements.
+
+    A context for appending a directory to sys.path for a second."""
 
     def __init__(self, dir):
+        warnings.warn(
+            "`appended_to_syspath` is deprecated since IPython 8.1, and has no replacements",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         self.dir = dir
 
     def __enter__(self):
diff --git a/IPython/utils/tests/test_deprecated.py b/IPython/utils/tests/test_deprecated.py
new file mode 100644
index 00000000000..f6f54ce52a9
--- /dev/null
+++ b/IPython/utils/tests/test_deprecated.py
@@ -0,0 +1,7 @@
+from IPython.utils.syspathcontext import appended_to_syspath
+import pytest
+
+
+def test_append_deprecated():
+    with pytest.warns(DeprecationWarning):
+        appended_to_syspath(".")
diff --git a/IPython/utils/version.py b/IPython/utils/version.py
index 050155640d4..8c65c78e15e 100644
--- a/IPython/utils/version.py
+++ b/IPython/utils/version.py
@@ -14,7 +14,10 @@
 
 from warnings import warn
 
-warn("The `IPython.utils.version` module has been deprecated since IPython 8.0.")
+warn(
+    "The `IPython.utils.version` module has been deprecated since IPython 8.0.",
+    DeprecationWarning,
+)
 
 
 def check_version(v, check):

From fcd299c5726988dfae1aa81f5e47348eb7300231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Leli=C3=A8vre?= <slel@users.noreply.github.com>
Date: Sun, 6 Feb 2022 15:23:06 +0100
Subject: [PATCH 1084/1407] Sync `latex_symbols.jl` url in two places

Follow-up to #11399 and #11400.

Make sure the comment at the top of

https://github.com/ipython/ipython/blob/master/IPython/core/latex_symbols.py

points to the file actually used in

- https://github.com/ipython/ipython/edit/master/tools/gen_latex_symbols.py
---
 tools/gen_latex_symbols.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/gen_latex_symbols.py b/tools/gen_latex_symbols.py
index e1b441054ac..b623755136a 100644
--- a/tools/gen_latex_symbols.py
+++ b/tools/gen_latex_symbols.py
@@ -58,18 +58,18 @@ def test_ident(i):
 
 # Write the `latex_symbols.py` module in the cwd
 
-s = """# encoding: utf-8
+s = f"""# encoding: utf-8
 
 # DO NOT EDIT THIS FILE BY HAND.
 
 # To update this file, run the script /tools/gen_latex_symbols.py using Python 3
 
 # This file is autogenerated from the file:
-# https://raw.githubusercontent.com/JuliaLang/julia/master/base/latex_symbols.jl
+# {url}
 # This original list is filtered to remove any unicode characters that are not valid
 # Python identifiers.
 
-latex_symbols = {\n
+latex_symbols = {{\n
 """
 for line in valid_idents:
     s += '    "%s" : "%s",\n' % (line[0], line[1])

From 16451266fc75855a617f61a4e7bf6d29330965b1 Mon Sep 17 00:00:00 2001
From: ltrujello <ltrujillo@g.hmc.edu>
Date: Sun, 30 Jan 2022 11:09:36 -0800
Subject: [PATCH 1085/1407] Fixes #13472 by restoring user's terminal cursor

---
 IPython/core/interactiveshell.py | 4 ++++
 IPython/terminal/shortcuts.py    | 7 +------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 3d9ec35b2ed..17aacfc3013 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3679,6 +3679,10 @@ def atexit_operations(self):
                 pass
         del self.tempdirs
 
+        # Restore user's cursor
+        if hasattr(self, "editing_mode") and self.editing_mode == 'vi':
+            sys.stdout.write("\x1b[0 q")
+            sys.stdout.flush()
 
     def cleanup(self):
         self.restore_sys_module_state()
diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index ea204f8ddd8..2cceb0786be 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -336,12 +336,7 @@ def set_input_mode(self, mode):
         shape = {InputMode.NAVIGATION: 2, InputMode.REPLACE: 4}.get(mode, 6)
         cursor = "\x1b[{} q".format(shape)
 
-        if hasattr(sys.stdout, "_cli"):
-            write = sys.stdout._cli.output.write_raw
-        else:
-            write = sys.stdout.write
-
-        write(cursor)
+        sys.stdout.write(cursor)
         sys.stdout.flush()
 
         self._input_mode = mode

From 42e22f8e67a24dc274652afaab046c6d57654714 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 8 Feb 2022 12:25:55 +0100
Subject: [PATCH 1086/1407] MAINT: cleanup imports of tempdir.

Many files were importing tempdir from IPython.utils, though all the
changes are now upstream in Python. Import directly from tempdir.

Use isort/darker on touched files to cleanup imports at the same time
---
 IPython/core/interactiveshell.py        | 81 +++++++++++++++----------
 IPython/core/tests/test_application.py  |  2 +-
 IPython/core/tests/test_completerlib.py |  3 +-
 IPython/core/tests/test_extension.py    |  3 +-
 IPython/core/tests/test_history.py      |  8 ++-
 IPython/core/tests/test_logger.py       |  3 +-
 IPython/core/tests/test_paths.py        |  4 +-
 IPython/core/tests/test_profile.py      |  7 +--
 IPython/core/tests/test_run.py          |  8 ++-
 IPython/core/tests/test_ultratb.py      |  9 ++-
 IPython/lib/tests/test_deepreload.py    |  9 +--
 IPython/utils/tempdir.py                |  3 +-
 IPython/utils/tests/test_path.py        | 10 +--
 13 files changed, 85 insertions(+), 65 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 902da1bd9a1..7d5a7d340b9 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -20,34 +20,53 @@
 import os
 import re
 import runpy
+import subprocess
 import sys
 import tempfile
 import traceback
 import types
-import subprocess
 import warnings
+from ast import stmt
 from io import open as io_open
-
+from logging import error
 from pathlib import Path
-from pickleshare import PickleShareDB
+from typing import Callable
+from typing import List as ListType
+from typing import Optional, Tuple
+from warnings import warn
 
+from pickleshare import PickleShareDB
+from tempfile import TemporaryDirectory
+from traitlets import (
+    Any,
+    Bool,
+    CaselessStrEnum,
+    Dict,
+    Enum,
+    Instance,
+    Integer,
+    List,
+    Type,
+    Unicode,
+    default,
+    observe,
+    validate,
+)
 from traitlets.config.configurable import SingletonConfigurable
 from traitlets.utils.importstring import import_item
-from IPython.core import oinspect
-from IPython.core import magic
-from IPython.core import page
-from IPython.core import prefilter
-from IPython.core import ultratb
+
+import IPython.core.hooks
+from IPython.core import magic, oinspect, page, prefilter, ultratb
 from IPython.core.alias import Alias, AliasManager
 from IPython.core.autocall import ExitAutocall
 from IPython.core.builtin_trap import BuiltinTrap
-from IPython.core.events import EventManager, available_events
 from IPython.core.compilerop import CachingCompiler, check_linecache_ipython
 from IPython.core.debugger import InterruptiblePdb
 from IPython.core.display_trap import DisplayTrap
 from IPython.core.displayhook import DisplayHook
 from IPython.core.displaypub import DisplayPublisher
 from IPython.core.error import InputRejected, UsageError
+from IPython.core.events import EventManager, available_events
 from IPython.core.extensions import ExtensionManager
 from IPython.core.formatters import DisplayFormatter
 from IPython.core.history import HistoryManager
@@ -59,31 +78,17 @@
 from IPython.core.profiledir import ProfileDir
 from IPython.core.usage import default_banner
 from IPython.display import display
+from IPython.paths import get_ipython_dir
 from IPython.testing.skipdoctest import skip_doctest
-from IPython.utils import PyColorize
-from IPython.utils import io
-from IPython.utils import py3compat
-from IPython.utils import openpy
+from IPython.utils import PyColorize, io, openpy, py3compat
 from IPython.utils.decorators import undoc
 from IPython.utils.io import ask_yes_no
 from IPython.utils.ipstruct import Struct
-from IPython.paths import get_ipython_dir
-from IPython.utils.path import get_home_dir, get_py_filename, ensure_dir_exists
-from IPython.utils.process import system, getoutput
+from IPython.utils.path import ensure_dir_exists, get_home_dir, get_py_filename
+from IPython.utils.process import getoutput, system
 from IPython.utils.strdispatch import StrDispatch
 from IPython.utils.syspathcontext import prepended_to_syspath
-from IPython.utils.text import format_screen, LSString, SList, DollarFormatter
-from IPython.utils.tempdir import TemporaryDirectory
-from traitlets import (
-    Integer, Bool, CaselessStrEnum, Enum, List, Dict, Unicode, Instance, Type,
-    observe, default, validate, Any
-)
-from warnings import warn
-from logging import error
-import IPython.core.hooks
-
-from typing import List as ListType, Tuple, Optional, Callable
-from ast import stmt
+from IPython.utils.text import DollarFormatter, LSString, SList, format_screen
 
 sphinxify: Optional[Callable]
 
@@ -122,8 +127,13 @@ class ProvisionalWarning(DeprecationWarning):
 
 # we still need to run things using the asyncio eventloop, but there is no
 # async integration
-from .async_helpers import _asyncio_runner, _pseudo_sync_runner
-from .async_helpers import _curio_runner, _trio_runner, _should_be_async
+from .async_helpers import (
+    _asyncio_runner,
+    _curio_runner,
+    _pseudo_sync_runner,
+    _should_be_async,
+    _trio_runner,
+)
 
 #-----------------------------------------------------------------------------
 # Globals
@@ -2035,8 +2045,12 @@ def init_completer(self):
         (typically over the network by remote frontends).
         """
         from IPython.core.completer import IPCompleter
-        from IPython.core.completerlib import (module_completer,
-                magic_run_completer, cd_completer, reset_completer)
+        from IPython.core.completerlib import (
+            cd_completer,
+            magic_run_completer,
+            module_completer,
+            reset_completer,
+        )
 
         self.Completer = IPCompleter(shell=self,
                                      namespace=self.user_ns,
@@ -3344,8 +3358,9 @@ def enable_matplotlib(self, gui=None):
             make sense in all contexts, for example a terminal ipython can't
             display figures inline.
         """
-        from IPython.core import pylabtools as pt
         from matplotlib_inline.backend_inline import configure_inline_support
+
+        from IPython.core import pylabtools as pt
         gui, backend = pt.find_gui_and_backend(gui, self.pylab_gui_select)
 
         if gui != 'inline':
diff --git a/IPython/core/tests/test_application.py b/IPython/core/tests/test_application.py
index 891908e98e7..07ad291659f 100644
--- a/IPython/core/tests/test_application.py
+++ b/IPython/core/tests/test_application.py
@@ -4,11 +4,11 @@
 import os
 import tempfile
 
+from tempfile import TemporaryDirectory
 from traitlets import Unicode
 
 from IPython.core.application import BaseIPythonApplication
 from IPython.testing import decorators as dec
-from IPython.utils.tempdir import TemporaryDirectory
 
 
 @dec.onlyif_unicode_paths
diff --git a/IPython/core/tests/test_completerlib.py b/IPython/core/tests/test_completerlib.py
index b5508447895..827204ccfa6 100644
--- a/IPython/core/tests/test_completerlib.py
+++ b/IPython/core/tests/test_completerlib.py
@@ -14,8 +14,9 @@
 import unittest
 from os.path import join
 
+from tempfile import TemporaryDirectory
+
 from IPython.core.completerlib import magic_run_completer, module_completion, try_import
-from IPython.utils.tempdir import TemporaryDirectory
 from IPython.testing.decorators import onlyif_unicode_paths
 
 
diff --git a/IPython/core/tests/test_extension.py b/IPython/core/tests/test_extension.py
index 51db4b6258c..8297bc4d40c 100644
--- a/IPython/core/tests/test_extension.py
+++ b/IPython/core/tests/test_extension.py
@@ -1,8 +1,9 @@
 import os.path
 
+from tempfile import TemporaryDirectory
+
 import IPython.testing.tools as tt
 from IPython.utils.syspathcontext import prepended_to_syspath
-from IPython.utils.tempdir import TemporaryDirectory
 
 ext1_content = """
 def load_ipython_extension(ip):
diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
index 6d6a1b1dd15..388ebc64acd 100644
--- a/IPython/core/tests/test_history.py
+++ b/IPython/core/tests/test_history.py
@@ -7,17 +7,19 @@
 
 # stdlib
 import io
-from pathlib import Path
+import sqlite3
 import sys
 import tempfile
 from datetime import datetime
-import sqlite3
+from pathlib import Path
 
+from tempfile import TemporaryDirectory
 # our own packages
 from traitlets.config.loader import Config
-from IPython.utils.tempdir import TemporaryDirectory
+
 from IPython.core.history import HistoryManager, extract_hist_ranges
 
+
 def test_proper_default_encoding():
     assert sys.getdefaultencoding() == "utf-8"
 
diff --git a/IPython/core/tests/test_logger.py b/IPython/core/tests/test_logger.py
index 71c4e6b60c0..10e462098be 100644
--- a/IPython/core/tests/test_logger.py
+++ b/IPython/core/tests/test_logger.py
@@ -2,9 +2,10 @@
 """Test IPython.core.logger"""
 
 import os.path
+
 import pytest
+from tempfile import TemporaryDirectory
 
-from IPython.utils.tempdir import TemporaryDirectory
 
 def test_logstart_inaccessible_file():
     with pytest.raises(IOError):
diff --git a/IPython/core/tests/test_paths.py b/IPython/core/tests/test_paths.py
index d1366ee34ef..eb754b81529 100644
--- a/IPython/core/tests/test_paths.py
+++ b/IPython/core/tests/test_paths.py
@@ -6,11 +6,11 @@
 import warnings
 from unittest.mock import patch
 
-from testpath import modified_env, assert_isdir, assert_isfile
+from tempfile import TemporaryDirectory
+from testpath import assert_isdir, assert_isfile, modified_env
 
 from IPython import paths
 from IPython.testing.decorators import skip_win32
-from IPython.utils.tempdir import TemporaryDirectory
 
 TMP_TEST_DIR = os.path.realpath(tempfile.mkdtemp())
 HOME_TEST_DIR = os.path.join(TMP_TEST_DIR, "home_test_dir")
diff --git a/IPython/core/tests/test_profile.py b/IPython/core/tests/test_profile.py
index 8dd58cc67f4..8734ec3513e 100644
--- a/IPython/core/tests/test_profile.py
+++ b/IPython/core/tests/test_profile.py
@@ -23,17 +23,16 @@
 import shutil
 import sys
 import tempfile
-
 from pathlib import Path
 from unittest import TestCase
 
-from IPython.core.profileapp import list_profiles_in, list_bundled_profiles
-from IPython.core.profiledir import ProfileDir
+from tempfile import TemporaryDirectory
 
+from IPython.core.profileapp import list_bundled_profiles, list_profiles_in
+from IPython.core.profiledir import ProfileDir
 from IPython.testing import decorators as dec
 from IPython.testing import tools as tt
 from IPython.utils.process import getoutput
-from IPython.utils.tempdir import TemporaryDirectory
 
 #-----------------------------------------------------------------------------
 # Globals
diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index 0f73a781e3e..c7841759170 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -19,21 +19,22 @@
 import functools
 import os
 import platform
-from os.path import join as pjoin
 import random
 import string
 import sys
 import textwrap
 import unittest
+from os.path import join as pjoin
 from unittest.mock import patch
 
 import pytest
+from tempfile import TemporaryDirectory
 
+from IPython.core import debugger
 from IPython.testing import decorators as dec
 from IPython.testing import tools as tt
 from IPython.utils.io import capture_output
-from IPython.utils.tempdir import TemporaryDirectory
-from IPython.core import debugger
+
 
 def doctest_refbug():
     """Very nasty problem with references held by multiple runs of a script.
@@ -411,6 +412,7 @@ def test_run_nb_error(self):
         """Test %run notebook.ipynb error"""
         pytest.importorskip("nbformat")
         from nbformat import v4, writes
+
         # %run when a file name isn't provided
         pytest.raises(Exception, _ip.magic, "run")
 
diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index 423998019b5..4b31ef0cd93 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -3,21 +3,20 @@
 """
 import io
 import logging
+import os.path
 import platform
 import re
 import sys
-import os.path
-from textwrap import dedent
 import traceback
 import unittest
+from textwrap import dedent
 
-from IPython.core.ultratb import ColorTB, VerboseTB
-
+from tempfile import TemporaryDirectory
 
+from IPython.core.ultratb import ColorTB, VerboseTB
 from IPython.testing import tools as tt
 from IPython.testing.decorators import onlyif_unicode_paths
 from IPython.utils.syspathcontext import prepended_to_syspath
-from IPython.utils.tempdir import TemporaryDirectory
 
 file_1 = """1
 2
diff --git a/IPython/lib/tests/test_deepreload.py b/IPython/lib/tests/test_deepreload.py
index 9759a7f69f7..b8097905787 100644
--- a/IPython/lib/tests/test_deepreload.py
+++ b/IPython/lib/tests/test_deepreload.py
@@ -4,14 +4,15 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-import pytest
 import types
-
 from pathlib import Path
 
+import pytest
+from tempfile import TemporaryDirectory
+
+from IPython.lib.deepreload import modules_reloading
+from IPython.lib.deepreload import reload as dreload
 from IPython.utils.syspathcontext import prepended_to_syspath
-from IPython.utils.tempdir import TemporaryDirectory
-from IPython.lib.deepreload import reload as dreload, modules_reloading
 
 
 def test_deepreload():
diff --git a/IPython/utils/tempdir.py b/IPython/utils/tempdir.py
index bbfffe9c923..b3e151de59e 100644
--- a/IPython/utils/tempdir.py
+++ b/IPython/utils/tempdir.py
@@ -10,8 +10,7 @@
 
 
 class NamedFileInTemporaryDirectory(object):
-
-    def __init__(self, filename, mode='w+b', bufsize=-1, **kwds):
+    def __init__(self, filename, mode="w+b", bufsize=-1, add_to_syspath=False, **kwds):
         """
         Open a file named `filename` in a temporary directory.
 
diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index b27e4355383..16fcd5f341f 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -10,24 +10,23 @@
 import tempfile
 import unittest
 from contextlib import contextmanager
-from unittest.mock import patch
-from os.path import join, abspath
 from importlib import reload
+from os.path import abspath, join
+from unittest.mock import patch
 
 import pytest
+from tempfile import TemporaryDirectory
 
 import IPython
 from IPython import paths
 from IPython.testing import decorators as dec
 from IPython.testing.decorators import (
+    onlyif_unicode_paths,
     skip_if_not_win32,
     skip_win32,
-    onlyif_unicode_paths,
 )
 from IPython.testing.tools import make_tempfile
 from IPython.utils import path
-from IPython.utils.tempdir import TemporaryDirectory
-
 
 # Platform-dependent imports
 try:
@@ -41,6 +40,7 @@
         import winreg as wreg
     except ImportError:
         import _winreg as wreg
+
         #Add entries that needs to be stubbed by the testing code
         (wreg.OpenKey, wreg.QueryValueEx,) = (None, None)
 

From 234b6375bf384c571eaacf984ed43503b98a8448 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 9 Feb 2022 00:07:16 +0300
Subject: [PATCH 1087/1407] ipdoctest: Merge upstream changes to pytest doctest
 plugin

---
 IPython/testing/plugin/pytest_ipdoctest.py | 183 +++++++++++----------
 1 file changed, 93 insertions(+), 90 deletions(-)

diff --git a/IPython/testing/plugin/pytest_ipdoctest.py b/IPython/testing/plugin/pytest_ipdoctest.py
index 603e33c0be4..230b159b36b 100644
--- a/IPython/testing/plugin/pytest_ipdoctest.py
+++ b/IPython/testing/plugin/pytest_ipdoctest.py
@@ -14,6 +14,7 @@
 import types
 import warnings
 from contextlib import contextmanager
+from pathlib import Path
 from typing import Any
 from typing import Callable
 from typing import Dict
@@ -28,8 +29,6 @@
 from typing import TYPE_CHECKING
 from typing import Union
 
-import py.path
-
 import pytest
 from _pytest import outcomes
 from _pytest._code.code import ExceptionInfo
@@ -42,6 +41,7 @@
 from _pytest.fixtures import FixtureRequest
 from _pytest.nodes import Collector
 from _pytest.outcomes import OutcomeException
+from _pytest.pathlib import fnmatch_ex
 from _pytest.pathlib import import_path
 from _pytest.python_api import approx
 from _pytest.warning_types import PytestWarning
@@ -126,35 +126,38 @@ def pytest_unconfigure() -> None:
 
 
 def pytest_collect_file(
-    path: py.path.local,
+    file_path: Path,
     parent: Collector,
 ) -> Optional[Union["IPDoctestModule", "IPDoctestTextfile"]]:
     config = parent.config
-    if path.ext == ".py":
-        if config.option.ipdoctestmodules and not _is_setup_py(path):
-            mod: IPDoctestModule = IPDoctestModule.from_parent(parent, fspath=path)
+    if file_path.suffix == ".py":
+        if config.option.ipdoctestmodules and not any(
+            (_is_setup_py(file_path), _is_main_py(file_path))
+        ):
+            mod: IPDoctestModule = IPDoctestModule.from_parent(parent, path=file_path)
             return mod
-    elif _is_ipdoctest(config, path, parent):
-        txt: IPDoctestTextfile = IPDoctestTextfile.from_parent(parent, fspath=path)
+    elif _is_ipdoctest(config, file_path, parent):
+        txt: IPDoctestTextfile = IPDoctestTextfile.from_parent(parent, path=file_path)
         return txt
     return None
 
 
-def _is_setup_py(path: py.path.local) -> bool:
-    if path.basename != "setup.py":
+def _is_setup_py(path: Path) -> bool:
+    if path.name != "setup.py":
         return False
-    contents = path.read_binary()
+    contents = path.read_bytes()
     return b"setuptools" in contents or b"distutils" in contents
 
 
-def _is_ipdoctest(config: Config, path: py.path.local, parent) -> bool:
-    if path.ext in (".txt", ".rst") and parent.session.isinitpath(path):
+def _is_ipdoctest(config: Config, path: Path, parent: Collector) -> bool:
+    if path.suffix in (".txt", ".rst") and parent.session.isinitpath(path):
         return True
     globs = config.getoption("ipdoctestglob") or ["test*.txt"]
-    for glob in globs:
-        if path.check(fnmatch=glob):
-            return True
-    return False
+    return any(fnmatch_ex(glob, path) for glob in globs)
+
+
+def _is_main_py(path: Path) -> bool:
+    return path.name == "__main__.py"
 
 
 class ReprFailDoctest(TerminalRepr):
@@ -273,7 +276,7 @@ def from_parent(  # type: ignore
         runner: "IPDocTestRunner",
         dtest: "doctest.DocTest",
     ):
-        # incompatible signature due to to imposed limits on sublcass
+        # incompatible signature due to imposed limits on subclass
         """The public named constructor."""
         return super().from_parent(name=name, parent=parent, runner=runner, dtest=dtest)
 
@@ -372,61 +375,57 @@ def repr_failure(  # type: ignore[override]
         elif isinstance(excinfo.value, MultipleDoctestFailures):
             failures = excinfo.value.failures
 
-        if failures is not None:
-            reprlocation_lines = []
-            for failure in failures:
-                example = failure.example
-                test = failure.test
-                filename = test.filename
-                if test.lineno is None:
-                    lineno = None
-                else:
-                    lineno = test.lineno + example.lineno + 1
-                message = type(failure).__name__
-                # TODO: ReprFileLocation doesn't expect a None lineno.
-                reprlocation = ReprFileLocation(filename, lineno, message)  # type: ignore[arg-type]
-                checker = _get_checker()
-                report_choice = _get_report_choice(
-                    self.config.getoption("ipdoctestreport")
-                )
-                if lineno is not None:
-                    assert failure.test.docstring is not None
-                    lines = failure.test.docstring.splitlines(False)
-                    # add line numbers to the left of the error message
-                    assert test.lineno is not None
-                    lines = [
-                        "%03d %s" % (i + test.lineno + 1, x)
-                        for (i, x) in enumerate(lines)
-                    ]
-                    # trim docstring error lines to 10
-                    lines = lines[max(example.lineno - 9, 0) : example.lineno + 1]
-                else:
-                    lines = [
-                        "EXAMPLE LOCATION UNKNOWN, not showing all tests of that example"
-                    ]
-                    indent = ">>>"
-                    for line in example.source.splitlines():
-                        lines.append(f"??? {indent} {line}")
-                        indent = "..."
-                if isinstance(failure, doctest.DocTestFailure):
-                    lines += checker.output_difference(
-                        example, failure.got, report_choice
-                    ).split("\n")
-                else:
-                    inner_excinfo = ExceptionInfo(failure.exc_info)
-                    lines += ["UNEXPECTED EXCEPTION: %s" % repr(inner_excinfo.value)]
-                    lines += [
-                        x.strip("\n")
-                        for x in traceback.format_exception(*failure.exc_info)
-                    ]
-                reprlocation_lines.append((reprlocation, lines))
-            return ReprFailDoctest(reprlocation_lines)
-        else:
+        if failures is None:
             return super().repr_failure(excinfo)
 
-    def reportinfo(self):
+        reprlocation_lines = []
+        for failure in failures:
+            example = failure.example
+            test = failure.test
+            filename = test.filename
+            if test.lineno is None:
+                lineno = None
+            else:
+                lineno = test.lineno + example.lineno + 1
+            message = type(failure).__name__
+            # TODO: ReprFileLocation doesn't expect a None lineno.
+            reprlocation = ReprFileLocation(filename, lineno, message)  # type: ignore[arg-type]
+            checker = _get_checker()
+            report_choice = _get_report_choice(self.config.getoption("ipdoctestreport"))
+            if lineno is not None:
+                assert failure.test.docstring is not None
+                lines = failure.test.docstring.splitlines(False)
+                # add line numbers to the left of the error message
+                assert test.lineno is not None
+                lines = [
+                    "%03d %s" % (i + test.lineno + 1, x) for (i, x) in enumerate(lines)
+                ]
+                # trim docstring error lines to 10
+                lines = lines[max(example.lineno - 9, 0) : example.lineno + 1]
+            else:
+                lines = [
+                    "EXAMPLE LOCATION UNKNOWN, not showing all tests of that example"
+                ]
+                indent = ">>>"
+                for line in example.source.splitlines():
+                    lines.append(f"??? {indent} {line}")
+                    indent = "..."
+            if isinstance(failure, doctest.DocTestFailure):
+                lines += checker.output_difference(
+                    example, failure.got, report_choice
+                ).split("\n")
+            else:
+                inner_excinfo = ExceptionInfo.from_exc_info(failure.exc_info)
+                lines += ["UNEXPECTED EXCEPTION: %s" % repr(inner_excinfo.value)]
+                lines += [
+                    x.strip("\n") for x in traceback.format_exception(*failure.exc_info)
+                ]
+            reprlocation_lines.append((reprlocation, lines))
+        return ReprFailDoctest(reprlocation_lines)
+
+    def reportinfo(self) -> Tuple[Union["os.PathLike[str]", str], Optional[int], str]:
         assert self.dtest is not None
-        return self.fspath, self.dtest.lineno, "[ipdoctest] %s" % self.name
+        return self.path, self.dtest.lineno, "[ipdoctest] %s" % self.name
 
 
 def _get_flag_lookup() -> Dict[str, int]:
@@ -474,9 +473,9 @@ def collect(self) -> Iterable[IPDoctestItem]:
         # Inspired by doctest.testfile; ideally we would use it directly,
         # but it doesn't support passing a custom checker.
         encoding = self.config.getini("ipdoctest_encoding")
-        text = self.fspath.read_text(encoding)
-        filename = str(self.fspath)
-        name = self.fspath.basename
+        text = self.path.read_text(encoding)
+        filename = str(self.path)
+        name = self.path.name
         globs = {"__name__": "__main__"}
 
         optionflags = get_optionflags(self)
@@ -559,15 +558,20 @@ class MockAwareDocTestFinder(DocTestFinder):
 
             def _find_lineno(self, obj, source_lines):
                 """Doctest code does not take into account `@property`, this
-                is a hackish way to fix it.
+                is a hackish way to fix it. https://bugs.python.org/issue17446
 
-                https://bugs.python.org/issue17446
+                Wrapped Doctests will need to be unwrapped so the correct
+                line number is returned. This will be reported upstream. #8796
                 """
                 if isinstance(obj, property):
                     obj = getattr(obj, "fget", obj)
+
+                if hasattr(obj, "__wrapped__"):
+                    # Get the main obj in case of it being wrapped
+                    obj = inspect.unwrap(obj)
+
                 # Type ignored because this is a private function.
-                return DocTestFinder._find_lineno(  # type: ignore
-                    self,
+                return super()._find_lineno(  # type:ignore[misc]
                     obj,
                     source_lines,
                 )
@@ -580,20 +584,22 @@ def _find(
                 with _patch_unwrap_mock_aware():
 
                     # Type ignored because this is a private function.
-                    DocTestFinder._find(  # type: ignore
-                        self, tests, obj, name, module, source_lines, globs, seen
+                    super()._find(  # type:ignore[misc]
+                        tests, obj, name, module, source_lines, globs, seen
                     )
 
-        if self.fspath.basename == "conftest.py":
+        if self.path.name == "conftest.py":
             module = self.config.pluginmanager._importconftest(
-                self.fspath, self.config.getoption("importmode")
+                self.path,
+                self.config.getoption("importmode"),
+                rootpath=self.config.rootpath,
             )
         else:
             try:
-                module = import_path(self.fspath)
+                module = import_path(self.path, root=self.config.rootpath)
             except ImportError:
                 if self.config.getvalue("ipdoctest_ignore_import_errors"):
-                    pytest.skip("unable to import module %r" % self.fspath)
+                    pytest.skip("unable to import module %r" % self.path)
                 else:
                     raise
         # Uses internal doctest module parsing mechanism.
@@ -665,7 +671,7 @@ class LiteralsOutputChecker(IPDoctestOutputChecker):
         )
 
         def check_output(self, want: str, got: str, optionflags: int) -> bool:
-            if IPDoctestOutputChecker.check_output(self, want, got, optionflags):
+            if super().check_output(want, got, optionflags):
                 return True
 
             allow_unicode = optionflags & _get_allow_unicode_flag()
@@ -689,7 +695,7 @@ def remove_prefixes(regex: Pattern[str], txt: str) -> str:
             if allow_number:
                 got = self._remove_unwanted_precision(want, got)
 
-            return IPDoctestOutputChecker.check_output(self, want, got, optionflags)
+            return super().check_output(want, got, optionflags)
 
         def _remove_unwanted_precision(self, want: str, got: str) -> str:
             wants = list(self._number_re.finditer(want))
@@ -702,13 +708,10 @@ def _remove_unwanted_precision(self, want: str, got: str) -> str:
                 exponent: Optional[str] = w.group("exponent1")
                 if exponent is None:
                     exponent = w.group("exponent2")
-                if fraction is None:
-                    precision = 0
-                else:
-                    precision = len(fraction)
+                precision = 0 if fraction is None else len(fraction)
                 if exponent is not None:
                     precision -= int(exponent)
-                if float(w.group()) == approx(float(g.group()), abs=10 ** -precision):
+                if float(w.group()) == approx(float(g.group()), abs=10**-precision):
                     # They're close enough. Replace the text we actually
                     # got with the text we want, so that it will match when we
                     # check the string literally.

From beb0b8251992ff8d2ee2c182666cb089781a382e Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 9 Feb 2022 01:24:16 +0300
Subject: [PATCH 1088/1407] ipdoctest: pytest<7 compatibility

---
 IPython/testing/plugin/pytest_ipdoctest.py | 83 ++++++++++++++++++++--
 1 file changed, 77 insertions(+), 6 deletions(-)

diff --git a/IPython/testing/plugin/pytest_ipdoctest.py b/IPython/testing/plugin/pytest_ipdoctest.py
index 230b159b36b..809713d7c8e 100644
--- a/IPython/testing/plugin/pytest_ipdoctest.py
+++ b/IPython/testing/plugin/pytest_ipdoctest.py
@@ -142,6 +142,23 @@ def pytest_collect_file(
     return None
 
 
+if int(pytest.__version__.split(".")[0]) < 7:
+    _collect_file = pytest_collect_file
+
+    def pytest_collect_file(
+        path,
+        parent: Collector,
+    ) -> Optional[Union["IPDoctestModule", "IPDoctestTextfile"]]:
+        return _collect_file(Path(path), parent)
+
+    _import_path = import_path
+
+    def import_path(path, root):
+        import py.path
+
+        return _import_path(py.path.local(path))
+
+
 def _is_setup_py(path: Path) -> bool:
     if path.name != "setup.py":
         return False
@@ -427,6 +444,12 @@ def reportinfo(self) -> Tuple[Union["os.PathLike[str]", str], Optional[int], str
         assert self.dtest is not None
         return self.path, self.dtest.lineno, "[ipdoctest] %s" % self.name
 
+    if int(pytest.__version__.split(".")[0]) < 7:
+
+        @property
+        def path(self) -> Path:
+            return Path(self.fspath)
+
 
 def _get_flag_lookup() -> Dict[str, int]:
     import doctest
@@ -494,6 +517,27 @@ def collect(self) -> Iterable[IPDoctestItem]:
                 self, name=test.name, runner=runner, dtest=test
             )
 
+    if int(pytest.__version__.split(".")[0]) < 7:
+
+        @property
+        def path(self) -> Path:
+            return Path(self.fspath)
+
+        @classmethod
+        def from_parent(
+            cls,
+            parent,
+            *,
+            fspath=None,
+            path: Optional[Path] = None,
+            **kw,
+        ):
+            if path is not None:
+                import py.path
+
+                fspath = py.path.local(path)
+            return super().from_parent(parent=parent, fspath=fspath, **kw)
+
 
 def _check_all_skipped(test: "doctest.DocTest") -> None:
     """Raise pytest.skip() if all examples in the given DocTest have the SKIP
@@ -589,11 +633,17 @@ def _find(
                     )
 
         if self.path.name == "conftest.py":
-            module = self.config.pluginmanager._importconftest(
-                self.path,
-                self.config.getoption("importmode"),
-                rootpath=self.config.rootpath,
-            )
+            if int(pytest.__version__.split(".")[0]) < 7:
+                module = self.config.pluginmanager._importconftest(
+                    self.path,
+                    self.config.getoption("importmode"),
+                )
+            else:
+                module = self.config.pluginmanager._importconftest(
+                    self.path,
+                    self.config.getoption("importmode"),
+                    rootpath=self.config.rootpath,
+                )
         else:
             try:
                 module = import_path(self.path, root=self.config.rootpath)
@@ -618,6 +668,27 @@ def _find(
                     self, name=test.name, runner=runner, dtest=test
                 )
 
+    if int(pytest.__version__.split(".")[0]) < 7:
+
+        @property
+        def path(self) -> Path:
+            return Path(self.fspath)
+
+        @classmethod
+        def from_parent(
+            cls,
+            parent,
+            *,
+            fspath=None,
+            path: Optional[Path] = None,
+            **kw,
+        ):
+            if path is not None:
+                import py.path
+
+                fspath = py.path.local(path)
+            return super().from_parent(parent=parent, fspath=fspath, **kw)
+
 
 def _setup_fixtures(doctest_item: IPDoctestItem) -> FixtureRequest:
     """Used by IPDoctestTextfile and IPDoctestItem to setup fixture information."""
@@ -711,7 +782,7 @@ def _remove_unwanted_precision(self, want: str, got: str) -> str:
                 precision = 0 if fraction is None else len(fraction)
                 if exponent is not None:
                     precision -= int(exponent)
-                if float(w.group()) == approx(float(g.group()), abs=10**-precision):
+                if float(w.group()) == approx(float(g.group()), abs=10 ** -precision):
                     # They're close enough. Replace the text we actually
                     # got with the text we want, so that it will match when we
                     # check the string literally.

From 31afadfb688639b1d0f72e9242144a3aadd4cde4 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Wed, 9 Feb 2022 02:34:07 +0300
Subject: [PATCH 1089/1407] unpin pytest

---
 setup.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 4fbffaa1a07..2da02e4e598 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -63,7 +63,7 @@ qtconsole =
     qtconsole
 terminal =
 test =
-    pytest<7
+    pytest
     pytest-asyncio
     testpath
 test_extra =
@@ -72,7 +72,7 @@ test_extra =
     nbformat
     numpy>=1.19
     pandas
-    pytest<7
+    pytest
     testpath
     trio
 all =

From dc84061e9da02efcd601f9a94e149a47bbd54acb Mon Sep 17 00:00:00 2001
From: Artur Svistunov <18216480+madbird1304@users.noreply.github.com>
Date: Wed, 9 Feb 2022 04:51:26 +0300
Subject: [PATCH 1090/1407] issue#13073: fix `%paste` magic under Wayland

---
 IPython/core/hooks.py    |  4 ++--
 IPython/lib/clipboard.py | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/IPython/core/hooks.py b/IPython/core/hooks.py
index 09b08d942e0..0f1f5af2dc7 100644
--- a/IPython/core/hooks.py
+++ b/IPython/core/hooks.py
@@ -156,14 +156,14 @@ def clipboard_get(self):
     """
     from ..lib.clipboard import (
         osx_clipboard_get, tkinter_clipboard_get,
-        win32_clipboard_get
+        win32_clipboard_get, wayland_clipboard_get,
     )
     if sys.platform == 'win32':
         chain = [win32_clipboard_get, tkinter_clipboard_get]
     elif sys.platform == 'darwin':
         chain = [osx_clipboard_get, tkinter_clipboard_get]
     else:
-        chain = [tkinter_clipboard_get]
+        chain = [wayland_clipboard_get, tkinter_clipboard_get]
     dispatcher = CommandChainDispatcher()
     for func in chain:
         dispatcher.add(func)
diff --git a/IPython/lib/clipboard.py b/IPython/lib/clipboard.py
index 95a6b0a0a34..5d6630d17a7 100644
--- a/IPython/lib/clipboard.py
+++ b/IPython/lib/clipboard.py
@@ -67,3 +67,26 @@ def tkinter_clipboard_get():
     return text
 
 
+def wayland_clipboard_get():
+    """Get the clipboard's text under Wayland using wl-paste command.
+
+    This requires Wayland and wl-clipboard installed and running.
+    """
+    if os.environ.get("XDG_SESSION_TYPE") != "wayland":
+        raise TryNext("wayland is not detected")
+
+    try:
+        with subprocess.Popen(["wl-paste"], stdout=subprocess.PIPE) as p:
+            raw, _ = p.communicate()
+    except FileNotFoundError as e:
+        raise ClipboardEmpty(
+            "Getting text from the clipboard under Wayland requires the wl-clipboard "
+            "extension: https://github.com/bugaevc/wl-clipboard"
+        ) from e
+
+    try:
+        text = py3compat.decode(raw)
+    except UnicodeDecodeError as e:
+        raise ClipboardEmpty from e
+
+    return text

From b2f71a87af023177d38196dcf8c9c1a725b8cf59 Mon Sep 17 00:00:00 2001
From: luz paz <luzpaz@users.noreply.github.com>
Date: Wed, 9 Feb 2022 13:59:30 -0500
Subject: [PATCH 1091/1407] Fix various typos

Found via `codespell -q 3`
---
 .github/workflows/downstream.yml            | 2 +-
 IPython/core/completer.py                   | 4 ++--
 IPython/extensions/tests/test_autoreload.py | 2 +-
 SECURITY.md                                 | 2 +-
 appveyor.yml                                | 2 +-
 docs/source/sphinxext.rst                   | 2 +-
 tools/release_helper.sh                     | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
index 5c5adc1e0ab..309d03a2204 100644
--- a/.github/workflows/downstream.yml
+++ b/.github/workflows/downstream.yml
@@ -39,7 +39,7 @@ jobs:
     - name: Install and update Python dependencies
       run: |
         python -m pip install --upgrade -e file://$PWD#egg=ipython[test]
-        # we must instal IPython after ipykernel to get the right versions.
+        # we must install IPython after ipykernel to get the right versions.
         python -m pip install --upgrade --upgrade-strategy eager flaky ipyparallel
         python -m pip install --upgrade 'pytest<7' 
     - name: pytest
diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 9774fd5a4e7..89b55d2b475 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1182,7 +1182,7 @@ def __init__(
 
         # This is a list of names of unicode characters that can be completed
         # into their corresponding unicode value. The list is large, so we
-        # laziliy initialize it on first use. Consuming code should access this
+        # lazily initialize it on first use. Consuming code should access this
         # attribute through the `@unicode_names` property.
         self._unicode_names = None
 
@@ -2070,7 +2070,7 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
             indexed.
         line_buffer : optional, str
             The current line the cursor is in, this is mostly due to legacy
-            reason that readline coudl only give a us the single current line.
+            reason that readline could only give a us the single current line.
             Prefer `full_text`.
         text : str
             The current "token" the cursor is in, mostly also for historical
diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index a0fe725aa68..88637fbab9c 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -33,7 +33,7 @@
 
 if platform.python_implementation() == "PyPy":
     pytest.skip(
-        "Current autoreload implementation is extremly slow on PyPy",
+        "Current autoreload implementation is extremely slow on PyPy",
         allow_module_level=True,
     )
 
diff --git a/SECURITY.md b/SECURITY.md
index a4b9435a975..dc5db66e2a2 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -3,4 +3,4 @@
 ## Reporting a Vulnerability
 
 All IPython and Jupyter security are handled via security@ipython.org. 
-You can find more informations on the Jupyter website. https://jupyter.org/security
+You can find more information on the Jupyter website. https://jupyter.org/security
diff --git a/appveyor.yml b/appveyor.yml
index b1c0abe0b6c..7637841b2fd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,7 +5,7 @@ matrix:
 environment:
   global:
     APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
-    COLUMNS: 120  # Appveyor web viwer window width is 130 chars
+    COLUMNS: 120  # Appveyor web viewer window width is 130 chars
 
   matrix:
    - PYTHON: "C:\\Python38"
diff --git a/docs/source/sphinxext.rst b/docs/source/sphinxext.rst
index b2012fa62f6..093e04a90fc 100644
--- a/docs/source/sphinxext.rst
+++ b/docs/source/sphinxext.rst
@@ -204,7 +204,7 @@ suppress the seed line so it doesn't show up in the rendered output
           [0.22591016, 0.77731835],
           [0.0072729 , 0.34273127]])
 
-For more information on @supress and @doctest decorators, please refer to the end of this file in
+For more information on @suppress and @doctest decorators, please refer to the end of this file in
 Pseudo-Decorators section.
 
 Another demonstration of multi-line input and output
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index a9208449f93..54114d18bb8 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -111,7 +111,7 @@ then
     sleep 1
     echo $BLUE"Saving API to file $PREV_RELEASE"$NOR
     frappuccino IPython IPython.kernel IPython.lib IPython.qt IPython.lib.kernel IPython.html IPython.frontend IPython.external --save IPython-$PREV_RELEASE.json
-    echo $BLUE"comming back to $BRANCH"$NOR
+    echo $BLUE"coming back to $BRANCH"$NOR
     git checkout $BRANCH
     sleep 1
     echo $BLUE"comparing ..."$NOR

From 89f7392432db54236f7f82332700d3be0d2d88a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anton=20=C3=84lgmyr?= <anton@algmyr.se>
Date: Sat, 12 Feb 2022 02:52:24 +0100
Subject: [PATCH 1092/1407] Add support for autoformatting using yapf

---
 IPython/terminal/interactiveshell.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 4a46f2702cd..4498888fcc7 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -116,6 +116,20 @@ def black_reformat_handler(text_before_cursor):
     return formatted_text
 
 
+def yapf_reformat_handler(text_before_cursor):
+    from yapf.yapflib import file_resources
+    from yapf.yapflib import yapf_api
+
+    style_config = file_resources.GetDefaultStyleForDir(os.getcwd())
+    formatted_text, was_formatted = yapf_api.FormatCode(text_before_cursor, style_config=style_config)
+    if was_formatted:
+        if not text_before_cursor.endswith("\n") and formatted_text.endswith("\n"):
+            formatted_text = formatted_text[:-1]
+        return formatted_text
+    else:
+        return text_before_cursor
+
+
 class TerminalInteractiveShell(InteractiveShell):
     mime_renderers = Dict().tag(config=True)
 
@@ -185,7 +199,7 @@ def debugger_cls(self):
 
     autoformatter = Unicode(
         "black",
-        help="Autoformatter to reformat Terminal code. Can be `'black'` or `None`",
+        help="Autoformatter to reformat Terminal code. Can be `'black'`, `'yapf'` or `None`",
         allow_none=True
     ).tag(config=True)
 
@@ -232,6 +246,8 @@ def _set_formatter(self, formatter):
             self.reformat_handler = lambda x:x
         elif formatter == 'black':
             self.reformat_handler = black_reformat_handler
+        elif formatter == 'yapf':
+            self.reformat_handler = yapf_reformat_handler
         else:
             raise ValueError
 

From a036e1fb432b1951caa6730ea0909be5d53917ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anton=20=C3=84lgmyr?= <anton@algmyr.se>
Date: Sat, 12 Feb 2022 03:00:20 +0100
Subject: [PATCH 1093/1407] Fix some formatting

---
 IPython/terminal/interactiveshell.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 4498888fcc7..03e91dc6830 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -121,7 +121,9 @@ def yapf_reformat_handler(text_before_cursor):
     from yapf.yapflib import yapf_api
 
     style_config = file_resources.GetDefaultStyleForDir(os.getcwd())
-    formatted_text, was_formatted = yapf_api.FormatCode(text_before_cursor, style_config=style_config)
+    formatted_text, was_formatted = yapf_api.FormatCode(
+        text_before_cursor, style_config=style_config
+    )
     if was_formatted:
         if not text_before_cursor.endswith("\n") and formatted_text.endswith("\n"):
             formatted_text = formatted_text[:-1]

From 5b6dbf75bcbf153cadf509962e95c50a3d9bd68b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anton=20=C3=84lgmyr?= <anton@algmyr.se>
Date: Sat, 12 Feb 2022 16:16:52 +0100
Subject: [PATCH 1094/1407] Fix darker complaint, even though inconsistent

---
 IPython/terminal/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 03e91dc6830..37773023db4 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -248,7 +248,7 @@ def _set_formatter(self, formatter):
             self.reformat_handler = lambda x:x
         elif formatter == 'black':
             self.reformat_handler = black_reformat_handler
-        elif formatter == 'yapf':
+        elif formatter == "yapf":
             self.reformat_handler = yapf_reformat_handler
         else:
             raise ValueError

From 83684a4776fddbbbbcaa0a47fa3914262fc5cf2a Mon Sep 17 00:00:00 2001
From: "Samuel B. Johnson" <sabjohnso@yahoo.com>
Date: Thu, 17 Feb 2022 20:13:30 -0600
Subject: [PATCH 1095/1407] :bug: Remove `ls` from list of system commands to
 warn about

---
 IPython/core/interactiveshell.py            | 9 ++-------
 IPython/core/tests/test_interactiveshell.py | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 61e15415000..a87db36d0b0 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2414,14 +2414,9 @@ def system_raw(self, cmd):
         cmd = self.var_expand(cmd, depth=1)
         # warn if there is an IPython magic alternative.
         main_cmd = cmd.split()[0]
-        has_magic_alternatives = ("pip", "conda", "cd", "ls")
+        has_magic_alternatives = ("pip", "conda", "cd")
 
-        # had to check if the command was an alias expanded because of `ls`
-        is_alias_expanded = self.alias_manager.is_alias(main_cmd) and (
-            self.alias_manager.retrieve_alias(main_cmd).strip() == cmd.strip()
-        )
-
-        if main_cmd in has_magic_alternatives and not is_alias_expanded:
+        if main_cmd in has_magic_alternatives:
             warnings.warn(
                 (
                     "You executed the system command !{0} which may not work "
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 09dbd967706..230a498cfcc 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -623,7 +623,7 @@ def test_control_c(self, *mocks):
         self.assertEqual(ip.user_ns["_exit_code"], -signal.SIGINT)
 
     def test_magic_warnings(self):
-        for magic_cmd in ("ls", "pip", "conda", "cd"):
+        for magic_cmd in ("pip", "conda", "cd"):
             with self.assertWarnsRegex(Warning, "You executed the system command"):
                 ip.system_raw(magic_cmd)
 

From d11e987f174a15f1640f8006c86f58d884c3faa4 Mon Sep 17 00:00:00 2001
From: Fabio Zadrozny <fabiofz@gmail.com>
Date: Thu, 17 Feb 2022 16:39:32 -0300
Subject: [PATCH 1096/1407] Set co_name for cells run line by line. Fixes
 https://github.com/ipython/ipykernel/issues/841

---
 IPython/core/interactiveshell.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 61e15415000..a50816f181e 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -15,6 +15,7 @@
 import ast
 import atexit
 import builtins as builtin_mod
+import dis
 import functools
 import inspect
 import os
@@ -3141,6 +3142,29 @@ def transform_ast(self, node):
             ast.fix_missing_locations(node)
         return node
 
+    def _update_code_co_name(self, code):
+        """Python 3.10 changed the behaviour so that whenever a code object
+        is assembled in the compile(ast) the co_firstlineno would be == 1.
+
+        This makes pydevd/debugpy think that all cells invoked are the same
+        since it caches information based on (co_firstlineno, co_name, co_filename).
+
+        Given that, this function changes the code 'co_name' to be unique
+        based on the first real lineno of the code (which also has a nice
+        side effect of customizing the name so that it's not always <module>).
+
+        See: https://github.com/ipython/ipykernel/issues/841
+        """
+        if not hasattr(code, "replace"):
+            # It may not be available on older versions of Python (only
+            # available for 3.8 onwards).
+            return code
+        try:
+            first_real_line = next(dis.findlinestarts(code))[1]
+        except StopIteration:
+            return code
+        return code.replace(co_name="<cell line: %s>" % (first_real_line,))
+
     async def run_ast_nodes(
         self,
         nodelist: ListType[stmt],
@@ -3239,6 +3263,7 @@ def compare(code):
                     else 0x0
                 ):
                     code = compiler(mod, cell_name, mode)
+                    code = self._update_code_co_name(code)
                     asy = compare(code)
                 if await self.run_code(code, result, async_=asy):
                     return True

From 258a093e0e4fd27ca7ee24da9793609f811d2856 Mon Sep 17 00:00:00 2001
From: Nathan Buckner <nbuckner@roku.com>
Date: Sun, 20 Feb 2022 08:50:13 -0800
Subject: [PATCH 1097/1407] Fix for symlink resolving

---
 IPython/core/interactiveshell.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 61e15415000..26198831992 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -772,10 +772,13 @@ def init_virtualenv(self):
         # stdlib venv may symlink sys.executable, so we can't use realpath.
         # but others can symlink *to* the venv Python, so we can't just use sys.executable.
         # So we just check every item in the symlink tree (generally <= 3)
+        current_dir = Path(os.curdir).absolute()
         paths = [p]
         while p.is_symlink():
-            p = Path(os.readlink(p))
-            paths.append(p.resolve())
+            os.chdir(p.parent)
+            p = Path(os.readlink(p)).absolute()
+            paths.append(p)
+        os.chdir(current_dir)
 
         # In Cygwin paths like "c:\..." and '\cygdrive\c\...' are possible
         if p_venv.parts[1] == "cygdrive":

From 3ad6bdca0e5f186e1205b7436668731539173111 Mon Sep 17 00:00:00 2001
From: Nathan Buckner <nbuckner@roku.com>
Date: Mon, 21 Feb 2022 05:19:24 -0800
Subject: [PATCH 1098/1407] Removed chdir and changed to joining the path if
 not absolute path. This better follows the readlink docs.

---
 IPython/core/interactiveshell.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 26198831992..42364eb960a 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -772,13 +772,13 @@ def init_virtualenv(self):
         # stdlib venv may symlink sys.executable, so we can't use realpath.
         # but others can symlink *to* the venv Python, so we can't just use sys.executable.
         # So we just check every item in the symlink tree (generally <= 3)
-        current_dir = Path(os.curdir).absolute()
         paths = [p]
         while p.is_symlink():
-            os.chdir(p.parent)
-            p = Path(os.readlink(p)).absolute()
+            new_path = p.readlink()
+            if not new_path.is_absolute():
+                new_path = p.parent / new_path
+            p = new_path
             paths.append(p)
-        os.chdir(current_dir)
 
         # In Cygwin paths like "c:\..." and '\cygdrive\c\...' are possible
         if p_venv.parts[1] == "cygdrive":

From 946e545b181fea95e876b15c51fc60a5a89bf934 Mon Sep 17 00:00:00 2001
From: Lucy McPhail <lucy.mcphail.p@gmail.com>
Date: Mon, 21 Feb 2022 20:26:24 +0000
Subject: [PATCH 1099/1407] Improve auto_match for quotes

Only insert a pair of quotes if there are an even number of quotes
preceding the cursor. This way, if the cursor is inside an unclosed
string, typing the closing quote will not insert a pair.
---
 IPython/terminal/shortcuts.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index ea204f8ddd8..274f9b250bb 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -139,12 +139,24 @@ def _(event):
         event.current_buffer.insert_text("{}")
         event.current_buffer.cursor_left()
 
-    @kb.add('"', filter=focused_insert & auto_match & following_text(r"[,)}\]]|$"))
+    @kb.add(
+        '"',
+        filter=focused_insert
+        & auto_match
+        & preceding_text(r'^([^"]+|"[^"]*")*$')
+        & following_text(r"[,)}\]]|$"),
+    )
     def _(event):
         event.current_buffer.insert_text('""')
         event.current_buffer.cursor_left()
 
-    @kb.add("'", filter=focused_insert & auto_match & following_text(r"[,)}\]]|$"))
+    @kb.add(
+        "'",
+        filter=focused_insert
+        & auto_match
+        & preceding_text(r"^([^']+|'[^']*')*$")
+        & following_text(r"[,)}\]]|$"),
+    )
     def _(event):
         event.current_buffer.insert_text("''")
         event.current_buffer.cursor_left()
@@ -186,16 +198,6 @@ def _(event):
         event.current_buffer.insert_text("{}" + dashes)
         event.current_buffer.cursor_left(len(dashes) + 1)
 
-    @kb.add('"', filter=focused_insert & auto_match & preceding_text(r".*(r|R)$"))
-    def _(event):
-        event.current_buffer.insert_text('""')
-        event.current_buffer.cursor_left()
-
-    @kb.add("'", filter=focused_insert & auto_match & preceding_text(r".*(r|R)$"))
-    def _(event):
-        event.current_buffer.insert_text("''")
-        event.current_buffer.cursor_left()
-
     # just move cursor
     @kb.add(")", filter=focused_insert & auto_match & following_text(r"^\)"))
     @kb.add("]", filter=focused_insert & auto_match & following_text(r"^\]"))

From 1cf66263c96b85749216150d72bf644d6349ed2d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 25 Feb 2022 10:59:58 +0100
Subject: [PATCH 1100/1407] doc parssing issue

---
 IPython/utils/text.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/utils/text.py b/IPython/utils/text.py
index a1754d254de..ef75f9331d7 100644
--- a/IPython/utils/text.py
+++ b/IPython/utils/text.py
@@ -471,7 +471,7 @@ def strip_ansi(source):
 class EvalFormatter(Formatter):
     """A String Formatter that allows evaluation of simple expressions.
     
-    Note that this version interprets a : as specifying a format string (as per
+    Note that this version interprets a `:`  as specifying a format string (as per
     standard string formatting), so if slicing is required, you must explicitly
     create a slice.
     

From bce649cba874ba7965ac894564e67e446a7854ff Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 25 Feb 2022 11:17:06 +0100
Subject: [PATCH 1101/1407] formatting

---
 IPython/core/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 17aacfc3013..9012f0f20a2 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3680,7 +3680,7 @@ def atexit_operations(self):
         del self.tempdirs
 
         # Restore user's cursor
-        if hasattr(self, "editing_mode") and self.editing_mode == 'vi':
+        if hasattr(self, "editing_mode") and self.editing_mode == "vi":
             sys.stdout.write("\x1b[0 q")
             sys.stdout.flush()
 

From 422f8d9cf8c3858aab934853780a872610df50e4 Mon Sep 17 00:00:00 2001
From: Can Sarigol <ertugrulsarigol@gmail.com>
Date: Mon, 24 Jan 2022 08:44:18 +0100
Subject: [PATCH 1102/1407] Get history file from shell to debugger if it
 exists.

---
 IPython/terminal/debugger.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index d76550d878f..8448d96370d 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -68,6 +68,8 @@ def gen_comp(self, text):
                 self.debugger_history = FileHistory(os.path.expanduser(str(p)))
             else:
                 self.debugger_history = InMemoryHistory()
+        else:
+            self.debugger_history = self.shell.debugger_history
 
         options = dict(
             message=(lambda: PygmentsTokens(get_prompt_tokens())),

From a9b523c7047fe12c49373972c6b092ed5fc29e99 Mon Sep 17 00:00:00 2001
From: Thomas Nicholas <thomas.nicholas@columbia.edu>
Date: Wed, 16 Feb 2022 16:03:03 -0500
Subject: [PATCH 1103/1407] match only pseudo-decorators

---
 IPython/sphinxext/ipython_directive.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/IPython/sphinxext/ipython_directive.py b/IPython/sphinxext/ipython_directive.py
index ac0964032a5..093fd7a362c 100644
--- a/IPython/sphinxext/ipython_directive.py
+++ b/IPython/sphinxext/ipython_directive.py
@@ -220,6 +220,8 @@
 # for tokenizing blocks
 COMMENT, INPUT, OUTPUT =  range(3)
 
+PSEUDO_DECORATORS = ["suppress", "verbatim", "savefig", "doctest"]
+
 #-----------------------------------------------------------------------------
 # Functions and class declarations
 #-----------------------------------------------------------------------------
@@ -263,11 +265,14 @@ def block_parser(part, rgxin, rgxout, fmtin, fmtout):
             block.append((COMMENT, line))
             continue
 
-        if line_stripped.startswith('@'):
-            # Here is where we assume there is, at most, one decorator.
-            # Might need to rethink this.
-            decorator = line_stripped
-            continue
+        if any(
+            line_stripped.startswith('@' + pseudo_decorator) for pseudo_decorator in PSEUDO_DECORATORS
+        ):                
+            if decorator:
+                raise RuntimeError("Applying multiple pseudo-decorators on one line is not supported")
+            else:
+                decorator = line_stripped
+                continue
 
         # does this look like an input line?
         matchin = rgxin.match(line)

From 5fec429e39671a5c359e6fc17ab59ece4e139847 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 25 Feb 2022 11:27:37 +0100
Subject: [PATCH 1104/1407] reformatting

---
 IPython/sphinxext/ipython_directive.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/IPython/sphinxext/ipython_directive.py b/IPython/sphinxext/ipython_directive.py
index 093fd7a362c..18bdfcae993 100644
--- a/IPython/sphinxext/ipython_directive.py
+++ b/IPython/sphinxext/ipython_directive.py
@@ -266,10 +266,13 @@ def block_parser(part, rgxin, rgxout, fmtin, fmtout):
             continue
 
         if any(
-            line_stripped.startswith('@' + pseudo_decorator) for pseudo_decorator in PSEUDO_DECORATORS
-        ):                
+            line_stripped.startswith("@" + pseudo_decorator)
+            for pseudo_decorator in PSEUDO_DECORATORS
+        ):
             if decorator:
-                raise RuntimeError("Applying multiple pseudo-decorators on one line is not supported")
+                raise RuntimeError(
+                    "Applying multiple pseudo-decorators on one line is not supported"
+                )
             else:
                 decorator = line_stripped
                 continue

From f6e3393f88b8d188726220c72e775a7a26c3249b Mon Sep 17 00:00:00 2001
From: ygeyzel <ygeyzel@gmail.com>
Date: Sat, 22 Jan 2022 17:24:56 +0200
Subject: [PATCH 1105/1407] Typing '%' restrict autocompletion to magics

---
 IPython/core/completer.py            |  5 +++--
 IPython/core/tests/test_completer.py | 11 +++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 89b55d2b475..0579e684e81 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -2139,8 +2139,9 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
         # different types of objects.  The rlcomplete() method could then
         # simply collapse the dict into a list for readline, but we'd have
         # richer completion semantics in other environments.
-        completions:Iterable[Any] = []
-        if self.use_jedi:
+        is_magic_prefix = len(text) > 0 and text[0] == "%"
+        completions: Iterable[Any] = []
+        if self.use_jedi and not is_magic_prefix:
             if not full_text:
                 full_text = line_buffer
             completions = self._jedi_matches(
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 5f791e84f83..746a1e68261 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -1262,3 +1262,14 @@ def meth_2(self, meth2_arg1, meth2_arg2):
         _, matches = ip.complete(None, "test.meth(")
         self.assertIn("meth_arg1=", matches)
         self.assertNotIn("meth2_arg1=", matches)
+
+    def test_percent_symbol_restrict_to_magic_completions(self):
+        ip = get_ipython()
+        completer = ip.Completer
+        text = "%a"
+
+        with provisionalcompleter():
+            completer.use_jedi = True
+            completions = completer.completions(text, len(text))
+            for c in completions:
+                self.assertEqual(c.text[0], "%")

From 5ccd62a38c58306166898a417e115707e3e673fe Mon Sep 17 00:00:00 2001
From: Adam Johnson <me@adamj.eu>
Date: Sat, 15 Jan 2022 10:09:31 +0000
Subject: [PATCH 1106/1407] Revert "enable formatting by default"

This reverts PR #13397 / commit df3248f00a60859ed07f81e87531856b30891396, whilst leaving in place the internal improvements.
---
 IPython/terminal/interactiveshell.py | 2 +-
 docs/source/whatsnew/version8.rst    | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 37773023db4..212692ab6d1 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -200,7 +200,7 @@ def debugger_cls(self):
     ).tag(config=True)
 
     autoformatter = Unicode(
-        "black",
+        None,
         help="Autoformatter to reformat Terminal code. Can be `'black'`, `'yapf'` or `None`",
         allow_none=True
     ).tag(config=True)
diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 7b2318f3dcd..12c5d1f17c7 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -344,12 +344,11 @@ For more information please see the following unit test : ``extensions/tests/tes
 Auto formatting with black in the CLI
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If ``black`` is installed in the same environment as IPython, terminal IPython
-will now *by default*  reformat the code in the CLI when possible. You can
-disable this with ``--TerminalInteractiveShell.autoformatter=None``.
-
 This feature was present in 7.x, but disabled by default.
 
+In 8.0, input was automatically reformatted with Black when black was installed.
+This feature has been reverted for the time being.
+You can re-enable it by setting ``TerminalInteractiveShell.autoformatter`` to ``"black"``
 
 History Range Glob feature
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

From 96cbe589e4b201af115a443bcaa3bab6f9fcc697 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 25 Feb 2022 11:39:18 +0100
Subject: [PATCH 1107/1407] Remove IPython/lib/security.

This should be part of Jupyter notebook / jupyter lab, and has no reason
to stay here. It might even be dangerous as it is not maintained here.
---
 IPython/lib/__init__.py            |  10 ---
 IPython/lib/security.py            | 114 -----------------------------
 IPython/lib/tests/test_security.py |  27 -------
 3 files changed, 151 deletions(-)
 delete mode 100644 IPython/lib/security.py
 delete mode 100644 IPython/lib/tests/test_security.py

diff --git a/IPython/lib/__init__.py b/IPython/lib/__init__.py
index 8eb89012df1..94b8ade4ec9 100644
--- a/IPython/lib/__init__.py
+++ b/IPython/lib/__init__.py
@@ -9,13 +9,3 @@
 #  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.lib.security import passwd
-
-#-----------------------------------------------------------------------------
-# Code
-#-----------------------------------------------------------------------------
diff --git a/IPython/lib/security.py b/IPython/lib/security.py
deleted file mode 100644
index 152561dabad..00000000000
--- a/IPython/lib/security.py
+++ /dev/null
@@ -1,114 +0,0 @@
-"""
-Password generation for the IPython notebook.
-"""
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
-# Stdlib
-import getpass
-import hashlib
-import random
-
-# Our own
-from IPython.core.error import UsageError
-from IPython.utils.py3compat import encode
-
-#-----------------------------------------------------------------------------
-# Globals
-#-----------------------------------------------------------------------------
-
-# Length of the salt in nr of hex chars, which implies salt_len * 4
-# bits of randomness.
-salt_len = 12
-
-#-----------------------------------------------------------------------------
-# Functions
-#-----------------------------------------------------------------------------
-
-def passwd(passphrase=None, algorithm='sha1'):
-    """Generate hashed password and salt for use in notebook configuration.
-
-    In the notebook configuration, set `c.NotebookApp.password` to
-    the generated string.
-
-    Parameters
-    ----------
-    passphrase : str
-        Password to hash.  If unspecified, the user is asked to input
-        and verify a password.
-    algorithm : str
-        Hashing algorithm to use (e.g, 'sha1' or any argument supported
-        by :func:`hashlib.new`).
-
-    Returns
-    -------
-    hashed_passphrase : str
-        Hashed password, in the format 'hash_algorithm:salt:passphrase_hash'.
-
-    Examples
-    --------
-    >>> passwd('mypassword')
-    'sha1:7cf3:b7d6da294ea9592a9480c8f52e63cd42cfb9dd12'  # random
-
-    """
-    if passphrase is None:
-        for i in range(3):
-            p0 = getpass.getpass('Enter password: ')
-            p1 = getpass.getpass('Verify password: ')
-            if p0 == p1:
-                passphrase = p0
-                break
-            else:
-                print('Passwords do not match.')
-        else:
-            raise UsageError('No matching passwords found. Giving up.')
-
-    h = hashlib.new(algorithm)
-    salt = ('%0' + str(salt_len) + 'x') % random.getrandbits(4 * salt_len)
-    h.update(encode(passphrase, 'utf-8') + encode(salt, 'ascii'))
-
-    return ':'.join((algorithm, salt, h.hexdigest()))
-
-
-def passwd_check(hashed_passphrase, passphrase):
-    """Verify that a given passphrase matches its hashed version.
-
-    Parameters
-    ----------
-    hashed_passphrase : str
-        Hashed password, in the format returned by `passwd`.
-    passphrase : str
-        Passphrase to validate.
-
-    Returns
-    -------
-    valid : bool
-        True if the passphrase matches the hash.
-
-    Examples
-    --------
-    >>> from IPython.lib.security import passwd_check
-    >>> passwd_check('sha1:0e112c3ddfce:a68df677475c2b47b6e86d0467eec97ac5f4b85a',
-    ...              'mypassword')
-    True
-
-    >>> passwd_check('sha1:0e112c3ddfce:a68df677475c2b47b6e86d0467eec97ac5f4b85a',
-    ...              'anotherpassword')
-    False
-    """
-    try:
-        algorithm, salt, pw_digest = hashed_passphrase.split(':', 2)
-    except (ValueError, TypeError):
-        return False
-
-    try:
-        h = hashlib.new(algorithm)
-    except ValueError:
-        return False
-
-    if len(pw_digest) == 0:
-        return False
-
-    h.update(encode(passphrase, 'utf-8') + encode(salt, 'ascii'))
-
-    return h.hexdigest() == pw_digest
diff --git a/IPython/lib/tests/test_security.py b/IPython/lib/tests/test_security.py
deleted file mode 100644
index 27c32ab7328..00000000000
--- a/IPython/lib/tests/test_security.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# coding: utf-8
-from IPython.lib import passwd
-from IPython.lib.security import passwd_check, salt_len
-
-def test_passwd_structure():
-    p = passwd("passphrase")
-    algorithm, salt, hashed = p.split(":")
-    assert algorithm == "sha1"
-    assert len(salt) == salt_len
-    assert len(hashed) == 40
-
-def test_roundtrip():
-    p = passwd("passphrase")
-    assert passwd_check(p, "passphrase") is True
-
-
-def test_bad():
-    p = passwd('passphrase')
-    assert passwd_check(p, p) is False
-    assert passwd_check(p, "a:b:c:d") is False
-    assert passwd_check(p, "a:b") is False
-
-
-def test_passwd_check_unicode():
-    # GH issue #4524
-    phash = u'sha1:23862bc21dd3:7a415a95ae4580582e314072143d9c382c491e4f'
-    assert passwd_check(phash, u"łe¶ŧ←↓→")

From 44d64dc36e727cde56d7b1986ee52228ddde1af9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 25 Feb 2022 11:56:58 +0100
Subject: [PATCH 1108/1407] Update some deprecated ip.magic() to run_line-magic
 in tests

---
 IPython/core/tests/test_alias.py    |  8 ++--
 IPython/core/tests/test_handlers.py | 64 ++++++++++++++++-------------
 IPython/core/tests/test_history.py  | 12 +++---
 3 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/IPython/core/tests/test_alias.py b/IPython/core/tests/test_alias.py
index a84b0095334..32d2e2f711e 100644
--- a/IPython/core/tests/test_alias.py
+++ b/IPython/core/tests/test_alias.py
@@ -43,11 +43,11 @@ def test_alias_args_error():
 
 def test_alias_args_commented():
     """Check that alias correctly ignores 'commented out' args"""
-    _ip.magic('alias commetarg echo this is %%s a commented out arg')
-    
+    _ip.run_line_magic("alias", "commentarg echo this is %%s a commented out arg")
+
     with capture_output() as cap:
-        _ip.run_cell('commetarg')
-    
+        _ip.run_cell("commentarg")
+
     # strip() is for pytest compat; testing via iptest patch IPython shell
     # in testing.globalipapp and replace the system call which messed up the
     # \r\n
diff --git a/IPython/core/tests/test_handlers.py b/IPython/core/tests/test_handlers.py
index e151e70ee91..604dadee1ab 100644
--- a/IPython/core/tests/test_handlers.py
+++ b/IPython/core/tests/test_handlers.py
@@ -56,36 +56,42 @@ def test_handlers():
     ip.user_ns['autocallable'] = autocallable
 
     # auto
-    ip.magic('autocall 0')
+    ip.run_line_magic("autocall", "0")
     # Only explicit escapes or instances of IPyAutocallable should get
     # expanded
-    run([
-        ('len "abc"',       'len "abc"'),
-        ('autocallable',    'autocallable()'),
-        # Don't add extra brackets (gh-1117)
-        ('autocallable()',    'autocallable()'),
-        ])
-    ip.magic('autocall 1')
-    run([
-        ('len "abc"', 'len("abc")'),
-        ('len "abc";', 'len("abc");'),  # ; is special -- moves out of parens
-        # Autocall is turned off if first arg is [] and the object
-        # is both callable and indexable.  Like so:
-        ('len [1,2]', 'len([1,2])'),      # len doesn't support __getitem__...
-        ('call_idx [1]', 'call_idx [1]'), # call_idx *does*..
-        ('call_idx 1', 'call_idx(1)'),
-        ('len', 'len'), # only at 2 does it auto-call on single args
-        ])
-    ip.magic('autocall 2')
-    run([
-        ('len "abc"', 'len("abc")'),
-        ('len "abc";', 'len("abc");'),
-        ('len [1,2]', 'len([1,2])'),
-        ('call_idx [1]', 'call_idx [1]'),
-        ('call_idx 1', 'call_idx(1)'),
-        # This is what's different:
-        ('len', 'len()'), # only at 2 does it auto-call on single args
-        ])
-    ip.magic('autocall 1')
+    run(
+        [
+            ('len "abc"', 'len "abc"'),
+            ("autocallable", "autocallable()"),
+            # Don't add extra brackets (gh-1117)
+            ("autocallable()", "autocallable()"),
+        ]
+    )
+    ip.run_line_magic("autocall", "1")
+    run(
+        [
+            ('len "abc"', 'len("abc")'),
+            ('len "abc";', 'len("abc");'),  # ; is special -- moves out of parens
+            # Autocall is turned off if first arg is [] and the object
+            # is both callable and indexable.  Like so:
+            ("len [1,2]", "len([1,2])"),  # len doesn't support __getitem__...
+            ("call_idx [1]", "call_idx [1]"),  # call_idx *does*..
+            ("call_idx 1", "call_idx(1)"),
+            ("len", "len"),  # only at 2 does it auto-call on single args
+        ]
+    )
+    ip.run_line_magic("autocall", "2")
+    run(
+        [
+            ('len "abc"', 'len("abc")'),
+            ('len "abc";', 'len("abc");'),
+            ("len [1,2]", "len([1,2])"),
+            ("call_idx [1]", "call_idx [1]"),
+            ("call_idx 1", "call_idx(1)"),
+            # This is what's different:
+            ("len", "len()"),  # only at 2 does it auto-call on single args
+        ]
+    )
+    ip.run_line_magic("autocall", "1")
 
     assert failures == []
diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
index 388ebc64acd..73d50c87d34 100644
--- a/IPython/core/tests/test_history.py
+++ b/IPython/core/tests/test_history.py
@@ -52,13 +52,13 @@ def test_history():
 
             # Check whether specifying a range beyond the end of the current
             # session results in an error (gh-804)
-            ip.magic('%hist 2-500')
+            ip.run_line_magic("hist", "2-500")
 
             # Check that we can write non-ascii characters to a file
-            ip.magic("%%hist -f %s" % (tmp_path / "test1"))
-            ip.magic("%%hist -pf %s" % (tmp_path / "test2"))
-            ip.magic("%%hist -nf %s" % (tmp_path / "test3"))
-            ip.magic("%%save %s 1-10" % (tmp_path / "test4"))
+            ip.run_line_magic("hist", "-f %s" % (tmp_path / "test1"))
+            ip.run_line_magic("hist", "-pf %s" % (tmp_path / "test2"))
+            ip.run_line_magic("hist", "-nf %s" % (tmp_path / "test3"))
+            ip.run_line_magic("save", "%s 1-10" % (tmp_path / "test4"))
 
             # New session
             ip.history_manager.reset()
@@ -124,7 +124,7 @@ def test_history():
 
             # Cross testing: check that magic %save can get previous session.
             testfilename = (tmp_path / "test.py").resolve()
-            ip.magic("save " + str(testfilename) + " ~1/1-3")
+            ip.run_line_magic("save", str(testfilename) + " ~1/1-3")
             with io.open(testfilename, encoding="utf-8") as testfile:
                 assert testfile.read() == "# coding: utf-8\n" + "\n".join(hist) + "\n"
 

From 88897b13403f10e426cd4fb5a5d5d3e205cb8b92 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 25 Feb 2022 12:39:35 +0100
Subject: [PATCH 1109/1407] Try to avoid network connection during tests.

Mitigate #13468
---
 IPython/core/display.py    | 4 ++--
 IPython/core/magics/osm.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index d36a176c3bf..933295ad6ce 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -884,7 +884,7 @@ def __init__(
         a URL, or a filename from which to load image data.
         The result is always embedding image data for inline images.
 
-        >>> Image('http://www.google.fr/images/srpr/logo3w.png')
+        >>> Image('https://www.google.fr/images/srpr/logo3w.png') # doctest: +SKIP
         <IPython.core.display.Image object>
 
         >>> Image('/path/to/image.jpg')
@@ -897,7 +897,7 @@ def __init__(
         it only generates ``<img>`` tag with a link to the source.
         This will not work in the qtconsole or offline.
 
-        >>> Image(url='http://www.google.fr/images/srpr/logo3w.png')
+        >>> Image(url='https://www.google.fr/images/srpr/logo3w.png')
         <IPython.core.display.Image object>
 
         """
diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index 11fec812ef6..42ed876ed15 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -127,7 +127,7 @@ def alias(self, parameter_s=''):
         Aliases expand Python variables just like system calls using ! or !!
         do: all expressions prefixed with '$' get expanded.  For details of
         the semantic rules, see PEP-215:
-        http://www.python.org/peps/pep-0215.html.  This is the library used by
+        https://www.python.org/dev/peps/pep-0215/.  This is the library used by
         IPython for variable expansion.  If you want to access a true shell
         variable, an extra $ is necessary to prevent its expansion by
         IPython::

From ccfe7e7389055919817f4acb60f58c3e926a8519 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 25 Feb 2022 14:31:28 +0100
Subject: [PATCH 1110/1407] Whats new 7.32

---
 docs/source/whatsnew/version7.rst | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 6597fe555f8..331db654b58 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -9,6 +9,10 @@ IPython 7.32
 ============
 
 
+
+Autoload magic lazily
+---------------------
+
 The ability to configure magics to be lazily loaded has been added to IPython.
 See the ``ipython --help-all`` section on ``MagicsManager.lazy_magic``.
 One can now use::
@@ -21,6 +25,21 @@ One can now use::
 And on first use of ``%my_magic``, or corresponding cell magic, or other line magic,
 the corresponding ``load_ext`` will be called just before trying to invoke the magic.
 
+Misc
+----
+
+ - Update sphinxify  for Docrepr 0.2.0  :ghpull:`13503`.
+ - Set co_name for cells run line by line (to fix debugging with Python 3.10)
+   :ghpull:`13535`
+
+
+Many thanks to all the contributors to this release. You can find all individual
+contributions to this milestone `on github
+<https://github.com/ipython/ipython/milestone/99>`__.
+
+Thanks as well to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries.
+
 .. _version 7.31:
 
 IPython 7.31

From 218264979f050dcdacd8964e16de79154f466cb6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 25 Feb 2022 14:24:36 +0100
Subject: [PATCH 1111/1407] wn 8

---
 docs/source/whatsnew/version8.rst | 71 +++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 12c5d1f17c7..02544df0ebe 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -3,6 +3,76 @@
 ============
 
 
+.. _version 8.1:
+
+IPython 8.1.0
+-------------
+
+IPython 8.1 is the first minor release after 8.0 and fixes a number of bugs and
+Update a few behavior that were problematic with the 8.0 as with many new major
+release.
+
+Note that beyond the changes listed here, IPython 8.1.0 also contains all the
+features listed in :ref:`version 7.32`.
+
+ - Misc and multiple fixes around quotation auto-closing. It is now disabled by
+   default. Run with ``TerminalInteractiveShell.auto_match=True`` to re-enabled
+ - Require pygments>=2.4.0 :ghpull:`13459`, this was implicit in the code, but
+   is now explicit in ``setup.cfg``/``setup.py``
+ - Docs improvement of ``core.magic_arguments`` examples. :ghpull:`13433`
+ - Multi-line edit executes too early with await. :ghpull:`13424`
+
+ - ``black``  is back as an optional dependency, and autoformatting disabled by
+   default until some fixes are implemented (black improperly reformat magics).
+   :ghpull:`13471` Additionally the ability to use ``yapf`` as a code
+   reformatter has been added :ghpull:`13528` . You can use
+   ``TerminalInteractiveShell.autoformatter="black"``,
+   ``TerminalInteractiveShell.autoformatter="yapf"`` to re-enable auto formating
+   with black, or switch to yapf.
+
+ - Fix and issue where ``display`` was not defined.
+
+ - Auto suggestions are now configurable. Currently only
+   ``AutoSuggestFromHistory`` (default) and ``None``. new provider contribution
+   welcomed. :ghpull:`13475`
+
+ - multiple packaging/testing improvement to simplify downstream packaging
+   (xfail with reasons, try to not access network...).
+
+ - Update deprecation. ``InteractiveShell.magic`` internal method has been
+   deprecated for many years but did not emit a warning until now.
+
+ - internal ``appended_to_syspath`` context manager has been deprecated.
+
+ - fix an issue with symlinks in virtualenv :ghpull:`13537`
+
+ - Fix an issue with vim mode, where cursor would not be reset on exit :ghpull:`13472`
+
+ - ipython directive now remove only known pseudo-decorators :ghpull:`13532`
+
+ - ``IPython/lib/security`` which used to be used for jupyter notebook has been
+   removed.
+
+ - Fix an issue where ``async with`` would execute on new lines. :ghpull:`13436`
+
+
+We want to remind users that IPython is part of the Jupyter organisations, and
+thus governed by a Code of Conduct. Some of the behavior we have seen on GitHub is not acceptable.
+Abuse and non-respectful comments on discussion will not be tolerated.
+
+Many thanks to all the contributors to this release, many of the above fixed issue and
+new features where done by first time contributors, showing there is still
+plenty of easy contribution possible in IPython
+. You can find all individual contributions
+to this milestone `on github <https://github.com/ipython/ipython/milestone/91>`__.
+
+Thanks as well to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries. In particular the Lazy autoloading of
+magics that you will find described in the 7.32 release notes.
+
+
+.. _version 8.0.1:
+
 IPython 8.0.1 (CVE-2022-21699)
 ------------------------------
 
@@ -45,6 +115,7 @@ Thus starting with this version:
 Further details can be read on the `GitHub Advisory <https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x>`__
 
 
+.. _version 8.0:
 
 IPython 8.0
 -----------

From e5d78c598bcd615b1007c41508a2486a97598a97 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 25 Feb 2022 15:12:07 +0100
Subject: [PATCH 1112/1407] Increase test coverage

---
 IPython/core/tests/test_interactiveshell.py | 50 ++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 230a498cfcc..10cce1fd646 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -380,7 +380,8 @@ def test_ofind_property_with_error(self):
         class A(object):
             @property
             def foo(self):
-                raise NotImplementedError()
+                raise NotImplementedError()  # pragma: no cover
+
         a = A()
 
         found = ip._ofind('a.foo', [('locals', locals())])
@@ -392,7 +393,7 @@ def test_ofind_multiple_attribute_lookups(self):
         class A(object):
             @property
             def foo(self):
-                raise NotImplementedError()
+                raise NotImplementedError()  # pragma: no cover
 
         a = A()
         a.a = A()
@@ -585,9 +586,9 @@ def test_exit_code_signal(self):
         self.assertEqual(ip.user_ns['_exit_code'], -signal.SIGALRM)
     
     @onlyif_cmds_exist("csh")
-    def test_exit_code_signal_csh(self):
-        SHELL = os.environ.get('SHELL', None)
-        os.environ['SHELL'] = find_cmd("csh")
+    def test_exit_code_signal_csh(self):  # pragma: no cover
+        SHELL = os.environ.get("SHELL", None)
+        os.environ["SHELL"] = find_cmd("csh")
         try:
             self.test_exit_code_signal()
         finally:
@@ -615,7 +616,7 @@ def test_1(self):
     def test_control_c(self, *mocks):
         try:
             self.system("sleep 1 # wont happen")
-        except KeyboardInterrupt:
+        except KeyboardInterrupt:  # pragma: no cove
             self.fail(
                 "system call should intercept "
                 "keyboard interrupt from subprocess.call"
@@ -679,16 +680,20 @@ def setUp(self):
     
     def tearDown(self):
         ip.ast_transformers.remove(self.negator)
-    
+
+    def test_non_int_const(self):
+        with tt.AssertPrints("hello"):
+            ip.run_cell('print("hello")')
+
     def test_run_cell(self):
-        with tt.AssertPrints('-34'):
-            ip.run_cell('print (12 + 22)')
-        
+        with tt.AssertPrints("-34"):
+            ip.run_cell("print(12 + 22)")
+
         # A named reference to a number shouldn't be transformed.
-        ip.user_ns['n'] = 55
-        with tt.AssertNotPrints('-55'):
-            ip.run_cell('print (n)')
-    
+        ip.user_ns["n"] = 55
+        with tt.AssertNotPrints("-55"):
+            ip.run_cell("print(n)")
+
     def test_timeit(self):
         called = set()
         def f(x):
@@ -796,7 +801,11 @@ def test_run_cell(self):
         # This shouldn't throw an error
         ip.run_cell("o = 2.0")
         self.assertEqual(ip.user_ns['o'], 2.0)
-    
+
+    def test_run_cell_non_int(self):
+        ip.run_cell("n = 'a'")
+        assert self.calls == []
+
     def test_timeit(self):
         called = set()
         def f(x):
@@ -815,14 +824,9 @@ def f(x):
 class ErrorTransformer(ast.NodeTransformer):
     """Throws an error when it sees a number."""
 
-    # for Python 3.7 and earlier
-    def visit_Num(self, node):
-        raise ValueError("test")
-
-    # for Python 3.8+
     def visit_Constant(self, node):
         if isinstance(node.value, int):
-            return self.visit_Num(node)
+            raise ValueError("test")
         return node
 
 
@@ -845,10 +849,6 @@ class StringRejector(ast.NodeTransformer):
     not be executed by throwing an InputRejected.
     """
     
-    #for python 3.7 and earlier
-    def visit_Str(self, node):
-        raise InputRejected("test")
-
     # 3.8 only
     def visit_Constant(self, node):
         if isinstance(node.value, str):

From bd470fe8cea36d6b1c65820e3e9fdb26d26ad422 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 25 Feb 2022 16:08:21 +0100
Subject: [PATCH 1113/1407] release 8.1.0

---
 IPython/core/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index c1c90b13bf2..d67ef21018c 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,7 +20,7 @@
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-# _version_extra = ""  # Uncomment this for full releases
+_version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 5d746502e38426a6b322bc0dd58bef723b02a40e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 25 Feb 2022 16:15:33 +0100
Subject: [PATCH 1114/1407] back to dev

---
 IPython/core/release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index d67ef21018c..1164867ced7 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -16,11 +16,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 8
-_version_minor = 1
+_version_minor = 2
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-_version_extra = ""  # Uncomment this for full releases
+# _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From d73d05141e673b30fe1c081826d50355086a93da Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 26 Feb 2022 07:28:10 -0800
Subject: [PATCH 1115/1407] Revert "Fix for symlink resolving"

---
 IPython/core/interactiveshell.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 85b63755087..6b30a22e3f0 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -785,11 +785,8 @@ def init_virtualenv(self):
         # So we just check every item in the symlink tree (generally <= 3)
         paths = [p]
         while p.is_symlink():
-            new_path = p.readlink()
-            if not new_path.is_absolute():
-                new_path = p.parent / new_path
-            p = new_path
-            paths.append(p)
+            p = Path(os.readlink(p))
+            paths.append(p.resolve())
 
         # In Cygwin paths like "c:\..." and '\cygdrive\c\...' are possible
         if p_venv.parts[1] == "cygdrive":

From ef1c5e7380631215e572619771e4edb69d64ba6c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 26 Feb 2022 16:37:30 +0100
Subject: [PATCH 1116/1407] wn 8.1.1

---
 docs/source/whatsnew/version8.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 02544df0ebe..8bc34f7b498 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -3,6 +3,13 @@
 ============
 
 
+.. _version 8.1.1:
+   
+IPython 8.1.1
+-------------
+
+Revert :ghpull:`13537` (fix an issue with symlinks in virtualenv) that raises an error in Python 3.8.
+
 .. _version 8.1:
 
 IPython 8.1.0
@@ -44,7 +51,7 @@ features listed in :ref:`version 7.32`.
 
  - internal ``appended_to_syspath`` context manager has been deprecated.
 
- - fix an issue with symlinks in virtualenv :ghpull:`13537`
+ - fix an issue with symlinks in virtualenv :ghpull:`13537` (Reverted in 8.1.1)
 
  - Fix an issue with vim mode, where cursor would not be reset on exit :ghpull:`13472`
 

From 506ca3c48b0c0177dc780144f7e68dbdc6d81794 Mon Sep 17 00:00:00 2001
From: Nathan Buckner <nbuckner@roku.com>
Date: Sat, 26 Feb 2022 08:23:48 -0800
Subject: [PATCH 1117/1407] Fix for the path look that's compatible with python
 3.8

---
 IPython/core/interactiveshell.py | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 6b30a22e3f0..dd200e9bf0a 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -758,6 +758,33 @@ def init_displayhook(self):
         # the appropriate time.
         self.display_trap = DisplayTrap(hook=self.displayhook)
 
+    @staticmethod
+    def get_python_link_paths(p: Path):
+        """Gets python paths including symlinks
+
+        Examples
+        --------
+        In [1]: from IPython.core.interactiveshell import InteractiveShell
+
+        In [2]: import sys, pathlib
+
+        In [3]: paths = InteractiveShell.get_python_link_paths(pathlib.Path(sys.executable))
+
+        In [4]: len(paths) == len(set(paths))
+        Out[4]: True
+
+        In [5]: bool(paths)
+        Out[5]: True
+        """
+        paths = [p]
+        while p.is_symlink():
+            new_path = Path(os.readlink(p))
+            if not new_path.is_absolute():
+                new_path = p.parent / new_path
+            p = new_path
+            paths.append(p)
+        return paths
+
     def init_virtualenv(self):
         """Add the current virtualenv to sys.path so the user can import modules from it.
         This isn't perfect: it doesn't use the Python interpreter with which the
@@ -783,10 +810,7 @@ def init_virtualenv(self):
         # stdlib venv may symlink sys.executable, so we can't use realpath.
         # but others can symlink *to* the venv Python, so we can't just use sys.executable.
         # So we just check every item in the symlink tree (generally <= 3)
-        paths = [p]
-        while p.is_symlink():
-            p = Path(os.readlink(p))
-            paths.append(p.resolve())
+        paths = self.get_python_link_paths(p)
 
         # In Cygwin paths like "c:\..." and '\cygdrive\c\...' are possible
         if p_venv.parts[1] == "cygdrive":

From 3e572a4edd6cf36331fa626f4c7d65ed70dbf38a Mon Sep 17 00:00:00 2001
From: Nathan Buckner <nbuckner@roku.com>
Date: Sun, 27 Feb 2022 16:39:20 -0800
Subject: [PATCH 1118/1407] Name of function didn't make sense because it
 doesn't call sys.executable and takes in any path

---
 IPython/core/interactiveshell.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index dd200e9bf0a..93c234fcf91 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -759,8 +759,8 @@ def init_displayhook(self):
         self.display_trap = DisplayTrap(hook=self.displayhook)
 
     @staticmethod
-    def get_python_link_paths(p: Path):
-        """Gets python paths including symlinks
+    def get_path_links(p: Path):
+        """Gets path links including all symlinks
 
         Examples
         --------
@@ -768,7 +768,7 @@ def get_python_link_paths(p: Path):
 
         In [2]: import sys, pathlib
 
-        In [3]: paths = InteractiveShell.get_python_link_paths(pathlib.Path(sys.executable))
+        In [3]: paths = InteractiveShell.get_path_links(pathlib.Path(sys.executable))
 
         In [4]: len(paths) == len(set(paths))
         Out[4]: True
@@ -810,7 +810,7 @@ def init_virtualenv(self):
         # stdlib venv may symlink sys.executable, so we can't use realpath.
         # but others can symlink *to* the venv Python, so we can't just use sys.executable.
         # So we just check every item in the symlink tree (generally <= 3)
-        paths = self.get_python_link_paths(p)
+        paths = self.get_path_links(p)
 
         # In Cygwin paths like "c:\..." and '\cygdrive\c\...' are possible
         if p_venv.parts[1] == "cygdrive":

From 5f648692d8da1737f330b70e8eb97cec1320e9f9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 3 Mar 2022 11:38:54 +0100
Subject: [PATCH 1119/1407] update whats new one moer time

---
 docs/source/whatsnew/version8.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 8bc34f7b498..783011fa74c 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -8,7 +8,10 @@
 IPython 8.1.1
 -------------
 
-Revert :ghpull:`13537` (fix an issue with symlinks in virtualenv) that raises an error in Python 3.8.
+Fix an issue with virtualenv and Python 3.8 introduced in 8.1
+
+Revert :ghpull:`13537` (fix an issue with symlinks in virtualenv) that raises an
+error in Python 3.8, and fixed in a different way in :ghpull:`13559`.
 
 .. _version 8.1:
 

From e9b2ec3bc5372d1ece0e28916cc51ed6bf9625f0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 3 Mar 2022 11:46:27 +0100
Subject: [PATCH 1120/1407] release 8.1.1

---
 IPython/core/release.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 1164867ced7..e4ecf38f0fa 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -16,11 +16,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 8
-_version_minor = 2
-_version_patch = 0
+_version_minor = 1
+_version_patch = 1
 _version_extra = ".dev"
 # _version_extra = "rc1"
-# _version_extra = ""  # Uncomment this for full releases
+_version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 385aad4abd987bda8821849cea85952fe09bbe57 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 3 Mar 2022 11:50:07 +0100
Subject: [PATCH 1121/1407] back to dev

---
 IPython/core/release.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index e4ecf38f0fa..1164867ced7 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -16,11 +16,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 8
-_version_minor = 1
-_version_patch = 1
+_version_minor = 2
+_version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-_version_extra = ""  # Uncomment this for full releases
+# _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 82e6fdcae2c60870da4f03fc654a6a950acc777d Mon Sep 17 00:00:00 2001
From: Yuval <yuval,jacoby1@mail.huji.ac.il>
Date: Thu, 3 Mar 2022 21:22:31 +0200
Subject: [PATCH 1122/1407] Adding and "End" key binding for applying an auto
 suggestion

---
 IPython/terminal/shortcuts.py                         | 11 +++++++++--
 .../whatsnew/pr/end-shortcut-accept-suggestion.rst    |  5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 docs/source/whatsnew/pr/end-shortcut-accept-suggestion.rst

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index b53e5b49a7c..95e956c3f87 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -267,8 +267,7 @@ def ebivim():
     focused_insert_vi = has_focus(DEFAULT_BUFFER) & vi_insert_mode
 
     # Needed for to accept autosuggestions in vi insert mode
-    @kb.add("c-e", filter=focused_insert_vi & ebivim)
-    def _(event):
+    def _apply_autosuggest(event):
         b = event.current_buffer
         suggestion = b.suggestion
         if suggestion:
@@ -276,6 +275,14 @@ def _(event):
         else:
             nc.end_of_line(event)
 
+    @kb.add("end", filter=has_focus(DEFAULT_BUFFER) & ebivim)
+    def _(event):
+        _apply_autosuggest(event)
+      
+    @kb.add("c-e", filter=focused_insert_vi & ebivim)
+    def _(event):
+        _apply_autosuggest(event)
+
     @kb.add("c-f", filter=focused_insert_vi)
     def _(event):
         b = event.current_buffer
diff --git a/docs/source/whatsnew/pr/end-shortcut-accept-suggestion.rst b/docs/source/whatsnew/pr/end-shortcut-accept-suggestion.rst
new file mode 100644
index 00000000000..4fc4c991e37
--- /dev/null
+++ b/docs/source/whatsnew/pr/end-shortcut-accept-suggestion.rst
@@ -0,0 +1,5 @@
+Added shortcut for accepting auto suggestion
+============================================
+
+Added End key shortcut for accepting auto-suggestion
+

From 3d15172f2ecf8368bf12ac68efc2961b63647489 Mon Sep 17 00:00:00 2001
From: Yuval <yuval,jacoby1@mail.huji.ac.il>
Date: Thu, 3 Mar 2022 21:48:42 +0200
Subject: [PATCH 1123/1407] Format according to black/darker

---
 IPython/terminal/shortcuts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 95e956c3f87..ba0cf123be3 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -278,7 +278,7 @@ def _apply_autosuggest(event):
     @kb.add("end", filter=has_focus(DEFAULT_BUFFER) & ebivim)
     def _(event):
         _apply_autosuggest(event)
-      
+
     @kb.add("c-e", filter=focused_insert_vi & ebivim)
     def _(event):
         _apply_autosuggest(event)

From fcb3ee519fc37c9fc2562cf9e1e2b77be6523998 Mon Sep 17 00:00:00 2001
From: john <john@spaceda.space>
Date: Sat, 5 Mar 2022 23:40:46 -0500
Subject: [PATCH 1124/1407] fix minor typo 'if by any chance IPython does not
 the right thing' -> ...IPython does not do the right thing...'

---
 docs/source/interactive/tutorial.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/interactive/tutorial.rst b/docs/source/interactive/tutorial.rst
index 511e7463875..947d6ad4905 100644
--- a/docs/source/interactive/tutorial.rst
+++ b/docs/source/interactive/tutorial.rst
@@ -59,7 +59,7 @@ while some other do not. We'll come to this later.
 Depending on the exact command you are typing you might realize that sometimes
 :kbd:`Enter` will add a new line, and sometimes it will execute the current
 statement. IPython tries to guess what you are doing, so most of the time you
-should not have to care. Though if by any chance IPython does not the right
+should not have to care. Though if by any chance IPython does not do the right
 thing you can force execution of the current code block by pressing in sequence
 :kbd:`Esc` and :kbd:`Enter`. You can also force the insertion of a new line at
 the position of the cursor by using :kbd:`Ctrl-o`.

From 3da97ccfdd6072238a5d8a538adfdf3641573fe6 Mon Sep 17 00:00:00 2001
From: Yuval <yuval,jacoby1@mail.huji.ac.il>
Date: Sun, 6 Mar 2022 13:52:42 +0200
Subject: [PATCH 1125/1407] Adapted binding to when ~ebvim + elaborated on how
 the binding works

---
 IPython/terminal/shortcuts.py                              | 2 +-
 docs/source/whatsnew/pr/end-shortcut-accept-suggestion.rst | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index ba0cf123be3..44007d1a225 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -275,7 +275,7 @@ def _apply_autosuggest(event):
         else:
             nc.end_of_line(event)
 
-    @kb.add("end", filter=has_focus(DEFAULT_BUFFER) & ebivim)
+    @kb.add("end", filter=has_focus(DEFAULT_BUFFER) & (ebivim | ~vi_insert_mode))
     def _(event):
         _apply_autosuggest(event)
 
diff --git a/docs/source/whatsnew/pr/end-shortcut-accept-suggestion.rst b/docs/source/whatsnew/pr/end-shortcut-accept-suggestion.rst
index 4fc4c991e37..c04998e8f3f 100644
--- a/docs/source/whatsnew/pr/end-shortcut-accept-suggestion.rst
+++ b/docs/source/whatsnew/pr/end-shortcut-accept-suggestion.rst
@@ -2,4 +2,6 @@ Added shortcut for accepting auto suggestion
 ============================================
 
 Added End key shortcut for accepting auto-suggestion
+This binding works in Vi mode too, provided 
+TerminalInteractiveShell.emacs_bindings_in_vi_insert_mode is set to be True.
 

From c365d5102d577f75ded01a3d01009e94047cb258 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 10 Mar 2022 08:44:59 +0100
Subject: [PATCH 1126/1407] Typo Manger -> Manager

---
 IPython/core/magic.py             | 2 +-
 docs/source/whatsnew/version7.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 79983df09f2..cedba619378 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -311,7 +311,7 @@ class MagicsManager(Configurable):
 
     For example::
 
-        c.MagicsManger.lazy_magics = {
+        c.MagicsManager.lazy_magics = {
           "my_magic": "slow.to.import",
           "my_other_magic": "also.slow",
         }
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 331db654b58..4dea95d6c78 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -17,7 +17,7 @@ The ability to configure magics to be lazily loaded has been added to IPython.
 See the ``ipython --help-all`` section on ``MagicsManager.lazy_magic``.
 One can now use::
 
-    c.MagicsManger.lazy_magics = {
+    c.MagicsManager.lazy_magics = {
               "my_magic": "slow.to.import",
               "my_other_magic": "also.slow",
     }

From 1c763ce9c8c6b66f3e369005e491314ddf7b026c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 10 Mar 2022 08:55:09 +0100
Subject: [PATCH 1127/1407] Links cleanup, in particular peps have moved

---
 IPython/core/magics/osm.py                        | 2 +-
 docs/source/links.txt                             | 6 +-----
 docs/source/whatsnew/version6.rst                 | 2 +-
 examples/IPython Kernel/Importing Notebooks.ipynb | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index 42ed876ed15..41957a28509 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -127,7 +127,7 @@ def alias(self, parameter_s=''):
         Aliases expand Python variables just like system calls using ! or !!
         do: all expressions prefixed with '$' get expanded.  For details of
         the semantic rules, see PEP-215:
-        https://www.python.org/dev/peps/pep-0215/.  This is the library used by
+        https://peps.python.org/pep-0215/.  This is the library used by
         IPython for variable expansion.  If you want to access a true shell
         variable, an extra $ is necessary to prevent its expansion by
         IPython::
diff --git a/docs/source/links.txt b/docs/source/links.txt
index 9379d1f9357..642389cbf09 100644
--- a/docs/source/links.txt
+++ b/docs/source/links.txt
@@ -20,9 +20,6 @@
 .. _ipython: https://ipython.org
 .. _`ipython manual`: https://ipython.org/documentation.html
 .. _ipython_github: http://github.com/ipython/ipython/
-.. _ipython_github_repo: http://github.com/ipython/ipython/
-.. _ipython_downloads: https://ipython.org/download.html
-.. _ipython_pypi: http://pypi.python.org/pypi/ipython
 .. _nbviewer: http://nbviewer.ipython.org
 
 .. _ZeroMQ: http://zeromq.org
@@ -35,8 +32,7 @@
 .. _reST: http://docutils.sourceforge.net/rst.html
 .. _docutils: http://docutils.sourceforge.net
 .. _lyx: http://www.lyx.org
-.. _pep8: http://www.python.org/dev/peps/pep-0008
-.. _numpy_coding_guide: https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt
+.. _pep8: https://peps.python.org/pep-0008/
 
 .. Licenses
 .. _GPL: http://www.gnu.org/licenses/gpl.html
diff --git a/docs/source/whatsnew/version6.rst b/docs/source/whatsnew/version6.rst
index 461132ecfce..cb3b42dd2f4 100644
--- a/docs/source/whatsnew/version6.rst
+++ b/docs/source/whatsnew/version6.rst
@@ -277,7 +277,7 @@ automatically upgrade to the latest version compatible with your system.
 
 The ability to use only Python 3 on the code base of IPython brings a number
 of advantages. Most of the newly written code make use of `optional function type
-annotation <https://www.python.org/dev/peps/pep-0484/>`_ leading to clearer code
+annotation <https://peps.python.org/pep-0484/>`_ leading to clearer code
 and better documentation.
 
 The total size of the repository has also decreased by about 1500 lines (for the 
diff --git a/examples/IPython Kernel/Importing Notebooks.ipynb b/examples/IPython Kernel/Importing Notebooks.ipynb
index 8a0aac77c7f..9d091aabc44 100644
--- a/examples/IPython Kernel/Importing Notebooks.ipynb	
+++ b/examples/IPython Kernel/Importing Notebooks.ipynb	
@@ -15,7 +15,7 @@
     "This is made difficult by the fact that Notebooks are not plain Python files,\n",
     "and thus cannot be imported by the regular Python machinery.\n",
     "\n",
-    "Fortunately, Python provides some fairly sophisticated [hooks](http://www.python.org/dev/peps/pep-0302/) into the import machinery,\n",
+    "Fortunately, Python provides some fairly sophisticated [hooks](https://peps.python.org/pep-0302/) into the import machinery,\n",
     "so we can actually make IPython notebooks importable without much difficulty,\n",
     "and only using public APIs."
    ]

From 46c63a5ba82fbc030506b23237450d021ef5caa8 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 12 Mar 2022 11:04:27 +0100
Subject: [PATCH 1128/1407] Restore support for etb=None

Closes #13584, #13538
Should close #13586 and #12467
---
 IPython/core/ultratb.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 1f08fa51ed2..96d118f6a23 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -763,7 +763,7 @@ def format_exception_as_a_whole(
         self,
         etype: type,
         evalue: BaseException,
-        etb: TracebackType,
+        etb: Optional[TracebackType],
         number_of_lines_of_context,
         tb_offset: Optional[int],
     ):
@@ -772,7 +772,6 @@ def format_exception_as_a_whole(
         This may be called multiple times by Python 3 exception chaining
         (PEP 3134).
         """
-        assert etb is not None
         # some locals
         orig_etype = etype
         try:
@@ -783,7 +782,9 @@ def format_exception_as_a_whole(
         tb_offset = self.tb_offset if tb_offset is None else tb_offset
         assert isinstance(tb_offset, int)
         head = self.prepare_header(etype, self.long_header)
-        records = self.get_records(etb, number_of_lines_of_context, tb_offset)
+        records = (
+            self.get_records(etb, number_of_lines_of_context, tb_offset) if etb else []
+        )
 
         frames = []
         skipped = 0
@@ -822,6 +823,7 @@ def format_exception_as_a_whole(
     def get_records(
         self, etb: TracebackType, number_of_lines_of_context: int, tb_offset: int
     ):
+        assert etb is not None
         context = number_of_lines_of_context - 1
         after = context // 2
         before = context - after
@@ -836,19 +838,17 @@ def get_records(
             after=after,
             pygments_formatter=formatter,
         )
-        assert etb is not None
         return list(stack_data.FrameInfo.stack_data(etb, options=options))[tb_offset:]
 
     def structured_traceback(
         self,
         etype: type,
         evalue: Optional[BaseException],
-        etb: TracebackType,
+        etb: Optional[TracebackType],
         tb_offset: Optional[int] = None,
         number_of_lines_of_context: int = 5,
     ):
         """Return a nice text document describing the traceback."""
-        assert etb is not None
         formatted_exception = self.format_exception_as_a_whole(etype, evalue, etb, number_of_lines_of_context,
                                                                tb_offset)
 

From 75b3d1cc6d5e1e629705d8a7233a374f1e4235e7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 14 Mar 2022 10:51:57 +0100
Subject: [PATCH 1129/1407] Get history from sql.

Fixes #13585

By getting history from sql we can get the transformed history.
This also skip storing history if `%paste` is used and `%paste` itself
will insert the pasted value in history which is more conveninent.
---
 IPython/core/interactiveshell.py     |  5 ++-
 IPython/terminal/interactiveshell.py | 53 +++++++++++++++++++++-------
 IPython/terminal/magics.py           |  2 +-
 3 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 93c234fcf91..8b8abe13d42 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3042,9 +3042,8 @@ def error_before_exec(value):
                 cell = raw_cell
 
         # Store raw and processed history
-        if store_history:
-            self.history_manager.store_inputs(self.execution_count,
-                                              cell, raw_cell)
+        if store_history and raw_cell.strip(" %") != "paste":
+            self.history_manager.store_inputs(self.execution_count, cell, raw_cell)
         if not silent:
             self.logger.log(cell, raw_cell)
 
diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 212692ab6d1..06724bea870 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -3,12 +3,10 @@
 import asyncio
 import os
 import sys
-import warnings
 from warnings import warn
 
 from IPython.core.async_helpers import get_asyncio_loop
 from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC
-from IPython.utils import io
 from IPython.utils.py3compat import input
 from IPython.utils.terminal import toggle_set_term_title, set_term_title, restore_term_title
 from IPython.utils.process import abbrev_cwd
@@ -32,7 +30,7 @@
 from prompt_toolkit.enums import DEFAULT_BUFFER, EditingMode
 from prompt_toolkit.filters import (HasFocus, Condition, IsDone)
 from prompt_toolkit.formatted_text import PygmentsTokens
-from prompt_toolkit.history import InMemoryHistory
+from prompt_toolkit.history import History
 from prompt_toolkit.layout.processors import ConditionalProcessor, HighlightMatchingBracketProcessor
 from prompt_toolkit.output import ColorDepth
 from prompt_toolkit.patch_stdout import patch_stdout
@@ -132,6 +130,43 @@ def yapf_reformat_handler(text_before_cursor):
         return text_before_cursor
 
 
+class PtkHistoryAdapter(History):
+    """
+    Prompt toolkit has it's own way of handling history, Where it assumes it can
+    Push/pull from history.
+
+    """
+
+    def __init__(self, shell):
+        super().__init__()
+        self.shell = shell
+        self._refresh()
+
+    def append_string(self, string):
+        # we rely on sql for that.
+        self._loaded = False
+        self._refresh()
+
+    def _refresh(self):
+        if not self._loaded:
+            self._loaded_strings = list(self.load_history_strings())
+
+    def load_history_strings(self):
+        last_cell = ""
+        res = []
+        for __, ___, cell in self.shell.history_manager.get_tail(
+            self.shell.history_load_length, include_latest=True
+        ):
+            # Ignore blank lines and consecutive duplicates
+            cell = cell.rstrip()
+            if cell and (cell != last_cell):
+                res.append(cell)
+                last_cell = cell
+        yield from res[::-1]
+
+    def store_string(self, string: str) -> None:
+        pass
+
 class TerminalInteractiveShell(InteractiveShell):
     mime_renderers = Dict().tag(config=True)
 
@@ -397,16 +432,9 @@ def prompt():
         # Set up keyboard shortcuts
         key_bindings = create_ipython_shortcuts(self)
 
+
         # Pre-populate history from IPython's history database
-        history = InMemoryHistory()
-        last_cell = u""
-        for __, ___, cell in self.history_manager.get_tail(self.history_load_length,
-                                                        include_latest=True):
-            # Ignore blank lines and consecutive duplicates
-            cell = cell.rstrip()
-            if cell and (cell != last_cell):
-                history.append_string(cell)
-                last_cell = cell
+        history = PtkHistoryAdapter(self)
 
         self._style = self._make_style_from_name_or_cls(self.highlighting_style)
         self.style = DynamicStyle(lambda: self._style)
@@ -586,7 +614,6 @@ def prompt_for_code(self):
     def enable_win_unicode_console(self):
         # Since IPython 7.10 doesn't support python < 3.6 and PEP 528, Python uses the unicode APIs for the Windows
         # console by default, so WUC shouldn't be needed.
-        from warnings import warn
         warn("`enable_win_unicode_console` is deprecated since IPython 7.10, does not do anything and will be removed in the future",
              DeprecationWarning,
              stacklevel=2)
diff --git a/IPython/terminal/magics.py b/IPython/terminal/magics.py
index 498a05027e5..206ff20a0f8 100644
--- a/IPython/terminal/magics.py
+++ b/IPython/terminal/magics.py
@@ -53,7 +53,7 @@ def store_or_execute(self, block, name):
             self.shell.user_ns['pasted_block'] = b
             self.shell.using_paste_magics = True
             try:
-                self.shell.run_cell(b)
+                self.shell.run_cell(b, store_history=True)
             finally:
                 self.shell.using_paste_magics = False
 

From 64c9adbccf45c19818168e8252f77af569128aef Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 14 Mar 2022 11:05:07 +0100
Subject: [PATCH 1130/1407] pin pytest

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 2da02e4e598..ae2fd9278fb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -63,7 +63,7 @@ qtconsole =
     qtconsole
 terminal =
 test =
-    pytest
+    pytest<7.1
     pytest-asyncio
     testpath
 test_extra =

From 196f7ebed836085bd393b8b724bd99c0cc493649 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 14 Mar 2022 11:15:20 +0100
Subject: [PATCH 1131/1407] fix setup.cfg

---
 setup.cfg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index ae2fd9278fb..2027b531d02 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -67,13 +67,12 @@ test =
     pytest-asyncio
     testpath
 test_extra =
+    %(test)s
     curio
     matplotlib!=3.2.0
     nbformat
     numpy>=1.19
     pandas
-    pytest
-    testpath
     trio
 all =
     %(black)s

From 6c515657207df9b9f41f421b558bbc4349583387 Mon Sep 17 00:00:00 2001
From: Maor Kleinberger <kmaork@gmail.com>
Date: Fri, 25 Mar 2022 17:16:49 +0300
Subject: [PATCH 1132/1407] Fix ctrl-\ behavior

This commit fixes two issues with ctrl-\ when using IPython on linux:
- Previously, pressing ctrl-\ would make IPython exit without resetting the terminal configuration
- IPython users could not override the behavior of ctrl-\ using `signal.signal(signal.SIGQUIT, ...)` as they would in other terminal apps
---
 IPython/terminal/shortcuts.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 44007d1a225..3a0017c101e 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -10,6 +10,7 @@
 import signal
 import sys
 import re
+import os
 from typing import Callable
 
 
@@ -56,7 +57,7 @@ def reformat_and_execute(event):
                             & insert_mode
                                       ))(reformat_and_execute)
 
-    kb.add('c-\\')(force_exit)
+    kb.add("c-\\")(quit)
 
     kb.add('c-p', filter=(vi_insert_mode & has_focus(DEFAULT_BUFFER))
                 )(previous_history_or_previous_completion)
@@ -458,11 +459,16 @@ def reset_search_buffer(event):
 def suspend_to_bg(event):
     event.app.suspend_to_background()
 
-def force_exit(event):
+def quit(event):
     """
-    Force exit (with a non-zero return value)
+    On platforms that support SIGQUIT, send SIGQUIT to the current process.
+    On other platforms, just exit the process with a message.
     """
-    sys.exit("Quit")
+    sigquit = getattr(signal, "SIGQUIT", None)
+    if sigquit is not None:
+        os.kill(0, signal.SIGQUIT)
+    else:
+        sys.exit("Quit")
 
 def indent_buffer(event):
     event.current_buffer.insert_text(' ' * 4)

From ad57192258523877ade1ea4afcbb073735247271 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 26 Mar 2022 10:19:53 +0100
Subject: [PATCH 1133/1407] Attempt at debugging #13598

---
 IPython/core/interactiveshell.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 8b8abe13d42..790a75e7d4e 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1976,10 +1976,19 @@ def showtraceback(self, exc_tuple=None, filename=None, tb_offset=None,
                         # Exception classes can customise their traceback - we
                         # use this in IPython.parallel for exceptions occurring
                         # in the engines. This should return a list of strings.
-                        stb = value._render_traceback_()
+                        if hasattr(value, "_render_traceback_"):
+                            stb = value._render_traceback_()
+                        else:
+                            stb = self.InteractiveTB.structured_traceback(
+                                etype, value, tb, tb_offset=tb_offset
+                            )
+
                     except Exception:
-                        stb = self.InteractiveTB.structured_traceback(etype,
-                                            value, tb, tb_offset=tb_offset)
+                        print(
+                            "Unexpected exception formatting exception. Falling back to standard exception"
+                        )
+                        traceback.print_exc()
+                        return None
 
                     self._showtraceback(etype, value, stb)
                     if self.call_pdb:

From 43fd87866d39b7a25c22fa3e4aeac616e083213d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 27 Mar 2022 09:10:45 +0200
Subject: [PATCH 1134/1407] Move debugger_cls one class higher

---
 IPython/core/ultratb.py | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 146ee568e94..2c9e8e016d4 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -207,7 +207,16 @@ class TBTools(colorable.Colorable):
     # Number of frames to skip when reporting tracebacks
     tb_offset = 0
 
-    def __init__(self, color_scheme='NoColor', call_pdb=False, ostream=None, parent=None, config=None):
+    def __init__(
+        self,
+        color_scheme="NoColor",
+        call_pdb=False,
+        ostream=None,
+        parent=None,
+        config=None,
+        *,
+        debugger_cls=None,
+    ):
         # Whether to call the interactive pdb debugger after printing
         # tracebacks or not
         super(TBTools, self).__init__(parent=parent, config=config)
@@ -227,9 +236,10 @@ def __init__(self, color_scheme='NoColor', call_pdb=False, ostream=None, parent=
 
         self.set_colors(color_scheme)
         self.old_scheme = color_scheme  # save initial value for toggles
+        self.debugger_cls = debugger_cls or debugger.Pdb
 
         if call_pdb:
-            self.pdb = debugger.Pdb()
+            self.pdb = debugger_cls()
         else:
             self.pdb = None
 
@@ -628,8 +638,15 @@ def __init__(
         tb_offset=1 allows use of this handler in interpreters which will have
         their own code at the top of the traceback (VerboseTB will first
         remove that frame before printing the traceback info)."""
-        TBTools.__init__(self, color_scheme=color_scheme, call_pdb=call_pdb,
-                         ostream=ostream, parent=parent, config=config)
+        TBTools.__init__(
+            self,
+            color_scheme=color_scheme,
+            call_pdb=call_pdb,
+            ostream=ostream,
+            parent=parent,
+            config=config,
+            debugger_cls=debugger_cls,
+        )
         self.tb_offset = tb_offset
         self.long_header = long_header
         self.include_vars = include_vars
@@ -642,7 +659,6 @@ def __init__(
             check_cache = linecache.checkcache
         self.check_cache = check_cache
 
-        self.debugger_cls = debugger_cls or debugger.Pdb
         self.skip_hidden = True
 
     def format_record(self, frame_info):
@@ -907,7 +923,7 @@ def debugger(self, force: bool = False):
         fix that by hand after invoking the exception handler."""
 
         if force or self.call_pdb:
-            if self.debugger_cls:
+            if self.pdb is None:
                 self.pdb = self.debugger_cls()
             # the system displayhook may have changed, restore the original
             # for pdb

From d90a85ca4dd8ec1feebffef208b8cf3f8ef22b21 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 27 Mar 2022 09:16:28 +0200
Subject: [PATCH 1135/1407] remove empty __init_

---
 IPython/core/ultratb.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 2c9e8e016d4..a44d5c2d2f1 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -360,9 +360,6 @@ class ListTB(TBTools):
     Because they are meant to be called without a full traceback (only a
     list), instances of this class can't call the interactive pdb debugger."""
 
-    def __init__(self, color_scheme='NoColor', call_pdb=False, ostream=None, parent=None, config=None):
-        TBTools.__init__(self, color_scheme=color_scheme, call_pdb=call_pdb,
-                         ostream=ostream, parent=parent,config=config)
 
     def __call__(self, etype, value, elist):
         self.ostream.flush()

From 9901f306d318442cff61f87378159e0a433f570c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 27 Mar 2022 11:54:20 +0200
Subject: [PATCH 1136/1407] update whatsnew 8.2

---
 docs/source/whatsnew/version8.rst | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 783011fa74c..c2398d5861b 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -3,6 +3,29 @@
 ============
 
 
+.. _version 8.2.0:
+
+IPython 8.2.0
+-------------
+
+IPython 8.2 mostly bring bugfixes to IPython.
+
+ - Auto-suggestion can now be elected with the ``end`` key. :ghpull:`13566`
+ - Some traceback issues with ``assert etb is not None`` have been fixed. :ghpull:`13588`
+ - History is now pulled from the sqitel database and not from in-memory.
+   In particular when using the ``%paste`` magic, the content of the pasted text will
+   be part of the history and not the verbatim text ``%paste`` anymore. :ghpull:`13592`
+ - Fix ``Ctrl-\\`` exit cleanup :ghpull:`13603`
+ - Fixes to ``ultratb`` ipdb support when used outside of IPython. :ghpull:`13498`
+
+
+I am still trying to fix and investigate :ghissue:`13598`, which seem to be
+random, and would appreciate help if you find  reproducible minimal case. I've
+tried to make various changes to the codebase to mitigate it, but a proper fix
+will be difficult without understating the cause.
+
+
+
 .. _version 8.1.1:
    
 IPython 8.1.1

From 6bd2c03d0b2fc6e4e598620debd74493eaee93af Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 27 Mar 2022 12:06:10 +0200
Subject: [PATCH 1137/1407] second whats new update

---
 docs/source/whatsnew/version8.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index c2398d5861b..6630fe6e602 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -22,9 +22,16 @@ IPython 8.2 mostly bring bugfixes to IPython.
 I am still trying to fix and investigate :ghissue:`13598`, which seem to be
 random, and would appreciate help if you find  reproducible minimal case. I've
 tried to make various changes to the codebase to mitigate it, but a proper fix
-will be difficult without understating the cause.
+will be difficult without understanding the cause.
 
 
+All the issues on pull-requests for this release can be found in the `8.2
+milestone. <https://github.com/ipython/ipython/milestone/100>`__ . And some
+documentation only PR can be found as part of the `7.33 milestone
+<https://github.com/ipython/ipython/milestone/101>`__ (currently not released).
+
+Thanks to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries.
 
 .. _version 8.1.1:
    

From b5cd02544acd3e3e3a32872700954025a6b6916b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 27 Mar 2022 12:08:49 +0200
Subject: [PATCH 1138/1407] release 8.2.0

---
 IPython/core/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 1164867ced7..0483150bf46 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,7 +20,7 @@
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-# _version_extra = ""  # Uncomment this for full releases
+_version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 669396ae9e948f9d673527051a0a453bcfd1db94 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 27 Mar 2022 12:09:33 +0200
Subject: [PATCH 1139/1407] back to dev

---
 IPython/core/release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 0483150bf46..ae19fa66f18 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -16,11 +16,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 8
-_version_minor = 2
+_version_minor = 3
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-_version_extra = ""  # Uncomment this for full releases
+# _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 42309de567484cde5225f03d77e15e9edefbf4b6 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Sun, 27 Mar 2022 19:09:13 +0200
Subject: [PATCH 1140/1407] Remove unused 'chain' import from setup.py

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index 159f8f2cbc9..5614d3ef8c8 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,6 @@
 
 import os
 import sys
-from itertools import chain
 
 # **Python version check**
 #

From bc12e6dcb215cb6cea47f57f7a58ecf3a89e3b56 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Mon, 4 Apr 2022 21:22:12 +0200
Subject: [PATCH 1141/1407] Fix empty autosuggestions bugging out the end key

The `nc.end_of_line(event)` line was never triggered. During writing this,
the `Suggestion` class from prompt-toolkit has no `__bool__` implemented,
which meant its objects always evaluate to `True`, even if
`b.suggestion.text == ''`.

The above resulted in the end key being unusable after an
autosuggestion has been accepted by the user.
---
 IPython/terminal/shortcuts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 3a0017c101e..615397abc5f 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -271,7 +271,7 @@ def ebivim():
     def _apply_autosuggest(event):
         b = event.current_buffer
         suggestion = b.suggestion
-        if suggestion:
+        if suggestion is not None and suggestion.text:
             b.insert_text(suggestion.text)
         else:
             nc.end_of_line(event)

From 199b25bc5ba2a9c1e575a82abc9323b6a87173ee Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 22 Mar 2022 16:53:44 +0100
Subject: [PATCH 1142/1407] Allow to get cellid from ipykernel

Other side of https://github.com/ipython/ipykernel/pull/886

half of https://github.com/ipython/ipython/issues/13579
---
 IPython/core/completer.py        |  2 +-
 IPython/core/interactiveshell.py | 52 ++++++++++++++++++++++++--------
 IPython/lib/display.py           |  4 +--
 IPython/terminal/ipapp.py        |  2 +-
 4 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 0579e684e81..5a00f2c83a0 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -41,7 +41,7 @@
 
 Only valid Python identifiers will complete. Combining characters (like arrow or
 dots) are also available, unlike latex they need to be put after the their
-counterpart that is to say, `F\\\\vec<tab>` is correct, not `\\\\vec<tab>F`.
+counterpart that is to say, ``F\\\\vec<tab>`` is correct, not ``\\\\vec<tab>F``.
 
 Some browsers are known to display combining characters incorrectly.
 
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 790a75e7d4e..ea9f6310ba5 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -199,19 +199,29 @@ class ExecutionInfo(object):
     store_history = False
     silent = False
     shell_futures = True
+    cell_id = None
 
-    def __init__(self, raw_cell, store_history, silent, shell_futures):
+    def __init__(self, raw_cell, store_history, silent, shell_futures, cell_id):
         self.raw_cell = raw_cell
         self.store_history = store_history
         self.silent = silent
         self.shell_futures = shell_futures
+        self.cell_id = cell_id
 
     def __repr__(self):
         name = self.__class__.__qualname__
-        raw_cell = ((self.raw_cell[:50] + '..')
-                    if len(self.raw_cell) > 50 else self.raw_cell)
-        return '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s>' %\
-               (name, id(self), raw_cell, self.store_history, self.silent, self.shell_futures)
+        raw_cell = (
+            (self.raw_cell[:50] + "..") if len(self.raw_cell) > 50 else self.raw_cell
+        )
+        return '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s cell_id=%s>' % (
+            name,
+            id(self),
+            raw_cell,
+            self.store_history,
+            self.silent,
+            self.shell_futures,
+            self.cell_id,
+        )
 
 
 class ExecutionResult(object):
@@ -2834,7 +2844,14 @@ def safe_run_module(self, mod_name, where):
             self.showtraceback()
             warn('Unknown failure executing module: <%s>' % mod_name)
 
-    def run_cell(self, raw_cell, store_history=False, silent=False, shell_futures=True):
+    def run_cell(
+        self,
+        raw_cell,
+        store_history=False,
+        silent=False,
+        shell_futures=True,
+        cell_id=None,
+    ):
         """Run a complete IPython cell.
 
         Parameters
@@ -2861,14 +2878,22 @@ def run_cell(self, raw_cell, store_history=False, silent=False, shell_futures=Tr
         result = None
         try:
             result = self._run_cell(
-                raw_cell, store_history, silent, shell_futures)
+                raw_cell, store_history, silent, shell_futures, cell_id
+            )
         finally:
             self.events.trigger('post_execute')
             if not silent:
                 self.events.trigger('post_run_cell', result)
         return result
 
-    def _run_cell(self, raw_cell:str, store_history:bool, silent:bool, shell_futures:bool) -> ExecutionResult:
+    def _run_cell(
+        self,
+        raw_cell: str,
+        store_history: bool,
+        silent: bool,
+        shell_futures: bool,
+        cell_id: str,
+    ) -> ExecutionResult:
         """Internal method to run a complete IPython cell."""
 
         # we need to avoid calling self.transform_cell multiple time on the same thing
@@ -2888,6 +2913,7 @@ def _run_cell(self, raw_cell:str, store_history:bool, silent:bool, shell_futures
             shell_futures=shell_futures,
             transformed_cell=transformed_cell,
             preprocessing_exc_tuple=preprocessing_exc_tuple,
+            cell_id=cell_id,
         )
 
         # run_cell_async is async, but may not actually need an eventloop.
@@ -2908,7 +2934,9 @@ def _run_cell(self, raw_cell:str, store_history:bool, silent:bool, shell_futures
         try:
             return runner(coro)
         except BaseException as e:
-            info = ExecutionInfo(raw_cell, store_history, silent, shell_futures)
+            info = ExecutionInfo(
+                raw_cell, store_history, silent, shell_futures, cell_id
+            )
             result = ExecutionResult(info)
             result.error_in_exec = e
             self.showtraceback(running_compiled_code=True)
@@ -2964,7 +2992,8 @@ async def run_cell_async(
         shell_futures=True,
         *,
         transformed_cell: Optional[str] = None,
-        preprocessing_exc_tuple: Optional[Any] = None
+        preprocessing_exc_tuple: Optional[Any] = None,
+        cell_id=None,
     ) -> ExecutionResult:
         """Run a complete IPython cell asynchronously.
 
@@ -2995,8 +3024,7 @@ async def run_cell_async(
 
         .. versionadded:: 7.0
         """
-        info = ExecutionInfo(
-            raw_cell, store_history, silent, shell_futures)
+        info = ExecutionInfo(raw_cell, store_history, silent, shell_futures, cell_id)
         result = ExecutionResult(info)
 
         if (not raw_cell) or raw_cell.isspace():
diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index 52060da37f3..4481683c4a0 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -92,8 +92,8 @@ class Audio(DisplayObject):
 
     From a File:
 
-    >>> Audio('/path/to/sound.wav')  # doctest: +SKIP
-    >>> Audio(filename='/path/to/sound.ogg')  # doctest: +SKIP
+    >>> Audio('IPython/lib/tests/test.wav')  # doctest: +SKIP
+    >>> Audio(filename='IPython/lib/tests/test.wav')  # doctest: +SKIP
 
     From Bytes:
 
diff --git a/IPython/terminal/ipapp.py b/IPython/terminal/ipapp.py
index e735a209255..a87eb2f4434 100755
--- a/IPython/terminal/ipapp.py
+++ b/IPython/terminal/ipapp.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
 """
-The :class:`~IPython.core.application.Application` object for the command
+The :class:`~traitlets.config.application.Application` object for the command
 line :command:`ipython` program.
 """
 

From f3957c0fa08df8aa87f0a21435557d11f6903624 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 5 Apr 2022 13:59:12 +0200
Subject: [PATCH 1143/1407] docs

---
 docs/source/config/callbacks.rst  | 32 ++++++++++++++++++++++---------
 docs/source/whatsnew/version8.rst |  8 ++++++++
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/docs/source/config/callbacks.rst b/docs/source/config/callbacks.rst
index 6c75c731b0e..60c7aba4a35 100644
--- a/docs/source/config/callbacks.rst
+++ b/docs/source/config/callbacks.rst
@@ -17,22 +17,29 @@ For example::
         def __init__(self, ip):
             self.shell = ip
             self.last_x = None
-        
+
         def pre_execute(self):
             self.last_x = self.shell.user_ns.get('x', None)
-        
+
         def pre_run_cell(self, info):
-            print('Cell code: "%s"' % info.raw_cell)
-        
+            print('info.raw_cell =', info.raw_cell)
+            print('info.store_history =', info.store_history)
+            print('info.silent =', info.silent)
+            print('info.shell_futures =', info.shell_futures)
+            print('info.cell_id =', info.cell_id)
+            print(dir(info))
+
         def post_execute(self):
             if self.shell.user_ns.get('x', None) != self.last_x:
                 print("x changed!")
-        
+
         def post_run_cell(self, result):
-            print('Cell code: "%s"' % result.info.raw_cell)
-            if result.error_before_exec:
-                print('Error before execution: %s' % result.error_before_exec)
-        
+            print('result.execution_count = ', result.execution_count)
+            print('result.error_before_exec = ', result.error_before_exec)
+            print('result.error_in_exec = ', result.error_in_exec)
+            print('result.info = ', result.info)
+            print('result.result = ', result.result)
+
     def load_ipython_extension(ip):
         vw = VarWatcher(ip)
         ip.events.register('pre_execute', vw.pre_execute)
@@ -40,6 +47,13 @@ For example::
         ip.events.register('post_execute', vw.post_execute)
         ip.events.register('post_run_cell', vw.post_run_cell)
 
+.. versionadded:: 8.3
+
+   Since IPython 8.3 and ipykernel 6.12.1, the ``info`` objects in the callback
+   now have a the ``cell_id`` that will be set to the value sent by the
+   frontened, when those send it.
+
+
 
 Events
 ======
diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 6630fe6e602..b557eb1935b 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -3,6 +3,14 @@
 ============
 
 
+.. _version 8.3.0:
+
+IPython 8.3.0
+-------------
+
+ - :ghpull:`13600`, ``pre_run_*``-hooks will now have a ``cell_id`` attribute on
+   the info object when frontend provide it.
+
 .. _version 8.2.0:
 
 IPython 8.2.0

From 32c393b6babeb82dab97aa4f2ac73edc358b4ebf Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 5 Apr 2022 14:06:44 +0200
Subject: [PATCH 1144/1407] Remove set-next input when triggering help.

This was a long standing feature from when the main way to edit code was
readline. Now that we have proper history and editing frontend,
including prompt toolkit this is not necessary, especially since it
creates issue like in JupyterLab.

Should close #13602
---
 IPython/core/inputtransformer.py             |  20 +-
 IPython/core/inputtransformer2.py            |  16 +-
 IPython/core/tests/test_inputtransformer.py  | 189 +++++++++----------
 IPython/core/tests/test_inputtransformer2.py | 167 +++++++++-------
 docs/source/whatsnew/version8.rst            |   5 +
 5 files changed, 207 insertions(+), 190 deletions(-)

diff --git a/IPython/core/inputtransformer.py b/IPython/core/inputtransformer.py
index f668f466aae..77f69f388f8 100644
--- a/IPython/core/inputtransformer.py
+++ b/IPython/core/inputtransformer.py
@@ -193,7 +193,7 @@ def assemble_logical_lines():
         line = ''.join(parts)
 
 # Utilities
-def _make_help_call(target, esc, lspace, next_input=None):
+def _make_help_call(target, esc, lspace):
     """Prepares a pinfo(2)/psearch call from a target name and the escape
     (i.e. ? or ??)"""
     method  = 'pinfo2' if esc == '??' \
@@ -203,12 +203,13 @@ def _make_help_call(target, esc, lspace, next_input=None):
     #Prepare arguments for get_ipython().run_line_magic(magic_name, magic_args)
     t_magic_name, _, t_magic_arg_s = arg.partition(' ')
     t_magic_name = t_magic_name.lstrip(ESC_MAGIC)
-    if next_input is None:
-        return '%sget_ipython().run_line_magic(%r, %r)' % (lspace, t_magic_name, t_magic_arg_s)
-    else:
-        return '%sget_ipython().set_next_input(%r);get_ipython().run_line_magic(%r, %r)' % \
-           (lspace, next_input, t_magic_name, t_magic_arg_s)
-    
+    return "%sget_ipython().run_line_magic(%r, %r)" % (
+        lspace,
+        t_magic_name,
+        t_magic_arg_s,
+    )
+
+
 # These define the transformations for the different escape characters.
 def _tr_system(line_info):
     "Translate lines escaped with: !"
@@ -349,10 +350,7 @@ def help_end(line):
     esc = m.group(3)
     lspace = _initial_space_re.match(line).group(0)
 
-    # If we're mid-command, put it back on the next prompt for the user.
-    next_input = line.rstrip('?') if line.strip() != m.group(0) else None
-
-    return _make_help_call(target, esc, lspace, next_input)
+    return _make_help_call(target, esc, lspace)
 
 
 @CoroutineInputTransformer.wrap
diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index 3a560073b22..a8f676f4952 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -325,7 +325,7 @@ def transform(self, lines: List[str]):
 ESCAPE_SINGLES = {'!', '?', '%', ',', ';', '/'}
 ESCAPE_DOUBLES = {'!!', '??'}  # %% (cell magic) is handled separately
 
-def _make_help_call(target, esc, next_input=None):
+def _make_help_call(target, esc):
     """Prepares a pinfo(2)/psearch call from a target name and the escape
     (i.e. ? or ??)"""
     method  = 'pinfo2' if esc == '??' \
@@ -335,11 +335,8 @@ def _make_help_call(target, esc, next_input=None):
     #Prepare arguments for get_ipython().run_line_magic(magic_name, magic_args)
     t_magic_name, _, t_magic_arg_s = arg.partition(' ')
     t_magic_name = t_magic_name.lstrip(ESC_MAGIC)
-    if next_input is None:
-        return 'get_ipython().run_line_magic(%r, %r)' % (t_magic_name, t_magic_arg_s)
-    else:
-        return 'get_ipython().set_next_input(%r);get_ipython().run_line_magic(%r, %r)' % \
-           (next_input, t_magic_name, t_magic_arg_s)
+    return "get_ipython().run_line_magic(%r, %r)" % (t_magic_name, t_magic_arg_s)
+
 
 def _tr_help(content):
     """Translate lines escaped with: ?
@@ -480,13 +477,8 @@ def transform(self, lines):
         target = m.group(1)
         esc = m.group(3)
 
-        # If we're mid-command, put it back on the next prompt for the user.
-        next_input = None
-        if (not lines_before) and (not lines_after) \
-                and content.strip() != m.group(0):
-            next_input = content.rstrip('?\n')
 
-        call = _make_help_call(target, esc, next_input=next_input)
+        call = _make_help_call(target, esc)
         new_line = indent + call + '\n'
 
         return lines_before + [new_line] + lines_after
diff --git a/IPython/core/tests/test_inputtransformer.py b/IPython/core/tests/test_inputtransformer.py
index 4de97b87cb8..bfc936d3176 100644
--- a/IPython/core/tests/test_inputtransformer.py
+++ b/IPython/core/tests/test_inputtransformer.py
@@ -59,108 +59,93 @@ def transform_checker(tests, transformer, **kwargs):
         ('x=1', 'x=1'), # normal input is unmodified
         ('    ','    '),  # blank lines are kept intact
         ("a, b = %foo", "a, b = get_ipython().run_line_magic('foo', '')"),
-        ],
-
-       classic_prompt =
-       [('>>> x=1', 'x=1'),
-        ('x=1', 'x=1'), # normal input is unmodified
-        ('    ', '    '),  # blank lines are kept intact
-        ],
-
-       ipy_prompt =
-       [('In [1]: x=1', 'x=1'),
-        ('x=1', 'x=1'), # normal input is unmodified
-        ('    ','    '),  # blank lines are kept intact
-        ],
-
-       # Tests for the escape transformer to leave normal code alone
-       escaped_noesc =
-       [ ('    ', '    '),
-         ('x=1', 'x=1'),
-         ],
-
-       # System calls
-       escaped_shell =
-       [ ('!ls', "get_ipython().system('ls')"),
-         # Double-escape shell, this means to capture the output of the
-         # subprocess and return it
-         ('!!ls', "get_ipython().getoutput('ls')"),
-         ],
-
-       # Help/object info
-       escaped_help =
-       [ ('?', 'get_ipython().show_usage()'),
-         ('?x1', "get_ipython().run_line_magic('pinfo', 'x1')"),
-         ('??x2', "get_ipython().run_line_magic('pinfo2', 'x2')"),
-         ('?a.*s', "get_ipython().run_line_magic('psearch', 'a.*s')"),
-         ('?%hist1', "get_ipython().run_line_magic('pinfo', '%hist1')"),
-         ('?%%hist2', "get_ipython().run_line_magic('pinfo', '%%hist2')"),
-         ('?abc = qwe', "get_ipython().run_line_magic('pinfo', 'abc')"),
-         ],
-
-      end_help =
-      [ ('x3?', "get_ipython().run_line_magic('pinfo', 'x3')"),
-        ('x4??', "get_ipython().run_line_magic('pinfo2', 'x4')"),
-        ('%hist1?', "get_ipython().run_line_magic('pinfo', '%hist1')"),
-        ('%hist2??', "get_ipython().run_line_magic('pinfo2', '%hist2')"),
-        ('%%hist3?', "get_ipython().run_line_magic('pinfo', '%%hist3')"),
-        ('%%hist4??', "get_ipython().run_line_magic('pinfo2', '%%hist4')"),
-        ('π.foo?', "get_ipython().run_line_magic('pinfo', 'π.foo')"),
-        ('f*?', "get_ipython().run_line_magic('psearch', 'f*')"),
-        ('ax.*aspe*?', "get_ipython().run_line_magic('psearch', 'ax.*aspe*')"),
-        ('a = abc?', "get_ipython().set_next_input('a = abc');"
-                      "get_ipython().run_line_magic('pinfo', 'abc')"),
-        ('a = abc.qe??', "get_ipython().set_next_input('a = abc.qe');"
-                          "get_ipython().run_line_magic('pinfo2', 'abc.qe')"),
-        ('a = *.items?', "get_ipython().set_next_input('a = *.items');"
-                          "get_ipython().run_line_magic('psearch', '*.items')"),
-        ('plot(a?', "get_ipython().set_next_input('plot(a');"
-                     "get_ipython().run_line_magic('pinfo', 'a')"),
-        ('a*2 #comment?', 'a*2 #comment?'),
-        ],
-
-       # Explicit magic calls
-       escaped_magic =
-       [ ('%cd', "get_ipython().run_line_magic('cd', '')"),
-         ('%cd /home', "get_ipython().run_line_magic('cd', '/home')"),
-         # Backslashes need to be escaped.
-         ('%cd C:\\User', "get_ipython().run_line_magic('cd', 'C:\\\\User')"),
-         ('    %magic', "    get_ipython().run_line_magic('magic', '')"),
-         ],
-
-       # Quoting with separate arguments
-       escaped_quote =
-       [ (',f', 'f("")'),
-         (',f x', 'f("x")'),
-         ('  ,f y', '  f("y")'),
-         (',f a b', 'f("a", "b")'),
-         ],
-
-       # Quoting with single argument
-       escaped_quote2 =
-       [ (';f', 'f("")'),
-         (';f x', 'f("x")'),
-         ('  ;f y', '  f("y")'),
-         (';f a b', 'f("a b")'),
-         ],
-
-       # Simply apply parens
-       escaped_paren =
-       [ ('/f', 'f()'),
-         ('/f x', 'f(x)'),
-         ('  /f y', '  f(y)'),
-         ('/f a b', 'f(a, b)'),
-         ],
-
-       # Check that we transform prompts before other transforms
-       mixed =
-       [ ('In [1]: %lsmagic', "get_ipython().run_line_magic('lsmagic', '')"),
-         ('>>> %lsmagic', "get_ipython().run_line_magic('lsmagic', '')"),
-         ('In [2]: !ls', "get_ipython().system('ls')"),
-         ('In [3]: abs?', "get_ipython().run_line_magic('pinfo', 'abs')"),
-         ('In [4]: b = %who', "b = get_ipython().run_line_magic('who', '')"),
-         ],
-       )
+    ],
+    classic_prompt=[
+        (">>> x=1", "x=1"),
+        ("x=1", "x=1"),  # normal input is unmodified
+        ("    ", "    "),  # blank lines are kept intact
+    ],
+    ipy_prompt=[
+        ("In [1]: x=1", "x=1"),
+        ("x=1", "x=1"),  # normal input is unmodified
+        ("    ", "    "),  # blank lines are kept intact
+    ],
+    # Tests for the escape transformer to leave normal code alone
+    escaped_noesc=[
+        ("    ", "    "),
+        ("x=1", "x=1"),
+    ],
+    # System calls
+    escaped_shell=[
+        ("!ls", "get_ipython().system('ls')"),
+        # Double-escape shell, this means to capture the output of the
+        # subprocess and return it
+        ("!!ls", "get_ipython().getoutput('ls')"),
+    ],
+    # Help/object info
+    escaped_help=[
+        ("?", "get_ipython().show_usage()"),
+        ("?x1", "get_ipython().run_line_magic('pinfo', 'x1')"),
+        ("??x2", "get_ipython().run_line_magic('pinfo2', 'x2')"),
+        ("?a.*s", "get_ipython().run_line_magic('psearch', 'a.*s')"),
+        ("?%hist1", "get_ipython().run_line_magic('pinfo', '%hist1')"),
+        ("?%%hist2", "get_ipython().run_line_magic('pinfo', '%%hist2')"),
+        ("?abc = qwe", "get_ipython().run_line_magic('pinfo', 'abc')"),
+    ],
+    end_help=[
+        ("x3?", "get_ipython().run_line_magic('pinfo', 'x3')"),
+        ("x4??", "get_ipython().run_line_magic('pinfo2', 'x4')"),
+        ("%hist1?", "get_ipython().run_line_magic('pinfo', '%hist1')"),
+        ("%hist2??", "get_ipython().run_line_magic('pinfo2', '%hist2')"),
+        ("%%hist3?", "get_ipython().run_line_magic('pinfo', '%%hist3')"),
+        ("%%hist4??", "get_ipython().run_line_magic('pinfo2', '%%hist4')"),
+        ("π.foo?", "get_ipython().run_line_magic('pinfo', 'π.foo')"),
+        ("f*?", "get_ipython().run_line_magic('psearch', 'f*')"),
+        ("ax.*aspe*?", "get_ipython().run_line_magic('psearch', 'ax.*aspe*')"),
+        ("a = abc?", "get_ipython().run_line_magic('pinfo', 'abc')"),
+        ("a = abc.qe??", "get_ipython().run_line_magic('pinfo2', 'abc.qe')"),
+        ("a = *.items?", "get_ipython().run_line_magic('psearch', '*.items')"),
+        ("plot(a?", "get_ipython().run_line_magic('pinfo', 'a')"),
+        ("a*2 #comment?", "a*2 #comment?"),
+    ],
+    # Explicit magic calls
+    escaped_magic=[
+        ("%cd", "get_ipython().run_line_magic('cd', '')"),
+        ("%cd /home", "get_ipython().run_line_magic('cd', '/home')"),
+        # Backslashes need to be escaped.
+        ("%cd C:\\User", "get_ipython().run_line_magic('cd', 'C:\\\\User')"),
+        ("    %magic", "    get_ipython().run_line_magic('magic', '')"),
+    ],
+    # Quoting with separate arguments
+    escaped_quote=[
+        (",f", 'f("")'),
+        (",f x", 'f("x")'),
+        ("  ,f y", '  f("y")'),
+        (",f a b", 'f("a", "b")'),
+    ],
+    # Quoting with single argument
+    escaped_quote2=[
+        (";f", 'f("")'),
+        (";f x", 'f("x")'),
+        ("  ;f y", '  f("y")'),
+        (";f a b", 'f("a b")'),
+    ],
+    # Simply apply parens
+    escaped_paren=[
+        ("/f", "f()"),
+        ("/f x", "f(x)"),
+        ("  /f y", "  f(y)"),
+        ("/f a b", "f(a, b)"),
+    ],
+    # Check that we transform prompts before other transforms
+    mixed=[
+        ("In [1]: %lsmagic", "get_ipython().run_line_magic('lsmagic', '')"),
+        (">>> %lsmagic", "get_ipython().run_line_magic('lsmagic', '')"),
+        ("In [2]: !ls", "get_ipython().system('ls')"),
+        ("In [3]: abs?", "get_ipython().run_line_magic('pinfo', 'abs')"),
+        ("In [4]: b = %who", "b = get_ipython().run_line_magic('who', '')"),
+    ],
+)
 
 # multiline syntax examples.  Each of these should be a list of lists, with
 # each entry itself having pairs of raw/transformed input.  The union (with
diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index abc63031d3a..0613dc02c93 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -14,45 +14,65 @@
 from IPython.core import inputtransformer2 as ipt2
 from IPython.core.inputtransformer2 import _find_assign_op, make_tokens_by_line
 
-MULTILINE_MAGIC = ("""\
+MULTILINE_MAGIC = (
+    """\
 a = f()
 %foo \\
 bar
 g()
-""".splitlines(keepends=True), (2, 0), """\
+""".splitlines(
+        keepends=True
+    ),
+    (2, 0),
+    """\
 a = f()
 get_ipython().run_line_magic('foo', ' bar')
 g()
-""".splitlines(keepends=True))
+""".splitlines(
+        keepends=True
+    ),
+)
 
-INDENTED_MAGIC = ("""\
+INDENTED_MAGIC = (
+    """\
 for a in range(5):
     %ls
-""".splitlines(keepends=True), (2, 4), """\
+""".splitlines(
+        keepends=True
+    ),
+    (2, 4),
+    """\
 for a in range(5):
     get_ipython().run_line_magic('ls', '')
-""".splitlines(keepends=True))
+""".splitlines(
+        keepends=True
+    ),
+)
 
-CRLF_MAGIC = ([
-    "a = f()\n",
-    "%ls\r\n",
-    "g()\n"
-], (2, 0), [
-    "a = f()\n",
-    "get_ipython().run_line_magic('ls', '')\n",
-    "g()\n"
-])
-
-MULTILINE_MAGIC_ASSIGN = ("""\
+CRLF_MAGIC = (
+    ["a = f()\n", "%ls\r\n", "g()\n"],
+    (2, 0),
+    ["a = f()\n", "get_ipython().run_line_magic('ls', '')\n", "g()\n"],
+)
+
+MULTILINE_MAGIC_ASSIGN = (
+    """\
 a = f()
 b = %foo \\
   bar
 g()
-""".splitlines(keepends=True), (2, 4), """\
+""".splitlines(
+        keepends=True
+    ),
+    (2, 4),
+    """\
 a = f()
 b = get_ipython().run_line_magic('foo', '   bar')
 g()
-""".splitlines(keepends=True))
+""".splitlines(
+        keepends=True
+    ),
+)
 
 MULTILINE_SYSTEM_ASSIGN = ("""\
 a = f()
@@ -72,68 +92,70 @@ def test():
   for i in range(1):
     print(i)
   res =! ls
-""".splitlines(keepends=True), (4, 7), '''\
+""".splitlines(
+        keepends=True
+    ),
+    (4, 7),
+    """\
 def test():
   for i in range(1):
     print(i)
   res =get_ipython().getoutput(\' ls\')
-'''.splitlines(keepends=True))
+""".splitlines(
+        keepends=True
+    ),
+)
 
 ######
 
-AUTOCALL_QUOTE = (
-    [",f 1 2 3\n"], (1, 0),
-    ['f("1", "2", "3")\n']
-)
+AUTOCALL_QUOTE = ([",f 1 2 3\n"], (1, 0), ['f("1", "2", "3")\n'])
 
-AUTOCALL_QUOTE2 = (
-    [";f 1 2 3\n"], (1, 0),
-    ['f("1 2 3")\n']
-)
+AUTOCALL_QUOTE2 = ([";f 1 2 3\n"], (1, 0), ['f("1 2 3")\n'])
 
-AUTOCALL_PAREN = (
-    ["/f 1 2 3\n"], (1, 0),
-    ['f(1, 2, 3)\n']
-)
+AUTOCALL_PAREN = (["/f 1 2 3\n"], (1, 0), ["f(1, 2, 3)\n"])
 
-SIMPLE_HELP = (
-    ["foo?\n"], (1, 0),
-    ["get_ipython().run_line_magic('pinfo', 'foo')\n"]
-)
+SIMPLE_HELP = (["foo?\n"], (1, 0), ["get_ipython().run_line_magic('pinfo', 'foo')\n"])
 
 DETAILED_HELP = (
-    ["foo??\n"], (1, 0),
-    ["get_ipython().run_line_magic('pinfo2', 'foo')\n"]
+    ["foo??\n"],
+    (1, 0),
+    ["get_ipython().run_line_magic('pinfo2', 'foo')\n"],
 )
 
-MAGIC_HELP = (
-    ["%foo?\n"], (1, 0),
-    ["get_ipython().run_line_magic('pinfo', '%foo')\n"]
-)
+MAGIC_HELP = (["%foo?\n"], (1, 0), ["get_ipython().run_line_magic('pinfo', '%foo')\n"])
 
 HELP_IN_EXPR = (
-    ["a = b + c?\n"], (1, 0),
-    ["get_ipython().set_next_input('a = b + c');"
-     "get_ipython().run_line_magic('pinfo', 'c')\n"]
+    ["a = b + c?\n"],
+    (1, 0),
+    ["get_ipython().run_line_magic('pinfo', 'c')\n"],
 )
 
-HELP_CONTINUED_LINE = ("""\
+HELP_CONTINUED_LINE = (
+    """\
 a = \\
 zip?
-""".splitlines(keepends=True), (1, 0),
-[r"get_ipython().set_next_input('a = \\\nzip');get_ipython().run_line_magic('pinfo', 'zip')" + "\n"]
+""".splitlines(
+        keepends=True
+    ),
+    (1, 0),
+    [r"get_ipython().run_line_magic('pinfo', 'zip')" + "\n"],
 )
 
-HELP_MULTILINE = ("""\
+HELP_MULTILINE = (
+    """\
 (a,
 b) = zip?
-""".splitlines(keepends=True), (1, 0),
-[r"get_ipython().set_next_input('(a,\nb) = zip');get_ipython().run_line_magic('pinfo', 'zip')" + "\n"]
+""".splitlines(
+        keepends=True
+    ),
+    (1, 0),
+    [r"get_ipython().run_line_magic('pinfo', 'zip')" + "\n"],
 )
 
 HELP_UNICODE = (
-    ["π.foo?\n"], (1, 0),
-    ["get_ipython().run_line_magic('pinfo', 'π.foo')\n"]
+    ["π.foo?\n"],
+    (1, 0),
+    ["get_ipython().run_line_magic('pinfo', 'π.foo')\n"],
 )
 
 
@@ -149,6 +171,7 @@ def test_check_make_token_by_line_never_ends_empty():
     Check that not sequence of single or double characters ends up leading to en empty list of tokens
     """
     from string import printable
+
     for c in printable:
         assert make_tokens_by_line(c)[-1] != []
         for k in printable:
@@ -156,7 +179,7 @@ def test_check_make_token_by_line_never_ends_empty():
 
 
 def check_find(transformer, case, match=True):
-    sample, expected_start, _  = case
+    sample, expected_start, _ = case
     tbl = make_tokens_by_line(sample)
     res = transformer.find(tbl)
     if match:
@@ -166,25 +189,30 @@ def check_find(transformer, case, match=True):
     else:
         assert res is None
 
+
 def check_transform(transformer_cls, case):
     lines, start, expected = case
     transformer = transformer_cls(start)
     assert transformer.transform(lines) == expected
 
+
 def test_continued_line():
     lines = MULTILINE_MAGIC_ASSIGN[0]
     assert ipt2.find_end_of_continued_line(lines, 1) == 2
 
     assert ipt2.assemble_continued_line(lines, (1, 5), 2) == "foo    bar"
 
+
 def test_find_assign_magic():
     check_find(ipt2.MagicAssign, MULTILINE_MAGIC_ASSIGN)
     check_find(ipt2.MagicAssign, MULTILINE_SYSTEM_ASSIGN, match=False)
     check_find(ipt2.MagicAssign, MULTILINE_SYSTEM_ASSIGN_AFTER_DEDENT, match=False)
 
+
 def test_transform_assign_magic():
     check_transform(ipt2.MagicAssign, MULTILINE_MAGIC_ASSIGN)
 
+
 def test_find_assign_system():
     check_find(ipt2.SystemAssign, MULTILINE_SYSTEM_ASSIGN)
     check_find(ipt2.SystemAssign, MULTILINE_SYSTEM_ASSIGN_AFTER_DEDENT)
@@ -192,30 +220,36 @@ def test_find_assign_system():
     check_find(ipt2.SystemAssign, (["a=!ls\n"], (1, 2), None))
     check_find(ipt2.SystemAssign, MULTILINE_MAGIC_ASSIGN, match=False)
 
+
 def test_transform_assign_system():
     check_transform(ipt2.SystemAssign, MULTILINE_SYSTEM_ASSIGN)
     check_transform(ipt2.SystemAssign, MULTILINE_SYSTEM_ASSIGN_AFTER_DEDENT)
 
+
 def test_find_magic_escape():
     check_find(ipt2.EscapedCommand, MULTILINE_MAGIC)
     check_find(ipt2.EscapedCommand, INDENTED_MAGIC)
     check_find(ipt2.EscapedCommand, MULTILINE_MAGIC_ASSIGN, match=False)
 
+
 def test_transform_magic_escape():
     check_transform(ipt2.EscapedCommand, MULTILINE_MAGIC)
     check_transform(ipt2.EscapedCommand, INDENTED_MAGIC)
     check_transform(ipt2.EscapedCommand, CRLF_MAGIC)
 
+
 def test_find_autocalls():
     for case in [AUTOCALL_QUOTE, AUTOCALL_QUOTE2, AUTOCALL_PAREN]:
         print("Testing %r" % case[0])
         check_find(ipt2.EscapedCommand, case)
 
+
 def test_transform_autocall():
     for case in [AUTOCALL_QUOTE, AUTOCALL_QUOTE2, AUTOCALL_PAREN]:
         print("Testing %r" % case[0])
         check_transform(ipt2.EscapedCommand, case)
 
+
 def test_find_help():
     for case in [SIMPLE_HELP, DETAILED_HELP, MAGIC_HELP, HELP_IN_EXPR]:
         check_find(ipt2.HelpEnd, case)
@@ -233,6 +267,7 @@ def test_find_help():
     # Nor in a string
     check_find(ipt2.HelpEnd, (["foo = '''bar?\n"], None, None), match=False)
 
+
 def test_transform_help():
     tf = ipt2.HelpEnd((1, 0), (1, 9))
     assert tf.transform(HELP_IN_EXPR[0]) == HELP_IN_EXPR[2]
@@ -246,10 +281,12 @@ def test_transform_help():
     tf = ipt2.HelpEnd((1, 0), (1, 0))
     assert tf.transform(HELP_UNICODE[0]) == HELP_UNICODE[2]
 
+
 def test_find_assign_op_dedent():
     """
     be careful that empty token like dedent are not counted as parens
     """
+
     class Tk:
         def __init__(self, s):
             self.string = s
@@ -302,21 +339,23 @@ def test_check_complete_param(code, expected, number):
 def test_check_complete():
     cc = ipt2.TransformerManager().check_complete
 
-    example = dedent("""
+    example = dedent(
+        """
         if True:
-            a=1""" )
+            a=1"""
+    )
 
     assert cc(example) == ("incomplete", 4)
     assert cc(example + "\n") == ("complete", None)
     assert cc(example + "\n    ") == ("complete", None)
 
     # no need to loop on all the letters/numbers.
-    short = '12abAB'+string.printable[62:]
+    short = "12abAB" + string.printable[62:]
     for c in short:
         # test does not raise:
         cc(c)
         for k in short:
-            cc(c+k)
+            cc(c + k)
 
     assert cc("def f():\n  x=0\n  \\\n  ") == ("incomplete", 2)
 
@@ -371,10 +410,9 @@ def test_null_cleanup_transformer():
     assert manager.transform_cell("") == ""
 
 
-
-
 def test_side_effects_I():
     count = 0
+
     def counter(lines):
         nonlocal count
         count += 1
@@ -384,14 +422,13 @@ def counter(lines):
 
     manager = ipt2.TransformerManager()
     manager.cleanup_transforms.insert(0, counter)
-    assert manager.check_complete("a=1\n") == ('complete', None)
+    assert manager.check_complete("a=1\n") == ("complete", None)
     assert count == 0
 
 
-
-
 def test_side_effects_II():
     count = 0
+
     def counter(lines):
         nonlocal count
         count += 1
@@ -401,5 +438,5 @@ def counter(lines):
 
     manager = ipt2.TransformerManager()
     manager.line_transforms.insert(0, counter)
-    assert manager.check_complete("b=1\n") == ('complete', None)
+    assert manager.check_complete("b=1\n") == ("complete", None)
     assert count == 0
diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index b557eb1935b..24fed4b2f71 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -8,6 +8,11 @@
 IPython 8.3.0
 -------------
 
+ - :ghpull:`13625`, using ``?``, ``??``, ``*?`` will not call
+   ``set_next_input`` as most frontend allow proper multiline editing and it was
+   causing issues for many users of multi-cell frontends.
+
+
  - :ghpull:`13600`, ``pre_run_*``-hooks will now have a ``cell_id`` attribute on
    the info object when frontend provide it.
 

From 0fab8f53b821019f60a00a70516a646fcd72e0ce Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Tue, 5 Apr 2022 18:27:26 +0200
Subject: [PATCH 1145/1407] Add a changenote for #13624

---
 docs/source/whatsnew/version8.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 24fed4b2f71..6ad4da1855a 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -16,6 +16,9 @@ IPython 8.3.0
  - :ghpull:`13600`, ``pre_run_*``-hooks will now have a ``cell_id`` attribute on
    the info object when frontend provide it.
 
+ - :ghpull:`13624`, fixed :kbd:`End` key being broken after accepting an
+   autosuggestion.
+
 .. _version 8.2.0:
 
 IPython 8.2.0

From 73e71b17354720f0462f3327872210b6380251bf Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 7 Apr 2022 14:17:38 +0200
Subject: [PATCH 1146/1407] DOC: misc fixes

---
 IPython/core/completer.py |  2 +-
 IPython/core/oinspect.py  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 5a00f2c83a0..cdd28f65687 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -50,7 +50,7 @@
 
 It is sometime challenging to know how to type a character, if you are using
 IPython, or any compatible frontend you can prepend backslash to the character
-and press `<tab>` to expand it to its latex form.
+and press ``<tab>`` to expand it to its latex form.
 
 .. code::
 
diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 0096b9c9441..1a5c0ae070c 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -518,12 +518,12 @@ def _mime_format(self, text:str, formatter=None) -> dict:
         """Return a mime bundle representation of the input text.
 
         - if `formatter` is None, the returned mime bundle has
-           a `text/plain` field, with the input text.
-           a `text/html` field with a `<pre>` tag containing the input text.
+           a ``text/plain`` field, with the input text.
+           a ``text/html`` field with a ``<pre>`` tag containing the input text.
 
-        - if `formatter` is not None, it must be a callable transforming the
-          input text into a mime bundle. Default values for `text/plain` and
-          `text/html` representations are the ones described above.
+        - if ``formatter`` is not None, it must be a callable transforming the
+          input text into a mime bundle. Default values for ``text/plain`` and
+          ``text/html`` representations are the ones described above.
 
         Note:
 

From cf0cbaf5cfbd8464e5b0ea69da8d141671008e82 Mon Sep 17 00:00:00 2001
From: Tim Metzler <33530562+tmetzl@users.noreply.github.com>
Date: Tue, 26 Apr 2022 01:31:26 +0200
Subject: [PATCH 1147/1407] Fix typo

---
 docs/source/config/shell_mimerenderer.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/config/shell_mimerenderer.rst b/docs/source/config/shell_mimerenderer.rst
index 0fb2ffd9862..75872ac6a35 100644
--- a/docs/source/config/shell_mimerenderer.rst
+++ b/docs/source/config/shell_mimerenderer.rst
@@ -10,7 +10,7 @@ thought to render a number of mimetypes in the shell. This can be used to either
 display inline images if your terminal emulator supports it; or open some
 display results with external file viewers.
 
-Registering new mimetype handlers can so far only be done my extensions and
+Registering new mimetype handlers can so far only be done by extensions and
 requires 4 steps:
 
    - Define a callable that takes 2 parameters:``data`` and ``metadata``; return

From 9f3065cb1e06f0d84deba523cb258eb407a6aca6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Apr 2022 11:12:50 +0200
Subject: [PATCH 1148/1407] misc doc fixes

---
 docs/source/config/integrating.rst         | 2 +-
 docs/source/index.rst                      | 6 +++---
 docs/source/whatsnew/github-stats-0.11.rst | 4 ++--
 docs/source/whatsnew/github-stats-2.0.rst  | 4 ++--
 docs/source/whatsnew/version0.9.rst        | 4 ++--
 docs/source/whatsnew/version8.rst          | 9 +++------
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/docs/source/config/integrating.rst b/docs/source/config/integrating.rst
index a0459685236..07429ef1792 100644
--- a/docs/source/config/integrating.rst
+++ b/docs/source/config/integrating.rst
@@ -135,7 +135,7 @@ Metadata
 ^^^^^^^^
 
 We often want to provide frontends with guidance on how to display the data. To
-support this, ``_repr_*_()`` methods (except `_repr_pretty_``?) can also return a ``(data, metadata)``
+support this, ``_repr_*_()`` methods (except ``_repr_pretty_``?) can also return a ``(data, metadata)``
 tuple where ``metadata`` is a dictionary containing arbitrary key-value pairs for
 the frontend to interpret. An example use case is ``_repr_jpeg_()``, which can
 be set to return a jpeg image and a ``{'height': 400, 'width': 600}`` dictionary
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 9cec0577bed..ebef06fe900 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -17,9 +17,9 @@ interactively.  Its main components are:
 * A powerful interactive Python shell.
 
 
-.. image:: ./_images/ipython-6-screenshot.png
-    :alt: Screenshot of IPython 6.0
-    :align: center
+    .. image:: ./_images/ipython-6-screenshot.png
+        :alt: Screenshot of IPython 6.0
+        :align: center
 
 
 * A `Jupyter <https://jupyter.org/>`_ kernel to work with Python code in Jupyter
diff --git a/docs/source/whatsnew/github-stats-0.11.rst b/docs/source/whatsnew/github-stats-0.11.rst
index 2f647ce7414..8fd4680c95b 100644
--- a/docs/source/whatsnew/github-stats-0.11.rst
+++ b/docs/source/whatsnew/github-stats-0.11.rst
@@ -51,9 +51,9 @@ Pull requests (226):
 * `542 <https://github.com/ipython/ipython/issues/542>`_: issue 440
 * `533 <https://github.com/ipython/ipython/issues/533>`_: Remove unused configobj and validate libraries from externals.
 * `538 <https://github.com/ipython/ipython/issues/538>`_: fix various tests on Windows
-* `540 <https://github.com/ipython/ipython/issues/540>`_: support `-pylab` flag with deprecation warning
+* `540 <https://github.com/ipython/ipython/issues/540>`_: support ``-pylab`` flag with deprecation warning
 * `537 <https://github.com/ipython/ipython/issues/537>`_: Docs update
-* `536 <https://github.com/ipython/ipython/issues/536>`_: `setup.py install` depends on setuptools on Windows
+* `536 <https://github.com/ipython/ipython/issues/536>`_: ``setup.py install`` depends on setuptools on Windows
 * `480 <https://github.com/ipython/ipython/issues/480>`_: Get help mid-command
 * `462 <https://github.com/ipython/ipython/issues/462>`_: Str and Bytes traitlets
 * `534 <https://github.com/ipython/ipython/issues/534>`_: Handle unicode properly in IPython.zmq.iostream
diff --git a/docs/source/whatsnew/github-stats-2.0.rst b/docs/source/whatsnew/github-stats-2.0.rst
index 5033994e1e1..98e3d5e3963 100644
--- a/docs/source/whatsnew/github-stats-2.0.rst
+++ b/docs/source/whatsnew/github-stats-2.0.rst
@@ -916,7 +916,7 @@ Pull Requests (687):
 * :ghpull:`4444`: Css cleaning
 * :ghpull:`4523`: Use username and password for MongoDB on ShiningPanda
 * :ghpull:`4510`: Update whatsnew from PR files
-* :ghpull:`4441`: add `setup.py jsversion`
+* :ghpull:`4441`: add ``setup.py jsversion``
 * :ghpull:`4518`: Fix for race condition in url file decoding.
 * :ghpull:`4497`: don't automatically unpack datetime objects in the message spec
 * :ghpull:`4506`: wait for empty queues as well as load-balanced tasks
@@ -1050,7 +1050,7 @@ Pull Requests (687):
 * :ghpull:`4214`: engine ID metadata should be unicode, not bytes
 * :ghpull:`4232`: no highlight if no language specified
 * :ghpull:`4218`: Fix display of SyntaxError when .py file is modified
-* :ghpull:`4207`: add `setup.py css` command
+* :ghpull:`4207`: add ``setup.py css`` command
 * :ghpull:`4224`: clear previous callbacks on execute
 * :ghpull:`4180`: Iptest refactoring
 * :ghpull:`4105`: JS output area misaligned
diff --git a/docs/source/whatsnew/version0.9.rst b/docs/source/whatsnew/version0.9.rst
index 81ebba1cac8..8d5f73c8667 100644
--- a/docs/source/whatsnew/version0.9.rst
+++ b/docs/source/whatsnew/version0.9.rst
@@ -81,7 +81,7 @@ New features
   :mod:`IPython.kernel`, :mod:`IPython.kernel.core`, :mod:`traitlets.config`,
   :mod:`IPython.tools` and :mod:`IPython.testing`.
 
-* As part of merging in the `ipython1-dev` stuff, the `setup.py` script and
+* As part of merging in the `ipython1-dev` stuff, the ``setup.py`` script and
   friends have been completely refactored.  Now we are checking for
   dependencies using the approach that matplotlib uses.
 
@@ -161,7 +161,7 @@ Backwards incompatible changes
   `'basic'` to `'b'`.
 
 * IPython has a larger set of dependencies if you want all of its capabilities.
-  See the `setup.py` script for details.
+  See the ``setup.py`` script for details.
 
 * The constructors for :class:`IPython.kernel.client.MultiEngineClient` and 
   :class:`IPython.kernel.client.TaskClient` no longer take the (ip,port) tuple.
diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 6ad4da1855a..b88dfb4151a 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -16,9 +16,6 @@ IPython 8.3.0
  - :ghpull:`13600`, ``pre_run_*``-hooks will now have a ``cell_id`` attribute on
    the info object when frontend provide it.
 
- - :ghpull:`13624`, fixed :kbd:`End` key being broken after accepting an
-   autosuggestion.
-
 .. _version 8.2.0:
 
 IPython 8.2.0
@@ -519,8 +516,8 @@ Automatic Vi prompt stripping
 
 When pasting code into IPython, it will strip the leading prompt characters if
 there are any. For example, you can paste the following code into the console -
-it will still work, even though each line is prefixed with prompts (`In`,
-`Out`)::
+it will still work, even though each line is prefixed with prompts (``In``,
+``Out``)::
 
     In [1]: 2 * 2 == 4
     Out[1]: True
@@ -615,7 +612,7 @@ who did a fantastic job at updating our code base, migrating to pytest, pushing
 our coverage, and fixing a large number of bugs. I highly recommend contacting
 them if you need help with C++ and Python projects.
 
-You can find all relevant issues and PRs with the SDG 2021 tag `<https://github.com/ipython/ipython/issues?q=label%3A%22Numfocus+SDG+2021%22+>`__
+You can find all relevant issues and PRs with `the SDG 2021 tag <https://github.com/ipython/ipython/issues?q=label%3A%22Numfocus+SDG+2021%22+>`__
 
 Removing support for older Python versions
 ------------------------------------------

From e25b9ab98fca64c136a50e2fde256f7cad9d0777 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Apr 2022 11:16:21 +0200
Subject: [PATCH 1149/1407] fix pytest

---
 pytest.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pytest.ini b/pytest.ini
index e0cfec07bdf..81511e9ce51 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -45,3 +45,4 @@ addopts = --durations=10
     --ignore=IPython/utils/version.py
 doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS
 ipdoctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS
+asyncio_mode = strict

From c55dbf99334886b9ef7edd0fe8d5598e68ea6edc Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Apr 2022 11:18:00 +0200
Subject: [PATCH 1150/1407] typo and reformat

---
 IPython/__init__.py                          |  5 +++--
 IPython/core/autocall.py                     |  2 +-
 IPython/core/completer.py                    |  2 +-
 IPython/core/history.py                      |  2 +-
 IPython/core/interactiveshell.py             | 19 +++++++++++--------
 IPython/core/magics/execution.py             |  4 ++--
 IPython/core/magics/script.py                |  4 ++--
 IPython/core/tests/test_inputtransformer2.py |  3 ++-
 IPython/core/tests/test_interactiveshell.py  |  2 +-
 IPython/core/tests/test_iplib.py             |  3 ++-
 IPython/core/tests/test_magic.py             |  4 +++-
 IPython/core/tests/test_magic_terminal.py    | 12 ++++++++----
 IPython/core/tests/test_profile.py           |  2 +-
 IPython/external/qt_loaders.py               |  4 +++-
 IPython/lib/display.py                       | 16 +++++++---------
 IPython/lib/tests/test_latextools.py         |  2 +-
 IPython/lib/tests/test_pretty.py             |  2 +-
 IPython/testing/plugin/dtexample.py          |  4 ++--
 IPython/testing/plugin/pytest_ipdoctest.py   |  2 +-
 IPython/utils/text.py                        |  8 ++++----
 20 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/IPython/__init__.py b/IPython/__init__.py
index e12da90d375..7ebb80b3621 100644
--- a/IPython/__init__.py
+++ b/IPython/__init__.py
@@ -28,7 +28,7 @@
 # Don't forget to also update setup.py when this changes!
 if sys.version_info < (3, 8):
     raise ImportError(
-"""
+        """
 IPython 8+ supports Python 3.8 and above, following NEP 29.
 When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
 Python 3.3 and 3.4 were supported up to IPython 6.x.
@@ -40,7 +40,8 @@
 
     https://github.com/ipython/ipython/blob/master/README.rst
 
-""")
+"""
+    )
 
 #-----------------------------------------------------------------------------
 # Setup the top level names
diff --git a/IPython/core/autocall.py b/IPython/core/autocall.py
index 5f7720bb46c..54beec3f58d 100644
--- a/IPython/core/autocall.py
+++ b/IPython/core/autocall.py
@@ -40,7 +40,7 @@ def __init__(self, ip=None):
         self._ip = ip
     
     def set_ip(self, ip):
-        """ Will be used to set _ip point to current ipython instance b/f call
+        """Will be used to set _ip point to current ipython instance b/f call
 
         Override this method if you don't want this to happen.
 
diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index cdd28f65687..59d3e9930fc 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -589,7 +589,7 @@ class Completer(Configurable):
 
         This will enable completion on elements of lists, results of function calls, etc.,
         but can be unsafe because the code is actually evaluated on TAB.
-        """
+        """,
     ).tag(config=True)
 
     use_jedi = Bool(default_value=JEDI_INSTALLED,
diff --git a/IPython/core/history.py b/IPython/core/history.py
index 41a04330b9b..579f6031dae 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -166,7 +166,7 @@ class HistoryAccessor(HistoryAccessorBase):
         in which case there will be no stored history, no SQLite connection,
         and no background saving thread.  This may be necessary in some
         threaded environments where IPython is embedded.
-        """
+        """,
     ).tag(config=True)
 
     connection_options = Dict(
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index ea9f6310ba5..2bb27a6e2b7 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -213,14 +213,17 @@ def __repr__(self):
         raw_cell = (
             (self.raw_cell[:50] + "..") if len(self.raw_cell) > 50 else self.raw_cell
         )
-        return '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s cell_id=%s>' % (
-            name,
-            id(self),
-            raw_cell,
-            self.store_history,
-            self.silent,
-            self.shell_futures,
-            self.cell_id,
+        return (
+            '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s cell_id=%s>'
+            % (
+                name,
+                id(self),
+                raw_cell,
+                self.store_history,
+                self.silent,
+                self.shell_futures,
+                self.cell_id,
+            )
         )
 
 
diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 371da5b1f98..da7f780b9cb 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -511,7 +511,7 @@ def run(self, parameter_s='', runner=None,
         """Run the named file inside IPython as a program.
 
         Usage::
-        
+
           %run [-n -i -e -G]
                [( -t [-N<N>] | -d [-b<N>] | -p [profile options] )]
                ( -m mod | filename ) [args]
@@ -552,7 +552,7 @@ def run(self, parameter_s='', runner=None,
         *two* back slashes (e.g. ``\\\\*``) to suppress expansions.
         To completely disable these expansions, you can use -G flag.
 
-        On Windows systems, the use of single quotes `'` when specifying 
+        On Windows systems, the use of single quotes `'` when specifying
         a file is not supported. Use double quotes `"`.
 
         Options:
diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index a0028c25eea..9fd2fc6c0dd 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -58,8 +58,8 @@ def script_args(f):
             '--no-raise-error', action="store_false", dest='raise_error',
             help="""Whether you should raise an error message in addition to
             a stream on stderr if you get a nonzero exit code.
-            """
-        )
+            """,
+        ),
     ]
     for arg in args:
         f = arg(f)
diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index 0613dc02c93..cddb32f7138 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -87,7 +87,8 @@
 
 #####
 
-MULTILINE_SYSTEM_ASSIGN_AFTER_DEDENT = ("""\
+MULTILINE_SYSTEM_ASSIGN_AFTER_DEDENT = (
+    """\
 def test():
   for i in range(1):
     print(i)
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 10cce1fd646..10827b5fa0f 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -547,7 +547,7 @@ def setUp(self):
         self.TESTDIR = join(self.BASETESTDIR, u"åäö")
         os.mkdir(self.TESTDIR)
         with open(
-            join(self.TESTDIR, u"åäötestscript.py"), "w", encoding="utf-8"
+            join(self.TESTDIR, "åäötestscript.py"), "w", encoding="utf-8"
         ) as sfile:
             sfile.write("pass\n")
         self.oldpath = os.getcwd()
diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index 94ce5185865..ec7007e0f2c 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -236,7 +236,8 @@ def test_run_cell():
     if 4:
         print "bar"
     
-    """)
+    """
+    )
     # Simply verifies that this kind of input is run
     ip.run_cell(complex)
     
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index b46a9e8388c..850e22792b9 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -448,7 +448,9 @@ def test_multiline_time():
     ip = get_ipython()
     ip.user_ns.pop('run', None)
 
-    ip.run_cell(dedent("""\
+    ip.run_cell(
+        dedent(
+            """\
         %%time
         a = "ho"
         b = "hey"
diff --git a/IPython/core/tests/test_magic_terminal.py b/IPython/core/tests/test_magic_terminal.py
index f09014786e6..5dfa0f0ed65 100644
--- a/IPython/core/tests/test_magic_terminal.py
+++ b/IPython/core/tests/test_magic_terminal.py
@@ -122,7 +122,8 @@ def test_paste_pyprompt(self):
         ip.user_ns.pop("x")
 
     def test_paste_py_multi(self):
-        self.paste("""
+        self.paste(
+            """
         >>> x = [1,2,3]
         >>> y = []
         >>> for i in x:
@@ -145,7 +146,8 @@ def test_paste_py_multi_r(self):
 
     def test_paste_email(self):
         "Test pasting of email-quoted contents"
-        self.paste("""\
+        self.paste(
+            """\
         >> def foo(x):
         >>     return x + 1
         >> xx = foo(1.1)"""
@@ -154,7 +156,8 @@ def test_paste_email(self):
 
     def test_paste_email2(self):
         "Email again; some programs add a space also at each quoting level"
-        self.paste("""\
+        self.paste(
+            """\
         > > def foo(x):
         > >     return x + 1
         > > yy = foo(2.1)     """
@@ -163,7 +166,8 @@ def test_paste_email2(self):
 
     def test_paste_email_py(self):
         "Email quoting of interactive input"
-        self.paste("""\
+        self.paste(
+            """\
         >> >>> def f(x):
         >> ...   return x+1
         >> ... 
diff --git a/IPython/core/tests/test_profile.py b/IPython/core/tests/test_profile.py
index a0de2f2d593..876c7fda856 100644
--- a/IPython/core/tests/test_profile.py
+++ b/IPython/core/tests/test_profile.py
@@ -108,7 +108,7 @@ def test_list_profiles_in():
     for name in ("profile_foo", "profile_hello", "not_a_profile"):
         Path(td / name).mkdir(parents=True)
     if dec.unicode_paths:
-        Path(td / u"profile_ünicode").mkdir(parents=True)
+        Path(td / "profile_ünicode").mkdir(parents=True)
 
     with open(td / "profile_file", "w", encoding="utf-8") as f:
         f.write("I am not a profile directory")
diff --git a/IPython/external/qt_loaders.py b/IPython/external/qt_loaders.py
index 975855ca6bc..39ea298460b 100644
--- a/IPython/external/qt_loaders.py
+++ b/IPython/external/qt_loaders.py
@@ -66,7 +66,9 @@ def find_spec(self, fullname, path, target=None):
                 """
     Importing %s disabled by IPython, which has
     already imported an Incompatible QT Binding: %s
-    """ % (fullname, loaded_api()))
+    """
+                % (fullname, loaded_api())
+            )
 
 
 ID = ImportDenier()
diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index 4481683c4a0..5ff2983dbf4 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -103,9 +103,9 @@ class Audio(DisplayObject):
     See Also
     --------
     ipywidgets.Audio
-    
-         AUdio widget with more more flexibility and options.
-    
+
+         Audio widget with more more flexibility and options.
+
     """
     _read_flags = 'rb'
 
@@ -510,12 +510,10 @@ def __init__(self,
 
         self.recursive = recursive
 
-    def _get_display_formatter(self,
-                               dirname_output_format,
-                               fname_output_format,
-                               fp_format,
-                               fp_cleaner=None):
-        """ generate built-in formatter function
+    def _get_display_formatter(
+        self, dirname_output_format, fname_output_format, fp_format, fp_cleaner=None
+    ):
+        """generate built-in formatter function
 
         this is used to define both the notebook and terminal built-in
          formatters as they only differ by some wrapper text for each entry
diff --git a/IPython/lib/tests/test_latextools.py b/IPython/lib/tests/test_latextools.py
index ead73abff93..d035752b4fe 100644
--- a/IPython/lib/tests/test_latextools.py
+++ b/IPython/lib/tests/test_latextools.py
@@ -31,7 +31,7 @@ def no_op(*args, **kwargs):
 
 
 @onlyif_cmds_exist("latex", "dvipng")
-@pytest.mark.parametrize("s, wrap", [(u"$$x^2$$", False), (u"x^2", True)])
+@pytest.mark.parametrize("s, wrap", [("$$x^2$$", False), ("x^2", True)])
 def test_latex_to_png_dvipng_runs(s, wrap):
     """
     Test that latex_to_png_dvipng just runs without error.
diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py
index ca16924e8f7..86085166071 100644
--- a/IPython/lib/tests/test_pretty.py
+++ b/IPython/lib/tests/test_pretty.py
@@ -273,7 +273,7 @@ def __repr__(self):
     p = pretty.pretty(c)
     assert p == u
     p = pretty.pretty([c])
-    assert p == u"[%s]" % u
+    assert p == "[%s]" % u
 
 
 def test_basic_class():
diff --git a/IPython/testing/plugin/dtexample.py b/IPython/testing/plugin/dtexample.py
index 119e0a0536c..aff616fa0d9 100644
--- a/IPython/testing/plugin/dtexample.py
+++ b/IPython/testing/plugin/dtexample.py
@@ -38,7 +38,7 @@ def ipfunc():
        ....:     print(i, end=' ')
        ....:     print(i+1, end=' ')
        ....:
-    0 1 1 2 2 3 
+    0 1 1 2 2 3
 
 
     It's OK to use '_' for the last result, but do NOT try to use IPython's
@@ -50,7 +50,7 @@ def ipfunc():
 
     In [8]: print(repr(_))
     'hi'
-    
+
     In [7]: 3+4
     Out[7]: 7
 
diff --git a/IPython/testing/plugin/pytest_ipdoctest.py b/IPython/testing/plugin/pytest_ipdoctest.py
index 809713d7c8e..4ba2f1adf8e 100644
--- a/IPython/testing/plugin/pytest_ipdoctest.py
+++ b/IPython/testing/plugin/pytest_ipdoctest.py
@@ -782,7 +782,7 @@ def _remove_unwanted_precision(self, want: str, got: str) -> str:
                 precision = 0 if fraction is None else len(fraction)
                 if exponent is not None:
                     precision -= int(exponent)
-                if float(w.group()) == approx(float(g.group()), abs=10 ** -precision):
+                if float(w.group()) == approx(float(g.group()), abs=10**-precision):
                     # They're close enough. Replace the text we actually
                     # got with the text we want, so that it will match when we
                     # check the string literally.
diff --git a/IPython/utils/text.py b/IPython/utils/text.py
index ef75f9331d7..74bccddf68b 100644
--- a/IPython/utils/text.py
+++ b/IPython/utils/text.py
@@ -470,11 +470,11 @@ def strip_ansi(source):
 
 class EvalFormatter(Formatter):
     """A String Formatter that allows evaluation of simple expressions.
-    
+
     Note that this version interprets a `:`  as specifying a format string (as per
     standard string formatting), so if slicing is required, you must explicitly
     create a slice.
-    
+
     This is to be used in templating cases, such as the parallel batch
     script templates, where simple arithmetic on arguments is useful.
 
@@ -690,8 +690,8 @@ def compute_item_matrix(items, row_first=False, empty=None, *args, **kwargs) :
         return ([[_get_or_default(items, c * nrow + r, default=empty) for c in range(ncol)] for r in range(nrow)], info)
 
 
-def columnize(items, row_first=False, separator='  ', displaywidth=80, spread=False):
-    """ Transform a list of strings into a single string with columns.
+def columnize(items, row_first=False, separator="  ", displaywidth=80, spread=False):
+    """Transform a list of strings into a single string with columns.
 
     Parameters
     ----------

From 96aefe4cd3768893f22480afe710ae392dd3dad3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Apr 2022 11:36:37 +0200
Subject: [PATCH 1151/1407] reformat 2

---
 IPython/core/interactiveshell.py           | 19 ++++++++-----------
 IPython/testing/plugin/dtexample.py        |  2 +-
 IPython/testing/plugin/pytest_ipdoctest.py |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 2bb27a6e2b7..ea9f6310ba5 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -213,17 +213,14 @@ def __repr__(self):
         raw_cell = (
             (self.raw_cell[:50] + "..") if len(self.raw_cell) > 50 else self.raw_cell
         )
-        return (
-            '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s cell_id=%s>'
-            % (
-                name,
-                id(self),
-                raw_cell,
-                self.store_history,
-                self.silent,
-                self.shell_futures,
-                self.cell_id,
-            )
+        return '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s cell_id=%s>' % (
+            name,
+            id(self),
+            raw_cell,
+            self.store_history,
+            self.silent,
+            self.shell_futures,
+            self.cell_id,
         )
 
 
diff --git a/IPython/testing/plugin/dtexample.py b/IPython/testing/plugin/dtexample.py
index aff616fa0d9..68f7016e34d 100644
--- a/IPython/testing/plugin/dtexample.py
+++ b/IPython/testing/plugin/dtexample.py
@@ -60,7 +60,7 @@ def ipfunc():
     In [9]: ipfunc()
     Out[9]: 'ipfunc'
     """
-    return 'ipfunc'
+    return "ipfunc"
 
 
 def ipos():
diff --git a/IPython/testing/plugin/pytest_ipdoctest.py b/IPython/testing/plugin/pytest_ipdoctest.py
index 4ba2f1adf8e..809713d7c8e 100644
--- a/IPython/testing/plugin/pytest_ipdoctest.py
+++ b/IPython/testing/plugin/pytest_ipdoctest.py
@@ -782,7 +782,7 @@ def _remove_unwanted_precision(self, want: str, got: str) -> str:
                 precision = 0 if fraction is None else len(fraction)
                 if exponent is not None:
                     precision -= int(exponent)
-                if float(w.group()) == approx(float(g.group()), abs=10**-precision):
+                if float(w.group()) == approx(float(g.group()), abs=10 ** -precision):
                     # They're close enough. Replace the text we actually
                     # got with the text we want, so that it will match when we
                     # check the string literally.

From d979804ce3789d77eec4e01004ae1e40714ed645 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Apr 2022 11:44:39 +0200
Subject: [PATCH 1152/1407] reformat setup.py

---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 5614d3ef8c8..fbaa5f63cba 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,9 @@
 
 Python {py} detected.
 {pip}
-""".format(py=sys.version_info, pip=pip_message )
+""".format(
+        py=sys.version_info, pip=pip_message
+    )
 
     print(error, file=sys.stderr)
     sys.exit(1)

From 22b4af1911f0bb234eaa9689ad20fd5883e8203c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Apr 2022 03:09:06 -0700
Subject: [PATCH 1153/1407] Update test.yml

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 601828aac9c..1bbddbfbf98 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,6 +17,7 @@ jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
         python-version: ["3.8", "3.9", "3.10"]

From dc5bcc1c50892a5128fcf128af28887226144927 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Apr 2022 11:11:31 +0200
Subject: [PATCH 1154/1407] This fixed the mixing of multiple history seen in
 #13631

It forces get_tail to put the current session last in the returned
results.
---
 IPython/core/history.py | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/IPython/core/history.py b/IPython/core/history.py
index 579f6031dae..9b0b2cbd048 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -296,8 +296,8 @@ def _run_sql(self, sql, params, raw=True, output=False, latest=False):
             toget = "history.%s, output_history.output" % toget
         if latest:
             toget += ", MAX(session * 128 * 1024 + line)"
-        cur = self.db.execute("SELECT session, line, %s FROM %s " %\
-                                (toget, sqlfrom) + sql, params)
+        this_querry = "SELECT session, line, %s FROM %s " % (toget, sqlfrom) + sql
+        cur = self.db.execute(this_querry, params)
         if latest:
             cur = (row[:-1] for row in cur)
         if output:    # Regroup into 3-tuples, and parse JSON
@@ -344,6 +344,11 @@ def get_last_session_id(self):
     def get_tail(self, n=10, raw=True, output=False, include_latest=False):
         """Get the last n lines from the history database.
 
+        Most recent entry last.
+
+        Completion will be reordered so that that the last ones are when
+        possible from current session.
+
         Parameters
         ----------
         n : int
@@ -362,11 +367,31 @@ def get_tail(self, n=10, raw=True, output=False, include_latest=False):
         self.writeout_cache()
         if not include_latest:
             n += 1
-        cur = self._run_sql("ORDER BY session DESC, line DESC LIMIT ?",
-                                (n,), raw=raw, output=output)
+        # cursor/line/entry
+        this_cur = list(
+            self._run_sql(
+                "WHERE session == ? ORDER BY line DESC LIMIT ?  ",
+                (self.session_number, n),
+                raw=raw,
+                output=output,
+            )
+        )
+        other_cur = list(
+            self._run_sql(
+                "WHERE session != ? ORDER BY session DESC, line DESC LIMIT ?",
+                (self.session_number, n),
+                raw=raw,
+                output=output,
+            )
+        )
+
+        everything = this_cur + other_cur
+
+        everything = everything[:n]
+
         if not include_latest:
-            return reversed(list(cur)[1:])
-        return reversed(list(cur))
+            return list(everything)[:0:-1]
+        return list(everything)[::-1]
 
     @catch_corrupt_db
     def search(self, pattern="*", raw=True, search_raw=True,

From af8de90a2537fbf4bb49a1c005b854d32248fd36 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Apr 2022 13:58:31 +0200
Subject: [PATCH 1155/1407] whats new 7.33

---
 docs/source/whatsnew/version7.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 4dea95d6c78..f6ecd257273 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,17 @@
  7.x Series
 ============
 
+.. _version 7.33:
+
+IPython 7.33
+============
+
+ - Allow IPython hooks to receive current cell ids when frontend support it. See
+   :ghpull:`13600`
+
+ - ``?`` does not trigger the insertion of a new cell anymore as most frontend
+   allow proper multiline edition. :ghpull:`13625`
+
 
 .. _version 7.32:
 

From 1150470ad809bf095a5ac78f35748e42c08f5c9d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Apr 2022 14:13:52 +0200
Subject: [PATCH 1156/1407] whats new 8.3

---
 docs/source/whatsnew/version8.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index b88dfb4151a..f9636e4877b 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -10,11 +10,16 @@ IPython 8.3.0
 
  - :ghpull:`13625`, using ``?``, ``??``, ``*?`` will not call
    ``set_next_input`` as most frontend allow proper multiline editing and it was
-   causing issues for many users of multi-cell frontends.
+   causing issues for many users of multi-cell frontends. This has been backported to 7.33
 
 
  - :ghpull:`13600`, ``pre_run_*``-hooks will now have a ``cell_id`` attribute on
-   the info object when frontend provide it.
+   the info object when frontend provide it. This has been backported to 7.33
+
+ - :ghpull:`13624`, fixed :kbd:`End` key being broken after accepting an
+   auto-suggestion.
+
+ - :ghpull:`13657` fix issue where history from different sessions would be mixed.
 
 .. _version 8.2.0:
 

From 55e81b920d19c6f7ca4588f1b85f2c3b11b209d3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Apr 2022 14:30:15 +0200
Subject: [PATCH 1157/1407] release 8.3.0

---
 IPython/core/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index ae19fa66f18..4e8c82cdb7d 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,7 +20,7 @@
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-# _version_extra = ""  # Uncomment this for full releases
+_version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From d1746145d828b4eb01f1e4d44d3f33d75206b1aa Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 Apr 2022 14:30:44 +0200
Subject: [PATCH 1158/1407] back to dev

---
 IPython/core/release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 4e8c82cdb7d..9d236997c27 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -16,11 +16,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 8
-_version_minor = 3
+_version_minor = 4
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-_version_extra = ""  # Uncomment this for full releases
+# _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From fc235985508d0431192405b46c6fbfb209069048 Mon Sep 17 00:00:00 2001
From: telamonian <telamonian@users.noreply.github.com>
Date: Mon, 2 May 2022 19:40:28 -0400
Subject: [PATCH 1159/1407] fix uncaught `BdbQuit` exceptions on ipdb `exit`

- `BdbQuit` is now handled in the top-most scope of `InteractiveShell.run_code`. This ensures that `BdbQuit` is correctly handled but can still do its job of breaking out of all user code/loops/further breakpoint requests. Hopefully will work better than previous attempts, which put the `BdqQuit` handling in `Pdb.set_trace`

- fixes:
  - jupyterlab/jupyterlab#12501

- refs:
  - ipython/ipython#876
  - ipython/ipython#1273
  - ipython/ipython#4474
  - ipython/ipython#5306
  - ipython/ipython#9731
  - ipython/ipython#9942
  - ipython/ipython#9950
  - ipython/ipython#10006
  - ipython/ipython#12378
---
 .gitignore                       | 10 +++++++++-
 IPython/core/debugger.py         |  1 -
 IPython/core/interactiveshell.py |  6 ++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5b45fd4d6b8..f4736530e10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,5 +28,13 @@ __pycache__
 .pytest_cache
 .python-version
 venv*/
-.idea/
 .mypy_cache/
+
+# jetbrains ide stuff
+*.iml
+.idea/
+
+# vscode ide stuff
+*.code-workspace
+.history
+.vscode
diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 8e3dd9678cd..ba12e3eac39 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -101,7 +101,6 @@
 #
 #*****************************************************************************
 
-import bdb
 import inspect
 import linecache
 import sys
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index ea9f6310ba5..371a3dad77e 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -14,6 +14,7 @@
 import abc
 import ast
 import atexit
+import bdb
 import builtins as builtin_mod
 import dis
 import functools
@@ -3403,6 +3404,11 @@ async def run_code(self, code_obj, result=None, *, async_=False):
                 result.error_in_exec = e
             self.showtraceback(exception_only=True)
             warn("To exit: use 'exit', 'quit', or Ctrl-D.", stacklevel=1)
+        except bdb.BdbQuit:
+            etype, value, tb = sys.exc_info()
+            if result is not None:
+                result.error_in_exec = value
+            # the BdbQuit stops here
         except self.custom_exceptions:
             etype, value, tb = sys.exc_info()
             if result is not None:

From d15e4f6a089b785a380b991b5ebc177f0060aac1 Mon Sep 17 00:00:00 2001
From: Artur Svistunov <18216480+madbird1304@users.noreply.github.com>
Date: Fri, 6 May 2022 02:45:57 +0300
Subject: [PATCH 1160/1407] issue#13073: Made a couple of fixes after testing
 on Wayland (Gnome)

---
 IPython/lib/clipboard.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/IPython/lib/clipboard.py b/IPython/lib/clipboard.py
index 5d6630d17a7..1d691a7ea63 100644
--- a/IPython/lib/clipboard.py
+++ b/IPython/lib/clipboard.py
@@ -1,14 +1,16 @@
 """ Utilities for accessing the platform's clipboard.
 """
-
+import os
 import subprocess
 
 from IPython.core.error import TryNext
 import IPython.utils.py3compat as py3compat
 
+
 class ClipboardEmpty(ValueError):
     pass
 
+
 def win32_clipboard_get():
     """ Get the current clipboard's text on Windows.
 
@@ -32,6 +34,7 @@ def win32_clipboard_get():
         win32clipboard.CloseClipboard()
     return text
 
+
 def osx_clipboard_get() -> str:
     """ Get the clipboard's text on OS X.
     """
@@ -43,6 +46,7 @@ def osx_clipboard_get() -> str:
     text = py3compat.decode(bytes_)
     return text
 
+
 def tkinter_clipboard_get():
     """ Get the clipboard's text using Tkinter.
 
@@ -77,13 +81,18 @@ def wayland_clipboard_get():
 
     try:
         with subprocess.Popen(["wl-paste"], stdout=subprocess.PIPE) as p:
-            raw, _ = p.communicate()
+            raw, err = p.communicate()
+            if p.wait():
+                raise TryNext(err)
     except FileNotFoundError as e:
-        raise ClipboardEmpty(
+        raise TryNext(
             "Getting text from the clipboard under Wayland requires the wl-clipboard "
             "extension: https://github.com/bugaevc/wl-clipboard"
         ) from e
 
+    if not raw:
+        raise ClipboardEmpty
+
     try:
         text = py3compat.decode(raw)
     except UnicodeDecodeError as e:

From 7d4445743ee27266003ef407a9090bd21170a848 Mon Sep 17 00:00:00 2001
From: Artur Svistunov <18216480+madbird1304@users.noreply.github.com>
Date: Fri, 6 May 2022 03:16:19 +0300
Subject: [PATCH 1161/1407] issue#13073: Fix formatting

---
 IPython/core/hooks.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/IPython/core/hooks.py b/IPython/core/hooks.py
index 0f1f5af2dc7..f73c5657638 100644
--- a/IPython/core/hooks.py
+++ b/IPython/core/hooks.py
@@ -155,8 +155,10 @@ def clipboard_get(self):
     """ Get text from the clipboard.
     """
     from ..lib.clipboard import (
-        osx_clipboard_get, tkinter_clipboard_get,
-        win32_clipboard_get, wayland_clipboard_get,
+        osx_clipboard_get,
+        tkinter_clipboard_get,
+        win32_clipboard_get,
+        wayland_clipboard_get,
     )
     if sys.platform == 'win32':
         chain = [win32_clipboard_get, tkinter_clipboard_get]

From c0a6176d65787bcd41e9b66ea0b8d5838f313af1 Mon Sep 17 00:00:00 2001
From: Blazej Michalik <blazej.michalik@nokia.com>
Date: Tue, 24 May 2022 03:10:20 +0200
Subject: [PATCH 1162/1407] Limit supported prompt-toolkit versions to
 3.0.2-3.1.0

Fixes #13645. Stems from #13592.
---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 2027b531d02..0e371836877 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,7 +37,7 @@ install_requires =
     matplotlib-inline
     pexpect>4.3; sys_platform != "win32"
     pickleshare
-    prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1
+    prompt_toolkit>3.0.1,<3.1.0
     pygments>=2.4.0
     setuptools>=18.5
     stack_data

From 2a80ede91b251d1aac2b7821441126a7bd87394e Mon Sep 17 00:00:00 2001
From: Thomas Grainger <tagrain@gmail.com>
Date: Wed, 25 May 2022 20:31:47 +0100
Subject: [PATCH 1163/1407] fix get_event_loop typo

---
 docs/source/interactive/autoawait.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/interactive/autoawait.rst b/docs/source/interactive/autoawait.rst
index e4ed965a13e..3b62fdae05a 100644
--- a/docs/source/interactive/autoawait.rst
+++ b/docs/source/interactive/autoawait.rst
@@ -177,7 +177,7 @@ On top of the above there are significant modification to the AST of
 significant overhead to this kind of code.
 
 By default the generated coroutine function will be consumed by Asyncio's
-``loop_runner = asyncio.get_evenloop().run_until_complete()`` method if
+``loop_runner = asyncio.get_event_loop().run_until_complete()`` method if
 ``async`` mode is deemed necessary, otherwise the coroutine will just be
 exhausted in a simple runner. It is possible, though, to change the default
 runner.

From 2e08c72d61d2b03e6edd9a13a8976bf1d4fa482c Mon Sep 17 00:00:00 2001
From: Gene Louis Kim <gkim21@cs.rochester.edu>
Date: Sat, 28 May 2022 02:31:00 -0400
Subject: [PATCH 1164/1407] Correct the debugger_cls() call to
 self.debugger_cls() call in TBTools.__init__() so that it doesn't crash when
 the optionally argument, debugger_cls, is unspecified.

---
 IPython/core/ultratb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 85697919408..5649a78d4bd 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -239,7 +239,7 @@ def __init__(
         self.debugger_cls = debugger_cls or debugger.Pdb
 
         if call_pdb:
-            self.pdb = debugger_cls()
+            self.pdb = self.debugger_cls()
         else:
             self.pdb = None
 

From daca7fa3beab97fac7e61458b40511546f160e31 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 28 May 2022 13:54:53 +0200
Subject: [PATCH 1165/1407] wn 734

---
 docs/source/whatsnew/version7.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index f6ecd257273..16987a77048 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,15 @@
  7.x Series
 ============
 
+.. _version 7.34:
+
+IPython 7.34
+============
+
+This version contains a single fix:  fix uncaught BdbQuit exceptions on ipdb
+exit :ghpull:`13668`
+
+
 .. _version 7.33:
 
 IPython 7.33

From b64600e6e235263961acdecfc0f5e6cb84d4909b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 28 May 2022 13:59:04 +0200
Subject: [PATCH 1166/1407] What's new 8.4

---
 docs/source/whatsnew/version8.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index f9636e4877b..c4b7b155212 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -2,6 +2,17 @@
  8.x Series
 ============
 
+.. _version 8.4.0:
+
+IPython 8.4.0
+-------------
+
+As for 7.34, this version contains a single fix:  fix uncaught BdbQuit exceptions on ipdb
+exit :ghpull:`13668`, and a single typo fix in documentation: :ghpull:`13682`
+
+Thanks to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries.
+
 
 .. _version 8.3.0:
 

From 4396dd6207f5bb1c310ea897065c0c6e17d5f5b1 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 28 May 2022 14:32:56 +0200
Subject: [PATCH 1167/1407] release 8.4.0

---
 IPython/core/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 9d236997c27..cda5c32d444 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,7 +20,7 @@
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-# _version_extra = ""  # Uncomment this for full releases
+_version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From af37d7b2206fa3c3520b304011b4294fa3019da2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 28 May 2022 14:33:21 +0200
Subject: [PATCH 1168/1407] back to dev

---
 IPython/core/release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index cda5c32d444..1d6483ce50e 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -16,11 +16,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 8
-_version_minor = 4
+_version_minor = 5
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-_version_extra = ""  # Uncomment this for full releases
+# _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From d09a817d1deeea97ea43778780da7ee6ce47cbe9 Mon Sep 17 00:00:00 2001
From: TenzinRabgy <tenzinrabgy@gmail.com>
Date: Thu, 2 Jun 2022 12:05:04 -0400
Subject: [PATCH 1169/1407] Update python2 code example to python3, print '' ->
 print('')

---
 IPython/lib/demo.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/IPython/lib/demo.py b/IPython/lib/demo.py
index 8c9ae905d49..ebffd54abde 100644
--- a/IPython/lib/demo.py
+++ b/IPython/lib/demo.py
@@ -136,7 +136,7 @@
     #################### EXAMPLE DEMO <ex_demo.py> ###############################
     '''A simple interactive demo to illustrate the use of IPython's Demo class.'''
 
-    print 'Hello, welcome to an interactive IPython demo.'
+    print('Hello, welcome to an interactive IPython demo.')
 
     # The mark below defines a block boundary, which is a point where IPython will
     # stop execution and return to the interactive prompt. The dashes are actually
@@ -152,21 +152,21 @@
     # the mark below makes this block as silent
     # <demo> silent
 
-    print 'This is a silent block, which gets executed but not printed.'
+    print('This is a silent block, which gets executed but not printed.')
 
     # <demo> stop
     # <demo> auto
-    print 'This is an automatic block.'
-    print 'It is executed without asking for confirmation, but printed.'
-    z = x+y
+    print('This is an automatic block.')
+    print('It is executed without asking for confirmation, but printed.')
+    z = x + y
 
-    print 'z=',x
+    print('z =', x)
 
     # <demo> stop
     # This is just another normal block.
-    print 'z is now:', z
+    print('z is now:', z)
 
-    print 'bye!'
+    print('bye!')
     ################### END EXAMPLE DEMO <ex_demo.py> ############################
 """
 

From 971e5ce2f61bc688e70b91280cff0ab0a3e098c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Fri, 10 Jun 2022 14:19:38 +0200
Subject: [PATCH 1170/1407] Modernize setuptools usage in pyproject.toml

1. Remove the redundant `wheel` dependency.  The setuptools build
   backend has been adding it automatically since day one, and it was
   explicitly specified in the docs as a mistake.  See:
   https://github.com/pypa/setuptools/commit/f7d30a9529378cf69054b5176249e5457aaf640a

2. Replace the legacy backend with the regular backend.  The legacy
   backend was only intended to be used implicitly when `pyproject.toml`
   does not specify only, and was not supposed to be specified
   explicitly there.  See:
   https://github.com/pypa/setuptools/issues/1689

3. Prepend the current directory to `sys.path` as required for
   `setup.py` to reliably import `setupbase`.  The non-legacy backend
   no longer does this for us.
---
 pyproject.toml | 4 ++--
 setup.py       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index c68b8c200f3..48ea37fb0f7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,3 @@
 [build-system]
-requires = ["setuptools >= 51.0.0", "wheel"]
-build-backend = "setuptools.build_meta:__legacy__"
+requires = ["setuptools >= 51.0.0"]
+build-backend = "setuptools.build_meta"
diff --git a/setup.py b/setup.py
index fbaa5f63cba..3c1dff9cc1c 100644
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,8 @@
 from setuptools import setup
 
 # Our own imports
+sys.path.insert(0, ".")
+
 from setupbase import target_update
 
 from setupbase import (

From ccd53253d1bdbf0ac1be7ad21be52e7a59a54364 Mon Sep 17 00:00:00 2001
From: Tom Nicholas <35968931+TomNicholas@users.noreply.github.com>
Date: Thu, 16 Jun 2022 14:57:09 -0400
Subject: [PATCH 1171/1407] Don't strip decorators before feeding into
 block_parser (#13612)

make sure only pseudo-decorators are stripped before feeding into block_parser
---
 IPython/sphinxext/ipython_directive.py               | 7 +++++--
 docs/source/whatsnew/pr/stripping-decorators-bug.rst | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 docs/source/whatsnew/pr/stripping-decorators-bug.rst

diff --git a/IPython/sphinxext/ipython_directive.py b/IPython/sphinxext/ipython_directive.py
index 18bdfcae993..b1f3931a475 100644
--- a/IPython/sphinxext/ipython_directive.py
+++ b/IPython/sphinxext/ipython_directive.py
@@ -821,8 +821,11 @@ def process_pure_python(self, content):
                 output.append(line)
                 continue
 
-            # handle decorators
-            if line_stripped.startswith('@'):
+            # handle pseudo-decorators, whilst ensuring real python decorators are treated as input
+            if any(
+                line_stripped.startswith("@" + pseudo_decorator)
+                for pseudo_decorator in PSEUDO_DECORATORS
+            ):
                 output.extend([line])
                 if 'savefig' in line:
                     savefig = True # and need to clear figure
diff --git a/docs/source/whatsnew/pr/stripping-decorators-bug.rst b/docs/source/whatsnew/pr/stripping-decorators-bug.rst
new file mode 100644
index 00000000000..2ea03d7f9f7
--- /dev/null
+++ b/docs/source/whatsnew/pr/stripping-decorators-bug.rst
@@ -0,0 +1,4 @@
+Stripping decorators bug
+========================
+
+Fixed bug which meant that ipython code blocks in restructured text documents executed with the ipython-sphinx extension skipped any lines of code containing python decorators.

From a72418e2dcdfc3c91f70d724d16d2691a41c9c24 Mon Sep 17 00:00:00 2001
From: JD Smith <93749+jdtsmith@users.noreply.github.com>
Date: Thu, 16 Jun 2022 15:15:36 -0400
Subject: [PATCH 1172/1407] Restore lineno's for Input mapped files (#13560)

* Implement lineno's for Input mapped files
* Adopt In [123], line 123 format
* Revert "Set co_name for cells run line by line. Fixes https://github.com/ipython/ipykernel/issues/841"
  (This reverts commit d11e987f174a15f1640f8006c86f58d884c3faa4.)
* Omit mention of ", in <module>" for input tracebacks
* Input cell -> Cell
* Remove <module> from traceback doctests
* Use f-string for `in ...' format
* Simplify _format_list logic, converting to f-strings
---
 IPython/core/interactiveshell.py              | 25 ----------
 IPython/core/tests/test_iplib.py              | 12 ++---
 IPython/core/ultratb.py                       | 50 ++++++++-----------
 .../whatsnew/pr/restore-line-numbers.rst      | 50 +++++++++++++++++++
 4 files changed, 78 insertions(+), 59 deletions(-)
 create mode 100644 docs/source/whatsnew/pr/restore-line-numbers.rst

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 371a3dad77e..7587a1d6bb8 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -16,7 +16,6 @@
 import atexit
 import bdb
 import builtins as builtin_mod
-import dis
 import functools
 import inspect
 import os
@@ -3212,29 +3211,6 @@ def transform_ast(self, node):
             ast.fix_missing_locations(node)
         return node
 
-    def _update_code_co_name(self, code):
-        """Python 3.10 changed the behaviour so that whenever a code object
-        is assembled in the compile(ast) the co_firstlineno would be == 1.
-
-        This makes pydevd/debugpy think that all cells invoked are the same
-        since it caches information based on (co_firstlineno, co_name, co_filename).
-
-        Given that, this function changes the code 'co_name' to be unique
-        based on the first real lineno of the code (which also has a nice
-        side effect of customizing the name so that it's not always <module>).
-
-        See: https://github.com/ipython/ipykernel/issues/841
-        """
-        if not hasattr(code, "replace"):
-            # It may not be available on older versions of Python (only
-            # available for 3.8 onwards).
-            return code
-        try:
-            first_real_line = next(dis.findlinestarts(code))[1]
-        except StopIteration:
-            return code
-        return code.replace(co_name="<cell line: %s>" % (first_real_line,))
-
     async def run_ast_nodes(
         self,
         nodelist: ListType[stmt],
@@ -3333,7 +3309,6 @@ def compare(code):
                     else 0x0
                 ):
                     code = compiler(mod, cell_name, mode)
-                    code = self._update_code_co_name(code)
                     asy = compare(code)
                 if await self.run_code(code, result, async_=asy):
                     return True
diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index ec7007e0f2c..14474bb0da1 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -45,7 +45,7 @@ def doctest_tb_plain():
 
     In [19]: run simpleerr.py
     Traceback (most recent call last):
-      File ...:... in <module>
+      File ...:...
         bar(mode)
       File ...:... in bar
         div0()
@@ -64,7 +64,7 @@ def doctest_tb_context():
     ---------------------------------------------------------------------------
     ZeroDivisionError                         Traceback (most recent call last)
     <BLANKLINE>
-    ... in <module>
+    ...
          30     except IndexError:
          31         mode = 'div'
     ---> 33     bar(mode)
@@ -93,7 +93,7 @@ def doctest_tb_verbose():
     ---------------------------------------------------------------------------
     ZeroDivisionError                         Traceback (most recent call last)
     <BLANKLINE>
-    ... in <module>
+    ...
          30     except IndexError:
          31         mode = 'div'
     ---> 33     bar(mode)
@@ -134,7 +134,7 @@ def doctest_tb_sysexit():
     Traceback (most recent call last):
       File ...:... in execfile
         exec(compiler(f.read(), fname, "exec"), glob, loc)
-      File ...:... in <module>
+      File ...:...
         bar(mode)
       File ...:... in bar
         sysexit(stat, mode)
@@ -152,7 +152,7 @@ def doctest_tb_sysexit():
          ... with open(fname, "rb") as f:
          ...     compiler = compiler or compile
     ---> ...     exec(compiler(f.read(), fname, "exec"), glob, loc)
-    ...<module>
+    ...
          30     except IndexError:
          31         mode = 'div'
     ---> 33     bar(mode)
@@ -189,7 +189,7 @@ def doctest_tb_sysexit_verbose():
     ---------------------------------------------------------------------------
     SystemExit                                Traceback (most recent call last)
     <BLANKLINE>
-    ... in <module>
+    ...
          30     except IndexError:
          31         mode = 'div'
     ---> 33     bar(mode)
diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 5649a78d4bd..125ee9a78a4 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -187,7 +187,10 @@ def _format_filename(file, ColorFilename, ColorNormal, *, lineno=None):
 
     if ipinst is not None and file in ipinst.compile._filename_map:
         file = "[%s]" % ipinst.compile._filename_map[file]
-        tpl_link = f"Input {ColorFilename}In {{file}}{ColorNormal}"
+        if lineno is None:
+            tpl_link = f"Cell {ColorFilename}In {{file}}{ColorNormal}"
+        else:
+            tpl_link = f"Cell {ColorFilename}In {{file}}, line {{lineno}}{ColorNormal}"
     else:
         file = util_path.compress_user(
             py3compat.cast_unicode(file, util_path.fs_encoding)
@@ -463,34 +466,25 @@ def _format_list(self, extracted_list):
 
         Colors = self.Colors
         list = []
-        for filename, lineno, name, line in extracted_list[:-1]:
-            item = "  %s in %s%s%s\n" % (
-                _format_filename(
-                    filename, Colors.filename, Colors.Normal, lineno=lineno
-                ),
-                Colors.name,
-                name,
-                Colors.Normal,
+        for ind, (filename, lineno, name, line) in enumerate(extracted_list):
+            normalCol, nameCol, fileCol, lineCol = (
+                # Emphasize the last entry
+                (Colors.normalEm, Colors.nameEm, Colors.filenameEm, Colors.line)
+                if ind == len(extracted_list) - 1
+                else (Colors.Normal, Colors.name, Colors.filename, "")
             )
+
+            fns = _format_filename(filename, fileCol, normalCol, lineno=lineno)
+            item = f"{normalCol}  {fns}"
+
+            if name != "<module>":
+                item += f" in {nameCol}{name}{normalCol}\n"
+            else:
+                item += "\n"
             if line:
-                item += '    %s\n' % line.strip()
+                item += f"{lineCol}    {line.strip()}{normalCol}\n"
             list.append(item)
-        # Emphasize the last entry
-        filename, lineno, name, line = extracted_list[-1]
-        item = "%s  %s in %s%s%s%s\n" % (
-            Colors.normalEm,
-            _format_filename(
-                filename, Colors.filenameEm, Colors.normalEm, lineno=lineno
-            ),
-            Colors.nameEm,
-            name,
-            Colors.normalEm,
-            Colors.Normal,
-        )
-        if line:
-            item += '%s    %s%s\n' % (Colors.line, line.strip(),
-                                      Colors.Normal)
-        list.append(item)
+
         return list
 
     def _format_exception_only(self, etype, value):
@@ -687,7 +681,7 @@ def format_record(self, frame_info):
 
         func = frame_info.executing.code_qualname()
         if func == "<module>":
-            call = tpl_call.format(file=func, scope="")
+            call = ""
         else:
             # Decide whether to include variable details or not
             var_repr = eqrepr if self.include_vars else nullrepr
@@ -731,7 +725,7 @@ def format_record(self, frame_info):
         if lvals_list:
             lvals = '%s%s' % (indent, em_normal.join(lvals_list))
 
-        result = "%s, %s\n" % (link, call)
+        result = f'{link}{", " if call else ""}{call}\n'
 
         result += ''.join(_format_traceback_lines(frame_info.lines, Colors, self.has_colors, lvals))
         return result
diff --git a/docs/source/whatsnew/pr/restore-line-numbers.rst b/docs/source/whatsnew/pr/restore-line-numbers.rst
new file mode 100644
index 00000000000..fb0729247a3
--- /dev/null
+++ b/docs/source/whatsnew/pr/restore-line-numbers.rst
@@ -0,0 +1,50 @@
+Restore line numbers for Input
+==================================
+
+Line number information in tracebacks from input are restored.
+Line numbers from input were removed during the transition to v8 enhanced traceback reporting.
+
+So, instead of::
+
+    ---------------------------------------------------------------------------
+    ZeroDivisionError                         Traceback (most recent call last)
+    Input In [3], in <cell line: 1>()
+    ----> 1 myfunc(2)
+
+    Input In [2], in myfunc(z)
+          1 def myfunc(z):
+    ----> 2     foo.boo(z-1)
+
+    File ~/code/python/ipython/foo.py:3, in boo(x)
+          2 def boo(x):
+    ----> 3     return 1/(1-x)
+
+    ZeroDivisionError: division by zero
+
+The error traceback now looks like::
+
+      ---------------------------------------------------------------------------
+      ZeroDivisionError                         Traceback (most recent call last)
+      Cell In [3], line 1
+      ----> 1 myfunc(2)
+
+      Cell In [2], line 2, in myfunc(z)
+            1 def myfunc(z):
+      ----> 2     foo.boo(z-1)
+
+      File ~/code/python/ipython/foo.py:3, in boo(x)
+            2 def boo(x):
+      ----> 3     return 1/(1-x)
+
+      ZeroDivisionError: division by zero
+
+or, with xmode=Plain::
+
+    Traceback (most recent call last):
+      Cell In [12], line 1
+        myfunc(2)
+      Cell In [6], line 2 in myfunc
+        foo.boo(z-1)
+      File ~/code/python/ipython/foo.py:3 in boo
+        return 1/(1-x)
+    ZeroDivisionError: division by zero

From 71d665c47dfea1bf5aea9985caded825fba73abe Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sun, 17 Apr 2022 00:16:27 -0400
Subject: [PATCH 1173/1407] ipython_directive: Adjust doc examples for
 reproducibility.

Before this change, building the documentation twice in a row in an
environment configured for reproducible bulids would result in
discrepancies such as:

   diff -ru /gnu/store/...-python-ipython-documentation-8.2.0/share/doc/python-ipython-documentation-8.2.0/html/sphinxext.html /gnu/store/...-python-ipython-documentation-8.2.0-check/share/doc/python-ipython-documentation-8.2.0/html/sphinxext.html
   --- /gnu/store/...-python-ipython-documentation-8.2.0/share/doc/python-ipython-documentation-8.2.0/html/sphinxext.html       1969-12-31 19:00:01.000000000 -0500
   +++ /gnu/store/...-python-ipython-documentation-8.2.0-check/share/doc/python-ipython-documentation-8.2.0/html/sphinxext.html 1969-12-31 19:00:01.000000000 -0500
   @@ -682,7 +682,7 @@
    <span class="gp">In [2]: </span><span class="kn">import</span> <span class="nn">datetime</span>
    <span class="gp">   ...: </span><span class="n">datetime</span><span class="o">.</span><span class="n">datetime</span><span class="o">.</span><span class="n">now</span><span class="p">()</span>
    <span class="gp">   ...: </span>
   -<span class="gh">Out[2]: </span><span class="go">datetime.datetime(2022, 4, 17, 3, 21, 14, 978155)</span>
   +<span class="gh">Out[2]: </span><span class="go">datetime.datetime(2022, 4, 17, 3, 37, 37, 115081)</span>
    </pre></div>
    </div>
    <p>It supports IPython construct that plain
   @@ -690,7 +690,7 @@
    <div class="highlight-ipython notranslate"><div class="highlight"><pre><span></span><span class="gp">In [3]: </span><span class="kn">import</span> <span class="nn">time</span>

    <span class="gp">In [4]: </span><span class="o">%</span><span class="k">timeit</span> time.sleep(0.05)
   -<span class="go">50.2 ms +- 104 us per loop (mean +- std. dev. of 7 runs, 10 loops each)</span>
   +<span class="go">50.1 ms +- 8.86 us per loop (mean +- std. dev. of 7 runs, 10 loops each)</span>
    </pre></div>
    </div>
    <p>This will also support top-level async when using IPython 7.0+</p>

* IPython/sphinxext/ipython_directive.py: Use a fixed date string in
the datetime example, and replace the %timeit example by %pdoc, whole
output is static.
---
 IPython/sphinxext/ipython_directive.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/sphinxext/ipython_directive.py b/IPython/sphinxext/ipython_directive.py
index b1f3931a475..9e3c7b2276a 100644
--- a/IPython/sphinxext/ipython_directive.py
+++ b/IPython/sphinxext/ipython_directive.py
@@ -19,7 +19,7 @@
    In [1]: 1+1
 
    In [1]: import datetime
-      ...: datetime.datetime.now()
+      ...: datetime.date.fromisoformat('2022-02-22')
 
 It supports IPython construct that plain
 Python does not understand (like magics):
@@ -28,7 +28,7 @@
 
    In [0]: import time
 
-   In [0]: %timeit time.sleep(0.05)
+   In [0]: %pdoc time.sleep
 
 This will also support top-level async when using IPython 7.0+
 

From f20e3b80393a1a5909a050cb7bb9cbce9e044827 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sun, 17 Apr 2022 00:21:46 -0400
Subject: [PATCH 1174/1407] utils: coloransi: Escape Unicode U0001 and U0002
 non-printable characters.

Fixes #13637.

These Unicode characters, would cause problems when processed by LaTeX
to generate the info or PDF documentation targets.

* IPython/utils/coloransi.py (InputTermColors): Escape the backslashes
in \001 and \002 so that they are shown as literals '\001' and '\002'
strings in the Sphinx-generated documentation rather than as
non-printable Unicode characters.
---
 IPython/utils/coloransi.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/utils/coloransi.py b/IPython/utils/coloransi.py
index e3314218025..9300b010856 100644
--- a/IPython/utils/coloransi.py
+++ b/IPython/utils/coloransi.py
@@ -74,8 +74,8 @@ class TermColors:
 class InputTermColors:
     """Color escape sequences for input prompts.
 
-    This class is similar to TermColors, but the escapes are wrapped in \001
-    and \002 so that readline can properly know the length of each line and
+    This class is similar to TermColors, but the escapes are wrapped in \\001
+    and \\002 so that readline can properly know the length of each line and
     can wrap lines accordingly.  Use this class for any colored text which
     needs to be used in input prompts, such as in calls to raw_input().
 

From b3dca841a72a00f8642e921259130fc0c78e4170 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 22 Jun 2022 17:08:01 +0200
Subject: [PATCH 1175/1407] Misc documentation fixes.

Should in particular close Quansight/deshaw#227
---
 IPython/core/magics/basic.py      | 2 +-
 docs/source/interactive/shell.rst | 2 +-
 docs/source/whatsnew/version7.rst | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py
index c1f69451100..ea407c61811 100644
--- a/IPython/core/magics/basic.py
+++ b/IPython/core/magics/basic.py
@@ -368,7 +368,7 @@ def xmode(self, parameter_s=''):
 
         If called without arguments, acts as a toggle.
 
-        When in verbose mode the value --show (and --hide)
+        When in verbose mode the value `--show` (and `--hide`)
         will respectively show (or hide) frames with ``__tracebackhide__ =
         True`` value set.
         """
diff --git a/docs/source/interactive/shell.rst b/docs/source/interactive/shell.rst
index 0ea125cb9ef..6362b21ea61 100644
--- a/docs/source/interactive/shell.rst
+++ b/docs/source/interactive/shell.rst
@@ -1,10 +1,10 @@
-.. _ipython_as_shell:
 
 .. note::
 
    This page has been kept for historical reason. You most likely want to use
    `Xonsh <https://xon.sh/>`__ instead of this.
 
+.. _ipython_as_shell:
 
 =========================
 IPython as a system shell
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 16987a77048..9c510462408 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -241,6 +241,7 @@ such that it allows autoplay.
     the HTML allowing it. It also could get blocked by some browser extensions.
 
 Try it out!
+
 ::
 
     In [1]: from IPython.display import YouTubeVideo
@@ -1368,7 +1369,6 @@ Miscellaneous
 IPython 7.3.0
 =============
 
-.. _whatsnew720:
 
 IPython 7.3.0 bring several bug fixes and small improvements that you will
 described bellow. 
@@ -1393,6 +1393,8 @@ Misc bug fixes and improvements:
  - Re-initialize posix aliases after a ``%reset`` :ghpull:`11528`
  - Allow the IPython command line to run ``*.ipynb`` files :ghpull:`11529`
 
+.. _whatsnew720:
+   
 IPython 7.2.0
 =============
 
@@ -1423,8 +1425,7 @@ and we're now proud to have code contributed by Chris in IPython.
 OSMagics.cd_force_quiet configuration option
 --------------------------------------------
 
-You can set this option to force the %cd magic to behave as if ``-q`` was passed:
-::
+You can set this option to force the %cd magic to behave as if ``-q`` was passed::
 
     In [1]: cd /
     /

From aff5624c5da935350b802e6b066a154a439d91b6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 23 Jun 2022 11:27:35 +0200
Subject: [PATCH 1176/1407] extend buffer len

---
 IPython/core/tests/test_debugger.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index d2d5bd09991..0c479abd30d 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -379,6 +379,7 @@ def _decorator_skip_setup():
     child.expect("\n")
 
     child.timeout = 5 * IPYTHON_TESTING_TIMEOUT_SCALE
+    child.str_last_chars = 500
 
     dedented_blocks = [dedent(b).strip() for b in skip_decorators_blocks]
     in_prompt_number = 1

From 079c54f4a370d9dddda81a21a41a602afeaf79d6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 23 Jun 2022 11:41:19 +0200
Subject: [PATCH 1177/1407] no CPR

---
 IPython/core/tests/test_debugger.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 0c479abd30d..fc81b71bc55 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -369,6 +369,7 @@ def _decorator_skip_setup():
 
     env = os.environ.copy()
     env["IPY_TEST_SIMPLE_PROMPT"] = "1"
+    env["PROMPT_TOOLKIT_NO_CPR"] = "1"
 
     child = pexpect.spawn(
         sys.executable, ["-m", "IPython", "--colors=nocolor"], env=env

From 99e4bc42310710f4c126a9bf1047ebc70d0baa3a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 23 Jun 2022 11:52:53 +0200
Subject: [PATCH 1178/1407] try to fix tests

---
 IPython/core/tests/test_debugger.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index fc81b71bc55..171f03d664a 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -452,11 +452,13 @@ def test_decorator_skip_with_breakpoint():
 
     env = os.environ.copy()
     env["IPY_TEST_SIMPLE_PROMPT"] = "1"
+    env["PROMPT_TOOLKIT_NO_CPR"] = "1"
 
     child = pexpect.spawn(
         sys.executable, ["-m", "IPython", "--colors=nocolor"], env=env
     )
     child.timeout = 15 * IPYTHON_TESTING_TIMEOUT_SCALE
+    child.str_last_chars = 500
 
     child.expect("IPython")
     child.expect("\n")

From 9891cc714271c35d72f34f3625cdea11f070cf36 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 23 Jun 2022 12:00:31 +0200
Subject: [PATCH 1179/1407] try to avoid using ptk in subprocess tests

---
 IPython/terminal/debugger.py | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index 8448d96370d..1859da20410 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -20,6 +20,11 @@
 PTK3 = ptk_version.startswith('3.')
 
 
+# we want to avoid ptk as much as possible when using subprocesses
+# as it uses cursor positioning requests, deletes color ....
+_use_simple_prompt = "IPY_TEST_SIMPLE_PROMPT" in os.environ
+
+
 class TerminalPdb(Pdb):
     """Standalone IPython debugger."""
 
@@ -87,8 +92,9 @@ def gen_comp(self, text):
         if not PTK3:
             options['inputhook'] = self.shell.inputhook
         options.update(pt_session_options)
-        self.pt_loop = asyncio.new_event_loop()
-        self.pt_app = PromptSession(**options)
+        if not _use_simple_prompt:
+            self.pt_loop = asyncio.new_event_loop()
+            self.pt_app = PromptSession(**options)
 
     def cmdloop(self, intro=None):
         """Repeatedly issue a prompt, accept input, parse an initial prefix
@@ -121,10 +127,15 @@ def cmdloop(self, intro=None):
                     self._ptcomp.ipy_completer.global_namespace = self.curframe.f_globals
 
                     # Run the prompt in a different thread.
-                    try:
-                        line = self.thread_executor.submit(self.pt_app.prompt).result()
-                    except EOFError:
-                        line = "EOF"
+                    if not _use_simple_prompt:
+                        try:
+                            line = self.thread_executor.submit(
+                                self.pt_app.prompt
+                            ).result()
+                        except EOFError:
+                            line = "EOF"
+                    else:
+                        line = input("ipdb> ")
 
                 line = self.precmd(line)
                 stop = self.onecmd(line)

From 55c0cedfa94e71a49cd4e60df803098f8d93daef Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 23 Jun 2022 12:22:53 +0200
Subject: [PATCH 1180/1407] debug

---
 IPython/core/tests/test_debugger.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 171f03d664a..d5ccfba4ee3 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -400,12 +400,15 @@ def test_decorator_skip():
 
     child = _decorator_skip_setup()
 
+    child.expect_exact("ipython-input-8")
     child.expect_exact("3     bar(3, 4)")
     child.expect("ipdb>")
 
     child.expect("ipdb>")
     child.sendline("step")
     child.expect_exact("step")
+    child.expect_exact("--Call--")
+    child.expect_exact("ipython-input-6")
 
     child.expect_exact("1 @pdb_skipped_decorator")
 

From 8cce7903f85887f137ca0ac9567b14b666dbd2e3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 23 Jun 2022 12:53:50 +0200
Subject: [PATCH 1181/1407] always skip

---
 IPython/core/tests/test_debugger.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index d5ccfba4ee3..5a12c3bb2ad 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -394,6 +394,7 @@ def _decorator_skip_setup():
     return child
 
 
+@pytest.mark.skip(reason="recently fail for unknown reason on CI")
 @skip_win32
 def test_decorator_skip():
     """test that decorator frames can be skipped."""
@@ -418,6 +419,7 @@ def test_decorator_skip():
     child.close()
 
 
+@pytest.mark.skip(reason="recently fail for unknown reason on CI")
 @pytest.mark.skipif(platform.python_implementation() == "PyPy", reason="issues on PyPy")
 @skip_win32
 def test_decorator_skip_disabled():

From 66aeb3fc55c8ac04242e566172af5de5cc6fe71e Mon Sep 17 00:00:00 2001
From: Clemens Brunner <clemens.brunner@gmail.com>
Date: Mon, 18 Jul 2022 17:03:32 +0200
Subject: [PATCH 1182/1407] Add setting to disable venv warning (#13706)

* Add setting to disable venv warning

* Fix style

* Add what's new entry

* Improve help text

* Use double quotes

Co-authored-by: Blazej Michalik <6691643+MrMino@users.noreply.github.com>

* Add missing comma

Co-authored-by: Blazej Michalik <6691643+MrMino@users.noreply.github.com>
---
 IPython/core/interactiveshell.py                  | 15 ++++++++++-----
 .../pr/silence-running-in-venv-warning.rst        |  8 ++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 docs/source/whatsnew/pr/silence-running-in-venv-warning.rst

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 7587a1d6bb8..06912640673 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -479,6 +479,11 @@ def input_splitter(self):
         """
     ).tag(config=True)
 
+    warn_venv = Bool(
+        True,
+        help="Warn if running in a virtual environment with no IPython installed (so IPython from the global environment is used).",
+    ).tag(config=True)
+
     # TODO: this part of prompt management should be moved to the frontends.
     # Use custom TraitTypes that convert '0'->'' and '\\n'->'\n'
     separate_in = SeparateUnicode('\n').tag(config=True)
@@ -847,11 +852,11 @@ def init_virtualenv(self):
                     p_ver = re_m.groups()
 
             virtual_env = str(virtual_env_path).format(*p_ver)
-
-        warn(
-            "Attempting to work in a virtualenv. If you encounter problems, "
-            "please install IPython inside the virtualenv."
-        )
+        if self.warn_venv:
+            warn(
+                "Attempting to work in a virtualenv. If you encounter problems, "
+                "please install IPython inside the virtualenv."
+            )
         import site
         sys.path.insert(0, virtual_env)
         site.addsitedir(virtual_env)
diff --git a/docs/source/whatsnew/pr/silence-running-in-venv-warning.rst b/docs/source/whatsnew/pr/silence-running-in-venv-warning.rst
new file mode 100644
index 00000000000..ed245bd157a
--- /dev/null
+++ b/docs/source/whatsnew/pr/silence-running-in-venv-warning.rst
@@ -0,0 +1,8 @@
+New setting to silence warning if working inside a virtual environment
+======================================================================
+
+Previously, when starting IPython in a virtual environment without IPython installed (so IPython from the global environment is used), the following warning was printed:
+
+    Attempting to work in a virtualenv. If you encounter problems, please install IPython inside the virtualenv.
+
+This warning can be permanently silenced by setting ``c.InteractiveShell.warn_venv`` to ``False`` (the default is ``True``).

From d858213d4088237e1481038865bc52ccdd074053 Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Fri, 29 Jul 2022 08:48:59 +0200
Subject: [PATCH 1183/1407] xxlimited_35 module now has the same name in repr
 in Py 3.11

See https://github.com/python/cpython/commit/a87c9b538fbfc42883417c4d5e69f1a5922690e3
---
 IPython/lib/tests/test_pretty.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py
index 86085166071..b93ab97eb9e 100644
--- a/IPython/lib/tests/test_pretty.py
+++ b/IPython/lib/tests/test_pretty.py
@@ -141,9 +141,12 @@ def test_pprint_heap_allocated_type():
     Test that pprint works for heap allocated types.
     """
     module_name = "xxlimited" if sys.version_info < (3, 10) else "xxlimited_35"
+    expected_output = (
+        "xxlimited.Null" if sys.version_info < (3, 11) else "xxlimited_35.Null"
+    )
     xxlimited = pytest.importorskip(module_name)
     output = pretty.pretty(xxlimited.Null)
-    assert output == "xxlimited.Null"
+    assert output == expected_output
 
 
 def test_pprint_nomod():

From b7dfcf479203b2423df15b4b0a435dfe3d02efcf Mon Sep 17 00:00:00 2001
From: Pieter Eendebak <pieter.eendebak@gmail.com>
Date: Tue, 24 May 2022 21:29:59 +0200
Subject: [PATCH 1184/1407] prevent popup windows during execution of
 latex_to_png_dvipng

---
 IPython/lib/latextools.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py
index 27aeef5b0eb..e832a9ea863 100644
--- a/IPython/lib/latextools.py
+++ b/IPython/lib/latextools.py
@@ -144,6 +144,13 @@ def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):
         find_cmd('dvipng')
     except FindCmdError:
         return None
+
+    startupinfo = None
+    if os.name == 'nt':
+        # prevent popup-windows
+        startupinfo = subprocess.STARTUPINFO()
+        startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+
     try:
         workdir = Path(tempfile.mkdtemp())
         tmpfile = workdir.joinpath("tmp.tex")
@@ -156,7 +163,7 @@ def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):
         with open(os.devnull, 'wb') as devnull:
             subprocess.check_call(
                 ["latex", "-halt-on-error", "-interaction", "batchmode", tmpfile],
-                cwd=workdir, stdout=devnull, stderr=devnull)
+                cwd=workdir, stdout=devnull, stderr=devnull, startupinfo=startupinfo)
 
             resolution = round(150*scale)
             subprocess.check_call(
@@ -179,6 +186,7 @@ def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):
                 cwd=workdir,
                 stdout=devnull,
                 stderr=devnull,
+                startupinfo=startupinfo
             )
 
         with outfile.open("rb") as f:

From 6dbc49a85fb433079faf96572da0db464b9fd7e1 Mon Sep 17 00:00:00 2001
From: Pieter Eendebak <pieter.eendebak@gmail.com>
Date: Tue, 24 May 2022 21:35:42 +0200
Subject: [PATCH 1185/1407] darker

---
 IPython/lib/latextools.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py
index e832a9ea863..45eaa29805f 100644
--- a/IPython/lib/latextools.py
+++ b/IPython/lib/latextools.py
@@ -146,7 +146,7 @@ def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):
         return None
 
     startupinfo = None
-    if os.name == 'nt':
+    if os.name == "nt":
         # prevent popup-windows
         startupinfo = subprocess.STARTUPINFO()
         startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
@@ -163,7 +163,11 @@ def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):
         with open(os.devnull, 'wb') as devnull:
             subprocess.check_call(
                 ["latex", "-halt-on-error", "-interaction", "batchmode", tmpfile],
-                cwd=workdir, stdout=devnull, stderr=devnull, startupinfo=startupinfo)
+                cwd=workdir,
+                stdout=devnull,
+                stderr=devnull,
+                startupinfo=startupinfo,
+            )
 
             resolution = round(150*scale)
             subprocess.check_call(
@@ -186,7 +190,7 @@ def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):
                 cwd=workdir,
                 stdout=devnull,
                 stderr=devnull,
-                startupinfo=startupinfo
+                startupinfo=startupinfo,
             )
 
         with outfile.open("rb") as f:

From c60a87a0deae6afd4a4ed7f932aa26c23b716477 Mon Sep 17 00:00:00 2001
From: Pieter Eendebak <pieter.eendebak@gmail.com>
Date: Fri, 27 May 2022 19:48:23 +0200
Subject: [PATCH 1186/1407] add whatsnew entry

---
 docs/source/whatsnew/pr/latex-generation-no-popup-window.rst | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/latex-generation-no-popup-window.rst

diff --git a/docs/source/whatsnew/pr/latex-generation-no-popup-window.rst b/docs/source/whatsnew/pr/latex-generation-no-popup-window.rst
new file mode 100644
index 00000000000..4cf73afdf22
--- /dev/null
+++ b/docs/source/whatsnew/pr/latex-generation-no-popup-window.rst
@@ -0,0 +1,5 @@
+No popup in window for latex generation
+=======================================
+
+When generating latex (e.g. via `_latex_repr_`) no popup window is shows under Windows.
+

From df3b160586ee348b6bf5cd7d5a8c55032b246cfe Mon Sep 17 00:00:00 2001
From: Pieter Eendebak <pieter.eendebak@gmail.com>
Date: Tue, 24 May 2022 22:30:56 +0200
Subject: [PATCH 1187/1407] use relative filename in latex and dvips commands

---
 IPython/lib/latextools.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py
index 27aeef5b0eb..a6f44b85c60 100644
--- a/IPython/lib/latextools.py
+++ b/IPython/lib/latextools.py
@@ -146,11 +146,11 @@ def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):
         return None
     try:
         workdir = Path(tempfile.mkdtemp())
-        tmpfile = workdir.joinpath("tmp.tex")
-        dvifile = workdir.joinpath("tmp.dvi")
-        outfile = workdir.joinpath("tmp.png")
+        tmpfile = "tmp.tex"
+        dvifile = "tmp.dvi"
+        outfile = "tmp.png"
 
-        with tmpfile.open("w", encoding="utf8") as f:
+        with workdir.joinpath(tmpfile).open("w", encoding="utf8") as f:
             f.writelines(genelatex(s, wrap))
 
         with open(os.devnull, 'wb') as devnull:
@@ -181,7 +181,7 @@ def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):
                 stderr=devnull,
             )
 
-        with outfile.open("rb") as f:
+        with workdir.joinpath(outfile).open("rb") as f:
             return f.read()
     except subprocess.CalledProcessError:
         return None

From 14f8a2ab5ffccdb77c52b445769ffc0445f06b31 Mon Sep 17 00:00:00 2001
From: Pieter Eendebak <pieter.eendebak@gmail.com>
Date: Fri, 27 May 2022 19:52:58 +0200
Subject: [PATCH 1188/1407] add whatsnew entry

---
 docs/source/whatsnew/pr/latex_rendering_relative_files.rst | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/latex_rendering_relative_files.rst

diff --git a/docs/source/whatsnew/pr/latex_rendering_relative_files.rst b/docs/source/whatsnew/pr/latex_rendering_relative_files.rst
new file mode 100644
index 00000000000..5201e0a6493
--- /dev/null
+++ b/docs/source/whatsnew/pr/latex_rendering_relative_files.rst
@@ -0,0 +1,6 @@
+Relative filenames in Latex rendering
+=====================================
+
+The input and output file arguments to `latex` and `dvipis` are files relative to the current working directory.
+This solves a problem where the current working directory contains characters that are not handled properly by `latex` and `dvips`.
+

From ba4b5b33cef669b356ba106531f1f9754e40e3e8 Mon Sep 17 00:00:00 2001
From: Pieter Eendebak <pieter.eendebak@gmail.com>
Date: Mon, 13 Jun 2022 13:43:28 +0200
Subject: [PATCH 1189/1407] update whatsnew

---
 docs/source/whatsnew/pr/latex_rendering_relative_files.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/pr/latex_rendering_relative_files.rst b/docs/source/whatsnew/pr/latex_rendering_relative_files.rst
index 5201e0a6493..befd4afa35a 100644
--- a/docs/source/whatsnew/pr/latex_rendering_relative_files.rst
+++ b/docs/source/whatsnew/pr/latex_rendering_relative_files.rst
@@ -1,6 +1,7 @@
 Relative filenames in Latex rendering
 =====================================
 
-The input and output file arguments to `latex` and `dvipis` are files relative to the current working directory.
+The `latex_to_png_dvipng` command internally generates input and output file arguments to `latex` and `dvipis`. These arguments are now generated as relative files to the current working directory instead of absolute file paths.
 This solves a problem where the current working directory contains characters that are not handled properly by `latex` and `dvips`.
+There are no changes to the user API.
 

From 7a493863e55e6f055576e3a3a7c73379843141d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lum=C3=ADr=20=27Frenzy=27=20Balhar?=
 <frenzy.madness@gmail.com>
Date: Fri, 5 Aug 2022 21:53:55 +0200
Subject: [PATCH 1190/1407] Update IPython/lib/tests/test_pretty.py

Co-authored-by: Ben Greiner <code@bnavigator.de>
---
 IPython/lib/tests/test_pretty.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py
index b93ab97eb9e..2d320bffd2f 100644
--- a/IPython/lib/tests/test_pretty.py
+++ b/IPython/lib/tests/test_pretty.py
@@ -142,7 +142,7 @@ def test_pprint_heap_allocated_type():
     """
     module_name = "xxlimited" if sys.version_info < (3, 10) else "xxlimited_35"
     expected_output = (
-        "xxlimited.Null" if sys.version_info < (3, 11) else "xxlimited_35.Null"
+        "xxlimited.Null" if sys.version_info < (3, 10, 6) else "xxlimited_35.Null"
     )
     xxlimited = pytest.importorskip(module_name)
     output = pretty.pretty(xxlimited.Null)

From ebea766ceb57ec0080300b246be0699f41957e26 Mon Sep 17 00:00:00 2001
From: Aleksey Bogdanov <oleksii.bohdanov@gmail.com>
Date: Sat, 6 Aug 2022 23:21:35 +0300
Subject: [PATCH 1191/1407] Fix HistoryAccessor.get_tail bug (#13666)

Current implementation of get_tail in HistoryAccessor assumes context
present only in subclass , so it's moved there and the old
implementation is restored.
---
 IPython/core/history.py            | 88 +++++++++++++++++++-----------
 IPython/core/tests/test_history.py | 67 ++++++++++++++++++++++-
 2 files changed, 123 insertions(+), 32 deletions(-)

diff --git a/IPython/core/history.py b/IPython/core/history.py
index 9b0b2cbd048..f247f7169b7 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -202,7 +202,6 @@ def __init__(self, profile="default", hist_file="", **traits):
         config : :class:`~traitlets.config.loader.Config`
             Config object. hist_file can also be set through this.
         """
-        # We need a pointer back to the shell for various tasks.
         super(HistoryAccessor, self).__init__(**traits)
         # defer setting hist_file from kwarg until after init,
         # otherwise the default kwarg value would clobber any value
@@ -344,11 +343,6 @@ def get_last_session_id(self):
     def get_tail(self, n=10, raw=True, output=False, include_latest=False):
         """Get the last n lines from the history database.
 
-        Most recent entry last.
-
-        Completion will be reordered so that that the last ones are when
-        possible from current session.
-
         Parameters
         ----------
         n : int
@@ -367,31 +361,11 @@ def get_tail(self, n=10, raw=True, output=False, include_latest=False):
         self.writeout_cache()
         if not include_latest:
             n += 1
-        # cursor/line/entry
-        this_cur = list(
-            self._run_sql(
-                "WHERE session == ? ORDER BY line DESC LIMIT ?  ",
-                (self.session_number, n),
-                raw=raw,
-                output=output,
-            )
-        )
-        other_cur = list(
-            self._run_sql(
-                "WHERE session != ? ORDER BY session DESC, line DESC LIMIT ?",
-                (self.session_number, n),
-                raw=raw,
-                output=output,
-            )
-        )
-
-        everything = this_cur + other_cur
-
-        everything = everything[:n]
-
+        cur = self._run_sql("ORDER BY session DESC, line DESC LIMIT ?",
+                                (n,), raw=raw, output=output)
         if not include_latest:
-            return list(everything)[:0:-1]
-        return list(everything)[::-1]
+            return reversed(list(cur)[1:])
+        return reversed(list(cur))
 
     @catch_corrupt_db
     def search(self, pattern="*", raw=True, search_raw=True,
@@ -560,7 +534,6 @@ def _dir_hist_default(self):
     def __init__(self, shell=None, config=None, **traits):
         """Create a new history manager associated with a shell instance.
         """
-        # We need a pointer back to the shell for various tasks.
         super(HistoryManager, self).__init__(shell=shell, config=config,
             **traits)
         self.save_flag = threading.Event()
@@ -656,6 +629,59 @@ def get_session_info(self, session=0):
 
         return super(HistoryManager, self).get_session_info(session=session)
 
+    @catch_corrupt_db
+    def get_tail(self, n=10, raw=True, output=False, include_latest=False):
+        """Get the last n lines from the history database.
+
+        Most recent entry last.
+
+        Completion will be reordered so that that the last ones are when
+        possible from current session.
+
+        Parameters
+        ----------
+        n : int
+            The number of lines to get
+        raw, output : bool
+            See :meth:`get_range`
+        include_latest : bool
+            If False (default), n+1 lines are fetched, and the latest one
+            is discarded. This is intended to be used where the function
+            is called by a user command, which it should not return.
+
+        Returns
+        -------
+        Tuples as :meth:`get_range`
+        """
+        self.writeout_cache()
+        if not include_latest:
+            n += 1
+        # cursor/line/entry
+        this_cur = list(
+            self._run_sql(
+                "WHERE session == ? ORDER BY line DESC LIMIT ?  ",
+                (self.session_number, n),
+                raw=raw,
+                output=output,
+            )
+        )
+        other_cur = list(
+            self._run_sql(
+                "WHERE session != ? ORDER BY session DESC, line DESC LIMIT ?",
+                (self.session_number, n),
+                raw=raw,
+                output=output,
+            )
+        )
+
+        everything = this_cur + other_cur
+
+        everything = everything[:n]
+
+        if not include_latest:
+            return list(everything)[:0:-1]
+        return list(everything)[::-1]
+
     def _get_range_session(self, start=1, stop=None, raw=True, output=False):
         """Get input and output history from the current session. Called by
         get_range, and takes similar parameters."""
diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
index 73d50c87d34..b98ef7683a3 100644
--- a/IPython/core/tests/test_history.py
+++ b/IPython/core/tests/test_history.py
@@ -17,7 +17,7 @@
 # our own packages
 from traitlets.config.loader import Config
 
-from IPython.core.history import HistoryManager, extract_hist_ranges
+from IPython.core.history import HistoryAccessor, HistoryManager, extract_hist_ranges
 
 
 def test_proper_default_encoding():
@@ -227,3 +227,68 @@ def test_histmanager_disabled():
 
     # hist_file should not be created
     assert hist_file.exists() is False
+
+def test_get_tail_session_awareness():
+    """Test .get_tail() is:
+                - session specific in HistoryManager
+                - session agnostic in HistoryAccessor
+            same for .get_last_session_id()
+    """
+    ip = get_ipython()
+    with TemporaryDirectory() as tmpdir:
+        tmp_path = Path(tmpdir)
+        hist_file = tmp_path / "history.sqlite"
+        get_source = lambda x: x[2]
+
+        # hm1 creates a new session and adds history entries,
+        # ha catches up
+        hm1 = HistoryManager(shell=ip, hist_file=hist_file)
+        hm1_last_sid = hm1.get_last_session_id
+        ha = HistoryAccessor(hist_file=hist_file)
+        ha_last_sid = ha.get_last_session_id
+
+        hist1 = ["a=1", "b=1", "c=1"]
+        for i, h in enumerate(hist1 + [""], start=1):
+            hm1.store_inputs(i, h)
+        assert list(map(get_source, hm1.get_tail())) == hist1
+        assert list(map(get_source, ha.get_tail())) == hist1
+        sid1 = hm1_last_sid()
+        assert sid1 is not None
+        assert ha_last_sid() == sid1
+
+        # hm2 creates a new session and adds entries,
+        # ha catches up
+        hm2 = HistoryManager(shell=ip, hist_file=hist_file)
+        hm2_last_sid = hm2.get_last_session_id
+
+        hist2 = ["a=2", "b=2", "c=2"]
+        for i, h in enumerate(hist2 + [""], start=1):
+            hm2.store_inputs(i, h)
+        tail = hm2.get_tail(n=3)
+        assert list(map(get_source, tail)) == hist2
+        tail = ha.get_tail(n=3)
+        assert list(map(get_source, tail)) == hist2
+        sid2 = hm2_last_sid()
+        assert sid2 is not None
+        assert ha_last_sid() == sid2
+        assert sid2 != sid1
+
+        # but hm1 still maintains its point of reference
+        # and adding more entries to it doesn't change others
+        # immediate perspective
+        assert hm1_last_sid() == sid1
+        tail = hm1.get_tail(n=3)
+        assert list(map(get_source, tail)) == hist1
+
+        hist3 = ["a=3", "b=3", "c=3"]
+        for i, h in enumerate(hist3 + [""], start=5):
+            hm1.store_inputs(i, h)
+        tail = hm1.get_tail(n=7)
+        assert list(map(get_source, tail)) == hist1 + [""] + hist3
+        tail = hm2.get_tail(n=3)
+        assert list(map(get_source, tail)) == hist2
+        tail = ha.get_tail(n=3)
+        assert list(map(get_source, tail)) == hist2
+        assert hm1_last_sid() == sid1
+        assert hm2_last_sid() == sid2
+        assert ha_last_sid() == sid2

From 7a11a58da2a65f1cc7b177f5161a7f17050e26b7 Mon Sep 17 00:00:00 2001
From: Aleksey Bogdanov <oleksii.bohdanov@gmail.com>
Date: Sun, 7 Aug 2022 10:35:08 +0300
Subject: [PATCH 1192/1407] Fix formatting issues

---
 IPython/core/history.py            | 5 +++--
 IPython/core/tests/test_history.py | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/IPython/core/history.py b/IPython/core/history.py
index f247f7169b7..1a89060e92e 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -361,8 +361,9 @@ def get_tail(self, n=10, raw=True, output=False, include_latest=False):
         self.writeout_cache()
         if not include_latest:
             n += 1
-        cur = self._run_sql("ORDER BY session DESC, line DESC LIMIT ?",
-                                (n,), raw=raw, output=output)
+        cur = self._run_sql(
+            "ORDER BY session DESC, line DESC LIMIT ?", (n,), raw=raw, output=output
+        )
         if not include_latest:
             return reversed(list(cur)[1:])
         return reversed(list(cur))
diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
index b98ef7683a3..46c0ea89e8a 100644
--- a/IPython/core/tests/test_history.py
+++ b/IPython/core/tests/test_history.py
@@ -228,11 +228,12 @@ def test_histmanager_disabled():
     # hist_file should not be created
     assert hist_file.exists() is False
 
+
 def test_get_tail_session_awareness():
     """Test .get_tail() is:
-                - session specific in HistoryManager
-                - session agnostic in HistoryAccessor
-            same for .get_last_session_id()
+        - session specific in HistoryManager
+        - session agnostic in HistoryAccessor
+    same for .get_last_session_id()
     """
     ip = get_ipython()
     with TemporaryDirectory() as tmpdir:

From 30528a19e0e0dbee58e584577d632af1c559dbcd Mon Sep 17 00:00:00 2001
From: Aleksey Bogdanov <oleksii.bohdanov@gmail.com>
Date: Sun, 7 Aug 2022 13:15:15 +0300
Subject: [PATCH 1193/1407] wrap db before host dir is gone in new test

---
 IPython/core/tests/test_history.py | 116 ++++++++++++++++-------------
 1 file changed, 63 insertions(+), 53 deletions(-)

diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
index 46c0ea89e8a..be152975633 100644
--- a/IPython/core/tests/test_history.py
+++ b/IPython/core/tests/test_history.py
@@ -240,56 +240,66 @@ def test_get_tail_session_awareness():
         tmp_path = Path(tmpdir)
         hist_file = tmp_path / "history.sqlite"
         get_source = lambda x: x[2]
-
-        # hm1 creates a new session and adds history entries,
-        # ha catches up
-        hm1 = HistoryManager(shell=ip, hist_file=hist_file)
-        hm1_last_sid = hm1.get_last_session_id
-        ha = HistoryAccessor(hist_file=hist_file)
-        ha_last_sid = ha.get_last_session_id
-
-        hist1 = ["a=1", "b=1", "c=1"]
-        for i, h in enumerate(hist1 + [""], start=1):
-            hm1.store_inputs(i, h)
-        assert list(map(get_source, hm1.get_tail())) == hist1
-        assert list(map(get_source, ha.get_tail())) == hist1
-        sid1 = hm1_last_sid()
-        assert sid1 is not None
-        assert ha_last_sid() == sid1
-
-        # hm2 creates a new session and adds entries,
-        # ha catches up
-        hm2 = HistoryManager(shell=ip, hist_file=hist_file)
-        hm2_last_sid = hm2.get_last_session_id
-
-        hist2 = ["a=2", "b=2", "c=2"]
-        for i, h in enumerate(hist2 + [""], start=1):
-            hm2.store_inputs(i, h)
-        tail = hm2.get_tail(n=3)
-        assert list(map(get_source, tail)) == hist2
-        tail = ha.get_tail(n=3)
-        assert list(map(get_source, tail)) == hist2
-        sid2 = hm2_last_sid()
-        assert sid2 is not None
-        assert ha_last_sid() == sid2
-        assert sid2 != sid1
-
-        # but hm1 still maintains its point of reference
-        # and adding more entries to it doesn't change others
-        # immediate perspective
-        assert hm1_last_sid() == sid1
-        tail = hm1.get_tail(n=3)
-        assert list(map(get_source, tail)) == hist1
-
-        hist3 = ["a=3", "b=3", "c=3"]
-        for i, h in enumerate(hist3 + [""], start=5):
-            hm1.store_inputs(i, h)
-        tail = hm1.get_tail(n=7)
-        assert list(map(get_source, tail)) == hist1 + [""] + hist3
-        tail = hm2.get_tail(n=3)
-        assert list(map(get_source, tail)) == hist2
-        tail = ha.get_tail(n=3)
-        assert list(map(get_source, tail)) == hist2
-        assert hm1_last_sid() == sid1
-        assert hm2_last_sid() == sid2
-        assert ha_last_sid() == sid2
+        hm1 = None
+        hm2 = None
+        try:
+            # hm1 creates a new session and adds history entries,
+            # ha catches up
+            hm1 = HistoryManager(shell=ip, hist_file=hist_file)
+            hm1_last_sid = hm1.get_last_session_id
+            ha = HistoryAccessor(hist_file=hist_file)
+            ha_last_sid = ha.get_last_session_id
+
+            hist1 = ["a=1", "b=1", "c=1"]
+            for i, h in enumerate(hist1 + [""], start=1):
+                hm1.store_inputs(i, h)
+            assert list(map(get_source, hm1.get_tail())) == hist1
+            assert list(map(get_source, ha.get_tail())) == hist1
+            sid1 = hm1_last_sid()
+            assert sid1 is not None
+            assert ha_last_sid() == sid1
+
+            # hm2 creates a new session and adds entries,
+            # ha catches up
+            hm2 = HistoryManager(shell=ip, hist_file=hist_file)
+            hm2_last_sid = hm2.get_last_session_id
+
+            hist2 = ["a=2", "b=2", "c=2"]
+            for i, h in enumerate(hist2 + [""], start=1):
+                hm2.store_inputs(i, h)
+            tail = hm2.get_tail(n=3)
+            assert list(map(get_source, tail)) == hist2
+            tail = ha.get_tail(n=3)
+            assert list(map(get_source, tail)) == hist2
+            sid2 = hm2_last_sid()
+            assert sid2 is not None
+            assert ha_last_sid() == sid2
+            assert sid2 != sid1
+
+            # but hm1 still maintains its point of reference
+            # and adding more entries to it doesn't change others
+            # immediate perspective
+            assert hm1_last_sid() == sid1
+            tail = hm1.get_tail(n=3)
+            assert list(map(get_source, tail)) == hist1
+
+            hist3 = ["a=3", "b=3", "c=3"]
+            for i, h in enumerate(hist3 + [""], start=5):
+                hm1.store_inputs(i, h)
+            tail = hm1.get_tail(n=7)
+            assert list(map(get_source, tail)) == hist1 + [""] + hist3
+            tail = hm2.get_tail(n=3)
+            assert list(map(get_source, tail)) == hist2
+            tail = ha.get_tail(n=3)
+            assert list(map(get_source, tail)) == hist2
+            assert hm1_last_sid() == sid1
+            assert hm2_last_sid() == sid2
+            assert ha_last_sid() == sid2
+        finally:
+            if hm1:
+                hm1.save_thread.stop()
+            if hm2:
+                hm2.save_thread.stop()
+            hm = hm1 or hm2
+            if hm:
+                hm.db.close()

From 59071056fd74bf0ff6819d666bd5749b6c0dddf1 Mon Sep 17 00:00:00 2001
From: Aleksey Bogdanov <oleksii.bohdanov@gmail.com>
Date: Sun, 7 Aug 2022 15:53:11 +0300
Subject: [PATCH 1194/1407] wrap db before host dir is gone in new test (v2)

---
 IPython/core/tests/test_history.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
index be152975633..a9ebafddd4c 100644
--- a/IPython/core/tests/test_history.py
+++ b/IPython/core/tests/test_history.py
@@ -242,6 +242,7 @@ def test_get_tail_session_awareness():
         get_source = lambda x: x[2]
         hm1 = None
         hm2 = None
+        ha = None
         try:
             # hm1 creates a new session and adds history entries,
             # ha catches up
@@ -298,8 +299,9 @@ def test_get_tail_session_awareness():
         finally:
             if hm1:
                 hm1.save_thread.stop()
+                hm1.db.close()
             if hm2:
                 hm2.save_thread.stop()
-            hm = hm1 or hm2
-            if hm:
-                hm.db.close()
+                hm2.db.close()
+            if ha:
+                ha.db.close()

From 9ed1939c703f9ce56bbfd375b6847428a3a44388 Mon Sep 17 00:00:00 2001
From: Jarrod Millman <jarrod.millman@gmail.com>
Date: Sat, 13 Aug 2022 13:20:57 -0700
Subject: [PATCH 1195/1407] Rename master to main

---
 .github/workflows/mypy.yml                   | 4 ++--
 .github/workflows/python-package.yml         | 4 ++--
 .github/workflows/test.yml                   | 1 -
 CONTRIBUTING.md                              | 4 ++--
 IPython/__init__.py                          | 2 +-
 README.rst                                   | 4 ++--
 docs/source/coredev/index.rst                | 6 +++---
 examples/IPython Kernel/Terminal Usage.ipynb | 2 +-
 setup.py                                     | 2 +-
 tools/github_stats.py                        | 4 ++--
 tools/release_helper.sh                      | 2 +-
 11 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index 03b58c64c46..8b1a4c37d89 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -2,9 +2,9 @@ name: Run MyPy
 
 on:
   push:
-    branches: [ master, 7.x]
+    branches: [ main, 7.x]
   pull_request:
-    branches: [ master, 7.x]
+    branches: [ main, 7.x]
 
 jobs:
   build:
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 663607f0246..37d021890f0 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -5,9 +5,9 @@ name: Python package
 
 on:
   push:
-    branches: [ master, 7.x ]
+    branches: [ main, 7.x ]
   pull_request:
-    branches: [ master, 7.x ]
+    branches: [ main, 7.x ]
 
 jobs:
   formatting:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1bbddbfbf98..f57425a03aa 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - master
       - '*.x'
   pull_request:
   # Run weekly on Monday at 1:23 UTC
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 11321a4ca4c..5826baf599c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,7 +33,7 @@ When opening a new Issue, please take the following steps:
 
 1. Search GitHub and/or Google for your issue to avoid duplicate reports.
    Keyword searches for your error messages are most helpful.
-2. If possible, try updating to master and reproducing your issue,
+2. If possible, try updating to main and reproducing your issue,
    because we may have already fixed it.
 3. Try to include a minimal reproducible test case.
 4. Include relevant system information.  Start with the output of:
@@ -53,7 +53,7 @@ Some guidelines on contributing to IPython:
   Review and discussion can begin well before the work is complete,
   and the more discussion the better.
   The worst case is that the PR is closed.
-* Pull Requests should generally be made against master
+* Pull Requests should generally be made against main
 * Pull Requests should be tested, if feasible:
     - bugfixes should include regression tests.
     - new behavior should at least get minimal exercise.
diff --git a/IPython/__init__.py b/IPython/__init__.py
index 7ebb80b3621..b5410f63da9 100644
--- a/IPython/__init__.py
+++ b/IPython/__init__.py
@@ -38,7 +38,7 @@
 
 See IPython `README.rst` file for more information:
 
-    https://github.com/ipython/ipython/blob/master/README.rst
+    https://github.com/ipython/ipython/blob/main/README.rst
 
 """
     )
diff --git a/README.rst b/README.rst
index ec160311665..5107eae9b5d 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-.. image:: https://codecov.io/github/ipython/ipython/coverage.svg?branch=master
-    :target: https://codecov.io/github/ipython/ipython?branch=master
+.. image:: https://codecov.io/github/ipython/ipython/coverage.svg?branch=main
+    :target: https://codecov.io/github/ipython/ipython?branch=main
 
 .. image:: https://img.shields.io/pypi/v/IPython.svg
     :target: https://pypi.python.org/pypi/ipython
diff --git a/docs/source/coredev/index.rst b/docs/source/coredev/index.rst
index ee1eadb9b1e..3ba94755eda 100644
--- a/docs/source/coredev/index.rst
+++ b/docs/source/coredev/index.rst
@@ -14,12 +14,12 @@ For instructions on how to make a developer install see :ref:`devinstall`.
 Backporting Pull requests
 =========================
 
-All pull requests should usually be made against ``master``, if a Pull Request
+All pull requests should usually be made against ``main``, if a Pull Request
 need to be backported to an earlier release; then it should be tagged with the
 correct ``milestone``.
 
 If you tag a pull request with a milestone **before** merging the pull request,
-and the base ref is ``master``, then our backport bot should automatically create
+and the base ref is ``main``, then our backport bot should automatically create
 a corresponding pull-request that backport on the correct branch.
 
 If you have write access to the IPython repository you can also just mention the
@@ -78,7 +78,7 @@ for the release you are actually making::
     PREV_RELEASE=4.2.1
     MILESTONE=5.0
     VERSION=5.0.0
-    BRANCH=master
+    BRANCH=main
 
 For `reproducibility of builds <https://reproducible-builds.org/specs/source-date-epoch/>`_,
 we recommend setting ``SOURCE_DATE_EPOCH`` prior to running the build; record the used value
diff --git a/examples/IPython Kernel/Terminal Usage.ipynb b/examples/IPython Kernel/Terminal Usage.ipynb
index e6bd4c0f116..935bdd4eb24 100644
--- a/examples/IPython Kernel/Terminal Usage.ipynb	
+++ b/examples/IPython Kernel/Terminal Usage.ipynb	
@@ -196,7 +196,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The `%gui` magic can be similarly used to control Wx, Tk, glut and pyglet applications, [as can be seen in our examples](https://github.com/ipython/ipython/tree/master/examples/lib)."
+    "The `%gui` magic can be similarly used to control Wx, Tk, glut and pyglet applications, [as can be seen in our examples](https://github.com/ipython/ipython/tree/main/examples/lib)."
    ]
   },
   {
diff --git a/setup.py b/setup.py
index 3c1dff9cc1c..bfdf5fb88bf 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@
 
 See IPython `README.rst` file for more information:
 
-    https://github.com/ipython/ipython/blob/master/README.rst
+    https://github.com/ipython/ipython/blob/main/README.rst
 
 Python {py} detected.
 {pip}
diff --git a/tools/github_stats.py b/tools/github_stats.py
index f1a44fa69a3..6a2f8f17fd5 100644
--- a/tools/github_stats.py
+++ b/tools/github_stats.py
@@ -79,8 +79,8 @@ def issues_closed_since(period=timedelta(days=365), project="ipython/ipython", p
     filtered = [ i for i in allclosed if _parse_datetime(i['closed_at']) > since ]
     if pulls:
         filtered = [ i for i in filtered if _parse_datetime(i['merged_at']) > since ]
-        # filter out PRs not against master (backports)
-        filtered = [ i for i in filtered if i['base']['ref'] == 'master' ]
+        # filter out PRs not against main (backports)
+        filtered = [ i for i in filtered if i['base']['ref'] == 'main' ]
     else:
         filtered = [ i for i in filtered if not is_pull_request(i) ]
     
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 54114d18bb8..697ed859e84 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -31,7 +31,7 @@ MILESTONE=${input:-$MILESTONE}
 echo -n "VERSION (X.y.z) [$VERSION]:"
 read input
 VERSION=${input:-$VERSION}
-echo -n "BRANCH (master|X.y) [$BRANCH]:"
+echo -n "BRANCH (main|X.y) [$BRANCH]:"
 read input
 BRANCH=${input:-$BRANCH}
 

From 517a92f878588484116edd6b88dfc738dcfe3cfb Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 15 Aug 2022 15:39:26 +0200
Subject: [PATCH 1196/1407] Apply autosuggestion only at EOL.

As they are displayed only at EOL.
Fixes #13724
---
 IPython/terminal/shortcuts.py   | 25 +++++++++++++--------
 IPython/tests/test_shortcuts.py | 40 +++++++++++++++++++++++++++++++++
 tools/retar.py                  |  2 ++
 3 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 IPython/tests/test_shortcuts.py

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 615397abc5f..6c1ba0418bc 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -32,6 +32,22 @@ def cursor_in_leading_ws():
     return (not before) or before.isspace()
 
 
+# Needed for to accept autosuggestions in vi insert mode
+def _apply_autosuggest(event):
+    """
+    Apply autosuggestion if at end of line.
+    """
+    b = event.current_buffer
+    d = b.document
+    after_cursor = d.text[d.cursor_position :]
+    lines = after_cursor.split("\n")
+    end_of_current_line = lines[0].strip()
+    suggestion = b.suggestion
+    if (suggestion is not None) and (suggestion.text) and (end_of_current_line == ""):
+        b.insert_text(suggestion.text)
+    else:
+        nc.end_of_line(event)
+
 def create_ipython_shortcuts(shell):
     """Set up the prompt_toolkit keyboard shortcuts for IPython"""
 
@@ -267,15 +283,6 @@ def ebivim():
 
     focused_insert_vi = has_focus(DEFAULT_BUFFER) & vi_insert_mode
 
-    # Needed for to accept autosuggestions in vi insert mode
-    def _apply_autosuggest(event):
-        b = event.current_buffer
-        suggestion = b.suggestion
-        if suggestion is not None and suggestion.text:
-            b.insert_text(suggestion.text)
-        else:
-            nc.end_of_line(event)
-
     @kb.add("end", filter=has_focus(DEFAULT_BUFFER) & (ebivim | ~vi_insert_mode))
     def _(event):
         _apply_autosuggest(event)
diff --git a/IPython/tests/test_shortcuts.py b/IPython/tests/test_shortcuts.py
new file mode 100644
index 00000000000..42edb92ba58
--- /dev/null
+++ b/IPython/tests/test_shortcuts.py
@@ -0,0 +1,40 @@
+import pytest
+from IPython.terminal.shortcuts import _apply_autosuggest
+
+from unittest.mock import Mock
+
+
+def make_event(text, cursor, suggestion):
+    event = Mock()
+    event.current_buffer = Mock()
+    event.current_buffer.suggestion = Mock()
+    event.current_buffer.cursor_position = cursor
+    event.current_buffer.suggestion.text = suggestion
+    event.current_buffer.document = Mock()
+    event.current_buffer.document.get_end_of_line_position = Mock(return_value=0)
+    event.current_buffer.document.text = text
+    event.current_buffer.document.cursor_position = cursor
+    return event
+
+
+@pytest.mark.parametrize(
+    "text, cursor, suggestion, called",
+    [
+        ("123456", 6, "123456789", True),
+        ("123456", 3, "123456789", False),
+        ("123456   \n789", 6, "123456789", True),
+    ],
+)
+def test_autosuggest_at_EOL(text, cursor, suggestion, called):
+    """
+    test that autosuggest is only applied at end of line.
+    """
+
+    event = make_event(text, cursor, suggestion)
+    event.current_buffer.insert_text = Mock()
+    _apply_autosuggest(event)
+    if called:
+        event.current_buffer.insert_text.assert_called()
+    else:
+        event.current_buffer.insert_text.assert_not_called()
+        # event.current_buffer.document.get_end_of_line_position.assert_called()
diff --git a/tools/retar.py b/tools/retar.py
index ccf1a1328a1..f8da2908fbe 100644
--- a/tools/retar.py
+++ b/tools/retar.py
@@ -4,6 +4,8 @@
 usage: 
 
     $ export SOURCE_DATE_EPOCH=$(date +%s)
+    # or
+    $ export SOURCE_DATE_EPOCH=$(git show -s --format=%ct HEAD)
     ...
     $ python retar.py <tarfile.gz>
 

From becb905f043c2b8a85b6ef099e82220988eae3fd Mon Sep 17 00:00:00 2001
From: Hugues Hoppe <hhoppe@users.noreply.github.com>
Date: Mon, 15 Aug 2022 16:30:35 -0700
Subject: [PATCH 1197/1407] Let %autoreload work on modules with frozen
 dataclasses

See Issue #12411 and Issue #12185.
The problem is that a frozen `dataclasses.dataclass` overrides the `__setattr__()` method, so updating its `__class__` member requires going through the base `object` class.  This seems to fix the problem.
---
 IPython/extensions/autoreload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index 816d2f35ea2..a0a8c27f134 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -300,7 +300,7 @@ class definition and update their __class__ to point to the new class
 
     for ref in refs:
         if type(ref) is old:
-            ref.__class__ = new
+            object.__setattr__(ref, "__class__", new)
 
 
 def update_class(old, new):

From b22400df04b0125f5127f142f391e26bb30de679 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 17 Aug 2022 10:34:07 +0200
Subject: [PATCH 1198/1407] fix linter

---
 tools/github_stats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/github_stats.py b/tools/github_stats.py
index 6a2f8f17fd5..af00a7b6ed9 100644
--- a/tools/github_stats.py
+++ b/tools/github_stats.py
@@ -80,7 +80,7 @@ def issues_closed_since(period=timedelta(days=365), project="ipython/ipython", p
     if pulls:
         filtered = [ i for i in filtered if _parse_datetime(i['merged_at']) > since ]
         # filter out PRs not against main (backports)
-        filtered = [ i for i in filtered if i['base']['ref'] == 'main' ]
+        filtered = [i for i in filtered if i["base"]["ref"] == "main"]
     else:
         filtered = [ i for i in filtered if not is_pull_request(i) ]
     

From 32a84f8444899fd06c021bccbc142bf79b2ee941 Mon Sep 17 00:00:00 2001
From: Richard Fung <richard.fung@databricks.com>
Date: Thu, 11 Aug 2022 12:33:17 -0700
Subject: [PATCH 1199/1407] keep autocomplete results stable in multi-thread
 access

---
 IPython/core/completer.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 59d3e9930fc..9cc81a49512 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -677,15 +677,15 @@ def global_matches(self, text):
         n = len(text)
         for lst in [keyword.kwlist,
                     builtin_mod.__dict__.keys(),
-                    self.namespace.keys(),
-                    self.global_namespace.keys()]:
+                    list(self.namespace.keys()),
+                    list(self.global_namespace.keys())]:
             for word in lst:
                 if word[:n] == text and word != "__builtins__":
                     match_append(word)
 
         snake_case_re = re.compile(r"[^_]+(_[^_]+)+?\Z")
-        for lst in [self.namespace.keys(),
-                    self.global_namespace.keys()]:
+        for lst in [list(self.namespace.keys()),
+                    list(self.global_namespace.keys())]:
             shortened = {"_".join([sub[0] for sub in word.split('_')]) : word
                          for word in lst if snake_case_re.match(word)}
             for word in shortened.keys():

From 399e97f1617927f836044b5c24eb16089b88992f Mon Sep 17 00:00:00 2001
From: Richard Fung <richard.fung@databricks.com>
Date: Fri, 19 Aug 2022 13:21:53 -0700
Subject: [PATCH 1200/1407] apply lint

---
 IPython/core/completer.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 9cc81a49512..cffd0866f42 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -675,19 +675,23 @@ def global_matches(self, text):
         matches = []
         match_append = matches.append
         n = len(text)
-        for lst in [keyword.kwlist,
-                    builtin_mod.__dict__.keys(),
-                    list(self.namespace.keys()),
-                    list(self.global_namespace.keys())]:
+        for lst in [
+            keyword.kwlist,
+            builtin_mod.__dict__.keys(),
+            list(self.namespace.keys()),
+            list(self.global_namespace.keys()),
+        ]:
             for word in lst:
                 if word[:n] == text and word != "__builtins__":
                     match_append(word)
 
         snake_case_re = re.compile(r"[^_]+(_[^_]+)+?\Z")
-        for lst in [list(self.namespace.keys()),
-                    list(self.global_namespace.keys())]:
-            shortened = {"_".join([sub[0] for sub in word.split('_')]) : word
-                         for word in lst if snake_case_re.match(word)}
+        for lst in [list(self.namespace.keys()), list(self.global_namespace.keys())]:
+            shortened = {
+                "_".join([sub[0] for sub in word.split("_")]): word
+                for word in lst
+                if snake_case_re.match(word)
+            }
             for word in shortened.keys():
                 if word[:n] == text and word != "__builtins__":
                     match_append(shortened[word])

From eaade5b8bf1f3c3bc1124a53baf15d4fe64d5745 Mon Sep 17 00:00:00 2001
From: Richard Fung <richard.fung@databricks.com>
Date: Fri, 19 Aug 2022 14:01:34 -0700
Subject: [PATCH 1201/1407] unrelated lint change

---
 tools/github_stats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/github_stats.py b/tools/github_stats.py
index 6a2f8f17fd5..af00a7b6ed9 100644
--- a/tools/github_stats.py
+++ b/tools/github_stats.py
@@ -80,7 +80,7 @@ def issues_closed_since(period=timedelta(days=365), project="ipython/ipython", p
     if pulls:
         filtered = [ i for i in filtered if _parse_datetime(i['merged_at']) > since ]
         # filter out PRs not against main (backports)
-        filtered = [ i for i in filtered if i['base']['ref'] == 'main' ]
+        filtered = [i for i in filtered if i["base"]["ref"] == "main"]
     else:
         filtered = [ i for i in filtered if not is_pull_request(i) ]
     

From 9af3aa0d91df4d55c09c8e12d836239a24e57bc8 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Sun, 28 Aug 2022 12:56:50 +0200
Subject: [PATCH 1202/1407] Upgrade GitHub Actions

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f57425a03aa..53ccb6f78ed 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -49,9 +49,9 @@ jobs:
             deps: test
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         cache: pip

From c66c03c2d0e90f6f2a27800699e6bec2529a9300 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Sun, 28 Aug 2022 12:58:35 +0200
Subject: [PATCH 1203/1407] Upgrade GitHub Actions

---
 .github/workflows/docs.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 96ed2172e68..e4be71c0ddb 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -7,11 +7,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v2
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: 3.x
     - name: Install Graphviz
       run: |
         sudo apt-get update

From c0b5bb3af2426c0d5701e9ea641f6a45e2a7c953 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Sun, 28 Aug 2022 13:00:29 +0200
Subject: [PATCH 1204/1407] Upgrade GitHub Actions

---
 .github/workflows/downstream.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
index 309d03a2204..ae2dbe5efe9 100644
--- a/.github/workflows/downstream.yml
+++ b/.github/workflows/downstream.yml
@@ -21,9 +21,9 @@ jobs:
             python-version: "3.9"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Update Python installer

From eee497f00e42efaea94c1117bd82b4d3de775efa Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Sun, 28 Aug 2022 13:01:39 +0200
Subject: [PATCH 1205/1407] Upgrade GitHub Actions

---
 .github/workflows/mypy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index 8b1a4c37d89..2725c92923c 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -15,9 +15,9 @@ jobs:
         python-version: [3.8]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

From de158eaa6e6f0fb05621052f259682278bd1791e Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Sun, 28 Aug 2022 13:02:53 +0200
Subject: [PATCH 1206/1407] Upgrade GitHub Actions

---
 .github/workflows/python-package.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 37d021890f0..fc28ac8e4c5 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -14,18 +14,14 @@ jobs:
 
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    strategy:
-      matrix:
-        python-version: [3.8]
-
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+    - name: Set up Python
+      uses: actions/setup-python@v4
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: 3.x
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

From 091ec63736ca5f2ce8d7835208a3644ed7c58f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20K=C3=B6ppe?= <mkoeppe@math.ucdavis.edu>
Date: Fri, 22 Jul 2022 10:38:09 -0700
Subject: [PATCH 1207/1407] setup.cfg: Remove setuptools from install_requires

It is not a runtime dependency.
---
 setup.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 0e371836877..274e338d0ce 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -39,7 +39,6 @@ install_requires =
     pickleshare
     prompt_toolkit>3.0.1,<3.1.0
     pygments>=2.4.0
-    setuptools>=18.5
     stack_data
     traitlets>=5
 

From 87ae1d99027a60e871bd4bb19fa069bf64c08634 Mon Sep 17 00:00:00 2001
From: Kian Eliasi <kian.elbo@gmail.com>
Date: Wed, 20 Jul 2022 23:14:43 +0430
Subject: [PATCH 1208/1407] Fix `overrite` typo

---
 IPython/core/tests/test_displayhook.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/tests/test_displayhook.py b/IPython/core/tests/test_displayhook.py
index 6ad89793442..22899f3dd02 100644
--- a/IPython/core/tests/test_displayhook.py
+++ b/IPython/core/tests/test_displayhook.py
@@ -28,7 +28,7 @@ def test_output_quiet():
     with AssertNotPrints('2'):
         ip.run_cell('1+1;\n#commented_out_function()', store_history=True)
 
-def test_underscore_no_overrite_user():
+def test_underscore_no_overwrite_user():
     ip.run_cell('_ = 42', store_history=True)
     ip.run_cell('1+1', store_history=True)
 
@@ -41,7 +41,7 @@ def test_underscore_no_overrite_user():
         ip.run_cell('_', store_history=True)
 
 
-def test_underscore_no_overrite_builtins():
+def test_underscore_no_overwrite_builtins():
     ip.run_cell("import gettext ; gettext.install('foo')", store_history=True)
     ip.run_cell('3+3', store_history=True)
 

From ac69cfdfd83ab56c430f307b137fd64616e126b7 Mon Sep 17 00:00:00 2001
From: Lucy McPhail <lucy.mcphail.p@gmail.com>
Date: Fri, 25 Feb 2022 11:30:56 +0000
Subject: [PATCH 1209/1407] Improve auto_match for triple quotes and escaped
 quotes

---
 IPython/terminal/shortcuts.py | 38 +++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 6c1ba0418bc..a68be9a6fca 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -140,6 +140,18 @@ def _following_text():
         _following_text_cache[pattern] = condition
         return condition
 
+    @Condition
+    def not_inside_unclosed_string():
+        app = get_app()
+        s = app.current_buffer.document.text_before_cursor
+        # remove escaped quotes
+        s = s.replace('\\"', "").replace("\\'", "")
+        # remove triple-quoted string literals
+        s = re.sub(r"(?:\"\"\"[\s\S]*\"\"\"|'''[\s\S]*''')", "", s)
+        # remove single-quoted string literals
+        s = re.sub(r"""(?:"[^"]*["\n]|'[^']*['\n])""", "", s)
+        return not ('"' in s or "'" in s)
+
     # auto match
     @kb.add("(", filter=focused_insert & auto_match & following_text(r"[,)}\]]|$"))
     def _(event):
@@ -160,7 +172,7 @@ def _(event):
         '"',
         filter=focused_insert
         & auto_match
-        & preceding_text(r'^([^"]+|"[^"]*")*$')
+        & not_inside_unclosed_string
         & following_text(r"[,)}\]]|$"),
     )
     def _(event):
@@ -171,13 +183,35 @@ def _(event):
         "'",
         filter=focused_insert
         & auto_match
-        & preceding_text(r"^([^']+|'[^']*')*$")
+        & not_inside_unclosed_string
         & following_text(r"[,)}\]]|$"),
     )
     def _(event):
         event.current_buffer.insert_text("''")
         event.current_buffer.cursor_left()
 
+    @kb.add(
+        '"',
+        filter=focused_insert
+        & auto_match
+        & not_inside_unclosed_string
+        & preceding_text(r'^.*""$'),
+    )
+    def _(event):
+        event.current_buffer.insert_text('""""')
+        event.current_buffer.cursor_left(3)
+
+    @kb.add(
+        "'",
+        filter=focused_insert
+        & auto_match
+        & not_inside_unclosed_string
+        & preceding_text(r"^.*''$"),
+    )
+    def _(event):
+        event.current_buffer.insert_text("''''")
+        event.current_buffer.cursor_left(3)
+
     # raw string
     @kb.add(
         "(", filter=focused_insert & auto_match & preceding_text(r".*(r|R)[\"'](-*)$")

From b8d9894be683a3f9547c840a9e2627402b3a5d8e Mon Sep 17 00:00:00 2001
From: David Dorfman <david.dorfman@granulate.io>
Date: Mon, 16 May 2022 04:31:19 +0300
Subject: [PATCH 1210/1407] terminal: Fix IndexError when attempting to elide
 paths with empty components

---
 IPython/terminal/ptutils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/terminal/ptutils.py b/IPython/terminal/ptutils.py
index c390d4972a7..1357abab71f 100644
--- a/IPython/terminal/ptutils.py
+++ b/IPython/terminal/ptutils.py
@@ -47,10 +47,10 @@ def _elide_point(string:str, *, min_elide=30)->str:
     if file_parts[-1] == '':
         file_parts.pop()
 
-    if len(object_parts) > 3:
+    if len(object_parts) > 3 and object_parts[1] and object_parts[-2]:
         return '{}.{}\N{HORIZONTAL ELLIPSIS}{}.{}'.format(object_parts[0], object_parts[1][0], object_parts[-2][-1], object_parts[-1])
 
-    elif len(file_parts) > 3:
+    elif len(file_parts) > 3 and file_parts[1] and file_parts[-2]:
         return ('{}' + os.sep + '{}\N{HORIZONTAL ELLIPSIS}{}' + os.sep + '{}').format(file_parts[0], file_parts[1][0], file_parts[-2][-1], file_parts[-1])
 
     return string

From fa47bf46a5a716685e109629128a9d1a4679ea17 Mon Sep 17 00:00:00 2001
From: David Dorfman <david.dorfman@granulate.io>
Date: Sun, 12 Jun 2022 13:45:01 +0300
Subject: [PATCH 1211/1407] Use slicing instead of condition

---
 IPython/terminal/ptutils.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/terminal/ptutils.py b/IPython/terminal/ptutils.py
index 1357abab71f..e9995a4a049 100644
--- a/IPython/terminal/ptutils.py
+++ b/IPython/terminal/ptutils.py
@@ -47,11 +47,11 @@ def _elide_point(string:str, *, min_elide=30)->str:
     if file_parts[-1] == '':
         file_parts.pop()
 
-    if len(object_parts) > 3 and object_parts[1] and object_parts[-2]:
-        return '{}.{}\N{HORIZONTAL ELLIPSIS}{}.{}'.format(object_parts[0], object_parts[1][0], object_parts[-2][-1], object_parts[-1])
+    if len(object_parts) > 3:
+        return '{}.{}\N{HORIZONTAL ELLIPSIS}{}.{}'.format(object_parts[0], object_parts[1][:1], object_parts[-2][-1:], object_parts[-1])
 
-    elif len(file_parts) > 3 and file_parts[1] and file_parts[-2]:
-        return ('{}' + os.sep + '{}\N{HORIZONTAL ELLIPSIS}{}' + os.sep + '{}').format(file_parts[0], file_parts[1][0], file_parts[-2][-1], file_parts[-1])
+    elif len(file_parts) > 3:
+        return ('{}' + os.sep + '{}\N{HORIZONTAL ELLIPSIS}{}' + os.sep + '{}').format(file_parts[0], file_parts[1][:1], file_parts[-2][-1:], file_parts[-1])
 
     return string
 

From 26b8d437dbd63df3093f3b44bfefd7431724c16b Mon Sep 17 00:00:00 2001
From: David Dorfman <david.dorfman@granulate.io>
Date: Sun, 12 Jun 2022 13:50:21 +0300
Subject: [PATCH 1212/1407] Reformat with darker

---
 IPython/terminal/ptutils.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/IPython/terminal/ptutils.py b/IPython/terminal/ptutils.py
index e9995a4a049..39bc2e15af9 100644
--- a/IPython/terminal/ptutils.py
+++ b/IPython/terminal/ptutils.py
@@ -48,10 +48,17 @@ def _elide_point(string:str, *, min_elide=30)->str:
         file_parts.pop()
 
     if len(object_parts) > 3:
-        return '{}.{}\N{HORIZONTAL ELLIPSIS}{}.{}'.format(object_parts[0], object_parts[1][:1], object_parts[-2][-1:], object_parts[-1])
+        return "{}.{}\N{HORIZONTAL ELLIPSIS}{}.{}".format(
+            object_parts[0],
+            object_parts[1][:1],
+            object_parts[-2][-1:],
+            object_parts[-1],
+        )
 
     elif len(file_parts) > 3:
-        return ('{}' + os.sep + '{}\N{HORIZONTAL ELLIPSIS}{}' + os.sep + '{}').format(file_parts[0], file_parts[1][:1], file_parts[-2][-1:], file_parts[-1])
+        return ("{}" + os.sep + "{}\N{HORIZONTAL ELLIPSIS}{}" + os.sep + "{}").format(
+            file_parts[0], file_parts[1][:1], file_parts[-2][-1:], file_parts[-1]
+        )
 
     return string
 

From 81795d984256a3e3ba5ab5388408f10b801a4f2d Mon Sep 17 00:00:00 2001
From: David Dorfman <david.dorfman@granulate.io>
Date: Mon, 13 Jun 2022 13:07:57 +0300
Subject: [PATCH 1213/1407] Add WN entry

---
 .../pr/fix-tab-completion-consecutive-separators.rst         | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/fix-tab-completion-consecutive-separators.rst

diff --git a/docs/source/whatsnew/pr/fix-tab-completion-consecutive-separators.rst b/docs/source/whatsnew/pr/fix-tab-completion-consecutive-separators.rst
new file mode 100644
index 00000000000..3b1eed6c2ec
--- /dev/null
+++ b/docs/source/whatsnew/pr/fix-tab-completion-consecutive-separators.rst
@@ -0,0 +1,5 @@
+Fixed tab completion for inputs with consecutive separators
+===========================================================
+
+Fixed error raised when attempting to tab-complete an input string with
+consecutive periods or forward slashes (such as "file:///var/log/...").

From 89dc552787e6e3d66c39ad3a262275a51eac4e0f Mon Sep 17 00:00:00 2001
From: satoru <satorulogic@gmail.com>
Date: Sat, 16 Jul 2022 14:54:00 +0800
Subject: [PATCH 1214/1407] Fix #13700, consistently use the original name in
 error message

---
 IPython/utils/path.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index 3db33e4c43e..51013c05f4b 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -83,12 +83,13 @@ def get_py_filename(name):
     """
 
     name = os.path.expanduser(name)
-    if not os.path.isfile(name) and not name.endswith('.py'):
-        name += '.py'
     if os.path.isfile(name):
         return name
-    else:
-        raise IOError('File `%r` not found.' % name)
+    if not name.endswith('.py'):
+        py_name = name + '.py'
+        if os.path.isfile(py_name):
+            return py_name
+    raise IOError('File `%r` not found.' % name)
 
 
 def filefind(filename: str, path_dirs=None) -> str:

From e53acc3604f3756e24171c3b4303bcba9bc82d4d Mon Sep 17 00:00:00 2001
From: satoru <satorulogic@gmail.com>
Date: Sat, 16 Jul 2022 15:21:15 +0800
Subject: [PATCH 1215/1407] Run darker as instructed

---
 IPython/core/interactiveshell.py           | 19 +++++++++++--------
 IPython/testing/plugin/pytest_ipdoctest.py |  2 +-
 IPython/utils/path.py                      |  6 +++---
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 06912640673..f7bacf443b2 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -213,14 +213,17 @@ def __repr__(self):
         raw_cell = (
             (self.raw_cell[:50] + "..") if len(self.raw_cell) > 50 else self.raw_cell
         )
-        return '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s cell_id=%s>' % (
-            name,
-            id(self),
-            raw_cell,
-            self.store_history,
-            self.silent,
-            self.shell_futures,
-            self.cell_id,
+        return (
+            '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s cell_id=%s>'
+            % (
+                name,
+                id(self),
+                raw_cell,
+                self.store_history,
+                self.silent,
+                self.shell_futures,
+                self.cell_id,
+            )
         )
 
 
diff --git a/IPython/testing/plugin/pytest_ipdoctest.py b/IPython/testing/plugin/pytest_ipdoctest.py
index 809713d7c8e..4ba2f1adf8e 100644
--- a/IPython/testing/plugin/pytest_ipdoctest.py
+++ b/IPython/testing/plugin/pytest_ipdoctest.py
@@ -782,7 +782,7 @@ def _remove_unwanted_precision(self, want: str, got: str) -> str:
                 precision = 0 if fraction is None else len(fraction)
                 if exponent is not None:
                     precision -= int(exponent)
-                if float(w.group()) == approx(float(g.group()), abs=10 ** -precision):
+                if float(w.group()) == approx(float(g.group()), abs=10**-precision):
                     # They're close enough. Replace the text we actually
                     # got with the text we want, so that it will match when we
                     # check the string literally.
diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index 51013c05f4b..a3a417d29e6 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -85,11 +85,11 @@ def get_py_filename(name):
     name = os.path.expanduser(name)
     if os.path.isfile(name):
         return name
-    if not name.endswith('.py'):
-        py_name = name + '.py'
+    if not name.endswith(".py"):
+        py_name = name + ".py"
         if os.path.isfile(py_name):
             return py_name
-    raise IOError('File `%r` not found.' % name)
+    raise IOError("File `%r` not found." % name)
 
 
 def filefind(filename: str, path_dirs=None) -> str:

From 46fd9a39bacbe4f5352b1df29699f5c17b79352e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 30 Aug 2022 11:45:47 +0200
Subject: [PATCH 1216/1407] formatter

---
 IPython/core/interactiveshell.py           | 19 ++++++++-----------
 IPython/testing/plugin/pytest_ipdoctest.py |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index f7bacf443b2..06912640673 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -213,17 +213,14 @@ def __repr__(self):
         raw_cell = (
             (self.raw_cell[:50] + "..") if len(self.raw_cell) > 50 else self.raw_cell
         )
-        return (
-            '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s cell_id=%s>'
-            % (
-                name,
-                id(self),
-                raw_cell,
-                self.store_history,
-                self.silent,
-                self.shell_futures,
-                self.cell_id,
-            )
+        return '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s cell_id=%s>' % (
+            name,
+            id(self),
+            raw_cell,
+            self.store_history,
+            self.silent,
+            self.shell_futures,
+            self.cell_id,
         )
 
 
diff --git a/IPython/testing/plugin/pytest_ipdoctest.py b/IPython/testing/plugin/pytest_ipdoctest.py
index 4ba2f1adf8e..809713d7c8e 100644
--- a/IPython/testing/plugin/pytest_ipdoctest.py
+++ b/IPython/testing/plugin/pytest_ipdoctest.py
@@ -782,7 +782,7 @@ def _remove_unwanted_precision(self, want: str, got: str) -> str:
                 precision = 0 if fraction is None else len(fraction)
                 if exponent is not None:
                     precision -= int(exponent)
-                if float(w.group()) == approx(float(g.group()), abs=10**-precision):
+                if float(w.group()) == approx(float(g.group()), abs=10 ** -precision):
                     # They're close enough. Replace the text we actually
                     # got with the text we want, so that it will match when we
                     # check the string literally.

From f5d4e0ac4c72fd6051acdd084f8091114b634444 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 30 Aug 2022 11:47:24 +0200
Subject: [PATCH 1217/1407] MAINT: run black on files that ends up in a single
 line change.

If running black on a file change one line of less, let just make it
black Compliant
---
 IPython/core/tests/print_argv.py      | 1 +
 IPython/core/tests/test_autocall.py   | 1 +
 IPython/core/tests/test_splitinput.py | 1 +
 IPython/lib/tests/test_clipboard.py   | 1 +
 IPython/utils/contexts.py             | 1 +
 IPython/utils/eventful.py             | 1 -
 IPython/utils/log.py                  | 1 -
 IPython/utils/tempdir.py              | 1 +
 8 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/IPython/core/tests/print_argv.py b/IPython/core/tests/print_argv.py
index 0e92bddcb06..4ec9e2799ed 100644
--- a/IPython/core/tests/print_argv.py
+++ b/IPython/core/tests/print_argv.py
@@ -1,2 +1,3 @@
 import sys
+
 print(sys.argv[1:])
diff --git a/IPython/core/tests/test_autocall.py b/IPython/core/tests/test_autocall.py
index ded9f78858a..925a1ccae37 100644
--- a/IPython/core/tests/test_autocall.py
+++ b/IPython/core/tests/test_autocall.py
@@ -8,6 +8,7 @@
 from IPython.core.splitinput import LineInfo
 from IPython.core.prefilter import AutocallChecker
 
+
 def doctest_autocall():
     """
     In [1]: def f1(a,b,c):
diff --git a/IPython/core/tests/test_splitinput.py b/IPython/core/tests/test_splitinput.py
index 8969da250ae..1462e7fa033 100644
--- a/IPython/core/tests/test_splitinput.py
+++ b/IPython/core/tests/test_splitinput.py
@@ -32,6 +32,7 @@
 def test_split_user_input():
     return tt.check_pairs(split_user_input, tests)
 
+
 def test_LineInfo():
     """Simple test for LineInfo construction and str()"""
     linfo = LineInfo("  %cd /home")
diff --git a/IPython/lib/tests/test_clipboard.py b/IPython/lib/tests/test_clipboard.py
index 802f753a339..6597c946b57 100644
--- a/IPython/lib/tests/test_clipboard.py
+++ b/IPython/lib/tests/test_clipboard.py
@@ -2,6 +2,7 @@
 from IPython.lib.clipboard import ClipboardEmpty
 from IPython.testing.decorators import skip_if_no_x11
 
+
 @skip_if_no_x11
 def test_clipboard_get():
     # Smoketest for clipboard access - we can't easily guarantee that the
diff --git a/IPython/utils/contexts.py b/IPython/utils/contexts.py
index 7f95d4419dc..73c3f2e5b36 100644
--- a/IPython/utils/contexts.py
+++ b/IPython/utils/contexts.py
@@ -7,6 +7,7 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+
 class preserve_keys(object):
     """Preserve a set of keys in a dictionary.
 
diff --git a/IPython/utils/eventful.py b/IPython/utils/eventful.py
index 661851ed37c..837c6e03442 100644
--- a/IPython/utils/eventful.py
+++ b/IPython/utils/eventful.py
@@ -1,4 +1,3 @@
-
 from warnings import warn
 
 warn("IPython.utils.eventful has moved to traitlets.eventful", stacklevel=2)
diff --git a/IPython/utils/log.py b/IPython/utils/log.py
index bb262eda936..f9dea91ce90 100644
--- a/IPython/utils/log.py
+++ b/IPython/utils/log.py
@@ -1,4 +1,3 @@
-
 from warnings import warn
 
 warn("IPython.utils.log has moved to traitlets.log", stacklevel=2)
diff --git a/IPython/utils/tempdir.py b/IPython/utils/tempdir.py
index 5afc5d64250..a233c73e382 100644
--- a/IPython/utils/tempdir.py
+++ b/IPython/utils/tempdir.py
@@ -48,6 +48,7 @@ class TemporaryWorkingDirectory(TemporaryDirectory):
         with TemporaryWorkingDirectory() as tmpdir:
             ...
     """
+
     def __enter__(self):
         self.old_wd = Path.cwd()
         _os.chdir(self.name)

From 1dcbbc47bf458fa100769e50240de2d2bfaf388f Mon Sep 17 00:00:00 2001
From: Jacob Hall <jwhall@email.wm.edu>
Date: Mon, 20 Jun 2022 21:31:03 -0400
Subject: [PATCH 1218/1407] terminal interface: catch exception when standard
 stream is closed

if a standard stream is closed, e.g. `import sys;
sys.stdin.close()`, a ValueError is raised when the stream is read.
this commit adds a try .. except statement to catch that exception
in IPython/terminal/interactiveshell.py
---
 IPython/terminal/interactiveshell.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 06724bea870..b7739c885a4 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -91,7 +91,12 @@ def get_default_editor():
 # - no isatty method
 for _name in ('stdin', 'stdout', 'stderr'):
     _stream = getattr(sys, _name)
-    if not _stream or not hasattr(_stream, 'isatty') or not _stream.isatty():
+    try:
+        if not _stream or not hasattr(_stream, "isatty") or not _stream.isatty():
+            _is_tty = False
+            break
+    except ValueError:
+        # stream is closed
         _is_tty = False
         break
 else:

From 6e3d5b4f5290b03b42fc64c94f902281d1c739d9 Mon Sep 17 00:00:00 2001
From: Aman <aman.s.chhina@gmail.com>
Date: Tue, 3 May 2022 21:23:43 -0400
Subject: [PATCH 1219/1407] Replaced getting cwd from os.getcwd() to
 pathlib.Path.cwd() in cd().

---
 IPython/core/magics/osm.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index 41957a28509..f3fa246567b 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -8,6 +8,7 @@
 
 import io
 import os
+import pathlib
 import re
 import sys
 from pprint import pformat
@@ -409,7 +410,7 @@ def cd(self, parameter_s=''):
             except OSError:
                 print(sys.exc_info()[1])
             else:
-                cwd = os.getcwd()
+                cwd = pathlib.Path.cwd()
                 dhist = self.shell.user_ns['_dh']
                 if oldcwd != cwd:
                     dhist.append(cwd)
@@ -419,7 +420,7 @@ def cd(self, parameter_s=''):
             os.chdir(self.shell.home_dir)
             if hasattr(self.shell, 'term_title') and self.shell.term_title:
                 set_term_title(self.shell.term_title_format.format(cwd="~"))
-            cwd = os.getcwd()
+            cwd = pathlib.Path.cwd()
             dhist = self.shell.user_ns['_dh']
 
             if oldcwd != cwd:

From 0a8b189aa2ef5e146dcd6aa461c7ba67e979c430 Mon Sep 17 00:00:00 2001
From: William Andrea <william.j.andrea@gmail.com>
Date: Sat, 23 Apr 2022 13:02:35 -0400
Subject: [PATCH 1220/1407] Show "maxlen" in deque repr

"collections.deque" has a "maxlen" attribute that should be shown in its repr if defined, just like its default repr does.

This was brought up on Stack Overflow: https://stackoverflow.com/questions/71981214/python-deque-maxlen-does-not-show
---
 IPython/lib/pretty.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/lib/pretty.py b/IPython/lib/pretty.py
index 72f143522df..f7feff9c3d3 100644
--- a/IPython/lib/pretty.py
+++ b/IPython/lib/pretty.py
@@ -908,6 +908,8 @@ def _deque_pprint(obj, p, cycle):
     cls_ctor = CallExpression.factory(obj.__class__.__name__)
     if cycle:
         p.pretty(cls_ctor(RawText("...")))
+    elif obj.maxlen is not None:
+        p.pretty(cls_ctor(list(obj), maxlen=obj.maxlen))
     else:
         p.pretty(cls_ctor(list(obj)))
 

From 85a4bd798f2def36f662f064f5f64b6ef0762801 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 30 Aug 2022 16:38:25 +0200
Subject: [PATCH 1221/1407] update whatsnew

---
 docs/source/whatsnew/development.rst          |   1 +
 .../pr/end-shortcut-accept-suggestion.rst     |   7 --
 ...-tab-completion-consecutive-separators.rst |   5 -
 .../pr/latex-generation-no-popup-window.rst   |   5 -
 .../pr/latex_rendering_relative_files.rst     |   7 --
 .../whatsnew/pr/restore-line-numbers.rst      |  50 --------
 .../pr/silence-running-in-venv-warning.rst    |   8 --
 .../whatsnew/pr/stripping-decorators-bug.rst  |   4 -
 docs/source/whatsnew/version8.rst             | 116 ++++++++++++++++++
 9 files changed, 117 insertions(+), 86 deletions(-)
 delete mode 100644 docs/source/whatsnew/pr/end-shortcut-accept-suggestion.rst
 delete mode 100644 docs/source/whatsnew/pr/fix-tab-completion-consecutive-separators.rst
 delete mode 100644 docs/source/whatsnew/pr/latex-generation-no-popup-window.rst
 delete mode 100644 docs/source/whatsnew/pr/latex_rendering_relative_files.rst
 delete mode 100644 docs/source/whatsnew/pr/restore-line-numbers.rst
 delete mode 100644 docs/source/whatsnew/pr/silence-running-in-venv-warning.rst
 delete mode 100644 docs/source/whatsnew/pr/stripping-decorators-bug.rst

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 502b0e0bbab..9969680d1a0 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -25,6 +25,7 @@ Need to be updated:
 
 
 
+
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 
 Backwards incompatible changes
diff --git a/docs/source/whatsnew/pr/end-shortcut-accept-suggestion.rst b/docs/source/whatsnew/pr/end-shortcut-accept-suggestion.rst
deleted file mode 100644
index c04998e8f3f..00000000000
--- a/docs/source/whatsnew/pr/end-shortcut-accept-suggestion.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Added shortcut for accepting auto suggestion
-============================================
-
-Added End key shortcut for accepting auto-suggestion
-This binding works in Vi mode too, provided 
-TerminalInteractiveShell.emacs_bindings_in_vi_insert_mode is set to be True.
-
diff --git a/docs/source/whatsnew/pr/fix-tab-completion-consecutive-separators.rst b/docs/source/whatsnew/pr/fix-tab-completion-consecutive-separators.rst
deleted file mode 100644
index 3b1eed6c2ec..00000000000
--- a/docs/source/whatsnew/pr/fix-tab-completion-consecutive-separators.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Fixed tab completion for inputs with consecutive separators
-===========================================================
-
-Fixed error raised when attempting to tab-complete an input string with
-consecutive periods or forward slashes (such as "file:///var/log/...").
diff --git a/docs/source/whatsnew/pr/latex-generation-no-popup-window.rst b/docs/source/whatsnew/pr/latex-generation-no-popup-window.rst
deleted file mode 100644
index 4cf73afdf22..00000000000
--- a/docs/source/whatsnew/pr/latex-generation-no-popup-window.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-No popup in window for latex generation
-=======================================
-
-When generating latex (e.g. via `_latex_repr_`) no popup window is shows under Windows.
-
diff --git a/docs/source/whatsnew/pr/latex_rendering_relative_files.rst b/docs/source/whatsnew/pr/latex_rendering_relative_files.rst
deleted file mode 100644
index befd4afa35a..00000000000
--- a/docs/source/whatsnew/pr/latex_rendering_relative_files.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Relative filenames in Latex rendering
-=====================================
-
-The `latex_to_png_dvipng` command internally generates input and output file arguments to `latex` and `dvipis`. These arguments are now generated as relative files to the current working directory instead of absolute file paths.
-This solves a problem where the current working directory contains characters that are not handled properly by `latex` and `dvips`.
-There are no changes to the user API.
-
diff --git a/docs/source/whatsnew/pr/restore-line-numbers.rst b/docs/source/whatsnew/pr/restore-line-numbers.rst
deleted file mode 100644
index fb0729247a3..00000000000
--- a/docs/source/whatsnew/pr/restore-line-numbers.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-Restore line numbers for Input
-==================================
-
-Line number information in tracebacks from input are restored.
-Line numbers from input were removed during the transition to v8 enhanced traceback reporting.
-
-So, instead of::
-
-    ---------------------------------------------------------------------------
-    ZeroDivisionError                         Traceback (most recent call last)
-    Input In [3], in <cell line: 1>()
-    ----> 1 myfunc(2)
-
-    Input In [2], in myfunc(z)
-          1 def myfunc(z):
-    ----> 2     foo.boo(z-1)
-
-    File ~/code/python/ipython/foo.py:3, in boo(x)
-          2 def boo(x):
-    ----> 3     return 1/(1-x)
-
-    ZeroDivisionError: division by zero
-
-The error traceback now looks like::
-
-      ---------------------------------------------------------------------------
-      ZeroDivisionError                         Traceback (most recent call last)
-      Cell In [3], line 1
-      ----> 1 myfunc(2)
-
-      Cell In [2], line 2, in myfunc(z)
-            1 def myfunc(z):
-      ----> 2     foo.boo(z-1)
-
-      File ~/code/python/ipython/foo.py:3, in boo(x)
-            2 def boo(x):
-      ----> 3     return 1/(1-x)
-
-      ZeroDivisionError: division by zero
-
-or, with xmode=Plain::
-
-    Traceback (most recent call last):
-      Cell In [12], line 1
-        myfunc(2)
-      Cell In [6], line 2 in myfunc
-        foo.boo(z-1)
-      File ~/code/python/ipython/foo.py:3 in boo
-        return 1/(1-x)
-    ZeroDivisionError: division by zero
diff --git a/docs/source/whatsnew/pr/silence-running-in-venv-warning.rst b/docs/source/whatsnew/pr/silence-running-in-venv-warning.rst
deleted file mode 100644
index ed245bd157a..00000000000
--- a/docs/source/whatsnew/pr/silence-running-in-venv-warning.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-New setting to silence warning if working inside a virtual environment
-======================================================================
-
-Previously, when starting IPython in a virtual environment without IPython installed (so IPython from the global environment is used), the following warning was printed:
-
-    Attempting to work in a virtualenv. If you encounter problems, please install IPython inside the virtualenv.
-
-This warning can be permanently silenced by setting ``c.InteractiveShell.warn_venv`` to ``False`` (the default is ``True``).
diff --git a/docs/source/whatsnew/pr/stripping-decorators-bug.rst b/docs/source/whatsnew/pr/stripping-decorators-bug.rst
deleted file mode 100644
index 2ea03d7f9f7..00000000000
--- a/docs/source/whatsnew/pr/stripping-decorators-bug.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Stripping decorators bug
-========================
-
-Fixed bug which meant that ipython code blocks in restructured text documents executed with the ipython-sphinx extension skipped any lines of code containing python decorators.
diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index c4b7b155212..59e71654faf 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -2,6 +2,122 @@
  8.x Series
 ============
 
+.. _version 8.5.0:
+
+IPython 8.5.0
+-------------
+
+First release since a couple of month due to various reasons and timing preventing
+me for sticking to the usual monthly release the last Friday of each month. This
+is of non negligible size as it has more than two dozen PRs with various fixes
+an bug fixes.
+
+Many thanks to everybody who contributed PRs for your patience in review and
+merges.
+
+Here is a non exhaustive list of changes that have been implemented for IPython
+8.5.0. As usual you can find the full list of issues and PRs tagged with `the
+8.5 milestone
+<https://github.com/ipython/ipython/pulls?q=is%3Aclosed+milestone%3A8.5+>`__.
+
+ - Added shortcut for accepting auto suggestion. The End key shortcut for
+   accepting auto-suggestion This binding works in Vi mode too, provided
+   ``TerminalInteractiveShell.emacs_bindings_in_vi_insert_mode`` is set to be
+   ``True`` :ghpull:`13566`.
+
+ - No popup in window for latex generation w hen generating latex (e.g. via
+   `_latex_repr_`) no popup window is shows under Windows. :ghpull:`13679`
+
+ - Fixed error raised when attempting to tab-complete an input string with
+   consecutive periods or forward slashes (such as "file:///var/log/...").
+   :ghpull:`13675`
+
+ - Relative filenames in Latex rendering :
+   The `latex_to_png_dvipng` command internally generates input and output file
+   arguments to `latex` and `dvipis`. These arguments are now generated as
+   relative files to the current working directory instead of absolute file
+   paths. This solves a problem where the current working directory contains
+   characters that are not handled properly by `latex` and `dvips`. There are
+   no changes to the user API. :ghpull:`13680`
+
+ - Stripping decorators bug: Fixed bug which meant that ipython code blocks in
+   restructured text documents executed with the ipython-sphinx extension
+   skipped any lines of code containing python decorators. :ghpull:`13612`
+
+ - Allow some modules with frozen dataclasses to be reloaded. :ghpull:`13732`
+ - Fix paste magic on wayland. :ghpull:`13671`
+ - show maxlen in deque's repr. :ghpull:`13648`
+
+Restore line numbers for Input 
+------------------------------
+
+Line number information in tracebacks from input are restored.
+Line numbers from input were removed during the transition to v8 enhanced traceback reporting.
+
+So, instead of::
+
+    ---------------------------------------------------------------------------
+    ZeroDivisionError                         Traceback (most recent call last)
+    Input In [3], in <cell line: 1>()
+    ----> 1 myfunc(2)
+
+    Input In [2], in myfunc(z)
+          1 def myfunc(z):
+    ----> 2     foo.boo(z-1)
+
+    File ~/code/python/ipython/foo.py:3, in boo(x)
+          2 def boo(x):
+    ----> 3     return 1/(1-x)
+
+    ZeroDivisionError: division by zero
+
+The error traceback now looks like::
+
+      ---------------------------------------------------------------------------
+      ZeroDivisionError                         Traceback (most recent call last)
+      Cell In [3], line 1
+      ----> 1 myfunc(2)
+
+      Cell In [2], line 2, in myfunc(z)
+            1 def myfunc(z):
+      ----> 2     foo.boo(z-1)
+
+      File ~/code/python/ipython/foo.py:3, in boo(x)
+            2 def boo(x):
+      ----> 3     return 1/(1-x)
+
+      ZeroDivisionError: division by zero
+
+or, with xmode=Plain::
+
+    Traceback (most recent call last):
+      Cell In [12], line 1
+        myfunc(2)
+      Cell In [6], line 2 in myfunc
+        foo.boo(z-1)
+      File ~/code/python/ipython/foo.py:3 in boo
+        return 1/(1-x)
+    ZeroDivisionError: division by zero
+
+:ghpull:`13560`
+
+New setting to silence warning if working inside a virtual environment
+----------------------------------------------------------------------
+
+Previously, when starting IPython in a virtual environment without IPython installed (so IPython from the global environment is used), the following warning was printed:
+
+    Attempting to work in a virtualenv. If you encounter problems, please install IPython inside the virtualenv.
+
+This warning can be permanently silenced by setting ``c.InteractiveShell.warn_venv`` to ``False`` (the default is ``True``).
+
+:ghpull:`13706`
+
+-------
+
+Thanks to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries.
+
+
 .. _version 8.4.0:
 
 IPython 8.4.0

From c179c2a596e57d64940aa58160832a047600e474 Mon Sep 17 00:00:00 2001
From: satoru <satorulogic@gmail.com>
Date: Sat, 16 Jul 2022 16:06:14 +0800
Subject: [PATCH 1222/1407] Fix #13654, improve performance of auto match for
 quotes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As pointed out in #13654, auto matching of quotes may take a long time
if the prefix is long.
To be more precise, the longer the text before the first quote, the
slower it is.
This is all caused by the regex pattern used: `r'^([^"]+|"[^"]*")*$'`,
which I suspect is O(2^N) slow.

```python
In [1]: text = "function_with_long_nameeee('arg"

In [2]: import re

In [3]: pattern = re.compile(r"^([^']+|'[^']*')*$")

In [4]: %timeit pattern.match(text)
10.3 s ± 67.2 ms per loop (mean ± std. dev. of 7 runs, 1 loop each)

In [5]: %timeit pattern.match("1'")
312 ns ± 0.775 ns per loop (mean ± std. dev. of 7 runs, 1,000,000 loops
    each)

In [6]: %timeit pattern.match("12'")
462 ns ± 1.95 ns per loop (mean ± std. dev. of 7 runs, 1,000,000 loops
    each)

In [7]: %timeit pattern.match("123'")
766 ns ± 6.32 ns per loop (mean ± std. dev. of 7 runs, 1,000,000 loops
    each)

In [8]: %timeit pattern.match("1234'")
1.59 µs ± 20.9 ns per loop (mean ± std. dev. of 7 runs, 1,000,000 loops
  each)
```

But the pattern we want here can actually be detected with a Python
implemention in O(N) time.
---
 IPython/terminal/shortcuts.py | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index a68be9a6fca..4b51b284ed6 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -106,20 +106,37 @@ def reformat_and_execute(event):
     def auto_match():
         return shell.auto_match
 
+    def all_quotes_paired(quote, buf):
+        paired = True
+        i = 0
+        while i < len(buf):
+            c = buf[i]
+            if c == quote:
+                paired = not paired
+            elif c == '\\':
+                i += 1
+            i += 1
+        return paired
+
     focused_insert = (vi_insert_mode | emacs_insert_mode) & has_focus(DEFAULT_BUFFER)
     _preceding_text_cache = {}
     _following_text_cache = {}
 
     def preceding_text(pattern):
-        try:
+        if pattern in _preceding_text_cache:
             return _preceding_text_cache[pattern]
-        except KeyError:
-            pass
-        m = re.compile(pattern)
 
-        def _preceding_text():
-            app = get_app()
-            return bool(m.match(app.current_buffer.document.current_line_before_cursor))
+        if callable(pattern):
+            def _preceding_text():
+                app = get_app()
+                before_cursor = app.current_buffer.document.current_line_before_cursor
+                return bool(pattern(before_cursor))
+        else:
+            m = re.compile(pattern)
+
+            def _preceding_text():
+                app = get_app()
+                return bool(m.match(app.current_buffer.document.current_line_before_cursor))
 
         condition = Condition(_preceding_text)
         _preceding_text_cache[pattern] = condition
@@ -173,6 +190,7 @@ def _(event):
         filter=focused_insert
         & auto_match
         & not_inside_unclosed_string
+        & preceding_text(lambda line: all_quotes_paired('"', line))
         & following_text(r"[,)}\]]|$"),
     )
     def _(event):
@@ -184,6 +202,7 @@ def _(event):
         filter=focused_insert
         & auto_match
         & not_inside_unclosed_string
+        & preceding_text(lambda line: all_quotes_paired("'", line))
         & following_text(r"[,)}\]]|$"),
     )
     def _(event):

From 0355b0b8a1e6ad2ae0d41081ce531bdbce0b34d6 Mon Sep 17 00:00:00 2001
From: satoru <satorulogic@gmail.com>
Date: Sat, 16 Jul 2022 16:19:04 +0800
Subject: [PATCH 1223/1407] Fix format

---
 IPython/terminal/shortcuts.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 4b51b284ed6..7d6de8b3b04 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -113,7 +113,7 @@ def all_quotes_paired(quote, buf):
             c = buf[i]
             if c == quote:
                 paired = not paired
-            elif c == '\\':
+            elif c == "\\":
                 i += 1
             i += 1
         return paired
@@ -127,16 +127,19 @@ def preceding_text(pattern):
             return _preceding_text_cache[pattern]
 
         if callable(pattern):
+
             def _preceding_text():
                 app = get_app()
                 before_cursor = app.current_buffer.document.current_line_before_cursor
                 return bool(pattern(before_cursor))
+
         else:
             m = re.compile(pattern)
 
             def _preceding_text():
                 app = get_app()
-                return bool(m.match(app.current_buffer.document.current_line_before_cursor))
+                before_cursor = app.current_buffer.document.current_line_before_cursor
+                return bool(m.match(before_cursor))
 
         condition = Condition(_preceding_text)
         _preceding_text_cache[pattern] = condition

From aefe51c6071e045e00ed87fa5ef995eca17105f5 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 1 Sep 2022 12:02:43 +0200
Subject: [PATCH 1224/1407] try ruff to find unused imports

---
 IPython/__init__.py                               | 1 -
 IPython/core/application.py                       | 1 -
 IPython/core/crashhandler.py                      | 1 -
 IPython/core/debugger.py                          | 1 -
 IPython/core/excolors.py                          | 1 -
 IPython/core/formatters.py                        | 1 -
 IPython/core/inputtransformer2.py                 | 1 -
 IPython/core/magics/basic.py                      | 1 -
 IPython/core/oinspect.py                          | 1 -
 IPython/core/shellapp.py                          | 1 -
 IPython/core/tests/test_compilerop.py             | 3 ---
 IPython/core/tests/test_debugger.py               | 1 -
 IPython/core/tests/test_formatters.py             | 1 -
 IPython/core/tests/test_history.py                | 1 -
 IPython/core/tests/test_inputtransformer2_line.py | 1 -
 IPython/core/tests/test_iplib.py                  | 2 --
 IPython/core/tests/test_magic.py                  | 1 -
 IPython/core/tests/test_paths.py                  | 1 -
 IPython/core/tests/test_pylabtools.py             | 3 ---
 IPython/core/tests/test_ultratb.py                | 1 -
 IPython/lib/latextools.py                         | 2 +-
 IPython/paths.py                                  | 1 -
 IPython/testing/decorators.py                     | 1 -
 IPython/testing/globalipapp.py                    | 1 -
 IPython/testing/plugin/ipdoctest.py               | 1 -
 IPython/tests/cve.py                              | 1 -
 IPython/utils/io.py                               | 1 -
 IPython/utils/module_paths.py                     | 1 -
 IPython/utils/path.py                             | 2 --
 IPython/utils/tests/test_io.py                    | 1 -
 IPython/utils/tests/test_module_paths.py          | 2 --
 IPython/utils/tests/test_text.py                  | 1 -
 32 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/IPython/__init__.py b/IPython/__init__.py
index b5410f63da9..03b3116a98a 100644
--- a/IPython/__init__.py
+++ b/IPython/__init__.py
@@ -18,7 +18,6 @@
 # Imports
 #-----------------------------------------------------------------------------
 
-import os
 import sys
 
 #-----------------------------------------------------------------------------
diff --git a/IPython/core/application.py b/IPython/core/application.py
index 0cdea5c69b8..26c061661ac 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -14,7 +14,6 @@
 
 import atexit
 from copy import deepcopy
-import glob
 import logging
 import os
 import shutil
diff --git a/IPython/core/crashhandler.py b/IPython/core/crashhandler.py
index 4af39361e80..f60a75bbc5b 100644
--- a/IPython/core/crashhandler.py
+++ b/IPython/core/crashhandler.py
@@ -19,7 +19,6 @@
 # Imports
 #-----------------------------------------------------------------------------
 
-import os
 import sys
 import traceback
 from pprint import pformat
diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index ba12e3eac39..73b0328743b 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -104,7 +104,6 @@
 import inspect
 import linecache
 import sys
-import warnings
 import re
 import os
 
diff --git a/IPython/core/excolors.py b/IPython/core/excolors.py
index c47ce922c4e..85eef81f0e0 100644
--- a/IPython/core/excolors.py
+++ b/IPython/core/excolors.py
@@ -4,7 +4,6 @@
 """
 
 import os
-import warnings
 
 #*****************************************************************************
 #       Copyright (C) 2005-2006 Fernando Perez <fperez@colorado.edu>
diff --git a/IPython/core/formatters.py b/IPython/core/formatters.py
index 4e0b9e455ae..e7aa6f3abab 100644
--- a/IPython/core/formatters.py
+++ b/IPython/core/formatters.py
@@ -11,7 +11,6 @@
 # Distributed under the terms of the Modified BSD License.
 
 import abc
-import json
 import sys
 import traceback
 import warnings
diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index a8f676f4952..e4e385a95ff 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -11,7 +11,6 @@
 # Distributed under the terms of the Modified BSD License.
 
 import ast
-import sys
 from codeop import CommandCompiler, Compile
 import re
 import tokenize
diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py
index ea407c61811..af69b02676d 100644
--- a/IPython/core/magics/basic.py
+++ b/IPython/core/magics/basic.py
@@ -1,7 +1,6 @@
 """Implementation of basic magic functions."""
 
 
-import argparse
 from logging import error
 import io
 import os
diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 1a5c0ae070c..f1c454b2604 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -31,7 +31,6 @@
 from IPython.testing.skipdoctest import skip_doctest
 from IPython.utils import PyColorize
 from IPython.utils import openpy
-from IPython.utils import py3compat
 from IPython.utils.dir2 import safe_hasattr
 from IPython.utils.path import compress_user
 from IPython.utils.text import indent
diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py
index f737bcb56b7..180f8b1b01f 100644
--- a/IPython/core/shellapp.py
+++ b/IPython/core/shellapp.py
@@ -19,7 +19,6 @@
 from IPython.core import pylabtools
 from IPython.utils.contexts import preserve_keys
 from IPython.utils.path import filefind
-import traitlets
 from traitlets import (
     Unicode, Instance, List, Bool, CaselessStrEnum, observe,
     DottedObjectName,
diff --git a/IPython/core/tests/test_compilerop.py b/IPython/core/tests/test_compilerop.py
index b939bb60676..8a5c9dc085b 100644
--- a/IPython/core/tests/test_compilerop.py
+++ b/IPython/core/tests/test_compilerop.py
@@ -17,9 +17,6 @@
 import linecache
 import sys
 
-# Third-party imports
-import pytest
-
 # Our own imports
 from IPython.core import compilerop
 
diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index 5a12c3bb2ad..5f7f98d3c29 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -4,7 +4,6 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-import bdb
 import builtins
 import os
 import sys
diff --git a/IPython/core/tests/test_formatters.py b/IPython/core/tests/test_formatters.py
index 26d35837ac8..c642befaccf 100644
--- a/IPython/core/tests/test_formatters.py
+++ b/IPython/core/tests/test_formatters.py
@@ -1,6 +1,5 @@
 """Tests for the Formatters."""
 
-import warnings
 from math import pi
 
 try:
diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
index a9ebafddd4c..fa64fe04df1 100644
--- a/IPython/core/tests/test_history.py
+++ b/IPython/core/tests/test_history.py
@@ -7,7 +7,6 @@
 
 # stdlib
 import io
-import sqlite3
 import sys
 import tempfile
 from datetime import datetime
diff --git a/IPython/core/tests/test_inputtransformer2_line.py b/IPython/core/tests/test_inputtransformer2_line.py
index 30558fd7e25..ec7a8736412 100644
--- a/IPython/core/tests/test_inputtransformer2_line.py
+++ b/IPython/core/tests/test_inputtransformer2_line.py
@@ -3,7 +3,6 @@
 Line-based transformers are the simpler ones; token-based transformers are
 more complex. See test_inputtransformer2 for tests for token-based transformers.
 """
-import pytest
 
 from IPython.core import inputtransformer2 as ipt2
 
diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index 14474bb0da1..f12601823d1 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -4,8 +4,6 @@
 # Module imports
 #-----------------------------------------------------------------------------
 
-# third party
-import pytest
 
 # our own packages
 
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 850e22792b9..1c793ca2915 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 """Tests for various magic functions."""
 
-import asyncio
 import gc
 import io
 import os
diff --git a/IPython/core/tests/test_paths.py b/IPython/core/tests/test_paths.py
index eb754b81529..86367b61ecb 100644
--- a/IPython/core/tests/test_paths.py
+++ b/IPython/core/tests/test_paths.py
@@ -1,7 +1,6 @@
 import errno
 import os
 import shutil
-import sys
 import tempfile
 import warnings
 from unittest.mock import patch
diff --git a/IPython/core/tests/test_pylabtools.py b/IPython/core/tests/test_pylabtools.py
index 78886373ced..59bf3bccd49 100644
--- a/IPython/core/tests/test_pylabtools.py
+++ b/IPython/core/tests/test_pylabtools.py
@@ -155,9 +155,6 @@ def test_import_pylab():
     assert ns["np"] == np
 
 
-from traitlets.config import Config
-
-
 class TestPylabSwitch(object):
     class Shell(InteractiveShell):
         def init_history(self):
diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index 1f49603ee88..349d2ac9e46 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -2,7 +2,6 @@
 """Tests for IPython.core.ultratb
 """
 import io
-import logging
 import os.path
 import platform
 import re
diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py
index b90a5d78606..693060ba55c 100644
--- a/IPython/lib/latextools.py
+++ b/IPython/lib/latextools.py
@@ -12,7 +12,7 @@
 from base64 import encodebytes
 import textwrap
 
-from pathlib import Path, PurePath
+from pathlib import Path
 
 from IPython.utils.process import find_cmd, FindCmdError
 from traitlets.config import get_config
diff --git a/IPython/paths.py b/IPython/paths.py
index 4fd253cf1e2..cc6408ca434 100644
--- a/IPython/paths.py
+++ b/IPython/paths.py
@@ -1,7 +1,6 @@
 """Find files and directories which IPython uses.
 """
 import os.path
-import shutil
 import tempfile
 from warnings import warn
 
diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
index 644a513a8c3..af42f349d5a 100644
--- a/IPython/testing/decorators.py
+++ b/IPython/testing/decorators.py
@@ -36,7 +36,6 @@
 import sys
 import tempfile
 import unittest
-import warnings
 from importlib import import_module
 
 from decorator import decorator
diff --git a/IPython/testing/globalipapp.py b/IPython/testing/globalipapp.py
index 698e3d845aa..3a699e07d61 100644
--- a/IPython/testing/globalipapp.py
+++ b/IPython/testing/globalipapp.py
@@ -12,7 +12,6 @@
 import builtins as builtin_mod
 import sys
 import types
-import warnings
 
 from pathlib import Path
 
diff --git a/IPython/testing/plugin/ipdoctest.py b/IPython/testing/plugin/ipdoctest.py
index 52cd8fd3b8a..e7edf9837f1 100644
--- a/IPython/testing/plugin/ipdoctest.py
+++ b/IPython/testing/plugin/ipdoctest.py
@@ -21,7 +21,6 @@
 # From the standard library
 import doctest
 import logging
-import os
 import re
 
 from testpath import modified_env
diff --git a/IPython/tests/cve.py b/IPython/tests/cve.py
index 0a9dec4e854..fd1b807604a 100644
--- a/IPython/tests/cve.py
+++ b/IPython/tests/cve.py
@@ -9,7 +9,6 @@
 import os
 import string
 import subprocess
-import time
 
 
 def test_cve_2022_21699():
diff --git a/IPython/utils/io.py b/IPython/utils/io.py
index 170bc625acb..2eac5e66cba 100644
--- a/IPython/utils/io.py
+++ b/IPython/utils/io.py
@@ -12,7 +12,6 @@
 import os
 import sys
 import tempfile
-import warnings
 from pathlib import Path
 from warnings import warn
 
diff --git a/IPython/utils/module_paths.py b/IPython/utils/module_paths.py
index f9f7cacc332..6f8cb1004a6 100644
--- a/IPython/utils/module_paths.py
+++ b/IPython/utils/module_paths.py
@@ -17,7 +17,6 @@
 
 # Stdlib imports
 import importlib
-import os
 import sys
 
 # Third-party imports
diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index a3a417d29e6..ccb70dccd43 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -12,10 +12,8 @@
 import shutil
 import random
 import glob
-from warnings import warn
 
 from IPython.utils.process import system
-from IPython.utils.decorators import undoc
 
 #-----------------------------------------------------------------------------
 # Code
diff --git a/IPython/utils/tests/test_io.py b/IPython/utils/tests/test_io.py
index 3b4c03eae06..75d895e03c3 100644
--- a/IPython/utils/tests/test_io.py
+++ b/IPython/utils/tests/test_io.py
@@ -8,7 +8,6 @@
 import sys
 from io import StringIO
 
-from subprocess import Popen, PIPE
 import unittest
 
 from IPython.utils.io import Tee, capture_output
diff --git a/IPython/utils/tests/test_module_paths.py b/IPython/utils/tests/test_module_paths.py
index 8438a1e737f..8dc52fd3234 100644
--- a/IPython/utils/tests/test_module_paths.py
+++ b/IPython/utils/tests/test_module_paths.py
@@ -18,8 +18,6 @@
 
 from pathlib import Path
 
-from IPython.testing.tools import make_tempfile
-
 import IPython.utils.module_paths as mp
 
 TEST_FILE_PATH = Path(__file__).resolve().parent
diff --git a/IPython/utils/tests/test_text.py b/IPython/utils/tests/test_text.py
index c036f5327c9..cc04cc93efa 100644
--- a/IPython/utils/tests/test_text.py
+++ b/IPython/utils/tests/test_text.py
@@ -15,7 +15,6 @@
 import os
 import math
 import random
-import sys
 
 from pathlib import Path
 

From 1db65d02e89f31c28c221197a2ed04f3ade3b195 Mon Sep 17 00:00:00 2001
From: Nir Schulman <narsssx@gmail.com>
Date: Sat, 3 Sep 2022 09:11:58 +0300
Subject: [PATCH 1225/1407] Added additional entrypoint script.

Added a third entrypoint to use python's minor version as well.

This can help when testing out differences of python versions. One could easily open "ipython3.10" and test it's differences with "ipython3.8".
---
 setupbase.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/setupbase.py b/setupbase.py
index b57dcc1b2a5..aaed8d1abaf 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -211,14 +211,16 @@ def find_entry_points():
     use, our own build_scripts_entrypt class below parses these and builds
     command line scripts.
 
-    Each of our entry points gets both a plain name, e.g. ipython, and one
-    suffixed with the Python major version number, e.g. ipython3.
+    Each of our entry points gets a plain name, e.g. ipython, a name
+    suffixed with the Python major version number, e.g. ipython3, and
+    a name suffixed with the Python major.minor version number, eg. ipython3.8.
     """
     ep = [
             'ipython%s = IPython:start_ipython',
         ]
-    suffix = str(sys.version_info[0])
-    return [e % '' for e in ep] + [e % suffix for e in ep]
+    major_suffix = str(sys.version_info[0])
+    minor_suffix = ".".join([str(sys.version_info[0]), str(sys.version_info[1])])
+    return [e % '' for e in ep] + [e % major_suffix for e in ep] + [e % minor_suffix for e in ep]
 
 class install_lib_symlink(Command):
     user_options = [

From d0bc765bde7c0471806b89231ce980209cf66c71 Mon Sep 17 00:00:00 2001
From: Nir Schulman <narsssx@gmail.com>
Date: Sat, 3 Sep 2022 09:40:33 +0300
Subject: [PATCH 1226/1407] Update setupbase.py

---
 setupbase.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setupbase.py b/setupbase.py
index aaed8d1abaf..5db235cd7de 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -220,7 +220,11 @@ def find_entry_points():
         ]
     major_suffix = str(sys.version_info[0])
     minor_suffix = ".".join([str(sys.version_info[0]), str(sys.version_info[1])])
-    return [e % '' for e in ep] + [e % major_suffix for e in ep] + [e % minor_suffix for e in ep]
+    return (
+        [e % "" for e in ep]
+        + [e % major_suffix for e in ep]
+        + [e % minor_suffix for e in ep]
+    )
 
 class install_lib_symlink(Command):
     user_options = [

From 77a4bce71bfcd1c2caf805a1743058c7d02af40d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 3 Sep 2022 12:00:40 +0200
Subject: [PATCH 1227/1407] Remove deprecated install_ext and
 ~/.ipython/extensions

As pointed out in #13722 loading extensions from this place have been
deprecated for about 5 years, so time for removal.

I understand this will likely make it too hard for some user who can't
seem to be able to write 8 lines of configuration:

    $ cat mod.py pyproject.toml
    """ipython ext"""
    __version__ = "0.0.1"
    [build-system]
    requires = ["flit_core >=3.2,<4"]
    build-backend = "flit_core.buildapi"

    [project]
    name = "mod"
    dynamic = ["version", "description"]

Those can be reminded that they can also modify their $PYTHONPATH, so
that py files can be imported from their preferred folder.

Closes #13722
---
 IPython/core/extensions.py              | 18 +-----------------
 docs/source/config/extensions/index.rst |  8 ++------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/IPython/core/extensions.py b/IPython/core/extensions.py
index ce419e1bd40..21fba40eaf4 100644
--- a/IPython/core/extensions.py
+++ b/IPython/core/extensions.py
@@ -88,13 +88,7 @@ def _load_extension(self, module_str: str):
 
         with self.shell.builtin_trap:
             if module_str not in sys.modules:
-                with prepended_to_syspath(self.ipython_extension_dir):
-                    mod = import_module(module_str)
-                    if mod.__file__.startswith(self.ipython_extension_dir):
-                        print(("Loading extensions from {dir} is deprecated. "
-                               "We recommend managing extensions like any "
-                               "other Python packages, in site-packages.").format(
-                              dir=compress_user(self.ipython_extension_dir)))
+                mod = import_module(module_str)
             mod = sys.modules[module_str]
             if self._call_load_ipython_extension(mod):
                 self.loaded.add(module_str)
@@ -155,13 +149,3 @@ def _call_unload_ipython_extension(self, mod):
         if hasattr(mod, 'unload_ipython_extension'):
             mod.unload_ipython_extension(self.shell)
             return True
-
-    @undoc
-    def install_extension(self, url, filename=None):
-        """
-        Deprecated.
-        """
-        # Ensure the extension directory exists
-        raise DeprecationWarning(
-            '`install_extension` and the `install_ext` magic have been deprecated since IPython 4.0'
-            'Use pip or other package managers to manage ipython extensions.')
diff --git a/docs/source/config/extensions/index.rst b/docs/source/config/extensions/index.rst
index e3c9cab4252..4b0a2222a8b 100644
--- a/docs/source/config/extensions/index.rst
+++ b/docs/source/config/extensions/index.rst
@@ -6,8 +6,7 @@ IPython extensions
 
 A level above configuration are IPython extensions, Python modules which modify
 the behaviour of the shell. They are referred to by an importable module name,
-and can be placed anywhere you'd normally import from, or in
-``.ipython/extensions/``.
+and can be placed anywhere you'd normally import from.
 
 Getting extensions
 ==================
@@ -71,10 +70,7 @@ Useful :class:`InteractiveShell` methods include :meth:`~IPython.core.interactiv
    :ref:`defining_magics`
 
 You can put your extension modules anywhere you want, as long as they can be
-imported by Python's standard import mechanism. However, to make it easy to
-write extensions, you can also put your extensions in :file:`extensions/`
-within the :ref:`IPython directory <ipythondir>`. This directory is
-added to :data:`sys.path` automatically.
+imported by Python's standard import mechanism.
 
 When your extension is ready for general use, please add it to the `extensions
 index <https://github.com/ipython/ipython/wiki/Extensions-Index>`_. We also

From d22310b932d989bce3ef82890f03a5d6ecb68775 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Mon, 5 Sep 2022 05:21:34 +0100
Subject: [PATCH 1228/1407] Refactor `IPCompleter` Matcher API

---
 IPython/core/completer.py            | 767 ++++++++++++++++++++++-----
 IPython/core/tests/test_completer.py |  40 +-
 2 files changed, 653 insertions(+), 154 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 59d3e9930fc..4d51ee45825 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -100,6 +100,30 @@
 
 Be sure to update :any:`jedi` to the latest stable version or to try the
 current development version to get better completions.
+
+Matchers
+========
+
+All completions routines are implemented using unified ``matchers`` API.
+The matchers API is provisional and subject to change without notice.
+
+The built-in matchers include:
+
+- ``IPCompleter.dict_key_matcher``:  dictionary key completions,
+- ``IPCompleter.magic_matcher``: completions for magics,
+- ``IPCompleter.unicode_name_matcher``, ``IPCompleter.fwd_unicode_matcher`` and ``IPCompleter.latex_matcher``: see `Forward latex/unicode completion`_,
+- ``back_unicode_name_matcher`` and ``back_latex_name_matcher``: see `Backward latex completion`_,
+- ``IPCompleter.file_matcher``: paths to files and directories,
+- ``IPCompleter.python_func_kw_matcher`` - function keywords,
+- ``IPCompleter.python_matches`` - globals and attributes (v1 API),
+- ``IPCompleter.jedi_matcher`` - static analysis with Jedi,
+- ``IPCompleter.custom_completer_matcher`` - pluggable completer with a default implementation in ``core.InteractiveShell``
+    which uses uses IPython hooks system (`complete_command`) with string dispatch (including regular expressions).
+    Differently to other matchers, ``custom_completer_matcher`` will not suppress Jedi results to match
+    behaviour in earlier IPython versions.
+
+Adding custom matchers is possible by appending to `IPCompleter.custom_matchers` list,
+but please be aware that this API is subject to change.
 """
 
 
@@ -124,9 +148,26 @@
 import uuid
 import warnings
 from contextlib import contextmanager
+from functools import lru_cache, partial
 from importlib import import_module
 from types import SimpleNamespace
-from typing import Iterable, Iterator, List, Tuple, Union, Any, Sequence, Dict, NamedTuple, Pattern, Optional
+from typing import (
+    Iterable,
+    Iterator,
+    List,
+    Tuple,
+    Union,
+    Any,
+    Sequence,
+    Dict,
+    NamedTuple,
+    Pattern,
+    Optional,
+    Callable,
+    TYPE_CHECKING,
+    Set,
+)
+from typing_extensions import TypedDict, NotRequired
 
 from IPython.core.error import TryNext
 from IPython.core.inputtransformer2 import ESC_MAGIC
@@ -137,7 +178,17 @@
 from IPython.utils.dir2 import dir2, get_real_method
 from IPython.utils.path import ensure_dir_exists
 from IPython.utils.process import arg_split
-from traitlets import Bool, Enum, Int, List as ListTrait, Unicode, default, observe
+from traitlets import (
+    Bool,
+    Enum,
+    Int,
+    List as ListTrait,
+    Unicode,
+    Dict as DictTrait,
+    Union as UnionTrait,
+    default,
+    observe,
+)
 from traitlets.config.configurable import Configurable
 
 import __main__
@@ -145,6 +196,7 @@
 # skip module docstests
 __skip_doctest__ = True
 
+
 try:
     import jedi
     jedi.settings.case_insensitive_completion = False
@@ -153,7 +205,16 @@
     JEDI_INSTALLED = True
 except ImportError:
     JEDI_INSTALLED = False
-#-----------------------------------------------------------------------------
+
+if TYPE_CHECKING:
+    from typing import cast
+else:
+
+    def cast(obj, _type):
+        return obj
+
+
+# -----------------------------------------------------------------------------
 # Globals
 #-----------------------------------------------------------------------------
 
@@ -177,6 +238,8 @@
 # may have trouble processing.
 MATCHES_LIMIT = 500
 
+# Completion type reported when no type can be inferred.
+_UNKNOWN_TYPE = "<unknown>"
 
 class ProvisionalCompleterWarning(FutureWarning):
     """
@@ -355,6 +418,9 @@ def __repr__(self):
         return '<Fake completion object jedi has crashed>'
 
 
+_JediCompletionLike = Union[jedi.api.Completion, _FakeJediCompletion]
+
+
 class Completion:
     """
     Completion object used and return by IPython completers.
@@ -417,6 +483,131 @@ def __hash__(self):
         return hash((self.start, self.end, self.text))
 
 
+class SimpleCompletion:
+    # TODO: decide whether we should keep the ``SimpleCompletion`` separate from ``Completion``
+    #  there are two advantages of keeping them separate:
+    #   - compatibility with old readline `Completer.complete` interface (less important)
+    #   - ease of use for third parties (just return matched text and don't worry about coordinates)
+    #  the disadvantage is that we need to loop over the completions again to transform them into
+    #  `Completion` objects (but it was done like that before the refactor into `SimpleCompletion` too).
+    __slots__ = ["text", "type"]
+
+    def __init__(self, text: str, *, type: str = None):
+        self.text = text
+        self.type = type
+
+    def __repr__(self):
+        return f"<SimpleCompletion text={self.text!r} type={self.type!r}>"
+
+
+class _MatcherResultBase(TypedDict):
+
+    #: suffix of the provided ``CompletionContext.token``, if not given defaults to full token.
+    matched_fragment: NotRequired[str]
+
+    #: whether to suppress results from other matchers; default is False.
+    suppress_others: NotRequired[bool]
+
+    #: are completions already ordered and should be left as-is? default is False.
+    ordered: NotRequired[bool]
+
+    # TODO: should we used a relevance score for ordering?
+    #: value between 0 (likely not relevant) and 100 (likely relevant); default is 50.
+    # relevance: NotRequired[float]
+
+
+class SimpleMatcherResult(_MatcherResultBase):
+    """Result of new-style completion matcher."""
+
+    #: list of candidate completions
+    completions: Sequence[SimpleCompletion]
+
+
+class _JediMatcherResult(_MatcherResultBase):
+    """Matching result returned by Jedi (will be processed differently)"""
+
+    #: list of candidate completions
+    completions: Iterable[_JediCompletionLike]
+
+
+class CompletionContext(NamedTuple):
+    # rationale: many legacy matchers relied on completer state (`self.text_until_cursor`)
+    # which was not explicitly visible as an argument of the matcher, making any refactor
+    # prone to errors; by explicitly passing `cursor_position` we can decouple the matchers
+    # from the completer, and make substituting them in sub-classes easier.
+
+    #: Relevant fragment of code directly preceding the cursor.
+    #: The extraction of token is implemented via splitter heuristic
+    #: (following readline behaviour for legacy reasons), which is user configurable
+    #: (by switching the greedy mode).
+    token: str
+
+    full_text: str
+
+    #: Cursor position in the line (the same for ``full_text`` and `text``).
+    cursor_position: int
+
+    #: Cursor line in ``full_text``.
+    cursor_line: int
+
+    @property
+    @lru_cache(maxsize=None)  # TODO change to @cache after dropping Python 3.7
+    def text_until_cursor(self) -> str:
+        return self.line_with_cursor[: self.cursor_position]
+
+    @property
+    @lru_cache(maxsize=None)  # TODO change to @cache after dropping Python 3.7
+    def line_with_cursor(self) -> str:
+        return self.full_text.split("\n")[self.cursor_line]
+
+
+MatcherResult = Union[SimpleMatcherResult, _JediMatcherResult]
+
+MatcherAPIv1 = Callable[[str], List[str]]
+MatcherAPIv2 = Callable[[CompletionContext], MatcherResult]
+Matcher = Union[MatcherAPIv1, MatcherAPIv2]
+
+
+def completion_matcher(
+    *, priority: float = None, identifier: str = None, api_version=1
+):
+    """Adds attributes describing the matcher.
+
+    Parameters
+    ----------
+    priority : Optional[float]
+        The priority of the matcher, determines the order of execution of matchers.
+        Higher priority means that the matcher will be executed first. Defaults to 50.
+    identifier : Optional[str]
+        identifier of the matcher allowing users to modify the behaviour via traitlets,
+        and also used to for debugging (will be passed as ``origin`` with the completions).
+        Defaults to matcher function ``__qualname__``.
+    api_version: Optional[int]
+        version of the Matcher API used by this matcher.
+        Currently supported values are 1 and 2.
+        Defaults to 1.
+    """
+
+    def wrapper(func: Matcher):
+        func.matcher_priority = priority
+        func.matcher_identifier = identifier or func.__qualname__
+        func.matcher_api_version = api_version
+        return func
+
+    return wrapper
+
+
+def _get_matcher_id(matcher: Matcher):
+    return getattr(matcher, "matcher_identifier", matcher.__qualname__)
+
+
+def _get_matcher_api_version(matcher):
+    return getattr(matcher, "matcher_api_version", 1)
+
+
+context_matcher = partial(completion_matcher, api_version=2)
+
+
 _IC = Iterable[Completion]
 
 
@@ -920,7 +1111,16 @@ def _safe_isinstance(obj, module, class_name):
     return (module in sys.modules and
             isinstance(obj, getattr(import_module(module), class_name)))
 
-def back_unicode_name_matches(text:str) -> Tuple[str, Sequence[str]]:
+
+@context_matcher()
+def back_unicode_name_matcher(context):
+    fragment, matches = back_unicode_name_matches(context.token)
+    return _convert_matcher_v1_result_to_v2(
+        matches, type="unicode", fragment=fragment, suppress_if_matches=True
+    )
+
+
+def back_unicode_name_matches(text: str) -> Tuple[str, Sequence[str]]:
     """Match Unicode characters back to Unicode name
 
     This does  ``☃`` -> ``\\snowman``
@@ -959,7 +1159,16 @@ def back_unicode_name_matches(text:str) -> Tuple[str, Sequence[str]]:
         pass
     return '', ()
 
-def back_latex_name_matches(text:str) -> Tuple[str, Sequence[str]] :
+
+@context_matcher()
+def back_latex_name_matcher(context):
+    fragment, matches = back_latex_name_matches(context.token)
+    return _convert_matcher_v1_result_to_v2(
+        matches, type="latex", fragment=fragment, suppress_if_matches=True
+    )
+
+
+def back_latex_name_matches(text: str) -> Tuple[str, Sequence[str]]:
     """Match latex characters back to unicode name
 
     This does ``\\ℵ`` -> ``\\aleph``
@@ -1038,11 +1247,25 @@ def _make_signature(completion)-> str:
                                           for p in signature.defined_names()) if f])
 
 
-class _CompleteResult(NamedTuple):
-    matched_text : str
-    matches: Sequence[str]
-    matches_origin: Sequence[str]
-    jedi_matches: Any
+_CompleteResult = Dict[str, MatcherResult]
+
+
+def _convert_matcher_v1_result_to_v2(
+    matches: Sequence[str],
+    type: str,
+    fragment: str = None,
+    suppress_if_matches: bool = False,
+) -> SimpleMatcherResult:
+    """Utility to help with transition"""
+    result = {
+        "completions": [SimpleCompletion(text=match, type=type) for match in matches],
+        "suppress_others": (True if matches else False)
+        if suppress_if_matches
+        else False,
+    }
+    if fragment is not None:
+        result["matched_fragment"] = fragment
+    return result
 
 
 class IPCompleter(Completer):
@@ -1058,17 +1281,58 @@ def _greedy_changed(self, change):
         else:
             self.splitter.delims = DELIMS
 
-    dict_keys_only = Bool(False,
-        help="""Whether to show dict key matches only""")
+    dict_keys_only = Bool(
+        False,
+        help="""
+        Whether to show dict key matches only.
+        
+        (disables all matchers except for `IPCompleter.dict_key_matcher`).
+        """,
+    )
+
+    suppress_competing_matchers = UnionTrait(
+        [Bool(), DictTrait(Bool(None, allow_none=True))],
+        help="""
+        Whether to suppress completions from other `Matchers`_.
+
+        When set to ``None`` (default) the matchers will attempt to auto-detect
+        whether suppression of other matchers is desirable. For example, at
+        the beginning of a line followed by `%` we expect a magic completion
+        to be the only applicable option, and after ``my_dict['`` we usually
+        expect a completion with an existing dictionary key.
+
+        If you want to disable this heuristic and see completions from all matchers,
+        set ``IPCompleter.suppress_competing_matchers = False``.
+        To disable the heuristic for specific matchers provide a dictionary mapping:
+        ``IPCompleter.suppress_competing_matchers = {'IPCompleter.dict_key_matcher': False}``.
+
+        Set ``IPCompleter.suppress_competing_matchers = True`` to limit
+        completions to the set of matchers with the highest priority;
+        this is equivalent to ``IPCompleter.merge_completions`` and        
+        can be beneficial for performance, but will sometimes omit relevant
+        candidates from matchers further down the priority list.
+        """,
+    ).tag(config=True)
 
-    merge_completions = Bool(True,
+    merge_completions = Bool(
+        True,
         help="""Whether to merge completion results into a single list
 
         If False, only the completion results from the first non-empty
         completer will be returned.
-        """
+        
+        As of version 8.5.0, setting the value to ``False`` is an alias for:
+        ``IPCompleter.suppress_competing_matchers = True.``.
+        """,
+    ).tag(config=True)
+
+    disable_matchers = ListTrait(
+        Unicode(), help="""List of matchers to disable."""
     ).tag(config=True)
-    omit__names = Enum((0,1,2), default_value=2,
+
+    omit__names = Enum(
+        (0, 1, 2),
+        default_value=2,
         help="""Instruct the completer to omit private method names
 
         Specifically, when completing on ``object.<tab>``.
@@ -1144,7 +1408,7 @@ def __init__(
             namespace=namespace,
             global_namespace=global_namespace,
             config=config,
-            **kwargs
+            **kwargs,
         )
 
         # List where completion matches will be stored
@@ -1173,8 +1437,8 @@ def __init__(
         #= re.compile(r'[\s|\[]*(\w+)(?:\s*=?\s*.*)')
 
         self.magic_arg_matchers = [
-            self.magic_config_matches,
-            self.magic_color_matches,
+            self.magic_config_matcher,
+            self.magic_color_matcher,
         ]
 
         # This is set externally by InteractiveShell
@@ -1186,27 +1450,53 @@ def __init__(
         # attribute through the `@unicode_names` property.
         self._unicode_names = None
 
+        self._backslash_combining_matchers = [
+            self.latex_name_matcher,
+            self.unicode_name_matcher,
+            back_latex_name_matcher,
+            back_unicode_name_matcher,
+            self.fwd_unicode_matcher,
+        ]
+
+        if not self.backslash_combining_completions:
+            for matcher in self._backslash_combining_matchers:
+                self.disable_matchers.append(matcher.matcher_identifier)
+
+        if not self.merge_completions:
+            self.suppress_competing_matchers = True
+
+        if self.dict_keys_only:
+            self.disable_matchers.append(self.dict_key_matcher.matcher_identifier)
+
     @property
-    def matchers(self) -> List[Any]:
+    def matchers(self) -> List[Matcher]:
         """All active matcher routines for completion"""
         if self.dict_keys_only:
-            return [self.dict_key_matches]
+            return [self.dict_key_matcher]
 
         if self.use_jedi:
             return [
                 *self.custom_matchers,
-                self.dict_key_matches,
-                self.file_matches,
-                self.magic_matches,
+                *self._backslash_combining_matchers,
+                *self.magic_arg_matchers,
+                self.custom_completer_matcher,
+                self.magic_matcher,
+                self._jedi_matcher,
+                self.dict_key_matcher,
+                self.file_matcher,
             ]
         else:
             return [
                 *self.custom_matchers,
-                self.dict_key_matches,
+                *self._backslash_combining_matchers,
+                *self.magic_arg_matchers,
+                self.custom_completer_matcher,
+                self.dict_key_matcher,
+                # TODO: convert python_matches to v2 API
+                self.magic_matcher,
                 self.python_matches,
-                self.file_matches,
-                self.magic_matches,
-                self.python_func_kw_matches,
+                self.file_matcher,
+                self.python_func_kw_matcher,
             ]
 
     def all_completions(self, text:str) -> List[str]:
@@ -1227,7 +1517,14 @@ def _clean_glob_win32(self, text:str):
         return [f.replace("\\","/")
                 for f in self.glob("%s*" % text)]
 
-    def file_matches(self, text:str)->List[str]:
+    @context_matcher()
+    def file_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
+        matches = self.file_matches(context.token)
+        # TODO: add a heuristic for suppressing (e.g. if it has OS-specific delimiter,
+        #  starts with `/home/`, `C:\`, etc)
+        return _convert_matcher_v1_result_to_v2(matches, type="path")
+
+    def file_matches(self, text: str) -> List[str]:
         """Match filenames, expanding ~USER type strings.
 
         Most of the seemingly convoluted logic in this completer is an
@@ -1309,7 +1606,16 @@ def file_matches(self, text:str)->List[str]:
         # Mark directories in input list by appending '/' to their names.
         return [x+'/' if os.path.isdir(x) else x for x in matches]
 
-    def magic_matches(self, text:str):
+    @context_matcher()
+    def magic_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
+        text = context.token
+        matches = self.magic_matches(text)
+        result = _convert_matcher_v1_result_to_v2(matches, type="magic")
+        is_magic_prefix = len(text) > 0 and text[0] == "%"
+        result["suppress_others"] = is_magic_prefix and bool(result["completions"])
+        return result
+
+    def magic_matches(self, text: str):
         """Match magics"""
         # Get all shell magics now rather than statically, so magics loaded at
         # runtime show up too.
@@ -1351,8 +1657,14 @@ def matches(magic):
 
         return comp
 
-    def magic_config_matches(self, text:str) -> List[str]:
-        """ Match class names and attributes for %config magic """
+    @context_matcher()
+    def magic_config_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
+        # NOTE: uses `line_buffer` equivalent for compatibility
+        matches = self.magic_config_matches(context.line_with_cursor)
+        return _convert_matcher_v1_result_to_v2(matches, type="param")
+
+    def magic_config_matches(self, text: str) -> List[str]:
+        """Match class names and attributes for %config magic"""
         texts = text.strip().split()
 
         if len(texts) > 0 and (texts[0] == 'config' or texts[0] == '%config'):
@@ -1386,8 +1698,14 @@ def magic_config_matches(self, text:str) -> List[str]:
                          if attr.startswith(texts[1]) ]
         return []
 
-    def magic_color_matches(self, text:str) -> List[str] :
-        """ Match color schemes for %colors magic"""
+    @context_matcher()
+    def magic_color_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
+        # NOTE: uses `line_buffer` equivalent for compatibility
+        matches = self.magic_color_matches(context.line_with_cursor)
+        return _convert_matcher_v1_result_to_v2(matches, type="param")
+
+    def magic_color_matches(self, text: str) -> List[str]:
+        """Match color schemes for %colors magic"""
         texts = text.split()
         if text.endswith(' '):
             # .split() strips off the trailing whitespace. Add '' back
@@ -1400,9 +1718,24 @@ def magic_color_matches(self, text:str) -> List[str] :
                      if color.startswith(prefix) ]
         return []
 
-    def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str) -> Iterable[Any]:
+    @context_matcher(identifier="IPCompleter.jedi_matcher")
+    def _jedi_matcher(self, context: CompletionContext) -> _JediMatcherResult:
+        matches = self._jedi_matches(
+            cursor_column=context.cursor_position,
+            cursor_line=context.cursor_line,
+            text=context.full_text,
+        )
+        return {
+            "completions": matches,
+            # statis analysis should not suppress other matchers
+            "suppress_others": False,
+        }
+
+    def _jedi_matches(
+        self, cursor_column: int, cursor_line: int, text: str
+    ) -> Iterable[_JediCompletionLike]:
         """
-        Return a list of :any:`jedi.api.Completions` object from a ``text`` and
+        Return a list of :any:`jedi.api.Completion`s object from a ``text`` and
         cursor position.
 
         Parameters
@@ -1554,6 +1887,11 @@ def _default_arguments(self, obj):
 
         return list(set(ret))
 
+    @context_matcher()
+    def python_func_kw_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
+        matches = self.python_func_kw_matches(context.token)
+        return _convert_matcher_v1_result_to_v2(matches, type="param")
+
     def python_func_kw_matches(self, text):
         """Match named parameters (kwargs) of the last open function"""
 
@@ -1650,9 +1988,18 @@ def _get_keys(obj: Any) -> List[Any]:
             return obj.dtype.names or []
         return []
 
-    def dict_key_matches(self, text:str) -> List[str]:
-        "Match string keys in a dictionary, after e.g. 'foo[' "
+    @context_matcher()
+    def dict_key_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
+        matches = self.dict_key_matches(context.token)
+        return _convert_matcher_v1_result_to_v2(
+            matches, type="dict key", suppress_if_matches=True
+        )
+
+    def dict_key_matches(self, text: str) -> List[str]:
+        """Match string keys in a dictionary, after e.g. ``foo[``.
 
+        DEPRECATED: Deprecated since 8.5. Use ``dict_key_matcher`` instead.
+        """
 
         if self.__dict_key_regexps is not None:
             regexps = self.__dict_key_regexps
@@ -1754,8 +2101,15 @@ def dict_key_matches(self, text:str) -> List[str]:
 
         return [leading + k + suf for k in matches]
 
+    @context_matcher()
+    def unicode_name_matcher(self, context):
+        fragment, matches = self.unicode_name_matches(context.token)
+        return _convert_matcher_v1_result_to_v2(
+            matches, type="unicode", fragment=fragment, suppress_if_matches=True
+        )
+
     @staticmethod
-    def unicode_name_matches(text:str) -> Tuple[str, List[str]] :
+    def unicode_name_matches(text: str) -> Tuple[str, List[str]]:
         """Match Latex-like syntax for unicode characters base
         on the name of the character.
 
@@ -1776,8 +2130,14 @@ def unicode_name_matches(text:str) -> Tuple[str, List[str]] :
                 pass
         return '', []
 
+    @context_matcher()
+    def latex_name_matcher(self, context):
+        fragment, matches = self.latex_matches(context.token)
+        return _convert_matcher_v1_result_to_v2(
+            matches, type="latex", fragment=fragment, suppress_if_matches=True
+        )
 
-    def latex_matches(self, text:str) -> Tuple[str, Sequence[str]]:
+    def latex_matches(self, text: str) -> Tuple[str, Sequence[str]]:
         """Match Latex syntax for unicode characters.
 
         This does both ``\\alp`` -> ``\\alpha`` and ``\\alpha`` -> ``α``
@@ -1797,6 +2157,15 @@ def latex_matches(self, text:str) -> Tuple[str, Sequence[str]]:
                     return s, matches
         return '', ()
 
+    @context_matcher()
+    def custom_completer_matcher(self, context):
+        matches = self.dispatch_custom_completer(context.token) or []
+        result = _convert_matcher_v1_result_to_v2(
+            matches, type="<unknown>", suppress_if_matches=True
+        )
+        result["ordered"] = True
+        return result
+
     def dispatch_custom_completer(self, text):
         if not self.custom_completers:
             return
@@ -1951,12 +2320,25 @@ def _completions(self, full_text: str, offset: int, *, _timeout) -> Iterator[Com
         """
         deadline = time.monotonic() + _timeout
 
-
         before = full_text[:offset]
         cursor_line, cursor_column = position_to_cursor(full_text, offset)
 
-        matched_text, matches, matches_origin, jedi_matches = self._complete(
-            full_text=full_text, cursor_line=cursor_line, cursor_pos=cursor_column)
+        jedi_matcher_id = _get_matcher_id(self._jedi_matcher)
+
+        results = self._complete(
+            full_text=full_text, cursor_line=cursor_line, cursor_pos=cursor_column
+        )
+        non_jedi_results: Dict[str, SimpleMatcherResult] = {
+            identifier: result
+            for identifier, result in results.items()
+            if identifier != jedi_matcher_id
+        }
+
+        jedi_matches = (
+            cast(results[jedi_matcher_id], _JediMatcherResult)["completions"]
+            if jedi_matcher_id in results
+            else ()
+        )
 
         iter_jm = iter(jedi_matches)
         if _timeout:
@@ -1984,27 +2366,55 @@ def _completions(self, full_text: str, offset: int, *, _timeout) -> Iterator[Com
 
         for jm in iter_jm:
             delta = len(jm.name_with_symbols) - len(jm.complete)
-            yield Completion(start=offset - delta,
-                             end=offset,
-                             text=jm.name_with_symbols,
-                             type='<unknown>',  # don't compute type for speed
-                             _origin='jedi',
-                             signature='')
-
-
-        start_offset = before.rfind(matched_text)
+            yield Completion(
+                start=offset - delta,
+                end=offset,
+                text=jm.name_with_symbols,
+                type=_UNKNOWN_TYPE,  # don't compute type for speed
+                _origin="jedi",
+                signature="",
+            )
 
         # TODO:
         # Suppress this, right now just for debug.
-        if jedi_matches and matches and self.debug:
-            yield Completion(start=start_offset, end=offset, text='--jedi/ipython--',
-                             _origin='debug', type='none', signature='')
+        if jedi_matches and non_jedi_results and self.debug:
+            some_start_offset = before.rfind(
+                next(iter(non_jedi_results.values()))["matched_fragment"]
+            )
+            yield Completion(
+                start=some_start_offset,
+                end=offset,
+                text="--jedi/ipython--",
+                _origin="debug",
+                type="none",
+                signature="",
+            )
 
-        # I'm unsure if this is always true, so let's assert and see if it
-        # crash
-        assert before.endswith(matched_text)
-        for m, t in zip(matches, matches_origin):
-            yield Completion(start=start_offset, end=offset, text=m, _origin=t, signature='', type='<unknown>')
+        ordered = []
+        sortable = []
+
+        for origin, result in non_jedi_results.items():
+            matched_text = result["matched_fragment"]
+            start_offset = before.rfind(matched_text)
+            is_ordered = result.get("ordered", False)
+            container = ordered if is_ordered else sortable
+
+            # I'm unsure if this is always true, so let's assert and see if it
+            # crash
+            assert before.endswith(matched_text)
+
+            for simple_completion in result["completions"]:
+                completion = Completion(
+                    start=start_offset,
+                    end=offset,
+                    text=simple_completion.text,
+                    _origin=origin,
+                    signature="",
+                    type=simple_completion.type or _UNKNOWN_TYPE,
+                )
+                container.append(completion)
+
+        yield from self._deduplicate(ordered + self._sort(sortable))
 
 
     def complete(self, text=None, line_buffer=None, cursor_pos=None) -> Tuple[str, Sequence[str]]:
@@ -2046,7 +2456,54 @@ def complete(self, text=None, line_buffer=None, cursor_pos=None) -> Tuple[str, S
                       PendingDeprecationWarning)
         # potential todo, FOLD the 3rd throw away argument of _complete
         # into the first 2 one.
-        return self._complete(line_buffer=line_buffer, cursor_pos=cursor_pos, text=text, cursor_line=0)[:2]
+        # TODO: Q: does the above refer to jedi completions (i.e. 0-indexed?)
+        # TODO: should we deprecate now, or does it stay?
+
+        results = self._complete(
+            line_buffer=line_buffer, cursor_pos=cursor_pos, text=text, cursor_line=0
+        )
+
+        jedi_matcher_id = _get_matcher_id(self._jedi_matcher)
+
+        return self._arrange_and_extract(
+            results,
+            # TODO: can we confirm that excluding Jedi here was a deliberate choice in previous version?
+            skip_matchers={jedi_matcher_id},
+            # this API does not support different start/end positions (fragments of token).
+            abort_if_offset_changes=True,
+        )
+
+    def _arrange_and_extract(
+        self,
+        results: Dict[str, MatcherResult],
+        skip_matchers: Set[str],
+        abort_if_offset_changes: bool,
+    ):
+
+        sortable = []
+        ordered = []
+        most_recent_fragment = None
+        for identifier, result in results.items():
+            if identifier in skip_matchers:
+                continue
+            if not most_recent_fragment:
+                most_recent_fragment = result["matched_fragment"]
+            if (
+                abort_if_offset_changes
+                and result["matched_fragment"] != most_recent_fragment
+            ):
+                break
+            if result.get("ordered", False):
+                ordered.extend(result["completions"])
+            else:
+                sortable.extend(result["completions"])
+
+        if not most_recent_fragment:
+            most_recent_fragment = ""  # to satisfy typechecker (and just in case)
+
+        return most_recent_fragment, [
+            m.text for m in self._deduplicate(ordered + self._sort(sortable))
+        ]
 
     def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
                   full_text=None) -> _CompleteResult:
@@ -2081,14 +2538,10 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
 
         Returns
         -------
-        A tuple of N elements which are (likely):
-            matched_text: ? the text that the complete matched
-            matches: list of completions ?
-            matches_origin: ? list same length as matches, and where each completion came from
-            jedi_matches: list of Jedi matches, have it's own structure.
+        An ordered dictionary where keys are identifiers of completion
+        matchers and values are ``MatcherResult``s.
         """
 
-
         # if the cursor position isn't given, the only sane assumption we can
         # make is that it's at the end of the line (the common case)
         if cursor_pos is None:
@@ -2100,93 +2553,131 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
         # if text is either None or an empty string, rely on the line buffer
         if (not line_buffer) and full_text:
             line_buffer = full_text.split('\n')[cursor_line]
-        if not text: # issue #11508: check line_buffer before calling split_line
-            text = self.splitter.split_line(line_buffer, cursor_pos)  if line_buffer else ''
-
-        if self.backslash_combining_completions:
-            # allow deactivation of these on windows.
-            base_text = text if not line_buffer else line_buffer[:cursor_pos]
-
-            for meth in (self.latex_matches,
-                         self.unicode_name_matches,
-                         back_latex_name_matches,
-                         back_unicode_name_matches,
-                         self.fwd_unicode_match):
-                name_text, name_matches = meth(base_text)
-                if name_text:
-                    return _CompleteResult(name_text, name_matches[:MATCHES_LIMIT], \
-                           [meth.__qualname__]*min(len(name_matches), MATCHES_LIMIT), ())
-
+        if not text:  # issue #11508: check line_buffer before calling split_line
+            text = (
+                self.splitter.split_line(line_buffer, cursor_pos) if line_buffer else ""
+            )
 
         # If no line buffer is given, assume the input text is all there was
         if line_buffer is None:
             line_buffer = text
 
+        # deprecated - do not use `line_buffer` in new code.
         self.line_buffer = line_buffer
         self.text_until_cursor = self.line_buffer[:cursor_pos]
 
-        # Do magic arg matches
-        for matcher in self.magic_arg_matchers:
-            matches = list(matcher(line_buffer))[:MATCHES_LIMIT]
-            if matches:
-                origins = [matcher.__qualname__] * len(matches)
-                return _CompleteResult(text, matches, origins, ())
+        if not full_text:
+            full_text = line_buffer
+
+        context = CompletionContext(
+            full_text=full_text,
+            cursor_position=cursor_pos,
+            cursor_line=cursor_line,
+            token=text,
+        )
 
         # Start with a clean slate of completions
-        matches = []
+        results = {}
 
-        # FIXME: we should extend our api to return a dict with completions for
-        # different types of objects.  The rlcomplete() method could then
-        # simply collapse the dict into a list for readline, but we'd have
-        # richer completion semantics in other environments.
-        is_magic_prefix = len(text) > 0 and text[0] == "%"
-        completions: Iterable[Any] = []
-        if self.use_jedi and not is_magic_prefix:
-            if not full_text:
-                full_text = line_buffer
-            completions = self._jedi_matches(
-                cursor_pos, cursor_line, full_text)
-
-        if self.merge_completions:
-            matches = []
-            for matcher in self.matchers:
-                try:
-                    matches.extend([(m, matcher.__qualname__)
-                                    for m in matcher(text)])
-                except:
-                    # Show the ugly traceback if the matcher causes an
-                    # exception, but do NOT crash the kernel!
-                    sys.excepthook(*sys.exc_info())
-        else:
-            for matcher in self.matchers:
-                matches = [(m, matcher.__qualname__)
-                            for m in matcher(text)]
-                if matches:
-                    break
-                    
-        seen = set()
-        filtered_matches = set()
-        for m in matches:
-            t, c = m
-            if t not in seen:
-                filtered_matches.add(m)
-                seen.add(t)
+        custom_completer_matcher_id = _get_matcher_id(self.custom_completer_matcher)
+        jedi_matcher_id = _get_matcher_id(self._jedi_matcher)
 
-        _filtered_matches = sorted(filtered_matches, key=lambda x: completions_sorting_key(x[0]))
+        for matcher in self.matchers:
+            api_version = _get_matcher_api_version(matcher)
+            matcher_id = _get_matcher_id(matcher)
 
-        custom_res = [(m, 'custom') for m in self.dispatch_custom_completer(text) or []]
-        
-        _filtered_matches = custom_res or _filtered_matches
-        
-        _filtered_matches = _filtered_matches[:MATCHES_LIMIT]
-        _matches = [m[0] for m in _filtered_matches]
-        origins = [m[1] for m in _filtered_matches]
+            if matcher_id in results:
+                warnings.warn(f"Duplicate matcher ID: {matcher_id}.")
 
-        self.matches = _matches
+            try:
+                if api_version == 1:
+                    result = _convert_matcher_v1_result_to_v2(
+                        matcher(text), type=_UNKNOWN_TYPE
+                    )
+                elif api_version == 2:
+                    # TODO: MATCHES_LIMIT was used inconsistently in previous version
+                    #  (applied individually to latex/unicode and magic arguments matcher,
+                    #  but not Jedi, paths, magics, etc). Jedi did not have a limit here at
+                    #  all, but others had a total limit (retained in `_deduplicate_and_sort`).
+                    #  1) Was that deliberate or an omission?
+                    #  2) Should we include the limit in the API v2 signature to allow
+                    #     more expensive matchers to return early?
+                    result = cast(matcher, MatcherAPIv2)(context)
+                else:
+                    raise ValueError(f"Unsupported API version {api_version}")
+            except:
+                # Show the ugly traceback if the matcher causes an
+                # exception, but do NOT crash the kernel!
+                sys.excepthook(*sys.exc_info())
+                continue
 
-        return _CompleteResult(text, _matches, origins, completions)
-        
-    def fwd_unicode_match(self, text:str) -> Tuple[str, Sequence[str]]:
+            # set default value for matched fragment if suffix was not selected.
+            result["matched_fragment"] = result.get("matched_fragment", context.token)
+
+            suppression_recommended = result.get("suppress_others", False)
+
+            should_suppress = (
+                self.suppress_competing_matchers is True
+                or suppression_recommended
+                or (
+                    isinstance(self.suppress_competing_matchers, dict)
+                    and self.suppress_competing_matchers[matcher_id]
+                )
+            ) and len(result["completions"])
+
+            if should_suppress:
+                new_results = {matcher_id: result}
+                if (
+                    matcher_id == custom_completer_matcher_id
+                    and jedi_matcher_id in results
+                ):
+                    # custom completer does not suppress Jedi (this may change in future versions).
+                    new_results[jedi_matcher_id] = results[jedi_matcher_id]
+                results = new_results
+                break
+
+            results[matcher_id] = result
+
+        _, matches = self._arrange_and_extract(
+            results,
+            # TODO Jedi completions non included in legacy stateful API; was this deliberate or omission?
+            #  if it was omission, we can remove the filtering step, otherwise remove this comment.
+            skip_matchers={jedi_matcher_id},
+            abort_if_offset_changes=False,
+        )
+
+        # populate legacy stateful API
+        self.matches = matches
+
+        return results
+
+    @staticmethod
+    def _deduplicate(
+        matches: Sequence[SimpleCompletion],
+    ) -> Iterable[SimpleCompletion]:
+        filtered_matches = {}
+        for match in matches:
+            text = match.text
+            if (
+                text not in filtered_matches
+                or filtered_matches[text].type == _UNKNOWN_TYPE
+            ):
+                filtered_matches[text] = match
+
+        return filtered_matches.values()
+
+    @staticmethod
+    def _sort(matches: Sequence[SimpleCompletion]):
+        return sorted(matches, key=lambda x: completions_sorting_key(x.text))
+
+    @context_matcher()
+    def fwd_unicode_matcher(self, context):
+        fragment, matches = self.latex_matches(context.token)
+        return _convert_matcher_v1_result_to_v2(
+            matches, type="unicode", fragment=fragment, suppress_if_matches=True
+        )
+
+    def fwd_unicode_match(self, text: str) -> Tuple[str, Sequence[str]]:
         """
         Forward match a string starting with a backslash with a list of
         potential Unicode completions.
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 746a1e68261..2643816cceb 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -298,7 +298,7 @@ def test_back_unicode_completion(self):
         ip = get_ipython()
 
         name, matches = ip.complete("\\Ⅴ")
-        self.assertEqual(matches, ("\\ROMAN NUMERAL FIVE",))
+        self.assertEqual(matches, ["\\ROMAN NUMERAL FIVE"])
 
     def test_forward_unicode_completion(self):
         ip = get_ipython()
@@ -379,6 +379,12 @@ def test_local_file_completions(self):
 
     def test_quoted_file_completions(self):
         ip = get_ipython()
+
+        def _(text):
+            return ip.Completer._complete(
+                cursor_line=0, cursor_pos=len(text), full_text=text
+            )["IPCompleter.file_matcher"]["completions"]
+
         with TemporaryWorkingDirectory():
             name = "foo'bar"
             open(name, "w", encoding="utf-8").close()
@@ -387,25 +393,16 @@ def test_quoted_file_completions(self):
             escaped = name if sys.platform == "win32" else "foo\\'bar"
 
             # Single quote matches embedded single quote
-            text = "open('foo"
-            c = ip.Completer._complete(
-                cursor_line=0, cursor_pos=len(text), full_text=text
-            )[1]
-            self.assertEqual(c, [escaped])
+            c = _("open('foo")[0]
+            self.assertEqual(c.text, escaped)
 
             # Double quote requires no escape
-            text = 'open("foo'
-            c = ip.Completer._complete(
-                cursor_line=0, cursor_pos=len(text), full_text=text
-            )[1]
-            self.assertEqual(c, [name])
+            c = _('open("foo')[0]
+            self.assertEqual(c.text, name)
 
             # No quote requires an escape
-            text = "%ls foo"
-            c = ip.Completer._complete(
-                cursor_line=0, cursor_pos=len(text), full_text=text
-            )[1]
-            self.assertEqual(c, [escaped])
+            c = _("%ls foo")[0]
+            self.assertEqual(c.text, escaped)
 
     def test_all_completions_dups(self):
         """
@@ -475,6 +472,17 @@ def test_completion_have_signature(self):
             "encoding" in c.signature
         ), "Signature of function was not found by completer"
 
+    def test_completions_have_type(self):
+        """
+        Lets make sure matchers provide completion type.
+        """
+        ip = get_ipython()
+        with provisionalcompleter():
+            ip.Completer.use_jedi = False
+            completions = ip.Completer.completions("%tim", 3)
+            c = next(completions)  # should be `%time` or similar
+        assert c.type == "magic", "Type of magic was not assigned by completer"
+
     @pytest.mark.xfail(reason="Known failure on jedi<=0.18.0")
     def test_deduplicate_completions(self):
         """

From 728bad98401fa6531483879f97a166f07e9d6570 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Mon, 5 Sep 2022 07:59:33 +0100
Subject: [PATCH 1229/1407] Shim TypedDict and NotRequired at runtime until

the lowest supported Python version catches up.
---
 IPython/core/completer.py | 4 +++-
 setup.cfg                 | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 4d51ee45825..1e04800e8d3 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -167,7 +167,6 @@
     TYPE_CHECKING,
     Set,
 )
-from typing_extensions import TypedDict, NotRequired
 
 from IPython.core.error import TryNext
 from IPython.core.inputtransformer2 import ESC_MAGIC
@@ -208,11 +207,14 @@
 
 if TYPE_CHECKING:
     from typing import cast
+    from typing_extensions import TypedDict, NotRequired
 else:
 
     def cast(obj, _type):
         return obj
 
+    TypedDict = Dict
+    NotRequired = Tuple
 
 # -----------------------------------------------------------------------------
 # Globals
diff --git a/setup.cfg b/setup.cfg
index 0e371836877..8d5136d73a2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -74,6 +74,7 @@ test_extra =
     numpy>=1.19
     pandas
     trio
+    typing_extensions
 all =
     %(black)s
     %(doc)s

From 93c8b4d5380d861bf77c590660b93e495bef893b Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Mon, 5 Sep 2022 08:25:48 +0100
Subject: [PATCH 1230/1407] Update ipdoctest test

---
 IPython/core/completer.py     |  2 ++
 IPython/core/magics/config.py | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 1e04800e8d3..d8fecbbf298 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -101,6 +101,8 @@
 Be sure to update :any:`jedi` to the latest stable version or to try the
 current development version to get better completions.
 
+.. _Matchers:
+
 Matchers
 ========
 
diff --git a/IPython/core/magics/config.py b/IPython/core/magics/config.py
index c1387b601b8..efa992bbb79 100644
--- a/IPython/core/magics/config.py
+++ b/IPython/core/magics/config.py
@@ -80,6 +80,9 @@ def config(self, s):
                 Enable debug for the Completer. Mostly print extra information for
                 experimental jedi integration.
                 Current: False
+            IPCompleter.disable_matchers=<list-item-1>...
+                List of matchers to disable.
+                Current: []
             IPCompleter.greedy=<Bool>
                 Activate greedy completion
                         PENDING DEPRECATION. this is now mostly taken care of with Jedi.
@@ -102,6 +105,8 @@ def config(self, s):
                 Whether to merge completion results into a single list
                         If False, only the completion results from the first non-empty
                         completer will be returned.
+                        As of version 8.5.0, setting the value to ``False`` is an alias for:
+                        ``IPCompleter.suppress_competing_matchers = True.``.
                 Current: True
             IPCompleter.omit__names=<Enum>
                 Instruct the completer to omit private method names
@@ -117,6 +122,24 @@ def config(self, s):
             IPCompleter.profiler_output_dir=<Unicode>
                 Template for path at which to output profile data for completions.
                 Current: '.completion_profiles'
+            IPCompleter.suppress_competing_matchers=<Union>
+                Whether to suppress completions from other `Matchers`_.
+                When set to ``None`` (default) the matchers will attempt to auto-detect
+                whether suppression of other matchers is desirable. For example, at the
+                beginning of a line followed by `%` we expect a magic completion to be the
+                only applicable option, and after ``my_dict['`` we usually expect a
+                completion with an existing dictionary key.
+                If you want to disable this heuristic and see completions from all matchers,
+                set ``IPCompleter.suppress_competing_matchers = False``. To disable the
+                heuristic for specific matchers provide a dictionary mapping:
+                ``IPCompleter.suppress_competing_matchers = {'IPCompleter.dict_key_matcher':
+                False}``.
+                Set ``IPCompleter.suppress_competing_matchers = True`` to limit completions
+                to the set of matchers with the highest priority; this is equivalent to
+                ``IPCompleter.merge_completions`` and         can be beneficial for
+                performance, but will sometimes omit relevant candidates from matchers
+                further down the priority list.
+                Current: False
             IPCompleter.use_jedi=<Bool>
                 Experimental: Use Jedi to generate autocompletions. Default to True if jedi
                 is installed.

From 311a3a0fd25d09cc4d314f900e31ee6ac2cfbba4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 6 Sep 2022 11:02:43 +0200
Subject: [PATCH 1231/1407] release 8.5.0

---
 IPython/core/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 1d6483ce50e..18aaa7f9765 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,7 +20,7 @@
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-# _version_extra = ""  # Uncomment this for full releases
+_version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 84af48129c748341ce0b73cb42d310fc7966a51a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 6 Sep 2022 11:03:20 +0200
Subject: [PATCH 1232/1407] back to dev

---
 IPython/core/release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 18aaa7f9765..a7e48a17b83 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -16,11 +16,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 8
-_version_minor = 5
+_version_minor = 6
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-_version_extra = ""  # Uncomment this for full releases
+# _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 95de1fe40d1baa7e13c9635c335ca0b87cf5dad7 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Tue, 6 Sep 2022 21:19:39 +0100
Subject: [PATCH 1233/1407] Move documentation requirements to setup.cfg

---
 docs/requirements.txt | 10 +---------
 setup.cfg             | 10 +++++++++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 587288c2a0f..add92ee1e12 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,9 +1 @@
--e .[test]
-ipykernel
-setuptools>=18.5
-sphinx
-sphinx-rtd-theme
-docrepr
-matplotlib
-stack_data
-pytest<7
+-e .[doc]
diff --git a/setup.cfg b/setup.cfg
index 274e338d0ce..6004f3a4d3d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -46,7 +46,15 @@ install_requires =
 black =
     black
 doc =
-    Sphinx>=1.3
+    ipykernel
+    setuptools>=18.5
+    sphinx>=1.3
+    sphinx-rtd-theme
+    docrepr
+    matplotlib
+    stack_data
+    pytest<7
+    %(test)s
 kernel =
     ipykernel
 nbconvert =

From 4ab4de3bbf08805262e4b67957faf2e2c588e382 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Tue, 6 Sep 2022 21:27:27 +0100
Subject: [PATCH 1234/1407] Update README to use optional dependency over
 requirements.txt

---
 docs/README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/README.rst b/docs/README.rst
index ebdb17107e0..4bfc5b18ccc 100644
--- a/docs/README.rst
+++ b/docs/README.rst
@@ -26,7 +26,7 @@ the following tools are needed to build the documentation:
 In a conda environment, or a Python 3 ``venv``, you should be able to run::
 
   cd ipython
-  pip install -U -r docs/requirements.txt
+  pip install .[doc] -U
 
 
 Build Commands

From cce852948681451002291370b6fc6b64bae0d908 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Wed, 7 Sep 2022 03:05:37 +0100
Subject: [PATCH 1235/1407] Implement `priority`, `do_not_suppress`, add tests
 and docs.

---
 IPython/core/completer.py            | 247 ++++++++++++++++++---------
 IPython/core/magics/config.py        |  10 +-
 IPython/core/tests/test_completer.py | 107 ++++++++++++
 3 files changed, 280 insertions(+), 84 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index d8fecbbf298..f15fabb7d7e 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -101,12 +101,10 @@
 Be sure to update :any:`jedi` to the latest stable version or to try the
 current development version to get better completions.
 
-.. _Matchers:
-
 Matchers
 ========
 
-All completions routines are implemented using unified ``matchers`` API.
+All completions routines are implemented using unified *Matchers* API.
 The matchers API is provisional and subject to change without notice.
 
 The built-in matchers include:
@@ -119,13 +117,26 @@
 - ``IPCompleter.python_func_kw_matcher`` - function keywords,
 - ``IPCompleter.python_matches`` - globals and attributes (v1 API),
 - ``IPCompleter.jedi_matcher`` - static analysis with Jedi,
-- ``IPCompleter.custom_completer_matcher`` - pluggable completer with a default implementation in ``core.InteractiveShell``
-    which uses uses IPython hooks system (`complete_command`) with string dispatch (including regular expressions).
-    Differently to other matchers, ``custom_completer_matcher`` will not suppress Jedi results to match
-    behaviour in earlier IPython versions.
+- ``IPCompleter.custom_completer_matcher`` - pluggable completer with a default implementation in any:`core.InteractiveShell`
+  which uses uses IPython hooks system (`complete_command`) with string dispatch (including regular expressions).
+  Differently to other matchers, ``custom_completer_matcher`` will not suppress Jedi results to match
+  behaviour in earlier IPython versions.
+
+Custom matchers can be added by appending to ``IPCompleter.custom_matchers`` list.
+
+Suppression of competing matchers
+---------------------------------
+
+By default results from all matchers are combined, in the order determined by
+their priority. Matchers can request to suppress results from subsequent
+matchers by setting ``suppress`` to ``True`` in the ``MatcherResult``.
 
-Adding custom matchers is possible by appending to `IPCompleter.custom_matchers` list,
-but please be aware that this API is subject to change.
+When multiple matchers simultaneously request surpression, the results from of
+the matcher with higher priority will be returned.
+
+Sometimes it is desirable to suppress most but not all other matchers;
+this can be achieved by adding a list of identifiers of matchers which
+should not be suppressed to ``MatcherResult`` under ``do_not_suppress`` key.
 """
 
 
@@ -231,7 +242,7 @@ def cast(obj, _type):
 _UNICODE_RANGES = [(32, 0x3134b), (0xe0001, 0xe01f0)]
 
 # Public API
-__all__ = ['Completer','IPCompleter']
+__all__ = ["Completer", "IPCompleter"]
 
 if sys.platform == 'win32':
     PROTECTABLES = ' '
@@ -427,7 +438,7 @@ def __repr__(self):
 
 class Completion:
     """
-    Completion object used and return by IPython completers.
+    Completion object used and returned by IPython completers.
 
     .. warning::
 
@@ -488,12 +499,19 @@ def __hash__(self):
 
 
 class SimpleCompletion:
-    # TODO: decide whether we should keep the ``SimpleCompletion`` separate from ``Completion``
-    #  there are two advantages of keeping them separate:
-    #   - compatibility with old readline `Completer.complete` interface (less important)
-    #   - ease of use for third parties (just return matched text and don't worry about coordinates)
-    #  the disadvantage is that we need to loop over the completions again to transform them into
-    #  `Completion` objects (but it was done like that before the refactor into `SimpleCompletion` too).
+    """Completion item to be included in the dictionary returned by new-style Matcher (API v2).
+
+    .. warning::
+
+        Provisional
+
+        This class is used to describe the currently supported attributes of
+        simple completion items, and any additional implementation details
+        should not be relied on. Additional attributes may be included in
+        future versions, and meaning of text disambiguated from the current
+        dual meaning of "text to insert" and "text to used as a label".
+    """
+
     __slots__ = ["text", "type"]
 
     def __init__(self, text: str, *, type: str = None):
@@ -504,30 +522,31 @@ def __repr__(self):
         return f"<SimpleCompletion text={self.text!r} type={self.type!r}>"
 
 
-class _MatcherResultBase(TypedDict):
+class MatcherResultBase(TypedDict):
+    """Definition of dictionary to be returned by new-style Matcher (API v2)."""
 
     #: suffix of the provided ``CompletionContext.token``, if not given defaults to full token.
     matched_fragment: NotRequired[str]
 
-    #: whether to suppress results from other matchers; default is False.
-    suppress_others: NotRequired[bool]
+    #: whether to suppress results from all other matchers (True), some
+    #: matchers (set of identifiers) or none (False); default is False.
+    suppress: NotRequired[Union[bool, Set[str]]]
+
+    #: identifiers of matchers which should NOT be suppressed
+    do_not_suppress: NotRequired[Set[str]]
 
     #: are completions already ordered and should be left as-is? default is False.
     ordered: NotRequired[bool]
 
-    # TODO: should we used a relevance score for ordering?
-    #: value between 0 (likely not relevant) and 100 (likely relevant); default is 50.
-    # relevance: NotRequired[float]
 
-
-class SimpleMatcherResult(_MatcherResultBase):
+class SimpleMatcherResult(MatcherResultBase):
     """Result of new-style completion matcher."""
 
     #: list of candidate completions
     completions: Sequence[SimpleCompletion]
 
 
-class _JediMatcherResult(_MatcherResultBase):
+class _JediMatcherResult(MatcherResultBase):
     """Matching result returned by Jedi (will be processed differently)"""
 
     #: list of candidate completions
@@ -535,6 +554,8 @@ class _JediMatcherResult(_MatcherResultBase):
 
 
 class CompletionContext(NamedTuple):
+    """Completion context provided as an argument to matchers in the Matcher API v2."""
+
     # rationale: many legacy matchers relied on completer state (`self.text_until_cursor`)
     # which was not explicitly visible as an argument of the matcher, making any refactor
     # prone to errors; by explicitly passing `cursor_position` we can decouple the matchers
@@ -546,14 +567,20 @@ class CompletionContext(NamedTuple):
     #: (by switching the greedy mode).
     token: str
 
+    #: The full available content of the editor or buffer
     full_text: str
 
-    #: Cursor position in the line (the same for ``full_text`` and `text``).
+    #: Cursor position in the line (the same for ``full_text`` and ``text``).
     cursor_position: int
 
     #: Cursor line in ``full_text``.
     cursor_line: int
 
+    #: The maximum number of completions that will be used downstream.
+    #: Matchers can use this information to abort early.
+    #: The built-in Jedi matcher is currently excepted from this limit.
+    limit: int
+
     @property
     @lru_cache(maxsize=None)  # TODO change to @cache after dropping Python 3.7
     def text_until_cursor(self) -> str:
@@ -573,7 +600,7 @@ def line_with_cursor(self) -> str:
 
 
 def completion_matcher(
-    *, priority: float = None, identifier: str = None, api_version=1
+    *, priority: float = None, identifier: str = None, api_version: int = 1
 ):
     """Adds attributes describing the matcher.
 
@@ -581,7 +608,7 @@ def completion_matcher(
     ----------
     priority : Optional[float]
         The priority of the matcher, determines the order of execution of matchers.
-        Higher priority means that the matcher will be executed first. Defaults to 50.
+        Higher priority means that the matcher will be executed first. Defaults to 0.
     identifier : Optional[str]
         identifier of the matcher allowing users to modify the behaviour via traitlets,
         and also used to for debugging (will be passed as ``origin`` with the completions).
@@ -593,14 +620,23 @@ def completion_matcher(
     """
 
     def wrapper(func: Matcher):
-        func.matcher_priority = priority
+        func.matcher_priority = priority or 0
         func.matcher_identifier = identifier or func.__qualname__
         func.matcher_api_version = api_version
+        if TYPE_CHECKING:
+            if api_version == 1:
+                func = cast(func, MatcherAPIv1)
+            elif api_version == 2:
+                func = cast(func, MatcherAPIv2)
         return func
 
     return wrapper
 
 
+def _get_matcher_priority(matcher: Matcher):
+    return getattr(matcher, "matcher_priority", 0)
+
+
 def _get_matcher_id(matcher: Matcher):
     return getattr(matcher, "matcher_identifier", matcher.__qualname__)
 
@@ -1118,6 +1154,10 @@ def _safe_isinstance(obj, module, class_name):
 
 @context_matcher()
 def back_unicode_name_matcher(context):
+    """Match Unicode characters back to Unicode name
+
+    Same as ``back_unicode_name_matches``, but adopted to new Matcher API.
+    """
     fragment, matches = back_unicode_name_matches(context.token)
     return _convert_matcher_v1_result_to_v2(
         matches, type="unicode", fragment=fragment, suppress_if_matches=True
@@ -1166,6 +1206,10 @@ def back_unicode_name_matches(text: str) -> Tuple[str, Sequence[str]]:
 
 @context_matcher()
 def back_latex_name_matcher(context):
+    """Match latex characters back to unicode name
+
+    Same as ``back_latex_name_matches``, but adopted to new Matcher API.
+    """
     fragment, matches = back_latex_name_matches(context.token)
     return _convert_matcher_v1_result_to_v2(
         matches, type="latex", fragment=fragment, suppress_if_matches=True
@@ -1263,9 +1307,7 @@ def _convert_matcher_v1_result_to_v2(
     """Utility to help with transition"""
     result = {
         "completions": [SimpleCompletion(text=match, type=type) for match in matches],
-        "suppress_others": (True if matches else False)
-        if suppress_if_matches
-        else False,
+        "suppress": (True if matches else False) if suppress_if_matches else False,
     }
     if fragment is not None:
         result["matched_fragment"] = fragment
@@ -1297,7 +1339,7 @@ def _greedy_changed(self, change):
     suppress_competing_matchers = UnionTrait(
         [Bool(), DictTrait(Bool(None, allow_none=True))],
         help="""
-        Whether to suppress completions from other `Matchers`_.
+        Whether to suppress completions from other *Matchers*.
 
         When set to ``None`` (default) the matchers will attempt to auto-detect
         whether suppression of other matchers is desirable. For example, at
@@ -1312,7 +1354,7 @@ def _greedy_changed(self, change):
 
         Set ``IPCompleter.suppress_competing_matchers = True`` to limit
         completions to the set of matchers with the highest priority;
-        this is equivalent to ``IPCompleter.merge_completions`` and        
+        this is equivalent to ``IPCompleter.merge_completions`` and
         can be beneficial for performance, but will sometimes omit relevant
         candidates from matchers further down the priority list.
         """,
@@ -1325,7 +1367,7 @@ def _greedy_changed(self, change):
         If False, only the completion results from the first non-empty
         completer will be returned.
         
-        As of version 8.5.0, setting the value to ``False`` is an alias for:
+        As of version 8.6.0, setting the value to ``False`` is an alias for:
         ``IPCompleter.suppress_competing_matchers = True.``.
         """,
     ).tag(config=True)
@@ -1469,9 +1511,6 @@ def __init__(
         if not self.merge_completions:
             self.suppress_competing_matchers = True
 
-        if self.dict_keys_only:
-            self.disable_matchers.append(self.dict_key_matcher.matcher_identifier)
-
     @property
     def matchers(self) -> List[Matcher]:
         """All active matcher routines for completion"""
@@ -1523,6 +1562,7 @@ def _clean_glob_win32(self, text:str):
 
     @context_matcher()
     def file_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
+        """Same as ``file_matches``, but adopted to new Matcher API."""
         matches = self.file_matches(context.token)
         # TODO: add a heuristic for suppressing (e.g. if it has OS-specific delimiter,
         #  starts with `/home/`, `C:\`, etc)
@@ -1540,7 +1580,10 @@ def file_matches(self, text: str) -> List[str]:
         only the parts after what's already been typed (instead of the
         full completions, as is normally done).  I don't think with the
         current (as of Python 2.3) Python readline it's possible to do
-        better."""
+        better.
+
+        DEPRECATED: Deprecated since 8.6. Use ``file_matcher`` instead.
+        """
 
         # chars that require escaping with backslash - i.e. chars
         # that readline treats incorrectly as delimiters, but we
@@ -1616,11 +1659,14 @@ def magic_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
         matches = self.magic_matches(text)
         result = _convert_matcher_v1_result_to_v2(matches, type="magic")
         is_magic_prefix = len(text) > 0 and text[0] == "%"
-        result["suppress_others"] = is_magic_prefix and bool(result["completions"])
+        result["suppress"] = is_magic_prefix and bool(result["completions"])
         return result
 
     def magic_matches(self, text: str):
-        """Match magics"""
+        """Match magics.
+
+        DEPRECATED: Deprecated since 8.6. Use ``magic_matcher`` instead.
+        """
         # Get all shell magics now rather than statically, so magics loaded at
         # runtime show up too.
         lsm = self.shell.magics_manager.lsmagic()
@@ -1663,12 +1709,16 @@ def matches(magic):
 
     @context_matcher()
     def magic_config_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
+        """Match class names and attributes for %config magic."""
         # NOTE: uses `line_buffer` equivalent for compatibility
         matches = self.magic_config_matches(context.line_with_cursor)
         return _convert_matcher_v1_result_to_v2(matches, type="param")
 
     def magic_config_matches(self, text: str) -> List[str]:
-        """Match class names and attributes for %config magic"""
+        """Match class names and attributes for %config magic.
+
+        DEPRECATED: Deprecated since 8.6. Use ``magic_config_matcher`` instead.
+        """
         texts = text.strip().split()
 
         if len(texts) > 0 and (texts[0] == 'config' or texts[0] == '%config'):
@@ -1704,12 +1754,16 @@ def magic_config_matches(self, text: str) -> List[str]:
 
     @context_matcher()
     def magic_color_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
+        """Match color schemes for %colors magic."""
         # NOTE: uses `line_buffer` equivalent for compatibility
         matches = self.magic_color_matches(context.line_with_cursor)
         return _convert_matcher_v1_result_to_v2(matches, type="param")
 
     def magic_color_matches(self, text: str) -> List[str]:
-        """Match color schemes for %colors magic"""
+        """Match color schemes for %colors magic.
+
+        DEPRECATED: Deprecated since 8.6. Use ``magic_color_matcher`` instead.
+        """
         texts = text.split()
         if text.endswith(' '):
             # .split() strips off the trailing whitespace. Add '' back
@@ -1731,8 +1785,8 @@ def _jedi_matcher(self, context: CompletionContext) -> _JediMatcherResult:
         )
         return {
             "completions": matches,
-            # statis analysis should not suppress other matchers
-            "suppress_others": False,
+            # static analysis should not suppress other matchers
+            "suppress": False,
         }
 
     def _jedi_matches(
@@ -1755,6 +1809,8 @@ def _jedi_matches(
         -----
         If ``IPCompleter.debug`` is ``True`` may return a :any:`_FakeJediCompletion`
         object containing a string with the Jedi debug information attached.
+
+        DEPRECATED: Deprecated since 8.6. Use ``_jedi_matcher`` instead.
         """
         namespaces = [self.namespace]
         if self.global_namespace is not None:
@@ -1893,11 +1949,15 @@ def _default_arguments(self, obj):
 
     @context_matcher()
     def python_func_kw_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
+        """Match named parameters (kwargs) of the last open function."""
         matches = self.python_func_kw_matches(context.token)
         return _convert_matcher_v1_result_to_v2(matches, type="param")
 
     def python_func_kw_matches(self, text):
-        """Match named parameters (kwargs) of the last open function"""
+        """Match named parameters (kwargs) of the last open function.
+
+        DEPRECATED: Deprecated since 8.6. Use ``magic_config_matcher`` instead.
+        """
 
         if "." in text: # a parameter cannot be dotted
             return []
@@ -1994,6 +2054,7 @@ def _get_keys(obj: Any) -> List[Any]:
 
     @context_matcher()
     def dict_key_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
+        """Match string keys in a dictionary, after e.g. ``foo[``."""
         matches = self.dict_key_matches(context.token)
         return _convert_matcher_v1_result_to_v2(
             matches, type="dict key", suppress_if_matches=True
@@ -2002,7 +2063,7 @@ def dict_key_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
     def dict_key_matches(self, text: str) -> List[str]:
         """Match string keys in a dictionary, after e.g. ``foo[``.
 
-        DEPRECATED: Deprecated since 8.5. Use ``dict_key_matcher`` instead.
+        DEPRECATED: Deprecated since 8.6. Use `dict_key_matcher` instead.
         """
 
         if self.__dict_key_regexps is not None:
@@ -2136,6 +2197,10 @@ def unicode_name_matches(text: str) -> Tuple[str, List[str]]:
 
     @context_matcher()
     def latex_name_matcher(self, context):
+        """Match Latex syntax for unicode characters.
+
+        This does both ``\\alp`` -> ``\\alpha`` and ``\\alpha`` -> ``α``
+        """
         fragment, matches = self.latex_matches(context.token)
         return _convert_matcher_v1_result_to_v2(
             matches, type="latex", fragment=fragment, suppress_if_matches=True
@@ -2145,6 +2210,8 @@ def latex_matches(self, text: str) -> Tuple[str, Sequence[str]]:
         """Match Latex syntax for unicode characters.
 
         This does both ``\\alp`` -> ``\\alpha`` and ``\\alpha`` -> ``α``
+
+        DEPRECATED: Deprecated since 8.6. Use `latex_matcher` instead.
         """
         slashpos = text.rfind('\\')
         if slashpos > -1:
@@ -2168,9 +2235,13 @@ def custom_completer_matcher(self, context):
             matches, type="<unknown>", suppress_if_matches=True
         )
         result["ordered"] = True
+        result["do_not_suppress"] = {_get_matcher_id(self._jedi_matcher)}
         return result
 
     def dispatch_custom_completer(self, text):
+        """
+        DEPRECATED: Deprecated since 8.6. Use `custom_completer_matcher` instead.
+        """
         if not self.custom_completers:
             return
 
@@ -2418,8 +2489,9 @@ def _completions(self, full_text: str, offset: int, *, _timeout) -> Iterator[Com
                 )
                 container.append(completion)
 
-        yield from self._deduplicate(ordered + self._sort(sortable))
-
+        yield from list(self._deduplicate(ordered + self._sort(sortable)))[
+            :MATCHES_LIMIT
+        ]
 
     def complete(self, text=None, line_buffer=None, cursor_pos=None) -> Tuple[str, Sequence[str]]:
         """Find completions for the given text and line context.
@@ -2490,6 +2562,8 @@ def _arrange_and_extract(
         for identifier, result in results.items():
             if identifier in skip_matchers:
                 continue
+            if not result["completions"]:
+                continue
             if not most_recent_fragment:
                 most_recent_fragment = result["matched_fragment"]
             if (
@@ -2578,34 +2652,42 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
             cursor_position=cursor_pos,
             cursor_line=cursor_line,
             token=text,
+            limit=MATCHES_LIMIT,
         )
 
         # Start with a clean slate of completions
         results = {}
 
-        custom_completer_matcher_id = _get_matcher_id(self.custom_completer_matcher)
         jedi_matcher_id = _get_matcher_id(self._jedi_matcher)
 
-        for matcher in self.matchers:
+        suppressed_matchers = set()
+
+        matchers = {
+            _get_matcher_id(matcher): matcher
+            for matcher in sorted(
+                self.matchers, key=_get_matcher_priority, reverse=True
+            )
+        }
+
+        for matcher_id, matcher in matchers.items():
             api_version = _get_matcher_api_version(matcher)
             matcher_id = _get_matcher_id(matcher)
 
+            if matcher_id in self.disable_matchers:
+                continue
+
             if matcher_id in results:
                 warnings.warn(f"Duplicate matcher ID: {matcher_id}.")
 
+            if matcher_id in suppressed_matchers:
+                continue
+
             try:
                 if api_version == 1:
                     result = _convert_matcher_v1_result_to_v2(
                         matcher(text), type=_UNKNOWN_TYPE
                     )
                 elif api_version == 2:
-                    # TODO: MATCHES_LIMIT was used inconsistently in previous version
-                    #  (applied individually to latex/unicode and magic arguments matcher,
-                    #  but not Jedi, paths, magics, etc). Jedi did not have a limit here at
-                    #  all, but others had a total limit (retained in `_deduplicate_and_sort`).
-                    #  1) Was that deliberate or an omission?
-                    #  2) Should we include the limit in the API v2 signature to allow
-                    #     more expensive matchers to return early?
                     result = cast(matcher, MatcherAPIv2)(context)
                 else:
                     raise ValueError(f"Unsupported API version {api_version}")
@@ -2618,27 +2700,31 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
             # set default value for matched fragment if suffix was not selected.
             result["matched_fragment"] = result.get("matched_fragment", context.token)
 
-            suppression_recommended = result.get("suppress_others", False)
+            if not suppressed_matchers:
+                suppression_recommended = result.get("suppress", False)
 
-            should_suppress = (
-                self.suppress_competing_matchers is True
-                or suppression_recommended
-                or (
-                    isinstance(self.suppress_competing_matchers, dict)
-                    and self.suppress_competing_matchers[matcher_id]
-                )
-            ) and len(result["completions"])
-
-            if should_suppress:
-                new_results = {matcher_id: result}
-                if (
-                    matcher_id == custom_completer_matcher_id
-                    and jedi_matcher_id in results
-                ):
-                    # custom completer does not suppress Jedi (this may change in future versions).
-                    new_results[jedi_matcher_id] = results[jedi_matcher_id]
-                results = new_results
-                break
+                should_suppress = (
+                    self.suppress_competing_matchers is True
+                    or suppression_recommended
+                    or (
+                        isinstance(self.suppress_competing_matchers, dict)
+                        and self.suppress_competing_matchers[matcher_id]
+                    )
+                ) and len(result["completions"])
+
+                if should_suppress:
+                    suppression_exceptions = result.get("do_not_suppress", set())
+                    try:
+                        to_suppress = set(suppression_recommended)
+                    except TypeError:
+                        to_suppress = set(matchers)
+                    suppressed_matchers = to_suppress - suppression_exceptions
+
+                    new_results = {}
+                    for previous_matcher_id, previous_result in results.items():
+                        if previous_matcher_id not in suppressed_matchers:
+                            new_results[previous_matcher_id] = previous_result
+                    results = new_results
 
             results[matcher_id] = result
 
@@ -2676,6 +2762,7 @@ def _sort(matches: Sequence[SimpleCompletion]):
 
     @context_matcher()
     def fwd_unicode_matcher(self, context):
+        """Same as ``fwd_unicode_match``, but adopted to new Matcher API."""
         fragment, matches = self.latex_matches(context.token)
         return _convert_matcher_v1_result_to_v2(
             matches, type="unicode", fragment=fragment, suppress_if_matches=True
@@ -2693,6 +2780,8 @@ def fwd_unicode_match(self, text: str) -> Tuple[str, Sequence[str]]:
         At tuple with:
             - matched text (empty if no matches)
             - list of potential completions, empty tuple  otherwise)
+
+        DEPRECATED: Deprecated since 8.6. Use `fwd_unicode_matcher` instead.
         """
         # TODO: self.unicode_names is here a list we traverse each time with ~100k elements.
         # We could do a faster match using a Trie.
diff --git a/IPython/core/magics/config.py b/IPython/core/magics/config.py
index efa992bbb79..f93561aa622 100644
--- a/IPython/core/magics/config.py
+++ b/IPython/core/magics/config.py
@@ -105,7 +105,7 @@ def config(self, s):
                 Whether to merge completion results into a single list
                         If False, only the completion results from the first non-empty
                         completer will be returned.
-                        As of version 8.5.0, setting the value to ``False`` is an alias for:
+                        As of version 8.6.0, setting the value to ``False`` is an alias for:
                         ``IPCompleter.suppress_competing_matchers = True.``.
                 Current: True
             IPCompleter.omit__names=<Enum>
@@ -123,7 +123,7 @@ def config(self, s):
                 Template for path at which to output profile data for completions.
                 Current: '.completion_profiles'
             IPCompleter.suppress_competing_matchers=<Union>
-                Whether to suppress completions from other `Matchers`_.
+                Whether to suppress completions from other *Matchers*.
                 When set to ``None`` (default) the matchers will attempt to auto-detect
                 whether suppression of other matchers is desirable. For example, at the
                 beginning of a line followed by `%` we expect a magic completion to be the
@@ -136,9 +136,9 @@ def config(self, s):
                 False}``.
                 Set ``IPCompleter.suppress_competing_matchers = True`` to limit completions
                 to the set of matchers with the highest priority; this is equivalent to
-                ``IPCompleter.merge_completions`` and         can be beneficial for
-                performance, but will sometimes omit relevant candidates from matchers
-                further down the priority list.
+                ``IPCompleter.merge_completions`` and can be beneficial for performance, but
+                will sometimes omit relevant candidates from matchers further down the
+                priority list.
                 Current: False
             IPCompleter.use_jedi=<Bool>
                 Experimental: Use Jedi to generate autocompletions. Default to True if jedi
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 2643816cceb..e47cf1a7206 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -24,6 +24,9 @@
     provisionalcompleter,
     match_dict_keys,
     _deduplicate_completions,
+    completion_matcher,
+    SimpleCompletion,
+    CompletionContext,
 )
 
 # -----------------------------------------------------------------------------
@@ -109,6 +112,16 @@ def greedy_completion():
         ip.Completer.greedy = greedy_original
 
 
+@contextmanager
+def custom_matchers(matchers):
+    ip = get_ipython()
+    try:
+        ip.Completer.custom_matchers.extend(matchers)
+        yield
+    finally:
+        ip.Completer.custom_matchers.clear()
+
+
 def test_protect_filename():
     if sys.platform == "win32":
         pairs = [
@@ -1281,3 +1294,97 @@ def test_percent_symbol_restrict_to_magic_completions(self):
             completions = completer.completions(text, len(text))
             for c in completions:
                 self.assertEqual(c.text[0], "%")
+
+    def test_matcher_suppression(self):
+        @completion_matcher(identifier="a_matcher")
+        def a_matcher(text):
+            return ["completion_a"]
+
+        @completion_matcher(identifier="b_matcher", api_version=2)
+        def b_matcher(context: CompletionContext):
+            text = context.token
+            result = {"completions": [SimpleCompletion("completion_b")]}
+
+            if text == "suppress c":
+                result["suppress"] = {"c_matcher"}
+
+            if text.startswith("suppress all"):
+                result["suppress"] = True
+                if text == "suppress all but c":
+                    result["do_not_suppress"] = {"c_matcher"}
+                if text == "suppress all but a":
+                    result["do_not_suppress"] = {"a_matcher"}
+
+            return result
+
+        @completion_matcher(identifier="c_matcher")
+        def c_matcher(text):
+            return ["completion_c"]
+
+        with custom_matchers([a_matcher, b_matcher, c_matcher]):
+            ip = get_ipython()
+            c = ip.Completer
+
+            def _(text, expected):
+                with provisionalcompleter():
+                    c.use_jedi = False
+                    s, matches = c.complete(text)
+                    self.assertEqual(expected, matches)
+
+            _("do not suppress", ["completion_a", "completion_b", "completion_c"])
+            _("suppress all", ["completion_b"])
+            _("suppress all but a", ["completion_a", "completion_b"])
+            _("suppress all but c", ["completion_b", "completion_c"])
+
+    def test_matcher_disabling(self):
+        @completion_matcher(identifier="a_matcher")
+        def a_matcher(text):
+            return ["completion_a"]
+
+        @completion_matcher(identifier="b_matcher")
+        def b_matcher(text):
+            return ["completion_b"]
+
+        def _(expected):
+            with provisionalcompleter():
+                c.use_jedi = False
+                s, matches = c.complete("completion_")
+                self.assertEqual(expected, matches)
+
+        with custom_matchers([a_matcher, b_matcher]):
+            ip = get_ipython()
+            c = ip.Completer
+
+            _(["completion_a", "completion_b"])
+
+            cfg = Config()
+            cfg.IPCompleter.disable_matchers = ["b_matcher"]
+            c.update_config(cfg)
+
+            _(["completion_a"])
+
+            cfg.IPCompleter.disable_matchers = []
+            c.update_config(cfg)
+
+    def test_matcher_priority(self):
+        @completion_matcher(identifier="a_matcher", priority=0, api_version=2)
+        def a_matcher(text):
+            return {"completions": [SimpleCompletion("completion_a")], "suppress": True}
+
+        @completion_matcher(identifier="b_matcher", priority=2, api_version=2)
+        def b_matcher(text):
+            return {"completions": [SimpleCompletion("completion_b")], "suppress": True}
+
+        def _(expected):
+            with provisionalcompleter():
+                c.use_jedi = False
+                s, matches = c.complete("completion_")
+                self.assertEqual(expected, matches)
+
+        with custom_matchers([a_matcher, b_matcher]):
+            ip = get_ipython()
+            c = ip.Completer
+
+            _(["completion_b"])
+            a_matcher.matcher_priority = 3
+            _(["completion_a"])

From 21f1467bc36d067eb813c96e216a4cdda2d047d5 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Wed, 7 Sep 2022 04:00:23 +0100
Subject: [PATCH 1236/1407] Correct suppression defaults, add a test for #13735

---
 IPython/core/completer.py            | 16 ++++---
 IPython/core/magics/config.py        |  2 +-
 IPython/core/tests/test_completer.py | 68 +++++++++++++++++++++++-----
 3 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index f15fabb7d7e..e00d81e6719 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1337,7 +1337,8 @@ def _greedy_changed(self, change):
     )
 
     suppress_competing_matchers = UnionTrait(
-        [Bool(), DictTrait(Bool(None, allow_none=True))],
+        [Bool(allow_none=True), DictTrait(Bool(None, allow_none=True))],
+        default_value=None,
         help="""
         Whether to suppress completions from other *Matchers*.
 
@@ -2703,13 +2704,14 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
             if not suppressed_matchers:
                 suppression_recommended = result.get("suppress", False)
 
+                suppression_config = (
+                    self.suppress_competing_matchers.get(matcher_id, None)
+                    if isinstance(self.suppress_competing_matchers, dict)
+                    else self.suppress_competing_matchers
+                )
                 should_suppress = (
-                    self.suppress_competing_matchers is True
-                    or suppression_recommended
-                    or (
-                        isinstance(self.suppress_competing_matchers, dict)
-                        and self.suppress_competing_matchers[matcher_id]
-                    )
+                    (suppression_config is True)
+                    or (suppression_recommended and (suppression_config is not False))
                 ) and len(result["completions"])
 
                 if should_suppress:
diff --git a/IPython/core/magics/config.py b/IPython/core/magics/config.py
index f93561aa622..f442ba15259 100644
--- a/IPython/core/magics/config.py
+++ b/IPython/core/magics/config.py
@@ -139,7 +139,7 @@ def config(self, s):
                 ``IPCompleter.merge_completions`` and can be beneficial for performance, but
                 will sometimes omit relevant candidates from matchers further down the
                 priority list.
-                Current: False
+                Current: None
             IPCompleter.use_jedi=<Bool>
                 Experimental: Use Jedi to generate autocompletions. Default to True if jedi
                 is installed.
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index e47cf1a7206..c675a9ab161 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -1295,6 +1295,36 @@ def test_percent_symbol_restrict_to_magic_completions(self):
             for c in completions:
                 self.assertEqual(c.text[0], "%")
 
+    def test_dict_key_restrict_to_dicts(self):
+        """Test that dict key suppresses non-dict completion items"""
+        ip = get_ipython()
+        c = ip.Completer
+        d = {"abc": None}
+        ip.user_ns["d"] = d
+
+        text = 'd["a'
+
+        def _():
+            with provisionalcompleter():
+                c.use_jedi = True
+                return [
+                    completion.text for completion in c.completions(text, len(text))
+                ]
+
+        completions = _()
+        self.assertEqual(completions, ["abc"])
+
+        # check that it can be disabled in granular manner:
+        cfg = Config()
+        cfg.IPCompleter.suppress_competing_matchers = {
+            "IPCompleter.dict_key_matcher": False
+        }
+        c.update_config(cfg)
+
+        completions = _()
+        self.assertIn("abc", completions)
+        self.assertGreater(len(completions), 1)
+
     def test_matcher_suppression(self):
         @completion_matcher(identifier="a_matcher")
         def a_matcher(text):
@@ -1326,16 +1356,34 @@ def c_matcher(text):
             c = ip.Completer
 
             def _(text, expected):
-                with provisionalcompleter():
-                    c.use_jedi = False
-                    s, matches = c.complete(text)
-                    self.assertEqual(expected, matches)
+                c.use_jedi = False
+                s, matches = c.complete(text)
+                self.assertEqual(expected, matches)
 
             _("do not suppress", ["completion_a", "completion_b", "completion_c"])
             _("suppress all", ["completion_b"])
             _("suppress all but a", ["completion_a", "completion_b"])
             _("suppress all but c", ["completion_b", "completion_c"])
 
+            def configure(suppression_config):
+                cfg = Config()
+                cfg.IPCompleter.suppress_competing_matchers = suppression_config
+                c.update_config(cfg)
+
+            # test that configuration takes priority over the run-time decisions
+
+            configure(False)
+            _("suppress all", ["completion_a", "completion_b", "completion_c"])
+
+            configure({"b_matcher": False})
+            _("suppress all", ["completion_a", "completion_b", "completion_c"])
+
+            configure({"a_matcher": False})
+            _("suppress all", ["completion_b"])
+
+            configure({"b_matcher": True})
+            _("do not suppress", ["completion_b"])
+
     def test_matcher_disabling(self):
         @completion_matcher(identifier="a_matcher")
         def a_matcher(text):
@@ -1346,10 +1394,8 @@ def b_matcher(text):
             return ["completion_b"]
 
         def _(expected):
-            with provisionalcompleter():
-                c.use_jedi = False
-                s, matches = c.complete("completion_")
-                self.assertEqual(expected, matches)
+            s, matches = c.complete("completion_")
+            self.assertEqual(expected, matches)
 
         with custom_matchers([a_matcher, b_matcher]):
             ip = get_ipython()
@@ -1376,10 +1422,8 @@ def b_matcher(text):
             return {"completions": [SimpleCompletion("completion_b")], "suppress": True}
 
         def _(expected):
-            with provisionalcompleter():
-                c.use_jedi = False
-                s, matches = c.complete("completion_")
-                self.assertEqual(expected, matches)
+            s, matches = c.complete("completion_")
+            self.assertEqual(expected, matches)
 
         with custom_matchers([a_matcher, b_matcher]):
             ip = get_ipython()

From d137c7abd87ca6ede43f30d0c94fa5764cc3cd2b Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Wed, 7 Sep 2022 22:13:42 +0100
Subject: [PATCH 1237/1407] Improve type hinting and documentation

---
 IPython/core/completer.py   | 185 +++++++++++++++++++++++++++---------
 IPython/utils/decorators.py |  27 +++++-
 IPython/utils/docs.py       |   7 ++
 docs/source/conf.py         |   8 ++
 docs/sphinxext/apigen.py    |  43 +++++----
 5 files changed, 206 insertions(+), 64 deletions(-)
 create mode 100644 IPython/utils/docs.py

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index b4a0215961c..dfe03629454 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -109,21 +109,48 @@
 
 The built-in matchers include:
 
-- ``IPCompleter.dict_key_matcher``:  dictionary key completions,
-- ``IPCompleter.magic_matcher``: completions for magics,
-- ``IPCompleter.unicode_name_matcher``, ``IPCompleter.fwd_unicode_matcher`` and ``IPCompleter.latex_matcher``: see `Forward latex/unicode completion`_,
-- ``back_unicode_name_matcher`` and ``back_latex_name_matcher``: see `Backward latex completion`_,
-- ``IPCompleter.file_matcher``: paths to files and directories,
-- ``IPCompleter.python_func_kw_matcher`` - function keywords,
-- ``IPCompleter.python_matches`` - globals and attributes (v1 API),
+- :any:`IPCompleter.dict_key_matcher`:  dictionary key completions,
+- :any:`IPCompleter.magic_matcher`: completions for magics,
+- :any:`IPCompleter.unicode_name_matcher`,
+  :any:`IPCompleter.fwd_unicode_matcher`
+  and :any:`IPCompleter.latex_name_matcher`: see `Forward latex/unicode completion`_,
+- :any:`back_unicode_name_matcher` and :any:`back_latex_name_matcher`: see `Backward latex completion`_,
+- :any:`IPCompleter.file_matcher`: paths to files and directories,
+- :any:`IPCompleter.python_func_kw_matcher` - function keywords,
+- :any:`IPCompleter.python_matches` - globals and attributes (v1 API),
 - ``IPCompleter.jedi_matcher`` - static analysis with Jedi,
-- ``IPCompleter.custom_completer_matcher`` - pluggable completer with a default implementation in any:`core.InteractiveShell`
-  which uses uses IPython hooks system (`complete_command`) with string dispatch (including regular expressions).
-  Differently to other matchers, ``custom_completer_matcher`` will not suppress Jedi results to match
-  behaviour in earlier IPython versions.
+- :any:`IPCompleter.custom_completer_matcher` - pluggable completer with a default
+  implementation in :any:`InteractiveShell` which uses IPython hooks system
+  (`complete_command`) with string dispatch (including regular expressions).
+  Differently to other matchers, ``custom_completer_matcher`` will not suppress
+  Jedi results to match behaviour in earlier IPython versions.
 
 Custom matchers can be added by appending to ``IPCompleter.custom_matchers`` list.
 
+Matcher API
+-----------
+
+Simplifying some details, the ``Matcher`` interface can described as
+
+.. highlight::
+
+    MatcherAPIv1 = Callable[[str], list[str]]
+    MatcherAPIv2 = Callable[[CompletionContext], SimpleMatcherResult]
+
+    Matcher = MatcherAPIv1 | MatcherAPIv2
+
+The ``MatcherAPIv1`` reflects the matcher API as available prior to IPython 8.6.0
+and remains supported as a simplest way for generating completions. This is also
+currently the only API supported by the IPython hooks system `complete_command`.
+
+To distinguish between matcher versions ``matcher_api_version`` attribute is used.
+More precisely, the API allows to omit ``matcher_api_version`` for v1 Matchers,
+and requires a literal ``2`` for v2 Matchers.
+
+Once the API stabilises future versions may relax the requirement for specifying
+``matcher_api_version`` by switching to :any:`functools.singledispatch`, therefore
+please do not rely on the presence of ``matcher_api_version`` for any purposes.
+
 Suppression of competing matchers
 ---------------------------------
 
@@ -137,6 +164,9 @@
 Sometimes it is desirable to suppress most but not all other matchers;
 this can be achieved by adding a list of identifiers of matchers which
 should not be suppressed to ``MatcherResult`` under ``do_not_suppress`` key.
+
+The suppression behaviour can is user-configurable via
+:any:`IPCompleter.suppress_competing_matchers`.
 """
 
 
@@ -146,7 +176,7 @@
 # Some of this code originated from rlcompleter in the Python standard library
 # Copyright (C) 2001 Python Software Foundation, www.python.org
 
-
+from __future__ import annotations
 import builtins as builtin_mod
 import glob
 import inspect
@@ -176,9 +206,9 @@
     NamedTuple,
     Pattern,
     Optional,
-    Callable,
     TYPE_CHECKING,
     Set,
+    Literal,
 )
 
 from IPython.core.error import TryNext
@@ -187,7 +217,9 @@
 from IPython.core.oinspect import InspectColors
 from IPython.testing.skipdoctest import skip_doctest
 from IPython.utils import generics
+from IPython.utils.decorators import sphinx_options
 from IPython.utils.dir2 import dir2, get_real_method
+from IPython.utils.docs import GENERATING_DOCUMENTATION
 from IPython.utils.path import ensure_dir_exists
 from IPython.utils.process import arg_split
 from traitlets import (
@@ -218,16 +250,23 @@
 except ImportError:
     JEDI_INSTALLED = False
 
-if TYPE_CHECKING:
+
+if TYPE_CHECKING or GENERATING_DOCUMENTATION:
     from typing import cast
-    from typing_extensions import TypedDict, NotRequired
+    from typing_extensions import TypedDict, NotRequired, Protocol, TypeAlias
 else:
 
-    def cast(obj, _type):
+    def cast(obj, type_):
+        """Workaround for `TypeError: MatcherAPIv2() takes no arguments`"""
         return obj
 
-    TypedDict = Dict
-    NotRequired = Tuple
+    # do not require on runtime
+    NotRequired = Tuple  # requires Python >=3.11
+    TypedDict = Dict  # by extension of `NotRequired` requires 3.11 too
+    Protocol = object  # requires Python >=3.8
+    TypeAlias = Any  # requires Python >=3.10
+if GENERATING_DOCUMENTATION:
+    from typing import TypedDict
 
 # -----------------------------------------------------------------------------
 # Globals
@@ -522,31 +561,36 @@ def __repr__(self):
         return f"<SimpleCompletion text={self.text!r} type={self.type!r}>"
 
 
-class MatcherResultBase(TypedDict):
+class _MatcherResultBase(TypedDict):
     """Definition of dictionary to be returned by new-style Matcher (API v2)."""
 
-    #: suffix of the provided ``CompletionContext.token``, if not given defaults to full token.
+    #: Suffix of the provided ``CompletionContext.token``, if not given defaults to full token.
     matched_fragment: NotRequired[str]
 
-    #: whether to suppress results from all other matchers (True), some
+    #: Whether to suppress results from all other matchers (True), some
     #: matchers (set of identifiers) or none (False); default is False.
     suppress: NotRequired[Union[bool, Set[str]]]
 
-    #: identifiers of matchers which should NOT be suppressed
+    #: Identifiers of matchers which should NOT be suppressed when this matcher
+    #: requests to suppress all other matchers; defaults to an empty set.
     do_not_suppress: NotRequired[Set[str]]
 
-    #: are completions already ordered and should be left as-is? default is False.
+    #: Are completions already ordered and should be left as-is? default is False.
     ordered: NotRequired[bool]
 
 
-class SimpleMatcherResult(MatcherResultBase):
+@sphinx_options(show_inherited_members=True, exclude_inherited_from=["dict"])
+class SimpleMatcherResult(_MatcherResultBase, TypedDict):
     """Result of new-style completion matcher."""
 
-    #: list of candidate completions
+    # note: TypedDict is added again to the inheritance chain
+    # in order to get __orig_bases__ for documentation
+
+    #: List of candidate completions
     completions: Sequence[SimpleCompletion]
 
 
-class _JediMatcherResult(MatcherResultBase):
+class _JediMatcherResult(_MatcherResultBase):
     """Matching result returned by Jedi (will be processed differently)"""
 
     #: list of candidate completions
@@ -592,11 +636,38 @@ def line_with_cursor(self) -> str:
         return self.full_text.split("\n")[self.cursor_line]
 
 
+#: Matcher results for API v2.
 MatcherResult = Union[SimpleMatcherResult, _JediMatcherResult]
 
-MatcherAPIv1 = Callable[[str], List[str]]
-MatcherAPIv2 = Callable[[CompletionContext], MatcherResult]
-Matcher = Union[MatcherAPIv1, MatcherAPIv2]
+
+class _MatcherAPIv1Base(Protocol):
+    def __call__(self, text: str) -> list[str]:
+        """Call signature."""
+
+
+class _MatcherAPIv1Total(_MatcherAPIv1Base, Protocol):
+    #: API version
+    matcher_api_version: Optional[Literal[1]]
+
+    def __call__(self, text: str) -> list[str]:
+        """Call signature."""
+
+
+#: Protocol describing Matcher API v1.
+MatcherAPIv1: TypeAlias = Union[_MatcherAPIv1Base, _MatcherAPIv1Total]
+
+
+class MatcherAPIv2(Protocol):
+    """Protocol describing Matcher API v2."""
+
+    #: API version
+    matcher_api_version: Literal[2] = 2
+
+    def __call__(self, context: CompletionContext) -> MatcherResult:
+        """Call signature."""
+
+
+Matcher: TypeAlias = Union[MatcherAPIv1, MatcherAPIv2]
 
 
 def completion_matcher(
@@ -1160,7 +1231,7 @@ def _safe_isinstance(obj, module, class_name):
 def back_unicode_name_matcher(context):
     """Match Unicode characters back to Unicode name
 
-    Same as ``back_unicode_name_matches``, but adopted to new Matcher API.
+    Same as :any:`back_unicode_name_matches`, but adopted to new Matcher API.
     """
     fragment, matches = back_unicode_name_matches(context.token)
     return _convert_matcher_v1_result_to_v2(
@@ -1178,6 +1249,9 @@ def back_unicode_name_matches(text: str) -> Tuple[str, Sequence[str]]:
 
     This will not either back-complete standard sequences like \\n, \\b ...
 
+    .. deprecated:: 8.6
+        You can use :meth:`back_unicode_name_matcher` instead.
+
     Returns
     =======
 
@@ -1187,7 +1261,6 @@ def back_unicode_name_matches(text: str) -> Tuple[str, Sequence[str]]:
         empty string,
     - a sequence (of 1), name for the match Unicode character, preceded by
         backslash, or empty if no match.
-    
     """
     if len(text)<2:
         return '', ()
@@ -1212,7 +1285,7 @@ def back_unicode_name_matches(text: str) -> Tuple[str, Sequence[str]]:
 def back_latex_name_matcher(context):
     """Match latex characters back to unicode name
 
-    Same as ``back_latex_name_matches``, but adopted to new Matcher API.
+    Same as :any:`back_latex_name_matches`, but adopted to new Matcher API.
     """
     fragment, matches = back_latex_name_matches(context.token)
     return _convert_matcher_v1_result_to_v2(
@@ -1225,6 +1298,8 @@ def back_latex_name_matches(text: str) -> Tuple[str, Sequence[str]]:
 
     This does ``\\ℵ`` -> ``\\aleph``
 
+    .. deprecated:: 8.6
+        You can use :meth:`back_latex_name_matcher` instead.
     """
     if len(text)<2:
         return '', ()
@@ -1567,7 +1642,7 @@ def _clean_glob_win32(self, text:str):
 
     @context_matcher()
     def file_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
-        """Same as ``file_matches``, but adopted to new Matcher API."""
+        """Same as :any:`file_matches`, but adopted to new Matcher API."""
         matches = self.file_matches(context.token)
         # TODO: add a heuristic for suppressing (e.g. if it has OS-specific delimiter,
         #  starts with `/home/`, `C:\`, etc)
@@ -1587,7 +1662,8 @@ def file_matches(self, text: str) -> List[str]:
         current (as of Python 2.3) Python readline it's possible to do
         better.
 
-        DEPRECATED: Deprecated since 8.6. Use ``file_matcher`` instead.
+        .. deprecated:: 8.6
+            You can use :meth:`file_matcher` instead.
         """
 
         # chars that require escaping with backslash - i.e. chars
@@ -1660,6 +1736,7 @@ def file_matches(self, text: str) -> List[str]:
 
     @context_matcher()
     def magic_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
+        """Match magics."""
         text = context.token
         matches = self.magic_matches(text)
         result = _convert_matcher_v1_result_to_v2(matches, type="magic")
@@ -1670,7 +1747,8 @@ def magic_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
     def magic_matches(self, text: str):
         """Match magics.
 
-        DEPRECATED: Deprecated since 8.6. Use ``magic_matcher`` instead.
+        .. deprecated:: 8.6
+            You can use :meth:`magic_matcher` instead.
         """
         # Get all shell magics now rather than statically, so magics loaded at
         # runtime show up too.
@@ -1722,7 +1800,8 @@ def magic_config_matcher(self, context: CompletionContext) -> SimpleMatcherResul
     def magic_config_matches(self, text: str) -> List[str]:
         """Match class names and attributes for %config magic.
 
-        DEPRECATED: Deprecated since 8.6. Use ``magic_config_matcher`` instead.
+        .. deprecated:: 8.6
+            You can use :meth:`magic_config_matcher` instead.
         """
         texts = text.strip().split()
 
@@ -1767,7 +1846,8 @@ def magic_color_matcher(self, context: CompletionContext) -> SimpleMatcherResult
     def magic_color_matches(self, text: str) -> List[str]:
         """Match color schemes for %colors magic.
 
-        DEPRECATED: Deprecated since 8.6. Use ``magic_color_matcher`` instead.
+        .. deprecated:: 8.6
+            You can use :meth:`magic_color_matcher` instead.
         """
         texts = text.split()
         if text.endswith(' '):
@@ -1815,7 +1895,8 @@ def _jedi_matches(
         If ``IPCompleter.debug`` is ``True`` may return a :any:`_FakeJediCompletion`
         object containing a string with the Jedi debug information attached.
 
-        DEPRECATED: Deprecated since 8.6. Use ``_jedi_matcher`` instead.
+        .. deprecated:: 8.6
+            You can use :meth:`_jedi_matcher` instead.
         """
         namespaces = [self.namespace]
         if self.global_namespace is not None:
@@ -1961,7 +2042,8 @@ def python_func_kw_matcher(self, context: CompletionContext) -> SimpleMatcherRes
     def python_func_kw_matches(self, text):
         """Match named parameters (kwargs) of the last open function.
 
-        DEPRECATED: Deprecated since 8.6. Use ``magic_config_matcher`` instead.
+        .. deprecated:: 8.6
+            You can use :meth:`python_func_kw_matcher` instead.
         """
 
         if "." in text: # a parameter cannot be dotted
@@ -2068,7 +2150,8 @@ def dict_key_matcher(self, context: CompletionContext) -> SimpleMatcherResult:
     def dict_key_matches(self, text: str) -> List[str]:
         """Match string keys in a dictionary, after e.g. ``foo[``.
 
-        DEPRECATED: Deprecated since 8.6. Use `dict_key_matcher` instead.
+        .. deprecated:: 8.6
+            You can use :meth:`dict_key_matcher` instead.
         """
 
         if self.__dict_key_regexps is not None:
@@ -2173,6 +2256,7 @@ def dict_key_matches(self, text: str) -> List[str]:
 
     @context_matcher()
     def unicode_name_matcher(self, context):
+        """Same as :any:`unicode_name_matches`, but adopted to new Matcher API."""
         fragment, matches = self.unicode_name_matches(context.token)
         return _convert_matcher_v1_result_to_v2(
             matches, type="unicode", fragment=fragment, suppress_if_matches=True
@@ -2216,7 +2300,8 @@ def latex_matches(self, text: str) -> Tuple[str, Sequence[str]]:
 
         This does both ``\\alp`` -> ``\\alpha`` and ``\\alpha`` -> ``α``
 
-        DEPRECATED: Deprecated since 8.6. Use `latex_matcher` instead.
+        .. deprecated:: 8.6
+            You can use :meth:`latex_name_matcher` instead.
         """
         slashpos = text.rfind('\\')
         if slashpos > -1:
@@ -2235,9 +2320,13 @@ def latex_matches(self, text: str) -> Tuple[str, Sequence[str]]:
 
     @context_matcher()
     def custom_completer_matcher(self, context):
+        """Dispatch custom completer.
+
+        If a match is found, suppresses all other matchers except for Jedi.
+        """
         matches = self.dispatch_custom_completer(context.token) or []
         result = _convert_matcher_v1_result_to_v2(
-            matches, type="<unknown>", suppress_if_matches=True
+            matches, type=_UNKNOWN_TYPE, suppress_if_matches=True
         )
         result["ordered"] = True
         result["do_not_suppress"] = {_get_matcher_id(self._jedi_matcher)}
@@ -2245,7 +2334,8 @@ def custom_completer_matcher(self, context):
 
     def dispatch_custom_completer(self, text):
         """
-        DEPRECATED: Deprecated since 8.6. Use `custom_completer_matcher` instead.
+        .. deprecated:: 8.6
+            You can use :meth:`custom_completer_matcher` instead.
         """
         if not self.custom_completers:
             return
@@ -2768,7 +2858,7 @@ def _sort(matches: Sequence[SimpleCompletion]):
 
     @context_matcher()
     def fwd_unicode_matcher(self, context):
-        """Same as ``fwd_unicode_match``, but adopted to new Matcher API."""
+        """Same as :any:`fwd_unicode_match`, but adopted to new Matcher API."""
         fragment, matches = self.latex_matches(context.token)
         return _convert_matcher_v1_result_to_v2(
             matches, type="unicode", fragment=fragment, suppress_if_matches=True
@@ -2779,15 +2869,16 @@ def fwd_unicode_match(self, text: str) -> Tuple[str, Sequence[str]]:
         Forward match a string starting with a backslash with a list of
         potential Unicode completions.
 
-        Will compute list list of Unicode character names on first call and cache it.
+        Will compute list of Unicode character names on first call and cache it.
+
+        .. deprecated:: 8.6
+            You can use :meth:`fwd_unicode_matcher` instead.
 
         Returns
         -------
         At tuple with:
             - matched text (empty if no matches)
             - list of potential completions, empty tuple  otherwise)
-
-        DEPRECATED: Deprecated since 8.6. Use `fwd_unicode_matcher` instead.
         """
         # TODO: self.unicode_names is here a list we traverse each time with ~100k elements.
         # We could do a faster match using a Trie.
diff --git a/IPython/utils/decorators.py b/IPython/utils/decorators.py
index 47791d7ca65..bc7589cd35c 100644
--- a/IPython/utils/decorators.py
+++ b/IPython/utils/decorators.py
@@ -2,7 +2,7 @@
 """Decorators that don't go anywhere else.
 
 This module contains misc. decorators that don't really go with another module
-in :mod:`IPython.utils`. Beore putting something here please see if it should
+in :mod:`IPython.utils`. Before putting something here please see if it should
 go into another topical module in :mod:`IPython.utils`.
 """
 
@@ -16,6 +16,10 @@
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
+from typing import Sequence
+
+from IPython.utils.docs import GENERATING_DOCUMENTATION
+
 
 #-----------------------------------------------------------------------------
 # Code
@@ -48,6 +52,7 @@ def wrapper(*args,**kw):
     wrapper.__doc__ = func.__doc__
     return wrapper
 
+
 def undoc(func):
     """Mark a function or class as undocumented.
 
@@ -56,3 +61,23 @@ def undoc(func):
     """
     return func
 
+
+def sphinx_options(
+    show_inheritance: bool = True,
+    show_inherited_members: bool = False,
+    exclude_inherited_from: Sequence[str] = tuple(),
+):
+    """Set sphinx options"""
+
+    def wrapper(func):
+        if not GENERATING_DOCUMENTATION:
+            return func
+
+        func._sphinx_options = dict(
+            show_inheritance=show_inheritance,
+            show_inherited_members=show_inherited_members,
+            exclude_inherited_from=exclude_inherited_from,
+        )
+        return func
+
+    return wrapper
diff --git a/IPython/utils/docs.py b/IPython/utils/docs.py
new file mode 100644
index 00000000000..ee1aaeaa2f9
--- /dev/null
+++ b/IPython/utils/docs.py
@@ -0,0 +1,7 @@
+# encoding: utf-8
+
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
+import os
+
+GENERATING_DOCUMENTATION = os.environ.get("IN_SPHINX_RUN", None) == "True"
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 29212af8bf7..d04d4637ba7 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -41,6 +41,14 @@
     html_theme = "sphinx_rtd_theme"
     html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
+# Allow Python scripts to change behaviour during sphinx run
+os.environ["IN_SPHINX_RUN"] = "True"
+
+autodoc_type_aliases = {
+    "Matcher": " IPython.core.completer.Matcher",
+    "MatcherAPIv1": " IPython.core.completer.MatcherAPIv1",
+}
+
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
 # absolute, like shown here.
diff --git a/docs/sphinxext/apigen.py b/docs/sphinxext/apigen.py
index e58493b17fd..47dc1101933 100644
--- a/docs/sphinxext/apigen.py
+++ b/docs/sphinxext/apigen.py
@@ -24,14 +24,9 @@
 import os
 import re
 from importlib import import_module
+from types import SimpleNamespace as Obj
 
 
-class Obj(object):
-    '''Namespace to hold arbitrary information.'''
-    def __init__(self, **kwargs):
-        for k, v in kwargs.items():
-            setattr(self, k, v)
-                                        
 class FuncClsScanner(ast.NodeVisitor):
     """Scan a module for top-level functions and classes.
     
@@ -42,7 +37,7 @@ def __init__(self):
         self.classes = []
         self.classes_seen = set()
         self.functions = []
-    
+
     @staticmethod
     def has_undoc_decorator(node):
         return any(isinstance(d, ast.Name) and d.id == 'undoc' \
@@ -62,11 +57,15 @@ def visit_FunctionDef(self, node):
             self.functions.append(node.name)
     
     def visit_ClassDef(self, node):
-        if not (node.name.startswith('_') or self.has_undoc_decorator(node)) \
-                and node.name not in self.classes_seen:
-            cls = Obj(name=node.name)
-            cls.has_init = any(isinstance(n, ast.FunctionDef) and \
-                                n.name=='__init__' for n in node.body)
+        if (
+            not (node.name.startswith("_") or self.has_undoc_decorator(node))
+            and node.name not in self.classes_seen
+        ):
+            cls = Obj(name=node.name, sphinx_options={})
+            cls.has_init = any(
+                isinstance(n, ast.FunctionDef) and n.name == "__init__"
+                for n in node.body
+            )
             self.classes.append(cls)
             self.classes_seen.add(node.name)
     
@@ -221,7 +220,11 @@ def _import_funcs_classes(self, uri):
         funcs, classes = [], []
         for name, obj in ns.items():
             if inspect.isclass(obj):
-                cls = Obj(name=name, has_init='__init__' in obj.__dict__)
+                cls = Obj(
+                    name=name,
+                    has_init="__init__" in obj.__dict__,
+                    sphinx_options=getattr(obj, "_sphinx_options", {}),
+                )
                 classes.append(cls)
             elif inspect.isfunction(obj):
                 funcs.append(name)
@@ -279,10 +282,18 @@ def generate_api_doc(self, uri):
                   self.rst_section_levels[2] * len(subhead) + '\n'
 
         for c in classes:
-            ad += '\n.. autoclass:: ' + c.name + '\n'
+            opts = c.sphinx_options
+            ad += "\n.. autoclass:: " + c.name + "\n"
             # must NOT exclude from index to keep cross-refs working
-            ad += '  :members:\n' \
-                  '  :show-inheritance:\n'
+            ad += "  :members:\n"
+            if opts.get("show_inheritance", True):
+                ad += "  :show-inheritance:\n"
+            if opts.get("show_inherited_members", False):
+                exclusions_list = opts.get("exclude_inherited_from", [])
+                exclusions = (
+                    (" " + " ".join(exclusions_list)) if exclusions_list else ""
+                )
+                ad += f"  :inherited-members:{exclusions}\n"
             if c.has_init:
                   ad += '\n  .. automethod:: __init__\n'
         

From b61b12e7a06b841c22fb89d4d70f55b02478098b Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Wed, 7 Sep 2022 22:16:59 +0100
Subject: [PATCH 1238/1407] Move `typing_extensions` optional dependency

---
 docs/requirements.txt | 1 +
 setup.cfg             | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 587288c2a0f..5d3295b0f3a 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -7,3 +7,4 @@ docrepr
 matplotlib
 stack_data
 pytest<7
+typing_extensions
diff --git a/setup.cfg b/setup.cfg
index 99b3498d0b3..274e338d0ce 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -73,7 +73,6 @@ test_extra =
     numpy>=1.19
     pandas
     trio
-    typing_extensions
 all =
     %(black)s
     %(doc)s

From 56b6489db7006249abf67e9d8b7f9ee4d7ed681a Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Wed, 7 Sep 2022 22:23:58 +0100
Subject: [PATCH 1239/1407] =?UTF-8?q?`highlight`=20=E2=86=92=20`code-block?=
 =?UTF-8?q?`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IPython/core/completer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index dfe03629454..a379e0e0935 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -132,7 +132,7 @@
 
 Simplifying some details, the ``Matcher`` interface can described as
 
-.. highlight::
+.. code-block::
 
     MatcherAPIv1 = Callable[[str], list[str]]
     MatcherAPIv2 = Callable[[CompletionContext], SimpleMatcherResult]

From 9eecab41318397815082d29814cce75b2cd34e45 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 8 Sep 2022 11:48:03 +0200
Subject: [PATCH 1240/1407] DOC/SEC/MAINT: Update security.md with Tidelift.

Also add badge to readme.
---
 README.rst  | 3 +++
 SECURITY.md | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/README.rst b/README.rst
index 5107eae9b5d..e38b7120e6b 100644
--- a/README.rst
+++ b/README.rst
@@ -13,6 +13,9 @@
 .. image:: https://raster.shields.io/badge/Follows-NEP29-brightgreen.png
     :target: https://numpy.org/neps/nep-0029-deprecation_policy.html
 
+.. image:: https://tidelift.com/subscription/pkg/pypi-ipython
+    :target: https://tidelift.com/badges/package/pypi/ipython?style=flat
+
 
 ===========================================
  IPython: Productive Interactive Computing
diff --git a/SECURITY.md b/SECURITY.md
index dc5db66e2a2..1208990a74f 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,3 +4,8 @@
 
 All IPython and Jupyter security are handled via security@ipython.org. 
 You can find more information on the Jupyter website. https://jupyter.org/security
+
+## Tidelift
+
+We are also lifting IPython via Tidelift, you can also report security concern via the [tidelift platform](
+https://tidelift.com/security).

From ef9f0dec2b28978d70e1aadd1e37e1052f90c77c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 8 Sep 2022 14:17:08 +0200
Subject: [PATCH 1241/1407] SEC: force workflows to be read-only.

Via tidelift and suggested by
https://deps.dev/pypi/ipython
---
 .github/workflows/docs.yml           | 3 +++
 .github/workflows/downstream.yml     | 2 ++
 .github/workflows/mypy.yml           | 3 +++
 .github/workflows/python-package.yml | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index e4be71c0ddb..f18fb39392f 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -2,6 +2,9 @@ name: Build docs
 
 on: [push, pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
index ae2dbe5efe9..e6206ae71f1 100644
--- a/.github/workflows/downstream.yml
+++ b/.github/workflows/downstream.yml
@@ -8,6 +8,8 @@ on:
   - cron:  '23 1 * * 1'
   workflow_dispatch:
 
+permissions:
+  contents: read
 
 jobs:
   test:
diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index 2725c92923c..8d1927d6b36 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ main, 7.x]
 
+permissions:
+  contents: read
+
 jobs:
   build:
 
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index fc28ac8e4c5..62667b48d38 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -3,6 +3,9 @@
 
 name: Python package
 
+permissions:
+  contents: read
+
 on:
   push:
     branches: [ main, 7.x ]

From 37590bda0f176f0548f3f47a2d5a26aa120f734d Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Thu, 8 Sep 2022 17:13:07 +0100
Subject: [PATCH 1242/1407] Fix backslash combining matchers (they require
 `text_until_cursor`).

---
 IPython/core/completer.py            | 23 +++++++++++++----------
 IPython/core/tests/test_completer.py | 12 ++++++++++++
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index a379e0e0935..50b3e5e0180 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1228,12 +1228,12 @@ def _safe_isinstance(obj, module, class_name):
 
 
 @context_matcher()
-def back_unicode_name_matcher(context):
+def back_unicode_name_matcher(context: CompletionContext):
     """Match Unicode characters back to Unicode name
 
     Same as :any:`back_unicode_name_matches`, but adopted to new Matcher API.
     """
-    fragment, matches = back_unicode_name_matches(context.token)
+    fragment, matches = back_unicode_name_matches(context.text_until_cursor)
     return _convert_matcher_v1_result_to_v2(
         matches, type="unicode", fragment=fragment, suppress_if_matches=True
     )
@@ -1282,12 +1282,12 @@ def back_unicode_name_matches(text: str) -> Tuple[str, Sequence[str]]:
 
 
 @context_matcher()
-def back_latex_name_matcher(context):
+def back_latex_name_matcher(context: CompletionContext):
     """Match latex characters back to unicode name
 
     Same as :any:`back_latex_name_matches`, but adopted to new Matcher API.
     """
-    fragment, matches = back_latex_name_matches(context.token)
+    fragment, matches = back_latex_name_matches(context.text_until_cursor)
     return _convert_matcher_v1_result_to_v2(
         matches, type="latex", fragment=fragment, suppress_if_matches=True
     )
@@ -2255,9 +2255,9 @@ def dict_key_matches(self, text: str) -> List[str]:
         return [leading + k + suf for k in matches]
 
     @context_matcher()
-    def unicode_name_matcher(self, context):
+    def unicode_name_matcher(self, context: CompletionContext):
         """Same as :any:`unicode_name_matches`, but adopted to new Matcher API."""
-        fragment, matches = self.unicode_name_matches(context.token)
+        fragment, matches = self.unicode_name_matches(context.text_until_cursor)
         return _convert_matcher_v1_result_to_v2(
             matches, type="unicode", fragment=fragment, suppress_if_matches=True
         )
@@ -2285,12 +2285,12 @@ def unicode_name_matches(text: str) -> Tuple[str, List[str]]:
         return '', []
 
     @context_matcher()
-    def latex_name_matcher(self, context):
+    def latex_name_matcher(self, context: CompletionContext):
         """Match Latex syntax for unicode characters.
 
         This does both ``\\alp`` -> ``\\alpha`` and ``\\alpha`` -> ``α``
         """
-        fragment, matches = self.latex_matches(context.token)
+        fragment, matches = self.latex_matches(context.text_until_cursor)
         return _convert_matcher_v1_result_to_v2(
             matches, type="latex", fragment=fragment, suppress_if_matches=True
         )
@@ -2857,9 +2857,12 @@ def _sort(matches: Sequence[SimpleCompletion]):
         return sorted(matches, key=lambda x: completions_sorting_key(x.text))
 
     @context_matcher()
-    def fwd_unicode_matcher(self, context):
+    def fwd_unicode_matcher(self, context: CompletionContext):
         """Same as :any:`fwd_unicode_match`, but adopted to new Matcher API."""
-        fragment, matches = self.latex_matches(context.token)
+        # TODO: use `context.limit` to terminate early once we matched the maximum
+        #  number that will be used downstream; can be added as an optional to
+        #  `fwd_unicode_match(text: str, limit: int = None)` or we could re-implement here.
+        fragment, matches = self.fwd_unicode_match(context.text_until_cursor)
         return _convert_matcher_v1_result_to_v2(
             matches, type="unicode", fragment=fragment, suppress_if_matches=True
         )
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index c675a9ab161..fd72cf7d57a 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -1295,6 +1295,18 @@ def test_percent_symbol_restrict_to_magic_completions(self):
             for c in completions:
                 self.assertEqual(c.text[0], "%")
 
+    def test_fwd_unicode_restricts(self):
+        ip = get_ipython()
+        completer = ip.Completer
+        text = "\\ROMAN NUMERAL FIVE"
+
+        with provisionalcompleter():
+            completer.use_jedi = True
+            completions = [
+                completion.text for completion in completer.completions(text, len(text))
+            ]
+            self.assertEqual(completions, ["\u2164"])
+
     def test_dict_key_restrict_to_dicts(self):
         """Test that dict key suppresses non-dict completion items"""
         ip = get_ipython()

From 3e5275d3a7ad2ee6efc916d5019626e77e516501 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 8 Sep 2022 09:22:20 -0700
Subject: [PATCH 1243/1407] Update SECURITY.md

Co-authored-by: Jason Weill <93281816+jweill-aws@users.noreply.github.com>
---
 SECURITY.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 1208990a74f..86c88c328c0 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -7,5 +7,4 @@ You can find more information on the Jupyter website. https://jupyter.org/securi
 
 ## Tidelift
 
-We are also lifting IPython via Tidelift, you can also report security concern via the [tidelift platform](
-https://tidelift.com/security).
+You can report security concerns for IPython via the [Tidelift platform](https://tidelift.com/security). 

From 62af0b0aefaf75d9175ca77a7771d42674502770 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Thu, 8 Sep 2022 17:26:23 +0100
Subject: [PATCH 1244/1407] Relax constraint on limit to allow no limit

---
 IPython/core/completer.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 50b3e5e0180..ef99c979f61 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -623,7 +623,8 @@ class CompletionContext(NamedTuple):
     #: The maximum number of completions that will be used downstream.
     #: Matchers can use this information to abort early.
     #: The built-in Jedi matcher is currently excepted from this limit.
-    limit: int
+    # If not given, return all possible completions.
+    limit: Optional[int]
 
     @property
     @lru_cache(maxsize=None)  # TODO change to @cache after dropping Python 3.7

From b33c7213c79c36af4fdd388f1cdbe6001bfcb9e2 Mon Sep 17 00:00:00 2001
From: nouman <55525217+noumxn@users.noreply.github.com>
Date: Sat, 10 Sep 2022 10:52:55 +0530
Subject: [PATCH 1245/1407] Update autoreload.py

Fixes ipython#13651
---
 IPython/extensions/autoreload.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index a0a8c27f134..f485ac38b56 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -95,6 +95,10 @@
   before it is reloaded are not upgraded.
 
 - C extension modules cannot be reloaded, and so cannot be autoreloaded.
+
+- While comparing Enum and Flag, the 'is' Identity Operator is used (even in the case '==' has been used (Similar to the 'None' keyword)).
+
+- Reloading a module, or importing the same module by a different name, creates new Enums. These may look the same, but are not.
 """
 
 __skip_doctest__ = True

From 4c855f4e60cacfb74e9417e07366c8ad49493f36 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 12 Sep 2022 21:26:00 +0200
Subject: [PATCH 1246/1407] Quick hack to make tb highlighting configurable.

For example put

    from IPython.core.ultratb import VerboseTB
    VerboseTB._tb_highlight = "bg:#039dfc"

In your ipython_config.py

Mitigate #13446 and #13486
---
 IPython/core/ultratb.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 125ee9a78a4..8f40c63b758 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -610,6 +610,8 @@ class VerboseTB(TBTools):
     traceback, to be used with alternate interpreters (because their own code
     would appear in the traceback)."""
 
+    _tb_highlight = "bg:ansiyellow"
+
     def __init__(
         self,
         color_scheme: str = "Linux",
@@ -836,7 +838,7 @@ def get_records(
         before = context - after
         if self.has_colors:
             style = get_style_by_name("default")
-            style = stack_data.style_with_executing_node(style, "bg:ansiyellow")
+            style = stack_data.style_with_executing_node(style, self._tb_highlight)
             formatter = Terminal256Formatter(style=style)
         else:
             formatter = None

From 2dfda2f86249899ae61deb61bcb707847ee449a0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 16 Sep 2022 14:42:14 +0200
Subject: [PATCH 1247/1407] MAINT: Nep 29- drop support for Numpy 1.19.

> On Jun 21, 2022 drop support for NumPy 1.19 (initially released on Jun 20, 2020)
---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 6004f3a4d3d..fa6a1665d52 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -78,7 +78,7 @@ test_extra =
     curio
     matplotlib!=3.2.0
     nbformat
-    numpy>=1.19
+    numpy>=1.20
     pandas
     trio
 all =

From 7ee7665834919ceab5658088d39c10df059cf5c1 Mon Sep 17 00:00:00 2001
From: "Wenhan Zhu (Cosmos)" <zhuwenhan950913@gmail.com>
Date: Mon, 19 Sep 2022 14:44:16 -0400
Subject: [PATCH 1248/1407] fixed cpaste session error

---
 IPython/terminal/magics.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/terminal/magics.py b/IPython/terminal/magics.py
index 206ff20a0f8..66d532511b3 100644
--- a/IPython/terminal/magics.py
+++ b/IPython/terminal/magics.py
@@ -41,7 +41,7 @@ class TerminalMagics(Magics):
     def __init__(self, shell):
         super(TerminalMagics, self).__init__(shell)
 
-    def store_or_execute(self, block, name):
+    def store_or_execute(self, block, name, store_history=False):
         """ Execute a block, or store it in a variable, per the user's request.
         """
         if name:
@@ -53,7 +53,7 @@ def store_or_execute(self, block, name):
             self.shell.user_ns['pasted_block'] = b
             self.shell.using_paste_magics = True
             try:
-                self.shell.run_cell(b, store_history=True)
+                self.shell.run_cell(b, store_history)
             finally:
                 self.shell.using_paste_magics = False
 
@@ -147,7 +147,7 @@ def cpaste(self, parameter_s=''):
 
         sentinel = opts.get('s', u'--')
         block = '\n'.join(get_pasted_lines(sentinel, quiet=quiet))
-        self.store_or_execute(block, name)
+        self.store_or_execute(block, name, store_history=False)
 
     @line_magic
     def paste(self, parameter_s=''):
@@ -203,7 +203,7 @@ def paste(self, parameter_s=''):
                 sys.stdout.write("\n")
             sys.stdout.write("## -- End pasted text --\n")
 
-        self.store_or_execute(block, name)
+        self.store_or_execute(block, name, store_history=True)
 
     # Class-level: add a '%cls' magic only on Windows
     if sys.platform == 'win32':

From 5bb0259a747651290f91c0384ca93492a423c82d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Krassowski?=
 <5832902+krassowski@users.noreply.github.com>
Date: Sat, 24 Sep 2022 21:15:53 +0100
Subject: [PATCH 1249/1407] Remove outdated header as suggested

Co-authored-by: Matthias Bussonnier <bussonniermatthias@gmail.com>
---
 IPython/utils/docs.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/IPython/utils/docs.py b/IPython/utils/docs.py
index ee1aaeaa2f9..6a97815cdc7 100644
--- a/IPython/utils/docs.py
+++ b/IPython/utils/docs.py
@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-# Copyright (c) IPython Development Team.
-# Distributed under the terms of the Modified BSD License.
 import os
 
 GENERATING_DOCUMENTATION = os.environ.get("IN_SPHINX_RUN", None) == "True"

From ab60d3197788b943db0cf81d9279c28e52ec9225 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sat, 24 Sep 2022 21:39:35 +0100
Subject: [PATCH 1250/1407] Switch `CompletionContext` to `dataclass`, use
 `cached_property`

Data class has narrower API than named tuple (does not expose item getters)
which means it is less likely that the downstream code would be broken in
the future if we introduce new attributes. Also, compared to other places
where memory-efficient named tuple is used, `CompletionContext` is only
created once per completion and thus does not require as low overhead.
For the same reason we can forgo slightly more memory-efficient
`@property @cache` stack and just use `@cached_property`.
---
 IPython/core/completer.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index ef99c979f61..fc3aea7b611 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -191,7 +191,8 @@
 import uuid
 import warnings
 from contextlib import contextmanager
-from functools import lru_cache, partial
+from dataclasses import dataclass
+from functools import cached_property, partial
 from importlib import import_module
 from types import SimpleNamespace
 from typing import (
@@ -597,7 +598,8 @@ class _JediMatcherResult(_MatcherResultBase):
     completions: Iterable[_JediCompletionLike]
 
 
-class CompletionContext(NamedTuple):
+@dataclass
+class CompletionContext:
     """Completion context provided as an argument to matchers in the Matcher API v2."""
 
     # rationale: many legacy matchers relied on completer state (`self.text_until_cursor`)
@@ -626,13 +628,11 @@ class CompletionContext(NamedTuple):
     # If not given, return all possible completions.
     limit: Optional[int]
 
-    @property
-    @lru_cache(maxsize=None)  # TODO change to @cache after dropping Python 3.7
+    @cached_property
     def text_until_cursor(self) -> str:
         return self.line_with_cursor[: self.cursor_position]
 
-    @property
-    @lru_cache(maxsize=None)  # TODO change to @cache after dropping Python 3.7
+    @cached_property
     def line_with_cursor(self) -> str:
         return self.full_text.split("\n")[self.cursor_line]
 

From 1c5ecd6fc3c010595a324ef2fa2a2e23f9566503 Mon Sep 17 00:00:00 2001
From: Petri Salminen <petri@salminen.dev>
Date: Wed, 28 Sep 2022 19:47:12 +0300
Subject: [PATCH 1251/1407] Allow spaces in file paths when using sphinx
 directive

Closes: #11606
---
 IPython/sphinxext/ipython_directive.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/sphinxext/ipython_directive.py b/IPython/sphinxext/ipython_directive.py
index 9e3c7b2276a..e55ba126c8a 100644
--- a/IPython/sphinxext/ipython_directive.py
+++ b/IPython/sphinxext/ipython_directive.py
@@ -981,7 +981,7 @@ def setup(self):
         self.shell.warning_is_error = warning_is_error
 
         # setup bookmark for saving figures directory
-        self.shell.process_input_line('bookmark ipy_savedir %s'%savefig_dir,
+        self.shell.process_input_line('bookmark ipy_savedir "%s"'%savefig_dir,
                                       store_history=False)
         self.shell.clear_cout()
 

From 0238c413f52790562bd5f55e978b6e261ec27446 Mon Sep 17 00:00:00 2001
From: ChandanChainani <chainanichan@gmail.com>
Date: Fri, 14 Oct 2022 10:39:16 +0530
Subject: [PATCH 1252/1407] Fix doc for `IPython.display.TextDisplayObject`
 (#13770)

---
 IPython/core/display.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 933295ad6ce..a095f3cb5e0 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -389,7 +389,19 @@ def reload(self):
 
 
 class TextDisplayObject(DisplayObject):
-    """Validate that display data is text"""
+    """Create a text display object given raw data.
+
+    Parameters
+    ----------
+    data : str or unicode
+        The raw data or a URL or file to load the data from.
+    url : unicode
+        A URL to download the data from.
+    filename : unicode
+        Path to a local file to load the data from.
+    metadata : dict
+        Dict of metadata associated to be the object when displayed
+    """
     def _check_data(self):
         if self.data is not None and not isinstance(self.data, str):
             raise TypeError("%s expects text, not %r" % (self.__class__.__name__, self.data))

From e2cd7aca43afd18d8294816d39ce800366eab8d3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 16 Oct 2022 15:01:08 +0200
Subject: [PATCH 1253/1407] MAINT: convert ip.magic to to run_line magic in
 many places.

Too many warnings during test suite make it hard to spot issues.
---
 IPython/core/tests/test_magic.py | 111 ++++++++++++++++---------------
 IPython/core/tests/test_run.py   |  94 +++++++++++++-------------
 2 files changed, 106 insertions(+), 99 deletions(-)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 1c793ca2915..509dd66dd28 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -84,7 +84,7 @@ def test_extract_symbols_raises_exception_with_non_python_code():
 def test_magic_not_found():
     # magic not found raises UsageError
     with pytest.raises(UsageError):
-        _ip.magic('doesntexist')
+        _ip.run_line_magic("doesntexist", "")
 
     # ensure result isn't success when a magic isn't found
     result = _ip.run_cell('%doesntexist')
@@ -116,13 +116,14 @@ def test_config():
     magic.
     """
     ## should not raise.
-    _ip.magic('config')
+    _ip.run_line_magic("config", "")
+
 
 def test_config_available_configs():
     """ test that config magic prints available configs in unique and
     sorted order. """
     with capture_output() as captured:
-        _ip.magic('config')
+        _ip.run_line_magic("config", "")
 
     stdout = captured.stdout
     config_classes = stdout.strip().split('\n')[1:]
@@ -131,7 +132,7 @@ def test_config_available_configs():
 def test_config_print_class():
     """ test that config with a classname prints the class's options. """
     with capture_output() as captured:
-        _ip.magic('config TerminalInteractiveShell')
+        _ip.run_line_magic("config", "TerminalInteractiveShell")
 
     stdout = captured.stdout
     assert re.match(
@@ -144,7 +145,7 @@ def test_rehashx():
     _ip.alias_manager.clear_aliases()
     del _ip.db['syscmdlist']
 
-    _ip.magic('rehashx')
+    _ip.run_line_magic("rehashx", "")
     # Practically ALL ipython development systems will have more than 10 aliases
 
     assert len(_ip.alias_manager.aliases) > 10
@@ -277,11 +278,11 @@ def test_macro():
     cmds = ["a=1", "def b():\n  return a**2", "print(a,b())"]
     for i, cmd in enumerate(cmds, start=1):
         ip.history_manager.store_inputs(i, cmd)
-    ip.magic("macro test 1-3")
+    ip.run_line_magic("macro", "test 1-3")
     assert ip.user_ns["test"].value == "\n".join(cmds) + "\n"
 
     # List macros
-    assert "test" in ip.magic("macro")
+    assert "test" in ip.run_line_magic("macro", "")
 
 
 def test_macro_run():
@@ -302,7 +303,7 @@ def test_magic_magic():
     """Test %magic"""
     ip = get_ipython()
     with capture_output() as captured:
-        ip.magic("magic")
+        ip.run_line_magic("magic", "")
 
     stdout = captured.stdout
     assert "%magic" in stdout
@@ -316,7 +317,7 @@ def test_numpy_reset_array_undec():
     _ip.ex("import numpy as np")
     _ip.ex("a = np.empty(2)")
     assert "a" in _ip.user_ns
-    _ip.magic("reset -f array")
+    _ip.run_line_magic("reset", "-f array")
     assert "a" not in _ip.user_ns
 
 
@@ -326,7 +327,7 @@ def test_reset_out():
     # test '%reset -f out', make an Out prompt
     _ip.run_cell("parrot", store_history=True)
     assert "dead" in [_ip.user_ns[x] for x in ("_", "__", "___")]
-    _ip.magic("reset -f out")
+    _ip.run_line_magic("reset", "-f out")
     assert "dead" not in [_ip.user_ns[x] for x in ("_", "__", "___")]
     assert len(_ip.user_ns["Out"]) == 0
 
@@ -336,7 +337,7 @@ def test_reset_in():
     # test '%reset -f in'
     _ip.run_cell("parrot", store_history=True)
     assert "parrot" in [_ip.user_ns[x] for x in ("_i", "_ii", "_iii")]
-    _ip.magic("%reset -f in")
+    _ip.run_line_magic("reset", "-f in")
     assert "parrot" not in [_ip.user_ns[x] for x in ("_i", "_ii", "_iii")]
     assert len(set(_ip.user_ns["In"])) == 1
 
@@ -344,10 +345,10 @@ def test_reset_in():
 def test_reset_dhist():
     "Test '%reset dhist' magic"
     _ip.run_cell("tmp = [d for d in _dh]")  # copy before clearing
-    _ip.magic("cd " + os.path.dirname(pytest.__file__))
-    _ip.magic("cd -")
+    _ip.run_line_magic("cd", os.path.dirname(pytest.__file__))
+    _ip.run_line_magic("cd", "-")
     assert len(_ip.user_ns["_dh"]) > 0
-    _ip.magic("reset -f dhist")
+    _ip.run_line_magic("reset", "-f dhist")
     assert len(_ip.user_ns["_dh"]) == 0
     _ip.run_cell("_dh = [d for d in tmp]")  # restore
 
@@ -472,8 +473,8 @@ def test_time_local_ns():
 
 def test_doctest_mode():
     "Toggle doctest_mode twice, it should be a no-op and run without error"
-    _ip.magic('doctest_mode')
-    _ip.magic('doctest_mode')
+    _ip.run_line_magic("doctest_mode", "")
+    _ip.run_line_magic("doctest_mode", "")
 
 
 def test_parse_options():
@@ -498,7 +499,9 @@ def test_parse_options_preserve_non_option_string():
 def test_run_magic_preserve_code_block():
     """Test to assert preservation of non-option part of magic-block, while running magic."""
     _ip.user_ns["spaces"] = []
-    _ip.magic("timeit -n1 -r1 spaces.append([s.count(' ') for s in ['document']])")
+    _ip.run_line_magic(
+        "timeit", "-n1 -r1 spaces.append([s.count(' ') for s in ['document']])"
+    )
     assert _ip.user_ns["spaces"] == [[0]]
 
 
@@ -509,13 +512,13 @@ def test_dirops():
     startdir = os.getcwd()
     ipdir = os.path.realpath(_ip.ipython_dir)
     try:
-        _ip.magic('cd "%s"' % ipdir)
+        _ip.run_line_magic("cd", '"%s"' % ipdir)
         assert curpath() == ipdir
-        _ip.magic('cd -')
+        _ip.run_line_magic("cd", "-")
         assert curpath() == startdir
-        _ip.magic('pushd "%s"' % ipdir)
+        _ip.run_line_magic("pushd", '"%s"' % ipdir)
         assert curpath() == ipdir
-        _ip.magic('popd')
+        _ip.run_line_magic("popd", "")
         assert curpath() == startdir
     finally:
         os.chdir(startdir)
@@ -542,7 +545,7 @@ def test_xmode():
     # Calling xmode three times should be a no-op
     xmode = _ip.InteractiveTB.mode
     for i in range(4):
-        _ip.magic("xmode")
+        _ip.run_line_magic("xmode", "")
     assert _ip.InteractiveTB.mode == xmode
 
 def test_reset_hard():
@@ -557,7 +560,7 @@ def __repr__(self):
     _ip.run_cell("a")
 
     assert monitor == []
-    _ip.magic("reset -f")
+    _ip.run_line_magic("reset", "-f")
     assert monitor == [1]
 
 class TestXdel(tt.TempFileMixin):
@@ -570,14 +573,14 @@ def test_xdel(self):
                "a = A()\n")
         self.mktmp(src)
         # %run creates some hidden references...
-        _ip.magic("run %s" % self.fname)
+        _ip.run_line_magic("run", "%s" % self.fname)
         # ... as does the displayhook.
         _ip.run_cell("a")
 
         monitor = _ip.user_ns["A"].monitor
         assert monitor == []
 
-        _ip.magic("xdel a")
+        _ip.run_line_magic("xdel", "a")
 
         # Check that a's __del__ method has been called.
         gc.collect(0)
@@ -614,7 +617,7 @@ class A(object):
         def __repr__(self):
             raise Exception()
     _ip.user_ns['a'] = A()
-    _ip.magic("whos")
+    _ip.run_line_magic("whos", "")
 
 def doctest_precision():
     """doctest for %precision
@@ -655,12 +658,12 @@ def test_psearch():
 def test_timeit_shlex():
     """test shlex issues with timeit (#1109)"""
     _ip.ex("def f(*a,**kw): pass")
-    _ip.magic('timeit -n1 "this is a bug".count(" ")')
-    _ip.magic('timeit -r1 -n1 f(" ", 1)')
-    _ip.magic('timeit -r1 -n1 f(" ", 1, " ", 2, " ")')
-    _ip.magic('timeit -r1 -n1 ("a " + "b")')
-    _ip.magic('timeit -r1 -n1 f("a " + "b")')
-    _ip.magic('timeit -r1 -n1 f("a " + "b ")')
+    _ip.run_line_magic("timeit", '-n1 "this is a bug".count(" ")')
+    _ip.run_line_magic("timeit", '-r1 -n1 f(" ", 1)')
+    _ip.run_line_magic("timeit", '-r1 -n1 f(" ", 1, " ", 2, " ")')
+    _ip.run_line_magic("timeit", '-r1 -n1 ("a " + "b")')
+    _ip.run_line_magic("timeit", '-r1 -n1 f("a " + "b")')
+    _ip.run_line_magic("timeit", '-r1 -n1 f("a " + "b ")')
 
 
 def test_timeit_special_syntax():
@@ -738,9 +741,9 @@ def test_extension():
     try:
         _ip.user_ns.pop('arq', None)
         invalidate_caches()   # Clear import caches
-        _ip.magic("load_ext daft_extension")
+        _ip.run_line_magic("load_ext", "daft_extension")
         assert _ip.user_ns["arq"] == 185
-        _ip.magic("unload_ext daft_extension")
+        _ip.run_line_magic("unload_ext", "daft_extension")
         assert 'arq' not in _ip.user_ns
     finally:
         sys.path.remove(daft_path)
@@ -755,17 +758,17 @@ def test_notebook_export_json():
         _ip.history_manager.store_inputs(i, cmd)
     with TemporaryDirectory() as td:
         outfile = os.path.join(td, "nb.ipynb")
-        _ip.magic("notebook %s" % outfile)
+        _ip.run_line_magic("notebook", "%s" % outfile)
 
 
 class TestEnv(TestCase):
 
     def test_env(self):
-        env = _ip.magic("env")
+        env = _ip.run_line_magic("env", "")
         self.assertTrue(isinstance(env, dict))
 
     def test_env_secret(self):
-        env = _ip.magic("env")
+        env = _ip.run_line_magic("env", "")
         hidden = "<hidden>"
         with mock.patch.dict(
             os.environ,
@@ -776,35 +779,35 @@ def test_env_secret(self):
                 "VAR": "abc"
             }
         ):
-            env = _ip.magic("env")
+            env = _ip.run_line_magic("env", "")
         assert env["API_KEY"] == hidden
         assert env["SECRET_THING"] == hidden
         assert env["JUPYTER_TOKEN"] == hidden
         assert env["VAR"] == "abc"
 
     def test_env_get_set_simple(self):
-        env = _ip.magic("env var val1")
+        env = _ip.run_line_magic("env", "var val1")
         self.assertEqual(env, None)
-        self.assertEqual(os.environ['var'], 'val1')
-        self.assertEqual(_ip.magic("env var"), 'val1')
-        env = _ip.magic("env var=val2")
+        self.assertEqual(os.environ["var"], "val1")
+        self.assertEqual(_ip.run_line_magic("env", "var"), "val1")
+        env = _ip.run_line_magic("env", "var=val2")
         self.assertEqual(env, None)
         self.assertEqual(os.environ['var'], 'val2')
 
     def test_env_get_set_complex(self):
-        env = _ip.magic("env var 'val1 '' 'val2")
+        env = _ip.run_line_magic("env", "var 'val1 '' 'val2")
         self.assertEqual(env, None)
         self.assertEqual(os.environ['var'], "'val1 '' 'val2")
-        self.assertEqual(_ip.magic("env var"), "'val1 '' 'val2")
-        env = _ip.magic('env var=val2 val3="val4')
+        self.assertEqual(_ip.run_line_magic("env", "var"), "'val1 '' 'val2")
+        env = _ip.run_line_magic("env", 'var=val2 val3="val4')
         self.assertEqual(env, None)
         self.assertEqual(os.environ['var'], 'val2 val3="val4')
 
     def test_env_set_bad_input(self):
-        self.assertRaises(UsageError, lambda: _ip.magic("set_env var"))
+        self.assertRaises(UsageError, lambda: _ip.run_line_magic("set_env", "var"))
 
     def test_env_set_whitespace(self):
-        self.assertRaises(UsageError, lambda: _ip.magic("env var A=B"))
+        self.assertRaises(UsageError, lambda: _ip.run_line_magic("env", "var A=B"))
 
 
 class CellMagicTestCase(TestCase):
@@ -1308,7 +1311,7 @@ def test_ls_magic():
     ip = get_ipython()
     json_formatter = ip.display_formatter.formatters['application/json']
     json_formatter.enabled = True
-    lsmagic = ip.magic('lsmagic')
+    lsmagic = ip.run_line_magic("lsmagic", "")
     with warnings.catch_warnings(record=True) as w:
         j = json_formatter(lsmagic)
     assert sorted(j) == ["cell", "line"]
@@ -1358,16 +1361,16 @@ def test_logging_magic_not_quiet():
 
 
 def test_time_no_var_expand():
-    _ip.user_ns['a'] = 5
-    _ip.user_ns['b'] = []
-    _ip.magic('time b.append("{a}")')
-    assert _ip.user_ns['b'] == ['{a}']
+    _ip.user_ns["a"] = 5
+    _ip.user_ns["b"] = []
+    _ip.run_line_magic("time", 'b.append("{a}")')
+    assert _ip.user_ns["b"] == ["{a}"]
 
 
 # this is slow, put at the end for local testing.
 def test_timeit_arguments():
     "Test valid timeit arguments, should not cause SyntaxError (GH #1269)"
-    _ip.magic("timeit -n1 -r1 a=('#')")
+    _ip.run_line_magic("timeit", "-n1 -r1 a=('#')")
 
 
 MINIMAL_LAZY_MAGIC = """
@@ -1442,7 +1445,7 @@ def get_data(self, path):
         sys.meta_path.insert(0, MyTempImporter())
 
         with capture_output() as captured:
-            _ip.magic("run -m my_tmp")
+            _ip.run_line_magic("run", "-m my_tmp")
             _ip.run_cell("import my_tmp")
 
         output = "Loaded my_tmp\nI just ran a script\nLoaded my_tmp\n"
diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index ae20ce6096b..e27ba2cade8 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -180,13 +180,13 @@ def run_tmpfile(self):
         _ip = get_ipython()
         # This fails on Windows if self.tmpfile.name has spaces or "~" in it.
         # See below and ticket https://bugs.launchpad.net/bugs/366353
-        _ip.magic('run %s' % self.fname)
+        _ip.run_line_magic("run", self.fname)
 
     def run_tmpfile_p(self):
         _ip = get_ipython()
         # This fails on Windows if self.tmpfile.name has spaces or "~" in it.
         # See below and ticket https://bugs.launchpad.net/bugs/366353
-        _ip.magic('run -p %s' % self.fname)
+        _ip.run_line_magic("run", "-p %s" % self.fname)
 
     def test_builtins_id(self):
         """Check that %run doesn't damage __builtins__ """
@@ -216,20 +216,20 @@ def test_run_profile(self):
     def test_run_debug_twice(self):
         # https://github.com/ipython/ipython/issues/10028
         _ip = get_ipython()
-        with tt.fake_input(['c']):
-            _ip.magic('run -d %s' % self.fname)
-        with tt.fake_input(['c']):
-            _ip.magic('run -d %s' % self.fname)
+        with tt.fake_input(["c"]):
+            _ip.run_line_magic("run", "-d %s" % self.fname)
+        with tt.fake_input(["c"]):
+            _ip.run_line_magic("run", "-d %s" % self.fname)
 
     def test_run_debug_twice_with_breakpoint(self):
         """Make a valid python temp file."""
         _ip = get_ipython()
-        with tt.fake_input(['b 2', 'c', 'c']):
-            _ip.magic('run -d %s' % self.fname)
+        with tt.fake_input(["b 2", "c", "c"]):
+            _ip.run_line_magic("run", "-d %s" % self.fname)
 
-        with tt.fake_input(['c']):
-            with tt.AssertNotPrints('KeyError'):
-                _ip.magic('run -d %s' % self.fname)
+        with tt.fake_input(["c"]):
+            with tt.AssertNotPrints("KeyError"):
+                _ip.run_line_magic("run", "-d %s" % self.fname)
 
 
 class TestMagicRunSimple(tt.TempFileMixin):
@@ -239,7 +239,7 @@ def test_simpledef(self):
         src = ("class foo: pass\n"
                "def f(): return foo()")
         self.mktmp(src)
-        _ip.magic("run %s" % self.fname)
+        _ip.run_line_magic("run", str(self.fname))
         _ip.run_cell("t = isinstance(f(), foo)")
         assert _ip.user_ns["t"] is True
 
@@ -277,7 +277,7 @@ def test_aggressive_namespace_cleanup(self):
                 "       break\n" % ("run " + empty.fname)
             )
             self.mktmp(src)
-            _ip.magic("run %s" % self.fname)
+            _ip.run_line_magic("run", str(self.fname))
             _ip.run_cell("ip == get_ipython()")
             assert _ip.user_ns["i"] == 4
 
@@ -288,8 +288,8 @@ def test_run_second(self):
         with tt.TempFileMixin() as empty:
             empty.mktmp("")
 
-            _ip.magic("run %s" % self.fname)
-            _ip.magic("run %s" % empty.fname)
+            _ip.run_line_magic("run", self.fname)
+            _ip.run_line_magic("run", empty.fname)
             assert _ip.user_ns["afunc"]() == 1
 
     def test_tclass(self):
@@ -323,23 +323,23 @@ def test_run_i_after_reset(self):
         self.mktmp(src)
         _ip.run_cell("zz = 23")
         try:
-            _ip.magic("run -i %s" % self.fname)
+            _ip.run_line_magic("run", "-i %s" % self.fname)
             assert _ip.user_ns["yy"] == 23
         finally:
-            _ip.magic('reset -f')
+            _ip.run_line_magic("reset", "-f")
 
         _ip.run_cell("zz = 23")
         try:
-            _ip.magic("run -i %s" % self.fname)
+            _ip.run_line_magic("run", "-i %s" % self.fname)
             assert _ip.user_ns["yy"] == 23
         finally:
-            _ip.magic('reset -f')
+            _ip.run_line_magic("reset", "-f")
 
     def test_unicode(self):
         """Check that files in odd encodings are accepted."""
         mydir = os.path.dirname(__file__)
-        na = os.path.join(mydir, 'nonascii.py')
-        _ip.magic('run "%s"' % na)
+        na = os.path.join(mydir, "nonascii.py")
+        _ip.run_line_magic("run", "%r" % na)
         assert _ip.user_ns["u"] == "Ўт№Ф"
 
     def test_run_py_file_attribute(self):
@@ -347,9 +347,9 @@ def test_run_py_file_attribute(self):
         src = "t = __file__\n"
         self.mktmp(src)
         _missing = object()
-        file1 = _ip.user_ns.get('__file__', _missing)
-        _ip.magic('run %s' % self.fname)
-        file2 = _ip.user_ns.get('__file__', _missing)
+        file1 = _ip.user_ns.get("__file__", _missing)
+        _ip.run_line_magic("run", self.fname)
+        file2 = _ip.user_ns.get("__file__", _missing)
 
         # Check that __file__ was equal to the filename in the script's
         # namespace.
@@ -363,9 +363,9 @@ def test_run_ipy_file_attribute(self):
         src = "t = __file__\n"
         self.mktmp(src, ext='.ipy')
         _missing = object()
-        file1 = _ip.user_ns.get('__file__', _missing)
-        _ip.magic('run %s' % self.fname)
-        file2 = _ip.user_ns.get('__file__', _missing)
+        file1 = _ip.user_ns.get("__file__", _missing)
+        _ip.run_line_magic("run", self.fname)
+        file2 = _ip.user_ns.get("__file__", _missing)
 
         # Check that __file__ was equal to the filename in the script's
         # namespace.
@@ -378,18 +378,18 @@ def test_run_formatting(self):
         """ Test that %run -t -N<N> does not raise a TypeError for N > 1."""
         src = "pass"
         self.mktmp(src)
-        _ip.magic('run -t -N 1 %s' % self.fname)
-        _ip.magic('run -t -N 10 %s' % self.fname)
+        _ip.run_line_magic("run", "-t -N 1 %s" % self.fname)
+        _ip.run_line_magic("run", "-t -N 10 %s" % self.fname)
 
     def test_ignore_sys_exit(self):
         """Test the -e option to ignore sys.exit()"""
         src = "import sys; sys.exit(1)"
         self.mktmp(src)
-        with tt.AssertPrints('SystemExit'):
-            _ip.magic('run %s' % self.fname)
+        with tt.AssertPrints("SystemExit"):
+            _ip.run_line_magic("run", self.fname)
 
-        with tt.AssertNotPrints('SystemExit'):
-            _ip.magic('run -e %s' % self.fname)
+        with tt.AssertNotPrints("SystemExit"):
+            _ip.run_line_magic("run", "-e %s" % self.fname)
 
     def test_run_nb(self):
         """Test %run notebook.ipynb"""
@@ -404,7 +404,7 @@ def test_run_nb(self):
         src = writes(nb, version=4)
         self.mktmp(src, ext='.ipynb')
 
-        _ip.magic("run %s" % self.fname)
+        _ip.run_line_magic("run", self.fname)
 
         assert _ip.user_ns["answer"] == 42
 
@@ -478,12 +478,16 @@ def tearDown(self):
         sys.path[:] = [p for p in sys.path if p != self.tempdir.name]
         self.tempdir.cleanup()
 
-    def check_run_submodule(self, submodule, opts=''):
-        _ip.user_ns.pop('x', None)
-        _ip.magic('run {2} -m {0}.{1}'.format(self.package, submodule, opts))
-        self.assertEqual(_ip.user_ns['x'], self.value,
-                         'Variable `x` is not loaded from module `{0}`.'
-                         .format(submodule))
+    def check_run_submodule(self, submodule, opts=""):
+        _ip.user_ns.pop("x", None)
+        _ip.run_line_magic(
+            "run", "{2} -m {0}.{1}".format(self.package, submodule, opts)
+        )
+        self.assertEqual(
+            _ip.user_ns["x"],
+            self.value,
+            "Variable `x` is not loaded from module `{0}`.".format(submodule),
+        )
 
     def test_run_submodule_with_absolute_import(self):
         self.check_run_submodule('absolute')
@@ -533,17 +537,17 @@ def test_run__name__():
             f.write("q = __name__")
 
         _ip.user_ns.pop("q", None)
-        _ip.magic("run {}".format(path))
+        _ip.run_line_magic("run", "{}".format(path))
         assert _ip.user_ns.pop("q") == "__main__"
 
-        _ip.magic("run -n {}".format(path))
+        _ip.run_line_magic("run", "-n {}".format(path))
         assert _ip.user_ns.pop("q") == "foo"
 
         try:
-            _ip.magic("run -i -n {}".format(path))
+            _ip.run_line_magic("run", "-i -n {}".format(path))
             assert _ip.user_ns.pop("q") == "foo"
         finally:
-            _ip.magic('reset -f')
+            _ip.run_line_magic("reset", "-f")
 
 
 def test_run_tb():
@@ -563,7 +567,7 @@ def test_run_tb():
                 )
             )
         with capture_output() as io:
-            _ip.magic('run {}'.format(path))
+            _ip.run_line_magic("run", "{}".format(path))
         out = io.stdout
         assert "execfile" not in out
         assert "RuntimeError" in out

From 5e67aa3b5849d9d2cf708a75cbf951b02b1ae2d9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 16 Oct 2022 14:28:25 +0200
Subject: [PATCH 1254/1407] Support square bracket indexing with literal with
 pinfo/?/pinfo2/??

We add limited support for evaluating `[xxx]` where xxx is a numeric
literal. This still abit dangerous as __getindex__ can run arbitrary
code.

We could support a wider range of constructs, but this would start to
reach into complex and dangerous territory. Alredy this with lead to
weird suff like
   >>> def foo(*arg, **kwargs):pass
   >>> c = [foo]
   >>> c[0]?
   Signature: c[0](*args, **kwargs)

Instead of

   >>> c[0]?
   Signature: foo(*args, **kwargs)

As the name of the object is used in the signature is the one if the
main namespace.

This should fix https://github.com/ipython/ipython/issues/13780
---
 IPython/core/inputtransformer2.py          | 24 ++++++---
 IPython/core/interactiveshell.py           | 62 ++++++++++++++++------
 IPython/core/tests/test_oinspect.py        | 53 +++++++++++++++++-
 IPython/testing/plugin/pytest_ipdoctest.py |  2 +-
 4 files changed, 116 insertions(+), 25 deletions(-)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index e4e385a95ff..432e091fcdb 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -429,9 +429,11 @@ def transform(self, lines):
 
         return lines_before + [new_line] + lines_after
 
-_help_end_re = re.compile(r"""(%{0,2}
+
+_help_end_re = re.compile(
+    r"""(%{0,2}
                               (?!\d)[\w*]+            # Variable name
-                              (\.(?!\d)[\w*]+)*       # .etc.etc
+                              (\.(?!\d)[\w*]+|\[[0-9]+\])*       # .etc.etc or [0], we only support literal integers.
                               )
                               (\?\??)$                # ? or ??
                               """,
@@ -464,10 +466,11 @@ def find(cls, tokens_by_line):
     def transform(self, lines):
         """Transform a help command found by the ``find()`` classmethod.
         """
-        piece = ''.join(lines[self.start_line:self.q_line+1])
-        indent, content = piece[:self.start_col], piece[self.start_col:]
-        lines_before = lines[:self.start_line]
-        lines_after = lines[self.q_line + 1:]
+
+        piece = "".join(lines[self.start_line : self.q_line + 1])
+        indent, content = piece[: self.start_col], piece[self.start_col :]
+        lines_before = lines[: self.start_line]
+        lines_after = lines[self.q_line + 1 :]
 
         m = _help_end_re.search(content)
         if not m:
@@ -543,8 +546,13 @@ def has_sunken_brackets(tokens: List[tokenize.TokenInfo]):
 
 def show_linewise_tokens(s: str):
     """For investigation and debugging"""
-    if not s.endswith('\n'):
-        s += '\n'
+    warnings.warn(
+        "show_linewise_tokens is deprecated since IPython 8.6",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    if not s.endswith("\n"):
+        s += "\n"
     lines = s.splitlines(keepends=True)
     for line in make_tokens_by_line(lines):
         print("Line -------")
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 06912640673..1c422a59975 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -213,14 +213,17 @@ def __repr__(self):
         raw_cell = (
             (self.raw_cell[:50] + "..") if len(self.raw_cell) > 50 else self.raw_cell
         )
-        return '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s cell_id=%s>' % (
-            name,
-            id(self),
-            raw_cell,
-            self.store_history,
-            self.silent,
-            self.shell_futures,
-            self.cell_id,
+        return (
+            '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s cell_id=%s>'
+            % (
+                name,
+                id(self),
+                raw_cell,
+                self.store_history,
+                self.silent,
+                self.shell_futures,
+                self.cell_id,
+            )
         )
 
 
@@ -1537,10 +1540,33 @@ def _ofind(self, oname, namespaces=None):
         Has special code to detect magic functions.
         """
         oname = oname.strip()
-        if not oname.startswith(ESC_MAGIC) and \
-                not oname.startswith(ESC_MAGIC2) and \
-                not all(a.isidentifier() for a in oname.split(".")):
-            return {'found': False}
+        raw_parts = oname.split(".")
+        parts = []
+        parts_ok = True
+        for p in raw_parts:
+            if p.endswith("]"):
+                var, *indices = p.split("[")
+                if not var.isidentifier():
+                    parts_ok = False
+                    break
+                parts.append(var)
+                for ind in indices:
+                    if ind[-1] != "]" and not ind[:-1].isnumeric():
+                        parts_ok = False
+                        break
+                    parts.append(ind[:-1])
+                continue
+
+            if not p.isidentifier():
+                parts_ok = False
+            parts.append(p)
+
+        if (
+            not oname.startswith(ESC_MAGIC)
+            and not oname.startswith(ESC_MAGIC2)
+            and not parts_ok
+        ):
+            return {"found": False}
 
         if namespaces is None:
             # Namespaces to search in:
@@ -1562,7 +1588,7 @@ def _ofind(self, oname, namespaces=None):
         # Look for the given name by splitting it in parts.  If the head is
         # found, then we look for all the remaining parts as members, and only
         # declare success if we can find them all.
-        oname_parts = oname.split('.')
+        oname_parts = parts
         oname_head, oname_rest = oname_parts[0],oname_parts[1:]
         for nsname,ns in namespaces:
             try:
@@ -1579,7 +1605,10 @@ def _ofind(self, oname, namespaces=None):
                         if idx == len(oname_rest) - 1:
                             obj = self._getattr_property(obj, part)
                         else:
-                            obj = getattr(obj, part)
+                            if part.isnumeric():
+                                obj = obj[int(part)]
+                            else:
+                                obj = getattr(obj, part)
                     except:
                         # Blanket except b/c some badly implemented objects
                         # allow __getattr__ to raise exceptions other than
@@ -1643,7 +1672,10 @@ def _getattr_property(obj, attrname):
                 #
                 # The universal alternative is to traverse the mro manually
                 # searching for attrname in class dicts.
-                attr = getattr(type(obj), attrname)
+                if attrname.isnumeric():
+                    return obj[int(attrname)]
+                else:
+                    attr = getattr(type(obj), attrname)
             except AttributeError:
                 pass
             else:
diff --git a/IPython/core/tests/test_oinspect.py b/IPython/core/tests/test_oinspect.py
index 94deb356a88..f2312804acd 100644
--- a/IPython/core/tests/test_oinspect.py
+++ b/IPython/core/tests/test_oinspect.py
@@ -5,6 +5,7 @@
 # Distributed under the terms of the Modified BSD License.
 
 
+from contextlib import contextmanager
 from inspect import signature, Signature, Parameter
 import inspect
 import os
@@ -43,7 +44,7 @@ class SourceModuleMainTest:
 # defined, if any code is inserted above, the following line will need to be
 # updated.  Do NOT insert any whitespace between the next line and the function
 # definition below.
-THIS_LINE_NUMBER = 46  # Put here the actual number of this line
+THIS_LINE_NUMBER = 47  # Put here the actual number of this line
 
 
 def test_find_source_lines():
@@ -345,6 +346,56 @@ def foo(): pass
     inspector.pdef(foo, 'foo')
 
 
+@contextmanager
+def cleanup_user_ns(**kwargs):
+    """
+    On exit delete all the keys that were not in user_ns before entering.
+
+    It does not restore old values !
+
+    Parameters
+    ----------
+
+    **kwargs
+        used to update ip.user_ns
+
+    """
+    try:
+        known = set(ip.user_ns.keys())
+        ip.user_ns.update(kwargs)
+        yield
+    finally:
+        added = set(ip.user_ns.keys()) - known
+        for k in added:
+            del ip.user_ns[k]
+
+
+def test_pinfo_getindex():
+    def dummy():
+        """
+        MARKER
+        """
+
+    container = [dummy]
+    with cleanup_user_ns(container=container):
+        with AssertPrints("MARKER"):
+            ip._inspect("pinfo", "container[0]", detail_level=0)
+    assert "container" not in ip.user_ns.keys()
+
+
+def test_qmark_getindex():
+    def dummy():
+        """
+        MARKER 2
+        """
+
+    container = [dummy]
+    with cleanup_user_ns(container=container):
+        with AssertPrints("MARKER 2"):
+            ip.run_cell("container[0]?")
+    assert "container" not in ip.user_ns.keys()
+
+
 def test_pinfo_nonascii():
     # See gh-1177
     from . import nonascii2
diff --git a/IPython/testing/plugin/pytest_ipdoctest.py b/IPython/testing/plugin/pytest_ipdoctest.py
index 809713d7c8e..4ba2f1adf8e 100644
--- a/IPython/testing/plugin/pytest_ipdoctest.py
+++ b/IPython/testing/plugin/pytest_ipdoctest.py
@@ -782,7 +782,7 @@ def _remove_unwanted_precision(self, want: str, got: str) -> str:
                 precision = 0 if fraction is None else len(fraction)
                 if exponent is not None:
                     precision -= int(exponent)
-                if float(w.group()) == approx(float(g.group()), abs=10 ** -precision):
+                if float(w.group()) == approx(float(g.group()), abs=10**-precision):
                     # They're close enough. Replace the text we actually
                     # got with the text we want, so that it will match when we
                     # check the string literally.

From 44a6127199f95c09792dfe097270ec124ae0bf0e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 16 Oct 2022 15:35:59 +0200
Subject: [PATCH 1255/1407] revert fialing on windows

---
 IPython/core/tests/test_run.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index e27ba2cade8..9687786b46a 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -339,7 +339,7 @@ def test_unicode(self):
         """Check that files in odd encodings are accepted."""
         mydir = os.path.dirname(__file__)
         na = os.path.join(mydir, "nonascii.py")
-        _ip.run_line_magic("run", "%r" % na)
+        _ip.magic('run "%s"' % na)
         assert _ip.user_ns["u"] == "Ўт№Ф"
 
     def test_run_py_file_attribute(self):

From 6c9912fc5b73171c1c362a90fa3f6e36e81fa375 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 16 Oct 2022 15:45:03 +0200
Subject: [PATCH 1256/1407] reformat with same version of balck

---
 IPython/core/interactiveshell.py           | 19 ++++++++-----------
 IPython/testing/plugin/pytest_ipdoctest.py |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 1c422a59975..9b3cc06ea13 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -213,17 +213,14 @@ def __repr__(self):
         raw_cell = (
             (self.raw_cell[:50] + "..") if len(self.raw_cell) > 50 else self.raw_cell
         )
-        return (
-            '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s cell_id=%s>'
-            % (
-                name,
-                id(self),
-                raw_cell,
-                self.store_history,
-                self.silent,
-                self.shell_futures,
-                self.cell_id,
-            )
+        return '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s cell_id=%s>' % (
+            name,
+            id(self),
+            raw_cell,
+            self.store_history,
+            self.silent,
+            self.shell_futures,
+            self.cell_id,
         )
 
 
diff --git a/IPython/testing/plugin/pytest_ipdoctest.py b/IPython/testing/plugin/pytest_ipdoctest.py
index 4ba2f1adf8e..809713d7c8e 100644
--- a/IPython/testing/plugin/pytest_ipdoctest.py
+++ b/IPython/testing/plugin/pytest_ipdoctest.py
@@ -782,7 +782,7 @@ def _remove_unwanted_precision(self, want: str, got: str) -> str:
                 precision = 0 if fraction is None else len(fraction)
                 if exponent is not None:
                     precision -= int(exponent)
-                if float(w.group()) == approx(float(g.group()), abs=10**-precision):
+                if float(w.group()) == approx(float(g.group()), abs=10 ** -precision):
                     # They're close enough. Replace the text we actually
                     # got with the text we want, so that it will match when we
                     # check the string literally.

From 56c8a1e6f82ea7032ff8435cee3c5b3c9ab00b56 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 17 Oct 2022 09:05:00 +0200
Subject: [PATCH 1257/1407] support negative indexing

---
 IPython/core/inputtransformer2.py   | 14 ++++++++------
 IPython/core/interactiveshell.py    | 17 ++++++++++++++---
 IPython/core/tests/test_oinspect.py | 13 +++++++++++++
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index 432e091fcdb..37f0e7699c4 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -432,12 +432,14 @@ def transform(self, lines):
 
 _help_end_re = re.compile(
     r"""(%{0,2}
-                              (?!\d)[\w*]+            # Variable name
-                              (\.(?!\d)[\w*]+|\[[0-9]+\])*       # .etc.etc or [0], we only support literal integers.
-                              )
-                              (\?\??)$                # ? or ??
-                              """,
-                              re.VERBOSE)
+    (?!\d)[\w*]+            # Variable name
+    (\.(?!\d)[\w*]+|\[-?[0-9]+\])*       # .etc.etc or [0], we only support literal integers.
+    )
+    (\?\??)$                # ? or ??
+    """,
+    re.VERBOSE,
+)
+
 
 class HelpEnd(TokenTransformBase):
     """Transformer for help syntax: obj? and obj??"""
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 9b3cc06ea13..04094d74b06 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -147,6 +147,17 @@ class ProvisionalWarning(DeprecationWarning):
 # Utilities
 #-----------------------------------------------------------------------------
 
+def is_integer_string(s:str):
+    """
+    Variant of "str.isnumeric()" that allow negative values and other ints.
+    """
+    try:
+        int(s)
+        return True
+    except ValueError:
+        return False
+    raise ValueError('Unexpected error')
+
 @undoc
 def softspace(file, newvalue):
     """Copied from code.py, to remove the dependency"""
@@ -1548,7 +1559,7 @@ def _ofind(self, oname, namespaces=None):
                     break
                 parts.append(var)
                 for ind in indices:
-                    if ind[-1] != "]" and not ind[:-1].isnumeric():
+                    if ind[-1] != "]" and not is_integer_string(ind[:-1]):
                         parts_ok = False
                         break
                     parts.append(ind[:-1])
@@ -1602,7 +1613,7 @@ def _ofind(self, oname, namespaces=None):
                         if idx == len(oname_rest) - 1:
                             obj = self._getattr_property(obj, part)
                         else:
-                            if part.isnumeric():
+                            if is_integer_string(part):
                                 obj = obj[int(part)]
                             else:
                                 obj = getattr(obj, part)
@@ -1669,7 +1680,7 @@ def _getattr_property(obj, attrname):
                 #
                 # The universal alternative is to traverse the mro manually
                 # searching for attrname in class dicts.
-                if attrname.isnumeric():
+                if is_integer_string(attrname):
                     return obj[int(attrname)]
                 else:
                     attr = getattr(type(obj), attrname)
diff --git a/IPython/core/tests/test_oinspect.py b/IPython/core/tests/test_oinspect.py
index f2312804acd..0c7c0da6793 100644
--- a/IPython/core/tests/test_oinspect.py
+++ b/IPython/core/tests/test_oinspect.py
@@ -395,6 +395,19 @@ def dummy():
             ip.run_cell("container[0]?")
     assert "container" not in ip.user_ns.keys()
 
+def test_qmark_getindex_negatif():
+    def dummy():
+        """
+        MARKER 3
+        """
+
+    container = [dummy]
+    with cleanup_user_ns(container=container):
+        with AssertPrints("MARKER 3"):
+            ip.run_cell("container[-1]?")
+    assert "container" not in ip.user_ns.keys()
+
+
 
 def test_pinfo_nonascii():
     # See gh-1177

From 7fec05a42311e9d37e5d9467ffc5924abae4feb2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 17 Oct 2022 09:09:29 +0200
Subject: [PATCH 1258/1407] formatting

---
 IPython/core/interactiveshell.py    | 6 ++++--
 IPython/core/tests/test_oinspect.py | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 04094d74b06..649ceba903c 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -147,7 +147,8 @@ class ProvisionalWarning(DeprecationWarning):
 # Utilities
 #-----------------------------------------------------------------------------
 
-def is_integer_string(s:str):
+
+def is_integer_string(s: str):
     """
     Variant of "str.isnumeric()" that allow negative values and other ints.
     """
@@ -156,7 +157,8 @@ def is_integer_string(s:str):
         return True
     except ValueError:
         return False
-    raise ValueError('Unexpected error')
+    raise ValueError("Unexpected error")
+
 
 @undoc
 def softspace(file, newvalue):
diff --git a/IPython/core/tests/test_oinspect.py b/IPython/core/tests/test_oinspect.py
index 0c7c0da6793..8ae146fa49a 100644
--- a/IPython/core/tests/test_oinspect.py
+++ b/IPython/core/tests/test_oinspect.py
@@ -395,6 +395,7 @@ def dummy():
             ip.run_cell("container[0]?")
     assert "container" not in ip.user_ns.keys()
 
+
 def test_qmark_getindex_negatif():
     def dummy():
         """

From 1dca7fe12fb98a79256d6eb8212ec400eaa240b9 Mon Sep 17 00:00:00 2001
From: jcollins1983 <jason.collins83@gmail.com>
Date: Tue, 18 Oct 2022 07:34:44 +1100
Subject: [PATCH 1259/1407] Update namespace.py

Correct unattended to unintended in reset method docstring.
---
 IPython/core/magics/namespace.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/namespace.py b/IPython/core/magics/namespace.py
index c86d3de9b65..5da8f7161a0 100644
--- a/IPython/core/magics/namespace.py
+++ b/IPython/core/magics/namespace.py
@@ -492,7 +492,7 @@ def reset(self, parameter_s=''):
         --aggressive
             Try to aggressively remove modules from sys.modules ; this
             may allow you to reimport Python modules that have been updated and
-            pick up changes, but can have unattended consequences.
+            pick up changes, but can have unintended consequences.
 
         in
             reset input history

From 3a5c2e2e3b9671257534bad318ffa807a91dc55d Mon Sep 17 00:00:00 2001
From: Hassan Tahir <info.hassantahir@gmail.com>
Date: Thu, 20 Oct 2022 23:14:53 +0500
Subject: [PATCH 1260/1407] Fixed Tidelift Badge

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index e38b7120e6b..0371848061e 100644
--- a/README.rst
+++ b/README.rst
@@ -13,8 +13,8 @@
 .. image:: https://raster.shields.io/badge/Follows-NEP29-brightgreen.png
     :target: https://numpy.org/neps/nep-0029-deprecation_policy.html
 
-.. image:: https://tidelift.com/subscription/pkg/pypi-ipython
-    :target: https://tidelift.com/badges/package/pypi/ipython?style=flat
+.. image:: https://tidelift.com/badges/package/pypi/ipython?style=flat
+    :target: https://tidelift.com/subscription/pkg/pypi-ipython
 
 
 ===========================================

From e3ae64a182e8628d192f3ab6b31eb330670dbf88 Mon Sep 17 00:00:00 2001
From: Frazer McLean <frazer@frazermclean.co.uk>
Date: Fri, 28 Oct 2022 18:50:07 +0200
Subject: [PATCH 1261/1407] Use SPDX license expression in project metadata

---
 IPython/core/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index a7e48a17b83..ae8b15ec39e 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -36,7 +36,7 @@
 kernel_protocol_version_info = (5, 0)
 kernel_protocol_version = "%i.%i" % kernel_protocol_version_info
 
-license = 'BSD'
+license = 'BSD-3-Clause'
 
 authors = {'Fernando' : ('Fernando Perez','fperez.net@gmail.com'),
            'Janko'    : ('Janko Hauser','jhauser@zscout.de'),

From de9895dc85c43b2d7719ce49a2a24127ac51f215 Mon Sep 17 00:00:00 2001
From: anakimluke <anakimluke@users.noreply.github.com>
Date: Fri, 28 Oct 2022 20:06:20 -0300
Subject: [PATCH 1262/1407] fix minor typo in details.rst

---
 docs/source/config/details.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/config/details.rst b/docs/source/config/details.rst
index 9e63232d81d..3cc310a4b96 100644
--- a/docs/source/config/details.rst
+++ b/docs/source/config/details.rst
@@ -69,7 +69,7 @@ shell:
 
     /home/bob >>> # it works
 
-See ``IPython/example/utils/cwd_prompt.py`` for an example of how to write an
+See ``IPython/example/utils/cwd_prompt.py`` for an example of how to write
 extensions to customise prompts.
 
 Inside IPython or in a startup script, you can use a custom prompts class

From 033545a951e839c9de6a2600f10a80aa7657f271 Mon Sep 17 00:00:00 2001
From: Maciej Goszczycki <mgoszcz2@gmail.com>
Date: Sun, 3 Apr 2022 05:25:25 +0200
Subject: [PATCH 1263/1407] Prevent the terminal title from being set if the
 output is not a tty

Fixes #11482
---
 IPython/terminal/interactiveshell.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index b7739c885a4..cf2ab42776e 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -405,14 +405,14 @@ def _autosuggestions_provider_changed(self, change):
     @observe('term_title')
     def init_term_title(self, change=None):
         # Enable or disable the terminal title.
-        if self.term_title:
+        if self.term_title and _is_tty:
             toggle_set_term_title(True)
             set_term_title(self.term_title_format.format(cwd=abbrev_cwd()))
         else:
             toggle_set_term_title(False)
 
     def restore_term_title(self):
-        if self.term_title:
+        if self.term_title and _is_tty:
             restore_term_title()
 
     def init_display_formatter(self):

From 71f7729bba60f8e3e175bc0201a3c2f738d7a395 Mon Sep 17 00:00:00 2001
From: Maciej Goszczycki <mgoszcz2@gmail.com>
Date: Sun, 3 Apr 2022 05:28:50 +0200
Subject: [PATCH 1264/1407] Restore terminal title when not running
 non-interactively

---
 IPython/terminal/ipapp.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/terminal/ipapp.py b/IPython/terminal/ipapp.py
index a87eb2f4434..df4648b8914 100755
--- a/IPython/terminal/ipapp.py
+++ b/IPython/terminal/ipapp.py
@@ -318,6 +318,7 @@ def start(self):
             self.shell.mainloop()
         else:
             self.log.debug("IPython not interactive...")
+            self.shell.restore_term_title()
             if not self.shell.last_execution_succeeded:
                 sys.exit(1)
 

From d183ce0cc9e7194658fa042d910a0d2b56ea40ba Mon Sep 17 00:00:00 2001
From: Maciej Goszczycki <mgoszcz2@gmail.com>
Date: Sun, 3 Apr 2022 05:30:06 +0200
Subject: [PATCH 1265/1407] Only save the initial terminal title

---
 IPython/utils/terminal.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/IPython/utils/terminal.py b/IPython/utils/terminal.py
index 49fd3fe1739..cba499b711c 100644
--- a/IPython/utils/terminal.py
+++ b/IPython/utils/terminal.py
@@ -62,15 +62,27 @@ def _restore_term_title():
     pass
 
 
+_xterm_term_title_saved = False
+
+
 def _set_term_title_xterm(title):
     """ Change virtual terminal title in xterm-workalikes """
-    # save the current title to the xterm "stack"
-    sys.stdout.write('\033[22;0t') 
+    global _xterm_term_title_saved
+    # Only save the title the first time we set, otherwise restore will only
+    # go back one title (probably undoing a %cd title change).
+    if not _xterm_term_title_saved:
+        # save the current title to the xterm "stack"
+        sys.stdout.write('\033[22;0t') 
+        _xterm_term_title_saved = True
     sys.stdout.write('\033]0;%s\007' % title)
 
 
 def _restore_term_title_xterm():
+    # Make sure the restore has at least one accompanying set.
+    global _xterm_term_title_saved
+    assert _xterm_term_title_saved
     sys.stdout.write('\033[23;0t') 
+    _xterm_term_title_saved = False
 
 
 if os.name == 'posix':

From ed2fdc3dc2ef5875fbd8e701cfec4a4061fbbe75 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 29 Oct 2022 12:14:14 +0200
Subject: [PATCH 1266/1407] Fix formatting

---
 IPython/utils/terminal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/utils/terminal.py b/IPython/utils/terminal.py
index cba499b711c..161a9ae6042 100644
--- a/IPython/utils/terminal.py
+++ b/IPython/utils/terminal.py
@@ -72,7 +72,7 @@ def _set_term_title_xterm(title):
     # go back one title (probably undoing a %cd title change).
     if not _xterm_term_title_saved:
         # save the current title to the xterm "stack"
-        sys.stdout.write('\033[22;0t') 
+        sys.stdout.write("\033[22;0t")
         _xterm_term_title_saved = True
     sys.stdout.write('\033]0;%s\007' % title)
 

From e7d5820fd3fd8089b147482b85f06248f0e0a3b9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 29 Oct 2022 12:54:05 +0200
Subject: [PATCH 1267/1407] pin darker, upgrade black

---
 .github/workflows/python-package.yml       |  2 +-
 IPython/core/interactiveshell.py           | 19 +++++++++++--------
 IPython/core/release.py                    |  2 +-
 IPython/testing/plugin/pytest_ipdoctest.py |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 62667b48d38..fc1f19e0912 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -28,7 +28,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install darker black==21.12b0
+        pip install darker==1.5.1 black==22.10.0
     - name: Lint with darker
       run: |
         darker -r 60625f241f298b5039cb2debc365db38aa7bb522 --check --diff . || (
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 649ceba903c..6d04846081a 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -226,14 +226,17 @@ def __repr__(self):
         raw_cell = (
             (self.raw_cell[:50] + "..") if len(self.raw_cell) > 50 else self.raw_cell
         )
-        return '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s cell_id=%s>' % (
-            name,
-            id(self),
-            raw_cell,
-            self.store_history,
-            self.silent,
-            self.shell_futures,
-            self.cell_id,
+        return (
+            '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s cell_id=%s>'
+            % (
+                name,
+                id(self),
+                raw_cell,
+                self.store_history,
+                self.silent,
+                self.shell_futures,
+                self.cell_id,
+            )
         )
 
 
diff --git a/IPython/core/release.py b/IPython/core/release.py
index ae8b15ec39e..bd0ac2161e3 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -36,7 +36,7 @@
 kernel_protocol_version_info = (5, 0)
 kernel_protocol_version = "%i.%i" % kernel_protocol_version_info
 
-license = 'BSD-3-Clause'
+license = "BSD-3-Clause"
 
 authors = {'Fernando' : ('Fernando Perez','fperez.net@gmail.com'),
            'Janko'    : ('Janko Hauser','jhauser@zscout.de'),
diff --git a/IPython/testing/plugin/pytest_ipdoctest.py b/IPython/testing/plugin/pytest_ipdoctest.py
index 809713d7c8e..4ba2f1adf8e 100644
--- a/IPython/testing/plugin/pytest_ipdoctest.py
+++ b/IPython/testing/plugin/pytest_ipdoctest.py
@@ -782,7 +782,7 @@ def _remove_unwanted_precision(self, want: str, got: str) -> str:
                 precision = 0 if fraction is None else len(fraction)
                 if exponent is not None:
                     precision -= int(exponent)
-                if float(w.group()) == approx(float(g.group()), abs=10 ** -precision):
+                if float(w.group()) == approx(float(g.group()), abs=10**-precision):
                     # They're close enough. Replace the text we actually
                     # got with the text we want, so that it will match when we
                     # check the string literally.

From 667f3cbe6879d6fbe63ce8cb7895e2db6e49bfb7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 29 Oct 2022 12:56:56 +0200
Subject: [PATCH 1268/1407] Run black on all files that would lead to 3 lines
 changes or less

---
 IPython/core/tests/nonascii.py            | 2 +-
 IPython/lib/tests/test_imports.py         | 3 +++
 IPython/terminal/pt_inputhooks/asyncio.py | 3 +--
 IPython/terminal/pt_inputhooks/gtk.py     | 2 ++
 IPython/terminal/pt_inputhooks/gtk3.py    | 2 ++
 IPython/testing/plugin/simplevars.py      | 2 +-
 IPython/utils/_sysinfo.py                 | 2 +-
 IPython/utils/tests/test_dir2.py          | 3 +--
 setupbase.py                              | 2 +-
 9 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/IPython/core/tests/nonascii.py b/IPython/core/tests/nonascii.py
index 78801dfd093..12738e3adc2 100644
--- a/IPython/core/tests/nonascii.py
+++ b/IPython/core/tests/nonascii.py
@@ -1,4 +1,4 @@
 # coding: iso-8859-5
 # (Unlikely to be the default encoding for most testers.)
 # ������������������� <- Cyrillic characters
-u = '����'
+u = "����"
diff --git a/IPython/lib/tests/test_imports.py b/IPython/lib/tests/test_imports.py
index d2e1b877290..515cd4a8a58 100644
--- a/IPython/lib/tests/test_imports.py
+++ b/IPython/lib/tests/test_imports.py
@@ -1,11 +1,14 @@
 # encoding: utf-8
 from IPython.testing import decorators as dec
 
+
 def test_import_backgroundjobs():
     from IPython.lib import backgroundjobs
 
+
 def test_import_deepreload():
     from IPython.lib import deepreload
 
+
 def test_import_demo():
     from IPython.lib import demo
diff --git a/IPython/terminal/pt_inputhooks/asyncio.py b/IPython/terminal/pt_inputhooks/asyncio.py
index 2d8c128208e..d2499e11e68 100644
--- a/IPython/terminal/pt_inputhooks/asyncio.py
+++ b/IPython/terminal/pt_inputhooks/asyncio.py
@@ -31,8 +31,7 @@
 
 from IPython.core.async_helpers import get_asyncio_loop
 
-PTK3 = ptk_version.startswith('3.')
-
+PTK3 = ptk_version.startswith("3.")
 
 
 def inputhook(context):
diff --git a/IPython/terminal/pt_inputhooks/gtk.py b/IPython/terminal/pt_inputhooks/gtk.py
index 6e246ba8377..5c201b65d75 100644
--- a/IPython/terminal/pt_inputhooks/gtk.py
+++ b/IPython/terminal/pt_inputhooks/gtk.py
@@ -41,6 +41,7 @@
 # Enable threading in GTK. (Otherwise, GTK will keep the GIL.)
 gtk.gdk.threads_init()
 
+
 def inputhook(context):
     """
     When the eventloop of prompt-toolkit is idle, call this inputhook.
@@ -50,6 +51,7 @@ def inputhook(context):
 
     :param context: An `InputHookContext` instance.
     """
+
     def _main_quit(*a, **kw):
         gtk.main_quit()
         return False
diff --git a/IPython/terminal/pt_inputhooks/gtk3.py b/IPython/terminal/pt_inputhooks/gtk3.py
index ae82b4edaaa..b073bd94d99 100644
--- a/IPython/terminal/pt_inputhooks/gtk3.py
+++ b/IPython/terminal/pt_inputhooks/gtk3.py
@@ -3,10 +3,12 @@
 
 from gi.repository import Gtk, GLib
 
+
 def _main_quit(*args, **kwargs):
     Gtk.main_quit()
     return False
 
+
 def inputhook(context):
     GLib.io_add_watch(context.fileno(), GLib.PRIORITY_DEFAULT, GLib.IO_IN, _main_quit)
     Gtk.main()
diff --git a/IPython/testing/plugin/simplevars.py b/IPython/testing/plugin/simplevars.py
index cac0b753124..82a5edb028d 100644
--- a/IPython/testing/plugin/simplevars.py
+++ b/IPython/testing/plugin/simplevars.py
@@ -1,2 +1,2 @@
 x = 1
-print('x is:',x)
+print("x is:", x)
diff --git a/IPython/utils/_sysinfo.py b/IPython/utils/_sysinfo.py
index a80b0295e85..2e58242d561 100644
--- a/IPython/utils/_sysinfo.py
+++ b/IPython/utils/_sysinfo.py
@@ -1,2 +1,2 @@
 # GENERATED BY setup.py
-commit = u""
+commit = ""
diff --git a/IPython/utils/tests/test_dir2.py b/IPython/utils/tests/test_dir2.py
index d35b110e413..bf7f5e57ea2 100644
--- a/IPython/utils/tests/test_dir2.py
+++ b/IPython/utils/tests/test_dir2.py
@@ -19,7 +19,6 @@ def test_base():
 
 
 def test_SubClass():
-
     class SubClass(Base):
         y = 2
 
@@ -53,7 +52,7 @@ def some_method(self):
 
     class SillierWithDir(MisbehavingGetattr):
         def __dir__(self):
-            return ['some_method']
+            return ["some_method"]
 
     for bad_klass in (MisbehavingGetattr, SillierWithDir):
         obj = bad_klass()
diff --git a/setupbase.py b/setupbase.py
index 5db235cd7de..748b4dd6a8a 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -346,7 +346,7 @@ def _record_commit(self, base_dir):
                 out_file.writelines(
                     [
                         "# GENERATED BY setup.py\n",
-                        'commit = u"%s"\n' % repo_commit,
+                        'commit = "%s"\n' % repo_commit,
                     ]
                 )
 

From 5a72e3dbb24aa81c4a5062ac3b078a59a4e6f682 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Tue, 4 Oct 2022 12:41:10 -0700
Subject: [PATCH 1269/1407] Stop monkeypatching `linecache`

It turns out this has never been necessary if we just change the cache
entry to forbid expiry in the first place.
---
 IPython/core/compilerop.py       | 55 ++++++++++++++++----------------
 IPython/core/interactiveshell.py |  3 +-
 IPython/core/ultratb.py          |  6 ++--
 3 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/IPython/core/compilerop.py b/IPython/core/compilerop.py
index b43e570b3ad..e3d77b16d5c 100644
--- a/IPython/core/compilerop.py
+++ b/IPython/core/compilerop.py
@@ -73,25 +73,6 @@ class CachingCompiler(codeop.Compile):
     def __init__(self):
         codeop.Compile.__init__(self)
 
-        # This is ugly, but it must be done this way to allow multiple
-        # simultaneous ipython instances to coexist.  Since Python itself
-        # directly accesses the data structures in the linecache module, and
-        # the cache therein is global, we must work with that data structure.
-        # We must hold a reference to the original checkcache routine and call
-        # that in our own check_cache() below, but the special IPython cache
-        # must also be shared by all IPython instances.  If we were to hold
-        # separate caches (one in each CachingCompiler instance), any call made
-        # by Python itself to linecache.checkcache() would obliterate the
-        # cached data from the other IPython instances.
-        if not hasattr(linecache, '_ipython_cache'):
-            linecache._ipython_cache = {}
-        if not hasattr(linecache, '_checkcache_ori'):
-            linecache._checkcache_ori = linecache.checkcache
-        # Now, we must monkeypatch the linecache directly so that parts of the
-        # stdlib that call it outside our control go through our codepath
-        # (otherwise we'd lose our tracebacks).
-        linecache.checkcache = check_linecache_ipython
-
         # Caching a dictionary { filename: execution_count } for nicely
         # rendered tracebacks. The filename corresponds to the filename
         # argument used for the builtins.compile function.
@@ -161,14 +142,24 @@ def cache(self, transformed_code, number=0, raw_code=None):
         # Save the execution count
         self._filename_map[name] = number
 
+        # Since Python 2.5, setting mtime to `None` means the lines will
+        # never be removed by `linecache.checkcache`.  This means all the
+        # monkeypatching has *never* been necessary, since this code was
+        # only added in 2010, at which point IPython had already stopped
+        # supporting Python 2.4.
+        #
+        # Note that `linecache.clearcache` and `linecache.updatecache` may
+        # still remove our code from the cache, but those show explicit
+        # intent, and we should not try to interfere.  Normally the former
+        # is never called except when out of memory, and the latter is only
+        # called for lines *not* in the cache.
         entry = (
             len(transformed_code),
-            time.time(),
+            None,
             [line + "\n" for line in transformed_code.splitlines()],
             name,
         )
         linecache.cache[name] = entry
-        linecache._ipython_cache[name] = entry
         return name
 
     @contextmanager
@@ -187,10 +178,20 @@ def extra_flags(self, flags):
 
 
 def check_linecache_ipython(*args):
-    """Call linecache.checkcache() safely protecting our cached values.
+    """Deprecated since IPython 8.6.  Call linecache.checkcache() directly.
+
+    It was already not necessary to call this function directly.  If no
+    CachingCompiler had been created, this function would fail badly.  If
+    an instance had been created, this function would've been monkeypatched
+    into place.
+
+    As of IPython 8.6, the monkeypatching has gone away entirely.  But there
+    were still internal callers of this function, so maybe external callers
+    also existed?
     """
-    # First call the original checkcache as intended
-    linecache._checkcache_ori(*args)
-    # Then, update back the cache with our data, so that tracebacks related
-    # to our compiled codes can be produced.
-    linecache.cache.update(linecache._ipython_cache)
+    import warnings
+    warnings.warn(
+        'Just call linecache.checkcache() directly.',
+        DeprecationWarning
+    )
+    linecache.checkcache()
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 6d04846081a..c4eecff1fa6 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -61,7 +61,7 @@
 from IPython.core.alias import Alias, AliasManager
 from IPython.core.autocall import ExitAutocall
 from IPython.core.builtin_trap import BuiltinTrap
-from IPython.core.compilerop import CachingCompiler, check_linecache_ipython
+from IPython.core.compilerop import CachingCompiler
 from IPython.core.debugger import InterruptiblePdb
 from IPython.core.display_trap import DisplayTrap
 from IPython.core.displayhook import DisplayHook
@@ -1810,7 +1810,6 @@ def init_traceback_handlers(self, custom_exceptions):
         self.InteractiveTB = ultratb.AutoFormattedTB(mode = 'Plain',
                                                      color_scheme='NoColor',
                                                      tb_offset = 1,
-                                   check_cache=check_linecache_ipython,
                                    debugger_cls=self.debugger_cls, parent=self)
 
         # The instance will store a pointer to the system-wide exception hook,
diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 8f40c63b758..e83e2b4a0c1 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -644,10 +644,8 @@ def __init__(
         self.long_header = long_header
         self.include_vars = include_vars
         # By default we use linecache.checkcache, but the user can provide a
-        # different check_cache implementation.  This is used by the IPython
-        # kernel to provide tracebacks for interactive code that is cached,
-        # by a compiler instance that flushes the linecache but preserves its
-        # own code cache.
+        # different check_cache implementation.  This was formerly used by the
+        # IPython kernel for interactive code, but is no longer necessary.
         if check_cache is None:
             check_cache = linecache.checkcache
         self.check_cache = check_cache

From f712cf87436be380992485fc520663c425857c49 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 29 Oct 2022 12:32:21 +0200
Subject: [PATCH 1270/1407] please formatter

---
 IPython/core/compilerop.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/IPython/core/compilerop.py b/IPython/core/compilerop.py
index e3d77b16d5c..bffac9c86d5 100644
--- a/IPython/core/compilerop.py
+++ b/IPython/core/compilerop.py
@@ -190,8 +190,6 @@ def check_linecache_ipython(*args):
     also existed?
     """
     import warnings
-    warnings.warn(
-        'Just call linecache.checkcache() directly.',
-        DeprecationWarning
-    )
+
+    warnings.warn("Just call linecache.checkcache() directly.", DeprecationWarning)
     linecache.checkcache()

From 516c43d451962bf0d25d5454657c0a57ebb5bea8 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 29 Oct 2022 12:33:58 +0200
Subject: [PATCH 1271/1407] add some infor in warning

---
 IPython/core/compilerop.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IPython/core/compilerop.py b/IPython/core/compilerop.py
index bffac9c86d5..228f705666f 100644
--- a/IPython/core/compilerop.py
+++ b/IPython/core/compilerop.py
@@ -191,5 +191,9 @@ def check_linecache_ipython(*args):
     """
     import warnings
 
-    warnings.warn("Just call linecache.checkcache() directly.", DeprecationWarning)
+    warnings.warn(
+        "Deprecated Since IPython 8.6, Just call linecache.checkcache() directly.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
     linecache.checkcache()

From 93265fc972971fea195643c5391baa3e97f49857 Mon Sep 17 00:00:00 2001
From: Alex Ford <a.sewall.ford@gmail.com>
Date: Sun, 3 Apr 2022 19:15:43 -0700
Subject: [PATCH 1272/1407] display.Javascriptr should use `rel` in CSS link.

Seeing errors when using `display.Javascript` with `css` parameters.
The target css does not load in current chrome, due to the use of:

`<link ref="stylesheet" ...>`

rather than:

`<link rel="stylesheet" ...>`

in the display call.
---
 IPython/core/display.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index a095f3cb5e0..bf5504481f6 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -626,7 +626,7 @@ def _repr_json_(self):
         return self._data_and_metadata()
 
 _css_t = """var link = document.createElement("link");
-	link.ref = "stylesheet";
+	link.rel = "stylesheet";
 	link.type = "text/css";
 	link.href = "%s";
 	document.head.appendChild(link);

From 3fe68e1cb312a8aec1f4189220b017f60c6d45f7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 29 Oct 2022 03:30:54 -0700
Subject: [PATCH 1273/1407] Update IPython/core/display.py

---
 IPython/core/display.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index bf5504481f6..23d8636b507 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -625,6 +625,7 @@ def _data_and_metadata(self):
     def _repr_json_(self):
         return self._data_and_metadata()
 
+
 _css_t = """var link = document.createElement("link");
 	link.rel = "stylesheet";
 	link.type = "text/css";

From 6a90b3afa67416a79d036a11880da4d33aad8e30 Mon Sep 17 00:00:00 2001
From: Osher De Paz <osherdepaz@gmail.com>
Date: Sat, 1 Oct 2022 11:46:26 +0300
Subject: [PATCH 1274/1407] raise an error when user tries to open a standard
 stream

Fixes #13718
---
 IPython/core/interactiveshell.py            |  9 +++++++++
 IPython/core/tests/test_interactiveshell.py | 15 +++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 6d04846081a..e9cc89a0881 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1255,6 +1255,15 @@ def prepare_user_module(self, user_module=None, user_ns=None):
         if user_ns is None:
             user_ns = user_module.__dict__
 
+        @functools.wraps(io_open)
+        def modified_open(file, *args, **kwargs):
+            if file in {0, 1, 2}:
+                raise ValueError(f"IPython won't let you open fd={file} by default")
+
+            return io_open(file, *args, **kwargs)
+
+        user_ns["open"] = modified_open
+
         return user_module, user_ns
 
     def init_sys_modules(self):
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 10827b5fa0f..b5efe98b85b 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -103,6 +103,21 @@ def test_syntax_error(self):
         res = ip.run_cell("raise = 3")
         self.assertIsInstance(res.error_before_exec, SyntaxError)
 
+    def test_open_standard_input_stream(self):
+        ip.init_create_namespaces()
+        res = ip.run_cell("open(0)")
+        self.assertIsInstance(res.error_in_exec, ValueError)
+
+    def test_open_standard_output_stream(self):
+        ip.init_create_namespaces()
+        res = ip.run_cell("open(1)")
+        self.assertIsInstance(res.error_in_exec, ValueError)
+
+    def test_open_standard_error_stream(self):
+        ip.init_create_namespaces()
+        res = ip.run_cell("open(2)")
+        self.assertIsInstance(res.error_in_exec, ValueError)
+
     def test_In_variable(self):
         "Verify that In variable grows with user input (GH-284)"
         oldlen = len(ip.user_ns['In'])

From 467f4a49105b74a1e55a2ab070f947b7b82fbecb Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 19 Oct 2022 06:37:22 -0700
Subject: [PATCH 1275/1407] Update IPython/core/interactiveshell.py

---
 IPython/core/interactiveshell.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index e9cc89a0881..c6950453bf7 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1258,7 +1258,10 @@ def prepare_user_module(self, user_module=None, user_ns=None):
         @functools.wraps(io_open)
         def modified_open(file, *args, **kwargs):
             if file in {0, 1, 2}:
-                raise ValueError(f"IPython won't let you open fd={file} by default")
+                raise ValueError(f"IPython won't let you open fd={file} by default "
+                "as it is likely to crash IPython. If you know what you are doing, "
+                "you can use builtins' open."
+                )
 
             return io_open(file, *args, **kwargs)
 

From fac46998ce833b79138c26d839d06dfcf73e3d99 Mon Sep 17 00:00:00 2001
From: zhizheng1 <114848324+zhizheng1@users.noreply.github.com>
Date: Sat, 8 Oct 2022 09:52:34 +0800
Subject: [PATCH 1276/1407] Update pylabtools.py

---
 IPython/core/pylabtools.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index 68e100f7d07..7c452182992 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -26,6 +26,7 @@
     "qt": "Qt5Agg",
     "osx": "MacOSX",
     "nbagg": "nbAgg",
+    "webagg": "WebAgg",
     "notebook": "nbAgg",
     "agg": "agg",
     "svg": "svg",

From 054fd6835659e6f3142f65eba5ac3bb4f95f3085 Mon Sep 17 00:00:00 2001
From: zhizheng1 <114848324+zhizheng1@users.noreply.github.com>
Date: Sat, 8 Oct 2022 09:55:05 +0800
Subject: [PATCH 1277/1407] Update interactiveshell.py

---
 IPython/terminal/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index cf2ab42776e..50bc41cb8ad 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -711,7 +711,7 @@ def inputhook(self, context):
 
     active_eventloop = None
     def enable_gui(self, gui=None):
-        if gui and (gui != 'inline') :
+        if gui and (gui not in ['inline', 'webagg']) :
             self.active_eventloop, self._inputhook =\
                 get_inputhook_name_and_func(gui)
         else:

From 293ec35c126251e876e1a32bd04c55f9dcbf06d3 Mon Sep 17 00:00:00 2001
From: zhizheng1 <114848324+zhizheng1@users.noreply.github.com>
Date: Thu, 27 Oct 2022 17:59:54 +0800
Subject: [PATCH 1278/1407] Cosmetic fix.

---
 IPython/terminal/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 50bc41cb8ad..0250184dff0 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -711,7 +711,7 @@ def inputhook(self, context):
 
     active_eventloop = None
     def enable_gui(self, gui=None):
-        if gui and (gui not in ['inline', 'webagg']) :
+        if gui and (gui not in {'inline', 'webagg'}) :
             self.active_eventloop, self._inputhook =\
                 get_inputhook_name_and_func(gui)
         else:

From 17ac9ea417bd1c308af4f01691159a83efa376a4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 29 Oct 2022 12:28:12 +0200
Subject: [PATCH 1279/1407] please formatter

---
 IPython/core/display.py          | 1 +
 IPython/core/interactiveshell.py | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index a095f3cb5e0..25b340fc8eb 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -625,6 +625,7 @@ def _data_and_metadata(self):
     def _repr_json_(self):
         return self._data_and_metadata()
 
+
 _css_t = """var link = document.createElement("link");
 	link.ref = "stylesheet";
 	link.type = "text/css";
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index c6950453bf7..54e5d547beb 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1258,9 +1258,10 @@ def prepare_user_module(self, user_module=None, user_ns=None):
         @functools.wraps(io_open)
         def modified_open(file, *args, **kwargs):
             if file in {0, 1, 2}:
-                raise ValueError(f"IPython won't let you open fd={file} by default "
-                "as it is likely to crash IPython. If you know what you are doing, "
-                "you can use builtins' open."
+                raise ValueError(
+                    f"IPython won't let you open fd={file} by default "
+                    "as it is likely to crash IPython. If you know what you are doing, "
+                    "you can use builtins' open."
                 )
 
             return io_open(file, *args, **kwargs)

From 5ab1ecc6ba59be4c774544670822c6894e0caf21 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 29 Oct 2022 13:45:22 +0200
Subject: [PATCH 1280/1407] please formatter

---
 IPython/terminal/interactiveshell.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 0250184dff0..c867b553f2e 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -711,9 +711,8 @@ def inputhook(self, context):
 
     active_eventloop = None
     def enable_gui(self, gui=None):
-        if gui and (gui not in {'inline', 'webagg'}) :
-            self.active_eventloop, self._inputhook =\
-                get_inputhook_name_and_func(gui)
+        if gui and (gui not in {"inline", "webagg"}):
+            self.active_eventloop, self._inputhook = get_inputhook_name_and_func(gui)
         else:
             self.active_eventloop = self._inputhook = None
 

From f44e27095fd647cc22bf37874f183ec4db85949f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 29 Oct 2022 14:40:25 +0200
Subject: [PATCH 1281/1407] Refactor a bit of uniformity.

Not-reiniting user_ns may also help fix issues on windows.
---
 IPython/core/interactiveshell.py            | 24 ++++++++++-----------
 IPython/core/tests/test_interactiveshell.py |  3 ---
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 54e5d547beb..214493b324c 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -270,6 +270,16 @@ def __repr__(self):
         return '<%s object at %x, execution_count=%s error_before_exec=%s error_in_exec=%s info=%s result=%s>' %\
                 (name, id(self), self.execution_count, self.error_before_exec, self.error_in_exec, repr(self.info), repr(self.result))
 
+@functools.wraps(io_open)
+def _modified_open(file, *args, **kwargs):
+    if file in {0, 1, 2}:
+        raise ValueError(
+            f"IPython won't let you open fd={file} by default "
+            "as it is likely to crash IPython. If you know what you are doing, "
+            "you can use builtins' open."
+        )
+
+    return io_open(file, *args, **kwargs)
 
 class InteractiveShell(SingletonConfigurable):
     """An enhanced, interactive shell for Python."""
@@ -1255,19 +1265,6 @@ def prepare_user_module(self, user_module=None, user_ns=None):
         if user_ns is None:
             user_ns = user_module.__dict__
 
-        @functools.wraps(io_open)
-        def modified_open(file, *args, **kwargs):
-            if file in {0, 1, 2}:
-                raise ValueError(
-                    f"IPython won't let you open fd={file} by default "
-                    "as it is likely to crash IPython. If you know what you are doing, "
-                    "you can use builtins' open."
-                )
-
-            return io_open(file, *args, **kwargs)
-
-        user_ns["open"] = modified_open
-
         return user_module, user_ns
 
     def init_sys_modules(self):
@@ -1336,6 +1333,7 @@ def init_user_ns(self):
 
         ns['exit'] = self.exiter
         ns['quit'] = self.exiter
+        ns["open"] = _modified_open
 
         # Sync what we've added so far to user_ns_hidden so these aren't seen
         # by %who
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index b5efe98b85b..982bd5a3b22 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -104,17 +104,14 @@ def test_syntax_error(self):
         self.assertIsInstance(res.error_before_exec, SyntaxError)
 
     def test_open_standard_input_stream(self):
-        ip.init_create_namespaces()
         res = ip.run_cell("open(0)")
         self.assertIsInstance(res.error_in_exec, ValueError)
 
     def test_open_standard_output_stream(self):
-        ip.init_create_namespaces()
         res = ip.run_cell("open(1)")
         self.assertIsInstance(res.error_in_exec, ValueError)
 
     def test_open_standard_error_stream(self):
-        ip.init_create_namespaces()
         res = ip.run_cell("open(2)")
         self.assertIsInstance(res.error_in_exec, ValueError)
 

From 8ca7b420a29ad781cc6c701dd4a6af0dd21b35c4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 30 Oct 2022 09:10:13 +0100
Subject: [PATCH 1282/1407] fix stack-data 0.6 failing tests

---
 IPython/core/tests/test_iplib.py | 129 ++++++++++++++++++++-----------
 1 file changed, 85 insertions(+), 44 deletions(-)

diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index f12601823d1..dec429fbe35 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -1,15 +1,10 @@
 """Tests for the key interactiveshell module, where the main ipython class is defined.
 """
-#-----------------------------------------------------------------------------
-# Module imports
-#-----------------------------------------------------------------------------
 
+import stack_data
 
-# our own packages
+SV_VERSION = tuple([int(x) for x in stack_data.__version__.split(".")[0:2]])
 
-#-----------------------------------------------------------------------------
-# Test functions
-#-----------------------------------------------------------------------------
 
 def test_reset():
     """reset must clear most namespaces."""
@@ -170,46 +165,92 @@ def doctest_tb_sysexit():
     """
 
 
-def doctest_tb_sysexit_verbose():
-    """
-    In [18]: %run simpleerr.py exit
-    An exception has occurred, use %tb to see the full traceback.
-    SystemExit: (1, 'Mode = exit')
+if SV_VERSION < (0, 6):
 
-    In [19]: %run simpleerr.py exit 2
-    An exception has occurred, use %tb to see the full traceback.
-    SystemExit: (2, 'Mode = exit')
+    def doctest_tb_sysexit_verbose_stack_data_05():
+        """
+        In [18]: %run simpleerr.py exit
+        An exception has occurred, use %tb to see the full traceback.
+        SystemExit: (1, 'Mode = exit')
+
+        In [19]: %run simpleerr.py exit 2
+        An exception has occurred, use %tb to see the full traceback.
+        SystemExit: (2, 'Mode = exit')
+
+        In [23]: %xmode verbose
+        Exception reporting mode: Verbose
+
+        In [24]: %tb
+        ---------------------------------------------------------------------------
+        SystemExit                                Traceback (most recent call last)
+        <BLANKLINE>
+        ...
+            30     except IndexError:
+            31         mode = 'div'
+        ---> 33     bar(mode)
+                mode = 'exit'
+        <BLANKLINE>
+        ... in bar(mode='exit')
+            ...     except:
+            ...         stat = 1
+        ---> ...     sysexit(stat, mode)
+                mode = 'exit'
+                stat = 2
+            ...     else:
+            ...         raise ValueError('Unknown mode')
+        <BLANKLINE>
+        ... in sysexit(stat=2, mode='exit')
+            10 def sysexit(stat, mode):
+        ---> 11     raise SystemExit(stat, f"Mode = {mode}")
+                stat = 2
+        <BLANKLINE>
+        SystemExit: (2, 'Mode = exit')
+        """
 
-    In [23]: %xmode verbose
-    Exception reporting mode: Verbose
-
-    In [24]: %tb
-    ---------------------------------------------------------------------------
-    SystemExit                                Traceback (most recent call last)
-    <BLANKLINE>
-    ...
-         30     except IndexError:
-         31         mode = 'div'
-    ---> 33     bar(mode)
-            mode = 'exit'
-    <BLANKLINE>
-    ... in bar(mode='exit')
-         ...     except:
-         ...         stat = 1
-    ---> ...     sysexit(stat, mode)
-            mode = 'exit'
-            stat = 2
-         ...     else:
-         ...         raise ValueError('Unknown mode')
-    <BLANKLINE>
-    ... in sysexit(stat=2, mode='exit')
-         10 def sysexit(stat, mode):
-    ---> 11     raise SystemExit(stat, f"Mode = {mode}")
-            stat = 2
-    <BLANKLINE>
-    SystemExit: (2, 'Mode = exit')
-    """
+else:
+    # currently the only difference is
+    # + mode = 'exit'
 
+    def doctest_tb_sysexit_verbose_stack_data_06():
+        """
+        In [18]: %run simpleerr.py exit
+        An exception has occurred, use %tb to see the full traceback.
+        SystemExit: (1, 'Mode = exit')
+
+        In [19]: %run simpleerr.py exit 2
+        An exception has occurred, use %tb to see the full traceback.
+        SystemExit: (2, 'Mode = exit')
+
+        In [23]: %xmode verbose
+        Exception reporting mode: Verbose
+
+        In [24]: %tb
+        ---------------------------------------------------------------------------
+        SystemExit                                Traceback (most recent call last)
+        <BLANKLINE>
+        ...
+            30     except IndexError:
+            31         mode = 'div'
+        ---> 33     bar(mode)
+                mode = 'exit'
+        <BLANKLINE>
+        ... in bar(mode='exit')
+            ...     except:
+            ...         stat = 1
+        ---> ...     sysexit(stat, mode)
+                mode = 'exit'
+                stat = 2
+            ...     else:
+            ...         raise ValueError('Unknown mode')
+        <BLANKLINE>
+        ... in sysexit(stat=2, mode='exit')
+            10 def sysexit(stat, mode):
+        ---> 11     raise SystemExit(stat, f"Mode = {mode}")
+                stat = 2
+                mode = 'exit'
+        <BLANKLINE>
+        SystemExit: (2, 'Mode = exit')
+        """
 
 def test_run_cell():
     import textwrap

From fcdcddd5e528844672688e07bfa5188e48e37521 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 30 Oct 2022 09:20:57 +0100
Subject: [PATCH 1283/1407] iterate

---
 IPython/core/tests/test_iplib.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index dec429fbe35..8fdf2675ba1 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -229,22 +229,22 @@ def doctest_tb_sysexit_verbose_stack_data_06():
         SystemExit                                Traceback (most recent call last)
         <BLANKLINE>
         ...
-            30     except IndexError:
-            31         mode = 'div'
+             30     except IndexError:
+             31         mode = 'div'
         ---> 33     bar(mode)
                 mode = 'exit'
         <BLANKLINE>
         ... in bar(mode='exit')
-            ...     except:
-            ...         stat = 1
+             ...     except:
+             ...         stat = 1
         ---> ...     sysexit(stat, mode)
                 mode = 'exit'
                 stat = 2
-            ...     else:
-            ...         raise ValueError('Unknown mode')
+             ...     else:
+             ...         raise ValueError('Unknown mode')
         <BLANKLINE>
         ... in sysexit(stat=2, mode='exit')
-            10 def sysexit(stat, mode):
+             10 def sysexit(stat, mode):
         ---> 11     raise SystemExit(stat, f"Mode = {mode}")
                 stat = 2
                 mode = 'exit'

From 98e3599e130e253f292679f74982a3a2cd3a7a7a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 30 Oct 2022 09:27:22 +0100
Subject: [PATCH 1284/1407] exclude 3.8

import sys
---
 IPython/core/tests/test_iplib.py | 174 ++++++++++++++++---------------
 1 file changed, 88 insertions(+), 86 deletions(-)

diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index 8fdf2675ba1..c5e065005f0 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -2,6 +2,7 @@
 """
 
 import stack_data
+import sys
 
 SV_VERSION = tuple([int(x) for x in stack_data.__version__.split(".")[0:2]])
 
@@ -165,92 +166,93 @@ def doctest_tb_sysexit():
     """
 
 
-if SV_VERSION < (0, 6):
-
-    def doctest_tb_sysexit_verbose_stack_data_05():
-        """
-        In [18]: %run simpleerr.py exit
-        An exception has occurred, use %tb to see the full traceback.
-        SystemExit: (1, 'Mode = exit')
-
-        In [19]: %run simpleerr.py exit 2
-        An exception has occurred, use %tb to see the full traceback.
-        SystemExit: (2, 'Mode = exit')
-
-        In [23]: %xmode verbose
-        Exception reporting mode: Verbose
-
-        In [24]: %tb
-        ---------------------------------------------------------------------------
-        SystemExit                                Traceback (most recent call last)
-        <BLANKLINE>
-        ...
-            30     except IndexError:
-            31         mode = 'div'
-        ---> 33     bar(mode)
-                mode = 'exit'
-        <BLANKLINE>
-        ... in bar(mode='exit')
-            ...     except:
-            ...         stat = 1
-        ---> ...     sysexit(stat, mode)
-                mode = 'exit'
-                stat = 2
-            ...     else:
-            ...         raise ValueError('Unknown mode')
-        <BLANKLINE>
-        ... in sysexit(stat=2, mode='exit')
-            10 def sysexit(stat, mode):
-        ---> 11     raise SystemExit(stat, f"Mode = {mode}")
-                stat = 2
-        <BLANKLINE>
-        SystemExit: (2, 'Mode = exit')
-        """
-
-else:
-    # currently the only difference is
-    # + mode = 'exit'
-
-    def doctest_tb_sysexit_verbose_stack_data_06():
-        """
-        In [18]: %run simpleerr.py exit
-        An exception has occurred, use %tb to see the full traceback.
-        SystemExit: (1, 'Mode = exit')
-
-        In [19]: %run simpleerr.py exit 2
-        An exception has occurred, use %tb to see the full traceback.
-        SystemExit: (2, 'Mode = exit')
-
-        In [23]: %xmode verbose
-        Exception reporting mode: Verbose
-
-        In [24]: %tb
-        ---------------------------------------------------------------------------
-        SystemExit                                Traceback (most recent call last)
-        <BLANKLINE>
-        ...
-             30     except IndexError:
-             31         mode = 'div'
-        ---> 33     bar(mode)
-                mode = 'exit'
-        <BLANKLINE>
-        ... in bar(mode='exit')
-             ...     except:
-             ...         stat = 1
-        ---> ...     sysexit(stat, mode)
-                mode = 'exit'
-                stat = 2
-             ...     else:
-             ...         raise ValueError('Unknown mode')
-        <BLANKLINE>
-        ... in sysexit(stat=2, mode='exit')
-             10 def sysexit(stat, mode):
-        ---> 11     raise SystemExit(stat, f"Mode = {mode}")
-                stat = 2
-                mode = 'exit'
-        <BLANKLINE>
-        SystemExit: (2, 'Mode = exit')
-        """
+if sys.version_info >= (3, 9):
+    if SV_VERSION < (0, 6):
+
+        def doctest_tb_sysexit_verbose_stack_data_05():
+            """
+            In [18]: %run simpleerr.py exit
+            An exception has occurred, use %tb to see the full traceback.
+            SystemExit: (1, 'Mode = exit')
+
+            In [19]: %run simpleerr.py exit 2
+            An exception has occurred, use %tb to see the full traceback.
+            SystemExit: (2, 'Mode = exit')
+
+            In [23]: %xmode verbose
+            Exception reporting mode: Verbose
+
+            In [24]: %tb
+            ---------------------------------------------------------------------------
+            SystemExit                                Traceback (most recent call last)
+            <BLANKLINE>
+            ...
+                30     except IndexError:
+                31         mode = 'div'
+            ---> 33     bar(mode)
+                    mode = 'exit'
+            <BLANKLINE>
+            ... in bar(mode='exit')
+                ...     except:
+                ...         stat = 1
+            ---> ...     sysexit(stat, mode)
+                    mode = 'exit'
+                    stat = 2
+                ...     else:
+                ...         raise ValueError('Unknown mode')
+            <BLANKLINE>
+            ... in sysexit(stat=2, mode='exit')
+                10 def sysexit(stat, mode):
+            ---> 11     raise SystemExit(stat, f"Mode = {mode}")
+                    stat = 2
+            <BLANKLINE>
+            SystemExit: (2, 'Mode = exit')
+            """
+
+    else:
+        # currently the only difference is
+        # + mode = 'exit'
+
+        def doctest_tb_sysexit_verbose_stack_data_06():
+            """
+            In [18]: %run simpleerr.py exit
+            An exception has occurred, use %tb to see the full traceback.
+            SystemExit: (1, 'Mode = exit')
+
+            In [19]: %run simpleerr.py exit 2
+            An exception has occurred, use %tb to see the full traceback.
+            SystemExit: (2, 'Mode = exit')
+
+            In [23]: %xmode verbose
+            Exception reporting mode: Verbose
+
+            In [24]: %tb
+            ---------------------------------------------------------------------------
+            SystemExit                                Traceback (most recent call last)
+            <BLANKLINE>
+            ...
+                 30     except IndexError:
+                 31         mode = 'div'
+            ---> 33     bar(mode)
+                    mode = 'exit'
+            <BLANKLINE>
+            ... in bar(mode='exit')
+                 ...     except:
+                 ...         stat = 1
+            ---> ...     sysexit(stat, mode)
+                    mode = 'exit'
+                    stat = 2
+                 ...     else:
+                 ...         raise ValueError('Unknown mode')
+            <BLANKLINE>
+            ... in sysexit(stat=2, mode='exit')
+                 10 def sysexit(stat, mode):
+            ---> 11     raise SystemExit(stat, f"Mode = {mode}")
+                    stat = 2
+                    mode = 'exit'
+            <BLANKLINE>
+            SystemExit: (2, 'Mode = exit')
+            """
 
 def test_run_cell():
     import textwrap

From 0e83a6373574e28b7b8b1211ff49edfbb0119a37 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 30 Oct 2022 08:35:15 +0100
Subject: [PATCH 1285/1407] What's new version 8.6

---
 docs/source/whatsnew/version8.rst | 64 +++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 59e71654faf..eee7af0aa48 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -2,6 +2,70 @@
  8.x Series
 ============
 
+.. _version 8.6.0:
+
+IPython 8.6.0
+-------------
+
+Back to a more regular release schedule (at least I try), as Friday is
+already over by more than 24h hours. This is a slightly bigger release with a
+few new features that contain no less then 25 PRs.
+
+We'll notably found a couple of non negligible changes:
+
+The ``install_ext`` and related functions have been removed after being
+deprecated for years. You can use pip to install extensions. ``pip`` did not
+exists when ``install_ext`` was introduced. You can still load local extensions
+without installing them. Just set your ``sys.path`` for example. :ghpull:`13744`
+
+IPython now have extra entry points that that the major *and minor* version of
+python. For some of you this mean that you can do a quick ``ipython3.10`` to
+launch IPython from the Python 3.10 interpreter, while still using Python 3.11
+as your main Python. :ghpull:`13743`
+
+The completer matcher API have been improved. See :ghpull:`13745`. This should
+improve the type inference and improve dict keys completions in many use case.
+Tanks ``@krassowski`` for all the works, and the D.E. Shaw group for sponsoring
+it.
+
+The color of error nodes in tracebacks can now be customized. See
+:ghpull:`13756`. This is a private attribute until someone find the time to
+properly add a configuration option. Note that with Python 3.11 that also show
+the relevant nodes in traceback, it would be good to leverage this informations
+(plus the "did you mean" info added on attribute errors). But that's likely work
+I won't have time to do before long, so contributions welcome.
+
+As we follow NEP 29, we removed support for numpy 1.19 :ghpull:`13760`.
+
+
+The ``open()`` function present in the user namespace by default will now refuse
+to open the file descriptors 0,1,2 (stdin, out, err), to avoid crashing IPython.
+This mostly occurs in teaching context when incorrect values get passed around. 
+
+
+The ``?``, ``??``, and corresponding ``pinfo``, ``pinfo2`` magics can now find
+objects insides arrays. That is to say, the following now works::
+
+
+   >>> def my_func(*arg, **kwargs):pass
+   >>> container = [my_func]
+   >>> container[0]?
+
+
+If ``container`` define a custom ``getitem``, this __will__ trigger the custom
+method. So don't put side effects in your ``getitems``. Thanks the D.E. Shaw
+group for the request and sponsoring the work.
+
+
+As usual you can find the full list of PRs on GitHub under `the 8.6 milestone
+<https://github.com/ipython/ipython/pulls?q=milestone%3A8.6>`__.
+
+Thanks to all hacktoberfest contributors, please contribute to
+`closember.org <https://closember.org/>`__.
+
+Thanks to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries.
+
 .. _version 8.5.0:
 
 IPython 8.5.0

From f8d0e4c79a6c3587e6355f1354fff265f73f4938 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 30 Oct 2022 10:30:09 +0100
Subject: [PATCH 1286/1407] release 8.6.0

---
 IPython/core/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index bd0ac2161e3..d8eeae46901 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,7 +20,7 @@
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-# _version_extra = ""  # Uncomment this for full releases
+_version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 8d2d355e76da23a696d429d9eb2e0a14ba778578 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 30 Oct 2022 10:32:00 +0100
Subject: [PATCH 1287/1407] back to dev

---
 IPython/core/release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index d8eeae46901..d891c34cc62 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -16,11 +16,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 8
-_version_minor = 6
+_version_minor = 7
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-_version_extra = ""  # Uncomment this for full releases
+# _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From a146297a8ec7e17bd8633c77bce0c19ebd56160a Mon Sep 17 00:00:00 2001
From: Jason Grout <jason@jasongrout.org>
Date: Wed, 9 Nov 2022 06:25:20 -0700
Subject: [PATCH 1288/1407] Lint formatting

---
 IPython/sphinxext/ipython_directive.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IPython/sphinxext/ipython_directive.py b/IPython/sphinxext/ipython_directive.py
index e55ba126c8a..c428e7917fd 100644
--- a/IPython/sphinxext/ipython_directive.py
+++ b/IPython/sphinxext/ipython_directive.py
@@ -981,8 +981,9 @@ def setup(self):
         self.shell.warning_is_error = warning_is_error
 
         # setup bookmark for saving figures directory
-        self.shell.process_input_line('bookmark ipy_savedir "%s"'%savefig_dir,
-                                      store_history=False)
+        self.shell.process_input_line(
+            'bookmark ipy_savedir "%s"' % savefig_dir, store_history=False
+        )
         self.shell.clear_cout()
 
         return rgxin, rgxout, promptin, promptout

From 724c9d70d5ae1d23d6121ba2e88fa987af1fd8c5 Mon Sep 17 00:00:00 2001
From: Jason Grout <jason@jasongrout.org>
Date: Wed, 9 Nov 2022 00:36:57 -0700
Subject: [PATCH 1289/1407] Fix mypy error by being more explicit and verbose

---
 IPython/core/magics/basic.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py
index af69b02676d..7dfa84ce2d5 100644
--- a/IPython/core/magics/basic.py
+++ b/IPython/core/magics/basic.py
@@ -297,7 +297,10 @@ def page(self, parameter_s=''):
         oname = args and args or '_'
         info = self.shell._ofind(oname)
         if info['found']:
-            txt = (raw and str or pformat)( info['obj'] )
+            if raw:
+                txt = str(info["obj"])
+            else:
+                txt = pformat(info["obj"])
             page.page(txt)
         else:
             print('Object `%s` not found' % oname)

From 03052c48c0a6b868d81f5f3678b218a079959f66 Mon Sep 17 00:00:00 2001
From: Bill Vineyard <71736216+wvineyard@users.noreply.github.com>
Date: Sat, 29 Oct 2022 11:21:17 -0500
Subject: [PATCH 1290/1407] removed duplicate .vscode in gitignore

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f4736530e10..3b6963b6317 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@ __pycache__
 .cache
 .coverage
 *.swp
-.vscode
 .pytest_cache
 .python-version
 venv*/

From 1c3678bf1debbc6abd19fe94f4c574b329f3c749 Mon Sep 17 00:00:00 2001
From: Jason Grout <jason@jasongrout.org>
Date: Tue, 8 Nov 2022 17:04:51 -0700
Subject: [PATCH 1291/1407] Make the formatting of a code block name extendable

Currently the user display of a code block requires a tight coupling between the caching compiler and the ultratb file, i.e., ultratb needs to know internal private variables of the caching compiler. This change makes the user-visible display of the code block name the responsibility of the caching compiler. A nice result is that the caching compiler can be overridden to have custom terminology in different systems for code blocks executed.
---
 IPython/core/compilerop.py | 15 +++++++++++++++
 IPython/core/ultratb.py    | 26 ++++++++++++++++----------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/IPython/core/compilerop.py b/IPython/core/compilerop.py
index 228f705666f..7799a4fc99e 100644
--- a/IPython/core/compilerop.py
+++ b/IPython/core/compilerop.py
@@ -116,6 +116,21 @@ def get_code_name(self, raw_code, transformed_code, number):
         """
         return code_name(transformed_code, number)
 
+    def format_code_name(self, name):
+        """Return a user-friendly label and name for a code block.
+
+        Parameters
+        ----------
+        name : str
+            The name for the code block returned from get_code_name
+
+        Returns
+        -------
+        A (label, name) pair that can be used in tracebacks, or None if the default formatting should be used.
+        """
+        if name in self._filename_map:
+            return "Cell", "In[%s]" % self._filename_map[name]
+
     def cache(self, transformed_code, number=0, raw_code=None):
         """Make a name for a block of code, and cache the code.
 
diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index e83e2b4a0c1..18eff270829 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -173,7 +173,7 @@ def _format_traceback_lines(lines, Colors, has_colors: bool, lvals):
 
 def _format_filename(file, ColorFilename, ColorNormal, *, lineno=None):
     """
-    Format filename lines with `In [n]` if it's the nth code cell or `File *.py` if it's a module.
+    Format filename lines with custom formatting from caching compiler or `File *.py` by default
 
     Parameters
     ----------
@@ -184,23 +184,29 @@ def _format_filename(file, ColorFilename, ColorNormal, *, lineno=None):
         ColorScheme's normal coloring to be used.
     """
     ipinst = get_ipython()
-
-    if ipinst is not None and file in ipinst.compile._filename_map:
-        file = "[%s]" % ipinst.compile._filename_map[file]
+    if (
+        ipinst is not None
+        and (data := ipinst.compile.format_code_name(file)) is not None
+    ):
+        label, name = data
         if lineno is None:
-            tpl_link = f"Cell {ColorFilename}In {{file}}{ColorNormal}"
+            tpl_link = f"{{label}} {ColorFilename}{{name}}{ColorNormal}"
         else:
-            tpl_link = f"Cell {ColorFilename}In {{file}}, line {{lineno}}{ColorNormal}"
+            tpl_link = (
+                f"{{label}} {ColorFilename}{{name}}, line {{lineno}}{ColorNormal}"
+            )
     else:
-        file = util_path.compress_user(
+        label = "File"
+        name = util_path.compress_user(
             py3compat.cast_unicode(file, util_path.fs_encoding)
         )
         if lineno is None:
-            tpl_link = f"File {ColorFilename}{{file}}{ColorNormal}"
+            tpl_link = f"{{label}} {ColorFilename}{{name}}{ColorNormal}"
         else:
-            tpl_link = f"File {ColorFilename}{{file}}:{{lineno}}{ColorNormal}"
+            # can we make this the more friendly ", line {{lineno}}", or do we need to preserve the formatting with the colon?
+            tpl_link = f"{{label}} {ColorFilename}{{name}}:{{lineno}}{ColorNormal}"
 
-    return tpl_link.format(file=file, lineno=lineno)
+    return tpl_link.format(label=label, name=name, lineno=lineno)
 
 #---------------------------------------------------------------------------
 # Module classes

From cd04814365c74d947b8ffc52bd21ea36a5f4fc8c Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Fri, 11 Nov 2022 20:18:03 +0000
Subject: [PATCH 1292/1407] Fix `merge_completions=False` error with Jedi

Jedi uses filter to return an iterator hence
we cannot just check `len()` to see if there
are any completions.
---
 IPython/core/completer.py            | 17 +++++++-
 IPython/core/tests/test_completer.py | 59 ++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index fc3aea7b611..25b780be3da 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -671,6 +671,19 @@ def __call__(self, context: CompletionContext) -> MatcherResult:
 Matcher: TypeAlias = Union[MatcherAPIv1, MatcherAPIv2]
 
 
+def has_any_completions(result: MatcherResult) -> bool:
+    """Check if any result includes any completions."""
+    if hasattr(result["completions"], "__len__"):
+        return len(result["completions"]) != 0
+    try:
+        old_iterator = result["completions"]
+        first = next(old_iterator)
+        result["completions"] = itertools.chain([first], old_iterator)
+        return True
+    except StopIteration:
+        return False
+
+
 def completion_matcher(
     *, priority: float = None, identifier: str = None, api_version: int = 1
 ):
@@ -1952,7 +1965,7 @@ def _jedi_matches(
             else:
                 return []
 
-    def python_matches(self, text:str)->List[str]:
+    def python_matches(self, text: str) -> Iterable[str]:
         """Match attributes or global python names"""
         if "." in text:
             try:
@@ -2807,7 +2820,7 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
                 should_suppress = (
                     (suppression_config is True)
                     or (suppression_recommended and (suppression_config is not False))
-                ) and len(result["completions"])
+                ) and has_any_completions(result)
 
                 if should_suppress:
                     suppression_exceptions = result.get("do_not_suppress", set())
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index fd72cf7d57a..98ec814a769 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -1396,6 +1396,65 @@ def configure(suppression_config):
             configure({"b_matcher": True})
             _("do not suppress", ["completion_b"])
 
+            configure(True)
+            _("do not suppress", ["completion_a"])
+
+    def test_matcher_suppression_with_iterator(self):
+        @completion_matcher(identifier="matcher_returning_iterator")
+        def matcher_returning_iterator(text):
+            return iter(["completion_iter"])
+
+        @completion_matcher(identifier="matcher_returning_list")
+        def matcher_returning_list(text):
+            return ["completion_list"]
+
+        with custom_matchers([matcher_returning_iterator, matcher_returning_list]):
+            ip = get_ipython()
+            c = ip.Completer
+
+            def _(text, expected):
+                c.use_jedi = False
+                s, matches = c.complete(text)
+                self.assertEqual(expected, matches)
+
+            def configure(suppression_config):
+                cfg = Config()
+                cfg.IPCompleter.suppress_competing_matchers = suppression_config
+                c.update_config(cfg)
+
+            configure(False)
+            _("---", ["completion_iter", "completion_list"])
+
+            configure(True)
+            _("---", ["completion_iter"])
+
+            configure(None)
+            _("--", ["completion_iter", "completion_list"])
+
+    def test_matcher_suppression_with_jedi(self):
+        ip = get_ipython()
+        c = ip.Completer
+        c.use_jedi = True
+
+        def configure(suppression_config):
+            cfg = Config()
+            cfg.IPCompleter.suppress_competing_matchers = suppression_config
+            c.update_config(cfg)
+
+        def _():
+            with provisionalcompleter():
+                matches = [completion.text for completion in c.completions("dict.", 5)]
+                self.assertIn("keys", matches)
+
+        configure(False)
+        _()
+
+        configure(True)
+        _()
+
+        configure(None)
+        _()
+
     def test_matcher_disabling(self):
         @completion_matcher(identifier="a_matcher")
         def a_matcher(text):

From c5994eee0ff57d26cde7f7e14de0c92ae9520f25 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sat, 12 Nov 2022 22:16:01 +0000
Subject: [PATCH 1293/1407] Explain expected format for
 `disable_matchers`/identifiers

---
 IPython/core/completer.py     | 13 ++++++++++---
 IPython/core/magics/config.py |  2 ++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index fc3aea7b611..645f8b806e5 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -684,7 +684,10 @@ def completion_matcher(
     identifier : Optional[str]
         identifier of the matcher allowing users to modify the behaviour via traitlets,
         and also used to for debugging (will be passed as ``origin`` with the completions).
-        Defaults to matcher function ``__qualname__``.
+
+        Defaults to matcher function's ``__qualname__`` (for example,
+        ``IPCompleter.file_matcher`` for the built-in matched defined
+        as a ``file_matcher`` method of the ``IPCompleter`` class).
     api_version: Optional[int]
         version of the Matcher API used by this matcher.
         Currently supported values are 1 and 2.
@@ -1447,14 +1450,18 @@ def _greedy_changed(self, change):
 
         If False, only the completion results from the first non-empty
         completer will be returned.
-        
+
         As of version 8.6.0, setting the value to ``False`` is an alias for:
         ``IPCompleter.suppress_competing_matchers = True.``.
         """,
     ).tag(config=True)
 
     disable_matchers = ListTrait(
-        Unicode(), help="""List of matchers to disable."""
+        Unicode(),
+        help="""List of matchers to disable.
+
+        The list should contain matcher identifiers (see :any:`completion_matcher`).
+        """,
     ).tag(config=True)
 
     omit__names = Enum(
diff --git a/IPython/core/magics/config.py b/IPython/core/magics/config.py
index f442ba15259..87fe3eed3a5 100644
--- a/IPython/core/magics/config.py
+++ b/IPython/core/magics/config.py
@@ -82,6 +82,8 @@ def config(self, s):
                 Current: False
             IPCompleter.disable_matchers=<list-item-1>...
                 List of matchers to disable.
+                        The list should contain matcher identifiers (see
+                :any:`completion_matcher`).
                 Current: []
             IPCompleter.greedy=<Bool>
                 Activate greedy completion

From 2c55f54336afc3bae882220e483e3dbacb9248f1 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 15 Nov 2022 11:31:53 +0100
Subject: [PATCH 1294/1407] MAINT:add py.typed

---
 IPython/py.typed | 0
 MANIFEST.in      | 1 +
 2 files changed, 1 insertion(+)
 create mode 100644 IPython/py.typed

diff --git a/IPython/py.typed b/IPython/py.typed
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/MANIFEST.in b/MANIFEST.in
index c70c57d346f..970adeef334 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include LICENSE
 include setupbase.py
 include MANIFEST.in
 include pytest.ini
+include py.typed
 include mypy.ini
 include .mailmap
 include .flake8

From cfb05c7ae1e0576d89ea75ccd6d0ba5ff863d8ba Mon Sep 17 00:00:00 2001
From: Hristo Georgiev <hristo.a.georgiev@gmail.com>
Date: Fri, 18 Nov 2022 15:31:42 +0200
Subject: [PATCH 1295/1407] Pin minimum prompt-toolkit to 3.0.11

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index b3a26586cf3..18af28885e4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,7 +37,7 @@ install_requires =
     matplotlib-inline
     pexpect>4.3; sys_platform != "win32"
     pickleshare
-    prompt_toolkit>3.0.1,<3.1.0
+    prompt_toolkit>=3.0.11,<3.1.0
     pygments>=2.4.0
     stack_data
     traitlets>=5

From bd008c4c8ac27f5f6779841c294074bb89f2ad4f Mon Sep 17 00:00:00 2001
From: nfgf <nfgferreira@gmail.com>
Date: Fri, 25 Nov 2022 00:44:21 -0500
Subject: [PATCH 1296/1407] 1st proposal

---
 IPython/core/interactiveshell.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 21e428b54d4..689ddfe30d7 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2362,6 +2362,14 @@ def run_line_magic(self, magic_name: str, line, _stack_depth=1):
                 kwargs['local_ns'] = self.get_local_scope(stack_depth)
             with self.builtin_trap:
                 result = fn(*args, **kwargs)
+
+            # The code below prevents output from being displayed
+            # when using magic %time.
+            # Output from '%time foo();', for instance, would never
+            # be displayed.
+            if magic_name == 'time' and len(magic_arg_s) > 0 and magic_arg_s[-1] == ';':
+                return None
+
             return result
 
     def get_local_scope(self, stack_depth):

From d0be67275d918e187de37943854f9db8e2ecec40 Mon Sep 17 00:00:00 2001
From: Nir Schulman <narsssx@gmail.com>
Date: Fri, 25 Nov 2022 14:56:58 +0200
Subject: [PATCH 1297/1407] Reused the previously unused find_entry_points in
 setup.py

---
 setup.cfg | 3 ---
 setup.py  | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index b3a26586cf3..5c7554a28fd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -106,9 +106,6 @@ IPython.lib.tests = *.wav
 IPython.testing.plugin = *.txt
 
 [options.entry_points]
-console_scripts =
-    ipython = IPython:start_ipython
-    ipython3 = IPython:start_ipython
 pygments.lexers =
     ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer
     ipython = IPython.lib.lexers:IPythonLexer
diff --git a/setup.py b/setup.py
index bfdf5fb88bf..dca0cd3b3aa 100644
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@
 # Our own imports
 sys.path.insert(0, ".")
 
-from setupbase import target_update
+from setupbase import target_update, find_entry_points
 
 from setupbase import (
     setup_args,
@@ -139,6 +139,9 @@
     'install_scripts_sym': install_scripts_for_symlink,
     'unsymlink': unsymlink,
 }
+setup_args["entry_points"] = {
+    "console_scripts": find_entry_points()
+}
 
 #---------------------------------------------------------------------------
 # Do the actual setup now

From cfa39c55f44e0f117856cf64ea1ff895392d8f82 Mon Sep 17 00:00:00 2001
From: Nir Schulman <narsssx@gmail.com>
Date: Fri, 25 Nov 2022 17:35:07 +0200
Subject: [PATCH 1298/1407] Fixed formatting

---
 setup.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index dca0cd3b3aa..4939ca53836 100644
--- a/setup.py
+++ b/setup.py
@@ -139,9 +139,7 @@
     'install_scripts_sym': install_scripts_for_symlink,
     'unsymlink': unsymlink,
 }
-setup_args["entry_points"] = {
-    "console_scripts": find_entry_points()
-}
+setup_args["entry_points"] = {"console_scripts": find_entry_points()}
 
 #---------------------------------------------------------------------------
 # Do the actual setup now

From f4081a6ff29cce329ec1da25599ba06c4fafe67e Mon Sep 17 00:00:00 2001
From: nfgf <nfgferreira@gmail.com>
Date: Fri, 25 Nov 2022 10:52:05 -0500
Subject: [PATCH 1299/1407] Formatting fixes after running dark.

---
 IPython/core/interactiveshell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 689ddfe30d7..c8aacdc22cf 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2367,7 +2367,7 @@ def run_line_magic(self, magic_name: str, line, _stack_depth=1):
             # when using magic %time.
             # Output from '%time foo();', for instance, would never
             # be displayed.
-            if magic_name == 'time' and len(magic_arg_s) > 0 and magic_arg_s[-1] == ';':
+            if magic_name == "time" and len(magic_arg_s) > 0 and magic_arg_s[-1] == ";":
                 return None
 
             return result

From b6e1073c7f9f8e5cc20b4349b607f6324f7b7d06 Mon Sep 17 00:00:00 2001
From: nfgf <nfgferreira@gmail.com>
Date: Sat, 26 Nov 2022 14:54:01 -0500
Subject: [PATCH 1300/1407] Adding test.

---
 IPython/core/tests/test_magic.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 509dd66dd28..ce0fbbea684 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -416,6 +416,21 @@ def test_time():
         with tt.AssertPrints("hihi", suppress=False):
             ip.run_cell("f('hi')")
 
+# ';' at the end of %time prevents instruction value to be printed.
+# This tests fix for #13837 
+def test_time_no_outputwith_semicolon():
+    ip = get_ipython()
+
+    with tt.AssertPrints(" 123456"):
+        with tt.AssertPrints("Wall time: ", suppress=False):
+            with tt.AssertPrints("CPU times: ", suppress=False):
+                ip.run_cell("%time 123000+456")
+
+    with tt.AssertNotPrints(" 123456"):
+        with tt.AssertPrints("Wall time: ", suppress=False):
+            with tt.AssertPrints("CPU times: ", suppress=False):
+                ip.run_cell("%time 123000+456;")
+
 def test_time_last_not_expression():
     ip.run_cell("%%time\n"
                 "var_1 = 1\n"

From 31f22916c1fd38d6570df4c64539d2a2f1e976b5 Mon Sep 17 00:00:00 2001
From: nfgf <nfgferreira@gmail.com>
Date: Sat, 26 Nov 2022 15:07:55 -0500
Subject: [PATCH 1301/1407] Change after running darker.

---
 IPython/core/tests/test_magic.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index ce0fbbea684..9c44320740a 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -416,6 +416,7 @@ def test_time():
         with tt.AssertPrints("hihi", suppress=False):
             ip.run_cell("f('hi')")
 
+
 # ';' at the end of %time prevents instruction value to be printed.
 # This tests fix for #13837 
 def test_time_no_outputwith_semicolon():
@@ -431,6 +432,7 @@ def test_time_no_outputwith_semicolon():
             with tt.AssertPrints("CPU times: ", suppress=False):
                 ip.run_cell("%time 123000+456;")
 
+
 def test_time_last_not_expression():
     ip.run_cell("%%time\n"
                 "var_1 = 1\n"

From a07a31dc85da8ee493f1718728ae39bf50bc8ea9 Mon Sep 17 00:00:00 2001
From: nfgf <nfgferreira@gmail.com>
Date: Sat, 26 Nov 2022 15:21:41 -0500
Subject: [PATCH 1302/1407] Again

---
 IPython/core/tests/test_magic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 9c44320740a..cb9890c4682 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -418,7 +418,7 @@ def test_time():
 
 
 # ';' at the end of %time prevents instruction value to be printed.
-# This tests fix for #13837 
+# This tests fix for #13837.
 def test_time_no_outputwith_semicolon():
     ip = get_ipython()
 

From 12d1fb6d179b4d1a40bc6b8ce0adfd3ac536fd6e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 28 Nov 2022 10:06:35 +0100
Subject: [PATCH 1303/1407] What's new 8.7

---
 docs/source/whatsnew/version8.rst | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index eee7af0aa48..d3c33704bad 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -2,6 +2,32 @@
  8.x Series
 ============
 
+
+.. _version 8.7.0:
+
+IPython 8.7.0
+-------------
+
+
+Small release of IPython with a couple of bug fixes and new features for this
+month. Next month is end of year, it is unclear if there will be a release close
+the new year's eve, or if the next release will be at end of January.
+
+Here are a few of the relevant fixes,
+as usual you can find the full list of PRs on GitHub under `the 8.7 milestone
+<https://github.com/ipython/ipython/pulls?q=milestone%3A8.7>`__.
+
+
+   - :ghpull:`13834` bump the minimum prompt toolkit to 3.0.11.
+   - IPython shipped with the ``py.typed`` marker now, and we are progressively
+     adding more types. :ghpull:`13831`
+   - :ghpull:`13817` add configuration of code blacks formatting.
+
+
+Thanks to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries.
+
+
 .. _version 8.6.0:
 
 IPython 8.6.0
@@ -40,7 +66,7 @@ As we follow NEP 29, we removed support for numpy 1.19 :ghpull:`13760`.
 
 The ``open()`` function present in the user namespace by default will now refuse
 to open the file descriptors 0,1,2 (stdin, out, err), to avoid crashing IPython.
-This mostly occurs in teaching context when incorrect values get passed around. 
+This mostly occurs in teaching context when incorrect values get passed around.
 
 
 The ``?``, ``??``, and corresponding ``pinfo``, ``pinfo2`` magics can now find

From ff770b25d03140e6f9355625601d609d4a5464e8 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 28 Nov 2022 14:50:12 +0100
Subject: [PATCH 1304/1407] release 8.7.0

---
 IPython/core/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index d891c34cc62..ff1acafac66 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,7 +20,7 @@
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-# _version_extra = ""  # Uncomment this for full releases
+_version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 3f0bf05f072a91b2a3042d23ce250e5e906183fd Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 28 Nov 2022 14:51:08 +0100
Subject: [PATCH 1305/1407] back to dev

---
 IPython/core/release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index ff1acafac66..e2ce2eac2b4 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -16,11 +16,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 8
-_version_minor = 7
+_version_minor = 8
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-_version_extra = ""  # Uncomment this for full releases
+# _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 81300ca6de7e50ea521073dbf49cc5eb4a276d66 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 28 Nov 2022 14:57:08 +0100
Subject: [PATCH 1306/1407] Make sure build is installed

---
 tools/release_helper.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 697ed859e84..d221f551e66 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -8,6 +8,7 @@ python -c 'import twine'
 python -c 'import sphinx'
 python -c 'import sphinx_rtd_theme'
 python -c 'import pytest'
+python -c 'import build'
 
 
 BLACK=$(tput setaf 1)

From bd3807ac61ffb208e146bde78726e676e4092512 Mon Sep 17 00:00:00 2001
From: nfgf <nfgferreira@gmail.com>
Date: Tue, 29 Nov 2022 17:59:33 -0500
Subject: [PATCH 1307/1407] Implementing decorator

---
 IPython/core/displayhook.py      |  8 +++++++-
 IPython/core/interactiveshell.py | 12 ++++++------
 IPython/core/magic.py            | 11 ++++++++++-
 IPython/core/magics/execution.py |  2 ++
 IPython/core/tests/test_magic.py | 17 ++++++++++++++++-
 5 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/IPython/core/displayhook.py b/IPython/core/displayhook.py
index 578e783ab8e..25aa2f03274 100644
--- a/IPython/core/displayhook.py
+++ b/IPython/core/displayhook.py
@@ -91,7 +91,13 @@ def quiet(self):
             # some uses of ipshellembed may fail here
             return False
         
-        sio = _io.StringIO(cell)
+        return self.semicolon_at_end_of_expression(cell)
+        
+    @staticmethod
+    def semicolon_at_end_of_expression(expression):
+        """Parse Python expression and detects whether last token is ';'"""
+
+        sio = _io.StringIO(expression)
         tokens = list(tokenize.generate_tokens(sio.readline))
 
         for token in reversed(tokens):
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index c8aacdc22cf..69b441816a4 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2363,12 +2363,12 @@ def run_line_magic(self, magic_name: str, line, _stack_depth=1):
             with self.builtin_trap:
                 result = fn(*args, **kwargs)
 
-            # The code below prevents output from being displayed
-            # when using magic %time.
-            # Output from '%time foo();', for instance, would never
-            # be displayed.
-            if magic_name == "time" and len(magic_arg_s) > 0 and magic_arg_s[-1] == ";":
-                return None
+            # The code below prevents the output from being displayed
+            # when using magics with decodator @output_can_be_disabled
+            # when the last Python token in the expression is a ';'.
+            if getattr(fn, magic.MAGIC_OUTPUT_CAN_BE_DISABLED, False):
+                if DisplayHook.semicolon_at_end_of_expression(magic_arg_s):
+                    return None
 
             return result
 
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index cedba619378..0eadc179762 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -258,7 +258,7 @@ def mark(func, *a, **kw):
 
 
 MAGIC_NO_VAR_EXPAND_ATTR = '_ipython_magic_no_var_expand'
-
+MAGIC_OUTPUT_CAN_BE_DISABLED = '_ipython_magic_output_can_be_disabled'
 
 def no_var_expand(magic_func):
     """Mark a magic function as not needing variable expansion
@@ -275,6 +275,15 @@ def no_var_expand(magic_func):
     setattr(magic_func, MAGIC_NO_VAR_EXPAND_ATTR, True)
     return magic_func
 
+def output_can_be_disabled(magic_func):
+    """Mark a magic function so its output may be disabled.
+
+    The output is disabled if the Python expression used as a parameter of
+    the magic ends in a semicolon, not counting a Python comment that can
+    follows it.
+    """
+    setattr(magic_func, MAGIC_OUTPUT_CAN_BE_DISABLED, True)
+    return magic_func
 
 # Create the actual decorators for public use
 
diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index da7f780b9cb..5d7942f6472 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -37,6 +37,7 @@
     magics_class,
     needs_local_scope,
     no_var_expand,
+    output_can_be_disabled,
     on_off,
 )
 from IPython.testing.skipdoctest import skip_doctest
@@ -1194,6 +1195,7 @@ def timeit(self, line='', cell=None, local_ns=None):
     @no_var_expand
     @needs_local_scope
     @line_cell_magic
+    @output_can_be_disabled
     def time(self,line='', cell=None, local_ns=None):
         """Time execution of a Python statement or expression.
 
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index cb9890c4682..55408d4af1e 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -419,7 +419,7 @@ def test_time():
 
 # ';' at the end of %time prevents instruction value to be printed.
 # This tests fix for #13837.
-def test_time_no_outputwith_semicolon():
+def test_time_no_output_with_semicolon():
     ip = get_ipython()
 
     with tt.AssertPrints(" 123456"):
@@ -432,6 +432,21 @@ def test_time_no_outputwith_semicolon():
             with tt.AssertPrints("CPU times: ", suppress=False):
                 ip.run_cell("%time 123000+456;")
 
+    with tt.AssertPrints(" 123456"):
+        with tt.AssertPrints("Wall time: ", suppress=False):
+            with tt.AssertPrints("CPU times: ", suppress=False):
+                ip.run_cell("%time 123000+456 # Comment")
+
+    with tt.AssertNotPrints(" 123456"):
+        with tt.AssertPrints("Wall time: ", suppress=False):
+            with tt.AssertPrints("CPU times: ", suppress=False):
+                ip.run_cell("%time 123000+456; # Comment")
+
+    with tt.AssertPrints(" 123456"):
+        with tt.AssertPrints("Wall time: ", suppress=False):
+            with tt.AssertPrints("CPU times: ", suppress=False):
+                ip.run_cell("%time 123000+456 # ;Comment")
+
 
 def test_time_last_not_expression():
     ip.run_cell("%%time\n"

From a2de719356f944389f23a9e90747a9853d5a6e64 Mon Sep 17 00:00:00 2001
From: nfgf <nfgferreira@gmail.com>
Date: Tue, 29 Nov 2022 18:07:19 -0500
Subject: [PATCH 1308/1407] Formatting to make darker happy.

---
 IPython/core/magic.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 0eadc179762..2381bf96dac 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -275,6 +275,7 @@ def no_var_expand(magic_func):
     setattr(magic_func, MAGIC_NO_VAR_EXPAND_ATTR, True)
     return magic_func
 
+
 def output_can_be_disabled(magic_func):
     """Mark a magic function so its output may be disabled.
 

From 33f18f7c11f178a5610ce620151a1abf1abc53fb Mon Sep 17 00:00:00 2001
From: nfgf <nfgferreira@gmail.com>
Date: Tue, 29 Nov 2022 18:16:15 -0500
Subject: [PATCH 1309/1407] Again

---
 IPython/core/magic.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 2381bf96dac..a5a55e6fbcf 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -260,6 +260,7 @@ def mark(func, *a, **kw):
 MAGIC_NO_VAR_EXPAND_ATTR = '_ipython_magic_no_var_expand'
 MAGIC_OUTPUT_CAN_BE_DISABLED = '_ipython_magic_output_can_be_disabled'
 
+
 def no_var_expand(magic_func):
     """Mark a magic function as not needing variable expansion
 

From 10a27e1d026040a5f0415b052aa5e0614bbece46 Mon Sep 17 00:00:00 2001
From: nfgf <nfgferreira@gmail.com>
Date: Tue, 29 Nov 2022 18:26:59 -0500
Subject: [PATCH 1310/1407] And again

---
 IPython/core/displayhook.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/displayhook.py b/IPython/core/displayhook.py
index 25aa2f03274..aba4f904d8d 100644
--- a/IPython/core/displayhook.py
+++ b/IPython/core/displayhook.py
@@ -92,7 +92,7 @@ def quiet(self):
             return False
         
         return self.semicolon_at_end_of_expression(cell)
-        
+
     @staticmethod
     def semicolon_at_end_of_expression(expression):
         """Parse Python expression and detects whether last token is ';'"""

From a9f3943371cd8fd9e028f4e04d3bee0d43fc5dbe Mon Sep 17 00:00:00 2001
From: nfgf <nfgferreira@gmail.com>
Date: Tue, 29 Nov 2022 18:35:18 -0500
Subject: [PATCH 1311/1407] sigh

---
 IPython/core/magic.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index a5a55e6fbcf..82728cdebd1 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -257,8 +257,8 @@ def mark(func, *a, **kw):
     return magic_deco
 
 
-MAGIC_NO_VAR_EXPAND_ATTR = '_ipython_magic_no_var_expand'
-MAGIC_OUTPUT_CAN_BE_DISABLED = '_ipython_magic_output_can_be_disabled'
+MAGIC_NO_VAR_EXPAND_ATTR = "_ipython_magic_no_var_expand"
+MAGIC_OUTPUT_CAN_BE_DISABLED = "_ipython_magic_output_can_be_disabled"
 
 
 def no_var_expand(magic_func):

From 4b0aed94df9573566e87941eec4e23bd58727097 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Wed, 30 Nov 2022 02:23:01 +0000
Subject: [PATCH 1312/1407] Implement guarded evaluation, replace greedy,
 implement:

- completion of integer keys
- completion in pandas for loc indexer `.loc[:, <tab>`
---
 IPython/core/completer.py               | 243 +++++++----
 IPython/core/guarded_eval.py            | 541 ++++++++++++++++++++++++
 IPython/core/tests/test_completer.py    |  56 ++-
 IPython/core/tests/test_guarded_eval.py | 286 +++++++++++++
 4 files changed, 1027 insertions(+), 99 deletions(-)
 create mode 100644 IPython/core/guarded_eval.py
 create mode 100644 IPython/core/tests/test_guarded_eval.py

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 2dff9efbbfe..a497f12f01c 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -190,6 +190,7 @@
 import unicodedata
 import uuid
 import warnings
+from ast import literal_eval
 from contextlib import contextmanager
 from dataclasses import dataclass
 from functools import cached_property, partial
@@ -212,6 +213,7 @@
     Literal,
 )
 
+from IPython.core.guarded_eval import guarded_eval, EvaluationContext
 from IPython.core.error import TryNext
 from IPython.core.inputtransformer2 import ESC_MAGIC
 from IPython.core.latex_symbols import latex_symbols, reverse_latex_symbol
@@ -296,6 +298,9 @@ def cast(obj, type_):
 # Completion type reported when no type can be inferred.
 _UNKNOWN_TYPE = "<unknown>"
 
+# sentinel value to signal lack of a match
+not_found = object()
+
 class ProvisionalCompleterWarning(FutureWarning):
     """
     Exception raise by an experimental feature in this module.
@@ -902,12 +907,33 @@ def split_line(self, line, cursor_pos=None):
 
 class Completer(Configurable):
 
-    greedy = Bool(False,
-        help="""Activate greedy completion
-        PENDING DEPRECATION. this is now mostly taken care of with Jedi.
+    greedy = Bool(
+        False,
+        help="""Activate greedy completion.
+
+        .. deprecated:: 8.8
+            Use :any:`evaluation` instead.
+
+        As of IPython 8.8 proxy for ``evaluation = 'unsafe'`` when set to ``True``,
+        and for ``'forbidden'`` when set to ``False``.
+        """,
+    ).tag(config=True)
 
-        This will enable completion on elements of lists, results of function calls, etc.,
-        but can be unsafe because the code is actually evaluated on TAB.
+    evaluation = Enum(
+        ('forbidden', 'minimal', 'limitted', 'unsafe', 'dangerous'),
+        default_value='limitted',
+        help="""Code evaluation under completion.
+
+        Successive options allow to enable more eager evaluation for more accurate completion suggestions,
+        including for nested dictionaries, nested lists, or even results of function calls. Setting `unsafe`
+        or higher can lead to evaluation of arbitrary user code on TAB with potentially dangerous side effects.
+
+        Allowed values are:
+          - `forbidden`: no evaluation at all
+          - `minimal`:  evaluation of literals and access to built-in namespaces; no item/attribute evaluation nor access to locals/globals
+          - `limitted` (default): access to all namespaces, evaluation of hard-coded methods (``keys()``, ``__getattr__``, ``__getitems__``, etc) on allow-listed objects (e.g. ``dict``, ``list``, ``tuple``, ``pandas.Series``)
+          - `unsafe`: evaluation of all methods and function calls but not of syntax with side-effects like `del x`,
+          - `dangerous`: completely arbitrary evaluation
         """,
     ).tag(config=True)
 
@@ -1029,28 +1055,16 @@ def attr_matches(self, text):
         with a __getattr__ hook is evaluated.
 
         """
+        m2 = re.match(r"(.+)\.(\w*)$", self.line_buffer)
+        if not m2:
+            return []
+        expr, attr = m2.group(1,2)
 
-        # Another option, seems to work great. Catches things like ''.<tab>
-        m = re.match(r"(\S+(\.\w+)*)\.(\w*)$", text)
+        obj = self._evaluate_expr(expr)
 
-        if m:
-            expr, attr = m.group(1, 3)
-        elif self.greedy:
-            m2 = re.match(r"(.+)\.(\w*)$", self.line_buffer)
-            if not m2:
-                return []
-            expr, attr = m2.group(1,2)
-        else:
+        if obj is not_found:
             return []
 
-        try:
-            obj = eval(expr, self.namespace)
-        except:
-            try:
-                obj = eval(expr, self.global_namespace)
-            except:
-                return []
-
         if self.limit_to__all__ and hasattr(obj, '__all__'):
             words = get__all__entries(obj)
         else:
@@ -1068,9 +1082,33 @@ def attr_matches(self, text):
             pass
         # Build match list to return
         n = len(attr)
-        return [u"%s.%s" % (expr, w) for w in words if w[:n] == attr ]
+        return ["%s.%s" % (expr, w) for w in words if w[:n] == attr ]
 
 
+    def _evaluate_expr(self, expr):
+        obj = not_found
+        done = False
+        while not done and expr:
+            try:
+                obj = guarded_eval(
+                    expr,
+                    EvaluationContext(
+                        globals_=self.global_namespace,
+                        locals_=self.namespace,
+                        evaluation=self.evaluation
+                    )
+                )
+                done = True
+            except Exception as e:
+                if self.debug:
+                    print('Evaluation exception', e)
+                # trim the expression to remove any invalid prefix
+                # e.g. user starts `(d[`, so we get `expr = '(d'`,
+                # where parenthesis is not closed.
+                # TODO: make this faster by reusing parts of the computation?
+                expr = expr[1:]
+        return obj
+
 def get__all__entries(obj):
     """returns the strings in the __all__ attribute"""
     try:
@@ -1081,8 +1119,8 @@ def get__all__entries(obj):
     return [w for w in words if isinstance(w, str)]
 
 
-def match_dict_keys(keys: List[Union[str, bytes, Tuple[Union[str, bytes]]]], prefix: str, delims: str,
-                    extra_prefix: Optional[Tuple[str, bytes]]=None) -> Tuple[str, int, List[str]]:
+def match_dict_keys(keys: List[Union[str, bytes, Tuple[Union[str, bytes], ...]]], prefix: str, delims: str,
+                    extra_prefix: Optional[Tuple[Union[str, bytes], ...]]=None) -> Tuple[str, int, List[str]]:
     """Used by dict_key_matches, matching the prefix to a list of keys
 
     Parameters
@@ -1106,25 +1144,28 @@ def match_dict_keys(keys: List[Union[str, bytes, Tuple[Union[str, bytes]]]], pre
 
     """
     prefix_tuple = extra_prefix if extra_prefix else ()
+
     Nprefix = len(prefix_tuple)
+    text_serializable_types = (str, bytes, int, float, slice)
     def filter_prefix_tuple(key):
         # Reject too short keys
         if len(key) <= Nprefix:
             return False
-        # Reject keys with non str/bytes in it
+        # Reject keys which cannot be serialised to text
         for k in key:
-            if not isinstance(k, (str, bytes)):
+            if not isinstance(k, text_serializable_types):
                 return False
         # Reject keys that do not match the prefix
         for k, pt in zip(key, prefix_tuple):
-            if k != pt:
+            if k != pt and not isinstance(pt, slice):
                 return False
         # All checks passed!
         return True
 
-    filtered_keys:List[Union[str,bytes]] = []
+    filtered_keys: List[Union[str, bytes, int, float, slice]] = []
+
     def _add_to_filtered_keys(key):
-        if isinstance(key, (str, bytes)):
+        if isinstance(key, text_serializable_types):
             filtered_keys.append(key)
 
     for k in keys:
@@ -1140,7 +1181,7 @@ def _add_to_filtered_keys(key):
     assert quote_match is not None # silence mypy
     quote = quote_match.group()
     try:
-        prefix_str = eval(prefix + quote, {})
+        prefix_str = literal_eval(prefix + quote)
     except Exception:
         return '', 0, []
 
@@ -1150,17 +1191,18 @@ def _add_to_filtered_keys(key):
     token_start = token_match.start()
     token_prefix = token_match.group()
 
-    matched:List[str] = []
+    matched: List[str] = []
     for key in filtered_keys:
+        str_key = key if isinstance(key, (str, bytes)) else str(key)
         try:
-            if not key.startswith(prefix_str):
+            if not str_key.startswith(prefix_str):
                 continue
         except (AttributeError, TypeError, UnicodeError):
             # Python 3+ TypeError on b'a'.startswith('a') or vice-versa
             continue
 
         # reformat remainder of key to begin with prefix
-        rem = key[len(prefix_str):]
+        rem = str_key[len(prefix_str):]
         # force repr wrapped in '
         rem_repr = repr(rem + '"') if isinstance(rem, str) else repr(rem + b'"')
         rem_repr = rem_repr[1 + rem_repr.index("'"):-2]
@@ -1237,11 +1279,14 @@ def position_to_cursor(text:str, offset:int)->Tuple[int, int]:
     return line, col
 
 
-def _safe_isinstance(obj, module, class_name):
+def _safe_isinstance(obj, module, class_name, *attrs):
     """Checks if obj is an instance of module.class_name if loaded
     """
-    return (module in sys.modules and
-            isinstance(obj, getattr(import_module(module), class_name)))
+    if module in sys.modules:
+        m = sys.modules[module]
+        for attr in [class_name, *attrs]:
+            m = getattr(m, attr)
+        return isinstance(obj, m)
 
 
 @context_matcher()
@@ -1394,6 +1439,37 @@ def _make_signature(completion)-> str:
 _CompleteResult = Dict[str, MatcherResult]
 
 
+DICT_MATCHER_REGEX = re.compile(r"""(?x)
+(  # match dict-referring - or any get item object - expression
+    .+
+)
+\[   # open bracket
+\s*  # and optional whitespace
+# Capture any number of serializable objects (e.g. "a", "b", 'c')
+# and slices
+((?:[uUbB]?  # string prefix (r not handled)
+    (?:
+        '(?:[^']|(?<!\\)\\')*'
+    |
+        "(?:[^"]|(?<!\\)\\")*"
+    |
+        # capture integers and slices
+        (?:[-+]?\d+)?(?::(?:[-+]?\d+)?){0,2}
+    )
+    \s*,\s*
+)*)
+([uUbB]?  # string prefix (r not handled)
+    (?:   # unclosed string
+        '(?:[^']|(?<!\\)\\')*
+    |
+        "(?:[^"]|(?<!\\)\\")*
+    |
+        (?:[-+]?\d+)
+    )
+)?
+$
+""")
+
 def _convert_matcher_v1_result_to_v2(
     matches: Sequence[str],
     type: str,
@@ -1413,21 +1489,21 @@ def _convert_matcher_v1_result_to_v2(
 class IPCompleter(Completer):
     """Extension of the completer class with IPython-specific features"""
 
-    __dict_key_regexps: Optional[Dict[bool,Pattern]] = None
-
     @observe('greedy')
     def _greedy_changed(self, change):
         """update the splitter and readline delims when greedy is changed"""
         if change['new']:
+            self.evaluation = 'unsafe'
             self.splitter.delims = GREEDY_DELIMS
         else:
+            self.evaluation = 'limitted'
             self.splitter.delims = DELIMS
 
     dict_keys_only = Bool(
         False,
         help="""
         Whether to show dict key matches only.
-        
+
         (disables all matchers except for `IPCompleter.dict_key_matcher`).
         """,
     )
@@ -2149,12 +2225,17 @@ def _get_keys(obj: Any) -> List[Any]:
             return method()
 
         # Special case some common in-memory dict-like types
-        if isinstance(obj, dict) or\
-           _safe_isinstance(obj, 'pandas', 'DataFrame'):
+        if (isinstance(obj, dict) or
+           _safe_isinstance(obj, 'pandas', 'DataFrame')):
             try:
                 return list(obj.keys())
             except Exception:
                 return []
+        elif _safe_isinstance(obj, 'pandas', 'core', 'indexing', '_LocIndexer'):
+            try:
+                return list(obj.obj.keys())
+            except Exception:
+                return []
         elif _safe_isinstance(obj, 'numpy', 'ndarray') or\
              _safe_isinstance(obj, 'numpy', 'void'):
             return obj.dtype.names or []
@@ -2175,65 +2256,43 @@ def dict_key_matches(self, text: str) -> List[str]:
             You can use :meth:`dict_key_matcher` instead.
         """
 
-        if self.__dict_key_regexps is not None:
-            regexps = self.__dict_key_regexps
-        else:
-            dict_key_re_fmt = r'''(?x)
-            (  # match dict-referring expression wrt greedy setting
-                %s
-            )
-            \[   # open bracket
-            \s*  # and optional whitespace
-            # Capture any number of str-like objects (e.g. "a", "b", 'c')
-            ((?:[uUbB]?  # string prefix (r not handled)
-                (?:
-                    '(?:[^']|(?<!\\)\\')*'
-                |
-                    "(?:[^"]|(?<!\\)\\")*"
-                )
-                \s*,\s*
-            )*)
-            ([uUbB]?  # string prefix (r not handled)
-                (?:   # unclosed string
-                    '(?:[^']|(?<!\\)\\')*
-                |
-                    "(?:[^"]|(?<!\\)\\")*
-                )
-            )?
-            $
-            '''
-            regexps = self.__dict_key_regexps = {
-                False: re.compile(dict_key_re_fmt % r'''
-                                  # identifiers separated by .
-                                  (?!\d)\w+
-                                  (?:\.(?!\d)\w+)*
-                                  '''),
-                True: re.compile(dict_key_re_fmt % '''
-                                 .+
-                                 ''')
-            }
+        # Short-circuit on closed dictionary (regular expression would
+        # not match anyway, but would take quite a while).
+        if self.text_until_cursor.strip().endswith(']'):
+            return []
 
-        match = regexps[self.greedy].search(self.text_until_cursor)
+        match = DICT_MATCHER_REGEX.search(self.text_until_cursor)
 
         if match is None:
             return []
 
-        expr, prefix0, prefix = match.groups()
-        try:
-            obj = eval(expr, self.namespace)
-        except Exception:
-            try:
-                obj = eval(expr, self.global_namespace)
-            except Exception:
-                return []
+        expr, prior_tuple_keys, key_prefix = match.groups()
+
+        obj = self._evaluate_expr(expr)
+
+        if obj is not_found:
+            return []
 
         keys = self._get_keys(obj)
         if not keys:
             return keys
 
-        extra_prefix = eval(prefix0) if prefix0 != '' else None
+        tuple_prefix = guarded_eval(
+            prior_tuple_keys,
+            EvaluationContext(
+                globals_=self.global_namespace,
+                locals_=self.namespace,
+                evaluation=self.evaluation,
+                in_subscript=True
+            )
+        )
 
-        closing_quote, token_offset, matches = match_dict_keys(keys, prefix, self.splitter.delims, extra_prefix=extra_prefix)
+        closing_quote, token_offset, matches = match_dict_keys(
+            keys,
+            key_prefix,
+            self.splitter.delims,
+            extra_prefix=tuple_prefix
+        )
         if not matches:
             return matches
 
@@ -2242,7 +2301,7 @@ def dict_key_matches(self, text: str) -> List[str]:
         # - the start of the key text
         # - the start of the completion
         text_start = len(self.text_until_cursor) - len(text)
-        if prefix:
+        if key_prefix:
             key_start = match.start(3)
             completion_start = key_start + token_offset
         else:
diff --git a/IPython/core/guarded_eval.py b/IPython/core/guarded_eval.py
new file mode 100644
index 00000000000..f477c6bc2c1
--- /dev/null
+++ b/IPython/core/guarded_eval.py
@@ -0,0 +1,541 @@
+from typing import Callable, Protocol, Set, Tuple, NamedTuple, Literal, Union
+import collections
+import sys
+import ast
+import types
+from functools import cached_property
+from dataclasses import dataclass, field
+
+
+class HasGetItem(Protocol):
+    def __getitem__(self, key) -> None: ...
+
+
+class InstancesHaveGetItem(Protocol):
+    def __call__(self) -> HasGetItem: ...
+
+
+class HasGetAttr(Protocol):
+    def __getattr__(self, key) -> None: ...
+
+
+class DoesNotHaveGetAttr(Protocol):
+    pass
+
+# By default `__getattr__` is not explicitly implemented on most objects
+MayHaveGetattr = Union[HasGetAttr, DoesNotHaveGetAttr]
+
+
+def unbind_method(func: Callable) -> Union[Callable, None]:
+    """Get unbound method for given bound method.
+
+    Returns None if cannot get unbound method."""
+    owner = getattr(func, '__self__', None)
+    owner_class = type(owner)
+    name = getattr(func, '__name__', None)
+    instance_dict_overrides = getattr(owner, '__dict__', None)
+    if (
+        owner is not None
+        and
+        name
+        and
+        (
+            not instance_dict_overrides
+            or
+            (
+                instance_dict_overrides
+                and name not in instance_dict_overrides
+            )
+        )
+    ):
+        return getattr(owner_class, name)
+
+
+@dataclass
+class EvaluationPolicy:
+    allow_locals_access: bool = False
+    allow_globals_access: bool = False
+    allow_item_access: bool = False
+    allow_attr_access: bool = False
+    allow_builtins_access: bool = False
+    allow_any_calls: bool = False
+    allowed_calls: Set[Callable] = field(default_factory=set)
+
+    def can_get_item(self, value, item):
+        return self.allow_item_access
+
+    def can_get_attr(self, value, attr):
+        return self.allow_attr_access
+
+    def can_call(self, func):
+        if self.allow_any_calls:
+            return True
+
+        if func in self.allowed_calls:
+            return True
+
+        owner_method = unbind_method(func)
+        if owner_method and owner_method in self.allowed_calls:
+            return True
+
+def has_original_dunder_external(value, module_name, access_path, method_name,):
+    try:
+        if module_name not in sys.modules:
+            return False
+        member_type = sys.modules[module_name]
+        for attr in access_path:
+            member_type = getattr(member_type, attr)
+        value_type = type(value)
+        if type(value) == member_type:
+            return True
+        if isinstance(value, member_type):
+            method = getattr(value_type, method_name, None)
+            member_method = getattr(member_type, method_name, None)
+            if member_method == method:
+                return True
+    except (AttributeError, KeyError):
+        return False
+
+
+def has_original_dunder(
+    value,
+    allowed_types,
+    allowed_methods,
+    allowed_external,
+    method_name
+):
+    # note: Python ignores `__getattr__`/`__getitem__` on instances,
+    # we only need to check at class level
+    value_type = type(value)
+
+    # strict type check passes → no need to check method
+    if value_type in allowed_types:
+        return True
+
+    method = getattr(value_type, method_name, None)
+
+    if not method:
+        return None
+
+    if method in allowed_methods:
+        return True
+
+    for module_name, *access_path in allowed_external:
+        if has_original_dunder_external(value, module_name, access_path, method_name):
+            return True
+
+    return False
+
+
+@dataclass
+class SelectivePolicy(EvaluationPolicy):
+    allowed_getitem: Set[HasGetItem] = field(default_factory=set)
+    allowed_getitem_external: Set[Tuple[str, ...]] = field(default_factory=set)
+    allowed_getattr: Set[MayHaveGetattr] = field(default_factory=set)
+    allowed_getattr_external: Set[Tuple[str, ...]] = field(default_factory=set)
+
+    def can_get_attr(self, value, attr):
+        has_original_attribute = has_original_dunder(
+            value,
+            allowed_types=self.allowed_getattr,
+            allowed_methods=self._getattribute_methods,
+            allowed_external=self.allowed_getattr_external,
+            method_name='__getattribute__'
+        )
+        has_original_attr = has_original_dunder(
+            value,
+            allowed_types=self.allowed_getattr,
+            allowed_methods=self._getattr_methods,
+            allowed_external=self.allowed_getattr_external,
+            method_name='__getattr__'
+        )
+        # Many objects do not have `__getattr__`, this is fine
+        if has_original_attr is None and has_original_attribute:
+            return True
+
+        # Accept objects without modifications to `__getattr__` and `__getattribute__`
+        return has_original_attr and has_original_attribute
+
+    def get_attr(self, value, attr):
+        if self.can_get_attr(value, attr):
+            return getattr(value, attr)
+
+
+    def can_get_item(self, value, item):
+        """Allow accessing `__getiitem__` of allow-listed instances unless it was not modified."""
+        return has_original_dunder(
+            value,
+            allowed_types=self.allowed_getitem,
+            allowed_methods=self._getitem_methods,
+            allowed_external=self.allowed_getitem_external,
+            method_name='__getitem__'
+        )
+
+    @cached_property
+    def _getitem_methods(self) -> Set[Callable]:
+        return self._safe_get_methods(
+            self.allowed_getitem,
+            '__getitem__'
+        )
+
+    @cached_property
+    def _getattr_methods(self) -> Set[Callable]:
+        return self._safe_get_methods(
+            self.allowed_getattr,
+            '__getattr__'
+        )
+
+    @cached_property
+    def _getattribute_methods(self) -> Set[Callable]:
+        return self._safe_get_methods(
+            self.allowed_getattr,
+            '__getattribute__'
+        )
+
+    def _safe_get_methods(self, classes, name) -> Set[Callable]:
+        return {
+            method
+            for class_ in classes
+            for method in [getattr(class_, name, None)]
+            if method
+        }
+
+
+class DummyNamedTuple(NamedTuple):
+    pass
+
+
+class EvaluationContext(NamedTuple):
+    locals_: dict
+    globals_: dict
+    evaluation: Literal['forbidden', 'minimal', 'limitted', 'unsafe', 'dangerous'] = 'forbidden'
+    in_subscript: bool = False
+
+
+class IdentitySubscript:
+    def __getitem__(self, key):
+        return key
+
+IDENTITY_SUBSCRIPT = IdentitySubscript()
+SUBSCRIPT_MARKER = '__SUBSCRIPT_SENTINEL__'
+
+class GuardRejection(ValueError):
+    pass
+
+
+def guarded_eval(
+    code: str,
+    context: EvaluationContext
+):
+    locals_ = context.locals_
+
+    if context.evaluation == 'forbidden':
+        raise GuardRejection('Forbidden mode')
+
+    # note: not using `ast.literal_eval` as it does not implement
+    # getitem at all, for example it fails on simple `[0][1]`
+
+    if context.in_subscript:
+        # syntatic sugar for ellipsis (:) is only available in susbcripts
+        # so we need to trick the ast parser into thinking that we have
+        # a subscript, but we need to be able to later recognise that we did
+        # it so we can ignore the actual __getitem__ operation
+        if not code:
+            return tuple()
+        locals_ = locals_.copy()
+        locals_[SUBSCRIPT_MARKER] = IDENTITY_SUBSCRIPT
+        code = SUBSCRIPT_MARKER + '[' + code + ']'
+        context = EvaluationContext(**{
+            **context._asdict(),
+            **{'locals_': locals_}
+        })
+
+    if context.evaluation == 'dangerous':
+        return eval(code, context.globals_, context.locals_)
+
+    expression = ast.parse(code, mode='eval')
+
+    return eval_node(expression, context)
+
+def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
+    """
+    Evaluate AST node in provided context.
+
+    Applies evaluation restrictions defined in the context.
+
+    Currently does not support evaluation of functions with arguments.
+
+    Does not evaluate actions which always have side effects:
+    - class definitions (`class sth: ...`)
+    - function definitions (`def sth: ...`)
+    - variable assignments (`x = 1`)
+    - augumented assignments (`x += 1`)
+    - deletions (`del x`)
+
+    Does not evaluate operations which do not return values:
+    - assertions (`assert x`)
+    - pass (`pass`)
+    - imports (`import x`)
+    - control flow
+       - conditionals (`if x:`) except for terenary IfExp (`a if x else b`)
+       - loops (`for` and `while`)
+       - exception handling
+    """
+    policy = EVALUATION_POLICIES[context.evaluation]
+    if node is None:
+        return None
+    if isinstance(node, ast.Expression):
+        return eval_node(node.body, context)
+    if isinstance(node, ast.BinOp):
+        # TODO: add guards
+        left = eval_node(node.left, context)
+        right = eval_node(node.right, context)
+        if isinstance(node.op, ast.Add):
+            return left + right
+        if isinstance(node.op, ast.Sub):
+            return left - right
+        if isinstance(node.op, ast.Mult):
+            return left * right
+        if isinstance(node.op, ast.Div):
+            return left / right
+        if isinstance(node.op, ast.FloorDiv):
+            return left // right
+        if isinstance(node.op, ast.Mod):
+            return left % right
+        if isinstance(node.op, ast.Pow):
+            return left ** right
+        if isinstance(node.op, ast.LShift):
+            return left << right
+        if isinstance(node.op, ast.RShift):
+            return left >> right
+        if isinstance(node.op, ast.BitOr):
+            return left | right
+        if isinstance(node.op, ast.BitXor):
+            return left ^ right
+        if isinstance(node.op, ast.BitAnd):
+            return left & right
+        if isinstance(node.op, ast.MatMult):
+            return left @ right
+    if isinstance(node, ast.Constant):
+        return node.value
+    if isinstance(node, ast.Index):
+        return eval_node(node.value, context)
+    if isinstance(node, ast.Tuple):
+        return tuple(
+            eval_node(e, context)
+            for e in node.elts
+        )
+    if isinstance(node, ast.List):
+        return [
+            eval_node(e, context)
+            for e in node.elts
+        ]
+    if isinstance(node, ast.Set):
+        return {
+            eval_node(e, context)
+            for e in node.elts
+        }
+    if isinstance(node, ast.Dict):
+        return dict(zip(
+            [eval_node(k, context) for k in node.keys],
+            [eval_node(v, context) for v in node.values]
+        ))
+    if isinstance(node, ast.Slice):
+        return slice(
+            eval_node(node.lower, context),
+            eval_node(node.upper, context),
+            eval_node(node.step, context)
+        )
+    if isinstance(node, ast.ExtSlice):
+        return tuple([
+            eval_node(dim, context) 
+            for dim in node.dims
+        ])
+    if isinstance(node, ast.UnaryOp):
+        # TODO: add guards
+        value = eval_node(node.operand, context)
+        if isinstance(node.op, ast.USub):
+            return -value
+        if isinstance(node.op, ast.UAdd):
+            return +value
+        if isinstance(node.op, ast.Invert):
+            return ~value
+        if isinstance(node.op, ast.Not):
+            return not value
+        raise ValueError('Unhandled unary operation:', node.op)
+    if isinstance(node, ast.Subscript):
+        value = eval_node(node.value, context)
+        slice_ = eval_node(node.slice, context)
+        if policy.can_get_item(value, slice_):
+            return value[slice_]
+        raise GuardRejection(
+            'Subscript access (`__getitem__`) for',
+            type(value), # not joined to avoid calling `repr`
+            f' not allowed in {context.evaluation} mode'
+        )
+    if isinstance(node, ast.Name):
+        if policy.allow_locals_access and node.id in context.locals_:
+            return context.locals_[node.id]
+        if policy.allow_globals_access and node.id in context.globals_:
+            return context.globals_[node.id]
+        if policy.allow_builtins_access and node.id in __builtins__:
+            return __builtins__[node.id]
+        if not policy.allow_globals_access and not policy.allow_locals_access:
+            raise GuardRejection(
+                f'Namespace access not allowed in {context.evaluation} mode'
+            )
+        else:
+            raise NameError(f'{node.id} not found in locals nor globals')
+    if isinstance(node, ast.Attribute):
+        value = eval_node(node.value, context)
+        if policy.can_get_attr(value, node.attr):
+            return getattr(value, node.attr)
+        raise GuardRejection(
+            'Attribute access (`__getattr__`) for',
+            type(value), # not joined to avoid calling `repr`
+            f'not allowed in {context.evaluation} mode'
+        )
+    if isinstance(node, ast.IfExp):
+        test = eval_node(node.test, context)
+        if test:
+             return eval_node(node.body, context)
+        else:
+            return eval_node(node.orelse, context)
+    if isinstance(node, ast.Call):
+        func = eval_node(node.func, context)
+        print(node.keywords)
+        if policy.can_call(func) and not node.keywords:
+            args = [
+                eval_node(arg, context)
+                for arg in node.args
+            ]
+            return func(*args)
+        raise GuardRejection(
+            'Call for',
+            func, # not joined to avoid calling `repr`
+            f'not allowed in {context.evaluation} mode'
+        )
+    raise ValueError('Unhandled node', node)
+
+
+SUPPORTED_EXTERNAL_GETITEM = {
+    ('pandas', 'core', 'indexing', '_iLocIndexer'),
+    ('pandas', 'core', 'indexing', '_LocIndexer'),
+    ('pandas', 'DataFrame'),
+    ('pandas', 'Series'),
+    ('numpy', 'ndarray'),
+    ('numpy', 'void')
+}
+
+BUILTIN_GETITEM = {
+    dict,
+    str,
+    bytes,
+    list,
+    tuple,
+    collections.defaultdict,
+    collections.deque,
+    collections.OrderedDict,
+    collections.ChainMap,
+    collections.UserDict,
+    collections.UserList,
+    collections.UserString,
+    DummyNamedTuple,
+    IdentitySubscript
+}
+
+
+def _list_methods(cls, source=None):
+    """For use on immutable objects or with methods returning a copy"""
+    return [
+        getattr(cls, k)
+        for k in (source if source else dir(cls))
+    ]
+
+
+dict_non_mutating_methods = ('copy', 'keys', 'values', 'items')
+list_non_mutating_methods = ('copy', 'index', 'count')
+set_non_mutating_methods = set(dir(set)) & set(dir(frozenset))
+
+
+dict_keys = type({}.keys())
+method_descriptor = type(list.copy)
+
+ALLOWED_CALLS = {
+    bytes,
+    *_list_methods(bytes),
+    dict,
+    *_list_methods(dict, dict_non_mutating_methods),
+    dict_keys.isdisjoint,
+    list,
+    *_list_methods(list, list_non_mutating_methods),
+    set,
+    *_list_methods(set, set_non_mutating_methods),
+    frozenset,
+    *_list_methods(frozenset),
+    range,
+    str,
+    *_list_methods(str),
+    tuple,
+    *_list_methods(tuple),
+    collections.deque,
+    *_list_methods(collections.deque, list_non_mutating_methods),
+    collections.defaultdict,
+    *_list_methods(collections.defaultdict, dict_non_mutating_methods),
+    collections.OrderedDict,
+    *_list_methods(collections.OrderedDict, dict_non_mutating_methods),
+    collections.UserDict,
+    *_list_methods(collections.UserDict, dict_non_mutating_methods),
+    collections.UserList,
+    *_list_methods(collections.UserList, list_non_mutating_methods),
+    collections.UserString,
+    *_list_methods(collections.UserString, dir(str)),
+    collections.Counter,
+    *_list_methods(collections.Counter, dict_non_mutating_methods),
+    collections.Counter.elements,
+    collections.Counter.most_common
+}
+
+EVALUATION_POLICIES = {
+    'minimal': EvaluationPolicy(
+        allow_builtins_access=True,
+        allow_locals_access=False,
+        allow_globals_access=False,
+        allow_item_access=False,
+        allow_attr_access=False,
+        allowed_calls=set(),
+        allow_any_calls=False
+    ),
+    'limitted': SelectivePolicy(
+        # TODO:
+        # - should reject binary and unary operations if custom methods would be dispatched
+        allowed_getitem=BUILTIN_GETITEM,
+        allowed_getitem_external=SUPPORTED_EXTERNAL_GETITEM,
+        allowed_getattr={
+            *BUILTIN_GETITEM,
+            set,
+            frozenset,
+            object,
+            type,  # `type` handles a lot of generic cases, e.g. numbers as in `int.real`.
+            dict_keys,
+            method_descriptor
+        },
+        allowed_getattr_external={
+            # pandas Series/Frame implements custom `__getattr__`
+            ('pandas', 'DataFrame'),
+            ('pandas', 'Series')
+        },
+        allow_builtins_access=True,
+        allow_locals_access=True,
+        allow_globals_access=True,
+        allowed_calls=ALLOWED_CALLS
+    ),
+    'unsafe': EvaluationPolicy(
+        allow_builtins_access=True,
+        allow_locals_access=True,
+        allow_globals_access=True,
+        allow_attr_access=True,
+        allow_item_access=True,
+        allow_any_calls=True
+    )
+}
\ No newline at end of file
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 98ec814a769..7a99a2655ab 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -112,6 +112,17 @@ def greedy_completion():
         ip.Completer.greedy = greedy_original
 
 
+@contextmanager
+def evaluation_level(evaluation: str):
+    ip = get_ipython()
+    evaluation_original = ip.Completer.evaluation
+    try:
+        ip.Completer.evaluation = evaluation
+        yield
+    finally:
+        ip.Completer.evaluation = evaluation_original
+
+
 @contextmanager
 def custom_matchers(matchers):
     ip = get_ipython()
@@ -522,10 +533,10 @@ class Z:
 
     def test_greedy_completions(self):
         """
-        Test the capability of the Greedy completer. 
+        Test the capability of the Greedy completer.
 
         Most of the test here does not really show off the greedy completer, for proof
-        each of the text below now pass with Jedi. The greedy completer is capable of more. 
+        each of the text below now pass with Jedi. The greedy completer is capable of more.
 
         See the :any:`test_dict_key_completion_contexts`
 
@@ -852,15 +863,13 @@ def test_match_dict_keys(self):
         assert match_dict_keys(keys, '"', delims=delims) == ('"', 1, ["foo"])
         assert match_dict_keys(keys, '"f', delims=delims) == ('"', 1, ["foo"])
 
-        match_dict_keys
-
     def test_match_dict_keys_tuple(self):
         """
         Test that match_dict_keys called with extra prefix works on a couple of use case,
         does return what expected, and does not crash.
         """
         delims = " \t\n`!@#$^&*()=+[{]}\\|;:'\",<>?"
-        
+
         keys = [("foo", "bar"), ("foo", "oof"), ("foo", b"bar"), ('other', 'test')]
 
         # Completion on first key == "foo"
@@ -883,6 +892,11 @@ def test_match_dict_keys_tuple(self):
         assert match_dict_keys(keys, "'foo", delims=delims, extra_prefix=('foo1', 'foo2', 'foo3')) == ("'", 1, ["foo4"])
         assert match_dict_keys(keys, "'foo", delims=delims, extra_prefix=('foo1', 'foo2', 'foo3', 'foo4')) == ("'", 1, [])
 
+        keys = [("foo", 1111), ("foo", 2222), (3333, "bar"), (3333, 'test')]
+        assert match_dict_keys(keys, "'", delims=delims, extra_prefix=("foo",)) == ("'", 1, ["1111", "2222"])
+        assert match_dict_keys(keys, "'", delims=delims, extra_prefix=(3333,)) == ("'", 1, ["bar", "test"])
+        assert match_dict_keys(keys, "'", delims=delims, extra_prefix=("3333",)) == ("'", 1, [])
+
     def test_dict_key_completion_string(self):
         """Test dictionary key completion for string keys"""
         ip = get_ipython()
@@ -1050,6 +1064,7 @@ class C:
 
         ip.user_ns["C"] = C
         ip.user_ns["get"] = lambda: d
+        ip.user_ns["nested"] = {'x': d}
 
         def assert_no_completion(**kwargs):
             _, matches = complete(**kwargs)
@@ -1075,6 +1090,13 @@ def assert_completion(**kwargs):
         assert_completion(line_buffer="(d[")
         assert_completion(line_buffer="C.data[")
 
+        # nested dict completion
+        assert_completion(line_buffer="nested['x'][")
+
+        with evaluation_level('minimal'):
+            with pytest.raises(AssertionError):
+                assert_completion(line_buffer="nested['x'][")
+
         # greedy flag
         def assert_completion(**kwargs):
             _, matches = complete(**kwargs)
@@ -1162,12 +1184,21 @@ def test_struct_array_key_completion(self):
         _, matches = complete(line_buffer="d['")
         self.assertIn("my_head", matches)
         self.assertIn("my_data", matches)
-        # complete on a nested level
-        with greedy_completion():
+        def completes_on_nested():
             ip.user_ns["d"] = numpy.zeros(2, dtype=dt)
             _, matches = complete(line_buffer="d[1]['my_head']['")
             self.assertTrue(any(["my_dt" in m for m in matches]))
             self.assertTrue(any(["my_df" in m for m in matches]))
+        # complete on a nested level
+        with greedy_completion():
+            completes_on_nested()
+
+        with evaluation_level('limitted'):
+            completes_on_nested()
+
+        with evaluation_level('minimal'):
+            with pytest.raises(AssertionError):
+                completes_on_nested()
 
     @dec.skip_without("pandas")
     def test_dataframe_key_completion(self):
@@ -1180,6 +1211,17 @@ def test_dataframe_key_completion(self):
         _, matches = complete(line_buffer="d['")
         self.assertIn("hello", matches)
         self.assertIn("world", matches)
+        _, matches = complete(line_buffer="d.loc[:, '")
+        self.assertIn("hello", matches)
+        self.assertIn("world", matches)
+        _, matches = complete(line_buffer="d.loc[1:, '")
+        self.assertIn("hello", matches)
+        _, matches = complete(line_buffer="d.loc[1:1, '")
+        self.assertIn("hello", matches)
+        _, matches = complete(line_buffer="d.loc[1:1:-1, '")
+        self.assertIn("hello", matches)
+        _, matches = complete(line_buffer="d.loc[::, '")
+        self.assertIn("hello", matches)
 
     def test_dict_key_completion_invalids(self):
         """Smoke test cases dict key completion can't handle"""
diff --git a/IPython/core/tests/test_guarded_eval.py b/IPython/core/tests/test_guarded_eval.py
new file mode 100644
index 00000000000..5c89a68f637
--- /dev/null
+++ b/IPython/core/tests/test_guarded_eval.py
@@ -0,0 +1,286 @@
+from typing import NamedTuple
+from IPython.core.guarded_eval import EvaluationContext, GuardRejection, guarded_eval, unbind_method
+from IPython.testing import decorators as dec
+import pytest
+
+
+def limitted(**kwargs):
+    return EvaluationContext(
+        locals_=kwargs,
+        globals_={},
+        evaluation='limitted'
+    )
+
+
+def unsafe(**kwargs):
+    return EvaluationContext(
+        locals_=kwargs,
+        globals_={},
+        evaluation='unsafe'
+    )
+
+@dec.skip_without('pandas')
+def test_pandas_series_iloc():
+    import pandas as pd
+    series = pd.Series([1], index=['a'])
+    context = limitted(data=series)
+    assert guarded_eval('data.iloc[0]', context) == 1
+
+
+@dec.skip_without('pandas')
+def test_pandas_series():
+    import pandas as pd
+    context = limitted(data=pd.Series([1], index=['a']))
+    assert guarded_eval('data["a"]', context) == 1
+    with pytest.raises(KeyError):
+        guarded_eval('data["c"]', context)
+
+
+@dec.skip_without('pandas')
+def test_pandas_bad_series():
+    import pandas as pd
+    class BadItemSeries(pd.Series):
+        def __getitem__(self, key):
+            return 'CUSTOM_ITEM'
+
+    class BadAttrSeries(pd.Series):
+        def __getattr__(self, key):
+            return 'CUSTOM_ATTR'
+
+    bad_series = BadItemSeries([1], index=['a'])
+    context = limitted(data=bad_series)
+
+    with pytest.raises(GuardRejection):
+        guarded_eval('data["a"]', context)
+    with pytest.raises(GuardRejection):
+        guarded_eval('data["c"]', context)
+
+    # note: here result is a bit unexpected because
+    # pandas `__getattr__` calls `__getitem__`;
+    # FIXME - special case to handle it?
+    assert guarded_eval('data.a', context) == 'CUSTOM_ITEM'
+
+    context = unsafe(data=bad_series)
+    assert guarded_eval('data["a"]', context) == 'CUSTOM_ITEM'
+
+    bad_attr_series = BadAttrSeries([1], index=['a'])
+    context = limitted(data=bad_attr_series)
+    assert guarded_eval('data["a"]', context) == 1
+    with pytest.raises(GuardRejection):
+        guarded_eval('data.a', context)
+
+
+@dec.skip_without('pandas')
+def test_pandas_dataframe_loc():
+    import pandas as pd
+    from pandas.testing import assert_series_equal
+    data = pd.DataFrame([{'a': 1}])
+    context = limitted(data=data)
+    assert_series_equal(
+        guarded_eval('data.loc[:, "a"]', context),
+        data['a']
+    )
+
+
+def test_named_tuple():
+
+    class GoodNamedTuple(NamedTuple):
+        a: str
+        pass
+
+    class BadNamedTuple(NamedTuple):
+        a: str
+        def __getitem__(self, key):
+            return None
+
+    good = GoodNamedTuple(a='x')
+    bad = BadNamedTuple(a='x')
+
+    context = limitted(data=good)
+    assert guarded_eval('data[0]', context) == 'x'
+
+    context = limitted(data=bad)
+    with pytest.raises(GuardRejection):
+        guarded_eval('data[0]', context)
+
+
+def test_dict():
+    context = limitted(
+        data={'a': 1, 'b': {'x': 2}, ('x', 'y'): 3}
+    )
+    assert guarded_eval('data["a"]', context) == 1
+    assert guarded_eval('data["b"]', context) == {'x': 2}
+    assert guarded_eval('data["b"]["x"]', context) == 2
+    assert guarded_eval('data["x", "y"]', context) == 3
+
+    assert guarded_eval('data.keys', context)
+
+
+def test_set():
+    context = limitted(data={'a', 'b'})
+    assert guarded_eval('data.difference', context)
+
+
+def test_list():
+    context = limitted(data=[1, 2, 3])
+    assert guarded_eval('data[1]', context) == 2
+    assert guarded_eval('data.copy', context)
+
+
+def test_dict_literal():
+    context = limitted()
+    assert guarded_eval('{}', context) == {}
+    assert guarded_eval('{"a": 1}', context) == {"a": 1}
+
+
+def test_list_literal():
+    context = limitted()
+    assert guarded_eval('[]', context) == []
+    assert guarded_eval('[1, "a"]', context) == [1, "a"]
+
+
+def test_set_literal():
+    context = limitted()
+    assert guarded_eval('set()', context) == set()
+    assert guarded_eval('{"a"}', context) == {"a"}
+
+
+def test_if_expression():
+    context = limitted()
+    assert guarded_eval('2 if True else 3', context) == 2
+    assert guarded_eval('4 if False else 5', context) == 5
+
+
+def test_object():
+    obj = object()
+    context = limitted(obj=obj)
+    assert guarded_eval('obj.__dir__', context) == obj.__dir__
+
+
+@pytest.mark.parametrize(
+    "code,expected",
+    [
+        [
+            'int.numerator',
+            int.numerator
+        ],
+        [
+            'float.is_integer',
+            float.is_integer
+        ],
+        [
+            'complex.real',
+            complex.real
+        ]
+    ]
+)
+def test_number_attributes(code, expected):
+    assert guarded_eval(code, limitted()) == expected
+
+
+def test_method_descriptor():
+    context = limitted()
+    assert guarded_eval('list.copy.__name__', context) == 'copy'
+
+
+@pytest.mark.parametrize(
+    "data,good,bad,expected",
+    [
+        [
+            [1, 2, 3],
+            'data.index(2)',
+            'data.append(4)',
+            1
+        ],
+        [
+            {'a': 1},
+            'data.keys().isdisjoint({})',
+            'data.update()',
+            True
+        ]
+    ]
+)
+def test_calls(data, good, bad, expected):
+    context = limitted(data=data)
+    assert guarded_eval(good, context) == expected
+
+    with pytest.raises(GuardRejection):
+        guarded_eval(bad, context)
+
+
+@pytest.mark.parametrize(
+    "code,expected",
+    [
+        [
+            '(1\n+\n1)',
+            2
+        ],
+        [
+            'list(range(10))[-1:]',
+            [9]
+        ],
+        [
+            'list(range(20))[3:-2:3]',
+            [3, 6, 9, 12, 15]
+        ]
+    ]
+)
+def test_literals(code, expected):
+    context = limitted()
+    assert guarded_eval(code, context) == expected
+
+
+def test_subscript():
+    context = EvaluationContext(
+        locals_={},
+        globals_={},
+        evaluation='limitted',
+        in_subscript=True
+    )
+    empty_slice = slice(None, None, None)
+    assert guarded_eval('', context) == tuple()
+    assert guarded_eval(':', context) == empty_slice
+    assert guarded_eval('1:2:3', context) == slice(1, 2, 3)
+    assert guarded_eval(':, "a"', context) == (empty_slice, "a")
+
+
+def test_unbind_method():
+    class X(list):
+        def index(self, k):
+            return 'CUSTOM'
+    x = X()
+    assert unbind_method(x.index) is X.index
+    assert unbind_method([].index) is list.index
+
+
+def test_assumption_instance_attr_do_not_matter():
+    """This is semi-specified in Python documentation.
+
+    However, since the specification says 'not guaranted
+    to work' rather than 'is forbidden to work', future
+    versions could invalidate this assumptions. This test
+    is meant to catch such a change if it ever comes true.
+    """
+    class T:
+        def __getitem__(self, k):
+            return 'a'
+        def __getattr__(self, k):
+            return 'a'
+    t = T()
+    t.__getitem__ = lambda f: 'b'
+    t.__getattr__ = lambda f: 'b'
+    assert t[1] == 'a'
+    assert t[1] == 'a'
+
+
+def test_assumption_named_tuples_share_getitem():
+    """Check assumption on named tuples sharing __getitem__"""
+    from typing import NamedTuple
+
+    class A(NamedTuple):
+        pass
+
+    class B(NamedTuple):
+        pass
+
+    assert A.__getitem__ == B.__getitem__

From 4c580c1497d56a21acf380031b2b60a22219913a Mon Sep 17 00:00:00 2001
From: nfgf <nfgferreira@gmail.com>
Date: Wed, 30 Nov 2022 19:27:49 -0500
Subject: [PATCH 1313/1407] Terminology: output is silenced, not disabled.

---
 IPython/core/interactiveshell.py |  4 ++--
 IPython/core/magic.py            | 12 ++++++------
 IPython/core/magics/execution.py |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 69b441816a4..12503e9d916 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2364,9 +2364,9 @@ def run_line_magic(self, magic_name: str, line, _stack_depth=1):
                 result = fn(*args, **kwargs)
 
             # The code below prevents the output from being displayed
-            # when using magics with decodator @output_can_be_disabled
+            # when using magics with decodator @output_can_be_silenced
             # when the last Python token in the expression is a ';'.
-            if getattr(fn, magic.MAGIC_OUTPUT_CAN_BE_DISABLED, False):
+            if getattr(fn, magic.MAGIC_OUTPUT_CAN_BE_SILENCED, False):
                 if DisplayHook.semicolon_at_end_of_expression(magic_arg_s):
                     return None
 
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 82728cdebd1..95653dc7893 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -258,7 +258,7 @@ def mark(func, *a, **kw):
 
 
 MAGIC_NO_VAR_EXPAND_ATTR = "_ipython_magic_no_var_expand"
-MAGIC_OUTPUT_CAN_BE_DISABLED = "_ipython_magic_output_can_be_disabled"
+MAGIC_OUTPUT_CAN_BE_SILENCED = "_ipython_magic_output_can_be_silenced"
 
 
 def no_var_expand(magic_func):
@@ -277,14 +277,14 @@ def no_var_expand(magic_func):
     return magic_func
 
 
-def output_can_be_disabled(magic_func):
-    """Mark a magic function so its output may be disabled.
+def output_can_be_silenced(magic_func):
+    """Mark a magic function so its output may be silenced.
 
-    The output is disabled if the Python expression used as a parameter of
+    The output is silenced if the Python expression used as a parameter of
     the magic ends in a semicolon, not counting a Python comment that can
-    follows it.
+    follow it.
     """
-    setattr(magic_func, MAGIC_OUTPUT_CAN_BE_DISABLED, True)
+    setattr(magic_func, MAGIC_OUTPUT_CAN_BE_SILENCED, True)
     return magic_func
 
 # Create the actual decorators for public use
diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 5d7942f6472..7b558d5bc6a 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -37,7 +37,7 @@
     magics_class,
     needs_local_scope,
     no_var_expand,
-    output_can_be_disabled,
+    output_can_be_silenced,
     on_off,
 )
 from IPython.testing.skipdoctest import skip_doctest
@@ -1195,7 +1195,7 @@ def timeit(self, line='', cell=None, local_ns=None):
     @no_var_expand
     @needs_local_scope
     @line_cell_magic
-    @output_can_be_disabled
+    @output_can_be_silenced
     def time(self,line='', cell=None, local_ns=None):
         """Time execution of a Python statement or expression.
 

From 61b0fb8f67cdc870ae116b9efbdc6fab76119cc1 Mon Sep 17 00:00:00 2001
From: Nicholas Bollweg <nick.bollweg@gmail.com>
Date: Thu, 1 Dec 2022 07:07:14 -0600
Subject: [PATCH 1314/1407] move all entry_point definitions to setup.py

---
 setup.cfg |  6 ------
 setup.py  | 10 +++++++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 226506f08f0..769bfda14a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -105,12 +105,6 @@ IPython.core.tests = *.png, *.jpg, daft_extension/*.py
 IPython.lib.tests = *.wav
 IPython.testing.plugin = *.txt
 
-[options.entry_points]
-pygments.lexers =
-    ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer
-    ipython = IPython.lib.lexers:IPythonLexer
-    ipython3 = IPython.lib.lexers:IPython3Lexer
-
 [velin]
 ignore_patterns =
    IPython/core/tests
diff --git a/setup.py b/setup.py
index 4939ca53836..454c297524f 100644
--- a/setup.py
+++ b/setup.py
@@ -139,7 +139,15 @@
     'install_scripts_sym': install_scripts_for_symlink,
     'unsymlink': unsymlink,
 }
-setup_args["entry_points"] = {"console_scripts": find_entry_points()}
+
+setup_args["entry_points"] = {
+    "console_scripts": find_entry_points(),
+    "pygments.lexers": [
+        "ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer",
+        "ipython = IPython.lib.lexers:IPythonLexer",
+        "ipython3 = IPython.lib.lexers:IPython3Lexer",
+    ]
+}
 
 #---------------------------------------------------------------------------
 # Do the actual setup now

From 5a611b0080ff68ad344125c27dc52b8ea041abc5 Mon Sep 17 00:00:00 2001
From: Angus Hollands <goosey15@gmail.com>
Date: Fri, 2 Dec 2022 21:47:31 +0000
Subject: [PATCH 1315/1407] docs: remove mention of `_ipython_display_` being
 ignored in the REPL

---
 docs/source/config/integrating.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/source/config/integrating.rst b/docs/source/config/integrating.rst
index 07429ef1792..23cc1e58875 100644
--- a/docs/source/config/integrating.rst
+++ b/docs/source/config/integrating.rst
@@ -128,7 +128,6 @@ More powerful methods
 
       Displays the object as a side effect; the return value is ignored. If this
       is defined, all other display methods are ignored.
-      This method is ignored in the REPL.
 
 
 Metadata

From c986c9eddefc3363d98a27c9cd6aa8d58fe8053b Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sat, 3 Dec 2022 00:37:34 +0000
Subject: [PATCH 1316/1407] Re-implement key closing behaviour with a setting,

improve number handling and static typing
---
 IPython/core/completer.py            | 307 +++++++++++++++++++++------
 IPython/core/guarded_eval.py         |  35 +--
 IPython/core/tests/test_completer.py | 191 ++++++++++++++---
 3 files changed, 430 insertions(+), 103 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index a497f12f01c..e53e83b38e9 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -178,6 +178,7 @@
 
 from __future__ import annotations
 import builtins as builtin_mod
+import enum
 import glob
 import inspect
 import itertools
@@ -186,15 +187,16 @@
 import re
 import string
 import sys
+import tokenize
 import time
 import unicodedata
 import uuid
 import warnings
 from ast import literal_eval
+from collections import defaultdict
 from contextlib import contextmanager
 from dataclasses import dataclass
 from functools import cached_property, partial
-from importlib import import_module
 from types import SimpleNamespace
 from typing import (
     Iterable,
@@ -205,8 +207,6 @@
     Any,
     Sequence,
     Dict,
-    NamedTuple,
-    Pattern,
     Optional,
     TYPE_CHECKING,
     Set,
@@ -233,7 +233,6 @@
     Unicode,
     Dict as DictTrait,
     Union as UnionTrait,
-    default,
     observe,
 )
 from traitlets.config.configurable import Configurable
@@ -559,7 +558,7 @@ class SimpleCompletion:
 
     __slots__ = ["text", "type"]
 
-    def __init__(self, text: str, *, type: str = None):
+    def __init__(self, text: str, *, type: Optional[str] = None):
         self.text = text
         self.type = type
 
@@ -647,16 +646,18 @@ def line_with_cursor(self) -> str:
 
 
 class _MatcherAPIv1Base(Protocol):
-    def __call__(self, text: str) -> list[str]:
+    def __call__(self, text: str) -> List[str]:
         """Call signature."""
+        ...
 
 
 class _MatcherAPIv1Total(_MatcherAPIv1Base, Protocol):
     #: API version
     matcher_api_version: Optional[Literal[1]]
 
-    def __call__(self, text: str) -> list[str]:
+    def __call__(self, text: str) -> List[str]:
         """Call signature."""
+        ...
 
 
 #: Protocol describing Matcher API v1.
@@ -671,6 +672,7 @@ class MatcherAPIv2(Protocol):
 
     def __call__(self, context: CompletionContext) -> MatcherResult:
         """Call signature."""
+        ...
 
 
 Matcher: TypeAlias = Union[MatcherAPIv1, MatcherAPIv2]
@@ -912,10 +914,11 @@ class Completer(Configurable):
         help="""Activate greedy completion.
 
         .. deprecated:: 8.8
-            Use :any:`evaluation` instead.
+            Use :any:`evaluation` and :any:`auto_close_dict_keys` instead.
 
-        As of IPython 8.8 proxy for ``evaluation = 'unsafe'`` when set to ``True``,
-        and for ``'forbidden'`` when set to ``False``.
+        Whent enabled in IPython 8.8+ activates following settings for compatibility:
+        - ``evaluation = 'unsafe'``
+        - ``auto_close_dict_keys = True``
         """,
     ).tag(config=True)
 
@@ -957,6 +960,11 @@ class Completer(Configurable):
              "Includes completion of latex commands, unicode names, and expanding "
              "unicode characters back to latex commands.").tag(config=True)
 
+    auto_close_dict_keys = Bool(
+        False,
+        help="""Enable auto-closing dictionary keys."""
+    ).tag(config=True)
+
     def __init__(self, namespace=None, global_namespace=None, **kwargs):
         """Create a new completer for the command line.
 
@@ -1119,8 +1127,80 @@ def get__all__entries(obj):
     return [w for w in words if isinstance(w, str)]
 
 
-def match_dict_keys(keys: List[Union[str, bytes, Tuple[Union[str, bytes], ...]]], prefix: str, delims: str,
-                    extra_prefix: Optional[Tuple[Union[str, bytes], ...]]=None) -> Tuple[str, int, List[str]]:
+class DictKeyState(enum.Flag):
+    """Represent state of the key match in context of other possible matches.
+
+    - given `d1 = {'a': 1}` completion on `d1['<tab>` will yield `{'a': END_OF_ITEM}` as there is no tuple.
+    - given `d2 = {('a', 'b'): 1}`: `d2['a', '<tab>` will yield `{'b': END_OF_TUPLE}` as there is no tuple members to add beyond `'b'`.
+    - given `d3 = {('a', 'b'): 1}`: `d3['<tab>` will yield `{'a': IN_TUPLE}` as `'a'` can be added.
+    - given `d4 = {'a': 1, ('a', 'b'): 2}`: `d4['<tab>` will yield `{'a': END_OF_ITEM & END_OF_TUPLE}`
+    """
+    BASELINE = 0
+    END_OF_ITEM = enum.auto()
+    END_OF_TUPLE = enum.auto()
+    IN_TUPLE = enum.auto()
+
+
+def _parse_tokens(c):
+    tokens = []
+    token_generator = tokenize.generate_tokens(iter(c.splitlines()).__next__)
+    while True:
+        try:
+            tokens.append(next(token_generator))
+        except tokenize.TokenError:
+            return tokens
+        except StopIteration:
+            return tokens
+
+
+def _match_number_in_dict_key_prefix(prefix: str) -> Union[str, None]:
+    """Match any valid Python numeric literal in a prefix of dictionary keys.
+
+    References:
+    - https://docs.python.org/3/reference/lexical_analysis.html#numeric-literals
+    - https://docs.python.org/3/library/tokenize.html
+    """
+    if prefix[-1].isspace():
+        # if user typed a space we do not have anything to complete
+        # even if there was a valid number token before
+        return None
+    tokens = _parse_tokens(prefix)
+    rev_tokens = reversed(tokens)
+    skip_over = {tokenize.ENDMARKER, tokenize.NEWLINE}
+    number = None
+    for token in rev_tokens:
+        if token.type in skip_over:
+            continue
+        if number is None:
+            if token.type == tokenize.NUMBER:
+                number = token.string
+                continue
+            else:
+                # we did not match a number
+                return None
+        if token.type == tokenize.OP:
+            if token.string == ',':
+                break
+            if token.string in {'+', '-'}:
+                number = token.string + number
+        else:
+            return None
+    return number
+
+
+_INT_FORMATS = {
+    '0b': bin,
+    '0o': oct,
+    '0x': hex,
+}
+
+
+def match_dict_keys(
+    keys: List[Union[str, bytes, Tuple[Union[str, bytes], ...]]],
+    prefix: str,
+    delims: str,
+    extra_prefix: Optional[Tuple[Union[str, bytes], ...]] = None
+) -> Tuple[str, int, Dict[str, DictKeyState]]:
     """Used by dict_key_matches, matching the prefix to a list of keys
 
     Parameters
@@ -1140,16 +1220,21 @@ def match_dict_keys(keys: List[Union[str, bytes, Tuple[Union[str, bytes], ...]]]
     A tuple of three elements: ``quote``, ``token_start``, ``matched``, with
     ``quote`` being the quote that need to be used to close current string.
     ``token_start`` the position where the replacement should start occurring,
-    ``matches`` a list of replacement/completion
-
+    ``matches`` a dictionary of replacement/completion keys on keys and values
+        indicating whether the state.
     """
     prefix_tuple = extra_prefix if extra_prefix else ()
 
-    Nprefix = len(prefix_tuple)
+    prefix_tuple_size = sum([
+        # for pandas, do not count slices as taking space
+        not isinstance(k, slice)
+        for k in prefix_tuple
+    ])
     text_serializable_types = (str, bytes, int, float, slice)
+
     def filter_prefix_tuple(key):
         # Reject too short keys
-        if len(key) <= Nprefix:
+        if len(key) <= prefix_tuple_size:
             return False
         # Reject keys which cannot be serialised to text
         for k in key:
@@ -1162,28 +1247,58 @@ def filter_prefix_tuple(key):
         # All checks passed!
         return True
 
-    filtered_keys: List[Union[str, bytes, int, float, slice]] = []
-
-    def _add_to_filtered_keys(key):
-        if isinstance(key, text_serializable_types):
-            filtered_keys.append(key)
+    filtered_key_is_final: Dict[Union[str, bytes, int, float], DictKeyState] = defaultdict(lambda: DictKeyState.BASELINE)
 
     for k in keys:
+        # If at least one of the matches is not final, mark as undetermined.
+        # This can happen with `d = {111: 'b', (111, 222): 'a'}` where
+        # `111` appears final on first match but is not final on the second.
+
         if isinstance(k, tuple):
             if filter_prefix_tuple(k):
-                _add_to_filtered_keys(k[Nprefix])
+                key_fragment = k[prefix_tuple_size]
+                filtered_key_is_final[key_fragment] |= (
+                    DictKeyState.END_OF_TUPLE
+                    if len(k) == prefix_tuple_size + 1 else
+                    DictKeyState.IN_TUPLE
+                )
+        elif prefix_tuple_size > 0:
+            # we are completing a tuple but this key is not a tuple,
+            # so we should ignore it
+            pass
         else:
-            _add_to_filtered_keys(k)
+            if isinstance(k, text_serializable_types):
+                filtered_key_is_final[k] |= DictKeyState.END_OF_ITEM
+
+    filtered_keys = filtered_key_is_final.keys()
 
     if not prefix:
-        return '', 0, [repr(k) for k in filtered_keys]
-    quote_match = re.search('["\']', prefix)
-    assert quote_match is not None # silence mypy
-    quote = quote_match.group()
-    try:
-        prefix_str = literal_eval(prefix + quote)
-    except Exception:
-        return '', 0, []
+        return '', 0, {repr(k): v for k, v in filtered_key_is_final.items()}
+
+    quote_match = re.search('(?:"|\')', prefix)
+    is_user_prefix_numeric = False
+
+    if quote_match:
+        quote = quote_match.group()
+        valid_prefix = prefix + quote
+        try:
+            prefix_str = literal_eval(valid_prefix)
+        except Exception:
+            return '', 0, {}
+    else:
+        # If it does not look like a string, let's assume
+        # we are dealing with a number or variable.
+        number_match = _match_number_in_dict_key_prefix(prefix)
+
+        # We do not want the key matcher to suggest variable names so we yield:
+        if number_match is None:
+            # The alternative would be to assume that user forgort the quote
+            # and if the substring matches, suggest adding it at the start.
+            return '', 0, {}
+
+        prefix_str = number_match
+        is_user_prefix_numeric = True
+        quote = ''
 
     pattern = '[^' + ''.join('\\' + c for c in delims) + ']*$'
     token_match = re.search(pattern, prefix, re.UNICODE)
@@ -1191,13 +1306,29 @@ def _add_to_filtered_keys(key):
     token_start = token_match.start()
     token_prefix = token_match.group()
 
-    matched: List[str] = []
+    matched: Dict[str, DictKeyState] = {}
+
     for key in filtered_keys:
-        str_key = key if isinstance(key, (str, bytes)) else str(key)
+        if isinstance(key, (int, float)):
+            # User typed a number but this key is not a number.
+            if not is_user_prefix_numeric:
+                continue
+            str_key = str(key)
+            if isinstance(key, int):
+                int_base = prefix_str[:2].lower()
+                # if user typed integer using binary/oct/hex notation:
+                if int_base in _INT_FORMATS:
+                    int_format = _INT_FORMATS[int_base]
+                    str_key = int_format(key)
+        else:
+            # User typed a string but this key is a number.
+            if is_user_prefix_numeric:
+                continue
+            str_key = key
         try:
             if not str_key.startswith(prefix_str):
                 continue
-        except (AttributeError, TypeError, UnicodeError):
+        except (AttributeError, TypeError, UnicodeError) as e:
             # Python 3+ TypeError on b'a'.startswith('a') or vice-versa
             continue
 
@@ -1213,7 +1344,9 @@ def _add_to_filtered_keys(key):
             rem_repr = rem_repr.replace('"', '\\"')
 
         # then reinsert prefix from start of token
-        matched.append('%s%s' % (token_prefix, rem_repr))
+        match = '%s%s' % (token_prefix, rem_repr)
+
+        matched[match] = filtered_key_is_final[key]
     return quote, token_start, matched
 
 
@@ -1447,24 +1580,39 @@ def _make_signature(completion)-> str:
 \s*  # and optional whitespace
 # Capture any number of serializable objects (e.g. "a", "b", 'c')
 # and slices
-((?:[uUbB]?  # string prefix (r not handled)
-    (?:
-        '(?:[^']|(?<!\\)\\')*'
-    |
-        "(?:[^"]|(?<!\\)\\")*"
+((?:(?:
+    (?: # closed string
+        [uUbB]?  # string prefix (r not handled)
+        (?:
+            '(?:[^']|(?<!\\)\\')*'
+        |
+            "(?:[^"]|(?<!\\)\\")*"
+        )
+    )
     |
         # capture integers and slices
         (?:[-+]?\d+)?(?::(?:[-+]?\d+)?){0,2}
+    |
+        # integer in bin/hex/oct notation
+        0[bBxXoO]_?(?:\w|\d)+
     )
     \s*,\s*
 )*)
-([uUbB]?  # string prefix (r not handled)
-    (?:   # unclosed string
-        '(?:[^']|(?<!\\)\\')*
-    |
-        "(?:[^"]|(?<!\\)\\")*
+((?:
+    (?: # unclosed string
+        [uUbB]?  # string prefix (r not handled)
+        (?:
+            '(?:[^']|(?<!\\)\\')*
+            |
+            "(?:[^"]|(?<!\\)\\")*
+        )
+    )
     |
+        # unfinished integer
         (?:[-+]?\d+)
+    |
+        # integer in bin/hex/oct notation
+        0[bBxXoO]_?(?:\w|\d)+
     )
 )?
 $
@@ -1473,7 +1621,7 @@ def _make_signature(completion)-> str:
 def _convert_matcher_v1_result_to_v2(
     matches: Sequence[str],
     type: str,
-    fragment: str = None,
+    fragment: Optional[str] = None,
     suppress_if_matches: bool = False,
 ) -> SimpleMatcherResult:
     """Utility to help with transition"""
@@ -1494,9 +1642,11 @@ def _greedy_changed(self, change):
         """update the splitter and readline delims when greedy is changed"""
         if change['new']:
             self.evaluation = 'unsafe'
+            self.auto_close_dict_keys = True
             self.splitter.delims = GREEDY_DELIMS
         else:
             self.evaluation = 'limitted'
+            self.auto_close_dict_keys = False
             self.splitter.delims = DELIMS
 
     dict_keys_only = Bool(
@@ -2294,7 +2444,7 @@ def dict_key_matches(self, text: str) -> List[str]:
             extra_prefix=tuple_prefix
         )
         if not matches:
-            return matches
+            return []
 
         # get the cursor position of
         # - the text being completed
@@ -2313,26 +2463,55 @@ def dict_key_matches(self, text: str) -> List[str]:
         else:
             leading = text[text_start:completion_start]
 
-        # the index of the `[` character
-        bracket_idx = match.end(1)
-
         # append closing quote and bracket as appropriate
         # this is *not* appropriate if the opening quote or bracket is outside
-        # the text given to this method
-        suf = ''
-        continuation = self.line_buffer[len(self.text_until_cursor):]
-        if key_start > text_start and closing_quote:
-            # quotes were opened inside text, maybe close them
-            if continuation.startswith(closing_quote):
-                continuation = continuation[len(closing_quote):]
-            else:
-                suf += closing_quote
-        if bracket_idx > text_start:
-            # brackets were opened inside text, maybe close them
-            if not continuation.startswith(']'):
-                suf += ']'
+        # the text given to this method, e.g. `d["""a\nt
+        can_close_quote = False
+        can_close_bracket = False
+
+        continuation = self.line_buffer[len(self.text_until_cursor):].strip()
+
+        if continuation.startswith(closing_quote):
+            # do not close if already closed, e.g. `d['a<tab>'`
+            continuation = continuation[len(closing_quote):]
+        else:
+            can_close_quote = True
+
+        continuation = continuation.strip()
+
+        # e.g. `pandas.DataFrame` has different tuple indexer behaviour,
+        # handling it is out of scope, so let's avoid appending suffixes.
+        has_known_tuple_handling = isinstance(obj, dict)
 
-        return [leading + k + suf for k in matches]
+        can_close_bracket = not continuation.startswith(']') and self.auto_close_dict_keys
+        can_close_tuple_item = not continuation.startswith(',') and has_known_tuple_handling and self.auto_close_dict_keys
+        can_close_quote = can_close_quote and self.auto_close_dict_keys
+
+        # fast path if closing qoute should be appended but not suffix is allowed
+        if not can_close_quote and not can_close_bracket and closing_quote:
+            return [leading + k for k in matches]
+
+        results = []
+
+        end_of_tuple_or_item = DictKeyState.END_OF_TUPLE | DictKeyState.END_OF_ITEM
+
+        for k, state_flag in matches.items():
+            result = leading + k
+            if can_close_quote and closing_quote:
+                result += closing_quote
+
+            if state_flag == end_of_tuple_or_item:
+                # We do not know which suffix to add,
+                # e.g. both tuple item and string
+                # match this item.
+                pass
+
+            if state_flag in end_of_tuple_or_item and can_close_bracket:
+                result += ']'
+            if state_flag == DictKeyState.IN_TUPLE and can_close_tuple_item:
+                result += ', '
+            results.append(result)
+        return results
 
     @context_matcher()
     def unicode_name_matcher(self, context: CompletionContext):
diff --git a/IPython/core/guarded_eval.py b/IPython/core/guarded_eval.py
index f477c6bc2c1..d420ca80980 100644
--- a/IPython/core/guarded_eval.py
+++ b/IPython/core/guarded_eval.py
@@ -1,11 +1,19 @@
-from typing import Callable, Protocol, Set, Tuple, NamedTuple, Literal, Union
+from typing import Callable, Set, Tuple, NamedTuple, Literal, Union, TYPE_CHECKING
 import collections
 import sys
 import ast
-import types
 from functools import cached_property
 from dataclasses import dataclass, field
 
+from IPython.utils.docs import GENERATING_DOCUMENTATION
+
+
+if TYPE_CHECKING or GENERATING_DOCUMENTATION:
+    from typing_extensions import Protocol
+else:
+    # do not require on runtime
+    Protocol = object  # requires Python >=3.8
+
 
 class HasGetItem(Protocol):
     def __getitem__(self, key) -> None: ...
@@ -266,20 +274,23 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
     Currently does not support evaluation of functions with arguments.
 
     Does not evaluate actions which always have side effects:
-    - class definitions (`class sth: ...`)
-    - function definitions (`def sth: ...`)
-    - variable assignments (`x = 1`)
-    - augumented assignments (`x += 1`)
-    - deletions (`del x`)
+    - class definitions (``class sth: ...``)
+    - function definitions (``def sth: ...``)
+    - variable assignments (``x = 1``)
+    - augumented assignments (``x += 1``)
+    - deletions (``del x``)
 
     Does not evaluate operations which do not return values:
-    - assertions (`assert x`)
-    - pass (`pass`)
-    - imports (`import x`)
+    - assertions (``assert x``)
+    - pass (``pass``)
+    - imports (``import x``)
     - control flow
-       - conditionals (`if x:`) except for terenary IfExp (`a if x else b`)
-       - loops (`for` and `while`)
+       - conditionals (``if x:``) except for terenary IfExp (``a if x else b``)
+       - loops (``for`` and `while``)
        - exception handling
+
+    The purpose of this function is to guard against unwanted side-effects;
+    it does not give guarantees on protection from malicious code execution.
     """
     policy = EVALUATION_POLICIES[context.evaluation]
     if node is None:
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 7a99a2655ab..4d8eecec1f8 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -24,6 +24,7 @@
     provisionalcompleter,
     match_dict_keys,
     _deduplicate_completions,
+    _match_number_in_dict_key_prefix,
     completion_matcher,
     SimpleCompletion,
     CompletionContext,
@@ -181,7 +182,6 @@ def check_line_split(splitter, test_specs):
         out = splitter.split_line(line, cursor_pos)
         assert out == split
 
-
 def test_line_split():
     """Basic line splitter test with default specs."""
     sp = completer.CompletionSplitter()
@@ -852,16 +852,37 @@ def test_match_dict_keys(self):
         """
         delims = " \t\n`!@#$^&*()=+[{]}\\|;:'\",<>?"
 
+        def match(*args, **kwargs):
+            quote, offset, matches = match_dict_keys(*args, **kwargs)
+            return quote, offset, list(matches)
+
         keys = ["foo", b"far"]
-        assert match_dict_keys(keys, "b'", delims=delims) == ("'", 2, ["far"])
-        assert match_dict_keys(keys, "b'f", delims=delims) == ("'", 2, ["far"])
-        assert match_dict_keys(keys, 'b"', delims=delims) == ('"', 2, ["far"])
-        assert match_dict_keys(keys, 'b"f', delims=delims) == ('"', 2, ["far"])
+        assert match(keys, "b'", delims=delims) == ("'", 2, ["far"])
+        assert match(keys, "b'f", delims=delims) == ("'", 2, ["far"])
+        assert match(keys, 'b"', delims=delims) == ('"', 2, ["far"])
+        assert match(keys, 'b"f', delims=delims) == ('"', 2, ["far"])
 
-        assert match_dict_keys(keys, "'", delims=delims) == ("'", 1, ["foo"])
-        assert match_dict_keys(keys, "'f", delims=delims) == ("'", 1, ["foo"])
-        assert match_dict_keys(keys, '"', delims=delims) == ('"', 1, ["foo"])
-        assert match_dict_keys(keys, '"f', delims=delims) == ('"', 1, ["foo"])
+        assert match(keys, "'", delims=delims) == ("'", 1, ["foo"])
+        assert match(keys, "'f", delims=delims) == ("'", 1, ["foo"])
+        assert match(keys, '"', delims=delims) == ('"', 1, ["foo"])
+        assert match(keys, '"f', delims=delims) == ('"', 1, ["foo"])
+
+        # Completion on first item of tuple
+        keys = [("foo", 1111), ("foo", 2222), (3333, "bar"), (3333, 'test')]
+        assert match(keys, "'f", delims=delims) == ("'", 1, ["foo"])
+        assert match(keys, "33", delims=delims) == ("", 0, ["3333"])
+
+        # Completion on numbers
+        keys = [
+            0xdeadbeef,   # 3735928559
+            1111, 1234, "1999",
+            0b10101,   # 21
+            22
+        ]
+        assert match(keys, "0xdead", delims=delims) == ("", 0, ["0xdeadbeef"])
+        assert match(keys, "1", delims=delims) == ("", 0, ["1111", "1234"])
+        assert match(keys, "2", delims=delims) == ("", 0, ["21", "22"])
+        assert match(keys, "0b101", delims=delims) == ("", 0, ['0b10101', '0b10110'])
 
     def test_match_dict_keys_tuple(self):
         """
@@ -872,30 +893,85 @@ def test_match_dict_keys_tuple(self):
 
         keys = [("foo", "bar"), ("foo", "oof"), ("foo", b"bar"), ('other', 'test')]
 
+        def match(*args, **kwargs):
+            quote, offset, matches = match_dict_keys(*args, **kwargs)
+            return quote, offset, list(matches)
+
         # Completion on first key == "foo"
-        assert match_dict_keys(keys, "'", delims=delims, extra_prefix=("foo",)) == ("'", 1, ["bar", "oof"])
-        assert match_dict_keys(keys, "\"", delims=delims, extra_prefix=("foo",)) == ("\"", 1, ["bar", "oof"])
-        assert match_dict_keys(keys, "'o", delims=delims, extra_prefix=("foo",)) == ("'", 1, ["oof"])
-        assert match_dict_keys(keys, "\"o", delims=delims, extra_prefix=("foo",)) == ("\"", 1, ["oof"])
-        assert match_dict_keys(keys, "b'", delims=delims, extra_prefix=("foo",)) == ("'", 2, ["bar"])
-        assert match_dict_keys(keys, "b\"", delims=delims, extra_prefix=("foo",)) == ("\"", 2, ["bar"])
-        assert match_dict_keys(keys, "b'b", delims=delims, extra_prefix=("foo",)) == ("'", 2, ["bar"])
-        assert match_dict_keys(keys, "b\"b", delims=delims, extra_prefix=("foo",)) == ("\"", 2, ["bar"])
+        assert match(keys, "'", delims=delims, extra_prefix=("foo",)) == ("'", 1, ["bar", "oof"])
+        assert match(keys, "\"", delims=delims, extra_prefix=("foo",)) == ("\"", 1, ["bar", "oof"])
+        assert match(keys, "'o", delims=delims, extra_prefix=("foo",)) == ("'", 1, ["oof"])
+        assert match(keys, "\"o", delims=delims, extra_prefix=("foo",)) == ("\"", 1, ["oof"])
+        assert match(keys, "b'", delims=delims, extra_prefix=("foo",)) == ("'", 2, ["bar"])
+        assert match(keys, "b\"", delims=delims, extra_prefix=("foo",)) == ("\"", 2, ["bar"])
+        assert match(keys, "b'b", delims=delims, extra_prefix=("foo",)) == ("'", 2, ["bar"])
+        assert match(keys, "b\"b", delims=delims, extra_prefix=("foo",)) == ("\"", 2, ["bar"])
 
         # No Completion
-        assert match_dict_keys(keys, "'", delims=delims, extra_prefix=("no_foo",)) == ("'", 1, [])
-        assert match_dict_keys(keys, "'", delims=delims, extra_prefix=("fo",)) == ("'", 1, [])
+        assert match(keys, "'", delims=delims, extra_prefix=("no_foo",)) == ("'", 1, [])
+        assert match(keys, "'", delims=delims, extra_prefix=("fo",)) == ("'", 1, [])
 
         keys = [('foo1', 'foo2', 'foo3', 'foo4'), ('foo1', 'foo2', 'bar', 'foo4')]
-        assert match_dict_keys(keys, "'foo", delims=delims, extra_prefix=('foo1',)) == ("'", 1, ["foo2", "foo2"])
-        assert match_dict_keys(keys, "'foo", delims=delims, extra_prefix=('foo1', 'foo2')) == ("'", 1, ["foo3"])
-        assert match_dict_keys(keys, "'foo", delims=delims, extra_prefix=('foo1', 'foo2', 'foo3')) == ("'", 1, ["foo4"])
-        assert match_dict_keys(keys, "'foo", delims=delims, extra_prefix=('foo1', 'foo2', 'foo3', 'foo4')) == ("'", 1, [])
+        assert match(keys, "'foo", delims=delims, extra_prefix=('foo1',)) == ("'", 1, ["foo2"])
+        assert match(keys, "'foo", delims=delims, extra_prefix=('foo1', 'foo2')) == ("'", 1, ["foo3"])
+        assert match(keys, "'foo", delims=delims, extra_prefix=('foo1', 'foo2', 'foo3')) == ("'", 1, ["foo4"])
+        assert match(keys, "'foo", delims=delims, extra_prefix=('foo1', 'foo2', 'foo3', 'foo4')) == ("'", 1, [])
+
+        keys = [("foo", 1111), ("foo", "2222"), (3333, "bar"), (3333, 4444)]
+        assert match(keys, "'", delims=delims, extra_prefix=("foo",)) == ("'", 1, ["2222"])
+        assert match(keys, "", delims=delims, extra_prefix=("foo",)) == ("", 0, ["1111", "'2222'"])
+        assert match(keys, "'", delims=delims, extra_prefix=(3333,)) == ("'", 1, ["bar"])
+        assert match(keys, "", delims=delims, extra_prefix=(3333,)) == ("", 0, ["'bar'", "4444"])
+        assert match(keys, "'", delims=delims, extra_prefix=("3333",)) == ("'", 1, [])
+        assert match(keys, "33", delims=delims) == ("", 0, ["3333"])
+
+    def test_dict_key_completion_closures(self):
+        ip = get_ipython()
+        complete = ip.Completer.complete
+        ip.Completer.auto_close_dict_keys = True
 
-        keys = [("foo", 1111), ("foo", 2222), (3333, "bar"), (3333, 'test')]
-        assert match_dict_keys(keys, "'", delims=delims, extra_prefix=("foo",)) == ("'", 1, ["1111", "2222"])
-        assert match_dict_keys(keys, "'", delims=delims, extra_prefix=(3333,)) == ("'", 1, ["bar", "test"])
-        assert match_dict_keys(keys, "'", delims=delims, extra_prefix=("3333",)) == ("'", 1, [])
+        ip.user_ns["d"] = {
+            # tuple only
+            ('aa', 11): None,
+            # tuple and non-tuple
+            ('bb', 22): None,
+            'bb': None,
+            # non-tuple only
+            'cc': None,
+            # numeric tuple only
+            (77, 'x'): None,
+            # numeric tuple and non-tuple
+            (88, 'y'): None,
+            88: None,
+            # numeric non-tuple only
+            99: None,
+        }
+
+        _, matches = complete(line_buffer="d[")
+        # should append `, ` if matches a tuple only
+        self.assertIn("'aa', ", matches)
+        # should not append anything if matches a tuple and an item
+        self.assertIn("'bb'", matches)
+        # should append `]` if matches and item only
+        self.assertIn("'cc']", matches)
+
+        # should append `, ` if matches a tuple only
+        self.assertIn("77, ", matches)
+        # should not append anything if matches a tuple and an item
+        self.assertIn("88", matches)
+        # should append `]` if matches and item only
+        self.assertIn("99]", matches)
+
+        _, matches = complete(line_buffer="d['aa', ")
+        # should restrict matches to those matching tuple prefix
+        self.assertIn("11]", matches)
+        self.assertNotIn("'bb'", matches)
+        self.assertNotIn("'bb', ", matches)
+        self.assertNotIn("'bb']", matches)
+        self.assertNotIn("'cc'", matches)
+        self.assertNotIn("'cc', ", matches)
+        self.assertNotIn("'cc']", matches)
+        ip.Completer.auto_close_dict_keys = False
 
     def test_dict_key_completion_string(self):
         """Test dictionary key completion for string keys"""
@@ -1052,6 +1128,35 @@ def test_dict_key_completion_string(self):
         self.assertNotIn("foo", matches)
         self.assertNotIn("bar", matches)
 
+    def test_dict_key_completion_numbers(self):
+        ip = get_ipython()
+        complete = ip.Completer.complete
+
+        ip.user_ns["d"] = {
+            0xdeadbeef: None,   # 3735928559
+            1111: None,
+            1234: None,
+            "1999": None,
+            0b10101: None,   # 21
+            22: None
+        }
+        _, matches = complete(line_buffer="d[1")
+        self.assertIn("1111", matches)
+        self.assertIn("1234", matches)
+        self.assertNotIn("1999", matches)
+        self.assertNotIn("'1999'", matches)
+
+        _, matches = complete(line_buffer="d[0xdead")
+        self.assertIn("0xdeadbeef", matches)
+
+        _, matches = complete(line_buffer="d[2")
+        self.assertIn("21", matches)
+        self.assertIn("22", matches)
+
+        _, matches = complete(line_buffer="d[0b101")
+        self.assertIn("0b10101", matches)
+        self.assertIn("0b10110", matches)
+
     def test_dict_key_completion_contexts(self):
         """Test expression contexts in which dict key completion occurs"""
         ip = get_ipython()
@@ -1545,3 +1650,35 @@ def _(expected):
             _(["completion_b"])
             a_matcher.matcher_priority = 3
             _(["completion_a"])
+
+
+@pytest.mark.parametrize(
+    'input, expected',
+    [
+        ['1.234', '1.234'],
+        # should match signed numbers
+        ['+1', '+1'],
+        ['-1', '-1'],
+        ['-1.0', '-1.0'],
+        ['-1.', '-1.'],
+        ['+1.', '+1.'],
+        ['.1', '.1'],
+        # should not match non-numbers
+        ['1..', None],
+        ['..', None],
+        ['.1.', None],
+        # should match after comma
+        [',1', '1'],
+        [', 1', '1'],
+        [', .1', '.1'],
+        [', +.1', '+.1'],
+        # should not match after trailing spaces
+        ['.1 ', None],
+        # some complex cases
+        ['0b_0011_1111_0100_1110', '0b_0011_1111_0100_1110'],
+        ['0xdeadbeef', '0xdeadbeef'],
+        ['0b_1110_0101', '0b_1110_0101']
+    ]
+)
+def test_match_numeric_literal_for_dict_key(input, expected):
+    assert _match_number_in_dict_key_prefix(input) == expected

From 21ae8802bd0d3b62a7e4e5fdc64648069616997d Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sat, 3 Dec 2022 00:41:40 +0000
Subject: [PATCH 1317/1407] You Want It Darker

---
 IPython/core/completer.py               | 112 +++++++------
 IPython/core/guarded_eval.py            | 207 +++++++++++-------------
 IPython/core/tests/test_completer.py    | 172 +++++++++++++-------
 IPython/core/tests/test_guarded_eval.py | 178 +++++++++-----------
 4 files changed, 338 insertions(+), 331 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index e53e83b38e9..3ea3dd99258 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -923,8 +923,8 @@ class Completer(Configurable):
     ).tag(config=True)
 
     evaluation = Enum(
-        ('forbidden', 'minimal', 'limitted', 'unsafe', 'dangerous'),
-        default_value='limitted',
+        ("forbidden", "minimal", "limitted", "unsafe", "dangerous"),
+        default_value="limitted",
         help="""Code evaluation under completion.
 
         Successive options allow to enable more eager evaluation for more accurate completion suggestions,
@@ -961,8 +961,7 @@ class Completer(Configurable):
              "unicode characters back to latex commands.").tag(config=True)
 
     auto_close_dict_keys = Bool(
-        False,
-        help="""Enable auto-closing dictionary keys."""
+        False, help="""Enable auto-closing dictionary keys."""
     ).tag(config=True)
 
     def __init__(self, namespace=None, global_namespace=None, **kwargs):
@@ -1066,7 +1065,7 @@ def attr_matches(self, text):
         m2 = re.match(r"(.+)\.(\w*)$", self.line_buffer)
         if not m2:
             return []
-        expr, attr = m2.group(1,2)
+        expr, attr = m2.group(1, 2)
 
         obj = self._evaluate_expr(expr)
 
@@ -1090,8 +1089,7 @@ def attr_matches(self, text):
             pass
         # Build match list to return
         n = len(attr)
-        return ["%s.%s" % (expr, w) for w in words if w[:n] == attr ]
-
+        return ["%s.%s" % (expr, w) for w in words if w[:n] == attr]
 
     def _evaluate_expr(self, expr):
         obj = not_found
@@ -1103,13 +1101,13 @@ def _evaluate_expr(self, expr):
                     EvaluationContext(
                         globals_=self.global_namespace,
                         locals_=self.namespace,
-                        evaluation=self.evaluation
-                    )
+                        evaluation=self.evaluation,
+                    ),
                 )
                 done = True
             except Exception as e:
                 if self.debug:
-                    print('Evaluation exception', e)
+                    print("Evaluation exception", e)
                 # trim the expression to remove any invalid prefix
                 # e.g. user starts `(d[`, so we get `expr = '(d'`,
                 # where parenthesis is not closed.
@@ -1135,6 +1133,7 @@ class DictKeyState(enum.Flag):
     - given `d3 = {('a', 'b'): 1}`: `d3['<tab>` will yield `{'a': IN_TUPLE}` as `'a'` can be added.
     - given `d4 = {'a': 1, ('a', 'b'): 2}`: `d4['<tab>` will yield `{'a': END_OF_ITEM & END_OF_TUPLE}`
     """
+
     BASELINE = 0
     END_OF_ITEM = enum.auto()
     END_OF_TUPLE = enum.auto()
@@ -1179,9 +1178,9 @@ def _match_number_in_dict_key_prefix(prefix: str) -> Union[str, None]:
                 # we did not match a number
                 return None
         if token.type == tokenize.OP:
-            if token.string == ',':
+            if token.string == ",":
                 break
-            if token.string in {'+', '-'}:
+            if token.string in {"+", "-"}:
                 number = token.string + number
         else:
             return None
@@ -1189,9 +1188,9 @@ def _match_number_in_dict_key_prefix(prefix: str) -> Union[str, None]:
 
 
 _INT_FORMATS = {
-    '0b': bin,
-    '0o': oct,
-    '0x': hex,
+    "0b": bin,
+    "0o": oct,
+    "0x": hex,
 }
 
 
@@ -1199,7 +1198,7 @@ def match_dict_keys(
     keys: List[Union[str, bytes, Tuple[Union[str, bytes], ...]]],
     prefix: str,
     delims: str,
-    extra_prefix: Optional[Tuple[Union[str, bytes], ...]] = None
+    extra_prefix: Optional[Tuple[Union[str, bytes], ...]] = None,
 ) -> Tuple[str, int, Dict[str, DictKeyState]]:
     """Used by dict_key_matches, matching the prefix to a list of keys
 
@@ -1225,11 +1224,13 @@ def match_dict_keys(
     """
     prefix_tuple = extra_prefix if extra_prefix else ()
 
-    prefix_tuple_size = sum([
-        # for pandas, do not count slices as taking space
-        not isinstance(k, slice)
-        for k in prefix_tuple
-    ])
+    prefix_tuple_size = sum(
+        [
+            # for pandas, do not count slices as taking space
+            not isinstance(k, slice)
+            for k in prefix_tuple
+        ]
+    )
     text_serializable_types = (str, bytes, int, float, slice)
 
     def filter_prefix_tuple(key):
@@ -1247,7 +1248,9 @@ def filter_prefix_tuple(key):
         # All checks passed!
         return True
 
-    filtered_key_is_final: Dict[Union[str, bytes, int, float], DictKeyState] = defaultdict(lambda: DictKeyState.BASELINE)
+    filtered_key_is_final: Dict[
+        Union[str, bytes, int, float], DictKeyState
+    ] = defaultdict(lambda: DictKeyState.BASELINE)
 
     for k in keys:
         # If at least one of the matches is not final, mark as undetermined.
@@ -1259,8 +1262,8 @@ def filter_prefix_tuple(key):
                 key_fragment = k[prefix_tuple_size]
                 filtered_key_is_final[key_fragment] |= (
                     DictKeyState.END_OF_TUPLE
-                    if len(k) == prefix_tuple_size + 1 else
-                    DictKeyState.IN_TUPLE
+                    if len(k) == prefix_tuple_size + 1
+                    else DictKeyState.IN_TUPLE
                 )
         elif prefix_tuple_size > 0:
             # we are completing a tuple but this key is not a tuple,
@@ -1273,9 +1276,9 @@ def filter_prefix_tuple(key):
     filtered_keys = filtered_key_is_final.keys()
 
     if not prefix:
-        return '', 0, {repr(k): v for k, v in filtered_key_is_final.items()}
+        return "", 0, {repr(k): v for k, v in filtered_key_is_final.items()}
 
-    quote_match = re.search('(?:"|\')', prefix)
+    quote_match = re.search("(?:\"|')", prefix)
     is_user_prefix_numeric = False
 
     if quote_match:
@@ -1284,7 +1287,7 @@ def filter_prefix_tuple(key):
         try:
             prefix_str = literal_eval(valid_prefix)
         except Exception:
-            return '', 0, {}
+            return "", 0, {}
     else:
         # If it does not look like a string, let's assume
         # we are dealing with a number or variable.
@@ -1294,11 +1297,11 @@ def filter_prefix_tuple(key):
         if number_match is None:
             # The alternative would be to assume that user forgort the quote
             # and if the substring matches, suggest adding it at the start.
-            return '', 0, {}
+            return "", 0, {}
 
         prefix_str = number_match
         is_user_prefix_numeric = True
-        quote = ''
+        quote = ""
 
     pattern = '[^' + ''.join('\\' + c for c in delims) + ']*$'
     token_match = re.search(pattern, prefix, re.UNICODE)
@@ -1333,7 +1336,7 @@ def filter_prefix_tuple(key):
             continue
 
         # reformat remainder of key to begin with prefix
-        rem = str_key[len(prefix_str):]
+        rem = str_key[len(prefix_str) :]
         # force repr wrapped in '
         rem_repr = repr(rem + '"') if isinstance(rem, str) else repr(rem + b'"')
         rem_repr = rem_repr[1 + rem_repr.index("'"):-2]
@@ -1344,7 +1347,7 @@ def filter_prefix_tuple(key):
             rem_repr = rem_repr.replace('"', '\\"')
 
         # then reinsert prefix from start of token
-        match = '%s%s' % (token_prefix, rem_repr)
+        match = "%s%s" % (token_prefix, rem_repr)
 
         matched[match] = filtered_key_is_final[key]
     return quote, token_start, matched
@@ -1572,7 +1575,8 @@ def _make_signature(completion)-> str:
 _CompleteResult = Dict[str, MatcherResult]
 
 
-DICT_MATCHER_REGEX = re.compile(r"""(?x)
+DICT_MATCHER_REGEX = re.compile(
+    r"""(?x)
 (  # match dict-referring - or any get item object - expression
     .+
 )
@@ -1616,7 +1620,9 @@ def _make_signature(completion)-> str:
     )
 )?
 $
-""")
+"""
+)
+
 
 def _convert_matcher_v1_result_to_v2(
     matches: Sequence[str],
@@ -1640,12 +1646,12 @@ class IPCompleter(Completer):
     @observe('greedy')
     def _greedy_changed(self, change):
         """update the splitter and readline delims when greedy is changed"""
-        if change['new']:
-            self.evaluation = 'unsafe'
+        if change["new"]:
+            self.evaluation = "unsafe"
             self.auto_close_dict_keys = True
             self.splitter.delims = GREEDY_DELIMS
         else:
-            self.evaluation = 'limitted'
+            self.evaluation = "limitted"
             self.auto_close_dict_keys = False
             self.splitter.delims = DELIMS
 
@@ -2375,13 +2381,12 @@ def _get_keys(obj: Any) -> List[Any]:
             return method()
 
         # Special case some common in-memory dict-like types
-        if (isinstance(obj, dict) or
-           _safe_isinstance(obj, 'pandas', 'DataFrame')):
+        if isinstance(obj, dict) or _safe_isinstance(obj, "pandas", "DataFrame"):
             try:
                 return list(obj.keys())
             except Exception:
                 return []
-        elif _safe_isinstance(obj, 'pandas', 'core', 'indexing', '_LocIndexer'):
+        elif _safe_isinstance(obj, "pandas", "core", "indexing", "_LocIndexer"):
             try:
                 return list(obj.obj.keys())
             except Exception:
@@ -2408,7 +2413,7 @@ def dict_key_matches(self, text: str) -> List[str]:
 
         # Short-circuit on closed dictionary (regular expression would
         # not match anyway, but would take quite a while).
-        if self.text_until_cursor.strip().endswith(']'):
+        if self.text_until_cursor.strip().endswith("]"):
             return []
 
         match = DICT_MATCHER_REGEX.search(self.text_until_cursor)
@@ -2433,15 +2438,12 @@ def dict_key_matches(self, text: str) -> List[str]:
                 globals_=self.global_namespace,
                 locals_=self.namespace,
                 evaluation=self.evaluation,
-                in_subscript=True
-            )
+                in_subscript=True,
+            ),
         )
 
         closing_quote, token_offset, matches = match_dict_keys(
-            keys,
-            key_prefix,
-            self.splitter.delims,
-            extra_prefix=tuple_prefix
+            keys, key_prefix, self.splitter.delims, extra_prefix=tuple_prefix
         )
         if not matches:
             return []
@@ -2469,11 +2471,11 @@ def dict_key_matches(self, text: str) -> List[str]:
         can_close_quote = False
         can_close_bracket = False
 
-        continuation = self.line_buffer[len(self.text_until_cursor):].strip()
+        continuation = self.line_buffer[len(self.text_until_cursor) :].strip()
 
         if continuation.startswith(closing_quote):
             # do not close if already closed, e.g. `d['a<tab>'`
-            continuation = continuation[len(closing_quote):]
+            continuation = continuation[len(closing_quote) :]
         else:
             can_close_quote = True
 
@@ -2483,8 +2485,14 @@ def dict_key_matches(self, text: str) -> List[str]:
         # handling it is out of scope, so let's avoid appending suffixes.
         has_known_tuple_handling = isinstance(obj, dict)
 
-        can_close_bracket = not continuation.startswith(']') and self.auto_close_dict_keys
-        can_close_tuple_item = not continuation.startswith(',') and has_known_tuple_handling and self.auto_close_dict_keys
+        can_close_bracket = (
+            not continuation.startswith("]") and self.auto_close_dict_keys
+        )
+        can_close_tuple_item = (
+            not continuation.startswith(",")
+            and has_known_tuple_handling
+            and self.auto_close_dict_keys
+        )
         can_close_quote = can_close_quote and self.auto_close_dict_keys
 
         # fast path if closing qoute should be appended but not suffix is allowed
@@ -2507,9 +2515,9 @@ def dict_key_matches(self, text: str) -> List[str]:
                 pass
 
             if state_flag in end_of_tuple_or_item and can_close_bracket:
-                result += ']'
+                result += "]"
             if state_flag == DictKeyState.IN_TUPLE and can_close_tuple_item:
-                result += ', '
+                result += ", "
             results.append(result)
         return results
 
diff --git a/IPython/core/guarded_eval.py b/IPython/core/guarded_eval.py
index d420ca80980..2c278a238ae 100644
--- a/IPython/core/guarded_eval.py
+++ b/IPython/core/guarded_eval.py
@@ -16,20 +16,24 @@
 
 
 class HasGetItem(Protocol):
-    def __getitem__(self, key) -> None: ...
+    def __getitem__(self, key) -> None:
+        ...
 
 
 class InstancesHaveGetItem(Protocol):
-    def __call__(self) -> HasGetItem: ...
+    def __call__(self) -> HasGetItem:
+        ...
 
 
 class HasGetAttr(Protocol):
-    def __getattr__(self, key) -> None: ...
+    def __getattr__(self, key) -> None:
+        ...
 
 
 class DoesNotHaveGetAttr(Protocol):
     pass
 
+
 # By default `__getattr__` is not explicitly implemented on most objects
 MayHaveGetattr = Union[HasGetAttr, DoesNotHaveGetAttr]
 
@@ -38,22 +42,16 @@ def unbind_method(func: Callable) -> Union[Callable, None]:
     """Get unbound method for given bound method.
 
     Returns None if cannot get unbound method."""
-    owner = getattr(func, '__self__', None)
+    owner = getattr(func, "__self__", None)
     owner_class = type(owner)
-    name = getattr(func, '__name__', None)
-    instance_dict_overrides = getattr(owner, '__dict__', None)
+    name = getattr(func, "__name__", None)
+    instance_dict_overrides = getattr(owner, "__dict__", None)
     if (
         owner is not None
-        and
-        name
-        and
-        (
+        and name
+        and (
             not instance_dict_overrides
-            or
-            (
-                instance_dict_overrides
-                and name not in instance_dict_overrides
-            )
+            or (instance_dict_overrides and name not in instance_dict_overrides)
         )
     ):
         return getattr(owner_class, name)
@@ -86,7 +84,13 @@ def can_call(self, func):
         if owner_method and owner_method in self.allowed_calls:
             return True
 
-def has_original_dunder_external(value, module_name, access_path, method_name,):
+
+def has_original_dunder_external(
+    value,
+    module_name,
+    access_path,
+    method_name,
+):
     try:
         if module_name not in sys.modules:
             return False
@@ -106,11 +110,7 @@ def has_original_dunder_external(value, module_name, access_path, method_name,):
 
 
 def has_original_dunder(
-    value,
-    allowed_types,
-    allowed_methods,
-    allowed_external,
-    method_name
+    value, allowed_types, allowed_methods, allowed_external, method_name
 ):
     # note: Python ignores `__getattr__`/`__getitem__` on instances,
     # we only need to check at class level
@@ -148,14 +148,14 @@ def can_get_attr(self, value, attr):
             allowed_types=self.allowed_getattr,
             allowed_methods=self._getattribute_methods,
             allowed_external=self.allowed_getattr_external,
-            method_name='__getattribute__'
+            method_name="__getattribute__",
         )
         has_original_attr = has_original_dunder(
             value,
             allowed_types=self.allowed_getattr,
             allowed_methods=self._getattr_methods,
             allowed_external=self.allowed_getattr_external,
-            method_name='__getattr__'
+            method_name="__getattr__",
         )
         # Many objects do not have `__getattr__`, this is fine
         if has_original_attr is None and has_original_attribute:
@@ -168,7 +168,6 @@ def get_attr(self, value, attr):
         if self.can_get_attr(value, attr):
             return getattr(value, attr)
 
-
     def can_get_item(self, value, item):
         """Allow accessing `__getiitem__` of allow-listed instances unless it was not modified."""
         return has_original_dunder(
@@ -176,29 +175,20 @@ def can_get_item(self, value, item):
             allowed_types=self.allowed_getitem,
             allowed_methods=self._getitem_methods,
             allowed_external=self.allowed_getitem_external,
-            method_name='__getitem__'
+            method_name="__getitem__",
         )
 
     @cached_property
     def _getitem_methods(self) -> Set[Callable]:
-        return self._safe_get_methods(
-            self.allowed_getitem,
-            '__getitem__'
-        )
+        return self._safe_get_methods(self.allowed_getitem, "__getitem__")
 
     @cached_property
     def _getattr_methods(self) -> Set[Callable]:
-        return self._safe_get_methods(
-            self.allowed_getattr,
-            '__getattr__'
-        )
+        return self._safe_get_methods(self.allowed_getattr, "__getattr__")
 
     @cached_property
     def _getattribute_methods(self) -> Set[Callable]:
-        return self._safe_get_methods(
-            self.allowed_getattr,
-            '__getattribute__'
-        )
+        return self._safe_get_methods(self.allowed_getattr, "__getattribute__")
 
     def _safe_get_methods(self, classes, name) -> Set[Callable]:
         return {
@@ -216,7 +206,9 @@ class DummyNamedTuple(NamedTuple):
 class EvaluationContext(NamedTuple):
     locals_: dict
     globals_: dict
-    evaluation: Literal['forbidden', 'minimal', 'limitted', 'unsafe', 'dangerous'] = 'forbidden'
+    evaluation: Literal[
+        "forbidden", "minimal", "limitted", "unsafe", "dangerous"
+    ] = "forbidden"
     in_subscript: bool = False
 
 
@@ -224,21 +216,20 @@ class IdentitySubscript:
     def __getitem__(self, key):
         return key
 
+
 IDENTITY_SUBSCRIPT = IdentitySubscript()
-SUBSCRIPT_MARKER = '__SUBSCRIPT_SENTINEL__'
+SUBSCRIPT_MARKER = "__SUBSCRIPT_SENTINEL__"
+
 
 class GuardRejection(ValueError):
     pass
 
 
-def guarded_eval(
-    code: str,
-    context: EvaluationContext
-):
+def guarded_eval(code: str, context: EvaluationContext):
     locals_ = context.locals_
 
-    if context.evaluation == 'forbidden':
-        raise GuardRejection('Forbidden mode')
+    if context.evaluation == "forbidden":
+        raise GuardRejection("Forbidden mode")
 
     # note: not using `ast.literal_eval` as it does not implement
     # getitem at all, for example it fails on simple `[0][1]`
@@ -252,19 +243,17 @@ def guarded_eval(
             return tuple()
         locals_ = locals_.copy()
         locals_[SUBSCRIPT_MARKER] = IDENTITY_SUBSCRIPT
-        code = SUBSCRIPT_MARKER + '[' + code + ']'
-        context = EvaluationContext(**{
-            **context._asdict(),
-            **{'locals_': locals_}
-        })
+        code = SUBSCRIPT_MARKER + "[" + code + "]"
+        context = EvaluationContext(**{**context._asdict(), **{"locals_": locals_}})
 
-    if context.evaluation == 'dangerous':
+    if context.evaluation == "dangerous":
         return eval(code, context.globals_, context.locals_)
 
-    expression = ast.parse(code, mode='eval')
+    expression = ast.parse(code, mode="eval")
 
     return eval_node(expression, context)
 
+
 def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
     """
     Evaluate AST node in provided context.
@@ -314,7 +303,7 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
         if isinstance(node.op, ast.Mod):
             return left % right
         if isinstance(node.op, ast.Pow):
-            return left ** right
+            return left**right
         if isinstance(node.op, ast.LShift):
             return left << right
         if isinstance(node.op, ast.RShift):
@@ -332,36 +321,26 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
     if isinstance(node, ast.Index):
         return eval_node(node.value, context)
     if isinstance(node, ast.Tuple):
-        return tuple(
-            eval_node(e, context)
-            for e in node.elts
-        )
+        return tuple(eval_node(e, context) for e in node.elts)
     if isinstance(node, ast.List):
-        return [
-            eval_node(e, context)
-            for e in node.elts
-        ]
+        return [eval_node(e, context) for e in node.elts]
     if isinstance(node, ast.Set):
-        return {
-            eval_node(e, context)
-            for e in node.elts
-        }
+        return {eval_node(e, context) for e in node.elts}
     if isinstance(node, ast.Dict):
-        return dict(zip(
-            [eval_node(k, context) for k in node.keys],
-            [eval_node(v, context) for v in node.values]
-        ))
+        return dict(
+            zip(
+                [eval_node(k, context) for k in node.keys],
+                [eval_node(v, context) for v in node.values],
+            )
+        )
     if isinstance(node, ast.Slice):
         return slice(
             eval_node(node.lower, context),
             eval_node(node.upper, context),
-            eval_node(node.step, context)
+            eval_node(node.step, context),
         )
     if isinstance(node, ast.ExtSlice):
-        return tuple([
-            eval_node(dim, context) 
-            for dim in node.dims
-        ])
+        return tuple([eval_node(dim, context) for dim in node.dims])
     if isinstance(node, ast.UnaryOp):
         # TODO: add guards
         value = eval_node(node.operand, context)
@@ -373,16 +352,16 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
             return ~value
         if isinstance(node.op, ast.Not):
             return not value
-        raise ValueError('Unhandled unary operation:', node.op)
+        raise ValueError("Unhandled unary operation:", node.op)
     if isinstance(node, ast.Subscript):
         value = eval_node(node.value, context)
         slice_ = eval_node(node.slice, context)
         if policy.can_get_item(value, slice_):
             return value[slice_]
         raise GuardRejection(
-            'Subscript access (`__getitem__`) for',
-            type(value), # not joined to avoid calling `repr`
-            f' not allowed in {context.evaluation} mode'
+            "Subscript access (`__getitem__`) for",
+            type(value),  # not joined to avoid calling `repr`
+            f" not allowed in {context.evaluation} mode",
         )
     if isinstance(node, ast.Name):
         if policy.allow_locals_access and node.id in context.locals_:
@@ -393,49 +372,46 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
             return __builtins__[node.id]
         if not policy.allow_globals_access and not policy.allow_locals_access:
             raise GuardRejection(
-                f'Namespace access not allowed in {context.evaluation} mode'
+                f"Namespace access not allowed in {context.evaluation} mode"
             )
         else:
-            raise NameError(f'{node.id} not found in locals nor globals')
+            raise NameError(f"{node.id} not found in locals nor globals")
     if isinstance(node, ast.Attribute):
         value = eval_node(node.value, context)
         if policy.can_get_attr(value, node.attr):
             return getattr(value, node.attr)
         raise GuardRejection(
-            'Attribute access (`__getattr__`) for',
-            type(value), # not joined to avoid calling `repr`
-            f'not allowed in {context.evaluation} mode'
+            "Attribute access (`__getattr__`) for",
+            type(value),  # not joined to avoid calling `repr`
+            f"not allowed in {context.evaluation} mode",
         )
     if isinstance(node, ast.IfExp):
         test = eval_node(node.test, context)
         if test:
-             return eval_node(node.body, context)
+            return eval_node(node.body, context)
         else:
             return eval_node(node.orelse, context)
     if isinstance(node, ast.Call):
         func = eval_node(node.func, context)
         print(node.keywords)
         if policy.can_call(func) and not node.keywords:
-            args = [
-                eval_node(arg, context)
-                for arg in node.args
-            ]
+            args = [eval_node(arg, context) for arg in node.args]
             return func(*args)
         raise GuardRejection(
-            'Call for',
-            func, # not joined to avoid calling `repr`
-            f'not allowed in {context.evaluation} mode'
+            "Call for",
+            func,  # not joined to avoid calling `repr`
+            f"not allowed in {context.evaluation} mode",
         )
-    raise ValueError('Unhandled node', node)
+    raise ValueError("Unhandled node", node)
 
 
 SUPPORTED_EXTERNAL_GETITEM = {
-    ('pandas', 'core', 'indexing', '_iLocIndexer'),
-    ('pandas', 'core', 'indexing', '_LocIndexer'),
-    ('pandas', 'DataFrame'),
-    ('pandas', 'Series'),
-    ('numpy', 'ndarray'),
-    ('numpy', 'void')
+    ("pandas", "core", "indexing", "_iLocIndexer"),
+    ("pandas", "core", "indexing", "_LocIndexer"),
+    ("pandas", "DataFrame"),
+    ("pandas", "Series"),
+    ("numpy", "ndarray"),
+    ("numpy", "void"),
 }
 
 BUILTIN_GETITEM = {
@@ -452,20 +428,17 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
     collections.UserList,
     collections.UserString,
     DummyNamedTuple,
-    IdentitySubscript
+    IdentitySubscript,
 }
 
 
 def _list_methods(cls, source=None):
     """For use on immutable objects or with methods returning a copy"""
-    return [
-        getattr(cls, k)
-        for k in (source if source else dir(cls))
-    ]
+    return [getattr(cls, k) for k in (source if source else dir(cls))]
 
 
-dict_non_mutating_methods = ('copy', 'keys', 'values', 'items')
-list_non_mutating_methods = ('copy', 'index', 'count')
+dict_non_mutating_methods = ("copy", "keys", "values", "items")
+list_non_mutating_methods = ("copy", "index", "count")
 set_non_mutating_methods = set(dir(set)) & set(dir(frozenset))
 
 
@@ -504,20 +477,20 @@ def _list_methods(cls, source=None):
     collections.Counter,
     *_list_methods(collections.Counter, dict_non_mutating_methods),
     collections.Counter.elements,
-    collections.Counter.most_common
+    collections.Counter.most_common,
 }
 
 EVALUATION_POLICIES = {
-    'minimal': EvaluationPolicy(
+    "minimal": EvaluationPolicy(
         allow_builtins_access=True,
         allow_locals_access=False,
         allow_globals_access=False,
         allow_item_access=False,
         allow_attr_access=False,
         allowed_calls=set(),
-        allow_any_calls=False
+        allow_any_calls=False,
     ),
-    'limitted': SelectivePolicy(
+    "limitted": SelectivePolicy(
         # TODO:
         # - should reject binary and unary operations if custom methods would be dispatched
         allowed_getitem=BUILTIN_GETITEM,
@@ -529,24 +502,24 @@ def _list_methods(cls, source=None):
             object,
             type,  # `type` handles a lot of generic cases, e.g. numbers as in `int.real`.
             dict_keys,
-            method_descriptor
+            method_descriptor,
         },
         allowed_getattr_external={
             # pandas Series/Frame implements custom `__getattr__`
-            ('pandas', 'DataFrame'),
-            ('pandas', 'Series')
+            ("pandas", "DataFrame"),
+            ("pandas", "Series"),
         },
         allow_builtins_access=True,
         allow_locals_access=True,
         allow_globals_access=True,
-        allowed_calls=ALLOWED_CALLS
+        allowed_calls=ALLOWED_CALLS,
     ),
-    'unsafe': EvaluationPolicy(
+    "unsafe": EvaluationPolicy(
         allow_builtins_access=True,
         allow_locals_access=True,
         allow_globals_access=True,
         allow_attr_access=True,
         allow_item_access=True,
-        allow_any_calls=True
-    )
-}
\ No newline at end of file
+        allow_any_calls=True,
+    ),
+}
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 4d8eecec1f8..4e385d546a0 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -868,21 +868,16 @@ def match(*args, **kwargs):
         assert match(keys, '"f', delims=delims) == ('"', 1, ["foo"])
 
         # Completion on first item of tuple
-        keys = [("foo", 1111), ("foo", 2222), (3333, "bar"), (3333, 'test')]
+        keys = [("foo", 1111), ("foo", 2222), (3333, "bar"), (3333, "test")]
         assert match(keys, "'f", delims=delims) == ("'", 1, ["foo"])
         assert match(keys, "33", delims=delims) == ("", 0, ["3333"])
 
         # Completion on numbers
-        keys = [
-            0xdeadbeef,   # 3735928559
-            1111, 1234, "1999",
-            0b10101,   # 21
-            22
-        ]
+        keys = [0xDEADBEEF, 1111, 1234, "1999", 0b10101, 22]  # 3735928559  # 21
         assert match(keys, "0xdead", delims=delims) == ("", 0, ["0xdeadbeef"])
         assert match(keys, "1", delims=delims) == ("", 0, ["1111", "1234"])
         assert match(keys, "2", delims=delims) == ("", 0, ["21", "22"])
-        assert match(keys, "0b101", delims=delims) == ("", 0, ['0b10101', '0b10110'])
+        assert match(keys, "0b101", delims=delims) == ("", 0, ["0b10101", "0b10110"])
 
     def test_match_dict_keys_tuple(self):
         """
@@ -898,30 +893,90 @@ def match(*args, **kwargs):
             return quote, offset, list(matches)
 
         # Completion on first key == "foo"
-        assert match(keys, "'", delims=delims, extra_prefix=("foo",)) == ("'", 1, ["bar", "oof"])
-        assert match(keys, "\"", delims=delims, extra_prefix=("foo",)) == ("\"", 1, ["bar", "oof"])
-        assert match(keys, "'o", delims=delims, extra_prefix=("foo",)) == ("'", 1, ["oof"])
-        assert match(keys, "\"o", delims=delims, extra_prefix=("foo",)) == ("\"", 1, ["oof"])
-        assert match(keys, "b'", delims=delims, extra_prefix=("foo",)) == ("'", 2, ["bar"])
-        assert match(keys, "b\"", delims=delims, extra_prefix=("foo",)) == ("\"", 2, ["bar"])
-        assert match(keys, "b'b", delims=delims, extra_prefix=("foo",)) == ("'", 2, ["bar"])
-        assert match(keys, "b\"b", delims=delims, extra_prefix=("foo",)) == ("\"", 2, ["bar"])
+        assert match(keys, "'", delims=delims, extra_prefix=("foo",)) == (
+            "'",
+            1,
+            ["bar", "oof"],
+        )
+        assert match(keys, '"', delims=delims, extra_prefix=("foo",)) == (
+            '"',
+            1,
+            ["bar", "oof"],
+        )
+        assert match(keys, "'o", delims=delims, extra_prefix=("foo",)) == (
+            "'",
+            1,
+            ["oof"],
+        )
+        assert match(keys, '"o', delims=delims, extra_prefix=("foo",)) == (
+            '"',
+            1,
+            ["oof"],
+        )
+        assert match(keys, "b'", delims=delims, extra_prefix=("foo",)) == (
+            "'",
+            2,
+            ["bar"],
+        )
+        assert match(keys, 'b"', delims=delims, extra_prefix=("foo",)) == (
+            '"',
+            2,
+            ["bar"],
+        )
+        assert match(keys, "b'b", delims=delims, extra_prefix=("foo",)) == (
+            "'",
+            2,
+            ["bar"],
+        )
+        assert match(keys, 'b"b', delims=delims, extra_prefix=("foo",)) == (
+            '"',
+            2,
+            ["bar"],
+        )
 
         # No Completion
         assert match(keys, "'", delims=delims, extra_prefix=("no_foo",)) == ("'", 1, [])
         assert match(keys, "'", delims=delims, extra_prefix=("fo",)) == ("'", 1, [])
 
-        keys = [('foo1', 'foo2', 'foo3', 'foo4'), ('foo1', 'foo2', 'bar', 'foo4')]
-        assert match(keys, "'foo", delims=delims, extra_prefix=('foo1',)) == ("'", 1, ["foo2"])
-        assert match(keys, "'foo", delims=delims, extra_prefix=('foo1', 'foo2')) == ("'", 1, ["foo3"])
-        assert match(keys, "'foo", delims=delims, extra_prefix=('foo1', 'foo2', 'foo3')) == ("'", 1, ["foo4"])
-        assert match(keys, "'foo", delims=delims, extra_prefix=('foo1', 'foo2', 'foo3', 'foo4')) == ("'", 1, [])
+        keys = [("foo1", "foo2", "foo3", "foo4"), ("foo1", "foo2", "bar", "foo4")]
+        assert match(keys, "'foo", delims=delims, extra_prefix=("foo1",)) == (
+            "'",
+            1,
+            ["foo2"],
+        )
+        assert match(keys, "'foo", delims=delims, extra_prefix=("foo1", "foo2")) == (
+            "'",
+            1,
+            ["foo3"],
+        )
+        assert match(
+            keys, "'foo", delims=delims, extra_prefix=("foo1", "foo2", "foo3")
+        ) == ("'", 1, ["foo4"])
+        assert match(
+            keys, "'foo", delims=delims, extra_prefix=("foo1", "foo2", "foo3", "foo4")
+        ) == ("'", 1, [])
 
         keys = [("foo", 1111), ("foo", "2222"), (3333, "bar"), (3333, 4444)]
-        assert match(keys, "'", delims=delims, extra_prefix=("foo",)) == ("'", 1, ["2222"])
-        assert match(keys, "", delims=delims, extra_prefix=("foo",)) == ("", 0, ["1111", "'2222'"])
-        assert match(keys, "'", delims=delims, extra_prefix=(3333,)) == ("'", 1, ["bar"])
-        assert match(keys, "", delims=delims, extra_prefix=(3333,)) == ("", 0, ["'bar'", "4444"])
+        assert match(keys, "'", delims=delims, extra_prefix=("foo",)) == (
+            "'",
+            1,
+            ["2222"],
+        )
+        assert match(keys, "", delims=delims, extra_prefix=("foo",)) == (
+            "",
+            0,
+            ["1111", "'2222'"],
+        )
+        assert match(keys, "'", delims=delims, extra_prefix=(3333,)) == (
+            "'",
+            1,
+            ["bar"],
+        )
+        assert match(keys, "", delims=delims, extra_prefix=(3333,)) == (
+            "",
+            0,
+            ["'bar'", "4444"],
+        )
         assert match(keys, "'", delims=delims, extra_prefix=("3333",)) == ("'", 1, [])
         assert match(keys, "33", delims=delims) == ("", 0, ["3333"])
 
@@ -932,16 +987,16 @@ def test_dict_key_completion_closures(self):
 
         ip.user_ns["d"] = {
             # tuple only
-            ('aa', 11): None,
+            ("aa", 11): None,
             # tuple and non-tuple
-            ('bb', 22): None,
-            'bb': None,
+            ("bb", 22): None,
+            "bb": None,
             # non-tuple only
-            'cc': None,
+            "cc": None,
             # numeric tuple only
-            (77, 'x'): None,
+            (77, "x"): None,
             # numeric tuple and non-tuple
-            (88, 'y'): None,
+            (88, "y"): None,
             88: None,
             # numeric non-tuple only
             99: None,
@@ -1133,12 +1188,12 @@ def test_dict_key_completion_numbers(self):
         complete = ip.Completer.complete
 
         ip.user_ns["d"] = {
-            0xdeadbeef: None,   # 3735928559
+            0xDEADBEEF: None,  # 3735928559
             1111: None,
             1234: None,
             "1999": None,
-            0b10101: None,   # 21
-            22: None
+            0b10101: None,  # 21
+            22: None,
         }
         _, matches = complete(line_buffer="d[1")
         self.assertIn("1111", matches)
@@ -1169,7 +1224,7 @@ class C:
 
         ip.user_ns["C"] = C
         ip.user_ns["get"] = lambda: d
-        ip.user_ns["nested"] = {'x': d}
+        ip.user_ns["nested"] = {"x": d}
 
         def assert_no_completion(**kwargs):
             _, matches = complete(**kwargs)
@@ -1198,7 +1253,7 @@ def assert_completion(**kwargs):
         # nested dict completion
         assert_completion(line_buffer="nested['x'][")
 
-        with evaluation_level('minimal'):
+        with evaluation_level("minimal"):
             with pytest.raises(AssertionError):
                 assert_completion(line_buffer="nested['x'][")
 
@@ -1289,6 +1344,7 @@ def test_struct_array_key_completion(self):
         _, matches = complete(line_buffer="d['")
         self.assertIn("my_head", matches)
         self.assertIn("my_data", matches)
+
         def completes_on_nested():
             ip.user_ns["d"] = numpy.zeros(2, dtype=dt)
             _, matches = complete(line_buffer="d[1]['my_head']['")
@@ -1298,10 +1354,10 @@ def completes_on_nested():
         with greedy_completion():
             completes_on_nested()
 
-        with evaluation_level('limitted'):
+        with evaluation_level("limitted"):
             completes_on_nested()
 
-        with evaluation_level('minimal'):
+        with evaluation_level("minimal"):
             with pytest.raises(AssertionError):
                 completes_on_nested()
 
@@ -1653,32 +1709,32 @@ def _(expected):
 
 
 @pytest.mark.parametrize(
-    'input, expected',
+    "input, expected",
     [
-        ['1.234', '1.234'],
+        ["1.234", "1.234"],
         # should match signed numbers
-        ['+1', '+1'],
-        ['-1', '-1'],
-        ['-1.0', '-1.0'],
-        ['-1.', '-1.'],
-        ['+1.', '+1.'],
-        ['.1', '.1'],
+        ["+1", "+1"],
+        ["-1", "-1"],
+        ["-1.0", "-1.0"],
+        ["-1.", "-1."],
+        ["+1.", "+1."],
+        [".1", ".1"],
         # should not match non-numbers
-        ['1..', None],
-        ['..', None],
-        ['.1.', None],
+        ["1..", None],
+        ["..", None],
+        [".1.", None],
         # should match after comma
-        [',1', '1'],
-        [', 1', '1'],
-        [', .1', '.1'],
-        [', +.1', '+.1'],
+        [",1", "1"],
+        [", 1", "1"],
+        [", .1", ".1"],
+        [", +.1", "+.1"],
         # should not match after trailing spaces
-        ['.1 ', None],
+        [".1 ", None],
         # some complex cases
-        ['0b_0011_1111_0100_1110', '0b_0011_1111_0100_1110'],
-        ['0xdeadbeef', '0xdeadbeef'],
-        ['0b_1110_0101', '0b_1110_0101']
-    ]
+        ["0b_0011_1111_0100_1110", "0b_0011_1111_0100_1110"],
+        ["0xdeadbeef", "0xdeadbeef"],
+        ["0b_1110_0101", "0b_1110_0101"],
+    ],
 )
 def test_match_numeric_literal_for_dict_key(input, expected):
     assert _match_number_in_dict_key_prefix(input) == expected
diff --git a/IPython/core/tests/test_guarded_eval.py b/IPython/core/tests/test_guarded_eval.py
index 5c89a68f637..129112ff4db 100644
--- a/IPython/core/tests/test_guarded_eval.py
+++ b/IPython/core/tests/test_guarded_eval.py
@@ -1,53 +1,54 @@
 from typing import NamedTuple
-from IPython.core.guarded_eval import EvaluationContext, GuardRejection, guarded_eval, unbind_method
+from IPython.core.guarded_eval import (
+    EvaluationContext,
+    GuardRejection,
+    guarded_eval,
+    unbind_method,
+)
 from IPython.testing import decorators as dec
 import pytest
 
 
 def limitted(**kwargs):
-    return EvaluationContext(
-        locals_=kwargs,
-        globals_={},
-        evaluation='limitted'
-    )
+    return EvaluationContext(locals_=kwargs, globals_={}, evaluation="limitted")
 
 
 def unsafe(**kwargs):
-    return EvaluationContext(
-        locals_=kwargs,
-        globals_={},
-        evaluation='unsafe'
-    )
+    return EvaluationContext(locals_=kwargs, globals_={}, evaluation="unsafe")
+
 
-@dec.skip_without('pandas')
+@dec.skip_without("pandas")
 def test_pandas_series_iloc():
     import pandas as pd
-    series = pd.Series([1], index=['a'])
+
+    series = pd.Series([1], index=["a"])
     context = limitted(data=series)
-    assert guarded_eval('data.iloc[0]', context) == 1
+    assert guarded_eval("data.iloc[0]", context) == 1
 
 
-@dec.skip_without('pandas')
+@dec.skip_without("pandas")
 def test_pandas_series():
     import pandas as pd
-    context = limitted(data=pd.Series([1], index=['a']))
+
+    context = limitted(data=pd.Series([1], index=["a"]))
     assert guarded_eval('data["a"]', context) == 1
     with pytest.raises(KeyError):
         guarded_eval('data["c"]', context)
 
 
-@dec.skip_without('pandas')
+@dec.skip_without("pandas")
 def test_pandas_bad_series():
     import pandas as pd
+
     class BadItemSeries(pd.Series):
         def __getitem__(self, key):
-            return 'CUSTOM_ITEM'
+            return "CUSTOM_ITEM"
 
     class BadAttrSeries(pd.Series):
         def __getattr__(self, key):
-            return 'CUSTOM_ATTR'
+            return "CUSTOM_ATTR"
 
-    bad_series = BadItemSeries([1], index=['a'])
+    bad_series = BadItemSeries([1], index=["a"])
     context = limitted(data=bad_series)
 
     with pytest.raises(GuardRejection):
@@ -58,121 +59,108 @@ def __getattr__(self, key):
     # note: here result is a bit unexpected because
     # pandas `__getattr__` calls `__getitem__`;
     # FIXME - special case to handle it?
-    assert guarded_eval('data.a', context) == 'CUSTOM_ITEM'
+    assert guarded_eval("data.a", context) == "CUSTOM_ITEM"
 
     context = unsafe(data=bad_series)
-    assert guarded_eval('data["a"]', context) == 'CUSTOM_ITEM'
+    assert guarded_eval('data["a"]', context) == "CUSTOM_ITEM"
 
-    bad_attr_series = BadAttrSeries([1], index=['a'])
+    bad_attr_series = BadAttrSeries([1], index=["a"])
     context = limitted(data=bad_attr_series)
     assert guarded_eval('data["a"]', context) == 1
     with pytest.raises(GuardRejection):
-        guarded_eval('data.a', context)
+        guarded_eval("data.a", context)
 
 
-@dec.skip_without('pandas')
+@dec.skip_without("pandas")
 def test_pandas_dataframe_loc():
     import pandas as pd
     from pandas.testing import assert_series_equal
-    data = pd.DataFrame([{'a': 1}])
+
+    data = pd.DataFrame([{"a": 1}])
     context = limitted(data=data)
-    assert_series_equal(
-        guarded_eval('data.loc[:, "a"]', context),
-        data['a']
-    )
+    assert_series_equal(guarded_eval('data.loc[:, "a"]', context), data["a"])
 
 
 def test_named_tuple():
-
     class GoodNamedTuple(NamedTuple):
         a: str
         pass
 
     class BadNamedTuple(NamedTuple):
         a: str
+
         def __getitem__(self, key):
             return None
 
-    good = GoodNamedTuple(a='x')
-    bad = BadNamedTuple(a='x')
+    good = GoodNamedTuple(a="x")
+    bad = BadNamedTuple(a="x")
 
     context = limitted(data=good)
-    assert guarded_eval('data[0]', context) == 'x'
+    assert guarded_eval("data[0]", context) == "x"
 
     context = limitted(data=bad)
     with pytest.raises(GuardRejection):
-        guarded_eval('data[0]', context)
+        guarded_eval("data[0]", context)
 
 
 def test_dict():
-    context = limitted(
-        data={'a': 1, 'b': {'x': 2}, ('x', 'y'): 3}
-    )
+    context = limitted(data={"a": 1, "b": {"x": 2}, ("x", "y"): 3})
     assert guarded_eval('data["a"]', context) == 1
-    assert guarded_eval('data["b"]', context) == {'x': 2}
+    assert guarded_eval('data["b"]', context) == {"x": 2}
     assert guarded_eval('data["b"]["x"]', context) == 2
     assert guarded_eval('data["x", "y"]', context) == 3
 
-    assert guarded_eval('data.keys', context)
+    assert guarded_eval("data.keys", context)
 
 
 def test_set():
-    context = limitted(data={'a', 'b'})
-    assert guarded_eval('data.difference', context)
+    context = limitted(data={"a", "b"})
+    assert guarded_eval("data.difference", context)
 
 
 def test_list():
     context = limitted(data=[1, 2, 3])
-    assert guarded_eval('data[1]', context) == 2
-    assert guarded_eval('data.copy', context)
+    assert guarded_eval("data[1]", context) == 2
+    assert guarded_eval("data.copy", context)
 
 
 def test_dict_literal():
     context = limitted()
-    assert guarded_eval('{}', context) == {}
+    assert guarded_eval("{}", context) == {}
     assert guarded_eval('{"a": 1}', context) == {"a": 1}
 
 
 def test_list_literal():
     context = limitted()
-    assert guarded_eval('[]', context) == []
+    assert guarded_eval("[]", context) == []
     assert guarded_eval('[1, "a"]', context) == [1, "a"]
 
 
 def test_set_literal():
     context = limitted()
-    assert guarded_eval('set()', context) == set()
+    assert guarded_eval("set()", context) == set()
     assert guarded_eval('{"a"}', context) == {"a"}
 
 
 def test_if_expression():
     context = limitted()
-    assert guarded_eval('2 if True else 3', context) == 2
-    assert guarded_eval('4 if False else 5', context) == 5
+    assert guarded_eval("2 if True else 3", context) == 2
+    assert guarded_eval("4 if False else 5", context) == 5
 
 
 def test_object():
     obj = object()
     context = limitted(obj=obj)
-    assert guarded_eval('obj.__dir__', context) == obj.__dir__
+    assert guarded_eval("obj.__dir__", context) == obj.__dir__
 
 
 @pytest.mark.parametrize(
     "code,expected",
     [
-        [
-            'int.numerator',
-            int.numerator
-        ],
-        [
-            'float.is_integer',
-            float.is_integer
-        ],
-        [
-            'complex.real',
-            complex.real
-        ]
-    ]
+        ["int.numerator", int.numerator],
+        ["float.is_integer", float.is_integer],
+        ["complex.real", complex.real],
+    ],
 )
 def test_number_attributes(code, expected):
     assert guarded_eval(code, limitted()) == expected
@@ -180,25 +168,15 @@ def test_number_attributes(code, expected):
 
 def test_method_descriptor():
     context = limitted()
-    assert guarded_eval('list.copy.__name__', context) == 'copy'
+    assert guarded_eval("list.copy.__name__", context) == "copy"
 
 
 @pytest.mark.parametrize(
     "data,good,bad,expected",
     [
-        [
-            [1, 2, 3],
-            'data.index(2)',
-            'data.append(4)',
-            1
-        ],
-        [
-            {'a': 1},
-            'data.keys().isdisjoint({})',
-            'data.update()',
-            True
-        ]
-    ]
+        [[1, 2, 3], "data.index(2)", "data.append(4)", 1],
+        [{"a": 1}, "data.keys().isdisjoint({})", "data.update()", True],
+    ],
 )
 def test_calls(data, good, bad, expected):
     context = limitted(data=data)
@@ -211,19 +189,10 @@ def test_calls(data, good, bad, expected):
 @pytest.mark.parametrize(
     "code,expected",
     [
-        [
-            '(1\n+\n1)',
-            2
-        ],
-        [
-            'list(range(10))[-1:]',
-            [9]
-        ],
-        [
-            'list(range(20))[3:-2:3]',
-            [3, 6, 9, 12, 15]
-        ]
-    ]
+        ["(1\n+\n1)", 2],
+        ["list(range(10))[-1:]", [9]],
+        ["list(range(20))[3:-2:3]", [3, 6, 9, 12, 15]],
+    ],
 )
 def test_literals(code, expected):
     context = limitted()
@@ -232,22 +201,20 @@ def test_literals(code, expected):
 
 def test_subscript():
     context = EvaluationContext(
-        locals_={},
-        globals_={},
-        evaluation='limitted',
-        in_subscript=True
+        locals_={}, globals_={}, evaluation="limitted", in_subscript=True
     )
     empty_slice = slice(None, None, None)
-    assert guarded_eval('', context) == tuple()
-    assert guarded_eval(':', context) == empty_slice
-    assert guarded_eval('1:2:3', context) == slice(1, 2, 3)
+    assert guarded_eval("", context) == tuple()
+    assert guarded_eval(":", context) == empty_slice
+    assert guarded_eval("1:2:3", context) == slice(1, 2, 3)
     assert guarded_eval(':, "a"', context) == (empty_slice, "a")
 
 
 def test_unbind_method():
     class X(list):
         def index(self, k):
-            return 'CUSTOM'
+            return "CUSTOM"
+
     x = X()
     assert unbind_method(x.index) is X.index
     assert unbind_method([].index) is list.index
@@ -261,16 +228,19 @@ def test_assumption_instance_attr_do_not_matter():
     versions could invalidate this assumptions. This test
     is meant to catch such a change if it ever comes true.
     """
+
     class T:
         def __getitem__(self, k):
-            return 'a'
+            return "a"
+
         def __getattr__(self, k):
-            return 'a'
+            return "a"
+
     t = T()
-    t.__getitem__ = lambda f: 'b'
-    t.__getattr__ = lambda f: 'b'
-    assert t[1] == 'a'
-    assert t[1] == 'a'
+    t.__getitem__ = lambda f: "b"
+    t.__getattr__ = lambda f: "b"
+    assert t[1] == "a"
+    assert t[1] == "a"
 
 
 def test_assumption_named_tuples_share_getitem():

From b2af257cac51c788faeb2186fd9494f4f9fc8b1c Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sat, 3 Dec 2022 01:14:39 +0000
Subject: [PATCH 1318/1407] Fix typos

---
 IPython/core/completer.py               | 10 +++---
 IPython/core/guarded_eval.py            | 11 +++----
 IPython/core/tests/test_completer.py    |  2 +-
 IPython/core/tests/test_guarded_eval.py | 44 ++++++++++++-------------
 4 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 3ea3dd99258..46ab19423cb 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -916,15 +916,15 @@ class Completer(Configurable):
         .. deprecated:: 8.8
             Use :any:`evaluation` and :any:`auto_close_dict_keys` instead.
 
-        Whent enabled in IPython 8.8+ activates following settings for compatibility:
+        When enabled in IPython 8.8+ activates following settings for compatibility:
         - ``evaluation = 'unsafe'``
         - ``auto_close_dict_keys = True``
         """,
     ).tag(config=True)
 
     evaluation = Enum(
-        ("forbidden", "minimal", "limitted", "unsafe", "dangerous"),
-        default_value="limitted",
+        ("forbidden", "minimal", "limited", "unsafe", "dangerous"),
+        default_value="limited",
         help="""Code evaluation under completion.
 
         Successive options allow to enable more eager evaluation for more accurate completion suggestions,
@@ -934,7 +934,7 @@ class Completer(Configurable):
         Allowed values are:
           - `forbidden`: no evaluation at all
           - `minimal`:  evaluation of literals and access to built-in namespaces; no item/attribute evaluation nor access to locals/globals
-          - `limitted` (default): access to all namespaces, evaluation of hard-coded methods (``keys()``, ``__getattr__``, ``__getitems__``, etc) on allow-listed objects (e.g. ``dict``, ``list``, ``tuple``, ``pandas.Series``)
+          - `limited` (default): access to all namespaces, evaluation of hard-coded methods (``keys()``, ``__getattr__``, ``__getitems__``, etc) on allow-listed objects (e.g. ``dict``, ``list``, ``tuple``, ``pandas.Series``)
           - `unsafe`: evaluation of all methods and function calls but not of syntax with side-effects like `del x`,
           - `dangerous`: completely arbitrary evaluation
         """,
@@ -1651,7 +1651,7 @@ def _greedy_changed(self, change):
             self.auto_close_dict_keys = True
             self.splitter.delims = GREEDY_DELIMS
         else:
-            self.evaluation = "limitted"
+            self.evaluation = "limited"
             self.auto_close_dict_keys = False
             self.splitter.delims = DELIMS
 
diff --git a/IPython/core/guarded_eval.py b/IPython/core/guarded_eval.py
index 2c278a238ae..0ed69dbb677 100644
--- a/IPython/core/guarded_eval.py
+++ b/IPython/core/guarded_eval.py
@@ -207,7 +207,7 @@ class EvaluationContext(NamedTuple):
     locals_: dict
     globals_: dict
     evaluation: Literal[
-        "forbidden", "minimal", "limitted", "unsafe", "dangerous"
+        "forbidden", "minimal", "limited", "unsafe", "dangerous"
     ] = "forbidden"
     in_subscript: bool = False
 
@@ -260,13 +260,13 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
 
     Applies evaluation restrictions defined in the context.
 
-    Currently does not support evaluation of functions with arguments.
+    Currently does not support evaluation of functions with keyword arguments.
 
     Does not evaluate actions which always have side effects:
     - class definitions (``class sth: ...``)
     - function definitions (``def sth: ...``)
     - variable assignments (``x = 1``)
-    - augumented assignments (``x += 1``)
+    - augmented assignments (``x += 1``)
     - deletions (``del x``)
 
     Does not evaluate operations which do not return values:
@@ -274,7 +274,7 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
     - pass (``pass``)
     - imports (``import x``)
     - control flow
-       - conditionals (``if x:``) except for terenary IfExp (``a if x else b``)
+       - conditionals (``if x:``) except for ternary IfExp (``a if x else b``)
        - loops (``for`` and `while``)
        - exception handling
 
@@ -393,7 +393,6 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
             return eval_node(node.orelse, context)
     if isinstance(node, ast.Call):
         func = eval_node(node.func, context)
-        print(node.keywords)
         if policy.can_call(func) and not node.keywords:
             args = [eval_node(arg, context) for arg in node.args]
             return func(*args)
@@ -490,7 +489,7 @@ def _list_methods(cls, source=None):
         allowed_calls=set(),
         allow_any_calls=False,
     ),
-    "limitted": SelectivePolicy(
+    "limited": SelectivePolicy(
         # TODO:
         # - should reject binary and unary operations if custom methods would be dispatched
         allowed_getitem=BUILTIN_GETITEM,
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 4e385d546a0..849d963905f 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -1354,7 +1354,7 @@ def completes_on_nested():
         with greedy_completion():
             completes_on_nested()
 
-        with evaluation_level("limitted"):
+        with evaluation_level("limited"):
             completes_on_nested()
 
         with evaluation_level("minimal"):
diff --git a/IPython/core/tests/test_guarded_eval.py b/IPython/core/tests/test_guarded_eval.py
index 129112ff4db..2c9db81bb19 100644
--- a/IPython/core/tests/test_guarded_eval.py
+++ b/IPython/core/tests/test_guarded_eval.py
@@ -9,8 +9,8 @@
 import pytest
 
 
-def limitted(**kwargs):
-    return EvaluationContext(locals_=kwargs, globals_={}, evaluation="limitted")
+def limited(**kwargs):
+    return EvaluationContext(locals_=kwargs, globals_={}, evaluation="limited")
 
 
 def unsafe(**kwargs):
@@ -22,7 +22,7 @@ def test_pandas_series_iloc():
     import pandas as pd
 
     series = pd.Series([1], index=["a"])
-    context = limitted(data=series)
+    context = limited(data=series)
     assert guarded_eval("data.iloc[0]", context) == 1
 
 
@@ -30,7 +30,7 @@ def test_pandas_series_iloc():
 def test_pandas_series():
     import pandas as pd
 
-    context = limitted(data=pd.Series([1], index=["a"]))
+    context = limited(data=pd.Series([1], index=["a"]))
     assert guarded_eval('data["a"]', context) == 1
     with pytest.raises(KeyError):
         guarded_eval('data["c"]', context)
@@ -49,7 +49,7 @@ def __getattr__(self, key):
             return "CUSTOM_ATTR"
 
     bad_series = BadItemSeries([1], index=["a"])
-    context = limitted(data=bad_series)
+    context = limited(data=bad_series)
 
     with pytest.raises(GuardRejection):
         guarded_eval('data["a"]', context)
@@ -65,7 +65,7 @@ def __getattr__(self, key):
     assert guarded_eval('data["a"]', context) == "CUSTOM_ITEM"
 
     bad_attr_series = BadAttrSeries([1], index=["a"])
-    context = limitted(data=bad_attr_series)
+    context = limited(data=bad_attr_series)
     assert guarded_eval('data["a"]', context) == 1
     with pytest.raises(GuardRejection):
         guarded_eval("data.a", context)
@@ -77,7 +77,7 @@ def test_pandas_dataframe_loc():
     from pandas.testing import assert_series_equal
 
     data = pd.DataFrame([{"a": 1}])
-    context = limitted(data=data)
+    context = limited(data=data)
     assert_series_equal(guarded_eval('data.loc[:, "a"]', context), data["a"])
 
 
@@ -95,16 +95,16 @@ def __getitem__(self, key):
     good = GoodNamedTuple(a="x")
     bad = BadNamedTuple(a="x")
 
-    context = limitted(data=good)
+    context = limited(data=good)
     assert guarded_eval("data[0]", context) == "x"
 
-    context = limitted(data=bad)
+    context = limited(data=bad)
     with pytest.raises(GuardRejection):
         guarded_eval("data[0]", context)
 
 
 def test_dict():
-    context = limitted(data={"a": 1, "b": {"x": 2}, ("x", "y"): 3})
+    context = limited(data={"a": 1, "b": {"x": 2}, ("x", "y"): 3})
     assert guarded_eval('data["a"]', context) == 1
     assert guarded_eval('data["b"]', context) == {"x": 2}
     assert guarded_eval('data["b"]["x"]', context) == 2
@@ -114,43 +114,43 @@ def test_dict():
 
 
 def test_set():
-    context = limitted(data={"a", "b"})
+    context = limited(data={"a", "b"})
     assert guarded_eval("data.difference", context)
 
 
 def test_list():
-    context = limitted(data=[1, 2, 3])
+    context = limited(data=[1, 2, 3])
     assert guarded_eval("data[1]", context) == 2
     assert guarded_eval("data.copy", context)
 
 
 def test_dict_literal():
-    context = limitted()
+    context = limited()
     assert guarded_eval("{}", context) == {}
     assert guarded_eval('{"a": 1}', context) == {"a": 1}
 
 
 def test_list_literal():
-    context = limitted()
+    context = limited()
     assert guarded_eval("[]", context) == []
     assert guarded_eval('[1, "a"]', context) == [1, "a"]
 
 
 def test_set_literal():
-    context = limitted()
+    context = limited()
     assert guarded_eval("set()", context) == set()
     assert guarded_eval('{"a"}', context) == {"a"}
 
 
 def test_if_expression():
-    context = limitted()
+    context = limited()
     assert guarded_eval("2 if True else 3", context) == 2
     assert guarded_eval("4 if False else 5", context) == 5
 
 
 def test_object():
     obj = object()
-    context = limitted(obj=obj)
+    context = limited(obj=obj)
     assert guarded_eval("obj.__dir__", context) == obj.__dir__
 
 
@@ -163,11 +163,11 @@ def test_object():
     ],
 )
 def test_number_attributes(code, expected):
-    assert guarded_eval(code, limitted()) == expected
+    assert guarded_eval(code, limited()) == expected
 
 
 def test_method_descriptor():
-    context = limitted()
+    context = limited()
     assert guarded_eval("list.copy.__name__", context) == "copy"
 
 
@@ -179,7 +179,7 @@ def test_method_descriptor():
     ],
 )
 def test_calls(data, good, bad, expected):
-    context = limitted(data=data)
+    context = limited(data=data)
     assert guarded_eval(good, context) == expected
 
     with pytest.raises(GuardRejection):
@@ -195,13 +195,13 @@ def test_calls(data, good, bad, expected):
     ],
 )
 def test_literals(code, expected):
-    context = limitted()
+    context = limited()
     assert guarded_eval(code, context) == expected
 
 
 def test_subscript():
     context = EvaluationContext(
-        locals_={}, globals_={}, evaluation="limitted", in_subscript=True
+        locals_={}, globals_={}, evaluation="limited", in_subscript=True
     )
     empty_slice = slice(None, None, None)
     assert guarded_eval("", context) == tuple()

From 467747d1e6716a0b5b796d2f9dcabe7474833d29 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sat, 3 Dec 2022 14:55:42 +0000
Subject: [PATCH 1319/1407] Check types with mypy

---
 .github/workflows/mypy.yml              |  1 +
 IPython/core/guarded_eval.py            | 49 ++++++++++++++++---------
 IPython/core/tests/test_completer.py    |  8 ++--
 IPython/core/tests/test_guarded_eval.py |  5 +++
 4 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index 8d1927d6b36..3ff6f86349e 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -31,6 +31,7 @@ jobs:
       run: |
         mypy -p IPython.terminal
         mypy -p IPython.core.magics
+        mypy -p IPython.core.guarded_eval
     - name: Lint with pyflakes
       run: |
         flake8  IPython/core/magics/script.py
diff --git a/IPython/core/guarded_eval.py b/IPython/core/guarded_eval.py
index 0ed69dbb677..a510d381485 100644
--- a/IPython/core/guarded_eval.py
+++ b/IPython/core/guarded_eval.py
@@ -1,4 +1,15 @@
-from typing import Callable, Set, Tuple, NamedTuple, Literal, Union, TYPE_CHECKING
+from typing import (
+    Any,
+    Callable,
+    Set,
+    Tuple,
+    NamedTuple,
+    Type,
+    Literal,
+    Union,
+    TYPE_CHECKING,
+)
+import builtins
 import collections
 import sys
 import ast
@@ -21,7 +32,7 @@ def __getitem__(self, key) -> None:
 
 
 class InstancesHaveGetItem(Protocol):
-    def __call__(self) -> HasGetItem:
+    def __call__(self, *args, **kwargs) -> HasGetItem:
         ...
 
 
@@ -55,6 +66,7 @@ def unbind_method(func: Callable) -> Union[Callable, None]:
         )
     ):
         return getattr(owner_class, name)
+    return None
 
 
 @dataclass
@@ -137,7 +149,7 @@ def has_original_dunder(
 
 @dataclass
 class SelectivePolicy(EvaluationPolicy):
-    allowed_getitem: Set[HasGetItem] = field(default_factory=set)
+    allowed_getitem: Set[InstancesHaveGetItem] = field(default_factory=set)
     allowed_getitem_external: Set[Tuple[str, ...]] = field(default_factory=set)
     allowed_getattr: Set[MayHaveGetattr] = field(default_factory=set)
     allowed_getattr_external: Set[Tuple[str, ...]] = field(default_factory=set)
@@ -368,8 +380,9 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
             return context.locals_[node.id]
         if policy.allow_globals_access and node.id in context.globals_:
             return context.globals_[node.id]
-        if policy.allow_builtins_access and node.id in __builtins__:
-            return __builtins__[node.id]
+        if policy.allow_builtins_access and hasattr(builtins, node.id):
+            # note: do not use __builtins__, it is implementation detail of Python
+            return getattr(builtins, node.id)
         if not policy.allow_globals_access and not policy.allow_locals_access:
             raise GuardRejection(
                 f"Namespace access not allowed in {context.evaluation} mode"
@@ -413,7 +426,7 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
     ("numpy", "void"),
 }
 
-BUILTIN_GETITEM = {
+BUILTIN_GETITEM: Set[InstancesHaveGetItem] = {
     dict,
     str,
     bytes,
@@ -441,8 +454,8 @@ def _list_methods(cls, source=None):
 set_non_mutating_methods = set(dir(set)) & set(dir(frozenset))
 
 
-dict_keys = type({}.keys())
-method_descriptor = type(list.copy)
+dict_keys: Type[collections.abc.KeysView] = type({}.keys())
+method_descriptor: Any = type(list.copy)
 
 ALLOWED_CALLS = {
     bytes,
@@ -479,6 +492,16 @@ def _list_methods(cls, source=None):
     collections.Counter.most_common,
 }
 
+BUILTIN_GETATTR: Set[MayHaveGetattr] = {
+    *BUILTIN_GETITEM,
+    set,
+    frozenset,
+    object,
+    type,  # `type` handles a lot of generic cases, e.g. numbers as in `int.real`.
+    dict_keys,
+    method_descriptor,
+}
+
 EVALUATION_POLICIES = {
     "minimal": EvaluationPolicy(
         allow_builtins_access=True,
@@ -494,15 +517,7 @@ def _list_methods(cls, source=None):
         # - should reject binary and unary operations if custom methods would be dispatched
         allowed_getitem=BUILTIN_GETITEM,
         allowed_getitem_external=SUPPORTED_EXTERNAL_GETITEM,
-        allowed_getattr={
-            *BUILTIN_GETITEM,
-            set,
-            frozenset,
-            object,
-            type,  # `type` handles a lot of generic cases, e.g. numbers as in `int.real`.
-            dict_keys,
-            method_descriptor,
-        },
+        allowed_getattr=BUILTIN_GETATTR,
         allowed_getattr_external={
             # pandas Series/Frame implements custom `__getattr__`
             ("pandas", "DataFrame"),
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 849d963905f..bd2fa3cefdb 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -114,7 +114,7 @@ def greedy_completion():
 
 
 @contextmanager
-def evaluation_level(evaluation: str):
+def evaluation_policy(evaluation: str):
     ip = get_ipython()
     evaluation_original = ip.Completer.evaluation
     try:
@@ -1253,7 +1253,7 @@ def assert_completion(**kwargs):
         # nested dict completion
         assert_completion(line_buffer="nested['x'][")
 
-        with evaluation_level("minimal"):
+        with evaluation_policy("minimal"):
             with pytest.raises(AssertionError):
                 assert_completion(line_buffer="nested['x'][")
 
@@ -1354,10 +1354,10 @@ def completes_on_nested():
         with greedy_completion():
             completes_on_nested()
 
-        with evaluation_level("limited"):
+        with evaluation_policy("limited"):
             completes_on_nested()
 
-        with evaluation_level("minimal"):
+        with evaluation_policy("minimal"):
             with pytest.raises(AssertionError):
                 completes_on_nested()
 
diff --git a/IPython/core/tests/test_guarded_eval.py b/IPython/core/tests/test_guarded_eval.py
index 2c9db81bb19..b908f2af255 100644
--- a/IPython/core/tests/test_guarded_eval.py
+++ b/IPython/core/tests/test_guarded_eval.py
@@ -199,6 +199,11 @@ def test_literals(code, expected):
     assert guarded_eval(code, context) == expected
 
 
+def test_access_builtins():
+    context = limited()
+    assert guarded_eval("round", context) == round
+
+
 def test_subscript():
     context = EvaluationContext(
         locals_={}, globals_={}, evaluation="limited", in_subscript=True

From 79c46895a728bb4d3ccb8d3fa03a1a0ddd327bec Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sat, 3 Dec 2022 15:04:48 +0000
Subject: [PATCH 1320/1407] Compactify assertions spaghettified by black

---
 IPython/core/tests/test_completer.py | 143 +++++++++------------------
 1 file changed, 48 insertions(+), 95 deletions(-)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index bd2fa3cefdb..423979a297f 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -853,31 +853,38 @@ def test_match_dict_keys(self):
         delims = " \t\n`!@#$^&*()=+[{]}\\|;:'\",<>?"
 
         def match(*args, **kwargs):
-            quote, offset, matches = match_dict_keys(*args, **kwargs)
+            quote, offset, matches = match_dict_keys(*args, delims=delims, **kwargs)
             return quote, offset, list(matches)
 
         keys = ["foo", b"far"]
-        assert match(keys, "b'", delims=delims) == ("'", 2, ["far"])
-        assert match(keys, "b'f", delims=delims) == ("'", 2, ["far"])
-        assert match(keys, 'b"', delims=delims) == ('"', 2, ["far"])
-        assert match(keys, 'b"f', delims=delims) == ('"', 2, ["far"])
+        assert match(keys, "b'") == ("'", 2, ["far"])
+        assert match(keys, "b'f") == ("'", 2, ["far"])
+        assert match(keys, 'b"') == ('"', 2, ["far"])
+        assert match(keys, 'b"f') == ('"', 2, ["far"])
 
-        assert match(keys, "'", delims=delims) == ("'", 1, ["foo"])
-        assert match(keys, "'f", delims=delims) == ("'", 1, ["foo"])
-        assert match(keys, '"', delims=delims) == ('"', 1, ["foo"])
-        assert match(keys, '"f', delims=delims) == ('"', 1, ["foo"])
+        assert match(keys, "'") == ("'", 1, ["foo"])
+        assert match(keys, "'f") == ("'", 1, ["foo"])
+        assert match(keys, '"') == ('"', 1, ["foo"])
+        assert match(keys, '"f') == ('"', 1, ["foo"])
 
         # Completion on first item of tuple
         keys = [("foo", 1111), ("foo", 2222), (3333, "bar"), (3333, "test")]
-        assert match(keys, "'f", delims=delims) == ("'", 1, ["foo"])
-        assert match(keys, "33", delims=delims) == ("", 0, ["3333"])
+        assert match(keys, "'f") == ("'", 1, ["foo"])
+        assert match(keys, "33") == ("", 0, ["3333"])
 
         # Completion on numbers
-        keys = [0xDEADBEEF, 1111, 1234, "1999", 0b10101, 22]  # 3735928559  # 21
-        assert match(keys, "0xdead", delims=delims) == ("", 0, ["0xdeadbeef"])
-        assert match(keys, "1", delims=delims) == ("", 0, ["1111", "1234"])
-        assert match(keys, "2", delims=delims) == ("", 0, ["21", "22"])
-        assert match(keys, "0b101", delims=delims) == ("", 0, ["0b10101", "0b10110"])
+        keys = [
+            0xDEADBEEF,
+            1111,
+            1234,
+            "1999",
+            0b10101,
+            22,
+        ]  # 0xDEADBEEF = 3735928559; 0b10101 = 21
+        assert match(keys, "0xdead") == ("", 0, ["0xdeadbeef"])
+        assert match(keys, "1") == ("", 0, ["1111", "1234"])
+        assert match(keys, "2") == ("", 0, ["21", "22"])
+        assert match(keys, "0b101") == ("", 0, ["0b10101", "0b10110"])
 
     def test_match_dict_keys_tuple(self):
         """
@@ -888,97 +895,43 @@ def test_match_dict_keys_tuple(self):
 
         keys = [("foo", "bar"), ("foo", "oof"), ("foo", b"bar"), ('other', 'test')]
 
-        def match(*args, **kwargs):
-            quote, offset, matches = match_dict_keys(*args, **kwargs)
+        def match(*args, extra=None, **kwargs):
+            quote, offset, matches = match_dict_keys(
+                *args, delims=delims, extra_prefix=extra, **kwargs
+            )
             return quote, offset, list(matches)
 
         # Completion on first key == "foo"
-        assert match(keys, "'", delims=delims, extra_prefix=("foo",)) == (
-            "'",
-            1,
-            ["bar", "oof"],
-        )
-        assert match(keys, '"', delims=delims, extra_prefix=("foo",)) == (
-            '"',
-            1,
-            ["bar", "oof"],
-        )
-        assert match(keys, "'o", delims=delims, extra_prefix=("foo",)) == (
-            "'",
-            1,
-            ["oof"],
-        )
-        assert match(keys, '"o', delims=delims, extra_prefix=("foo",)) == (
-            '"',
-            1,
-            ["oof"],
-        )
-        assert match(keys, "b'", delims=delims, extra_prefix=("foo",)) == (
-            "'",
-            2,
-            ["bar"],
-        )
-        assert match(keys, 'b"', delims=delims, extra_prefix=("foo",)) == (
-            '"',
-            2,
-            ["bar"],
-        )
-        assert match(keys, "b'b", delims=delims, extra_prefix=("foo",)) == (
-            "'",
-            2,
-            ["bar"],
-        )
-        assert match(keys, 'b"b', delims=delims, extra_prefix=("foo",)) == (
-            '"',
-            2,
-            ["bar"],
-        )
+        assert match(keys, "'", extra=("foo",)) == ("'", 1, ["bar", "oof"])
+        assert match(keys, '"', extra=("foo",)) == ('"', 1, ["bar", "oof"])
+        assert match(keys, "'o", extra=("foo",)) == ("'", 1, ["oof"])
+        assert match(keys, '"o', extra=("foo",)) == ('"', 1, ["oof"])
+        assert match(keys, "b'", extra=("foo",)) == ("'", 2, ["bar"])
+        assert match(keys, 'b"', extra=("foo",)) == ('"', 2, ["bar"])
+        assert match(keys, "b'b", extra=("foo",)) == ("'", 2, ["bar"])
+        assert match(keys, 'b"b', extra=("foo",)) == ('"', 2, ["bar"])
 
         # No Completion
-        assert match(keys, "'", delims=delims, extra_prefix=("no_foo",)) == ("'", 1, [])
-        assert match(keys, "'", delims=delims, extra_prefix=("fo",)) == ("'", 1, [])
+        assert match(keys, "'", extra=("no_foo",)) == ("'", 1, [])
+        assert match(keys, "'", extra=("fo",)) == ("'", 1, [])
 
         keys = [("foo1", "foo2", "foo3", "foo4"), ("foo1", "foo2", "bar", "foo4")]
-        assert match(keys, "'foo", delims=delims, extra_prefix=("foo1",)) == (
+        assert match(keys, "'foo", extra=("foo1",)) == ("'", 1, ["foo2"])
+        assert match(keys, "'foo", extra=("foo1", "foo2")) == ("'", 1, ["foo3"])
+        assert match(keys, "'foo", extra=("foo1", "foo2", "foo3")) == ("'", 1, ["foo4"])
+        assert match(keys, "'foo", extra=("foo1", "foo2", "foo3", "foo4")) == (
             "'",
             1,
-            ["foo2"],
+            [],
         )
-        assert match(keys, "'foo", delims=delims, extra_prefix=("foo1", "foo2")) == (
-            "'",
-            1,
-            ["foo3"],
-        )
-        assert match(
-            keys, "'foo", delims=delims, extra_prefix=("foo1", "foo2", "foo3")
-        ) == ("'", 1, ["foo4"])
-        assert match(
-            keys, "'foo", delims=delims, extra_prefix=("foo1", "foo2", "foo3", "foo4")
-        ) == ("'", 1, [])
 
         keys = [("foo", 1111), ("foo", "2222"), (3333, "bar"), (3333, 4444)]
-        assert match(keys, "'", delims=delims, extra_prefix=("foo",)) == (
-            "'",
-            1,
-            ["2222"],
-        )
-        assert match(keys, "", delims=delims, extra_prefix=("foo",)) == (
-            "",
-            0,
-            ["1111", "'2222'"],
-        )
-        assert match(keys, "'", delims=delims, extra_prefix=(3333,)) == (
-            "'",
-            1,
-            ["bar"],
-        )
-        assert match(keys, "", delims=delims, extra_prefix=(3333,)) == (
-            "",
-            0,
-            ["'bar'", "4444"],
-        )
-        assert match(keys, "'", delims=delims, extra_prefix=("3333",)) == ("'", 1, [])
-        assert match(keys, "33", delims=delims) == ("", 0, ["3333"])
+        assert match(keys, "'", extra=("foo",)) == ("'", 1, ["2222"])
+        assert match(keys, "", extra=("foo",)) == ("", 0, ["1111", "'2222'"])
+        assert match(keys, "'", extra=(3333,)) == ("'", 1, ["bar"])
+        assert match(keys, "", extra=(3333,)) == ("", 0, ["'bar'", "4444"])
+        assert match(keys, "'", extra=("3333",)) == ("'", 1, [])
+        assert match(keys, "33") == ("", 0, ["3333"])
 
     def test_dict_key_completion_closures(self):
         ip = get_ipython()

From 80b4bcf36ababf554d26b1f789460b911c5a97c3 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sat, 3 Dec 2022 16:56:09 +0000
Subject: [PATCH 1321/1407] Enable mypy typing checks for completer

---
 .github/workflows/mypy.yml |   1 +
 IPython/core/completer.py  | 185 ++++++++++++++++++++++++++-----------
 2 files changed, 133 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index 3ff6f86349e..e05678f724d 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -32,6 +32,7 @@ jobs:
         mypy -p IPython.terminal
         mypy -p IPython.core.magics
         mypy -p IPython.core.guarded_eval
+        mypy -p IPython.core.completer
     - name: Lint with pyflakes
       run: |
         flake8  IPython/core/magics/script.py
diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 46ab19423cb..2f3b4f01457 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -210,6 +210,8 @@
     Optional,
     TYPE_CHECKING,
     Set,
+    Sized,
+    TypeVar,
     Literal,
 )
 
@@ -255,10 +257,11 @@
 
 if TYPE_CHECKING or GENERATING_DOCUMENTATION:
     from typing import cast
-    from typing_extensions import TypedDict, NotRequired, Protocol, TypeAlias
+    from typing_extensions import TypedDict, NotRequired, Protocol, TypeAlias, TypeGuard
 else:
+    from typing import Generic
 
-    def cast(obj, type_):
+    def cast(type_, obj):
         """Workaround for `TypeError: MatcherAPIv2() takes no arguments`"""
         return obj
 
@@ -267,6 +270,7 @@ def cast(obj, type_):
     TypedDict = Dict  # by extension of `NotRequired` requires 3.11 too
     Protocol = object  # requires Python >=3.8
     TypeAlias = Any  # requires Python >=3.10
+    TypeGuard = Generic  # requires Python >=3.10
 if GENERATING_DOCUMENTATION:
     from typing import TypedDict
 
@@ -470,8 +474,9 @@ def __init__(self, name):
         self.complete = name
         self.type = 'crashed'
         self.name_with_symbols = name
-        self.signature = ''
-        self._origin = 'fake'
+        self.signature = ""
+        self._origin = "fake"
+        self.text = "crashed"
 
     def __repr__(self):
         return '<Fake completion object jedi has crashed>'
@@ -507,11 +512,23 @@ class Completion:
 
     __slots__ = ['start', 'end', 'text', 'type', 'signature', '_origin']
 
-    def __init__(self, start: int, end: int, text: str, *, type: str=None, _origin='', signature='') -> None:
-        warnings.warn("``Completion`` is a provisional API (as of IPython 6.0). "
-                      "It may change without warnings. "
-                      "Use in corresponding context manager.",
-                      category=ProvisionalCompleterWarning, stacklevel=2)
+    def __init__(
+        self,
+        start: int,
+        end: int,
+        text: str,
+        *,
+        type: Optional[str] = None,
+        _origin="",
+        signature="",
+    ) -> None:
+        warnings.warn(
+            "``Completion`` is a provisional API (as of IPython 6.0). "
+            "It may change without warnings. "
+            "Use in corresponding context manager.",
+            category=ProvisionalCompleterWarning,
+            stacklevel=2,
+        )
 
         self.start = start
         self.end = end
@@ -524,7 +541,7 @@ def __repr__(self):
         return '<Completion start=%s end=%s text=%r type=%r, signature=%r,>' % \
                 (self.start, self.end, self.text, self.type or '?', self.signature or '?')
 
-    def __eq__(self, other)->Bool:
+    def __eq__(self, other) -> bool:
         """
         Equality and hash do not hash the type (as some completer may not be
         able to infer the type), but are use to (partially) de-duplicate
@@ -592,14 +609,18 @@ class SimpleMatcherResult(_MatcherResultBase, TypedDict):
     # in order to get __orig_bases__ for documentation
 
     #: List of candidate completions
-    completions: Sequence[SimpleCompletion]
+    completions: Sequence[SimpleCompletion] | Iterator[SimpleCompletion]
 
 
 class _JediMatcherResult(_MatcherResultBase):
     """Matching result returned by Jedi (will be processed differently)"""
 
     #: list of candidate completions
-    completions: Iterable[_JediCompletionLike]
+    completions: Iterator[_JediCompletionLike]
+
+
+AnyMatcherCompletion = Union[_JediCompletionLike, SimpleCompletion]
+AnyCompletion = TypeVar("AnyCompletion", AnyMatcherCompletion, Completion)
 
 
 @dataclass
@@ -650,6 +671,9 @@ def __call__(self, text: str) -> List[str]:
         """Call signature."""
         ...
 
+    #: Used to construct the default matcher identifier
+    __qualname__: str
+
 
 class _MatcherAPIv1Total(_MatcherAPIv1Base, Protocol):
     #: API version
@@ -674,25 +698,59 @@ def __call__(self, context: CompletionContext) -> MatcherResult:
         """Call signature."""
         ...
 
+    #: Used to construct the default matcher identifier
+    __qualname__: str
+
 
 Matcher: TypeAlias = Union[MatcherAPIv1, MatcherAPIv2]
 
 
+def _is_matcher_v1(matcher: Matcher) -> TypeGuard[MatcherAPIv1]:
+    api_version = _get_matcher_api_version(matcher)
+    return api_version == 1
+
+
+def _is_matcher_v2(matcher: Matcher) -> TypeGuard[MatcherAPIv2]:
+    api_version = _get_matcher_api_version(matcher)
+    return api_version == 2
+
+
+def _is_sizable(value: Any) -> TypeGuard[Sized]:
+    """Determines whether objects is sizable"""
+    return hasattr(value, "__len__")
+
+
+def _is_iterator(value: Any) -> TypeGuard[Iterator]:
+    """Determines whether objects is sizable"""
+    return hasattr(value, "__next__")
+
+
 def has_any_completions(result: MatcherResult) -> bool:
     """Check if any result includes any completions."""
-    if hasattr(result["completions"], "__len__"):
-        return len(result["completions"]) != 0
-    try:
-        old_iterator = result["completions"]
-        first = next(old_iterator)
-        result["completions"] = itertools.chain([first], old_iterator)
-        return True
-    except StopIteration:
-        return False
+    completions = result["completions"]
+    if _is_sizable(completions):
+        return len(completions) != 0
+    if _is_iterator(completions):
+        try:
+            old_iterator = completions
+            first = next(old_iterator)
+            result["completions"] = cast(
+                Iterator[SimpleCompletion],
+                itertools.chain([first], old_iterator),
+            )
+            return True
+        except StopIteration:
+            return False
+    raise ValueError(
+        "Completions returned by matcher need to be an Iterator or a Sizable"
+    )
 
 
 def completion_matcher(
-    *, priority: float = None, identifier: str = None, api_version: int = 1
+    *,
+    priority: Optional[float] = None,
+    identifier: Optional[str] = None,
+    api_version: int = 1,
 ):
     """Adds attributes describing the matcher.
 
@@ -715,14 +773,14 @@ def completion_matcher(
     """
 
     def wrapper(func: Matcher):
-        func.matcher_priority = priority or 0
-        func.matcher_identifier = identifier or func.__qualname__
-        func.matcher_api_version = api_version
+        func.matcher_priority = priority or 0  # type: ignore
+        func.matcher_identifier = identifier or func.__qualname__  # type: ignore
+        func.matcher_api_version = api_version  # type: ignore
         if TYPE_CHECKING:
             if api_version == 1:
-                func = cast(func, MatcherAPIv1)
+                func = cast(MatcherAPIv1, func)
             elif api_version == 2:
-                func = cast(func, MatcherAPIv2)
+                func = cast(MatcherAPIv2, func)
         return func
 
     return wrapper
@@ -1311,6 +1369,8 @@ def filter_prefix_tuple(key):
 
     matched: Dict[str, DictKeyState] = {}
 
+    str_key: Union[str, bytes]
+
     for key in filtered_keys:
         if isinstance(key, (int, float)):
             # User typed a number but this key is not a number.
@@ -1637,7 +1697,7 @@ def _convert_matcher_v1_result_to_v2(
     }
     if fragment is not None:
         result["matched_fragment"] = fragment
-    return result
+    return cast(SimpleMatcherResult, result)
 
 
 class IPCompleter(Completer):
@@ -1839,7 +1899,7 @@ def __init__(
 
         if not self.backslash_combining_completions:
             for matcher in self._backslash_combining_matchers:
-                self.disable_matchers.append(matcher.matcher_identifier)
+                self.disable_matchers.append(_get_matcher_id(matcher))
 
         if not self.merge_completions:
             self.suppress_competing_matchers = True
@@ -2129,7 +2189,7 @@ def _jedi_matcher(self, context: CompletionContext) -> _JediMatcherResult:
 
     def _jedi_matches(
         self, cursor_column: int, cursor_line: int, text: str
-    ) -> Iterable[_JediCompletionLike]:
+    ) -> Iterator[_JediCompletionLike]:
         """
         Return a list of :any:`jedi.api.Completion`s object from a ``text`` and
         cursor position.
@@ -2195,15 +2255,23 @@ def _jedi_matches(
                 print("Error detecting if completing a non-finished string :", e, '|')
 
         if not try_jedi:
-            return []
+            return iter([])
         try:
             return filter(completion_filter, interpreter.complete(column=cursor_column, line=cursor_line + 1))
         except Exception as e:
             if self.debug:
-                return [_FakeJediCompletion('Oops Jedi has crashed, please report a bug with the following:\n"""\n%s\ns"""' % (e))]
+                return iter(
+                    [
+                        _FakeJediCompletion(
+                            'Oops Jedi has crashed, please report a bug with the following:\n"""\n%s\ns"""'
+                            % (e)
+                        )
+                    ]
+                )
             else:
-                return []
+                return iter([])
 
+    @completion_matcher(api_version=1)
     def python_matches(self, text: str) -> Iterable[str]:
         """Match attributes or global python names"""
         if "." in text:
@@ -2762,17 +2830,23 @@ def _completions(self, full_text: str, offset: int, *, _timeout) -> Iterator[Com
 
         jedi_matcher_id = _get_matcher_id(self._jedi_matcher)
 
+        def is_non_jedi_result(
+            result: MatcherResult, identifier: str
+        ) -> TypeGuard[SimpleMatcherResult]:
+            return identifier != jedi_matcher_id
+
         results = self._complete(
             full_text=full_text, cursor_line=cursor_line, cursor_pos=cursor_column
         )
+
         non_jedi_results: Dict[str, SimpleMatcherResult] = {
             identifier: result
             for identifier, result in results.items()
-            if identifier != jedi_matcher_id
+            if is_non_jedi_result(result, identifier)
         }
 
         jedi_matches = (
-            cast(results[jedi_matcher_id], _JediMatcherResult)["completions"]
+            cast(_JediMatcherResult, results[jedi_matcher_id])["completions"]
             if jedi_matcher_id in results
             else ()
         )
@@ -2827,8 +2901,8 @@ def _completions(self, full_text: str, offset: int, *, _timeout) -> Iterator[Com
                 signature="",
             )
 
-        ordered = []
-        sortable = []
+        ordered: List[Completion] = []
+        sortable: List[Completion] = []
 
         for origin, result in non_jedi_results.items():
             matched_text = result["matched_fragment"]
@@ -2918,8 +2992,8 @@ def _arrange_and_extract(
         abort_if_offset_changes: bool,
     ):
 
-        sortable = []
-        ordered = []
+        sortable: List[AnyMatcherCompletion] = []
+        ordered: List[AnyMatcherCompletion] = []
         most_recent_fragment = None
         for identifier, result in results.items():
             if identifier in skip_matchers:
@@ -3018,11 +3092,11 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
         )
 
         # Start with a clean slate of completions
-        results = {}
+        results: Dict[str, MatcherResult] = {}
 
         jedi_matcher_id = _get_matcher_id(self._jedi_matcher)
 
-        suppressed_matchers = set()
+        suppressed_matchers: Set[str] = set()
 
         matchers = {
             _get_matcher_id(matcher): matcher
@@ -3032,7 +3106,6 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
         }
 
         for matcher_id, matcher in matchers.items():
-            api_version = _get_matcher_api_version(matcher)
             matcher_id = _get_matcher_id(matcher)
 
             if matcher_id in self.disable_matchers:
@@ -3044,14 +3117,16 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
             if matcher_id in suppressed_matchers:
                 continue
 
+            result: MatcherResult
             try:
-                if api_version == 1:
+                if _is_matcher_v1(matcher):
                     result = _convert_matcher_v1_result_to_v2(
                         matcher(text), type=_UNKNOWN_TYPE
                     )
-                elif api_version == 2:
-                    result = cast(matcher, MatcherAPIv2)(context)
+                elif _is_matcher_v2(matcher):
+                    result = matcher(context)
                 else:
+                    api_version = _get_matcher_api_version(matcher)
                     raise ValueError(f"Unsupported API version {api_version}")
             except:
                 # Show the ugly traceback if the matcher causes an
@@ -3063,7 +3138,9 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
             result["matched_fragment"] = result.get("matched_fragment", context.token)
 
             if not suppressed_matchers:
-                suppression_recommended = result.get("suppress", False)
+                suppression_recommended: Union[bool, Set[str]] = result.get(
+                    "suppress", False
+                )
 
                 suppression_config = (
                     self.suppress_competing_matchers.get(matcher_id, None)
@@ -3076,10 +3153,12 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
                 ) and has_any_completions(result)
 
                 if should_suppress:
-                    suppression_exceptions = result.get("do_not_suppress", set())
-                    try:
+                    suppression_exceptions: Set[str] = result.get(
+                        "do_not_suppress", set()
+                    )
+                    if isinstance(suppression_recommended, Iterable):
                         to_suppress = set(suppression_recommended)
-                    except TypeError:
+                    else:
                         to_suppress = set(matchers)
                     suppressed_matchers = to_suppress - suppression_exceptions
 
@@ -3106,9 +3185,9 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
 
     @staticmethod
     def _deduplicate(
-        matches: Sequence[SimpleCompletion],
-    ) -> Iterable[SimpleCompletion]:
-        filtered_matches = {}
+        matches: Sequence[AnyCompletion],
+    ) -> Iterable[AnyCompletion]:
+        filtered_matches: Dict[str, AnyCompletion] = {}
         for match in matches:
             text = match.text
             if (
@@ -3120,7 +3199,7 @@ def _deduplicate(
         return filtered_matches.values()
 
     @staticmethod
-    def _sort(matches: Sequence[SimpleCompletion]):
+    def _sort(matches: Sequence[AnyCompletion]):
         return sorted(matches, key=lambda x: completions_sorting_key(x.text))
 
     @context_matcher()

From bbf990daf76dce132ac2f66e782d463f54a21f7f Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sat, 3 Dec 2022 20:27:08 +0000
Subject: [PATCH 1322/1407] Polish documentation, hide private functions

---
 IPython/core/completer.py               | 80 ++++++++++++--------
 IPython/core/guarded_eval.py            | 98 +++++++++++++++++--------
 IPython/core/magics/config.py           | 88 ++--------------------
 IPython/core/tests/test_guarded_eval.py | 12 +--
 4 files changed, 129 insertions(+), 149 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 2f3b4f01457..7dd585bce36 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -50,7 +50,7 @@
 
 It is sometime challenging to know how to type a character, if you are using
 IPython, or any compatible frontend you can prepend backslash to the character
-and press ``<tab>`` to expand it to its latex form.
+and press :kbd:`Tab` to expand it to its latex form.
 
 .. code::
 
@@ -59,7 +59,7 @@
 
 
 Both forward and backward completions can be deactivated by setting the
-``Completer.backslash_combining_completions`` option to ``False``.
+:any:`Completer.backslash_combining_completions` option to ``False``.
 
 
 Experimental
@@ -95,7 +95,7 @@
    ... myvar[1].bi<tab>
 
 Tab completion will be able to infer that ``myvar[1]`` is a real number without
-executing any code unlike the previously available ``IPCompleter.greedy``
+executing almost any code unlike the deprecated :any:`IPCompleter.greedy`
 option.
 
 Be sure to update :any:`jedi` to the latest stable version or to try the
@@ -972,29 +972,38 @@ class Completer(Configurable):
         help="""Activate greedy completion.
 
         .. deprecated:: 8.8
-            Use :any:`evaluation` and :any:`auto_close_dict_keys` instead.
+            Use :any:`Completer.evaluation` and :any:`Completer.auto_close_dict_keys` instead.
 
-        When enabled in IPython 8.8+ activates following settings for compatibility:
-        - ``evaluation = 'unsafe'``
-        - ``auto_close_dict_keys = True``
+        When enabled in IPython 8.8 or newer, changes configuration as follows:
+
+        - ``Completer.evaluation = 'unsafe'``
+        - ``Completer.auto_close_dict_keys = True``
         """,
     ).tag(config=True)
 
     evaluation = Enum(
         ("forbidden", "minimal", "limited", "unsafe", "dangerous"),
         default_value="limited",
-        help="""Code evaluation under completion.
+        help="""Policy for code evaluation under completion.
 
-        Successive options allow to enable more eager evaluation for more accurate completion suggestions,
-        including for nested dictionaries, nested lists, or even results of function calls. Setting `unsafe`
-        or higher can lead to evaluation of arbitrary user code on TAB with potentially dangerous side effects.
+        Successive options allow to enable more eager evaluation for better
+        completion suggestions, including for nested dictionaries, nested lists,
+        or even results of function calls.
+        Setting ``unsafe`` or higher can lead to evaluation of arbitrary user
+        code on :kbd:`Tab` with potentially unwanted or dangerous side effects.
 
         Allowed values are:
-          - `forbidden`: no evaluation at all
-          - `minimal`:  evaluation of literals and access to built-in namespaces; no item/attribute evaluation nor access to locals/globals
-          - `limited` (default): access to all namespaces, evaluation of hard-coded methods (``keys()``, ``__getattr__``, ``__getitems__``, etc) on allow-listed objects (e.g. ``dict``, ``list``, ``tuple``, ``pandas.Series``)
-          - `unsafe`: evaluation of all methods and function calls but not of syntax with side-effects like `del x`,
-          - `dangerous`: completely arbitrary evaluation
+
+        - ``forbidden``: no evaluation of code is permitted,
+        - ``minimal``: evaluation of literals and access to built-in namespace;
+          no item/attribute evaluation nor access to locals/globals,
+        - ``limited``: access to all namespaces, evaluation of hard-coded methods
+          (for example: :any:`dict.keys`, :any:`object.__getattr__`,
+          :any:`object.__getitem__`) on allow-listed objects (for example:
+          :any:`dict`, :any:`list`, :any:`tuple`, ``pandas.Series``),
+        - ``unsafe``: evaluation of all methods and function calls but not of
+          syntax with side-effects like `del x`,
+        - ``dangerous``: completely arbitrary evaluation.
         """,
     ).tag(config=True)
 
@@ -1019,7 +1028,15 @@ class Completer(Configurable):
              "unicode characters back to latex commands.").tag(config=True)
 
     auto_close_dict_keys = Bool(
-        False, help="""Enable auto-closing dictionary keys."""
+        False,
+        help="""
+        Enable auto-closing dictionary keys.
+
+        When enabled string keys will be suffixed with a final quote
+        (matching the opening quote), tuple keys will also receive a
+        separating comma if needed, and keys which are final will
+        receive a closing bracket (``]``).
+        """,
     ).tag(config=True)
 
     def __init__(self, namespace=None, global_namespace=None, **kwargs):
@@ -1157,8 +1174,8 @@ def _evaluate_expr(self, expr):
                 obj = guarded_eval(
                     expr,
                     EvaluationContext(
-                        globals_=self.global_namespace,
-                        locals_=self.namespace,
+                        globals=self.global_namespace,
+                        locals=self.namespace,
                         evaluation=self.evaluation,
                     ),
                 )
@@ -1183,7 +1200,7 @@ def get__all__entries(obj):
     return [w for w in words if isinstance(w, str)]
 
 
-class DictKeyState(enum.Flag):
+class _DictKeyState(enum.Flag):
     """Represent state of the key match in context of other possible matches.
 
     - given `d1 = {'a': 1}` completion on `d1['<tab>` will yield `{'a': END_OF_ITEM}` as there is no tuple.
@@ -1199,6 +1216,7 @@ class DictKeyState(enum.Flag):
 
 
 def _parse_tokens(c):
+    """Parse tokens even if there is an error."""
     tokens = []
     token_generator = tokenize.generate_tokens(iter(c.splitlines()).__next__)
     while True:
@@ -1257,7 +1275,7 @@ def match_dict_keys(
     prefix: str,
     delims: str,
     extra_prefix: Optional[Tuple[Union[str, bytes], ...]] = None,
-) -> Tuple[str, int, Dict[str, DictKeyState]]:
+) -> Tuple[str, int, Dict[str, _DictKeyState]]:
     """Used by dict_key_matches, matching the prefix to a list of keys
 
     Parameters
@@ -1307,8 +1325,8 @@ def filter_prefix_tuple(key):
         return True
 
     filtered_key_is_final: Dict[
-        Union[str, bytes, int, float], DictKeyState
-    ] = defaultdict(lambda: DictKeyState.BASELINE)
+        Union[str, bytes, int, float], _DictKeyState
+    ] = defaultdict(lambda: _DictKeyState.BASELINE)
 
     for k in keys:
         # If at least one of the matches is not final, mark as undetermined.
@@ -1319,9 +1337,9 @@ def filter_prefix_tuple(key):
             if filter_prefix_tuple(k):
                 key_fragment = k[prefix_tuple_size]
                 filtered_key_is_final[key_fragment] |= (
-                    DictKeyState.END_OF_TUPLE
+                    _DictKeyState.END_OF_TUPLE
                     if len(k) == prefix_tuple_size + 1
-                    else DictKeyState.IN_TUPLE
+                    else _DictKeyState.IN_TUPLE
                 )
         elif prefix_tuple_size > 0:
             # we are completing a tuple but this key is not a tuple,
@@ -1329,7 +1347,7 @@ def filter_prefix_tuple(key):
             pass
         else:
             if isinstance(k, text_serializable_types):
-                filtered_key_is_final[k] |= DictKeyState.END_OF_ITEM
+                filtered_key_is_final[k] |= _DictKeyState.END_OF_ITEM
 
     filtered_keys = filtered_key_is_final.keys()
 
@@ -1367,7 +1385,7 @@ def filter_prefix_tuple(key):
     token_start = token_match.start()
     token_prefix = token_match.group()
 
-    matched: Dict[str, DictKeyState] = {}
+    matched: Dict[str, _DictKeyState] = {}
 
     str_key: Union[str, bytes]
 
@@ -2503,8 +2521,8 @@ def dict_key_matches(self, text: str) -> List[str]:
         tuple_prefix = guarded_eval(
             prior_tuple_keys,
             EvaluationContext(
-                globals_=self.global_namespace,
-                locals_=self.namespace,
+                globals=self.global_namespace,
+                locals=self.namespace,
                 evaluation=self.evaluation,
                 in_subscript=True,
             ),
@@ -2569,7 +2587,7 @@ def dict_key_matches(self, text: str) -> List[str]:
 
         results = []
 
-        end_of_tuple_or_item = DictKeyState.END_OF_TUPLE | DictKeyState.END_OF_ITEM
+        end_of_tuple_or_item = _DictKeyState.END_OF_TUPLE | _DictKeyState.END_OF_ITEM
 
         for k, state_flag in matches.items():
             result = leading + k
@@ -2584,7 +2602,7 @@ def dict_key_matches(self, text: str) -> List[str]:
 
             if state_flag in end_of_tuple_or_item and can_close_bracket:
                 result += "]"
-            if state_flag == DictKeyState.IN_TUPLE and can_close_tuple_item:
+            if state_flag == _DictKeyState.IN_TUPLE and can_close_tuple_item:
                 result += ", "
             results.append(result)
         return results
diff --git a/IPython/core/guarded_eval.py b/IPython/core/guarded_eval.py
index a510d381485..637d329a17e 100644
--- a/IPython/core/guarded_eval.py
+++ b/IPython/core/guarded_eval.py
@@ -17,6 +17,7 @@
 from dataclasses import dataclass, field
 
 from IPython.utils.docs import GENERATING_DOCUMENTATION
+from IPython.utils.decorators import undoc
 
 
 if TYPE_CHECKING or GENERATING_DOCUMENTATION:
@@ -26,21 +27,25 @@
     Protocol = object  # requires Python >=3.8
 
 
+@undoc
 class HasGetItem(Protocol):
     def __getitem__(self, key) -> None:
         ...
 
 
+@undoc
 class InstancesHaveGetItem(Protocol):
     def __call__(self, *args, **kwargs) -> HasGetItem:
         ...
 
 
+@undoc
 class HasGetAttr(Protocol):
     def __getattr__(self, key) -> None:
         ...
 
 
+@undoc
 class DoesNotHaveGetAttr(Protocol):
     pass
 
@@ -49,7 +54,7 @@ class DoesNotHaveGetAttr(Protocol):
 MayHaveGetattr = Union[HasGetAttr, DoesNotHaveGetAttr]
 
 
-def unbind_method(func: Callable) -> Union[Callable, None]:
+def _unbind_method(func: Callable) -> Union[Callable, None]:
     """Get unbound method for given bound method.
 
     Returns None if cannot get unbound method."""
@@ -69,8 +74,11 @@ def unbind_method(func: Callable) -> Union[Callable, None]:
     return None
 
 
+@undoc
 @dataclass
 class EvaluationPolicy:
+    """Definition of evaluation policy."""
+
     allow_locals_access: bool = False
     allow_globals_access: bool = False
     allow_item_access: bool = False
@@ -92,12 +100,12 @@ def can_call(self, func):
         if func in self.allowed_calls:
             return True
 
-        owner_method = unbind_method(func)
+        owner_method = _unbind_method(func)
         if owner_method and owner_method in self.allowed_calls:
             return True
 
 
-def has_original_dunder_external(
+def _has_original_dunder_external(
     value,
     module_name,
     access_path,
@@ -121,7 +129,7 @@ def has_original_dunder_external(
         return False
 
 
-def has_original_dunder(
+def _has_original_dunder(
     value, allowed_types, allowed_methods, allowed_external, method_name
 ):
     # note: Python ignores `__getattr__`/`__getitem__` on instances,
@@ -141,12 +149,13 @@ def has_original_dunder(
         return True
 
     for module_name, *access_path in allowed_external:
-        if has_original_dunder_external(value, module_name, access_path, method_name):
+        if _has_original_dunder_external(value, module_name, access_path, method_name):
             return True
 
     return False
 
 
+@undoc
 @dataclass
 class SelectivePolicy(EvaluationPolicy):
     allowed_getitem: Set[InstancesHaveGetItem] = field(default_factory=set)
@@ -155,14 +164,14 @@ class SelectivePolicy(EvaluationPolicy):
     allowed_getattr_external: Set[Tuple[str, ...]] = field(default_factory=set)
 
     def can_get_attr(self, value, attr):
-        has_original_attribute = has_original_dunder(
+        has_original_attribute = _has_original_dunder(
             value,
             allowed_types=self.allowed_getattr,
             allowed_methods=self._getattribute_methods,
             allowed_external=self.allowed_getattr_external,
             method_name="__getattribute__",
         )
-        has_original_attr = has_original_dunder(
+        has_original_attr = _has_original_dunder(
             value,
             allowed_types=self.allowed_getattr,
             allowed_methods=self._getattr_methods,
@@ -182,7 +191,7 @@ def get_attr(self, value, attr):
 
     def can_get_item(self, value, item):
         """Allow accessing `__getiitem__` of allow-listed instances unless it was not modified."""
-        return has_original_dunder(
+        return _has_original_dunder(
             value,
             allowed_types=self.allowed_getitem,
             allowed_methods=self._getitem_methods,
@@ -211,34 +220,50 @@ def _safe_get_methods(self, classes, name) -> Set[Callable]:
         }
 
 
-class DummyNamedTuple(NamedTuple):
+class _DummyNamedTuple(NamedTuple):
     pass
 
 
 class EvaluationContext(NamedTuple):
-    locals_: dict
-    globals_: dict
+    #: Local namespace
+    locals: dict
+    #: Global namespace
+    globals: dict
+    #: Evaluation policy identifier
     evaluation: Literal[
         "forbidden", "minimal", "limited", "unsafe", "dangerous"
     ] = "forbidden"
+    #: Whether the evalution of code takes place inside of a subscript.
+    #: Useful for evaluating ``:-1, 'col'`` in ``df[:-1, 'col']``.
     in_subscript: bool = False
 
 
-class IdentitySubscript:
+class _IdentitySubscript:
+    """Returns the key itself when item is requested via subscript."""
+
     def __getitem__(self, key):
         return key
 
 
-IDENTITY_SUBSCRIPT = IdentitySubscript()
+IDENTITY_SUBSCRIPT = _IdentitySubscript()
 SUBSCRIPT_MARKER = "__SUBSCRIPT_SENTINEL__"
 
 
-class GuardRejection(ValueError):
+class GuardRejection(Exception):
+    """Exception raised when guard rejects evaluation attempt."""
+
     pass
 
 
 def guarded_eval(code: str, context: EvaluationContext):
-    locals_ = context.locals_
+    """Evaluate provided code in the evaluation context.
+
+    If evaluation policy given by context is set to ``forbidden``
+    no evaluation will be performed; if it is set to ``dangerous``
+    standard :func:`eval` will be used; finally, for any other,
+    policy :func:`eval_node` will be called on parsed AST.
+    """
+    locals_ = context.locals
 
     if context.evaluation == "forbidden":
         raise GuardRejection("Forbidden mode")
@@ -256,10 +281,10 @@ def guarded_eval(code: str, context: EvaluationContext):
         locals_ = locals_.copy()
         locals_[SUBSCRIPT_MARKER] = IDENTITY_SUBSCRIPT
         code = SUBSCRIPT_MARKER + "[" + code + "]"
-        context = EvaluationContext(**{**context._asdict(), **{"locals_": locals_}})
+        context = EvaluationContext(**{**context._asdict(), **{"locals": locals_}})
 
     if context.evaluation == "dangerous":
-        return eval(code, context.globals_, context.locals_)
+        return eval(code, context.globals, context.locals)
 
     expression = ast.parse(code, mode="eval")
 
@@ -267,14 +292,12 @@ def guarded_eval(code: str, context: EvaluationContext):
 
 
 def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
-    """
-    Evaluate AST node in provided context.
+    """Evaluate AST node in provided context.
 
-    Applies evaluation restrictions defined in the context.
+    Applies evaluation restrictions defined in the context. Currently does not support evaluation of functions with keyword arguments.
 
-    Currently does not support evaluation of functions with keyword arguments.
+    Does not evaluate actions that always have side effects:
 
-    Does not evaluate actions which always have side effects:
     - class definitions (``class sth: ...``)
     - function definitions (``def sth: ...``)
     - variable assignments (``x = 1``)
@@ -282,13 +305,15 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
     - deletions (``del x``)
 
     Does not evaluate operations which do not return values:
+
     - assertions (``assert x``)
     - pass (``pass``)
     - imports (``import x``)
-    - control flow
-       - conditionals (``if x:``) except for ternary IfExp (``a if x else b``)
-       - loops (``for`` and `while``)
-       - exception handling
+    - control flow:
+
+        - conditionals (``if x:``) except for ternary IfExp (``a if x else b``)
+        - loops (``for`` and `while``)
+        - exception handling
 
     The purpose of this function is to guard against unwanted side-effects;
     it does not give guarantees on protection from malicious code execution.
@@ -376,10 +401,10 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
             f" not allowed in {context.evaluation} mode",
         )
     if isinstance(node, ast.Name):
-        if policy.allow_locals_access and node.id in context.locals_:
-            return context.locals_[node.id]
-        if policy.allow_globals_access and node.id in context.globals_:
-            return context.globals_[node.id]
+        if policy.allow_locals_access and node.id in context.locals:
+            return context.locals[node.id]
+        if policy.allow_globals_access and node.id in context.globals:
+            return context.globals[node.id]
         if policy.allow_builtins_access and hasattr(builtins, node.id):
             # note: do not use __builtins__, it is implementation detail of Python
             return getattr(builtins, node.id)
@@ -439,8 +464,8 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
     collections.UserDict,
     collections.UserList,
     collections.UserString,
-    DummyNamedTuple,
-    IdentitySubscript,
+    _DummyNamedTuple,
+    _IdentitySubscript,
 }
 
 
@@ -537,3 +562,12 @@ def _list_methods(cls, source=None):
         allow_any_calls=True,
     ),
 }
+
+
+__all__ = [
+    "guarded_eval",
+    "eval_node",
+    "GuardRejection",
+    "EvaluationContext",
+    "_unbind_method",
+]
diff --git a/IPython/core/magics/config.py b/IPython/core/magics/config.py
index 87fe3eed3a5..9e1cb38c254 100644
--- a/IPython/core/magics/config.py
+++ b/IPython/core/magics/config.py
@@ -68,94 +68,22 @@ def config(self, s):
         To view what is configurable on a given class, just pass the class
         name::
 
-            In [2]: %config IPCompleter
-            IPCompleter(Completer) options
-            ----------------------------
-            IPCompleter.backslash_combining_completions=<Bool>
-                Enable unicode completions, e.g. \\alpha<tab> . Includes completion of latex
-                commands, unicode names, and expanding unicode characters back to latex
-                commands.
-                Current: True
-            IPCompleter.debug=<Bool>
-                Enable debug for the Completer. Mostly print extra information for
-                experimental jedi integration.
+            In [2]: %config LoggingMagics
+            LoggingMagics(Magics) options
+            ---------------------------
+            LoggingMagics.quiet=<Bool>
+                Suppress output of log state when logging is enabled
                 Current: False
-            IPCompleter.disable_matchers=<list-item-1>...
-                List of matchers to disable.
-                        The list should contain matcher identifiers (see
-                :any:`completion_matcher`).
-                Current: []
-            IPCompleter.greedy=<Bool>
-                Activate greedy completion
-                        PENDING DEPRECATION. this is now mostly taken care of with Jedi.
-                        This will enable completion on elements of lists, results of function calls, etc.,
-                        but can be unsafe because the code is actually evaluated on TAB.
-                Current: False
-            IPCompleter.jedi_compute_type_timeout=<Int>
-                Experimental: restrict time (in milliseconds) during which Jedi can compute types.
-                        Set to 0 to stop computing types. Non-zero value lower than 100ms may hurt
-                        performance by preventing jedi to build its cache.
-                Current: 400
-            IPCompleter.limit_to__all__=<Bool>
-                DEPRECATED as of version 5.0.
-                Instruct the completer to use __all__ for the completion
-                Specifically, when completing on ``object.<tab>``.
-                When True: only those names in obj.__all__ will be included.
-                When False [default]: the __all__ attribute is ignored
-                Current: False
-            IPCompleter.merge_completions=<Bool>
-                Whether to merge completion results into a single list
-                        If False, only the completion results from the first non-empty
-                        completer will be returned.
-                        As of version 8.6.0, setting the value to ``False`` is an alias for:
-                        ``IPCompleter.suppress_competing_matchers = True.``.
-                Current: True
-            IPCompleter.omit__names=<Enum>
-                Instruct the completer to omit private method names
-                        Specifically, when completing on ``object.<tab>``.
-                        When 2 [default]: all names that start with '_' will be excluded.
-                        When 1: all 'magic' names (``__foo__``) will be excluded.
-                        When 0: nothing will be excluded.
-                Choices: any of [0, 1, 2]
-                Current: 2
-            IPCompleter.profile_completions=<Bool>
-                If True, emit profiling data for completion subsystem using cProfile.
-                Current: False
-            IPCompleter.profiler_output_dir=<Unicode>
-                Template for path at which to output profile data for completions.
-                Current: '.completion_profiles'
-            IPCompleter.suppress_competing_matchers=<Union>
-                Whether to suppress completions from other *Matchers*.
-                When set to ``None`` (default) the matchers will attempt to auto-detect
-                whether suppression of other matchers is desirable. For example, at the
-                beginning of a line followed by `%` we expect a magic completion to be the
-                only applicable option, and after ``my_dict['`` we usually expect a
-                completion with an existing dictionary key.
-                If you want to disable this heuristic and see completions from all matchers,
-                set ``IPCompleter.suppress_competing_matchers = False``. To disable the
-                heuristic for specific matchers provide a dictionary mapping:
-                ``IPCompleter.suppress_competing_matchers = {'IPCompleter.dict_key_matcher':
-                False}``.
-                Set ``IPCompleter.suppress_competing_matchers = True`` to limit completions
-                to the set of matchers with the highest priority; this is equivalent to
-                ``IPCompleter.merge_completions`` and can be beneficial for performance, but
-                will sometimes omit relevant candidates from matchers further down the
-                priority list.
-                Current: None
-            IPCompleter.use_jedi=<Bool>
-                Experimental: Use Jedi to generate autocompletions. Default to True if jedi
-                is installed.
-                Current: True
 
         but the real use is in setting values::
 
-            In [3]: %config IPCompleter.greedy = True
+            In [3]: %config LoggingMagics.quiet = True
 
         and these values are read from the user_ns if they are variables::
 
-            In [4]: feeling_greedy=False
+            In [4]: feeling_quiet=False
 
-            In [5]: %config IPCompleter.greedy = feeling_greedy
+            In [5]: %config LoggingMagics.quiet = feeling_quiet
 
         """
         from traitlets.config.loader import Config
diff --git a/IPython/core/tests/test_guarded_eval.py b/IPython/core/tests/test_guarded_eval.py
index b908f2af255..9c98b7a8e2a 100644
--- a/IPython/core/tests/test_guarded_eval.py
+++ b/IPython/core/tests/test_guarded_eval.py
@@ -3,18 +3,18 @@
     EvaluationContext,
     GuardRejection,
     guarded_eval,
-    unbind_method,
+    _unbind_method,
 )
 from IPython.testing import decorators as dec
 import pytest
 
 
 def limited(**kwargs):
-    return EvaluationContext(locals_=kwargs, globals_={}, evaluation="limited")
+    return EvaluationContext(locals=kwargs, globals={}, evaluation="limited")
 
 
 def unsafe(**kwargs):
-    return EvaluationContext(locals_=kwargs, globals_={}, evaluation="unsafe")
+    return EvaluationContext(locals=kwargs, globals={}, evaluation="unsafe")
 
 
 @dec.skip_without("pandas")
@@ -206,7 +206,7 @@ def test_access_builtins():
 
 def test_subscript():
     context = EvaluationContext(
-        locals_={}, globals_={}, evaluation="limited", in_subscript=True
+        locals={}, globals={}, evaluation="limited", in_subscript=True
     )
     empty_slice = slice(None, None, None)
     assert guarded_eval("", context) == tuple()
@@ -221,8 +221,8 @@ def index(self, k):
             return "CUSTOM"
 
     x = X()
-    assert unbind_method(x.index) is X.index
-    assert unbind_method([].index) is list.index
+    assert _unbind_method(x.index) is X.index
+    assert _unbind_method([].index) is list.index
 
 
 def test_assumption_instance_attr_do_not_matter():

From 8f4e32247605f1bb9180aadd6e02a1be62d011bc Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sat, 3 Dec 2022 22:38:42 +0000
Subject: [PATCH 1323/1407] Add guards for binary, unary operators and
 comparators

---
 IPython/core/guarded_eval.py            | 181 +++++++++++++++++++-----
 IPython/core/tests/test_guarded_eval.py |  70 +++++++++
 2 files changed, 214 insertions(+), 37 deletions(-)

diff --git a/IPython/core/guarded_eval.py b/IPython/core/guarded_eval.py
index 637d329a17e..215a36fab05 100644
--- a/IPython/core/guarded_eval.py
+++ b/IPython/core/guarded_eval.py
@@ -1,6 +1,7 @@
 from typing import (
     Any,
     Callable,
+    Dict,
     Set,
     Tuple,
     NamedTuple,
@@ -9,10 +10,11 @@
     Union,
     TYPE_CHECKING,
 )
+import ast
 import builtins
 import collections
+import operator
 import sys
-import ast
 from functools import cached_property
 from dataclasses import dataclass, field
 
@@ -84,6 +86,7 @@ class EvaluationPolicy:
     allow_item_access: bool = False
     allow_attr_access: bool = False
     allow_builtins_access: bool = False
+    allow_all_operations: bool = False
     allow_any_calls: bool = False
     allowed_calls: Set[Callable] = field(default_factory=set)
 
@@ -93,6 +96,10 @@ def can_get_item(self, value, item):
     def can_get_attr(self, value, attr):
         return self.allow_attr_access
 
+    def can_operate(self, dunders: Tuple[str, ...], a, b=None):
+        if self.allow_all_operations:
+            return True
+
     def can_call(self, func):
         if self.allow_any_calls:
             return True
@@ -160,9 +167,17 @@ def _has_original_dunder(
 class SelectivePolicy(EvaluationPolicy):
     allowed_getitem: Set[InstancesHaveGetItem] = field(default_factory=set)
     allowed_getitem_external: Set[Tuple[str, ...]] = field(default_factory=set)
+
     allowed_getattr: Set[MayHaveGetattr] = field(default_factory=set)
     allowed_getattr_external: Set[Tuple[str, ...]] = field(default_factory=set)
 
+    allowed_operations: Set = field(default_factory=set)
+    allowed_operations_external: Set[Tuple[str, ...]] = field(default_factory=set)
+
+    _operation_methods_cache: Dict[str, Set[Callable]] = field(
+        default_factory=dict, init=False
+    )
+
     def can_get_attr(self, value, attr):
         has_original_attribute = _has_original_dunder(
             value,
@@ -199,6 +214,27 @@ def can_get_item(self, value, item):
             method_name="__getitem__",
         )
 
+    def can_operate(self, dunders: Tuple[str, ...], a, b=None):
+        return all(
+            [
+                _has_original_dunder(
+                    a,
+                    allowed_types=self.allowed_operations,
+                    allowed_methods=self._dunder_methods(dunder),
+                    allowed_external=self.allowed_operations_external,
+                    method_name=dunder,
+                )
+                for dunder in dunders
+            ]
+        )
+
+    def _dunder_methods(self, dunder: str) -> Set[Callable]:
+        if dunder not in self._operation_methods_cache:
+            self._operation_methods_cache[dunder] = self._safe_get_methods(
+                self.allowed_operations, dunder
+            )
+        return self._operation_methods_cache[dunder]
+
     @cached_property
     def _getitem_methods(self) -> Set[Callable]:
         return self._safe_get_methods(self.allowed_getitem, "__getitem__")
@@ -291,6 +327,50 @@ def guarded_eval(code: str, context: EvaluationContext):
     return eval_node(expression, context)
 
 
+BINARY_OP_DUNDERS: Dict[Type[ast.operator], Tuple[str]] = {
+    ast.Add: ("__add__",),
+    ast.Sub: ("__sub__",),
+    ast.Mult: ("__mul__",),
+    ast.Div: ("__truediv__",),
+    ast.FloorDiv: ("__floordiv__",),
+    ast.Mod: ("__mod__",),
+    ast.Pow: ("__pow__",),
+    ast.LShift: ("__lshift__",),
+    ast.RShift: ("__rshift__",),
+    ast.BitOr: ("__or__",),
+    ast.BitXor: ("__xor__",),
+    ast.BitAnd: ("__and__",),
+    ast.MatMult: ("__matmul__",),
+}
+
+COMP_OP_DUNDERS: Dict[Type[ast.cmpop], Tuple[str, ...]] = {
+    ast.Eq: ("__eq__",),
+    ast.NotEq: ("__ne__", "__eq__"),
+    ast.Lt: ("__lt__", "__gt__"),
+    ast.LtE: ("__le__", "__ge__"),
+    ast.Gt: ("__gt__", "__lt__"),
+    ast.GtE: ("__ge__", "__le__"),
+    ast.In: ("__contains__",),
+    # Note: ast.Is, ast.IsNot, ast.NotIn are handled specially
+}
+
+UNARY_OP_DUNDERS: Dict[Type[ast.unaryop], Tuple[str, ...]] = {
+    ast.USub: ("__neg__",),
+    ast.UAdd: ("__pos__",),
+    # we have to check both __inv__ and __invert__!
+    ast.Invert: ("__invert__", "__inv__"),
+    ast.Not: ("__not__",),
+}
+
+
+def _find_dunder(node_op, dunders) -> Union[Tuple[str, ...], None]:
+    dunder = None
+    for op, candidate_dunder in dunders.items():
+        if isinstance(node_op, op):
+            dunder = candidate_dunder
+    return dunder
+
+
 def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
     """Evaluate AST node in provided context.
 
@@ -324,35 +404,55 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
     if isinstance(node, ast.Expression):
         return eval_node(node.body, context)
     if isinstance(node, ast.BinOp):
-        # TODO: add guards
         left = eval_node(node.left, context)
         right = eval_node(node.right, context)
-        if isinstance(node.op, ast.Add):
-            return left + right
-        if isinstance(node.op, ast.Sub):
-            return left - right
-        if isinstance(node.op, ast.Mult):
-            return left * right
-        if isinstance(node.op, ast.Div):
-            return left / right
-        if isinstance(node.op, ast.FloorDiv):
-            return left // right
-        if isinstance(node.op, ast.Mod):
-            return left % right
-        if isinstance(node.op, ast.Pow):
-            return left**right
-        if isinstance(node.op, ast.LShift):
-            return left << right
-        if isinstance(node.op, ast.RShift):
-            return left >> right
-        if isinstance(node.op, ast.BitOr):
-            return left | right
-        if isinstance(node.op, ast.BitXor):
-            return left ^ right
-        if isinstance(node.op, ast.BitAnd):
-            return left & right
-        if isinstance(node.op, ast.MatMult):
-            return left @ right
+        dunders = _find_dunder(node.op, BINARY_OP_DUNDERS)
+        if dunders:
+            if policy.can_operate(dunders, left, right):
+                return getattr(left, dunders[0])(right)
+            else:
+                raise GuardRejection(
+                    f"Operation (`{dunders}`) for",
+                    type(left),
+                    f"not allowed in {context.evaluation} mode",
+                )
+    if isinstance(node, ast.Compare):
+        left = eval_node(node.left, context)
+        all_true = True
+        negate = False
+        for op, right in zip(node.ops, node.comparators):
+            right = eval_node(right, context)
+            dunder = None
+            dunders = _find_dunder(op, COMP_OP_DUNDERS)
+            if not dunders:
+                if isinstance(op, ast.NotIn):
+                    dunders = COMP_OP_DUNDERS[ast.In]
+                    negate = True
+                if isinstance(op, ast.Is):
+                    dunder = "is_"
+                if isinstance(op, ast.IsNot):
+                    dunder = "is_"
+                    negate = True
+            if not dunder and dunders:
+                dunder = dunders[0]
+            if dunder:
+                a, b = (right, left) if dunder == "__contains__" else (left, right)
+                if dunder == "is_" or dunders and policy.can_operate(dunders, a, b):
+                    result = getattr(operator, dunder)(a, b)
+                    if negate:
+                        result = not result
+                    if not result:
+                        all_true = False
+                    left = right
+                else:
+                    raise GuardRejection(
+                        f"Comparison (`{dunder}`) for",
+                        type(left),
+                        f"not allowed in {context.evaluation} mode",
+                    )
+            else:
+                raise ValueError(f"Comparison `{dunder}` not supported")
+        return all_true
     if isinstance(node, ast.Constant):
         return node.value
     if isinstance(node, ast.Index):
@@ -379,16 +479,17 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
     if isinstance(node, ast.ExtSlice):
         return tuple([eval_node(dim, context) for dim in node.dims])
     if isinstance(node, ast.UnaryOp):
-        # TODO: add guards
         value = eval_node(node.operand, context)
-        if isinstance(node.op, ast.USub):
-            return -value
-        if isinstance(node.op, ast.UAdd):
-            return +value
-        if isinstance(node.op, ast.Invert):
-            return ~value
-        if isinstance(node.op, ast.Not):
-            return not value
+        dunders = _find_dunder(node.op, UNARY_OP_DUNDERS)
+        if dunders:
+            if policy.can_operate(dunders, value):
+                return getattr(value, dunders[0])()
+            else:
+                raise GuardRejection(
+                    f"Operation (`{dunders}`) for",
+                    type(value),
+                    f"not allowed in {context.evaluation} mode",
+                )
         raise ValueError("Unhandled unary operation:", node.op)
     if isinstance(node, ast.Subscript):
         value = eval_node(node.value, context)
@@ -527,6 +628,9 @@ def _list_methods(cls, source=None):
     method_descriptor,
 }
 
+
+BUILTIN_OPERATIONS = {int, float, complex, *BUILTIN_GETATTR}
+
 EVALUATION_POLICIES = {
     "minimal": EvaluationPolicy(
         allow_builtins_access=True,
@@ -536,6 +640,7 @@ def _list_methods(cls, source=None):
         allow_attr_access=False,
         allowed_calls=set(),
         allow_any_calls=False,
+        allow_all_operations=False,
     ),
     "limited": SelectivePolicy(
         # TODO:
@@ -548,6 +653,7 @@ def _list_methods(cls, source=None):
             ("pandas", "DataFrame"),
             ("pandas", "Series"),
         },
+        allowed_operations=BUILTIN_OPERATIONS,
         allow_builtins_access=True,
         allow_locals_access=True,
         allow_globals_access=True,
@@ -560,6 +666,7 @@ def _list_methods(cls, source=None):
         allow_attr_access=True,
         allow_item_access=True,
         allow_any_calls=True,
+        allow_all_operations=True,
     ),
 }
 
diff --git a/IPython/core/tests/test_guarded_eval.py b/IPython/core/tests/test_guarded_eval.py
index 9c98b7a8e2a..94f58298665 100644
--- a/IPython/core/tests/test_guarded_eval.py
+++ b/IPython/core/tests/test_guarded_eval.py
@@ -199,6 +199,76 @@ def test_literals(code, expected):
     assert guarded_eval(code, context) == expected
 
 
+@pytest.mark.parametrize(
+    "code,expected",
+    [
+        ["-5", -5],
+        ["+5", +5],
+        ["~5", -6],
+    ],
+)
+def test_unary_operations(code, expected):
+    context = limited()
+    assert guarded_eval(code, context) == expected
+
+
+@pytest.mark.parametrize(
+    "code,expected",
+    [
+        ["1 + 1", 2],
+        ["3 - 1", 2],
+        ["2 * 3", 6],
+        ["5 // 2", 2],
+        ["5 / 2", 2.5],
+        ["5**2", 25],
+        ["2 >> 1", 1],
+        ["2 << 1", 4],
+        ["1 | 2", 3],
+        ["1 & 1", 1],
+        ["1 & 2", 0],
+    ],
+)
+def test_binary_operations(code, expected):
+    context = limited()
+    assert guarded_eval(code, context) == expected
+
+
+@pytest.mark.parametrize(
+    "code,expected",
+    [
+        ["2 > 1", True],
+        ["2 < 1", False],
+        ["2 <= 1", False],
+        ["2 <= 2", True],
+        ["1 >= 2", False],
+        ["2 >= 2", True],
+        ["2 == 2", True],
+        ["1 == 2", False],
+        ["1 != 2", True],
+        ["1 != 1", False],
+        ["1 < 4 < 3", False],
+        ["(1 < 4) < 3", True],
+        ["4 > 3 > 2 > 1", True],
+        ["4 > 3 > 2 > 9", False],
+        ["1 < 2 < 3 < 4", True],
+        ["9 < 2 < 3 < 4", False],
+        ["1 < 2 > 1 > 0 > -1 < 1", True],
+        ["1 in [1] in [[1]]", True],
+        ["1 in [1] in [[2]]", False],
+        ["1 in [1]", True],
+        ["0 in [1]", False],
+        ["1 not in [1]", False],
+        ["0 not in [1]", True],
+        ["True is True", True],
+        ["False is False", True],
+        ["True is False", False],
+    ],
+)
+def test_comparisons(code, expected):
+    context = limited()
+    assert guarded_eval(code, context) == expected
+
+
 def test_access_builtins():
     context = limited()
     assert guarded_eval("round", context) == round

From 6250931515354a158dbda57ea082d65aec8a308b Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 4 Dec 2022 00:25:52 +0000
Subject: [PATCH 1324/1407] Increase coverage of `guard_eval`

---
 IPython/core/completer.py               |   3 +-
 IPython/core/guarded_eval.py            |  49 ++++--
 IPython/core/tests/test_guarded_eval.py | 201 +++++++++++++++++++++---
 3 files changed, 215 insertions(+), 38 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 7dd585bce36..f2853d3c48a 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -996,7 +996,8 @@ class Completer(Configurable):
 
         - ``forbidden``: no evaluation of code is permitted,
         - ``minimal``: evaluation of literals and access to built-in namespace;
-          no item/attribute evaluation nor access to locals/globals,
+          no item/attribute evaluationm no access to locals/globals,
+          no evaluation of any operations or comparisons.
         - ``limited``: access to all namespaces, evaluation of hard-coded methods
           (for example: :any:`dict.keys`, :any:`object.__getattr__`,
           :any:`object.__getitem__`) on allow-listed objects (for example:
diff --git a/IPython/core/guarded_eval.py b/IPython/core/guarded_eval.py
index 215a36fab05..f71a73bea58 100644
--- a/IPython/core/guarded_eval.py
+++ b/IPython/core/guarded_eval.py
@@ -108,6 +108,7 @@ def can_call(self, func):
             return True
 
         owner_method = _unbind_method(func)
+
         if owner_method and owner_method in self.allowed_calls:
             return True
 
@@ -127,6 +128,10 @@ def _has_original_dunder_external(
         value_type = type(value)
         if type(value) == member_type:
             return True
+        if method_name == "__getattribute__":
+            # we have to short-circuit here due to an unresolved issue in
+            # `isinstance` implementation: https://bugs.python.org/issue32683
+            return False
         if isinstance(value, member_type):
             method = getattr(value_type, method_name, None)
             member_method = getattr(member_type, method_name, None)
@@ -149,7 +154,7 @@ def _has_original_dunder(
 
     method = getattr(value_type, method_name, None)
 
-    if not method:
+    if method is None:
         return None
 
     if method in allowed_methods:
@@ -193,6 +198,7 @@ def can_get_attr(self, value, attr):
             allowed_external=self.allowed_getattr_external,
             method_name="__getattr__",
         )
+
         # Many objects do not have `__getattr__`, this is fine
         if has_original_attr is None and has_original_attribute:
             return True
@@ -200,10 +206,6 @@ def can_get_attr(self, value, attr):
         # Accept objects without modifications to `__getattr__` and `__getattribute__`
         return has_original_attr and has_original_attribute
 
-    def get_attr(self, value, attr):
-        if self.can_get_attr(value, attr):
-            return getattr(value, attr)
-
     def can_get_item(self, value, item):
         """Allow accessing `__getiitem__` of allow-listed instances unless it was not modified."""
         return _has_original_dunder(
@@ -215,20 +217,24 @@ def can_get_item(self, value, item):
         )
 
     def can_operate(self, dunders: Tuple[str, ...], a, b=None):
+        objects = [a]
+        if b is not None:
+            objects.append(b)
         return all(
             [
                 _has_original_dunder(
-                    a,
+                    obj,
                     allowed_types=self.allowed_operations,
-                    allowed_methods=self._dunder_methods(dunder),
+                    allowed_methods=self._operator_dunder_methods(dunder),
                     allowed_external=self.allowed_operations_external,
                     method_name=dunder,
                 )
                 for dunder in dunders
+                for obj in objects
             ]
         )
 
-    def _dunder_methods(self, dunder: str) -> Set[Callable]:
+    def _operator_dunder_methods(self, dunder: str) -> Set[Callable]:
         if dunder not in self._operation_methods_cache:
             self._operation_methods_cache[dunder] = self._safe_get_methods(
                 self.allowed_operations, dunder
@@ -257,7 +263,7 @@ def _safe_get_methods(self, classes, name) -> Set[Callable]:
 
 
 class _DummyNamedTuple(NamedTuple):
-    pass
+    """Used internally to retrieve methods of named tuple instance."""
 
 
 class EvaluationContext(NamedTuple):
@@ -451,12 +457,15 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
                         f"not allowed in {context.evaluation} mode",
                     )
             else:
-                raise ValueError(f"Comparison `{dunder}` not supported")
+                raise ValueError(
+                    f"Comparison `{dunder}` not supported"
+                )  # pragma: no cover
         return all_true
     if isinstance(node, ast.Constant):
         return node.value
     if isinstance(node, ast.Index):
-        return eval_node(node.value, context)
+        # deprecated since Python 3.9
+        return eval_node(node.value, context)  # pragma: no cover
     if isinstance(node, ast.Tuple):
         return tuple(eval_node(e, context) for e in node.elts)
     if isinstance(node, ast.List):
@@ -477,7 +486,8 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
             eval_node(node.step, context),
         )
     if isinstance(node, ast.ExtSlice):
-        return tuple([eval_node(dim, context) for dim in node.dims])
+        # deprecated since Python 3.9
+        return tuple([eval_node(dim, context) for dim in node.dims])  # pragma: no cover
     if isinstance(node, ast.UnaryOp):
         value = eval_node(node.operand, context)
         dunders = _find_dunder(node.op, UNARY_OP_DUNDERS)
@@ -490,7 +500,6 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
                     type(value),
                     f"not allowed in {context.evaluation} mode",
                 )
-        raise ValueError("Unhandled unary operation:", node.op)
     if isinstance(node, ast.Subscript):
         value = eval_node(node.value, context)
         slice_ = eval_node(node.slice, context)
@@ -507,14 +516,14 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
         if policy.allow_globals_access and node.id in context.globals:
             return context.globals[node.id]
         if policy.allow_builtins_access and hasattr(builtins, node.id):
-            # note: do not use __builtins__, it is implementation detail of Python
+            # note: do not use __builtins__, it is implementation detail of cPython
             return getattr(builtins, node.id)
         if not policy.allow_globals_access and not policy.allow_locals_access:
             raise GuardRejection(
                 f"Namespace access not allowed in {context.evaluation} mode"
             )
         else:
-            raise NameError(f"{node.id} not found in locals nor globals")
+            raise NameError(f"{node.id} not found in locals, globals, nor builtins")
     if isinstance(node, ast.Attribute):
         value = eval_node(node.value, context)
         if policy.can_get_attr(value, node.attr):
@@ -540,7 +549,7 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
             func,  # not joined to avoid calling `repr`
             f"not allowed in {context.evaluation} mode",
         )
-    raise ValueError("Unhandled node", node)
+    raise ValueError("Unhandled node", ast.dump(node))
 
 
 SUPPORTED_EXTERNAL_GETITEM = {
@@ -552,6 +561,7 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
     ("numpy", "void"),
 }
 
+
 BUILTIN_GETITEM: Set[InstancesHaveGetItem] = {
     dict,
     str,
@@ -583,6 +593,8 @@ def _list_methods(cls, source=None):
 dict_keys: Type[collections.abc.KeysView] = type({}.keys())
 method_descriptor: Any = type(list.copy)
 
+NUMERICS = {int, float, complex}
+
 ALLOWED_CALLS = {
     bytes,
     *_list_methods(bytes),
@@ -600,6 +612,8 @@ def _list_methods(cls, source=None):
     *_list_methods(str),
     tuple,
     *_list_methods(tuple),
+    *NUMERICS,
+    *[method for numeric_cls in NUMERICS for method in _list_methods(numeric_cls)],
     collections.deque,
     *_list_methods(collections.deque, list_non_mutating_methods),
     collections.defaultdict,
@@ -624,12 +638,13 @@ def _list_methods(cls, source=None):
     frozenset,
     object,
     type,  # `type` handles a lot of generic cases, e.g. numbers as in `int.real`.
+    *NUMERICS,
     dict_keys,
     method_descriptor,
 }
 
 
-BUILTIN_OPERATIONS = {int, float, complex, *BUILTIN_GETATTR}
+BUILTIN_OPERATIONS = {*BUILTIN_GETATTR}
 
 EVALUATION_POLICIES = {
     "minimal": EvaluationPolicy(
diff --git a/IPython/core/tests/test_guarded_eval.py b/IPython/core/tests/test_guarded_eval.py
index 94f58298665..8d3495a3d6e 100644
--- a/IPython/core/tests/test_guarded_eval.py
+++ b/IPython/core/tests/test_guarded_eval.py
@@ -1,4 +1,5 @@
 from typing import NamedTuple
+from functools import partial
 from IPython.core.guarded_eval import (
     EvaluationContext,
     GuardRejection,
@@ -9,12 +10,19 @@
 import pytest
 
 
-def limited(**kwargs):
-    return EvaluationContext(locals=kwargs, globals={}, evaluation="limited")
+def create_context(evaluation: str, **kwargs):
+    return EvaluationContext(locals=kwargs, globals={}, evaluation=evaluation)
 
 
-def unsafe(**kwargs):
-    return EvaluationContext(locals=kwargs, globals={}, evaluation="unsafe")
+forbidden = partial(create_context, "forbidden")
+minimal = partial(create_context, "minimal")
+limited = partial(create_context, "limited")
+unsafe = partial(create_context, "unsafe")
+dangerous = partial(create_context, "dangerous")
+
+LIMITED_OR_HIGHER = [limited, unsafe, dangerous]
+
+MINIMAL_OR_HIGHER = [minimal, *LIMITED_OR_HIGHER]
 
 
 @dec.skip_without("pandas")
@@ -142,7 +150,7 @@ def test_set_literal():
     assert guarded_eval('{"a"}', context) == {"a"}
 
 
-def test_if_expression():
+def test_evaluates_if_expression():
     context = limited()
     assert guarded_eval("2 if True else 3", context) == 2
     assert guarded_eval("4 if False else 5", context) == 5
@@ -178,7 +186,7 @@ def test_method_descriptor():
         [{"a": 1}, "data.keys().isdisjoint({})", "data.update()", True],
     ],
 )
-def test_calls(data, good, bad, expected):
+def test_evaluates_calls(data, good, bad, expected):
     context = limited(data=data)
     assert guarded_eval(good, context) == expected
 
@@ -194,9 +202,26 @@ def test_calls(data, good, bad, expected):
         ["list(range(20))[3:-2:3]", [3, 6, 9, 12, 15]],
     ],
 )
-def test_literals(code, expected):
-    context = limited()
-    assert guarded_eval(code, context) == expected
+@pytest.mark.parametrize("context", LIMITED_OR_HIGHER)
+def test_evaluates_complex_cases(code, expected, context):
+    assert guarded_eval(code, context()) == expected
+
+
+@pytest.mark.parametrize(
+    "code,expected",
+    [
+        ["1", 1],
+        ["1.0", 1.0],
+        ["0xdeedbeef", 0xDEEDBEEF],
+        ["True", True],
+        ["None", None],
+        ["{}", {}],
+        ["[]", []],
+    ],
+)
+@pytest.mark.parametrize("context", MINIMAL_OR_HIGHER)
+def test_evaluates_literals(code, expected, context):
+    assert guarded_eval(code, context()) == expected
 
 
 @pytest.mark.parametrize(
@@ -207,9 +232,9 @@ def test_literals(code, expected):
         ["~5", -6],
     ],
 )
-def test_unary_operations(code, expected):
-    context = limited()
-    assert guarded_eval(code, context) == expected
+@pytest.mark.parametrize("context", LIMITED_OR_HIGHER)
+def test_evaluates_unary_operations(code, expected, context):
+    assert guarded_eval(code, context()) == expected
 
 
 @pytest.mark.parametrize(
@@ -228,9 +253,9 @@ def test_unary_operations(code, expected):
         ["1 & 2", 0],
     ],
 )
-def test_binary_operations(code, expected):
-    context = limited()
-    assert guarded_eval(code, context) == expected
+@pytest.mark.parametrize("context", LIMITED_OR_HIGHER)
+def test_evaluates_binary_operations(code, expected, context):
+    assert guarded_eval(code, context()) == expected
 
 
 @pytest.mark.parametrize(
@@ -262,16 +287,152 @@ def test_binary_operations(code, expected):
         ["True is True", True],
         ["False is False", True],
         ["True is False", False],
+        ["True is not True", False],
+        ["False is not True", True],
     ],
 )
-def test_comparisons(code, expected):
-    context = limited()
-    assert guarded_eval(code, context) == expected
+@pytest.mark.parametrize("context", LIMITED_OR_HIGHER)
+def test_evaluates_comparisons(code, expected, context):
+    assert guarded_eval(code, context()) == expected
+
+
+def test_guards_comparisons():
+    class GoodEq(int):
+        pass
+
+    class BadEq(int):
+        def __eq__(self, other):
+            assert False
+
+    context = limited(bad=BadEq(1), good=GoodEq(1))
+
+    with pytest.raises(GuardRejection):
+        guarded_eval("bad == 1", context)
+
+    with pytest.raises(GuardRejection):
+        guarded_eval("bad != 1", context)
+
+    with pytest.raises(GuardRejection):
+        guarded_eval("1 == bad", context)
+
+    with pytest.raises(GuardRejection):
+        guarded_eval("1 != bad", context)
+
+    assert guarded_eval("good == 1", context) is True
+    assert guarded_eval("good != 1", context) is False
+    assert guarded_eval("1 == good", context) is True
+    assert guarded_eval("1 != good", context) is False
+
+
+def test_guards_unary_operations():
+    class GoodOp(int):
+        pass
+
+    class BadOpInv(int):
+        def __inv__(self, other):
+            assert False
+
+    class BadOpInverse(int):
+        def __inv__(self, other):
+            assert False
+
+    context = limited(good=GoodOp(1), bad1=BadOpInv(1), bad2=BadOpInverse(1))
+
+    with pytest.raises(GuardRejection):
+        guarded_eval("~bad1", context)
+
+    with pytest.raises(GuardRejection):
+        guarded_eval("~bad2", context)
+
+
+def test_guards_binary_operations():
+    class GoodOp(int):
+        pass
 
+    class BadOp(int):
+        def __add__(self, other):
+            assert False
 
-def test_access_builtins():
+    context = limited(good=GoodOp(1), bad=BadOp(1))
+
+    with pytest.raises(GuardRejection):
+        guarded_eval("1 + bad", context)
+
+    with pytest.raises(GuardRejection):
+        guarded_eval("bad + 1", context)
+
+    assert guarded_eval("good + 1", context) == 2
+    assert guarded_eval("1 + good", context) == 2
+
+
+def test_guards_attributes():
+    class GoodAttr(float):
+        pass
+
+    class BadAttr1(float):
+        def __getattr__(self, key):
+            assert False
+
+    class BadAttr2(float):
+        def __getattribute__(self, key):
+            assert False
+
+    context = limited(good=GoodAttr(0.5), bad1=BadAttr1(0.5), bad2=BadAttr2(0.5))
+
+    with pytest.raises(GuardRejection):
+        guarded_eval("bad1.as_integer_ratio", context)
+
+    with pytest.raises(GuardRejection):
+        guarded_eval("bad2.as_integer_ratio", context)
+
+    assert guarded_eval("good.as_integer_ratio()", context) == (1, 2)
+
+
+@pytest.mark.parametrize("context", MINIMAL_OR_HIGHER)
+def test_access_builtins(context):
+    assert guarded_eval("round", context()) == round
+
+
+def test_access_builtins_fails():
     context = limited()
-    assert guarded_eval("round", context) == round
+    with pytest.raises(NameError):
+        guarded_eval("this_is_not_builtin", context)
+
+
+def test_rejects_forbidden():
+    context = forbidden()
+    with pytest.raises(GuardRejection):
+        guarded_eval("1", context)
+
+
+def test_guards_locals_and_globals():
+    context = EvaluationContext(
+        locals={"local_a": "a"}, globals={"global_b": "b"}, evaluation="minimal"
+    )
+
+    with pytest.raises(GuardRejection):
+        guarded_eval("local_a", context)
+
+    with pytest.raises(GuardRejection):
+        guarded_eval("global_b", context)
+
+
+def test_access_locals_and_globals():
+    context = EvaluationContext(
+        locals={"local_a": "a"}, globals={"global_b": "b"}, evaluation="limited"
+    )
+    assert guarded_eval("local_a", context) == "a"
+    assert guarded_eval("global_b", context) == "b"
+
+
+@pytest.mark.parametrize(
+    "code",
+    ["def func(): pass", "class C: pass", "x = 1", "x += 1", "del x", "import ast"],
+)
+@pytest.mark.parametrize("context", [minimal(), limited(), unsafe()])
+def test_rejects_side_effect_syntax(code, context):
+    with pytest.raises(SyntaxError):
+        guarded_eval(code, context)
 
 
 def test_subscript():

From add04498bd106451679b75e0bc3a782ad5a13ea5 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 4 Dec 2022 01:55:03 +0000
Subject: [PATCH 1325/1407] Fix code cov coverage reporting

---
 .github/workflows/test.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 53ccb6f78ed..2f4677fb4d2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -77,4 +77,7 @@ jobs:
       run: |
         pytest --color=yes -raXxs ${{ startsWith(matrix.python-version, 'pypy') && ' ' || '--cov --cov-report=xml' }}
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3
+      with:
+         name: Test
+         files: /home/runner/work/ipython/ipython/coverage.xml

From a6e74d58a693917677bfa4f35d94523a77cd3e35 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 4 Dec 2022 11:31:50 +0000
Subject: [PATCH 1326/1407] Describe code style checks and working with docs
 locally

---
 CONTRIBUTING.md | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5826baf599c..10bf1efff8f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -66,8 +66,9 @@ Some guidelines on contributing to IPython:
   If you're making functional changes, you can clean up the specific pieces of
   code you're working on.
 
-[Travis](http://travis-ci.org/#!/ipython/ipython) does a pretty good job testing
-IPython and Pull Requests, but it may make sense to manually perform tests,
+[GitHub Actions](https://github.com/ipython/ipython/actions/workflows/test.yml) does
+a pretty good job testing IPython and Pull Requests,
+but it may make sense to manually perform tests,
 particularly for PRs that affect `IPython.parallel` or Windows.
 
 For more detailed information, see our [GitHub Workflow](https://github.com/ipython/ipython/wiki/Dev:-GitHub-workflow).
@@ -88,3 +89,30 @@ Only a single test (for example **test_alias_lifecycle**) within a single file c
 ```shell
 pytest IPython/core/tests/test_alias.py::test_alias_lifecycle
 ```
+
+## Code style
+
+* Before committing run `darker -r 60625f241f298b5039cb2debc365db38aa7bb522 <file path>` to apply selective `black` formatting on modified regions using [darker](https://github.com/akaihola/darker)
+* For newly added modules or refactors, please enable static typing analysis with `mypy` for the modified module by adding the file path in [`mypy.yml`](https://github.com/ipython/ipython/blob/main/.github/workflows/mypy.yml) workflow.
+* As described in pull requests section, please avoid excessive formatting changes; if formatting-only commit is necessary consider adding its hash to [`.git-blame-ignore-revs`](https://github.com/ipython/ipython/blob/main/.git-blame-ignore-revs) file
+
+## Documentation
+
+Sphinx documentation can be built locally using standard sphinx `make` commands. To build HTML documentation from the root of the project, execute:
+
+```shell
+pip install -r docs/requirements.txt   # only needed once
+make -C docs/ html SPHINXOPTS="-W"
+```
+
+To force update of the API documentation, precede the `make` command with:
+
+```shell
+python3 docs/autogen_api.py
+```
+
+Similarly, to force-update the configuration, run:
+
+```shell
+python3 docs/autogen_config.py
+```

From 200dc32e519c12aa0bf9bdf6fce27e41c6a02dd0 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 4 Dec 2022 11:32:23 +0000
Subject: [PATCH 1327/1407] Fix a typo in GH actions URL in README

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 0371848061e..b004792e0e9 100644
--- a/README.rst
+++ b/README.rst
@@ -5,7 +5,7 @@
     :target: https://pypi.python.org/pypi/ipython
 
 .. image:: https://github.com/ipython/ipython/actions/workflows/test.yml/badge.svg
-    :target: https://github.com/ipython/ipython/actions/workflows/test.yml)
+    :target: https://github.com/ipython/ipython/actions/workflows/test.yml
 
 .. image:: https://www.codetriage.com/ipython/ipython/badges/users.svg
     :target: https://www.codetriage.com/ipython/ipython/

From 6938ae1204891a9ebb9989f5b266007f1f18d82f Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 4 Dec 2022 12:03:32 +0000
Subject: [PATCH 1328/1407] Remove unused pytest ignores (files have been
 deleted)

---
 pytest.ini | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pytest.ini b/pytest.ini
index 81511e9ce51..5cc977692b8 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -14,18 +14,10 @@ addopts = --durations=10
     --ignore=IPython/sphinxext
     --ignore=IPython/terminal/pt_inputhooks
     --ignore=IPython/__main__.py
-    --ignore=IPython/config.py
-    --ignore=IPython/frontend.py
-    --ignore=IPython/html.py
-    --ignore=IPython/nbconvert.py
-    --ignore=IPython/nbformat.py
-    --ignore=IPython/parallel.py
-    --ignore=IPython/qt.py
     --ignore=IPython/external/qt_for_kernel.py
     --ignore=IPython/html/widgets/widget_link.py
     --ignore=IPython/html/widgets/widget_output.py
     --ignore=IPython/terminal/console.py
-    --ignore=IPython/terminal/ptshell.py
     --ignore=IPython/utils/_process_cli.py
     --ignore=IPython/utils/_process_posix.py
     --ignore=IPython/utils/_process_win32.py

From a96912d4e98ea2da4f0e8d16e9d51714575b2bf2 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 4 Dec 2022 16:16:04 +0000
Subject: [PATCH 1329/1407] Guard against custom properties

---
 IPython/core/guarded_eval.py            | 65 ++++++++++++++++++++-----
 IPython/core/tests/test_guarded_eval.py | 49 ++++++++++++++++++-
 2 files changed, 101 insertions(+), 13 deletions(-)

diff --git a/IPython/core/guarded_eval.py b/IPython/core/guarded_eval.py
index f71a73bea58..9f391e35a69 100644
--- a/IPython/core/guarded_eval.py
+++ b/IPython/core/guarded_eval.py
@@ -3,6 +3,7 @@
     Callable,
     Dict,
     Set,
+    Sequence,
     Tuple,
     NamedTuple,
     Type,
@@ -113,18 +114,30 @@ def can_call(self, func):
             return True
 
 
+def _get_external(module_name: str, access_path: Sequence[str]):
+    """Get value from external module given a dotted access path.
+
+    Raises:
+    * `KeyError` if module is removed not found, and
+    * `AttributeError` if acess path does not match an exported object
+    """
+    member_type = sys.modules[module_name]
+    for attr in access_path:
+        member_type = getattr(member_type, attr)
+    return member_type
+
+
 def _has_original_dunder_external(
     value,
-    module_name,
-    access_path,
-    method_name,
+    module_name: str,
+    access_path: Sequence[str],
+    method_name: str,
 ):
+    if module_name not in sys.modules:
+        # LBYLB as it is faster
+        return False
     try:
-        if module_name not in sys.modules:
-            return False
-        member_type = sys.modules[module_name]
-        for attr in access_path:
-            member_type = getattr(member_type, attr)
+        member_type = _get_external(module_name, access_path)
         value_type = type(value)
         if type(value) == member_type:
             return True
@@ -199,12 +212,42 @@ def can_get_attr(self, value, attr):
             method_name="__getattr__",
         )
 
+        accept = False
+
         # Many objects do not have `__getattr__`, this is fine
         if has_original_attr is None and has_original_attribute:
-            return True
+            accept = True
+        else:
+            # Accept objects without modifications to `__getattr__` and `__getattribute__`
+            accept = has_original_attr and has_original_attribute
+
+        if accept:
+            # We still need to check for overriden properties.
 
-        # Accept objects without modifications to `__getattr__` and `__getattribute__`
-        return has_original_attr and has_original_attribute
+            value_class = type(value)
+            if not hasattr(value_class, attr):
+                return True
+
+            class_attr_val = getattr(value_class, attr)
+            is_property = isinstance(class_attr_val, property)
+
+            if not is_property:
+                return True
+
+            # Properties in allowed types are ok
+            if type(value) in self.allowed_getattr:
+                return True
+
+            # Properties in subclasses of allowed types may be ok if not changed
+            for module_name, *access_path in self.allowed_getattr_external:
+                try:
+                    external_class = _get_external(module_name, access_path)
+                    external_class_attr_val = getattr(external_class, attr)
+                except (KeyError, AttributeError):
+                    return False  # pragma: no cover
+                return class_attr_val == external_class_attr_val
+
+        return False
 
     def can_get_item(self, value, item):
         """Allow accessing `__getiitem__` of allow-listed instances unless it was not modified."""
diff --git a/IPython/core/tests/test_guarded_eval.py b/IPython/core/tests/test_guarded_eval.py
index 8d3495a3d6e..1ee93ffe744 100644
--- a/IPython/core/tests/test_guarded_eval.py
+++ b/IPython/core/tests/test_guarded_eval.py
@@ -1,3 +1,4 @@
+from contextlib import contextmanager
 from typing import NamedTuple
 from functools import partial
 from IPython.core.guarded_eval import (
@@ -25,6 +26,21 @@ def create_context(evaluation: str, **kwargs):
 MINIMAL_OR_HIGHER = [minimal, *LIMITED_OR_HIGHER]
 
 
+@contextmanager
+def module_not_installed(module: str):
+    import sys
+
+    try:
+        to_restore = sys.modules[module]
+        del sys.modules[module]
+    except KeyError:
+        to_restore = None
+    try:
+        yield
+    finally:
+        sys.modules[module] = to_restore
+
+
 @dec.skip_without("pandas")
 def test_pandas_series_iloc():
     import pandas as pd
@@ -34,6 +50,32 @@ def test_pandas_series_iloc():
     assert guarded_eval("data.iloc[0]", context) == 1
 
 
+def test_rejects_custom_properties():
+    class BadProperty:
+        @property
+        def iloc(self):
+            return [None]
+
+    series = BadProperty()
+    context = limited(data=series)
+
+    with pytest.raises(GuardRejection):
+        guarded_eval("data.iloc[0]", context)
+
+
+@dec.skip_without("pandas")
+def test_accepts_non_overriden_properties():
+    import pandas as pd
+
+    class GoodProperty(pd.Series):
+        pass
+
+    series = GoodProperty([1], index=["a"])
+    context = limited(data=series)
+
+    assert guarded_eval("data.iloc[0]", context) == 1
+
+
 @dec.skip_without("pandas")
 def test_pandas_series():
     import pandas as pd
@@ -472,9 +514,12 @@ def __getitem__(self, k):
         def __getattr__(self, k):
             return "a"
 
+    def f(self):
+        return "b"
+
     t = T()
-    t.__getitem__ = lambda f: "b"
-    t.__getattr__ = lambda f: "b"
+    t.__getitem__ = f
+    t.__getattr__ = f
     assert t[1] == "a"
     assert t[1] == "a"
 

From 52cda652f1a5c71f2117bf84f33f0cc99e59e7da Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 4 Dec 2022 16:16:38 +0000
Subject: [PATCH 1330/1407] Increase coverage for completer tests

---
 IPython/core/tests/test_completer.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 423979a297f..5e8cb35bc33 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -886,6 +886,12 @@ def match(*args, **kwargs):
         assert match(keys, "2") == ("", 0, ["21", "22"])
         assert match(keys, "0b101") == ("", 0, ["0b10101", "0b10110"])
 
+        # Should yield on variables
+        assert match(keys, "a_variable") == ("", 0, [])
+
+        # Should pass over invalid literals
+        assert match(keys, "'' ''") == ("", 0, [])
+
     def test_match_dict_keys_tuple(self):
         """
         Test that match_dict_keys called with extra prefix works on a couple of use case,
@@ -1687,6 +1693,9 @@ def _(expected):
         ["0b_0011_1111_0100_1110", "0b_0011_1111_0100_1110"],
         ["0xdeadbeef", "0xdeadbeef"],
         ["0b_1110_0101", "0b_1110_0101"],
+        # should not match if in an operation
+        ["1 + 1", None],
+        [", 1 + 1", None],
     ],
 )
 def test_match_numeric_literal_for_dict_key(input, expected):

From 7f95861a8736657bd78e36c14157c3962e65421c Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 4 Dec 2022 16:17:33 +0000
Subject: [PATCH 1331/1407] Remove outdated TODO comment

---
 IPython/core/guarded_eval.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/IPython/core/guarded_eval.py b/IPython/core/guarded_eval.py
index 9f391e35a69..c2d88d0473a 100644
--- a/IPython/core/guarded_eval.py
+++ b/IPython/core/guarded_eval.py
@@ -701,8 +701,6 @@ def _list_methods(cls, source=None):
         allow_all_operations=False,
     ),
     "limited": SelectivePolicy(
-        # TODO:
-        # - should reject binary and unary operations if custom methods would be dispatched
         allowed_getitem=BUILTIN_GETITEM,
         allowed_getitem_external=SUPPORTED_EXTERNAL_GETITEM,
         allowed_getattr=BUILTIN_GETATTR,

From abe32e8d2346f2badccfef6f84f7520365ece346 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 4 Dec 2022 16:58:39 +0000
Subject: [PATCH 1332/1407] Add more tests

---
 IPython/core/guarded_eval.py            | 10 ++++---
 IPython/core/tests/test_guarded_eval.py | 35 ++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/IPython/core/guarded_eval.py b/IPython/core/guarded_eval.py
index c2d88d0473a..d60a5c5f1e3 100644
--- a/IPython/core/guarded_eval.py
+++ b/IPython/core/guarded_eval.py
@@ -60,7 +60,8 @@ class DoesNotHaveGetAttr(Protocol):
 def _unbind_method(func: Callable) -> Union[Callable, None]:
     """Get unbound method for given bound method.
 
-    Returns None if cannot get unbound method."""
+    Returns None if cannot get unbound method, or method is already unbound.
+    """
     owner = getattr(func, "__self__", None)
     owner_class = type(owner)
     name = getattr(func, "__name__", None)
@@ -214,7 +215,7 @@ def can_get_attr(self, value, attr):
 
         accept = False
 
-        # Many objects do not have `__getattr__`, this is fine
+        # Many objects do not have `__getattr__`, this is fine.
         if has_original_attr is None and has_original_attribute:
             accept = True
         else:
@@ -234,9 +235,10 @@ def can_get_attr(self, value, attr):
             if not is_property:
                 return True
 
-            # Properties in allowed types are ok
+            # Properties in allowed types are ok (although we do not include any
+            # properties in our default allow list currently).
             if type(value) in self.allowed_getattr:
-                return True
+                return True  # pragma: no cover
 
             # Properties in subclasses of allowed types may be ok if not changed
             for module_name, *access_path in self.allowed_getattr_external:
diff --git a/IPython/core/tests/test_guarded_eval.py b/IPython/core/tests/test_guarded_eval.py
index 1ee93ffe744..905cf3ab8e3 100644
--- a/IPython/core/tests/test_guarded_eval.py
+++ b/IPython/core/tests/test_guarded_eval.py
@@ -22,7 +22,6 @@ def create_context(evaluation: str, **kwargs):
 dangerous = partial(create_context, "dangerous")
 
 LIMITED_OR_HIGHER = [limited, unsafe, dangerous]
-
 MINIMAL_OR_HIGHER = [minimal, *LIMITED_OR_HIGHER]
 
 
@@ -41,6 +40,39 @@ def module_not_installed(module: str):
         sys.modules[module] = to_restore
 
 
+def test_external_not_installed():
+    """
+    Because attribute check requires checking if object is not of allowed
+    external type, this tests logic for absence of external module.
+    """
+
+    class Custom:
+        def __init__(self):
+            self.test = 1
+
+        def __getattr__(self, key):
+            return key
+
+    with module_not_installed("pandas"):
+        context = limited(x=Custom())
+        with pytest.raises(GuardRejection):
+            guarded_eval("x.test", context)
+
+
+@dec.skip_without("pandas")
+def test_external_changed_api(monkeypatch):
+    """Check that the execution rejects if external API changed paths"""
+    import pandas as pd
+
+    series = pd.Series([1], index=["a"])
+
+    with monkeypatch.context() as m:
+        m.delattr(pd, "Series")
+        context = limited(data=series)
+        with pytest.raises(GuardRejection):
+            guarded_eval("data.iloc[0]", context)
+
+
 @dec.skip_without("pandas")
 def test_pandas_series_iloc():
     import pandas as pd
@@ -496,6 +528,7 @@ def index(self, k):
     x = X()
     assert _unbind_method(x.index) is X.index
     assert _unbind_method([].index) is list.index
+    assert _unbind_method(list.index) is None
 
 
 def test_assumption_instance_attr_do_not_matter():

From 9632124e4e561e99d96304a672854be0d4cb6e16 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 7 Dec 2022 10:22:54 -0700
Subject: [PATCH 1333/1407] Add py.typed to setup.cfg

---
 setup.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.cfg b/setup.cfg
index 226506f08f0..74bbd95193b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -100,6 +100,7 @@ exclude =
     setupext
 
 [options.package_data]
+IPython = py.typed
 IPython.core = profile/README*
 IPython.core.tests = *.png, *.jpg, daft_extension/*.py
 IPython.lib.tests = *.wav

From 86e1bdf022a2b181a690d77e97a78f20bd8ecab9 Mon Sep 17 00:00:00 2001
From: Jason Grout <jason@jasongrout.org>
Date: Fri, 9 Dec 2022 11:07:08 -0700
Subject: [PATCH 1334/1407] Refactor Inspector._get_info to make it easier to
 subclass and modify behavior.

This factors out the logic to append an info field to the inspect_reply mimebundle and the logic for what information is in the mimebundle into separate functions that can easily be overridden by an inspector subclass. This allows a subclass to easily:

* format information into yet another mimetype besides text/plain and text/html
* modify or add to the default information

without having to copy the default implementation.
---
 IPython/core/oinspect.py | 143 +++++++++++++++++++++------------------
 1 file changed, 78 insertions(+), 65 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index f1c454b2604..13d6268256d 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -552,56 +552,46 @@ def _mime_format(self, text:str, formatter=None) -> dict:
 
 
     def format_mime(self, bundle):
-
+        """Format a mimebundle being created by _make_info_unformatted into a real mimebundle"""
+        # First, format the field names and values for the text/plain field
         text_plain = bundle['text/plain']
+        if isinstance(text_plain, (list, tuple)):
+            text = ''
+            heads, bodies = list(zip(*text_plain))
+            _len = max(len(h) for h in heads)
 
-        text = ''
-        heads, bodies = list(zip(*text_plain))
-        _len = max(len(h) for h in heads)
+            for head, body in zip(heads, bodies):
+                body = body.strip('\n')
+                delim = '\n' if '\n' in body else ' '
+                text += self.__head(head+':') + (_len - len(head))*' ' +delim + body +'\n'
 
-        for head, body in zip(heads, bodies):
-            body = body.strip('\n')
-            delim = '\n' if '\n' in body else ' '
-            text += self.__head(head+':') + (_len - len(head))*' ' +delim + body +'\n'
+            bundle['text/plain'] = text
 
-        bundle['text/plain'] = text
+        # Next format the text/html value by joining strings if it is a list of strings
+        if isinstance(bundle['text/html'], (list, tuple)):
+            bundle['text/html'] = '\n'.join(bundle['text/html'])
         return bundle
 
-    def _get_info(
-        self, obj, oname="", formatter=None, info=None, detail_level=0, omit_sections=()
-    ):
-        """Retrieve an info dict and format it.
-
-        Parameters
-        ----------
-        obj : any
-            Object to inspect and return info from
-        oname : str (default: ''):
-            Name of the variable pointing to `obj`.
-        formatter : callable
-        info
-            already computed information
-        detail_level : integer
-            Granularity of detail level, if set to 1, give more information.
-        omit_sections : container[str]
-            Titles or keys to omit from output (can be set, tuple, etc., anything supporting `in`)
-        """
-
-        info = self.info(obj, oname=oname, info=info, detail_level=detail_level)
-
-        _mime = {
+    def _append_info_field(self, bundle, title:str, key:str, info, omit_sections, formatter):
+        """Append an info value to the unformatted mimebundle being constructed by _make_info_unformatted"""
+        if title in omit_sections or key in omit_sections:
+            return
+        field = info[key]
+        if field is not None:
+            formatted_field = self._mime_format(field, formatter)
+            bundle['text/plain'].append((title, formatted_field['text/plain']))
+            bundle['text/html'] += '<h1>' + title + '</h1>\n' + formatted_field['text/html']
+
+    def _make_info_unformatted(self, info, formatter, detail_level, omit_sections):
+        """Assemble the mimebundle as unformatted lists of information"""
+        bundle = {
             'text/plain': [],
-            'text/html': '',
+            'text/html': [],
         }
 
+        # A convenience function to simplify calls below
         def append_field(bundle, title:str, key:str, formatter=None):
-            if title in omit_sections or key in omit_sections:
-                return
-            field = info[key]
-            if field is not None:
-                formatted_field = self._mime_format(field, formatter)
-                bundle['text/plain'].append((title, formatted_field['text/plain']))
-                bundle['text/html'] += '<h1>' + title + '</h1>\n' + formatted_field['text/html'] + '\n'
+            self._append_info_field(bundle, title=title, key=key, info=info, omit_sections=omit_sections, formatter=formatter)
 
         def code_formatter(text):
             return {
@@ -610,56 +600,79 @@ def code_formatter(text):
             }
 
         if info['isalias']:
-            append_field(_mime, 'Repr', 'string_form')
+            append_field(bundle, 'Repr', 'string_form')
 
         elif info['ismagic']:
             if detail_level > 0:
-                append_field(_mime, 'Source', 'source', code_formatter)
+                append_field(bundle, 'Source', 'source', code_formatter)
             else:
-                append_field(_mime, 'Docstring', 'docstring', formatter)
-            append_field(_mime, 'File', 'file')
+                append_field(bundle, 'Docstring', 'docstring', formatter)
+            append_field(bundle, 'File', 'file')
 
         elif info['isclass'] or is_simple_callable(obj):
             # Functions, methods, classes
-            append_field(_mime, 'Signature', 'definition', code_formatter)
-            append_field(_mime, 'Init signature', 'init_definition', code_formatter)
-            append_field(_mime, 'Docstring', 'docstring', formatter)
+            append_field(bundle, 'Signature', 'definition', code_formatter)
+            append_field(bundle, 'Init signature', 'init_definition', code_formatter)
+            append_field(bundle, 'Docstring', 'docstring', formatter)
             if detail_level > 0 and info['source']:
-                append_field(_mime, 'Source', 'source', code_formatter)
+                append_field(bundle, 'Source', 'source', code_formatter)
             else:
-                append_field(_mime, 'Init docstring', 'init_docstring', formatter)
+                append_field(bundle, 'Init docstring', 'init_docstring', formatter)
 
-            append_field(_mime, 'File', 'file')
-            append_field(_mime, 'Type', 'type_name')
-            append_field(_mime, 'Subclasses', 'subclasses')
+            append_field(bundle, 'File', 'file')
+            append_field(bundle, 'Type', 'type_name')
+            append_field(bundle, 'Subclasses', 'subclasses')
 
         else:
             # General Python objects
-            append_field(_mime, 'Signature', 'definition', code_formatter)
-            append_field(_mime, 'Call signature', 'call_def', code_formatter)
-            append_field(_mime, 'Type', 'type_name')
-            append_field(_mime, 'String form', 'string_form')
+            append_field(bundle, 'Signature', 'definition', code_formatter)
+            append_field(bundle, 'Call signature', 'call_def', code_formatter)
+            append_field(bundle, 'Type', 'type_name')
+            append_field(bundle, 'String form', 'string_form')
 
             # Namespace
             if info['namespace'] != 'Interactive':
-                append_field(_mime, 'Namespace', 'namespace')
+                append_field(bundle, 'Namespace', 'namespace')
 
-            append_field(_mime, 'Length', 'length')
-            append_field(_mime, 'File', 'file')
+            append_field(bundle, 'Length', 'length')
+            append_field(bundle, 'File', 'file')
 
             # Source or docstring, depending on detail level and whether
             # source found.
             if detail_level > 0 and info['source']:
-                append_field(_mime, 'Source', 'source', code_formatter)
+                append_field(bundle, 'Source', 'source', code_formatter)
             else:
-                append_field(_mime, 'Docstring', 'docstring', formatter)
+                append_field(bundle, 'Docstring', 'docstring', formatter)
+
+            append_field(bundle, 'Class docstring', 'class_docstring', formatter)
+            append_field(bundle, 'Init docstring', 'init_docstring', formatter)
+            append_field(bundle, 'Call docstring', 'call_docstring', formatter)
+        return bundle
 
-            append_field(_mime, 'Class docstring', 'class_docstring', formatter)
-            append_field(_mime, 'Init docstring', 'init_docstring', formatter)
-            append_field(_mime, 'Call docstring', 'call_docstring', formatter)
 
+    def _get_info(
+        self, obj, oname="", formatter=None, info=None, detail_level=0, omit_sections=()
+    ):
+        """Retrieve an info dict and format it.
 
-        return self.format_mime(_mime)
+        Parameters
+        ----------
+        obj : any
+            Object to inspect and return info from
+        oname : str (default: ''):
+            Name of the variable pointing to `obj`.
+        formatter : callable
+        info
+            already computed information
+        detail_level : integer
+            Granularity of detail level, if set to 1, give more information.
+        omit_sections : container[str]
+            Titles or keys to omit from output (can be set, tuple, etc., anything supporting `in`)
+        """
+
+        info = self.info(obj, oname=oname, info=info, detail_level=detail_level)
+        bundle = self._make_info_unformatted(info, formatter, detail_level=detail_level, omit_sections=omit_sections)
+        return self.format_mime(bundle)
 
     def pinfo(
         self,

From eae299e8c9d1471eca2c76f1e8e19765fde556a2 Mon Sep 17 00:00:00 2001
From: Jason Grout <jason@jasongrout.org>
Date: Fri, 9 Dec 2022 11:17:05 -0700
Subject: [PATCH 1335/1407] Move formatting of inspect reply html into the
 format_mime function

Also simplify the formatting of the inspect reply text/plain logic
---
 IPython/core/oinspect.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 13d6268256d..3a80f05a4e1 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -553,23 +553,23 @@ def _mime_format(self, text:str, formatter=None) -> dict:
 
     def format_mime(self, bundle):
         """Format a mimebundle being created by _make_info_unformatted into a real mimebundle"""
-        # First, format the field names and values for the text/plain field
-        text_plain = bundle['text/plain']
-        if isinstance(text_plain, (list, tuple)):
-            text = ''
-            heads, bodies = list(zip(*text_plain))
-            _len = max(len(h) for h in heads)
-
-            for head, body in zip(heads, bodies):
+        # Format text/plain mimetype
+        if isinstance(bundle['text/plain'], (list, tuple)):
+            # bundle['text/plain'] is a list of (head, formatted body) pairs
+            lines = []
+            _len = max(len(h) for h,_ in bundle['text/plain'])
+
+            for head, body in bundle['text/plain']:
                 body = body.strip('\n')
                 delim = '\n' if '\n' in body else ' '
-                text += self.__head(head+':') + (_len - len(head))*' ' +delim + body +'\n'
+                lines.append(f"{self.__head(head+':')}{(_len - len(head))*' '}{delim}{body}")
 
-            bundle['text/plain'] = text
+            bundle['text/plain'] = '\n'.join(lines)
 
-        # Next format the text/html value by joining strings if it is a list of strings
+        # Format the text/html mimetype
         if isinstance(bundle['text/html'], (list, tuple)):
-            bundle['text/html'] = '\n'.join(bundle['text/html'])
+            # bundle['text/html'] is a list of (head, formatted body) pairs
+            bundle['text/html'] = '\n'.join((f'<h1>{head}</h1>\n{body}' for (head,body) in bundle['text/html']))
         return bundle
 
     def _append_info_field(self, bundle, title:str, key:str, info, omit_sections, formatter):
@@ -580,7 +580,7 @@ def _append_info_field(self, bundle, title:str, key:str, info, omit_sections, fo
         if field is not None:
             formatted_field = self._mime_format(field, formatter)
             bundle['text/plain'].append((title, formatted_field['text/plain']))
-            bundle['text/html'] += '<h1>' + title + '</h1>\n' + formatted_field['text/html']
+            bundle['text/html'].append((title, formatted_field['text/html']))
 
     def _make_info_unformatted(self, info, formatter, detail_level, omit_sections):
         """Assemble the mimebundle as unformatted lists of information"""

From 5e7b9d5506ff0f2891e10248255394592cc779b9 Mon Sep 17 00:00:00 2001
From: Jason Grout <jason@jasongrout.org>
Date: Fri, 9 Dec 2022 11:19:17 -0700
Subject: [PATCH 1336/1407] Lint

---
 IPython/core/oinspect.py | 105 ++++++++++++++++++++++-----------------
 1 file changed, 60 insertions(+), 45 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 3a80f05a4e1..1227fd07c66 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -554,44 +554,57 @@ def _mime_format(self, text:str, formatter=None) -> dict:
     def format_mime(self, bundle):
         """Format a mimebundle being created by _make_info_unformatted into a real mimebundle"""
         # Format text/plain mimetype
-        if isinstance(bundle['text/plain'], (list, tuple)):
+        if isinstance(bundle["text/plain"], (list, tuple)):
             # bundle['text/plain'] is a list of (head, formatted body) pairs
             lines = []
-            _len = max(len(h) for h,_ in bundle['text/plain'])
+            _len = max(len(h) for h, _ in bundle["text/plain"])
 
-            for head, body in bundle['text/plain']:
-                body = body.strip('\n')
-                delim = '\n' if '\n' in body else ' '
-                lines.append(f"{self.__head(head+':')}{(_len - len(head))*' '}{delim}{body}")
+            for head, body in bundle["text/plain"]:
+                body = body.strip("\n")
+                delim = "\n" if "\n" in body else " "
+                lines.append(
+                    f"{self.__head(head+':')}{(_len - len(head))*' '}{delim}{body}"
+                )
 
-            bundle['text/plain'] = '\n'.join(lines)
+            bundle["text/plain"] = "\n".join(lines)
 
         # Format the text/html mimetype
-        if isinstance(bundle['text/html'], (list, tuple)):
+        if isinstance(bundle["text/html"], (list, tuple)):
             # bundle['text/html'] is a list of (head, formatted body) pairs
-            bundle['text/html'] = '\n'.join((f'<h1>{head}</h1>\n{body}' for (head,body) in bundle['text/html']))
+            bundle["text/html"] = "\n".join(
+                (f"<h1>{head}</h1>\n{body}" for (head, body) in bundle["text/html"])
+            )
         return bundle
 
-    def _append_info_field(self, bundle, title:str, key:str, info, omit_sections, formatter):
+    def _append_info_field(
+        self, bundle, title: str, key: str, info, omit_sections, formatter
+    ):
         """Append an info value to the unformatted mimebundle being constructed by _make_info_unformatted"""
         if title in omit_sections or key in omit_sections:
             return
         field = info[key]
         if field is not None:
             formatted_field = self._mime_format(field, formatter)
-            bundle['text/plain'].append((title, formatted_field['text/plain']))
-            bundle['text/html'].append((title, formatted_field['text/html']))
+            bundle["text/plain"].append((title, formatted_field["text/plain"]))
+            bundle["text/html"].append((title, formatted_field["text/html"]))
 
     def _make_info_unformatted(self, info, formatter, detail_level, omit_sections):
         """Assemble the mimebundle as unformatted lists of information"""
         bundle = {
-            'text/plain': [],
-            'text/html': [],
+            "text/plain": [],
+            "text/html": [],
         }
 
         # A convenience function to simplify calls below
-        def append_field(bundle, title:str, key:str, formatter=None):
-            self._append_info_field(bundle, title=title, key=key, info=info, omit_sections=omit_sections, formatter=formatter)
+        def append_field(bundle, title: str, key: str, formatter=None):
+            self._append_info_field(
+                bundle,
+                title=title,
+                key=key,
+                info=info,
+                omit_sections=omit_sections,
+                formatter=formatter,
+            )
 
         def code_formatter(text):
             return {
@@ -599,54 +612,54 @@ def code_formatter(text):
                 'text/html': pylight(text)
             }
 
-        if info['isalias']:
-            append_field(bundle, 'Repr', 'string_form')
+        if info["isalias"]:
+            append_field(bundle, "Repr", "string_form")
 
         elif info['ismagic']:
             if detail_level > 0:
-                append_field(bundle, 'Source', 'source', code_formatter)
+                append_field(bundle, "Source", "source", code_formatter)
             else:
-                append_field(bundle, 'Docstring', 'docstring', formatter)
-            append_field(bundle, 'File', 'file')
+                append_field(bundle, "Docstring", "docstring", formatter)
+            append_field(bundle, "File", "file")
 
         elif info['isclass'] or is_simple_callable(obj):
             # Functions, methods, classes
-            append_field(bundle, 'Signature', 'definition', code_formatter)
-            append_field(bundle, 'Init signature', 'init_definition', code_formatter)
-            append_field(bundle, 'Docstring', 'docstring', formatter)
-            if detail_level > 0 and info['source']:
-                append_field(bundle, 'Source', 'source', code_formatter)
+            append_field(bundle, "Signature", "definition", code_formatter)
+            append_field(bundle, "Init signature", "init_definition", code_formatter)
+            append_field(bundle, "Docstring", "docstring", formatter)
+            if detail_level > 0 and info["source"]:
+                append_field(bundle, "Source", "source", code_formatter)
             else:
-                append_field(bundle, 'Init docstring', 'init_docstring', formatter)
+                append_field(bundle, "Init docstring", "init_docstring", formatter)
 
-            append_field(bundle, 'File', 'file')
-            append_field(bundle, 'Type', 'type_name')
-            append_field(bundle, 'Subclasses', 'subclasses')
+            append_field(bundle, "File", "file")
+            append_field(bundle, "Type", "type_name")
+            append_field(bundle, "Subclasses", "subclasses")
 
         else:
             # General Python objects
-            append_field(bundle, 'Signature', 'definition', code_formatter)
-            append_field(bundle, 'Call signature', 'call_def', code_formatter)
-            append_field(bundle, 'Type', 'type_name')
-            append_field(bundle, 'String form', 'string_form')
+            append_field(bundle, "Signature", "definition", code_formatter)
+            append_field(bundle, "Call signature", "call_def", code_formatter)
+            append_field(bundle, "Type", "type_name")
+            append_field(bundle, "String form", "string_form")
 
             # Namespace
-            if info['namespace'] != 'Interactive':
-                append_field(bundle, 'Namespace', 'namespace')
+            if info["namespace"] != "Interactive":
+                append_field(bundle, "Namespace", "namespace")
 
-            append_field(bundle, 'Length', 'length')
-            append_field(bundle, 'File', 'file')
+            append_field(bundle, "Length", "length")
+            append_field(bundle, "File", "file")
 
             # Source or docstring, depending on detail level and whether
             # source found.
-            if detail_level > 0 and info['source']:
-                append_field(bundle, 'Source', 'source', code_formatter)
+            if detail_level > 0 and info["source"]:
+                append_field(bundle, "Source", "source", code_formatter)
             else:
-                append_field(bundle, 'Docstring', 'docstring', formatter)
+                append_field(bundle, "Docstring", "docstring", formatter)
 
-            append_field(bundle, 'Class docstring', 'class_docstring', formatter)
-            append_field(bundle, 'Init docstring', 'init_docstring', formatter)
-            append_field(bundle, 'Call docstring', 'call_docstring', formatter)
+            append_field(bundle, "Class docstring", "class_docstring", formatter)
+            append_field(bundle, "Init docstring", "init_docstring", formatter)
+            append_field(bundle, "Call docstring", "call_docstring", formatter)
         return bundle
 
 
@@ -671,7 +684,9 @@ def _get_info(
         """
 
         info = self.info(obj, oname=oname, info=info, detail_level=detail_level)
-        bundle = self._make_info_unformatted(info, formatter, detail_level=detail_level, omit_sections=omit_sections)
+        bundle = self._make_info_unformatted(
+            info, formatter, detail_level=detail_level, omit_sections=omit_sections
+        )
         return self.format_mime(bundle)
 
     def pinfo(

From 5db69068fe3256b29f575deb68ecca5287cefafc Mon Sep 17 00:00:00 2001
From: Jason Grout <jason@jasongrout.org>
Date: Fri, 9 Dec 2022 11:24:40 -0700
Subject: [PATCH 1337/1407] Fix missing argument in _make_info_unformatted

---
 IPython/core/oinspect.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 1227fd07c66..43f6707dd36 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -588,7 +588,7 @@ def _append_info_field(
             bundle["text/plain"].append((title, formatted_field["text/plain"]))
             bundle["text/html"].append((title, formatted_field["text/html"]))
 
-    def _make_info_unformatted(self, info, formatter, detail_level, omit_sections):
+    def _make_info_unformatted(self, obj, info, formatter, detail_level, omit_sections):
         """Assemble the mimebundle as unformatted lists of information"""
         bundle = {
             "text/plain": [],
@@ -685,7 +685,7 @@ def _get_info(
 
         info = self.info(obj, oname=oname, info=info, detail_level=detail_level)
         bundle = self._make_info_unformatted(
-            info, formatter, detail_level=detail_level, omit_sections=omit_sections
+            obj, info, formatter, detail_level=detail_level, omit_sections=omit_sections
         )
         return self.format_mime(bundle)
 

From 99b83f140ac70d6307382b2fd238844baaf5c957 Mon Sep 17 00:00:00 2001
From: Jason Grout <jason@jasongrout.org>
Date: Fri, 9 Dec 2022 13:18:08 -0700
Subject: [PATCH 1338/1407] Escape html text in inspect replies by default

Otherwise, the default docstring <no docstring> was not displayed in html because it was acting as an html tag.
---
 IPython/core/oinspect.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 43f6707dd36..801cb880659 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -16,6 +16,7 @@
 import ast
 import inspect
 from inspect import signature
+import html
 import linecache
 import warnings
 import os
@@ -531,7 +532,7 @@ def _mime_format(self, text:str, formatter=None) -> dict:
         """
         defaults = {
             'text/plain': text,
-            'text/html': '<pre>' + text + '</pre>'
+            'text/html': '<pre>' + html.escape(text) + '</pre>'
         }
 
         if formatter is None:

From 08b767f70d80677fbd2205014f9b495c568738de Mon Sep 17 00:00:00 2001
From: Jason Grout <jasongrout@users.noreply.github.com>
Date: Fri, 9 Dec 2022 12:32:45 -0800
Subject: [PATCH 1339/1407] Minor formatting changes

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 10bf1efff8f..164757fb350 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -92,9 +92,9 @@ pytest IPython/core/tests/test_alias.py::test_alias_lifecycle
 
 ## Code style
 
-* Before committing run `darker -r 60625f241f298b5039cb2debc365db38aa7bb522 <file path>` to apply selective `black` formatting on modified regions using [darker](https://github.com/akaihola/darker)
+* Before committing, run `darker -r 60625f241f298b5039cb2debc365db38aa7bb522 <file path>` to apply selective `black` formatting on modified regions using [darker](https://github.com/akaihola/darker).
 * For newly added modules or refactors, please enable static typing analysis with `mypy` for the modified module by adding the file path in [`mypy.yml`](https://github.com/ipython/ipython/blob/main/.github/workflows/mypy.yml) workflow.
-* As described in pull requests section, please avoid excessive formatting changes; if formatting-only commit is necessary consider adding its hash to [`.git-blame-ignore-revs`](https://github.com/ipython/ipython/blob/main/.git-blame-ignore-revs) file
+* As described in the pull requests section, please avoid excessive formatting changes; if a formatting-only commit is necessary, consider adding its hash to [`.git-blame-ignore-revs`](https://github.com/ipython/ipython/blob/main/.git-blame-ignore-revs) file.
 
 ## Documentation
 

From ea239fb8c60c12e8db051cb64fd09d74e1684bc3 Mon Sep 17 00:00:00 2001
From: Jason Grout <jason@jasongrout.org>
Date: Fri, 9 Dec 2022 13:51:11 -0700
Subject: [PATCH 1340/1407] Lint + change to f strings

---
 IPython/core/oinspect.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 801cb880659..bcaa95c97fa 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -531,8 +531,8 @@ def _mime_format(self, text:str, formatter=None) -> dict:
 
         """
         defaults = {
-            'text/plain': text,
-            'text/html': '<pre>' + html.escape(text) + '</pre>'
+            "text/plain": text,
+            "text/html": f"<pre>{html.escape(text)}</pre>",
         }
 
         if formatter is None:
@@ -543,10 +543,7 @@ def _mime_format(self, text:str, formatter=None) -> dict:
             if not isinstance(formatted, dict):
                 # Handle the deprecated behavior of a formatter returning
                 # a string instead of a mime bundle.
-                return {
-                    'text/plain': formatted,
-                    'text/html': '<pre>' + formatted + '</pre>'
-                }
+                return {"text/plain": formatted, "text/html": f"<pre>{formatted}</pre>"}
 
             else:
                 return dict(defaults, **formatted)

From fdb27756cf4b9bb7bbacb725e9eeb735a14bae42 Mon Sep 17 00:00:00 2001
From: Jason Grout <jason@jasongrout.org>
Date: Thu, 17 Nov 2022 13:26:11 -0700
Subject: [PATCH 1341/1407] Make inspector class a configurable attribute in
 InteractiveShell.

---
 IPython/core/interactiveshell.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 21e428b54d4..fa0614d6139 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -389,6 +389,9 @@ def _import_runner(self, proposal):
     displayhook_class = Type(DisplayHook)
     display_pub_class = Type(DisplayPublisher)
     compiler_class = Type(CachingCompiler)
+    inspector_class = Type(
+        oinspect.Inspector, help="Class to use to instantiate the shell inspector"
+    ).tag(config=True)
 
     sphinxify_docstring = Bool(False, help=
         """
@@ -755,10 +758,12 @@ def init_builtins(self):
     @observe('colors')
     def init_inspector(self, changes=None):
         # Object inspector
-        self.inspector = oinspect.Inspector(oinspect.InspectColors,
-                                            PyColorize.ANSICodeColors,
-                                            self.colors,
-                                            self.object_info_string_level)
+        self.inspector = self.inspector_class(
+            oinspect.InspectColors,
+            PyColorize.ANSICodeColors,
+            self.colors,
+            self.object_info_string_level,
+        )
 
     def init_io(self):
         # implemented in subclasses, TerminalInteractiveShell does call

From 4182eee632b721ef5d70aa6bd6053920d8c1e42f Mon Sep 17 00:00:00 2001
From: nfgf <nfgferreira@gmail.com>
Date: Sat, 10 Dec 2022 12:04:12 -0500
Subject: [PATCH 1342/1407] Semicolon at the end silence output of %%time too.

---
 IPython/core/interactiveshell.py |  9 +++++++++
 IPython/core/tests/test_magic.py | 27 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 12503e9d916..f158ef21c4f 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2423,6 +2423,14 @@ def run_cell_magic(self, magic_name, line, cell):
             with self.builtin_trap:
                 args = (magic_arg_s, cell)
                 result = fn(*args, **kwargs)
+
+            # The code below prevents the output from being displayed
+            # when using magics with decodator @output_can_be_silenced
+            # when the last Python token in the expression is a ';'.
+            if getattr(fn, magic.MAGIC_OUTPUT_CAN_BE_SILENCED, False):
+                if DisplayHook.semicolon_at_end_of_expression(cell):
+                    return None
+
             return result
 
     def find_line_magic(self, magic_name):
@@ -3199,6 +3207,7 @@ def error_before_exec(value):
                 # Execute the user code
                 interactivity = "none" if silent else self.ast_node_interactivity
 
+
                 has_raised = await self.run_ast_nodes(code_ast.body, cell_name,
                        interactivity=interactivity, compiler=compiler, result=result)
 
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 55408d4af1e..e64b959322b 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -422,6 +422,7 @@ def test_time():
 def test_time_no_output_with_semicolon():
     ip = get_ipython()
 
+    # Test %time cases
     with tt.AssertPrints(" 123456"):
         with tt.AssertPrints("Wall time: ", suppress=False):
             with tt.AssertPrints("CPU times: ", suppress=False):
@@ -447,6 +448,32 @@ def test_time_no_output_with_semicolon():
             with tt.AssertPrints("CPU times: ", suppress=False):
                 ip.run_cell("%time 123000+456 # ;Comment")
 
+    # Test %%time cases
+    with tt.AssertPrints("123456"):
+        with tt.AssertPrints("Wall time: ", suppress=False):
+            with tt.AssertPrints("CPU times: ", suppress=False):
+                ip.run_cell("%%time\n123000+456\n\n\n")
+
+    with tt.AssertNotPrints("123456"):
+        with tt.AssertPrints("Wall time: ", suppress=False):
+            with tt.AssertPrints("CPU times: ", suppress=False):
+                ip.run_cell("%%time\n123000+456;\n\n\n")
+
+    with tt.AssertPrints("123456"):
+        with tt.AssertPrints("Wall time: ", suppress=False):
+            with tt.AssertPrints("CPU times: ", suppress=False):
+                ip.run_cell("%%time\n123000+456  # Comment\n\n\n")
+
+    with tt.AssertNotPrints("123456"):
+        with tt.AssertPrints("Wall time: ", suppress=False):
+            with tt.AssertPrints("CPU times: ", suppress=False):
+                ip.run_cell("%%time\n123000+456;  # Comment\n\n\n")
+
+    with tt.AssertPrints("123456"):
+        with tt.AssertPrints("Wall time: ", suppress=False):
+            with tt.AssertPrints("CPU times: ", suppress=False):
+                ip.run_cell("%%time\n123000+456  # ;Comment\n\n\n")
+
 
 def test_time_last_not_expression():
     ip.run_cell("%%time\n"

From 661d6d7c8212dd0b6d35853bf0a1fb7d1aad545e Mon Sep 17 00:00:00 2001
From: Takumasa Nakamura <n.takumasa@gmail.com>
Date: Fri, 16 Dec 2022 12:26:55 +0900
Subject: [PATCH 1343/1407] Fix paste/cpaste magic

---
 IPython/core/interactiveshell.py | 6 +++++-
 IPython/terminal/magics.py       | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 21e428b54d4..e137c922d75 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3138,8 +3138,12 @@ def error_before_exec(value):
             else:
                 cell = raw_cell
 
+        # Do NOT store paste/cpaste magic history
+        if "get_ipython().run_line_magic(" in cell and "paste" in cell:
+            store_history = False
+
         # Store raw and processed history
-        if store_history and raw_cell.strip(" %") != "paste":
+        if store_history:
             self.history_manager.store_inputs(self.execution_count, cell, raw_cell)
         if not silent:
             self.logger.log(cell, raw_cell)
diff --git a/IPython/terminal/magics.py b/IPython/terminal/magics.py
index 66d532511b3..cea53e4a248 100644
--- a/IPython/terminal/magics.py
+++ b/IPython/terminal/magics.py
@@ -147,7 +147,7 @@ def cpaste(self, parameter_s=''):
 
         sentinel = opts.get('s', u'--')
         block = '\n'.join(get_pasted_lines(sentinel, quiet=quiet))
-        self.store_or_execute(block, name, store_history=False)
+        self.store_or_execute(block, name, store_history=True)
 
     @line_magic
     def paste(self, parameter_s=''):

From 3455b5738de94fb4587d507a560424188acabb7e Mon Sep 17 00:00:00 2001
From: azjps <azjps@users.noreply.github.com>
Date: Mon, 19 Dec 2022 21:59:21 +1300
Subject: [PATCH 1344/1407] Set up shell command-line tab-completion for
 ipython

Set up shell command-line tab-completion using
argcomplete and ipython/traitlets#811

argcomplete supports following setuptools console_scripts
to the corresponding package's __main__.py to look for a
PYTHON_ARGCOMPLETE_OK marker.
---
 IPython/__init__.py | 1 +
 IPython/__main__.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/IPython/__init__.py b/IPython/__init__.py
index 03b3116a98a..c224f9a8c90 100644
--- a/IPython/__init__.py
+++ b/IPython/__init__.py
@@ -1,3 +1,4 @@
+# PYTHON_ARGCOMPLETE_OK
 """
 IPython: tools for interactive and parallel computing in Python.
 
diff --git a/IPython/__main__.py b/IPython/__main__.py
index d5123f33a20..8e9f989a82c 100644
--- a/IPython/__main__.py
+++ b/IPython/__main__.py
@@ -1,3 +1,4 @@
+# PYTHON_ARGCOMPLETE_OK
 # encoding: utf-8
 """Terminal-based IPython entry point.
 """

From a7cebe885813722fe432cf05d9effe59e05d5856 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Thu, 22 Dec 2022 16:08:13 +0000
Subject: [PATCH 1345/1407] Fix warning in docs build

---
 IPython/core/completer.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index f2853d3c48a..4edeb93426b 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -59,7 +59,8 @@
 
 
 Both forward and backward completions can be deactivated by setting the
-:any:`Completer.backslash_combining_completions` option to ``False``.
+:std:configtrait:`Completer.backslash_combining_completions` option to
+``False``.
 
 
 Experimental
@@ -166,7 +167,7 @@
 should not be suppressed to ``MatcherResult`` under ``do_not_suppress`` key.
 
 The suppression behaviour can is user-configurable via
-:any:`IPCompleter.suppress_competing_matchers`.
+:std:configtrait:`IPCompleter.suppress_competing_matchers`.
 """
 
 
@@ -972,7 +973,7 @@ class Completer(Configurable):
         help="""Activate greedy completion.
 
         .. deprecated:: 8.8
-            Use :any:`Completer.evaluation` and :any:`Completer.auto_close_dict_keys` instead.
+            Use :std:configtrait:`Completer.evaluation` and :std:configtrait:`Completer.auto_close_dict_keys` instead.
 
         When enabled in IPython 8.8 or newer, changes configuration as follows:
 

From f2b3fab00c6fdb56cd5512d457182d1dda4012ca Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 23 Dec 2022 11:16:53 +0100
Subject: [PATCH 1346/1407] Test on more recent Python versions.

---
 .github/workflows/mypy.yml | 2 +-
 .github/workflows/test.yml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index e05678f724d..52f3e79ab9c 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: ["3.x"]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2f4677fb4d2..73968555c4e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
         deps: [test_extra]
         # Test all on ubuntu, test ends on macos
         include:
@@ -27,15 +27,15 @@ jobs:
             python-version: "3.8"
             deps: test_extra
           - os: macos-latest
-            python-version: "3.10"
+            python-version: "3.11"
             deps: test_extra
           # Tests minimal dependencies set
           - os: ubuntu-latest
-            python-version: "3.10"
+            python-version: "3.11"
             deps: test
           # Tests latest development Python version
           - os: ubuntu-latest
-            python-version: "3.11-dev"
+            python-version: "3.12-dev"
             deps: test
           # Installing optional dependencies stuff takes ages on PyPy
           - os: ubuntu-latest

From 6cd25549de0ef4565ef70dfa8170833966baca6d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 23 Dec 2022 11:16:53 +0100
Subject: [PATCH 1347/1407] Test on more recent Python versions.

---
 .github/workflows/mypy.yml | 2 +-
 .github/workflows/test.yml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index e05678f724d..52f3e79ab9c 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: ["3.x"]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2f4677fb4d2..73968555c4e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
         deps: [test_extra]
         # Test all on ubuntu, test ends on macos
         include:
@@ -27,15 +27,15 @@ jobs:
             python-version: "3.8"
             deps: test_extra
           - os: macos-latest
-            python-version: "3.10"
+            python-version: "3.11"
             deps: test_extra
           # Tests minimal dependencies set
           - os: ubuntu-latest
-            python-version: "3.10"
+            python-version: "3.11"
             deps: test
           # Tests latest development Python version
           - os: ubuntu-latest
-            python-version: "3.11-dev"
+            python-version: "3.12-dev"
             deps: test
           # Installing optional dependencies stuff takes ages on PyPy
           - os: ubuntu-latest

From 023a594a32450ad02d771de6f83805f3bcd1662a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 23 Dec 2022 19:04:09 +0100
Subject: [PATCH 1348/1407] extend unicode for Python 3.12

---
 IPython/core/completer.py            | 2 +-
 IPython/core/tests/test_completer.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 4edeb93426b..5ba8ea0fdbd 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -285,7 +285,7 @@ def cast(type_, obj):
 # write this). With below range we cover them all, with a density of ~67%
 # biggest next gap we consider only adds up about 1% density and there are 600
 # gaps that would need hard coding.
-_UNICODE_RANGES = [(32, 0x3134b), (0xe0001, 0xe01f0)]
+_UNICODE_RANGES = [(32, 0x323B0), (0xE0001, 0xE01F0)]
 
 # Public API
 __all__ = ["Completer", "IPCompleter"]
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 5e8cb35bc33..7783798eb36 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -99,7 +99,7 @@ def test_unicode_range():
     assert len_exp == len_test, message
 
     # fail if new unicode symbols have been added. 
-    assert len_exp <= 138552, message
+    assert len_exp <= 143041, message
 
 
 @contextmanager

From 02894af40a93c28073ab84a14f5f396204cbb823 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 23 Dec 2022 19:44:09 +0100
Subject: [PATCH 1349/1407] skip test on 3.12

---
 IPython/extensions/tests/test_autoreload.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index 88637fbab9c..2c3c9db212d 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -367,7 +367,8 @@ class TestEnum(Enum):
         self.shell.run_code("assert func2() == 'changed'")
         self.shell.run_code("t = Test(); assert t.new_func() == 'changed'")
         self.shell.run_code("assert number == 1")
-        self.shell.run_code("assert TestEnum.B.value == 'added'")
+        if sys.version_info < (3, 12):
+            self.shell.run_code("assert TestEnum.B.value == 'added'")
 
         # ----------- TEST IMPORT FROM MODULE --------------------------
 

From ed7f35f8b721d4b4dcafea173ce724bee25704c7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 3 Jan 2023 11:57:18 +0100
Subject: [PATCH 1350/1407] Fix tests for pygments > 2.14

Pygments 2.14+  have the bash lexer return some tokens as
Text.Whitespace instead of Text, this update the test to support this.
---
 IPython/lib/tests/test_lexers.py | 52 ++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/IPython/lib/tests/test_lexers.py b/IPython/lib/tests/test_lexers.py
index efa00d601ea..000b8fe6fd9 100644
--- a/IPython/lib/tests/test_lexers.py
+++ b/IPython/lib/tests/test_lexers.py
@@ -4,11 +4,14 @@
 # Distributed under the terms of the Modified BSD License.
 
 from unittest import TestCase
+from pygments import __version__ as pygments_version
 from pygments.token import Token
 from pygments.lexers import BashLexer
 
 from .. import lexers
 
+pyg214 = tuple(int(x) for x in pygments_version.split(".")[:2]) >= (2, 14)
+
 
 class TestLexers(TestCase):
     """Collection of lexers tests"""
@@ -18,25 +21,26 @@ def setUp(self):
 
     def testIPythonLexer(self):
         fragment = '!echo $HOME\n'
-        tokens = [
+        bash_tokens = [
             (Token.Operator, '!'),
         ]
-        tokens.extend(self.bash_lexer.get_tokens(fragment[1:]))
-        self.assertEqual(tokens, list(self.lexer.get_tokens(fragment)))
+        bash_tokens.extend(self.bash_lexer.get_tokens(fragment[1:]))
+        ipylex_token = list(self.lexer.get_tokens(fragment))
+        assert bash_tokens[:-1] == ipylex_token[:-1]
 
-        fragment_2 = '!' + fragment
+        fragment_2 = "!" + fragment
         tokens_2 = [
             (Token.Operator, '!!'),
-        ] + tokens[1:]
-        self.assertEqual(tokens_2, list(self.lexer.get_tokens(fragment_2)))
+        ] + bash_tokens[1:]
+        assert tokens_2[:-1] == list(self.lexer.get_tokens(fragment_2))[:-1]
 
         fragment_2 = '\t %%!\n' + fragment[1:]
         tokens_2 = [
             (Token.Text, '\t '),
             (Token.Operator, '%%!'),
             (Token.Text, '\n'),
-        ] + tokens[1:]
-        self.assertEqual(tokens_2, list(self.lexer.get_tokens(fragment_2)))
+        ] + bash_tokens[1:]
+        assert tokens_2 == list(self.lexer.get_tokens(fragment_2))
 
         fragment_2 = 'x = ' + fragment
         tokens_2 = [
@@ -44,8 +48,8 @@ def testIPythonLexer(self):
             (Token.Text, ' '),
             (Token.Operator, '='),
             (Token.Text, ' '),
-        ] + tokens
-        self.assertEqual(tokens_2, list(self.lexer.get_tokens(fragment_2)))
+        ] + bash_tokens
+        assert tokens_2[:-1] == list(self.lexer.get_tokens(fragment_2))[:-1]
 
         fragment_2 = 'x, = ' + fragment
         tokens_2 = [
@@ -54,8 +58,8 @@ def testIPythonLexer(self):
             (Token.Text, ' '),
             (Token.Operator, '='),
             (Token.Text, ' '),
-        ] + tokens
-        self.assertEqual(tokens_2, list(self.lexer.get_tokens(fragment_2)))
+        ] + bash_tokens
+        assert tokens_2[:-1] == list(self.lexer.get_tokens(fragment_2))[:-1]
 
         fragment_2 = 'x, = %sx ' + fragment[1:]
         tokens_2 = [
@@ -67,8 +71,10 @@ def testIPythonLexer(self):
             (Token.Operator, '%'),
             (Token.Keyword, 'sx'),
             (Token.Text, ' '),
-        ] + tokens[1:]
-        self.assertEqual(tokens_2, list(self.lexer.get_tokens(fragment_2)))
+        ] + bash_tokens[1:]
+        if tokens_2[7] == (Token.Text, " ") and pyg214:  # pygments 2.14+
+            tokens_2[7] = (Token.Text.Whitespace, " ")
+        assert tokens_2[:-1] == list(self.lexer.get_tokens(fragment_2))[:-1]
 
         fragment_2 = 'f = %R function () {}\n'
         tokens_2 = [
@@ -80,7 +86,7 @@ def testIPythonLexer(self):
             (Token.Keyword, 'R'),
             (Token.Text, ' function () {}\n'),
         ]
-        self.assertEqual(tokens_2, list(self.lexer.get_tokens(fragment_2)))
+        assert tokens_2 == list(self.lexer.get_tokens(fragment_2))
 
         fragment_2 = '\t%%xyz\n$foo\n'
         tokens_2 = [
@@ -89,7 +95,7 @@ def testIPythonLexer(self):
             (Token.Keyword, 'xyz'),
             (Token.Text, '\n$foo\n'),
         ]
-        self.assertEqual(tokens_2, list(self.lexer.get_tokens(fragment_2)))
+        assert tokens_2 == list(self.lexer.get_tokens(fragment_2))
 
         fragment_2 = '%system?\n'
         tokens_2 = [
@@ -98,7 +104,7 @@ def testIPythonLexer(self):
             (Token.Operator, '?'),
             (Token.Text, '\n'),
         ]
-        self.assertEqual(tokens_2, list(self.lexer.get_tokens(fragment_2)))
+        assert tokens_2[:-1] == list(self.lexer.get_tokens(fragment_2))[:-1]
 
         fragment_2 = 'x != y\n'
         tokens_2 = [
@@ -109,7 +115,7 @@ def testIPythonLexer(self):
             (Token.Name, 'y'),
             (Token.Text, '\n'),
         ]
-        self.assertEqual(tokens_2, list(self.lexer.get_tokens(fragment_2)))
+        assert tokens_2[:-1] == list(self.lexer.get_tokens(fragment_2))[:-1]
 
         fragment_2 = ' ?math.sin\n'
         tokens_2 = [
@@ -118,7 +124,7 @@ def testIPythonLexer(self):
             (Token.Text, 'math.sin'),
             (Token.Text, '\n'),
         ]
-        self.assertEqual(tokens_2, list(self.lexer.get_tokens(fragment_2)))
+        assert tokens_2[:-1] == list(self.lexer.get_tokens(fragment_2))[:-1]
 
         fragment = ' *int*?\n'
         tokens = [
@@ -126,7 +132,7 @@ def testIPythonLexer(self):
             (Token.Operator, '?'),
             (Token.Text, '\n'),
         ]
-        self.assertEqual(tokens, list(self.lexer.get_tokens(fragment)))
+        assert tokens == list(self.lexer.get_tokens(fragment))
 
         fragment = '%%writefile -a foo.py\nif a == b:\n    pass'
         tokens = [
@@ -145,7 +151,9 @@ def testIPythonLexer(self):
             (Token.Keyword, 'pass'),
             (Token.Text, '\n'),
         ]
-        self.assertEqual(tokens, list(self.lexer.get_tokens(fragment)))
+        if tokens[10] == (Token.Text, "\n") and pyg214:  # pygments 2.14+
+            tokens[10] = (Token.Text.Whitespace, "\n")
+        assert tokens[:-1] == list(self.lexer.get_tokens(fragment))[:-1]
 
         fragment = '%%timeit\nmath.sin(0)'
         tokens = [
@@ -173,4 +181,4 @@ def testIPythonLexer(self):
             (Token.Punctuation, '>'),
             (Token.Text, '\n'),
         ]
-        self.assertEqual(tokens, list(self.lexer.get_tokens(fragment)))
+        assert tokens == list(self.lexer.get_tokens(fragment))

From 0520f55c8a2cb500ad2428d1c0b36adc57b11309 Mon Sep 17 00:00:00 2001
From: Nir Schulman <narsssx@gmail.com>
Date: Sat, 31 Dec 2022 08:47:28 +0200
Subject: [PATCH 1351/1407] Removed the usage of minor-version entrypoints

---
 setupbase.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/setupbase.py b/setupbase.py
index 748b4dd6a8a..3be9e831133 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -211,19 +211,16 @@ def find_entry_points():
     use, our own build_scripts_entrypt class below parses these and builds
     command line scripts.
 
-    Each of our entry points gets a plain name, e.g. ipython, a name
-    suffixed with the Python major version number, e.g. ipython3, and
-    a name suffixed with the Python major.minor version number, eg. ipython3.8.
+    Each of our entry points gets a plain name, e.g. ipython, and a name
+    suffixed with the Python major version number, e.g. ipython3.
     """
     ep = [
             'ipython%s = IPython:start_ipython',
         ]
     major_suffix = str(sys.version_info[0])
-    minor_suffix = ".".join([str(sys.version_info[0]), str(sys.version_info[1])])
     return (
         [e % "" for e in ep]
         + [e % major_suffix for e in ep]
-        + [e % minor_suffix for e in ep]
     )
 
 class install_lib_symlink(Command):

From 34da39cb0d7654f21d6f551864be94cc16f9ad34 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 3 Jan 2023 11:06:33 +0100
Subject: [PATCH 1352/1407] Please linter

---
 setupbase.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/setupbase.py b/setupbase.py
index 3be9e831133..a867c73ecd0 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -218,10 +218,8 @@ def find_entry_points():
             'ipython%s = IPython:start_ipython',
         ]
     major_suffix = str(sys.version_info[0])
-    return (
-        [e % "" for e in ep]
-        + [e % major_suffix for e in ep]
-    )
+    return [e % "" for e in ep] + [e % major_suffix for e in ep]
+
 
 class install_lib_symlink(Command):
     user_options = [

From 8af5442ee0d7c34d0066c6651ac2d364790c6d6c Mon Sep 17 00:00:00 2001
From: Jake Herrmann <jtherrmann@alaska.edu>
Date: Thu, 8 Dec 2022 17:12:57 -0900
Subject: [PATCH 1353/1407] Fix vi mode escape delay

---
 IPython/terminal/shortcuts.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 7d6de8b3b04..01072cd99a1 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -68,9 +68,14 @@ def reformat_and_execute(event):
         reformat_text_before_cursor(event.current_buffer, event.current_buffer.document, shell)
         event.current_buffer.validate_and_handle()
 
+    @Condition
+    def ebivim():
+        return shell.emacs_bindings_in_vi_insert_mode
+
     kb.add('escape', 'enter', filter=(has_focus(DEFAULT_BUFFER)
                             & ~has_selection
                             & insert_mode
+                            & ebivim
                                       ))(reformat_and_execute)
 
     kb.add("c-\\")(quit)
@@ -333,10 +338,6 @@ def _(event):
     if sys.platform == "win32":
         kb.add("c-v", filter=(has_focus(DEFAULT_BUFFER) & ~vi_mode))(win_paste)
 
-    @Condition
-    def ebivim():
-        return shell.emacs_bindings_in_vi_insert_mode
-
     focused_insert_vi = has_focus(DEFAULT_BUFFER) & vi_insert_mode
 
     @kb.add("end", filter=has_focus(DEFAULT_BUFFER) & (ebivim | ~vi_insert_mode))

From 11dd2521aee4a87d68f2244d6fee86c6e1873fcd Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 3 Jan 2023 12:00:52 +0100
Subject: [PATCH 1354/1407] please formatter

---
 IPython/terminal/shortcuts.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 01072cd99a1..6ca91ec31ba 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -72,11 +72,11 @@ def reformat_and_execute(event):
     def ebivim():
         return shell.emacs_bindings_in_vi_insert_mode
 
-    kb.add('escape', 'enter', filter=(has_focus(DEFAULT_BUFFER)
-                            & ~has_selection
-                            & insert_mode
-                            & ebivim
-                                      ))(reformat_and_execute)
+    kb.add(
+        "escape",
+        "enter",
+        filter=(has_focus(DEFAULT_BUFFER) & ~has_selection & insert_mode & ebivim),
+    )(reformat_and_execute)
 
     kb.add("c-\\")(quit)
 

From cc74642003f1ab22415ae0a32a4aa9548e3e398c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 3 Jan 2023 14:04:45 +0100
Subject: [PATCH 1355/1407] whats new version8.8

---
 docs/source/whatsnew/version8.rst | 66 ++++++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 14 deletions(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index d3c33704bad..e1d4574e452 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -2,6 +2,44 @@
  8.x Series
 ============
 
+.. _version 8.8.0:
+
+IPython 8.8.0
+-------------
+
+First release of IPython in 2023 as there was no release at the end of
+December.
+
+This is an unusually big release (relatively speaking) with more than 15 Pull
+Requests merge.
+
+Of particular interest are:
+
+ - :ghpull:`13852` that replace the greedy completer and improve
+   completion, in particular for dictionary keys.
+ - :ghpull:`13858` that adds ``py.typed`` to ``setup.cfg`` to make sure it is
+   bundled in wheels.
+ - :ghpull:`13869` that implements tab completions for IPython options in the
+   shell when using `argcomplete <https://github.com/kislyuk/argcomplete>`. I
+   believe this also needs a recent version of Traitlets.
+ - :ghpull:`13865` makes the ``inspector`` class of `InteractiveShell`
+   configurable.
+ - :ghpull:`13880` that remove minor-version entrypoints as the minor version
+   entry points that would be included in the wheel would be the one of the
+   Python version that was used to build the ``whl`` file.
+
+In no particular order, the rest of the changes update the test suite to be
+compatible with Pygments 2.14, various docfixes, testing on more recent python
+versions and various updates.
+
+As usual you can find the full list of PRs on GitHub under `the 8.8 milestone
+<https://github.com/ipython/ipython/milestone/110>`__.
+
+Many thanks to @krassowski for the many PRs and @jasongrout for reviewing and
+merging contributions.
+
+Thanks to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries.
 
 .. _version 8.7.0:
 
@@ -138,7 +176,7 @@ Here is a non exhaustive list of changes that have been implemented for IPython
  - Fix paste magic on wayland. :ghpull:`13671`
  - show maxlen in deque's repr. :ghpull:`13648`
 
-Restore line numbers for Input 
+Restore line numbers for Input
 ------------------------------
 
 Line number information in tracebacks from input are restored.
@@ -269,7 +307,7 @@ Thanks to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
 work on IPython and related libraries.
 
 .. _version 8.1.1:
-   
+
 IPython 8.1.1
 -------------
 
@@ -403,10 +441,10 @@ The 8.x branch started diverging from its predecessor around IPython 7.12
 (January 2020).
 
 This release contains 250+ pull requests, in addition to many of the features
-and backports that have made it to the 7.x branch. Please see the 
+and backports that have made it to the 7.x branch. Please see the
 `8.0 milestone <https://github.com/ipython/ipython/milestone/73?closed=1>`__ for the full list of pull requests.
 
-Please feel free to send pull requests to updates those notes after release, 
+Please feel free to send pull requests to updates those notes after release,
 I have likely forgotten a few things reviewing 250+ PRs.
 
 Dependencies changes/downstream packaging
@@ -421,7 +459,7 @@ looking for help to do so.
  - minimal Python is now 3.8
  - ``nose`` is not a testing requirement anymore
  - ``pytest`` replaces nose.
- - ``iptest``/``iptest3`` cli entrypoints do not exists anymore. 
+ - ``iptest``/``iptest3`` cli entrypoints do not exists anymore.
  - minimum officially support ``numpy`` version has been bumped, but this should
    not have much effect on packaging.
 
@@ -443,7 +481,7 @@ deprecation warning:
  - Please add **since which version** something is deprecated.
 
 As a side note, it is much easier to conditionally compare version
-numbers rather than using ``try/except`` when functionality changes with a version. 
+numbers rather than using ``try/except`` when functionality changes with a version.
 
 I won't list all the removed features here, but modules like ``IPython.kernel``,
 which was just a shim module around ``ipykernel`` for the past 8 years, have been
@@ -475,7 +513,7 @@ by mypy.
 Featured changes
 ----------------
 
-Here is a features list of changes in IPython 8.0. This is of course non-exhaustive. 
+Here is a features list of changes in IPython 8.0. This is of course non-exhaustive.
 Please note as well that many features have been added in the 7.x branch as well
 (and hence why you want to read the 7.x what's new notes), in particular
 features contributed by QuantStack (with respect to debugger protocol and Xeus
@@ -523,7 +561,7 @@ The error traceback is now correctly formatted, showing the cell number in which
 
     ZeroDivisionError: division by zero
 
-The ``stack_data`` package has been integrated, which provides smarter information in the traceback; 
+The ``stack_data`` package has been integrated, which provides smarter information in the traceback;
 in particular it will highlight the AST node where an error occurs which can help to quickly narrow down errors.
 
 For example in the following snippet::
@@ -563,7 +601,7 @@ and IPython 8.0 is capable of telling you where the index error occurs::
     ----> 3     return x[0][i][0]
                        ^^^^^^^
 
-The corresponding locations marked here with ``^`` will show up highlighted in 
+The corresponding locations marked here with ``^`` will show up highlighted in
 the terminal and notebooks.
 
 Finally, a colon ``::`` and line number is appended after a filename in
@@ -760,7 +798,7 @@ Previously, this was not the case for the Vi-mode prompts::
 This is now fixed, and Vi prompt prefixes - ``[ins]`` and ``[nav]`` -  are
 skipped just as the normal ``In`` would be.
 
-IPython shell can be started in the Vi mode using ``ipython --TerminalInteractiveShell.editing_mode=vi``, 
+IPython shell can be started in the Vi mode using ``ipython --TerminalInteractiveShell.editing_mode=vi``,
 You should be able to change mode dynamically with ``%config TerminalInteractiveShell.editing_mode='vi'``
 
 Empty History Ranges
@@ -787,8 +825,8 @@ when followed with :kbd:`F2`), send it to `dpaste.org <http://dpast.org>`_ using
 
 Windows timing implementation: Switch to process_time
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Timing on Windows, for example with ``%%time``,  was changed from being based on ``time.perf_counter`` 
-(which counted time even when the process was sleeping) to being based on ``time.process_time`` instead 
+Timing on Windows, for example with ``%%time``,  was changed from being based on ``time.perf_counter``
+(which counted time even when the process was sleeping) to being based on ``time.process_time`` instead
 (which only counts CPU time). This brings it closer to the behavior on Linux. See :ghpull:`12984`.
 
 Miscellaneous
@@ -813,7 +851,7 @@ Re-added support for XDG config directories
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 XDG support through the years comes and goes. There is a tension between having
-an identical location for configuration in all platforms versus having simple instructions. 
+an identical location for configuration in all platforms versus having simple instructions.
 After initial failures a couple of years ago, IPython was modified to automatically migrate XDG
 config files back into ``~/.ipython``. That migration code has now been removed.
 IPython now checks the XDG locations, so if you _manually_ move your config
@@ -841,7 +879,7 @@ Removing support for older Python versions
 
 
 We are removing support for Python up through 3.7, allowing internal code to use the more
-efficient ``pathlib`` and to make better use of type annotations. 
+efficient ``pathlib`` and to make better use of type annotations.
 
 .. image:: ../_images/8.0/pathlib_pathlib_everywhere.jpg
    :alt: "Meme image of Toy Story with Woody and Buzz, with the text 'pathlib, pathlib everywhere'"

From 198bb721ef48a538133fa4d646828e6838856113 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 3 Jan 2023 14:35:34 +0100
Subject: [PATCH 1356/1407] Misc release process update

A few of those things failed during release time, as I was building docs
on 3.10 (not 3.11) after recently upgrading.
---
 IPython/core/completer.py |  2 +-
 tools/release_helper.sh   | 25 ++++++++++++++++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 5ba8ea0fdbd..f0bbb4e5619 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -256,7 +256,7 @@
     JEDI_INSTALLED = False
 
 
-if TYPE_CHECKING or GENERATING_DOCUMENTATION:
+if TYPE_CHECKING or GENERATING_DOCUMENTATION and sys.version_info >= (3, 11):
     from typing import cast
     from typing_extensions import TypedDict, NotRequired, Protocol, TypeAlias, TypeGuard
 else:
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index d221f551e66..ebf8098195c 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -2,15 +2,6 @@
 # when releasing with bash, simple source it to get asked questions. 
 
 # misc check before starting
-
-python -c 'import keyring'
-python -c 'import twine'
-python -c 'import sphinx'
-python -c 'import sphinx_rtd_theme'
-python -c 'import pytest'
-python -c 'import build'
-
-
 BLACK=$(tput setaf 1)
 RED=$(tput setaf 1)
 GREEN=$(tput setaf 2)
@@ -22,6 +13,22 @@ WHITE=$(tput setaf 7)
 NOR=$(tput sgr0)
 
 
+echo "Checking all tools are installed..."
+
+python -c 'import keyring'
+python -c 'import twine'
+python -c 'import sphinx'
+python -c 'import sphinx_rtd_theme'
+python -c 'import pytest'
+python -c 'import build'
+# those are necessary fo building the docs
+echo "Checking imports for docs"
+python -c 'import numpy'
+python -c 'import matplotlib'
+
+
+
+
 echo "Will use $BLUE'$EDITOR'$NOR to edit files when necessary"
 echo -n "PREV_RELEASE (X.y.z) [$PREV_RELEASE]: "
 read input

From add5877a42ba8e3960bc92eb994c15955eacf254 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 3 Jan 2023 15:03:24 +0100
Subject: [PATCH 1357/1407] release 8.8.0

---
 IPython/core/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index e2ce2eac2b4..e99b4f3493d 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,7 +20,7 @@
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-# _version_extra = ""  # Uncomment this for full releases
+_version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 01bc9d96e0dd50fad02d7b1e3d2e58113c617b6b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 3 Jan 2023 15:04:11 +0100
Subject: [PATCH 1358/1407] back to dev

---
 IPython/core/release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index e99b4f3493d..0416637fc7d 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -16,11 +16,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 8
-_version_minor = 8
+_version_minor = 9
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-_version_extra = ""  # Uncomment this for full releases
+# _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 64e72a955f3ae4eb0ad823936a20364e4475e057 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 8 Jan 2023 00:17:23 +0000
Subject: [PATCH 1359/1407] Restore shortcuts in documentation, define
 identifiers

---
 .../{shortcuts.py => shortcuts/__init__.py}   | 373 +++++++++---------
 IPython/terminal/shortcuts/auto_match.py      |  90 +++++
 IPython/terminal/shortcuts/autosuggestions.py |  39 ++
 docs/autogen_shortcuts.py                     | 252 +++++++++---
 docs/source/_static/theme_overrides.css       |   7 +
 docs/source/conf.py                           |   5 +-
 docs/source/config/shortcuts/index.rst        |  29 +-
 7 files changed, 525 insertions(+), 270 deletions(-)
 rename IPython/terminal/{shortcuts.py => shortcuts/__init__.py} (62%)
 create mode 100644 IPython/terminal/shortcuts/auto_match.py
 create mode 100644 IPython/terminal/shortcuts/autosuggestions.py
 create mode 100644 docs/source/_static/theme_overrides.css

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts/__init__.py
similarity index 62%
rename from IPython/terminal/shortcuts.py
rename to IPython/terminal/shortcuts/__init__.py
index 6ca91ec31ba..6bc6ec7c39f 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts/__init__.py
@@ -16,14 +16,29 @@
 
 from prompt_toolkit.application.current import get_app
 from prompt_toolkit.enums import DEFAULT_BUFFER, SEARCH_BUFFER
-from prompt_toolkit.filters import (has_focus, has_selection, Condition,
-    vi_insert_mode, emacs_insert_mode, has_completions, vi_mode)
-from prompt_toolkit.key_binding.bindings.completion import display_completions_like_readline
+from prompt_toolkit.filters import (
+    has_focus as has_focus_impl,
+    has_selection,
+    Condition,
+    vi_insert_mode,
+    emacs_insert_mode,
+    has_completions,
+    vi_mode,
+)
+from prompt_toolkit.key_binding.bindings.completion import (
+    display_completions_like_readline,
+)
 from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.key_binding.bindings import named_commands as nc
 from prompt_toolkit.key_binding.vi_state import InputMode, ViState
+from prompt_toolkit.layout.layout import FocusableElement
 
 from IPython.utils.decorators import undoc
+from . import auto_match as match, autosuggestions
+
+
+__all__ = ["create_ipython_shortcuts"]
+
 
 @undoc
 @Condition
@@ -32,80 +47,84 @@ def cursor_in_leading_ws():
     return (not before) or before.isspace()
 
 
-# Needed for to accept autosuggestions in vi insert mode
-def _apply_autosuggest(event):
-    """
-    Apply autosuggestion if at end of line.
-    """
-    b = event.current_buffer
-    d = b.document
-    after_cursor = d.text[d.cursor_position :]
-    lines = after_cursor.split("\n")
-    end_of_current_line = lines[0].strip()
-    suggestion = b.suggestion
-    if (suggestion is not None) and (suggestion.text) and (end_of_current_line == ""):
-        b.insert_text(suggestion.text)
-    else:
-        nc.end_of_line(event)
+def has_focus(value: FocusableElement):
+    """Wrapper around has_focus adding a nice `__name__` to tester function"""
+    tester = has_focus_impl(value).func
+    tester.__name__ = f"is_focused({value})"
+    return Condition(tester)
 
-def create_ipython_shortcuts(shell):
-    """Set up the prompt_toolkit keyboard shortcuts for IPython"""
+
+def create_ipython_shortcuts(shell, for_all_platforms: bool = False):
+    """Set up the prompt_toolkit keyboard shortcuts for IPython."""
+    # Warning: if possible, do NOT define handler functions in the locals
+    # scope of this function, instead define functions in the global
+    # scope, or a separate module, and include a user-friendly docstring
+    # describing the action.
 
     kb = KeyBindings()
     insert_mode = vi_insert_mode | emacs_insert_mode
 
-    if getattr(shell, 'handle_return', None):
+    if getattr(shell, "handle_return", None):
         return_handler = shell.handle_return(shell)
     else:
         return_handler = newline_or_execute_outer(shell)
 
-    kb.add('enter', filter=(has_focus(DEFAULT_BUFFER)
-                            & ~has_selection
-                            & insert_mode
-                        ))(return_handler)
-
-    def reformat_and_execute(event):
-        reformat_text_before_cursor(event.current_buffer, event.current_buffer.document, shell)
-        event.current_buffer.validate_and_handle()
+    kb.add("enter", filter=(has_focus(DEFAULT_BUFFER) & ~has_selection & insert_mode))(
+        return_handler
+    )
 
     @Condition
     def ebivim():
         return shell.emacs_bindings_in_vi_insert_mode
 
-    kb.add(
+    @kb.add(
         "escape",
         "enter",
         filter=(has_focus(DEFAULT_BUFFER) & ~has_selection & insert_mode & ebivim),
-    )(reformat_and_execute)
+    )
+    def reformat_and_execute(event):
+        """Reformat code and execute it"""
+        reformat_text_before_cursor(
+            event.current_buffer, event.current_buffer.document, shell
+        )
+        event.current_buffer.validate_and_handle()
 
     kb.add("c-\\")(quit)
 
-    kb.add('c-p', filter=(vi_insert_mode & has_focus(DEFAULT_BUFFER))
-                )(previous_history_or_previous_completion)
+    kb.add("c-p", filter=(vi_insert_mode & has_focus(DEFAULT_BUFFER)))(
+        previous_history_or_previous_completion
+    )
 
-    kb.add('c-n', filter=(vi_insert_mode & has_focus(DEFAULT_BUFFER))
-                )(next_history_or_next_completion)
+    kb.add("c-n", filter=(vi_insert_mode & has_focus(DEFAULT_BUFFER)))(
+        next_history_or_next_completion
+    )
 
-    kb.add('c-g', filter=(has_focus(DEFAULT_BUFFER) & has_completions)
-                )(dismiss_completion)
+    kb.add("c-g", filter=(has_focus(DEFAULT_BUFFER) & has_completions))(
+        dismiss_completion
+    )
 
-    kb.add('c-c', filter=has_focus(DEFAULT_BUFFER))(reset_buffer)
+    kb.add("c-c", filter=has_focus(DEFAULT_BUFFER))(reset_buffer)
 
-    kb.add('c-c', filter=has_focus(SEARCH_BUFFER))(reset_search_buffer)
+    kb.add("c-c", filter=has_focus(SEARCH_BUFFER))(reset_search_buffer)
 
-    supports_suspend = Condition(lambda: hasattr(signal, 'SIGTSTP'))
-    kb.add('c-z', filter=supports_suspend)(suspend_to_bg)
+    supports_suspend = Condition(lambda: hasattr(signal, "SIGTSTP"))
+    kb.add("c-z", filter=supports_suspend)(suspend_to_bg)
 
     # Ctrl+I == Tab
-    kb.add('tab', filter=(has_focus(DEFAULT_BUFFER)
-                          & ~has_selection
-                          & insert_mode
-                          & cursor_in_leading_ws
-                        ))(indent_buffer)
-    kb.add('c-o', filter=(has_focus(DEFAULT_BUFFER) & emacs_insert_mode)
-           )(newline_autoindent_outer(shell.input_transformer_manager))
+    kb.add(
+        "tab",
+        filter=(
+            has_focus(DEFAULT_BUFFER)
+            & ~has_selection
+            & insert_mode
+            & cursor_in_leading_ws
+        ),
+    )(indent_buffer)
+    kb.add("c-o", filter=(has_focus(DEFAULT_BUFFER) & emacs_insert_mode))(
+        newline_autoindent_outer(shell.input_transformer_manager)
+    )
 
-    kb.add('f2', filter=has_focus(DEFAULT_BUFFER))(open_input_in_editor)
+    kb.add("f2", filter=has_focus(DEFAULT_BUFFER))(open_input_in_editor)
 
     @Condition
     def auto_match():
@@ -146,6 +165,8 @@ def _preceding_text():
                 before_cursor = app.current_buffer.document.current_line_before_cursor
                 return bool(m.match(before_cursor))
 
+            _preceding_text.__name__ = f"preceding_text({pattern!r})"
+
         condition = Condition(_preceding_text)
         _preceding_text_cache[pattern] = condition
         return condition
@@ -161,6 +182,8 @@ def _following_text():
             app = get_app()
             return bool(m.match(app.current_buffer.document.current_line_after_cursor))
 
+        _following_text.__name__ = f"following_text({pattern!r})"
+
         condition = Condition(_following_text)
         _following_text_cache[pattern] = condition
         return condition
@@ -178,151 +201,110 @@ def not_inside_unclosed_string():
         return not ('"' in s or "'" in s)
 
     # auto match
-    @kb.add("(", filter=focused_insert & auto_match & following_text(r"[,)}\]]|$"))
-    def _(event):
-        event.current_buffer.insert_text("()")
-        event.current_buffer.cursor_left()
-
-    @kb.add("[", filter=focused_insert & auto_match & following_text(r"[,)}\]]|$"))
-    def _(event):
-        event.current_buffer.insert_text("[]")
-        event.current_buffer.cursor_left()
-
-    @kb.add("{", filter=focused_insert & auto_match & following_text(r"[,)}\]]|$"))
-    def _(event):
-        event.current_buffer.insert_text("{}")
-        event.current_buffer.cursor_left()
+    auto_match_parens = {"(": match.parenthesis, "[": match.brackets, "{": match.braces}
+    for key, cmd in auto_match_parens.items():
+        kb.add(key, filter=focused_insert & auto_match & following_text(r"[,)}\]]|$"))(
+            cmd
+        )
 
-    @kb.add(
+    kb.add(
         '"',
         filter=focused_insert
         & auto_match
         & not_inside_unclosed_string
         & preceding_text(lambda line: all_quotes_paired('"', line))
         & following_text(r"[,)}\]]|$"),
-    )
-    def _(event):
-        event.current_buffer.insert_text('""')
-        event.current_buffer.cursor_left()
+    )(match.double_quote)
 
-    @kb.add(
+    kb.add(
         "'",
         filter=focused_insert
         & auto_match
         & not_inside_unclosed_string
         & preceding_text(lambda line: all_quotes_paired("'", line))
         & following_text(r"[,)}\]]|$"),
-    )
-    def _(event):
-        event.current_buffer.insert_text("''")
-        event.current_buffer.cursor_left()
+    )(match.single_quote)
 
-    @kb.add(
+    kb.add(
         '"',
         filter=focused_insert
         & auto_match
         & not_inside_unclosed_string
         & preceding_text(r'^.*""$'),
-    )
-    def _(event):
-        event.current_buffer.insert_text('""""')
-        event.current_buffer.cursor_left(3)
+    )(match.docstring_double_quotes)
 
-    @kb.add(
+    kb.add(
         "'",
         filter=focused_insert
         & auto_match
         & not_inside_unclosed_string
         & preceding_text(r"^.*''$"),
-    )
-    def _(event):
-        event.current_buffer.insert_text("''''")
-        event.current_buffer.cursor_left(3)
+    )(match.docstring_single_quotes)
 
     # raw string
-    @kb.add(
-        "(", filter=focused_insert & auto_match & preceding_text(r".*(r|R)[\"'](-*)$")
-    )
-    def _(event):
-        matches = re.match(
-            r".*(r|R)[\"'](-*)",
-            event.current_buffer.document.current_line_before_cursor,
-        )
-        dashes = matches.group(2) or ""
-        event.current_buffer.insert_text("()" + dashes)
-        event.current_buffer.cursor_left(len(dashes) + 1)
+    auto_match_parens_raw_string = {
+        "(": match.raw_string_parenthesis,
+        "[": match.raw_string_bracket,
+        "{": match.raw_string_braces,
+    }
+    for key, cmd in auto_match_parens_raw_string.items():
+        kb.add(
+            key,
+            filter=focused_insert & auto_match & preceding_text(r".*(r|R)[\"'](-*)$"),
+        )(cmd)
 
-    @kb.add(
-        "[", filter=focused_insert & auto_match & preceding_text(r".*(r|R)[\"'](-*)$")
+    # just move cursor
+    kb.add(")", filter=focused_insert & auto_match & following_text(r"^\)"))(
+        match.skip_over
     )
-    def _(event):
-        matches = re.match(
-            r".*(r|R)[\"'](-*)",
-            event.current_buffer.document.current_line_before_cursor,
-        )
-        dashes = matches.group(2) or ""
-        event.current_buffer.insert_text("[]" + dashes)
-        event.current_buffer.cursor_left(len(dashes) + 1)
-
-    @kb.add(
-        "{", filter=focused_insert & auto_match & preceding_text(r".*(r|R)[\"'](-*)$")
+    kb.add("]", filter=focused_insert & auto_match & following_text(r"^\]"))(
+        match.skip_over
+    )
+    kb.add("}", filter=focused_insert & auto_match & following_text(r"^\}"))(
+        match.skip_over
+    )
+    kb.add('"', filter=focused_insert & auto_match & following_text('^"'))(
+        match.skip_over
+    )
+    kb.add("'", filter=focused_insert & auto_match & following_text("^'"))(
+        match.skip_over
     )
-    def _(event):
-        matches = re.match(
-            r".*(r|R)[\"'](-*)",
-            event.current_buffer.document.current_line_before_cursor,
-        )
-        dashes = matches.group(2) or ""
-        event.current_buffer.insert_text("{}" + dashes)
-        event.current_buffer.cursor_left(len(dashes) + 1)
-
-    # just move cursor
-    @kb.add(")", filter=focused_insert & auto_match & following_text(r"^\)"))
-    @kb.add("]", filter=focused_insert & auto_match & following_text(r"^\]"))
-    @kb.add("}", filter=focused_insert & auto_match & following_text(r"^\}"))
-    @kb.add('"', filter=focused_insert & auto_match & following_text('^"'))
-    @kb.add("'", filter=focused_insert & auto_match & following_text("^'"))
-    def _(event):
-        event.current_buffer.cursor_right()
 
-    @kb.add(
+    kb.add(
         "backspace",
         filter=focused_insert
         & preceding_text(r".*\($")
         & auto_match
         & following_text(r"^\)"),
-    )
-    @kb.add(
+    )(match.delete_pair)
+    kb.add(
         "backspace",
         filter=focused_insert
         & preceding_text(r".*\[$")
         & auto_match
         & following_text(r"^\]"),
-    )
-    @kb.add(
+    )(match.delete_pair)
+    kb.add(
         "backspace",
         filter=focused_insert
         & preceding_text(r".*\{$")
         & auto_match
         & following_text(r"^\}"),
-    )
-    @kb.add(
+    )(match.delete_pair)
+    kb.add(
         "backspace",
         filter=focused_insert
         & preceding_text('.*"$')
         & auto_match
         & following_text('^"'),
-    )
-    @kb.add(
+    )(match.delete_pair)
+    kb.add(
         "backspace",
         filter=focused_insert
         & preceding_text(r".*'$")
         & auto_match
         & following_text(r"^'"),
-    )
-    def _(event):
-        event.current_buffer.delete()
-        event.current_buffer.delete_before_cursor()
+    )(match.delete_pair)
 
     if shell.display_completions == "readlinelike":
         kb.add(
@@ -335,37 +317,22 @@ def _(event):
             ),
         )(display_completions_like_readline)
 
-    if sys.platform == "win32":
+    if sys.platform == "win32" or for_all_platforms:
         kb.add("c-v", filter=(has_focus(DEFAULT_BUFFER) & ~vi_mode))(win_paste)
 
     focused_insert_vi = has_focus(DEFAULT_BUFFER) & vi_insert_mode
 
-    @kb.add("end", filter=has_focus(DEFAULT_BUFFER) & (ebivim | ~vi_insert_mode))
-    def _(event):
-        _apply_autosuggest(event)
-
-    @kb.add("c-e", filter=focused_insert_vi & ebivim)
-    def _(event):
-        _apply_autosuggest(event)
-
-    @kb.add("c-f", filter=focused_insert_vi)
-    def _(event):
-        b = event.current_buffer
-        suggestion = b.suggestion
-        if suggestion:
-            b.insert_text(suggestion.text)
-        else:
-            nc.forward_char(event)
-
-    @kb.add("escape", "f", filter=focused_insert_vi & ebivim)
-    def _(event):
-        b = event.current_buffer
-        suggestion = b.suggestion
-        if suggestion:
-            t = re.split(r"(\S+\s+)", suggestion.text)
-            b.insert_text(next((x for x in t if x), ""))
-        else:
-            nc.forward_word(event)
+    # autosuggestions
+    kb.add("end", filter=has_focus(DEFAULT_BUFFER) & (ebivim | ~vi_insert_mode))(
+        autosuggestions.accept_in_vi_insert_mode
+    )
+    kb.add("c-e", filter=focused_insert_vi & ebivim)(
+        autosuggestions.accept_in_vi_insert_mode
+    )
+    kb.add("c-f", filter=focused_insert_vi)(autosuggestions.accept)
+    kb.add("escape", "f", filter=focused_insert_vi & ebivim)(
+        autosuggestions.accept_word
+    )
 
     # Simple Control keybindings
     key_cmd_dict = {
@@ -423,7 +390,7 @@ def set_input_mode(self, mode):
 
 
 def reformat_text_before_cursor(buffer, document, shell):
-    text = buffer.delete_before_cursor(len(document.text[:document.cursor_position]))
+    text = buffer.delete_before_cursor(len(document.text[: document.cursor_position]))
     try:
         formatted_text = shell.reformat_handler(text)
         buffer.insert_text(formatted_text)
@@ -432,7 +399,6 @@ def reformat_text_before_cursor(buffer, document, shell):
 
 
 def newline_or_execute_outer(shell):
-
     def newline_or_execute(event):
         """When the user presses return, insert a newline or execute the code."""
         b = event.current_buffer
@@ -451,34 +417,38 @@ def newline_or_execute(event):
         if d.line_count == 1:
             check_text = d.text
         else:
-            check_text = d.text[:d.cursor_position]
+            check_text = d.text[: d.cursor_position]
         status, indent = shell.check_complete(check_text)
-       
+
         # if all we have after the cursor is whitespace: reformat current text
         # before cursor
-        after_cursor = d.text[d.cursor_position:]
+        after_cursor = d.text[d.cursor_position :]
         reformatted = False
         if not after_cursor.strip():
             reformat_text_before_cursor(b, d, shell)
             reformatted = True
-        if not (d.on_last_line or
-                d.cursor_position_row >= d.line_count - d.empty_line_count_at_the_end()
-                ):
+        if not (
+            d.on_last_line
+            or d.cursor_position_row >= d.line_count - d.empty_line_count_at_the_end()
+        ):
             if shell.autoindent:
-                b.insert_text('\n' + indent)
+                b.insert_text("\n" + indent)
             else:
-                b.insert_text('\n')
+                b.insert_text("\n")
             return
 
-        if (status != 'incomplete') and b.accept_handler:
+        if (status != "incomplete") and b.accept_handler:
             if not reformatted:
                 reformat_text_before_cursor(b, d, shell)
             b.validate_and_handle()
         else:
             if shell.autoindent:
-                b.insert_text('\n' + indent)
+                b.insert_text("\n" + indent)
             else:
-                b.insert_text('\n')
+                b.insert_text("\n")
+
+    newline_or_execute.__qualname__ = "newline_or_execute"
+
     return newline_or_execute
 
 
@@ -501,12 +471,14 @@ def next_history_or_next_completion(event):
 
 
 def dismiss_completion(event):
+    """Dismiss completion"""
     b = event.current_buffer
     if b.complete_state:
         b.cancel_completion()
 
 
 def reset_buffer(event):
+    """Reset buffer"""
     b = event.current_buffer
     if b.complete_state:
         b.cancel_completion()
@@ -515,16 +487,22 @@ def reset_buffer(event):
 
 
 def reset_search_buffer(event):
+    """Reset search buffer"""
     if event.current_buffer.document.text:
         event.current_buffer.reset()
     else:
         event.app.layout.focus(DEFAULT_BUFFER)
 
+
 def suspend_to_bg(event):
+    """Suspend to background"""
     event.app.suspend_to_background()
 
+
 def quit(event):
     """
+    Quit application with ``SIGQUIT`` if supported or ``sys.exit`` otherwise.
+
     On platforms that support SIGQUIT, send SIGQUIT to the current process.
     On other platforms, just exit the process with a message.
     """
@@ -534,8 +512,11 @@ def quit(event):
     else:
         sys.exit("Quit")
 
+
 def indent_buffer(event):
-    event.current_buffer.insert_text(' ' * 4)
+    """Indent buffer"""
+    event.current_buffer.insert_text(" " * 4)
+
 
 @undoc
 def newline_with_copy_margin(event):
@@ -547,9 +528,12 @@ def newline_with_copy_margin(event):
     Preserve margin and cursor position when using
     Control-O to insert a newline in EMACS mode
     """
-    warnings.warn("`newline_with_copy_margin(event)` is deprecated since IPython 6.0. "
-      "see `newline_autoindent_outer(shell)(event)` for a replacement.",
-                  DeprecationWarning, stacklevel=2)
+    warnings.warn(
+        "`newline_with_copy_margin(event)` is deprecated since IPython 6.0. "
+        "see `newline_autoindent_outer(shell)(event)` for a replacement.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
 
     b = event.current_buffer
     cursor_start_pos = b.document.cursor_position_col
@@ -560,6 +544,7 @@ def newline_with_copy_margin(event):
         pos_diff = cursor_start_pos - cursor_end_pos
         b.cursor_right(count=pos_diff)
 
+
 def newline_autoindent_outer(inputsplitter) -> Callable[..., None]:
     """
     Return a function suitable for inserting a indented newline after the cursor.
@@ -571,28 +556,33 @@ def newline_autoindent_outer(inputsplitter) -> Callable[..., None]:
     """
 
     def newline_autoindent(event):
-        """insert a newline after the cursor indented appropriately."""
+        """Insert a newline after the cursor indented appropriately."""
         b = event.current_buffer
         d = b.document
 
         if b.complete_state:
             b.cancel_completion()
-        text = d.text[:d.cursor_position] + '\n'
+        text = d.text[: d.cursor_position] + "\n"
         _, indent = inputsplitter.check_complete(text)
-        b.insert_text('\n' + (' ' * (indent or 0)), move_cursor=False)
+        b.insert_text("\n" + (" " * (indent or 0)), move_cursor=False)
+
+    newline_autoindent.__qualname__ = "newline_autoindent"
 
     return newline_autoindent
 
 
 def open_input_in_editor(event):
+    """Open code from input in external editor"""
     event.app.current_buffer.open_in_editor()
 
 
-if sys.platform == 'win32':
+if sys.platform == "win32":
     from IPython.core.error import TryNext
-    from IPython.lib.clipboard import (ClipboardEmpty,
-                                       win32_clipboard_get,
-                                       tkinter_clipboard_get)
+    from IPython.lib.clipboard import (
+        ClipboardEmpty,
+        win32_clipboard_get,
+        tkinter_clipboard_get,
+    )
 
     @undoc
     def win_paste(event):
@@ -606,3 +596,10 @@ def win_paste(event):
         except ClipboardEmpty:
             return
         event.current_buffer.insert_text(text.replace("\t", " " * 4))
+
+else:
+
+    @undoc
+    def win_paste(event):
+        """Stub used when auto-generating shortcuts for documentation"""
+        pass
diff --git a/IPython/terminal/shortcuts/auto_match.py b/IPython/terminal/shortcuts/auto_match.py
new file mode 100644
index 00000000000..0976bb20336
--- /dev/null
+++ b/IPython/terminal/shortcuts/auto_match.py
@@ -0,0 +1,90 @@
+import re
+from prompt_toolkit.key_binding import KeyPressEvent
+
+
+def parenthesis(event: KeyPressEvent):
+    """Auto-close parenthesis"""
+    event.current_buffer.insert_text("()")
+    event.current_buffer.cursor_left()
+
+
+def brackets(event: KeyPressEvent):
+    """Auto-close brackets"""
+    event.current_buffer.insert_text("[]")
+    event.current_buffer.cursor_left()
+
+
+def braces(event: KeyPressEvent):
+    """Auto-close braces"""
+    event.current_buffer.insert_text("{}")
+    event.current_buffer.cursor_left()
+
+
+def double_quote(event: KeyPressEvent):
+    """Auto-close double quotes"""
+    event.current_buffer.insert_text('""')
+    event.current_buffer.cursor_left()
+
+
+def single_quote(event: KeyPressEvent):
+    """Auto-close single quotes"""
+    event.current_buffer.insert_text("''")
+    event.current_buffer.cursor_left()
+
+
+def docstring_double_quotes(event: KeyPressEvent):
+    """Auto-close docstring (double quotes)"""
+    event.current_buffer.insert_text('""""')
+    event.current_buffer.cursor_left(3)
+
+
+def docstring_single_quotes(event: KeyPressEvent):
+    """Auto-close docstring (single quotes)"""
+    event.current_buffer.insert_text("''''")
+    event.current_buffer.cursor_left(3)
+
+
+def raw_string_parenthesis(event: KeyPressEvent):
+    """Auto-close parenthesis in raw strings"""
+    matches = re.match(
+        r".*(r|R)[\"'](-*)",
+        event.current_buffer.document.current_line_before_cursor,
+    )
+    dashes = matches.group(2) or ""
+    event.current_buffer.insert_text("()" + dashes)
+    event.current_buffer.cursor_left(len(dashes) + 1)
+
+
+def raw_string_bracket(event: KeyPressEvent):
+    """Auto-close bracker in raw strings"""
+    matches = re.match(
+        r".*(r|R)[\"'](-*)",
+        event.current_buffer.document.current_line_before_cursor,
+    )
+    dashes = matches.group(2) or ""
+    event.current_buffer.insert_text("[]" + dashes)
+    event.current_buffer.cursor_left(len(dashes) + 1)
+
+
+def raw_string_braces(event: KeyPressEvent):
+    """Auto-close braces in raw strings"""
+    matches = re.match(
+        r".*(r|R)[\"'](-*)",
+        event.current_buffer.document.current_line_before_cursor,
+    )
+    dashes = matches.group(2) or ""
+    event.current_buffer.insert_text("{}" + dashes)
+    event.current_buffer.cursor_left(len(dashes) + 1)
+
+
+def skip_over(event: KeyPressEvent):
+    """Skip over automatically added parenthesis.
+
+    (rather than adding another parenthesis)"""
+    event.current_buffer.cursor_right()
+
+
+def delete_pair(event: KeyPressEvent):
+    """Delete auto-closed parenthesis"""
+    event.current_buffer.delete()
+    event.current_buffer.delete_before_cursor()
diff --git a/IPython/terminal/shortcuts/autosuggestions.py b/IPython/terminal/shortcuts/autosuggestions.py
new file mode 100644
index 00000000000..fe1e8d07b7c
--- /dev/null
+++ b/IPython/terminal/shortcuts/autosuggestions.py
@@ -0,0 +1,39 @@
+import re
+from prompt_toolkit.key_binding import KeyPressEvent
+from prompt_toolkit.key_binding.bindings import named_commands as nc
+
+
+# Needed for to accept autosuggestions in vi insert mode
+def accept_in_vi_insert_mode(event: KeyPressEvent):
+    """Apply autosuggestion if at end of line."""
+    b = event.current_buffer
+    d = b.document
+    after_cursor = d.text[d.cursor_position :]
+    lines = after_cursor.split("\n")
+    end_of_current_line = lines[0].strip()
+    suggestion = b.suggestion
+    if (suggestion is not None) and (suggestion.text) and (end_of_current_line == ""):
+        b.insert_text(suggestion.text)
+    else:
+        nc.end_of_line(event)
+
+
+def accept(event):
+    """Accept suggestion"""
+    b = event.current_buffer
+    suggestion = b.suggestion
+    if suggestion:
+        b.insert_text(suggestion.text)
+    else:
+        nc.forward_char(event)
+
+
+def accept_word(event):
+    """Fill partial suggestion by word"""
+    b = event.current_buffer
+    suggestion = b.suggestion
+    if suggestion:
+        t = re.split(r"(\S+\s+)", suggestion.text)
+        b.insert_text(next((x for x in t if x), ""))
+    else:
+        nc.forward_word(event)
diff --git a/docs/autogen_shortcuts.py b/docs/autogen_shortcuts.py
index db7fe8d4917..b5886ffa576 100755
--- a/docs/autogen_shortcuts.py
+++ b/docs/autogen_shortcuts.py
@@ -1,45 +1,98 @@
+from dataclasses import dataclass
+from inspect import getsource
 from pathlib import Path
+from typing import cast, Callable, List, Union
+from html import escape as html_escape
+import re
+
+from prompt_toolkit.keys import KEY_ALIASES
+from prompt_toolkit.key_binding import KeyBindingsBase
+from prompt_toolkit.filters import Filter, Condition
+from prompt_toolkit.shortcuts import PromptSession
 
 from IPython.terminal.shortcuts import create_ipython_shortcuts
 
-def name(c):
-    s = c.__class__.__name__
-    if s == '_Invert':
-        return '(Not: %s)' % name(c.filter)
-    if s in log_filters.keys():
-        return '(%s: %s)' % (log_filters[s], ', '.join(name(x) for x in c.filters))
-    return log_filters[s] if s in log_filters.keys() else s
 
+@dataclass
+class Shortcut:
+    #: a sequence of keys (each element on the list corresponds to pressing one or more keys)
+    keys_sequence: list[str]
+    filter: str
 
-def sentencize(s):
-    """Extract first sentence
-    """
-    s = s.replace('\n', ' ').strip().split('.')
-    s = s[0] if len(s) else s
-    try:
-        return " ".join(s.split())
-    except AttributeError:
-        return s
 
+@dataclass
+class Handler:
+    description: str
+    identifier: str
 
-def most_common(lst, n=3):
-    """Most common elements occurring more then `n` times
-    """
-    from collections import Counter
 
-    c = Counter(lst)
-    return [k for (k, v) in c.items() if k and v > n]
+@dataclass
+class Binding:
+    handler: Handler
+    shortcut: Shortcut
 
 
-def multi_filter_str(flt):
-    """Yield readable conditional filter
-    """
-    assert hasattr(flt, 'filters'), 'Conditional filter required'
-    yield name(flt)
+class _NestedFilter(Filter):
+    """Protocol reflecting non-public prompt_toolkit's `_AndList` and `_OrList`."""
+
+    filters: List[Filter]
+
+
+class _Invert(Filter):
+    """Protocol reflecting non-public prompt_toolkit's `_Invert`."""
+
+    filter: Filter
+
+
+conjunctions_labels = {"_AndList": "and", "_OrList": "or"}
 
+ATOMIC_CLASSES = {"Never", "Always", "Condition"}
+
+
+def format_filter(
+    filter_: Union[Filter, _NestedFilter, Condition, _Invert],
+    is_top_level=True,
+    skip=None,
+) -> str:
+    """Create easily readable description of the filter."""
+    s = filter_.__class__.__name__
+    if s == "Condition":
+        func = cast(Condition, filter_).func
+        name = func.__name__
+        if name == "<lambda>":
+            source = getsource(func)
+            return source.split("=")[0].strip()
+        return func.__name__
+    elif s == "_Invert":
+        operand = cast(_Invert, filter_).filter
+        if operand.__class__.__name__ in ATOMIC_CLASSES:
+            return f"not {format_filter(operand, is_top_level=False)}"
+        return f"not ({format_filter(operand, is_top_level=False)})"
+    elif s in conjunctions_labels:
+        filters = cast(_NestedFilter, filter_).filters
+        conjunction = conjunctions_labels[s]
+        glue = f" {conjunction} "
+        result = glue.join(format_filter(x, is_top_level=False) for x in filters)
+        if len(filters) > 1 and not is_top_level:
+            result = f"({result})"
+        return result
+    elif s in ["Never", "Always"]:
+        return s.lower()
+    else:
+        raise ValueError(f"Unknown filter type: {filter_}")
+
+
+def sentencize(s) -> str:
+    """Extract first sentence"""
+    s = re.split(r"\.\W", s.replace("\n", " ").strip())
+    s = s[0] if len(s) else ""
+    if not s.endswith("."):
+        s += "."
+    try:
+        return " ".join(s.split())
+    except AttributeError:
+        return s
 
-log_filters = {'_AndList': 'And', '_OrList': 'Or'}
-log_invert =  {'_Invert'}
 
 class _DummyTerminal:
     """Used as a buffer to get prompt_toolkit bindings
@@ -50,47 +103,118 @@ class _DummyTerminal:
     editing_mode = "emacs"
 
 
-ipy_bindings = create_ipython_shortcuts(_DummyTerminal()).bindings
-
-dummy_docs = []  # ignore bindings without proper documentation
-
-common_docs = most_common([kb.handler.__doc__ for kb in ipy_bindings])
-if common_docs:
-    dummy_docs.extend(common_docs)
+def create_identifier(handler: Callable):
+    parts = handler.__module__.split(".")
+    name = handler.__name__
+    package = parts[0]
+    if len(parts) > 1:
+        final_module = parts[-1]
+        return f"{package}:{final_module}.{name}"
+    else:
+        return f"{package}:{name}"
+
+
+def bindings_from_prompt_toolkit(prompt_bindings: KeyBindingsBase) -> List[Binding]:
+    """Collect bindings to a simple format that does not depend on prompt-toolkit internals"""
+    bindings: List[Binding] = []
+
+    for kb in prompt_bindings.bindings:
+        bindings.append(
+            Binding(
+                handler=Handler(
+                    description=kb.handler.__doc__ or "",
+                    identifier=create_identifier(kb.handler),
+                ),
+                shortcut=Shortcut(
+                    keys_sequence=[
+                        str(k.value) if hasattr(k, "value") else k for k in kb.keys
+                    ],
+                    filter=format_filter(kb.filter, skip={"has_focus_filter"}),
+                ),
+            )
+        )
+    return bindings
+
+
+INDISTINGUISHABLE_KEYS = {**KEY_ALIASES, **{v: k for k, v in KEY_ALIASES.items()}}
+
+
+def format_prompt_keys(keys: str, add_alternatives=True) -> str:
+    """Format prompt toolkit key with modifier into an RST representation."""
+
+    def to_rst(key):
+        escaped = key.replace("\\", "\\\\")
+        return f":kbd:`{escaped}`"
+
+    keys_to_press: list[str]
+
+    prefixes = {
+        "c-s-": [to_rst("ctrl"), to_rst("shift")],
+        "s-c-": [to_rst("ctrl"), to_rst("shift")],
+        "c-": [to_rst("ctrl")],
+        "s-": [to_rst("shift")],
+    }
+
+    for prefix, modifiers in prefixes.items():
+        if keys.startswith(prefix):
+            remainder = keys[len(prefix) :]
+            keys_to_press = [*modifiers, to_rst(remainder)]
+            break
+    else:
+        keys_to_press = [to_rst(keys)]
 
-dummy_docs = list(set(dummy_docs))
+    result = " + ".join(keys_to_press)
 
-single_filter = {}
-multi_filter =  {}
-for kb in ipy_bindings:
-    doc = kb.handler.__doc__
-    if not doc or doc in dummy_docs:
-        continue
+    if keys in INDISTINGUISHABLE_KEYS and add_alternatives:
+        alternative = INDISTINGUISHABLE_KEYS[keys]
 
-    shortcut = ' '.join([k if isinstance(k, str) else k.name for k in kb.keys])
-    shortcut += shortcut.endswith('\\') and '\\' or ''
-    if hasattr(kb.filter, 'filters'):
-        flt = ' '.join(multi_filter_str(kb.filter))
-        multi_filter[(shortcut, flt)] = sentencize(doc)
-    else:
-        single_filter[(shortcut, name(kb.filter))] = sentencize(doc)
+        result = (
+            result
+            + " (or "
+            + format_prompt_keys(alternative, add_alternatives=False)
+            + ")"
+        )
 
+    return result
 
 if __name__ == '__main__':
     here = Path(__file__).parent
     dest = here / "source" / "config" / "shortcuts"
 
-    def sort_key(item):
-        k, v = item
-        shortcut, flt = k
-        return (str(shortcut), str(flt))
-
-    for filters, output_filename in [
-        (single_filter, "single_filtered"),
-        (multi_filter, "multi_filtered"),
-    ]:
-        with (dest / "{}.csv".format(output_filename)).open(
-            "w", encoding="utf-8"
-        ) as csv:
-            for (shortcut, flt), v in sorted(filters.items(), key=sort_key):
-                csv.write(":kbd:`{}`\t{}\t{}\n".format(shortcut, flt, v))
+    ipy_bindings = create_ipython_shortcuts(_DummyTerminal(), for_all_platforms=True)
+
+    session = PromptSession(key_bindings=ipy_bindings)
+    prompt_bindings = session.app.key_bindings
+
+    assert prompt_bindings
+    # Ensure that we collected the default shortcuts
+    assert len(prompt_bindings.bindings) > len(ipy_bindings.bindings)
+
+    bindings = bindings_from_prompt_toolkit(prompt_bindings)
+
+    def sort_key(binding: Binding):
+        return binding.handler.identifier, binding.shortcut.filter
+
+    filters = []
+    with (dest / "table.tsv").open("w", encoding="utf-8") as csv:
+        for binding in sorted(bindings, key=sort_key):
+            sequence = ", ".join(
+                [format_prompt_keys(keys) for keys in binding.shortcut.keys_sequence]
+            )
+            if binding.shortcut.filter == "always":
+                condition_label = "-"
+            else:
+                # we cannot fit all the columns as the filters got too complex over time
+                condition_label = "ⓘ"
+
+            csv.write(
+                "\t".join(
+                    [
+                        sequence,
+                        sentencize(binding.handler.description)
+                        + f" :raw-html:`<br>` `{binding.handler.identifier}`",
+                        f':raw-html:`<span title="{html_escape(binding.shortcut.filter)}" style="cursor: help">{condition_label}</span>`',
+                    ]
+                )
+                + "\n"
+            )
diff --git a/docs/source/_static/theme_overrides.css b/docs/source/_static/theme_overrides.css
new file mode 100644
index 00000000000..156db8c24b0
--- /dev/null
+++ b/docs/source/_static/theme_overrides.css
@@ -0,0 +1,7 @@
+/*
+ Needed to revert problematic lack of wrapping in sphinx_rtd_theme, see:
+ https://github.com/readthedocs/sphinx_rtd_theme/issues/117
+*/
+.wy-table-responsive table.shortcuts td, .wy-table-responsive table.shortcuts th {
+  white-space: normal!important;
+}
diff --git a/docs/source/conf.py b/docs/source/conf.py
index d04d4637ba7..868c0d0e346 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -211,7 +211,6 @@ def filter(self, record):
 # given in html_static_path.
 # html_style = 'default.css'
 
-
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
 #html_title = None
@@ -327,6 +326,10 @@ def filter(self, record):
 modindex_common_prefix = ['IPython.']
 
 
+def setup(app):
+    app.add_css_file("theme_overrides.css")
+
+
 # Cleanup
 # -------
 # delete release info to avoid pickling errors from sphinx
diff --git a/docs/source/config/shortcuts/index.rst b/docs/source/config/shortcuts/index.rst
index 4103d92a7bd..e361ec26c5d 100755
--- a/docs/source/config/shortcuts/index.rst
+++ b/docs/source/config/shortcuts/index.rst
@@ -4,28 +4,23 @@ IPython shortcuts
 
 Available shortcuts in an IPython terminal.
 
-.. warning::
+.. note::
 
-  This list is automatically generated, and may not hold all available
-  shortcuts. In particular, it may depend on the version of ``prompt_toolkit``
-  installed during the generation of this page.
+  This list is automatically generated. Key bindings defined in ``prompt_toolkit`` may differ
+  between installations depending on the ``prompt_toolkit`` version.
 
 
-Single Filtered shortcuts
-=========================
-
-.. csv-table::
-    :header: Shortcut,Filter,Description
-    :widths: 30, 30, 100
-    :delim: tab
-    :file: single_filtered.csv
+* Comma-separated keys, e.g. :kbd:`Esc`, :kbd:`f`, indicate a sequence which can be activated by pressing the listed keys in succession.
+* Plus-separated keys, e.g. :kbd:`Esc` + :kbd:`f` indicate a combination which requires pressing all keys simultaneously.
+* Hover over the ⓘ icon in the filter column to see when the shortcut is active.g
 
+.. role:: raw-html(raw)
+   :format: html
 
-Multi Filtered shortcuts
-========================
 
 .. csv-table::
-    :header: Shortcut,Filter,Description
-    :widths: 30, 30, 100
+    :header: Shortcut,Description and identifier,Filter
     :delim: tab
-    :file: multi_filtered.csv
+    :class: shortcuts
+    :file: table.tsv
+    :widths: 20 75 5

From f6cb59f82a748f6225e8f9460722c8169a00d665 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 8 Jan 2023 14:45:38 +0000
Subject: [PATCH 1360/1407] Fix mypy job, fix issues detected by mypy

---
 .github/workflows/mypy.yml               |  2 ++
 IPython/terminal/shortcuts/__init__.py   | 12 ++++++------
 IPython/terminal/shortcuts/auto_match.py |  6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index 52f3e79ab9c..c7fa22c7210 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -29,11 +29,13 @@ jobs:
         pip install mypy pyflakes flake8
     - name: Lint with mypy
       run: |
+        set -e
         mypy -p IPython.terminal
         mypy -p IPython.core.magics
         mypy -p IPython.core.guarded_eval
         mypy -p IPython.core.completer
     - name: Lint with pyflakes
       run: |
+        set -e
         flake8  IPython/core/magics/script.py
         flake8  IPython/core/magics/packaging.py
diff --git a/IPython/terminal/shortcuts/__init__.py b/IPython/terminal/shortcuts/__init__.py
index 6bc6ec7c39f..68eaf65ff60 100644
--- a/IPython/terminal/shortcuts/__init__.py
+++ b/IPython/terminal/shortcuts/__init__.py
@@ -11,7 +11,7 @@
 import sys
 import re
 import os
-from typing import Callable
+from typing import Callable, Dict, Union
 
 
 from prompt_toolkit.application.current import get_app
@@ -143,10 +143,10 @@ def all_quotes_paired(quote, buf):
         return paired
 
     focused_insert = (vi_insert_mode | emacs_insert_mode) & has_focus(DEFAULT_BUFFER)
-    _preceding_text_cache = {}
-    _following_text_cache = {}
+    _preceding_text_cache: Dict[Union[str, Callable], Condition] = {}
+    _following_text_cache: Dict[Union[str, Callable], Condition] = {}
 
-    def preceding_text(pattern):
+    def preceding_text(pattern: Union[str, Callable]):
         if pattern in _preceding_text_cache:
             return _preceding_text_cache[pattern]
 
@@ -383,8 +383,8 @@ def set_input_mode(self, mode):
         self._input_mode = mode
 
     if shell.editing_mode == "vi" and shell.modal_cursor:
-        ViState._input_mode = InputMode.INSERT
-        ViState.input_mode = property(get_input_mode, set_input_mode)
+        ViState._input_mode = InputMode.INSERT  # type: ignore
+        ViState.input_mode = property(get_input_mode, set_input_mode)  # type: ignore
 
     return kb
 
diff --git a/IPython/terminal/shortcuts/auto_match.py b/IPython/terminal/shortcuts/auto_match.py
index 0976bb20336..bb0ca8b3169 100644
--- a/IPython/terminal/shortcuts/auto_match.py
+++ b/IPython/terminal/shortcuts/auto_match.py
@@ -50,7 +50,7 @@ def raw_string_parenthesis(event: KeyPressEvent):
         r".*(r|R)[\"'](-*)",
         event.current_buffer.document.current_line_before_cursor,
     )
-    dashes = matches.group(2) or ""
+    dashes = matches.group(2) if matches else ""
     event.current_buffer.insert_text("()" + dashes)
     event.current_buffer.cursor_left(len(dashes) + 1)
 
@@ -61,7 +61,7 @@ def raw_string_bracket(event: KeyPressEvent):
         r".*(r|R)[\"'](-*)",
         event.current_buffer.document.current_line_before_cursor,
     )
-    dashes = matches.group(2) or ""
+    dashes = matches.group(2) if matches else ""
     event.current_buffer.insert_text("[]" + dashes)
     event.current_buffer.cursor_left(len(dashes) + 1)
 
@@ -72,7 +72,7 @@ def raw_string_braces(event: KeyPressEvent):
         r".*(r|R)[\"'](-*)",
         event.current_buffer.document.current_line_before_cursor,
     )
-    dashes = matches.group(2) or ""
+    dashes = matches.group(2) if matches else ""
     event.current_buffer.insert_text("{}" + dashes)
     event.current_buffer.cursor_left(len(dashes) + 1)
 

From 1e51d378075a54559c257d91ff2e516bfced6cbc Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 8 Jan 2023 17:58:04 +0000
Subject: [PATCH 1361/1407] Implement token-by-token autosuggestions

---
 IPython/terminal/shortcuts/__init__.py        |  1 +
 IPython/terminal/shortcuts/autosuggestions.py | 52 +++++++++-
 IPython/terminal/tests/test_shortcuts.py      | 94 +++++++++++++++++++
 IPython/tests/test_shortcuts.py               | 40 --------
 4 files changed, 145 insertions(+), 42 deletions(-)
 create mode 100644 IPython/terminal/tests/test_shortcuts.py
 delete mode 100644 IPython/tests/test_shortcuts.py

diff --git a/IPython/terminal/shortcuts/__init__.py b/IPython/terminal/shortcuts/__init__.py
index 68eaf65ff60..f25a8c1a869 100644
--- a/IPython/terminal/shortcuts/__init__.py
+++ b/IPython/terminal/shortcuts/__init__.py
@@ -333,6 +333,7 @@ def not_inside_unclosed_string():
     kb.add("escape", "f", filter=focused_insert_vi & ebivim)(
         autosuggestions.accept_word
     )
+    kb.add("c-right", filter=has_focus(DEFAULT_BUFFER))(autosuggestions.accept_token)
 
     # Simple Control keybindings
     key_cmd_dict = {
diff --git a/IPython/terminal/shortcuts/autosuggestions.py b/IPython/terminal/shortcuts/autosuggestions.py
index fe1e8d07b7c..158d988acae 100644
--- a/IPython/terminal/shortcuts/autosuggestions.py
+++ b/IPython/terminal/shortcuts/autosuggestions.py
@@ -1,7 +1,13 @@
 import re
+import tokenize
+from io import StringIO
+from typing import List, Optional
+
 from prompt_toolkit.key_binding import KeyPressEvent
 from prompt_toolkit.key_binding.bindings import named_commands as nc
 
+from IPython.utils.tokenutil import generate_tokens
+
 
 # Needed for to accept autosuggestions in vi insert mode
 def accept_in_vi_insert_mode(event: KeyPressEvent):
@@ -18,7 +24,7 @@ def accept_in_vi_insert_mode(event: KeyPressEvent):
         nc.end_of_line(event)
 
 
-def accept(event):
+def accept(event: KeyPressEvent):
     """Accept suggestion"""
     b = event.current_buffer
     suggestion = b.suggestion
@@ -28,7 +34,7 @@ def accept(event):
         nc.forward_char(event)
 
 
-def accept_word(event):
+def accept_word(event: KeyPressEvent):
     """Fill partial suggestion by word"""
     b = event.current_buffer
     suggestion = b.suggestion
@@ -37,3 +43,45 @@ def accept_word(event):
         b.insert_text(next((x for x in t if x), ""))
     else:
         nc.forward_word(event)
+
+
+def accept_token(event: KeyPressEvent):
+    """Fill partial suggestion by token"""
+    b = event.current_buffer
+    suggestion = b.suggestion
+
+    if suggestion:
+        prefix = b.text
+        text = prefix + suggestion.text
+
+        tokens: List[Optional[str]] = [None, None, None]
+        substings = [""]
+        i = 0
+
+        for token in generate_tokens(StringIO(text).readline):
+            if token.type == tokenize.NEWLINE:
+                index = len(text)
+            else:
+                index = text.index(token[1], len(substings[-1]))
+            substings.append(text[:index])
+            tokenized_so_far = substings[-1]
+            if tokenized_so_far.startswith(prefix):
+                if i == 0 and len(tokenized_so_far) > len(prefix):
+                    tokens[0] = tokenized_so_far[len(prefix) :]
+                    substings.append(tokenized_so_far)
+                    i += 1
+                tokens[i] = token[1]
+                if i == 2:
+                    break
+                i += 1
+
+        if tokens[0]:
+            to_insert: str
+            insert_text = substings[-2]
+            if tokens[1] and len(tokens[1]) == 1:
+                insert_text = substings[-1]
+            to_insert = insert_text[len(prefix) :]
+            b.insert_text(to_insert)
+            return
+
+    nc.forward_word(event)
diff --git a/IPython/terminal/tests/test_shortcuts.py b/IPython/terminal/tests/test_shortcuts.py
new file mode 100644
index 00000000000..92242f75d38
--- /dev/null
+++ b/IPython/terminal/tests/test_shortcuts.py
@@ -0,0 +1,94 @@
+import pytest
+from IPython.terminal.shortcuts.autosuggestions import (
+    accept_in_vi_insert_mode,
+    accept_token,
+)
+
+from unittest.mock import patch, Mock
+
+
+def make_event(text, cursor, suggestion):
+    event = Mock()
+    event.current_buffer = Mock()
+    event.current_buffer.suggestion = Mock()
+    event.current_buffer.text = text
+    event.current_buffer.cursor_position = cursor
+    event.current_buffer.suggestion.text = suggestion
+    event.current_buffer.document = Mock()
+    event.current_buffer.document.get_end_of_line_position = Mock(return_value=0)
+    event.current_buffer.document.text = text
+    event.current_buffer.document.cursor_position = cursor
+    return event
+
+
+@pytest.mark.parametrize(
+    "text, cursor, suggestion, called",
+    [
+        ("123456", 6, "123456789", True),
+        ("123456", 3, "123456789", False),
+        ("123456   \n789", 6, "123456789", True),
+    ],
+)
+def test_autosuggest_at_EOL(text, cursor, suggestion, called):
+    """
+    test that autosuggest is only applied at end of line.
+    """
+
+    event = make_event(text, cursor, suggestion)
+    event.current_buffer.insert_text = Mock()
+    accept_in_vi_insert_mode(event)
+    if called:
+        event.current_buffer.insert_text.assert_called()
+    else:
+        event.current_buffer.insert_text.assert_not_called()
+        # event.current_buffer.document.get_end_of_line_position.assert_called()
+
+
+@pytest.mark.parametrize(
+    "text, suggestion, expected",
+    [
+        ("", "def out(tag: str, n=50):", "def "),
+        ("d", "ef out(tag: str, n=50):", "ef "),
+        ("de ", "f out(tag: str, n=50):", "f "),
+        ("def", " out(tag: str, n=50):", " "),
+        ("def ", "out(tag: str, n=50):", "out("),
+        ("def o", "ut(tag: str, n=50):", "ut("),
+        ("def ou", "t(tag: str, n=50):", "t("),
+        ("def out", "(tag: str, n=50):", "("),
+        ("def out(", "tag: str, n=50):", "tag: "),
+        ("def out(t", "ag: str, n=50):", "ag: "),
+        ("def out(ta", "g: str, n=50):", "g: "),
+        ("def out(tag", ": str, n=50):", ": "),
+        ("def out(tag:", " str, n=50):", " "),
+        ("def out(tag: ", "str, n=50):", "str, "),
+        ("def out(tag: s", "tr, n=50):", "tr, "),
+        ("def out(tag: st", "r, n=50):", "r, "),
+        ("def out(tag: str", ", n=50):", ", n"),
+        ("def out(tag: str,", " n=50):", " n"),
+        ("def out(tag: str, ", "n=50):", "n="),
+        ("def out(tag: str, n", "=50):", "="),
+        ("def out(tag: str, n=", "50):", "50)"),
+        ("def out(tag: str, n=5", "0):", "0)"),
+        ("def out(tag: str, n=50", "):", "):"),
+        ("def out(tag: str, n=50)", ":", ":"),
+    ],
+)
+def test_autosuggest_token(text, suggestion, expected):
+    event = make_event(text, len(text), suggestion)
+    event.current_buffer.insert_text = Mock()
+    accept_token(event)
+    assert event.current_buffer.insert_text.called
+    assert event.current_buffer.insert_text.call_args[0] == (expected,)
+
+
+def test_autosuggest_token_empty():
+    full = "def out(tag: str, n=50):"
+    event = make_event(full, len(full), "")
+    event.current_buffer.insert_text = Mock()
+
+    with patch(
+        "prompt_toolkit.key_binding.bindings.named_commands.forward_word"
+    ) as forward_word:
+        accept_token(event)
+        assert not event.current_buffer.insert_text.called
+        assert forward_word.called
diff --git a/IPython/tests/test_shortcuts.py b/IPython/tests/test_shortcuts.py
deleted file mode 100644
index 42edb92ba58..00000000000
--- a/IPython/tests/test_shortcuts.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import pytest
-from IPython.terminal.shortcuts import _apply_autosuggest
-
-from unittest.mock import Mock
-
-
-def make_event(text, cursor, suggestion):
-    event = Mock()
-    event.current_buffer = Mock()
-    event.current_buffer.suggestion = Mock()
-    event.current_buffer.cursor_position = cursor
-    event.current_buffer.suggestion.text = suggestion
-    event.current_buffer.document = Mock()
-    event.current_buffer.document.get_end_of_line_position = Mock(return_value=0)
-    event.current_buffer.document.text = text
-    event.current_buffer.document.cursor_position = cursor
-    return event
-
-
-@pytest.mark.parametrize(
-    "text, cursor, suggestion, called",
-    [
-        ("123456", 6, "123456789", True),
-        ("123456", 3, "123456789", False),
-        ("123456   \n789", 6, "123456789", True),
-    ],
-)
-def test_autosuggest_at_EOL(text, cursor, suggestion, called):
-    """
-    test that autosuggest is only applied at end of line.
-    """
-
-    event = make_event(text, cursor, suggestion)
-    event.current_buffer.insert_text = Mock()
-    _apply_autosuggest(event)
-    if called:
-        event.current_buffer.insert_text.assert_called()
-    else:
-        event.current_buffer.insert_text.assert_not_called()
-        # event.current_buffer.document.get_end_of_line_position.assert_called()

From 2a5f51a098e49ab34b45a00070aa65f672b1c9c6 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 8 Jan 2023 22:21:58 +0000
Subject: [PATCH 1362/1407] Implement traversal of autosuggestions and
 by-character fill

---
 IPython/terminal/interactiveshell.py          |  20 +-
 IPython/terminal/shortcuts/__init__.py        |  37 ++-
 IPython/terminal/shortcuts/auto_suggest.py    | 255 ++++++++++++++++++
 IPython/terminal/shortcuts/autosuggestions.py |  87 ------
 IPython/terminal/tests/test_shortcuts.py      |   2 +-
 docs/autogen_shortcuts.py                     |   1 +
 6 files changed, 303 insertions(+), 99 deletions(-)
 create mode 100644 IPython/terminal/shortcuts/auto_suggest.py
 delete mode 100644 IPython/terminal/shortcuts/autosuggestions.py

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index c867b553f2e..0abff28db90 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -4,6 +4,7 @@
 import os
 import sys
 from warnings import warn
+from typing import Union as UnionType
 
 from IPython.core.async_helpers import get_asyncio_loop
 from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC
@@ -49,6 +50,7 @@
 from .prompts import Prompts, ClassicPrompts, RichPromptDisplayHook
 from .ptutils import IPythonPTCompleter, IPythonPTLexer
 from .shortcuts import create_ipython_shortcuts
+from .shortcuts.auto_suggest import NavigableAutoSuggestFromHistory
 
 PTK3 = ptk_version.startswith('3.')
 
@@ -183,7 +185,7 @@ class TerminalInteractiveShell(InteractiveShell):
                                      'menus, decrease for short and wide.'
                             ).tag(config=True)
 
-    pt_app = None
+    pt_app: UnionType[PromptSession, None] = None
     debugger_history = None
 
     debugger_history_file = Unicode(
@@ -376,18 +378,25 @@ def _displayhook_class_default(self):
     ).tag(config=True)
 
     autosuggestions_provider = Unicode(
-        "AutoSuggestFromHistory",
+        "NavigableAutoSuggestFromHistory",
         help="Specifies from which source automatic suggestions are provided. "
-        "Can be set to `'AutoSuggestFromHistory`' or `None` to disable"
-        "automatic suggestions. Default is `'AutoSuggestFromHistory`'.",
+        "Can be set to ``'NavigableAutoSuggestFromHistory'`` (:kbd:`up` and "
+        ":kbd:`down` swap suggestions), ``'AutoSuggestFromHistory'``, "
+        " or ``None`` to disable automatic suggestions. "
+        "Default is `'NavigableAutoSuggestFromHistory`'.",
         allow_none=True,
     ).tag(config=True)
 
     def _set_autosuggestions(self, provider):
+        # disconnect old handler
+        if self.auto_suggest and isinstance(self.auto_suggest, NavigableAutoSuggestFromHistory):
+            self.auto_suggest.disconnect()
         if provider is None:
             self.auto_suggest = None
         elif provider == "AutoSuggestFromHistory":
             self.auto_suggest = AutoSuggestFromHistory()
+        elif provider == "NavigableAutoSuggestFromHistory":
+            self.auto_suggest = NavigableAutoSuggestFromHistory()
         else:
             raise ValueError("No valid provider.")
         if self.pt_app:
@@ -462,6 +471,8 @@ def prompt():
             tempfile_suffix=".py",
             **self._extra_prompt_options()
         )
+        if isinstance(self.auto_suggest, NavigableAutoSuggestFromHistory):
+            self.auto_suggest.connect(self.pt_app)
 
     def _make_style_from_name_or_cls(self, name_or_cls):
         """
@@ -649,6 +660,7 @@ def init_alias(self):
 
     def __init__(self, *args, **kwargs):
         super(TerminalInteractiveShell, self).__init__(*args, **kwargs)
+        self.auto_suggest: UnionType[AutoSuggestFromHistory, NavigableAutoSuggestFromHistory, None] = None
         self._set_autosuggestions(self.autosuggestions_provider)
         self.init_prompt_toolkit_cli()
         self.init_term_title()
diff --git a/IPython/terminal/shortcuts/__init__.py b/IPython/terminal/shortcuts/__init__.py
index f25a8c1a869..3bb39066ec1 100644
--- a/IPython/terminal/shortcuts/__init__.py
+++ b/IPython/terminal/shortcuts/__init__.py
@@ -34,12 +34,24 @@
 from prompt_toolkit.layout.layout import FocusableElement
 
 from IPython.utils.decorators import undoc
-from . import auto_match as match, autosuggestions
+from . import auto_match as match, auto_suggest
 
 
 __all__ = ["create_ipython_shortcuts"]
 
 
+try:
+    # only added in 3.0.30
+    from prompt_toolkit.filters import has_suggestion
+except ImportError:
+
+    @undoc
+    @Condition
+    def has_suggestion():
+        buffer = get_app().current_buffer
+        return buffer.suggestion is not None and buffer.suggestion.text != ""
+
+
 @undoc
 @Condition
 def cursor_in_leading_ws():
@@ -324,16 +336,27 @@ def not_inside_unclosed_string():
 
     # autosuggestions
     kb.add("end", filter=has_focus(DEFAULT_BUFFER) & (ebivim | ~vi_insert_mode))(
-        autosuggestions.accept_in_vi_insert_mode
+        auto_suggest.accept_in_vi_insert_mode
     )
     kb.add("c-e", filter=focused_insert_vi & ebivim)(
-        autosuggestions.accept_in_vi_insert_mode
+        auto_suggest.accept_in_vi_insert_mode
+    )
+    kb.add("c-f", filter=focused_insert_vi)(auto_suggest.accept)
+    kb.add("escape", "f", filter=focused_insert_vi & ebivim)(auto_suggest.accept_word)
+    kb.add("c-right", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
+        auto_suggest.accept_token
+    )
+    from functools import partial
+
+    kb.add("up", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
+        auto_suggest.swap_autosuggestion_up(shell.auto_suggest)
+    )
+    kb.add("down", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
+        auto_suggest.swap_autosuggestion_down(shell.auto_suggest)
     )
-    kb.add("c-f", filter=focused_insert_vi)(autosuggestions.accept)
-    kb.add("escape", "f", filter=focused_insert_vi & ebivim)(
-        autosuggestions.accept_word
+    kb.add("right", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
+        auto_suggest.accept_character
     )
-    kb.add("c-right", filter=has_focus(DEFAULT_BUFFER))(autosuggestions.accept_token)
 
     # Simple Control keybindings
     key_cmd_dict = {
diff --git a/IPython/terminal/shortcuts/auto_suggest.py b/IPython/terminal/shortcuts/auto_suggest.py
new file mode 100644
index 00000000000..0e8533f6572
--- /dev/null
+++ b/IPython/terminal/shortcuts/auto_suggest.py
@@ -0,0 +1,255 @@
+import re
+import tokenize
+from io import StringIO
+from typing import Callable, List, Optional, Union
+
+from prompt_toolkit.buffer import Buffer
+from prompt_toolkit.key_binding import KeyPressEvent
+from prompt_toolkit.key_binding.bindings import named_commands as nc
+from prompt_toolkit.auto_suggest import AutoSuggestFromHistory, Suggestion
+from prompt_toolkit.document import Document
+from prompt_toolkit.history import History
+from prompt_toolkit.shortcuts import PromptSession
+
+from IPython.utils.tokenutil import generate_tokens
+
+
+def _get_query(document: Document):
+    return document.text.rsplit("\n", 1)[-1]
+
+
+class NavigableAutoSuggestFromHistory(AutoSuggestFromHistory):
+    """ """
+
+    def __init__(
+        self,
+    ):
+        self.skip_lines = 0
+        self._connected_apps = []
+
+    def reset_history_position(self, _: Buffer):
+        self.skip_lines = 0
+
+    def disconnect(self):
+        for pt_app in self._connected_apps:
+            text_insert_event = pt_app.default_buffer.on_text_insert
+            text_insert_event.remove_handler(self.reset_history_position)
+
+    def connect(self, pt_app: PromptSession):
+        self._connected_apps.append(pt_app)
+        pt_app.default_buffer.on_text_insert.add_handler(self.reset_history_position)
+
+    def get_suggestion(
+        self, buffer: Buffer, document: Document
+    ) -> Optional[Suggestion]:
+        text = _get_query(document)
+
+        if text.strip():
+            for suggestion, _ in self._find_next_match(
+                text, self.skip_lines, buffer.history
+            ):
+                return Suggestion(suggestion)
+
+        return None
+
+    def _find_match(
+        self, text: str, skip_lines: float, history: History, previous: bool
+    ):
+        line_number = -1
+
+        for string in reversed(list(history.get_strings())):
+            for line in reversed(string.splitlines()):
+                line_number += 1
+                if not previous and line_number < skip_lines:
+                    continue
+                # do not return empty suggestions as these
+                # close the auto-suggestion overlay (and are useless)
+                if line.startswith(text) and len(line) > len(text):
+                    yield line[len(text) :], line_number
+                if previous and line_number >= skip_lines:
+                    return
+
+    def _find_next_match(self, text: str, skip_lines: float, history: History):
+        return self._find_match(text, skip_lines, history, previous=False)
+
+    def _find_previous_match(self, text: str, skip_lines: float, history: History):
+        return reversed(
+            list(self._find_match(text, skip_lines, history, previous=True))
+        )
+
+    def up(self, query: str, other_than: str, history: History):
+        for suggestion, line_number in self._find_next_match(
+            query, self.skip_lines, history
+        ):
+            # if user has history ['very.a', 'very', 'very.b'] and typed 'very'
+            # we want to switch from 'very.b' to 'very.a' because a) if they
+            # suggestion equals current text, prompt-toolit aborts suggesting
+            # b) user likely would not be interested in 'very' anyways (they
+            # already typed it).
+            if query + suggestion != other_than:
+                self.skip_lines = line_number
+                break
+        else:
+            # no matches found, cycle back to beginning
+            self.skip_lines = 0
+
+    def down(self, query: str, other_than: str, history: History):
+        for suggestion, line_number in self._find_previous_match(
+            query, self.skip_lines, history
+        ):
+            if query + suggestion != other_than:
+                self.skip_lines = line_number
+                break
+        else:
+            # no matches found, cycle to end
+            for suggestion, line_number in self._find_previous_match(
+                query, float("Inf"), history
+            ):
+                if query + suggestion != other_than:
+                    self.skip_lines = line_number
+                    break
+
+
+# Needed for to accept autosuggestions in vi insert mode
+def accept_in_vi_insert_mode(event: KeyPressEvent):
+    """Apply autosuggestion if at end of line."""
+    b = event.current_buffer
+    d = b.document
+    after_cursor = d.text[d.cursor_position :]
+    lines = after_cursor.split("\n")
+    end_of_current_line = lines[0].strip()
+    suggestion = b.suggestion
+    if (suggestion is not None) and (suggestion.text) and (end_of_current_line == ""):
+        b.insert_text(suggestion.text)
+    else:
+        nc.end_of_line(event)
+
+
+def accept(event: KeyPressEvent):
+    """Accept autosuggestion"""
+    b = event.current_buffer
+    suggestion = b.suggestion
+    if suggestion:
+        b.insert_text(suggestion.text)
+    else:
+        nc.forward_char(event)
+
+
+def accept_word(event: KeyPressEvent):
+    """Fill partial autosuggestion by word"""
+    b = event.current_buffer
+    suggestion = b.suggestion
+    if suggestion:
+        t = re.split(r"(\S+\s+)", suggestion.text)
+        b.insert_text(next((x for x in t if x), ""))
+    else:
+        nc.forward_word(event)
+
+
+def accept_character(event: KeyPressEvent):
+    """Fill partial autosuggestion by character"""
+    b = event.current_buffer
+    suggestion = b.suggestion
+    if suggestion and suggestion.text:
+        b.insert_text(suggestion.text[0])
+
+
+def accept_token(event: KeyPressEvent):
+    """Fill partial autosuggestion by token"""
+    b = event.current_buffer
+    suggestion = b.suggestion
+
+    if suggestion:
+        prefix = _get_query(b.document)
+        text = prefix + suggestion.text
+
+        tokens: List[Optional[str]] = [None, None, None]
+        substrings = [""]
+        i = 0
+
+        for token in generate_tokens(StringIO(text).readline):
+            if token.type == tokenize.NEWLINE:
+                index = len(text)
+            else:
+                index = text.index(token[1], len(substrings[-1]))
+            substrings.append(text[:index])
+            tokenized_so_far = substrings[-1]
+            if tokenized_so_far.startswith(prefix):
+                if i == 0 and len(tokenized_so_far) > len(prefix):
+                    tokens[0] = tokenized_so_far[len(prefix) :]
+                    substrings.append(tokenized_so_far)
+                    i += 1
+                tokens[i] = token[1]
+                if i == 2:
+                    break
+                i += 1
+
+        if tokens[0]:
+            to_insert: str
+            insert_text = substrings[-2]
+            if tokens[1] and len(tokens[1]) == 1:
+                insert_text = substrings[-1]
+            to_insert = insert_text[len(prefix) :]
+            b.insert_text(to_insert)
+            return
+
+    nc.forward_word(event)
+
+
+Provider = Union[AutoSuggestFromHistory, NavigableAutoSuggestFromHistory, None]
+
+
+def _swap_autosuggestion(
+    buffer: Buffer,
+    provider: NavigableAutoSuggestFromHistory,
+    direction_method: Callable,
+):
+    """
+    We skip most recent history entry (in either direction) if it equals the
+    current autosuggestion because if user cycles when auto-suggestion is shown
+    they most likely want something else than what was suggested (othewrise
+    they would have accepted the suggestion).
+    """
+    suggestion = buffer.suggestion
+    if not suggestion:
+        return
+
+    query = _get_query(buffer.document)
+    current = query + suggestion.text
+
+    direction_method(query=query, other_than=current, history=buffer.history)
+
+    new_suggestion = provider.get_suggestion(buffer, buffer.document)
+    buffer.suggestion = new_suggestion
+
+
+def swap_autosuggestion_up(provider: Provider):
+    def swap_autosuggestion_up(event: KeyPressEvent):
+        """Get next autosuggestion from history."""
+        if not isinstance(provider, NavigableAutoSuggestFromHistory):
+            return
+
+        return _swap_autosuggestion(
+            buffer=event.current_buffer, provider=provider, direction_method=provider.up
+        )
+
+    swap_autosuggestion_up.__name__ = "swap_autosuggestion_up"
+    return swap_autosuggestion_up
+
+
+def swap_autosuggestion_down(
+    provider: Union[AutoSuggestFromHistory, NavigableAutoSuggestFromHistory, None]
+):
+    def swap_autosuggestion_down(event: KeyPressEvent):
+        """Get previous autosuggestion from history."""
+        if not isinstance(provider, NavigableAutoSuggestFromHistory):
+            return
+
+        return _swap_autosuggestion(
+            buffer=event.current_buffer,
+            provider=provider,
+            direction_method=provider.down,
+        )
+
+    swap_autosuggestion_down.__name__ = "swap_autosuggestion_down"
+    return swap_autosuggestion_down
diff --git a/IPython/terminal/shortcuts/autosuggestions.py b/IPython/terminal/shortcuts/autosuggestions.py
deleted file mode 100644
index 158d988acae..00000000000
--- a/IPython/terminal/shortcuts/autosuggestions.py
+++ /dev/null
@@ -1,87 +0,0 @@
-import re
-import tokenize
-from io import StringIO
-from typing import List, Optional
-
-from prompt_toolkit.key_binding import KeyPressEvent
-from prompt_toolkit.key_binding.bindings import named_commands as nc
-
-from IPython.utils.tokenutil import generate_tokens
-
-
-# Needed for to accept autosuggestions in vi insert mode
-def accept_in_vi_insert_mode(event: KeyPressEvent):
-    """Apply autosuggestion if at end of line."""
-    b = event.current_buffer
-    d = b.document
-    after_cursor = d.text[d.cursor_position :]
-    lines = after_cursor.split("\n")
-    end_of_current_line = lines[0].strip()
-    suggestion = b.suggestion
-    if (suggestion is not None) and (suggestion.text) and (end_of_current_line == ""):
-        b.insert_text(suggestion.text)
-    else:
-        nc.end_of_line(event)
-
-
-def accept(event: KeyPressEvent):
-    """Accept suggestion"""
-    b = event.current_buffer
-    suggestion = b.suggestion
-    if suggestion:
-        b.insert_text(suggestion.text)
-    else:
-        nc.forward_char(event)
-
-
-def accept_word(event: KeyPressEvent):
-    """Fill partial suggestion by word"""
-    b = event.current_buffer
-    suggestion = b.suggestion
-    if suggestion:
-        t = re.split(r"(\S+\s+)", suggestion.text)
-        b.insert_text(next((x for x in t if x), ""))
-    else:
-        nc.forward_word(event)
-
-
-def accept_token(event: KeyPressEvent):
-    """Fill partial suggestion by token"""
-    b = event.current_buffer
-    suggestion = b.suggestion
-
-    if suggestion:
-        prefix = b.text
-        text = prefix + suggestion.text
-
-        tokens: List[Optional[str]] = [None, None, None]
-        substings = [""]
-        i = 0
-
-        for token in generate_tokens(StringIO(text).readline):
-            if token.type == tokenize.NEWLINE:
-                index = len(text)
-            else:
-                index = text.index(token[1], len(substings[-1]))
-            substings.append(text[:index])
-            tokenized_so_far = substings[-1]
-            if tokenized_so_far.startswith(prefix):
-                if i == 0 and len(tokenized_so_far) > len(prefix):
-                    tokens[0] = tokenized_so_far[len(prefix) :]
-                    substings.append(tokenized_so_far)
-                    i += 1
-                tokens[i] = token[1]
-                if i == 2:
-                    break
-                i += 1
-
-        if tokens[0]:
-            to_insert: str
-            insert_text = substings[-2]
-            if tokens[1] and len(tokens[1]) == 1:
-                insert_text = substings[-1]
-            to_insert = insert_text[len(prefix) :]
-            b.insert_text(to_insert)
-            return
-
-    nc.forward_word(event)
diff --git a/IPython/terminal/tests/test_shortcuts.py b/IPython/terminal/tests/test_shortcuts.py
index 92242f75d38..39cc6e24819 100644
--- a/IPython/terminal/tests/test_shortcuts.py
+++ b/IPython/terminal/tests/test_shortcuts.py
@@ -1,5 +1,5 @@
 import pytest
-from IPython.terminal.shortcuts.autosuggestions import (
+from IPython.terminal.shortcuts.auto_suggest import (
     accept_in_vi_insert_mode,
     accept_token,
 )
diff --git a/docs/autogen_shortcuts.py b/docs/autogen_shortcuts.py
index b5886ffa576..f8fd17bb51f 100755
--- a/docs/autogen_shortcuts.py
+++ b/docs/autogen_shortcuts.py
@@ -101,6 +101,7 @@ class _DummyTerminal:
     input_transformer_manager = None
     display_completions = None
     editing_mode = "emacs"
+    auto_suggest = None
 
 
 def create_identifier(handler: Callable):

From 43d6a9b11a1aa2843edaf0d3ca1c3a4c4f699182 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 8 Jan 2023 22:49:19 +0000
Subject: [PATCH 1363/1407] Accepting suggestions with cursor in place and
 resume on backspace

---
 IPython/terminal/shortcuts/__init__.py     |  6 +++
 IPython/terminal/shortcuts/auto_suggest.py | 49 +++++++++++++++++-----
 2 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/IPython/terminal/shortcuts/__init__.py b/IPython/terminal/shortcuts/__init__.py
index 3bb39066ec1..84d599f237a 100644
--- a/IPython/terminal/shortcuts/__init__.py
+++ b/IPython/terminal/shortcuts/__init__.py
@@ -357,6 +357,12 @@ def not_inside_unclosed_string():
     kb.add("right", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
         auto_suggest.accept_character
     )
+    kb.add("left", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
+        auto_suggest.accept_and_keep_cursor
+    )
+    kb.add("backspace", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
+        auto_suggest.backspace_and_resume_hint
+    )
 
     # Simple Control keybindings
     key_cmd_dict = {
diff --git a/IPython/terminal/shortcuts/auto_suggest.py b/IPython/terminal/shortcuts/auto_suggest.py
index 0e8533f6572..8124f5c4b5d 100644
--- a/IPython/terminal/shortcuts/auto_suggest.py
+++ b/IPython/terminal/shortcuts/auto_suggest.py
@@ -37,6 +37,8 @@ def disconnect(self):
 
     def connect(self, pt_app: PromptSession):
         self._connected_apps.append(pt_app)
+        # note: `on_text_changed` could be used for a bit different behaviour
+        # on character deletion (i.e. reseting history position on backspace)
         pt_app.default_buffer.on_text_insert.add_handler(self.reset_history_position)
 
     def get_suggestion(
@@ -113,35 +115,35 @@ def down(self, query: str, other_than: str, history: History):
 # Needed for to accept autosuggestions in vi insert mode
 def accept_in_vi_insert_mode(event: KeyPressEvent):
     """Apply autosuggestion if at end of line."""
-    b = event.current_buffer
-    d = b.document
+    buffer = event.current_buffer
+    d = buffer.document
     after_cursor = d.text[d.cursor_position :]
     lines = after_cursor.split("\n")
     end_of_current_line = lines[0].strip()
-    suggestion = b.suggestion
+    suggestion = buffer.suggestion
     if (suggestion is not None) and (suggestion.text) and (end_of_current_line == ""):
-        b.insert_text(suggestion.text)
+        buffer.insert_text(suggestion.text)
     else:
         nc.end_of_line(event)
 
 
 def accept(event: KeyPressEvent):
     """Accept autosuggestion"""
-    b = event.current_buffer
-    suggestion = b.suggestion
+    buffer = event.current_buffer
+    suggestion = buffer.suggestion
     if suggestion:
-        b.insert_text(suggestion.text)
+        buffer.insert_text(suggestion.text)
     else:
         nc.forward_char(event)
 
 
 def accept_word(event: KeyPressEvent):
     """Fill partial autosuggestion by word"""
-    b = event.current_buffer
-    suggestion = b.suggestion
+    buffer = event.current_buffer
+    suggestion = buffer.suggestion
     if suggestion:
         t = re.split(r"(\S+\s+)", suggestion.text)
-        b.insert_text(next((x for x in t if x), ""))
+        buffer.insert_text(next((x for x in t if x), ""))
     else:
         nc.forward_word(event)
 
@@ -154,6 +156,33 @@ def accept_character(event: KeyPressEvent):
         b.insert_text(suggestion.text[0])
 
 
+def accept_and_keep_cursor(event: KeyPressEvent):
+    """Accept autosuggestion and keep cursor in place"""
+    buffer = event.current_buffer
+    old_position = buffer.cursor_position
+    suggestion = buffer.suggestion
+    if suggestion:
+        buffer.insert_text(suggestion.text)
+        buffer.cursor_position = old_position
+    else:
+        nc.backward_char(event)
+
+
+def backspace_and_resume_hint(event: KeyPressEvent):
+    """Resume autosuggestions after deleting last character"""
+    current_buffer = event.current_buffer
+
+    def resume_hinting(buffer: Buffer):
+        if buffer.auto_suggest:
+            suggestion = buffer.auto_suggest.get_suggestion(buffer, buffer.document)
+            if suggestion:
+                buffer.suggestion = suggestion
+        current_buffer.on_text_changed.remove_handler(resume_hinting)
+
+    current_buffer.on_text_changed.add_handler(resume_hinting)
+    nc.backward_delete_char(event)
+
+
 def accept_token(event: KeyPressEvent):
     """Fill partial autosuggestion by token"""
     b = event.current_buffer

From dfb5353105b3d33647bb943df32ffbad13f98978 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 8 Jan 2023 22:56:22 +0000
Subject: [PATCH 1364/1407] Accept with cursor in place with ctrl + down, move
 left after accepting

---
 IPython/terminal/shortcuts/__init__.py     | 3 +++
 IPython/terminal/shortcuts/auto_suggest.py | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/IPython/terminal/shortcuts/__init__.py b/IPython/terminal/shortcuts/__init__.py
index 84d599f237a..c4af1378df8 100644
--- a/IPython/terminal/shortcuts/__init__.py
+++ b/IPython/terminal/shortcuts/__init__.py
@@ -358,6 +358,9 @@ def not_inside_unclosed_string():
         auto_suggest.accept_character
     )
     kb.add("left", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
+        auto_suggest.accept_and_move_cursor_left
+    )
+    kb.add("c-down", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
         auto_suggest.accept_and_keep_cursor
     )
     kb.add("backspace", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
diff --git a/IPython/terminal/shortcuts/auto_suggest.py b/IPython/terminal/shortcuts/auto_suggest.py
index 8124f5c4b5d..19ecb865378 100644
--- a/IPython/terminal/shortcuts/auto_suggest.py
+++ b/IPython/terminal/shortcuts/auto_suggest.py
@@ -164,8 +164,12 @@ def accept_and_keep_cursor(event: KeyPressEvent):
     if suggestion:
         buffer.insert_text(suggestion.text)
         buffer.cursor_position = old_position
-    else:
-        nc.backward_char(event)
+
+
+def accept_and_move_cursor_left(event: KeyPressEvent):
+    """Accept autosuggestion and move cursor left"""
+    accept_and_keep_cursor(event)
+    nc.backward_char(event)
 
 
 def backspace_and_resume_hint(event: KeyPressEvent):

From 039c83ae7ba2e4dfa737692bd90c3b03c534c2c7 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Mon, 9 Jan 2023 00:33:09 +0000
Subject: [PATCH 1365/1407] Lint and add more tests

---
 IPython/terminal/interactiveshell.py       |   8 +-
 IPython/terminal/shortcuts/auto_suggest.py |   3 +-
 IPython/terminal/tests/test_shortcuts.py   | 139 +++++++++++++++++++++
 3 files changed, 146 insertions(+), 4 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 0abff28db90..be81c51a120 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -389,7 +389,9 @@ def _displayhook_class_default(self):
 
     def _set_autosuggestions(self, provider):
         # disconnect old handler
-        if self.auto_suggest and isinstance(self.auto_suggest, NavigableAutoSuggestFromHistory):
+        if self.auto_suggest and isinstance(
+            self.auto_suggest, NavigableAutoSuggestFromHistory
+        ):
             self.auto_suggest.disconnect()
         if provider is None:
             self.auto_suggest = None
@@ -660,7 +662,9 @@ def init_alias(self):
 
     def __init__(self, *args, **kwargs):
         super(TerminalInteractiveShell, self).__init__(*args, **kwargs)
-        self.auto_suggest: UnionType[AutoSuggestFromHistory, NavigableAutoSuggestFromHistory, None] = None
+        self.auto_suggest: UnionType[
+            AutoSuggestFromHistory, NavigableAutoSuggestFromHistory, None
+        ] = None
         self._set_autosuggestions(self.autosuggestions_provider)
         self.init_prompt_toolkit_cli()
         self.init_term_title()
diff --git a/IPython/terminal/shortcuts/auto_suggest.py b/IPython/terminal/shortcuts/auto_suggest.py
index 19ecb865378..988853f25b3 100644
--- a/IPython/terminal/shortcuts/auto_suggest.py
+++ b/IPython/terminal/shortcuts/auto_suggest.py
@@ -58,7 +58,6 @@ def _find_match(
         self, text: str, skip_lines: float, history: History, previous: bool
     ):
         line_number = -1
-
         for string in reversed(list(history.get_strings())):
             for line in reversed(string.splitlines()):
                 line_number += 1
@@ -167,7 +166,7 @@ def accept_and_keep_cursor(event: KeyPressEvent):
 
 
 def accept_and_move_cursor_left(event: KeyPressEvent):
-    """Accept autosuggestion and move cursor left"""
+    """Accept autosuggestion and move cursor left in place"""
     accept_and_keep_cursor(event)
     nc.backward_char(event)
 
diff --git a/IPython/terminal/tests/test_shortcuts.py b/IPython/terminal/tests/test_shortcuts.py
index 39cc6e24819..da8e841eddf 100644
--- a/IPython/terminal/tests/test_shortcuts.py
+++ b/IPython/terminal/tests/test_shortcuts.py
@@ -2,8 +2,18 @@
 from IPython.terminal.shortcuts.auto_suggest import (
     accept_in_vi_insert_mode,
     accept_token,
+    accept_character,
+    accept_word,
+    accept_and_keep_cursor,
+    NavigableAutoSuggestFromHistory,
+    swap_autosuggestion_up,
+    swap_autosuggestion_down,
 )
 
+from prompt_toolkit.history import InMemoryHistory
+from prompt_toolkit.shortcuts import PromptSession
+from prompt_toolkit.buffer import Buffer
+
 from unittest.mock import patch, Mock
 
 
@@ -81,6 +91,59 @@ def test_autosuggest_token(text, suggestion, expected):
     assert event.current_buffer.insert_text.call_args[0] == (expected,)
 
 
+@pytest.mark.parametrize(
+    "text, suggestion, expected",
+    [
+        ("", "def out(tag: str, n=50):", "d"),
+        ("d", "ef out(tag: str, n=50):", "e"),
+        ("de ", "f out(tag: str, n=50):", "f"),
+        ("def", " out(tag: str, n=50):", " "),
+    ],
+)
+def test_accept_character(text, suggestion, expected):
+    event = make_event(text, len(text), suggestion)
+    event.current_buffer.insert_text = Mock()
+    accept_character(event)
+    assert event.current_buffer.insert_text.called
+    assert event.current_buffer.insert_text.call_args[0] == (expected,)
+
+
+@pytest.mark.parametrize(
+    "text, suggestion, expected",
+    [
+        ("", "def out(tag: str, n=50):", "def "),
+        ("d", "ef out(tag: str, n=50):", "ef "),
+        ("de", "f out(tag: str, n=50):", "f "),
+        ("def", " out(tag: str, n=50):", " "),
+        # (this is why we also have accept_token)
+        ("def ", "out(tag: str, n=50):", "out(tag: "),
+    ],
+)
+def test_accept_word(text, suggestion, expected):
+    event = make_event(text, len(text), suggestion)
+    event.current_buffer.insert_text = Mock()
+    accept_word(event)
+    assert event.current_buffer.insert_text.called
+    assert event.current_buffer.insert_text.call_args[0] == (expected,)
+
+
+@pytest.mark.parametrize(
+    "text, suggestion, expected, cursor",
+    [
+        ("", "def out(tag: str, n=50):", "def out(tag: str, n=50):", 0),
+        ("def ", "out(tag: str, n=50):", "out(tag: str, n=50):", 4),
+    ],
+)
+def test_accept_and_keep_cursor(text, suggestion, expected, cursor):
+    event = make_event(text, cursor, suggestion)
+    buffer = event.current_buffer
+    buffer.insert_text = Mock()
+    accept_and_keep_cursor(event)
+    assert buffer.insert_text.called
+    assert buffer.insert_text.call_args[0] == (expected,)
+    assert buffer.cursor_position == cursor
+
+
 def test_autosuggest_token_empty():
     full = "def out(tag: str, n=50):"
     event = make_event(full, len(full), "")
@@ -92,3 +155,79 @@ def test_autosuggest_token_empty():
         accept_token(event)
         assert not event.current_buffer.insert_text.called
         assert forward_word.called
+
+
+async def test_navigable_provider():
+    provider = NavigableAutoSuggestFromHistory()
+    history = InMemoryHistory(history_strings=["very_a", "very", "very_b", "very_c"])
+    buffer = Buffer(history=history)
+
+    async for _ in history.load():
+        pass
+
+    buffer.cursor_position = 5
+    buffer.text = "very"
+
+    up = swap_autosuggestion_up(provider)
+    down = swap_autosuggestion_down(provider)
+
+    event = Mock()
+    event.current_buffer = buffer
+
+    def get_suggestion():
+        suggestion = provider.get_suggestion(buffer, buffer.document)
+        buffer.suggestion = suggestion
+        return suggestion
+
+    assert get_suggestion().text == "_c"
+
+    # should go up
+    up(event)
+    assert get_suggestion().text == "_b"
+
+    # should skip over 'very' which is identical to buffer content
+    up(event)
+    assert get_suggestion().text == "_a"
+
+    # should cycle back to beginning
+    up(event)
+    assert get_suggestion().text == "_c"
+
+    # should cycle back through end boundary
+    down(event)
+    assert get_suggestion().text == "_a"
+
+    down(event)
+    assert get_suggestion().text == "_b"
+
+    down(event)
+    assert get_suggestion().text == "_c"
+
+    down(event)
+    assert get_suggestion().text == "_a"
+
+
+def test_navigable_provider_connection():
+    provider = NavigableAutoSuggestFromHistory()
+    provider.skip_lines = 1
+
+    session_1 = PromptSession()
+    provider.connect(session_1)
+
+    assert provider.skip_lines == 1
+    session_1.default_buffer.on_text_insert.fire()
+    assert provider.skip_lines == 0
+
+    session_2 = PromptSession()
+    provider.connect(session_2)
+    provider.skip_lines = 2
+
+    assert provider.skip_lines == 2
+    session_2.default_buffer.on_text_insert.fire()
+    assert provider.skip_lines == 0
+
+    provider.skip_lines = 3
+    provider.disconnect()
+    session_1.default_buffer.on_text_insert.fire()
+    session_2.default_buffer.on_text_insert.fire()
+    assert provider.skip_lines == 3

From c97747aab90214f1c9b682aebe3f384a136caee0 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Mon, 9 Jan 2023 00:43:53 +0000
Subject: [PATCH 1366/1407] Mock session to avoid Windows issues on CI.

Instantiating a real session on Windows CI leads to exception:

```
prompt_toolkit.output.win32.NoConsoleScreenBufferError: No Windows console found. Are you running cmd.exe?
```

with the following traceback:

```
IPython\terminal\tests\test_shortcuts.py:214:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
C:\hostedtoolcache\windows\PyPy\3.8.15\x86\lib\site-packages\prompt_toolkit\shortcuts\prompt.py:476: in __init__
    self.app = self._create_application(editing_mode, erase_when_done)
C:\hostedtoolcache\windows\PyPy\3.8.15\x86\lib\site-packages\prompt_toolkit\shortcuts\prompt.py:765: in _create_application
    output=self._output,
C:\hostedtoolcache\windows\PyPy\3.8.15\x86\lib\site-packages\prompt_toolkit\application\application.py:282: in __init__
    self.output = output or session.output
C:\hostedtoolcache\windows\PyPy\3.8.15\x86\lib\site-packages\prompt_toolkit\application\current.py:71: in output
    self._output = create_output()
C:\hostedtoolcache\windows\PyPy\3.8.15\x86\lib\site-packages\prompt_toolkit\output\defaults.py:85: in create_output
    return Win32Output(stdout, default_color_depth=color_depth_from_env)
C:\hostedtoolcache\windows\PyPy\3.8.15\x86\lib\site-packages\prompt_toolkit\output\win32.py:114: in __init__
    info = self.get_win32_screen_buffer_info()
```
---
 IPython/terminal/tests/test_shortcuts.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/IPython/terminal/tests/test_shortcuts.py b/IPython/terminal/tests/test_shortcuts.py
index da8e841eddf..21434b74d18 100644
--- a/IPython/terminal/tests/test_shortcuts.py
+++ b/IPython/terminal/tests/test_shortcuts.py
@@ -11,7 +11,6 @@
 )
 
 from prompt_toolkit.history import InMemoryHistory
-from prompt_toolkit.shortcuts import PromptSession
 from prompt_toolkit.buffer import Buffer
 
 from unittest.mock import patch, Mock
@@ -207,18 +206,24 @@ def get_suggestion():
     assert get_suggestion().text == "_a"
 
 
+def create_session_mock():
+    session = Mock()
+    session.default_buffer = Buffer()
+    return session
+
+
 def test_navigable_provider_connection():
     provider = NavigableAutoSuggestFromHistory()
     provider.skip_lines = 1
 
-    session_1 = PromptSession()
+    session_1 = create_session_mock()
     provider.connect(session_1)
 
     assert provider.skip_lines == 1
     session_1.default_buffer.on_text_insert.fire()
     assert provider.skip_lines == 0
 
-    session_2 = PromptSession()
+    session_2 = create_session_mock()
     provider.connect(session_2)
     provider.skip_lines = 2
 

From dda97ea16fcecb56af542268031d6c02afb1d17a Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Mon, 9 Jan 2023 00:59:31 +0000
Subject: [PATCH 1367/1407] Add two final tests to increase coverage

---
 IPython/terminal/tests/test_shortcuts.py | 29 ++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/IPython/terminal/tests/test_shortcuts.py b/IPython/terminal/tests/test_shortcuts.py
index 21434b74d18..9f158434487 100644
--- a/IPython/terminal/tests/test_shortcuts.py
+++ b/IPython/terminal/tests/test_shortcuts.py
@@ -1,5 +1,6 @@
 import pytest
 from IPython.terminal.shortcuts.auto_suggest import (
+    accept,
     accept_in_vi_insert_mode,
     accept_token,
     accept_character,
@@ -12,6 +13,7 @@
 
 from prompt_toolkit.history import InMemoryHistory
 from prompt_toolkit.buffer import Buffer
+from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
 
 from unittest.mock import patch, Mock
 
@@ -30,6 +32,22 @@ def make_event(text, cursor, suggestion):
     return event
 
 
+@pytest.mark.parametrize(
+    "text, suggestion, expected",
+    [
+        ("", "def out(tag: str, n=50):", "def out(tag: str, n=50):"),
+        ("def ", "out(tag: str, n=50):", "out(tag: str, n=50):"),
+    ],
+)
+def test_accept(text, suggestion, expected):
+    event = make_event(text, len(text), suggestion)
+    buffer = event.current_buffer
+    buffer.insert_text = Mock()
+    accept(event)
+    assert buffer.insert_text.called
+    assert buffer.insert_text.call_args[0] == (expected,)
+
+
 @pytest.mark.parametrize(
     "text, cursor, suggestion, called",
     [
@@ -156,6 +174,17 @@ def test_autosuggest_token_empty():
         assert forward_word.called
 
 
+def test_other_providers():
+    """Ensure that swapping autosuggestions does not break with other providers"""
+    provider = AutoSuggestFromHistory()
+    up = swap_autosuggestion_up(provider)
+    down = swap_autosuggestion_down(provider)
+    event = Mock()
+    event.current_buffer = Buffer()
+    assert up(event) is None
+    assert down(event) is None
+
+
 async def test_navigable_provider():
     provider = NavigableAutoSuggestFromHistory()
     history = InMemoryHistory(history_strings=["very_a", "very", "very_b", "very_c"])

From 2e0a730903561765a90957e5ce652f74790890ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Krassowski?=
 <5832902+krassowski@users.noreply.github.com>
Date: Mon, 9 Jan 2023 02:29:12 +0000
Subject: [PATCH 1368/1407] Fix typos in a comment

---
 IPython/terminal/shortcuts/auto_suggest.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/terminal/shortcuts/auto_suggest.py b/IPython/terminal/shortcuts/auto_suggest.py
index 988853f25b3..8c699d8a23d 100644
--- a/IPython/terminal/shortcuts/auto_suggest.py
+++ b/IPython/terminal/shortcuts/auto_suggest.py
@@ -83,8 +83,8 @@ def up(self, query: str, other_than: str, history: History):
             query, self.skip_lines, history
         ):
             # if user has history ['very.a', 'very', 'very.b'] and typed 'very'
-            # we want to switch from 'very.b' to 'very.a' because a) if they
-            # suggestion equals current text, prompt-toolit aborts suggesting
+            # we want to switch from 'very.b' to 'very.a' because a) if the
+            # suggestion equals current text, prompt-toolkit aborts suggesting
             # b) user likely would not be interested in 'very' anyways (they
             # already typed it).
             if query + suggestion != other_than:

From 73fd29a13a83b077f3828d88daabdff23a8e74a8 Mon Sep 17 00:00:00 2001
From: Garland Zhang <garland.zhang@databricks.com>
Date: Wed, 11 Jan 2023 16:31:59 -0800
Subject: [PATCH 1369/1407] Update script.py

Handle non utf-8 characters during decoding for %%bash
---
 IPython/core/magics/script.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
index 9fd2fc6c0dd..e0615c0ca85 100644
--- a/IPython/core/magics/script.py
+++ b/IPython/core/magics/script.py
@@ -210,7 +210,7 @@ def in_thread(coro):
 
         async def _handle_stream(stream, stream_arg, file_object):
             while True:
-                line = (await stream.readline()).decode("utf8")
+                line = (await stream.readline()).decode("utf8", errors="replace")
                 if not line:
                     break
                 if stream_arg:

From 462382b3e30a006427d71c7e046b6e6164bda0a2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 16 Jan 2023 17:16:00 +0100
Subject: [PATCH 1370/1407] MAINT: Remove usage of traitlets.

Now this is mostly validate at typechecheck time, instead of runtime.
We don't use any validation logic so I'm unsure it is really necessary.
---
 IPython/core/application.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/IPython/core/application.py b/IPython/core/application.py
index 26c061661ac..2aa0f104399 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -123,9 +123,8 @@ def load_subconfig(self, fname, path=None, profile=None):
         return super(ProfileAwareConfigLoader, self).load_subconfig(fname, path=path)
 
 class BaseIPythonApplication(Application):
-
-    name = u'ipython'
-    description = Unicode(u'IPython: an enhanced interactive Python shell.')
+    name = "ipython"
+    description = "IPython: an enhanced interactive Python shell."
     version = Unicode(release.version)
 
     aliases = base_aliases

From 46c503d07bb4def76e824c54f4712a5fa4e7538d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 16 Jan 2023 17:15:26 +0100
Subject: [PATCH 1371/1407] MISC docs, cleanup and typing (in progress).

---
 IPython/terminal/ipapp.py                  |  4 ++--
 IPython/terminal/shortcuts/__init__.py     |  4 ++--
 IPython/terminal/shortcuts/auto_suggest.py | 27 +++++++++++++++++++---
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/IPython/terminal/ipapp.py b/IPython/terminal/ipapp.py
index df4648b8914..6280bce3b20 100755
--- a/IPython/terminal/ipapp.py
+++ b/IPython/terminal/ipapp.py
@@ -156,7 +156,7 @@ def make_report(self,traceback):
 flags.update(frontend_flags)
 
 aliases = dict(base_aliases)
-aliases.update(shell_aliases)
+aliases.update(shell_aliases)  # type: ignore[arg-type]
 
 #-----------------------------------------------------------------------------
 # Main classes and functions
@@ -180,7 +180,7 @@ def start(self):
 class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):
     name = u'ipython'
     description = usage.cl_usage
-    crash_handler_class = IPAppCrashHandler
+    crash_handler_class = IPAppCrashHandler  # typing: ignore[assignment]
     examples = _examples
 
     flags = flags
diff --git a/IPython/terminal/shortcuts/__init__.py b/IPython/terminal/shortcuts/__init__.py
index c4af1378df8..bc0c95c6f0b 100644
--- a/IPython/terminal/shortcuts/__init__.py
+++ b/IPython/terminal/shortcuts/__init__.py
@@ -163,11 +163,11 @@ def preceding_text(pattern: Union[str, Callable]):
             return _preceding_text_cache[pattern]
 
         if callable(pattern):
-
             def _preceding_text():
                 app = get_app()
                 before_cursor = app.current_buffer.document.current_line_before_cursor
-                return bool(pattern(before_cursor))
+                # mypy can't infer if(callable): https://github.com/python/mypy/issues/3603
+                return bool(pattern(before_cursor))  # type: ignore[operator]
 
         else:
             m = re.compile(pattern)
diff --git a/IPython/terminal/shortcuts/auto_suggest.py b/IPython/terminal/shortcuts/auto_suggest.py
index 8c699d8a23d..f623f8e1acf 100644
--- a/IPython/terminal/shortcuts/auto_suggest.py
+++ b/IPython/terminal/shortcuts/auto_suggest.py
@@ -1,7 +1,7 @@
 import re
 import tokenize
 from io import StringIO
-from typing import Callable, List, Optional, Union
+from typing import Callable, List, Optional, Union, Generator, Tuple
 
 from prompt_toolkit.buffer import Buffer
 from prompt_toolkit.key_binding import KeyPressEvent
@@ -19,7 +19,11 @@ def _get_query(document: Document):
 
 
 class NavigableAutoSuggestFromHistory(AutoSuggestFromHistory):
-    """ """
+    """
+    A subclass of AutoSuggestFromHistory that allow navigation to next/previous
+    suggestion from history. To do so it remembers the current position, but it
+    state need to carefully be cleared on the right events.
+    """
 
     def __init__(
         self,
@@ -56,7 +60,24 @@ def get_suggestion(
 
     def _find_match(
         self, text: str, skip_lines: float, history: History, previous: bool
-    ):
+    ) -> Generator[Tuple[str, float], None, None]:
+        """
+        text: str
+
+        skip_lines: float
+            float is used as the base value is +inf
+
+        Yields
+        ------
+        Tuple with:
+        str:
+            current suggestion.
+        float:
+            will actually yield only ints, which is passed back via skip_lines,
+            which may be a +inf (float)
+
+
+        """
         line_number = -1
         for string in reversed(list(history.get_strings())):
             for line in reversed(string.splitlines()):

From 577c3b1225aae1bf9d2a71f64c7cbb848fbbfc54 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 17 Jan 2023 09:04:55 +0100
Subject: [PATCH 1372/1407] Misc review cleanup.

Uniformize import, and put minimal prompt toolkit to 3.30
---
 IPython/terminal/shortcuts/__init__.py     | 56 +++++++++++-----------
 IPython/terminal/shortcuts/auto_suggest.py |  2 +-
 setup.cfg                                  |  2 +-
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/IPython/terminal/shortcuts/__init__.py b/IPython/terminal/shortcuts/__init__.py
index bc0c95c6f0b..a8b07026d31 100644
--- a/IPython/terminal/shortcuts/__init__.py
+++ b/IPython/terminal/shortcuts/__init__.py
@@ -6,52 +6,38 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-import warnings
+import os
+import re
 import signal
 import sys
-import re
-import os
+import warnings
 from typing import Callable, Dict, Union
 
-
 from prompt_toolkit.application.current import get_app
 from prompt_toolkit.enums import DEFAULT_BUFFER, SEARCH_BUFFER
+from prompt_toolkit.filters import Condition, emacs_insert_mode, has_completions
+from prompt_toolkit.filters import has_focus as has_focus_impl
 from prompt_toolkit.filters import (
-    has_focus as has_focus_impl,
     has_selection,
-    Condition,
+    has_suggestion,
     vi_insert_mode,
-    emacs_insert_mode,
-    has_completions,
     vi_mode,
 )
+from prompt_toolkit.key_binding import KeyBindings
+from prompt_toolkit.key_binding.bindings import named_commands as nc
 from prompt_toolkit.key_binding.bindings.completion import (
     display_completions_like_readline,
 )
-from prompt_toolkit.key_binding import KeyBindings
-from prompt_toolkit.key_binding.bindings import named_commands as nc
 from prompt_toolkit.key_binding.vi_state import InputMode, ViState
 from prompt_toolkit.layout.layout import FocusableElement
 
+from IPython.terminal.shortcuts import auto_match as match
+from IPython.terminal.shortcuts import auto_suggest
 from IPython.utils.decorators import undoc
-from . import auto_match as match, auto_suggest
-
 
 __all__ = ["create_ipython_shortcuts"]
 
 
-try:
-    # only added in 3.0.30
-    from prompt_toolkit.filters import has_suggestion
-except ImportError:
-
-    @undoc
-    @Condition
-    def has_suggestion():
-        buffer = get_app().current_buffer
-        return buffer.suggestion is not None and buffer.suggestion.text != ""
-
-
 @undoc
 @Condition
 def cursor_in_leading_ws():
@@ -66,8 +52,24 @@ def has_focus(value: FocusableElement):
     return Condition(tester)
 
 
-def create_ipython_shortcuts(shell, for_all_platforms: bool = False):
-    """Set up the prompt_toolkit keyboard shortcuts for IPython."""
+def create_ipython_shortcuts(shell, for_all_platforms: bool = False) -> KeyBindings:
+    """Set up the prompt_toolkit keyboard shortcuts for IPython.
+
+    Parameters
+    ----------
+    shell: InteractiveShell
+        The current IPython shell Instance
+    for_all_platforms: bool (default false)
+        This parameter is mostly used in generating the documentation
+        to create the shortcut binding for all the platforms, and export
+        them.
+
+    Returns
+    -------
+    KeyBindings
+        the keybinding instance for prompt toolkit.
+
+    """
     # Warning: if possible, do NOT define handler functions in the locals
     # scope of this function, instead define functions in the global
     # scope, or a separate module, and include a user-friendly docstring
@@ -613,8 +615,8 @@ def open_input_in_editor(event):
     from IPython.core.error import TryNext
     from IPython.lib.clipboard import (
         ClipboardEmpty,
-        win32_clipboard_get,
         tkinter_clipboard_get,
+        win32_clipboard_get,
     )
 
     @undoc
diff --git a/IPython/terminal/shortcuts/auto_suggest.py b/IPython/terminal/shortcuts/auto_suggest.py
index f623f8e1acf..f7fb47e8cb5 100644
--- a/IPython/terminal/shortcuts/auto_suggest.py
+++ b/IPython/terminal/shortcuts/auto_suggest.py
@@ -260,7 +260,7 @@ def _swap_autosuggestion(
     """
     We skip most recent history entry (in either direction) if it equals the
     current autosuggestion because if user cycles when auto-suggestion is shown
-    they most likely want something else than what was suggested (othewrise
+    they most likely want something else than what was suggested (otherwise
     they would have accepted the suggestion).
     """
     suggestion = buffer.suggestion
diff --git a/setup.cfg b/setup.cfg
index de327aba545..d196214d19a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,7 +37,7 @@ install_requires =
     matplotlib-inline
     pexpect>4.3; sys_platform != "win32"
     pickleshare
-    prompt_toolkit>=3.0.11,<3.1.0
+    prompt_toolkit>=3.0.30,<3.1.0
     pygments>=2.4.0
     stack_data
     traitlets>=5

From ad41919ea90c23c024a8c0e58c2224d21815de80 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 17 Jan 2023 09:10:49 +0100
Subject: [PATCH 1373/1407] add docs

---
 IPython/terminal/shortcuts/auto_match.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/IPython/terminal/shortcuts/auto_match.py b/IPython/terminal/shortcuts/auto_match.py
index bb0ca8b3169..c29f97a268c 100644
--- a/IPython/terminal/shortcuts/auto_match.py
+++ b/IPython/terminal/shortcuts/auto_match.py
@@ -1,3 +1,9 @@
+"""
+Utilities function for keybinding with prompt toolkit. 
+
+This will be bound to specific key press and filter modes, 
+like whether we are in edit mode, and whether the completer is open.
+"""
 import re
 from prompt_toolkit.key_binding import KeyPressEvent
 

From 3c529d3cbc6fa3eb736544860ad984c0198bcb35 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 17 Jan 2023 09:21:51 +0100
Subject: [PATCH 1374/1407] misc typing

---
 IPython/terminal/interactiveshell.py       | 10 +++++----
 IPython/terminal/shortcuts/auto_suggest.py | 26 +++++++++++++++-------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index be81c51a120..7213809e5fd 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -144,6 +144,10 @@ class PtkHistoryAdapter(History):
 
     """
 
+    auto_suggest: UnionType[
+        AutoSuggestFromHistory, NavigableAutoSuggestFromHistory, None
+    ]
+
     def __init__(self, shell):
         super().__init__()
         self.shell = shell
@@ -660,11 +664,9 @@ def init_alias(self):
                 self.alias_manager.soft_define_alias(cmd, cmd)
 
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         super(TerminalInteractiveShell, self).__init__(*args, **kwargs)
-        self.auto_suggest: UnionType[
-            AutoSuggestFromHistory, NavigableAutoSuggestFromHistory, None
-        ] = None
+        self.auto_suggest = None
         self._set_autosuggestions(self.autosuggestions_provider)
         self.init_prompt_toolkit_cli()
         self.init_term_title()
diff --git a/IPython/terminal/shortcuts/auto_suggest.py b/IPython/terminal/shortcuts/auto_suggest.py
index f7fb47e8cb5..a8e1d7bfeac 100644
--- a/IPython/terminal/shortcuts/auto_suggest.py
+++ b/IPython/terminal/shortcuts/auto_suggest.py
@@ -1,7 +1,7 @@
 import re
 import tokenize
 from io import StringIO
-from typing import Callable, List, Optional, Union, Generator, Tuple
+from typing import Callable, List, Optional, Union, Generator, Tuple, Sequence
 
 from prompt_toolkit.buffer import Buffer
 from prompt_toolkit.key_binding import KeyPressEvent
@@ -62,10 +62,18 @@ def _find_match(
         self, text: str, skip_lines: float, history: History, previous: bool
     ) -> Generator[Tuple[str, float], None, None]:
         """
-        text: str
-
-        skip_lines: float
-            float is used as the base value is +inf
+        text : str
+            Text content to find a match for, the user cursor is most of the
+            time at the end of this text.
+        skip_lines : float
+            number of items to skip in the search, this is used to indicate how
+            far in the list the user has navigated by pressing up or down.
+            The float type is used as the base value is +inf
+        history : History
+            prompt_toolkit History instance to fetch previous entries from.
+        previous : bool
+            Direction of the search, whether we are looking previous match
+            (True), or next match (False).
 
         Yields
         ------
@@ -91,7 +99,9 @@ def _find_match(
                 if previous and line_number >= skip_lines:
                     return
 
-    def _find_next_match(self, text: str, skip_lines: float, history: History):
+    def _find_next_match(
+        self, text: str, skip_lines: float, history: History
+    ) -> Generator[Tuple[str, float], None, None]:
         return self._find_match(text, skip_lines, history, previous=False)
 
     def _find_previous_match(self, text: str, skip_lines: float, history: History):
@@ -99,7 +109,7 @@ def _find_previous_match(self, text: str, skip_lines: float, history: History):
             list(self._find_match(text, skip_lines, history, previous=True))
         )
 
-    def up(self, query: str, other_than: str, history: History):
+    def up(self, query: str, other_than: str, history: History) -> None:
         for suggestion, line_number in self._find_next_match(
             query, self.skip_lines, history
         ):
@@ -115,7 +125,7 @@ def up(self, query: str, other_than: str, history: History):
             # no matches found, cycle back to beginning
             self.skip_lines = 0
 
-    def down(self, query: str, other_than: str, history: History):
+    def down(self, query: str, other_than: str, history: History) -> None:
         for suggestion, line_number in self._find_previous_match(
             query, self.skip_lines, history
         ):

From 3e2655952703c7426f10b9e9d86fde2a8cd0391e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 17 Jan 2023 09:36:11 +0100
Subject: [PATCH 1375/1407] Reformat and move some mapping to global location.

---
 IPython/terminal/shortcuts/__init__.py   | 23 +++++++++--------------
 IPython/terminal/shortcuts/auto_match.py |  8 ++++++++
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/IPython/terminal/shortcuts/__init__.py b/IPython/terminal/shortcuts/__init__.py
index a8b07026d31..d287368272a 100644
--- a/IPython/terminal/shortcuts/__init__.py
+++ b/IPython/terminal/shortcuts/__init__.py
@@ -165,6 +165,7 @@ def preceding_text(pattern: Union[str, Callable]):
             return _preceding_text_cache[pattern]
 
         if callable(pattern):
+
             def _preceding_text():
                 app = get_app()
                 before_cursor = app.current_buffer.document.current_line_before_cursor
@@ -215,12 +216,18 @@ def not_inside_unclosed_string():
         return not ('"' in s or "'" in s)
 
     # auto match
-    auto_match_parens = {"(": match.parenthesis, "[": match.brackets, "{": match.braces}
-    for key, cmd in auto_match_parens.items():
+    for key, cmd in match.auto_match_parens.items():
         kb.add(key, filter=focused_insert & auto_match & following_text(r"[,)}\]]|$"))(
             cmd
         )
 
+    # raw string
+    for key, cmd in match.auto_match_parens_raw_string.items():
+        kb.add(
+            key,
+            filter=focused_insert & auto_match & preceding_text(r".*(r|R)[\"'](-*)$"),
+        )(cmd)
+
     kb.add(
         '"',
         filter=focused_insert
@@ -255,18 +262,6 @@ def not_inside_unclosed_string():
         & preceding_text(r"^.*''$"),
     )(match.docstring_single_quotes)
 
-    # raw string
-    auto_match_parens_raw_string = {
-        "(": match.raw_string_parenthesis,
-        "[": match.raw_string_bracket,
-        "{": match.raw_string_braces,
-    }
-    for key, cmd in auto_match_parens_raw_string.items():
-        kb.add(
-            key,
-            filter=focused_insert & auto_match & preceding_text(r".*(r|R)[\"'](-*)$"),
-        )(cmd)
-
     # just move cursor
     kb.add(")", filter=focused_insert & auto_match & following_text(r"^\)"))(
         match.skip_over
diff --git a/IPython/terminal/shortcuts/auto_match.py b/IPython/terminal/shortcuts/auto_match.py
index c29f97a268c..46cb1bd8754 100644
--- a/IPython/terminal/shortcuts/auto_match.py
+++ b/IPython/terminal/shortcuts/auto_match.py
@@ -94,3 +94,11 @@ def delete_pair(event: KeyPressEvent):
     """Delete auto-closed parenthesis"""
     event.current_buffer.delete()
     event.current_buffer.delete_before_cursor()
+
+
+auto_match_parens = {"(": parenthesis, "[": brackets, "{": braces}
+auto_match_parens_raw_string = {
+    "(": raw_string_parenthesis,
+    "[": raw_string_bracket,
+    "{": raw_string_braces,
+}

From e0fc2386083aed55b44d4c50661fb53bd4170a3f Mon Sep 17 00:00:00 2001
From: nfgf <nfgferreira@gmail.com>
Date: Sat, 21 Jan 2023 13:03:39 -0500
Subject: [PATCH 1376/1407] Documentation update

---
 IPython/core/magic.py               |  2 +-
 docs/source/config/custommagics.rst | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 95653dc7893..4f9e4e548f7 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -280,7 +280,7 @@ def no_var_expand(magic_func):
 def output_can_be_silenced(magic_func):
     """Mark a magic function so its output may be silenced.
 
-    The output is silenced if the Python expression used as a parameter of
+    The output is silenced if the Python code used as a parameter of
     the magic ends in a semicolon, not counting a Python comment that can
     follow it.
     """
diff --git a/docs/source/config/custommagics.rst b/docs/source/config/custommagics.rst
index 99d4068773c..0a37b858a4c 100644
--- a/docs/source/config/custommagics.rst
+++ b/docs/source/config/custommagics.rst
@@ -139,13 +139,26 @@ Accessing user namespace and local scope
 ========================================
 
 When creating line magics, you may need to access surrounding scope  to get user
-variables (e.g when called inside functions). IPython provide the
+variables (e.g when called inside functions). IPython provides the
 ``@needs_local_scope`` decorator that can be imported from
 ``IPython.core.magics``. When decorated with ``@needs_local_scope`` a magic will
 be passed ``local_ns`` as an argument. As a convenience ``@needs_local_scope``
 can also be applied to cell magics even if cell magics cannot appear at local
 scope context.
 
+Silencing the magic output
+==========================
+
+Sometimes it may be useful to define a magic that can be silenced the same way
+that non-magic expressions can, i.e., by appending a semicolon at the end of the Python
+code to be executed. That can be achieved by decorating the magic function with
+the decorator ``@output_can_be_silenced`` that can be imported from
+``IPython.core.magics``. When this decorator is used, IPython will parse the Python
+code used by the magic and, if the last token is a ``;``, the output created by the
+magic will not show up on the screen. If you want to see an example of this decorator
+in action, take a look on the ``time`` magic defined in
+``IPython.core.magics.execution.py``.
+
 Complete Example
 ================
 

From fc700ddd1756a4302707abacf62198d1c3809738 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 22 Jan 2023 13:14:48 +0000
Subject: [PATCH 1377/1407] Discard auto-suggestion on `Esc`

---
 IPython/terminal/shortcuts/__init__.py     |  5 +++--
 IPython/terminal/shortcuts/auto_suggest.py |  6 ++++++
 IPython/terminal/tests/test_shortcuts.py   | 17 +++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/IPython/terminal/shortcuts/__init__.py b/IPython/terminal/shortcuts/__init__.py
index d287368272a..ad4dc39d870 100644
--- a/IPython/terminal/shortcuts/__init__.py
+++ b/IPython/terminal/shortcuts/__init__.py
@@ -343,8 +343,9 @@ def not_inside_unclosed_string():
     kb.add("c-right", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
         auto_suggest.accept_token
     )
-    from functools import partial
-
+    kb.add("escape", filter=has_suggestion & has_focus(DEFAULT_BUFFER), eager=True)(
+        auto_suggest.discard
+    )
     kb.add("up", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
         auto_suggest.swap_autosuggestion_up(shell.auto_suggest)
     )
diff --git a/IPython/terminal/shortcuts/auto_suggest.py b/IPython/terminal/shortcuts/auto_suggest.py
index a8e1d7bfeac..733a46d416f 100644
--- a/IPython/terminal/shortcuts/auto_suggest.py
+++ b/IPython/terminal/shortcuts/auto_suggest.py
@@ -167,6 +167,12 @@ def accept(event: KeyPressEvent):
         nc.forward_char(event)
 
 
+def discard(event: KeyPressEvent):
+    """Discard autosuggestion"""
+    buffer = event.current_buffer
+    buffer.suggestion = None
+
+
 def accept_word(event: KeyPressEvent):
     """Fill partial autosuggestion by word"""
     buffer = event.current_buffer
diff --git a/IPython/terminal/tests/test_shortcuts.py b/IPython/terminal/tests/test_shortcuts.py
index 9f158434487..a43a4ba2605 100644
--- a/IPython/terminal/tests/test_shortcuts.py
+++ b/IPython/terminal/tests/test_shortcuts.py
@@ -6,6 +6,7 @@
     accept_character,
     accept_word,
     accept_and_keep_cursor,
+    discard,
     NavigableAutoSuggestFromHistory,
     swap_autosuggestion_up,
     swap_autosuggestion_down,
@@ -48,6 +49,22 @@ def test_accept(text, suggestion, expected):
     assert buffer.insert_text.call_args[0] == (expected,)
 
 
+@pytest.mark.parametrize(
+    "text, suggestion",
+    [
+        ("", "def out(tag: str, n=50):"),
+        ("def ", "out(tag: str, n=50):"),
+    ],
+)
+def test_discard(text, suggestion):
+    event = make_event(text, len(text), suggestion)
+    buffer = event.current_buffer
+    buffer.insert_text = Mock()
+    discard(event)
+    assert not buffer.insert_text.called
+    assert buffer.suggestion is None
+
+
 @pytest.mark.parametrize(
     "text, cursor, suggestion, called",
     [

From 9c028ecc7fcd9ec8ba89cc60f4b49096dffa86ca Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 22 Jan 2023 20:01:51 +0000
Subject: [PATCH 1378/1407] Autosuggest: only navigate on edges of doc, show in
 multi-line doc

---
 IPython/terminal/interactiveshell.py       | 51 ++++++++++++------
 IPython/terminal/shortcuts/__init__.py     | 44 +++++++++++++---
 IPython/terminal/shortcuts/auto_suggest.py | 60 ++++++++++++++++++++--
 IPython/terminal/tests/test_shortcuts.py   | 42 +++++++++++++--
 4 files changed, 166 insertions(+), 31 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 7213809e5fd..c61024c124d 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -50,7 +50,10 @@
 from .prompts import Prompts, ClassicPrompts, RichPromptDisplayHook
 from .ptutils import IPythonPTCompleter, IPythonPTLexer
 from .shortcuts import create_ipython_shortcuts
-from .shortcuts.auto_suggest import NavigableAutoSuggestFromHistory
+from .shortcuts.auto_suggest import (
+    NavigableAutoSuggestFromHistory,
+    AppendAutoSuggestionInAnyLine,
+)
 
 PTK3 = ptk_version.startswith('3.')
 
@@ -577,23 +580,39 @@ def get_message():
             get_message = get_message()
 
         options = {
-                'complete_in_thread': False,
-                'lexer':IPythonPTLexer(),
-                'reserve_space_for_menu':self.space_for_menu,
-                'message': get_message,
-                'prompt_continuation': (
-                    lambda width, lineno, is_soft_wrap:
-                        PygmentsTokens(self.prompts.continuation_prompt_tokens(width))),
-                'multiline': True,
-                'complete_style': self.pt_complete_style,
-
+            "complete_in_thread": False,
+            "lexer": IPythonPTLexer(),
+            "reserve_space_for_menu": self.space_for_menu,
+            "message": get_message,
+            "prompt_continuation": (
+                lambda width, lineno, is_soft_wrap: PygmentsTokens(
+                    self.prompts.continuation_prompt_tokens(width)
+                )
+            ),
+            "multiline": True,
+            "complete_style": self.pt_complete_style,
+            "input_processors": [
                 # Highlight matching brackets, but only when this setting is
                 # enabled, and only when the DEFAULT_BUFFER has the focus.
-                'input_processors': [ConditionalProcessor(
-                        processor=HighlightMatchingBracketProcessor(chars='[](){}'),
-                        filter=HasFocus(DEFAULT_BUFFER) & ~IsDone() &
-                            Condition(lambda: self.highlight_matching_brackets))],
-                }
+                ConditionalProcessor(
+                    processor=HighlightMatchingBracketProcessor(chars="[](){}"),
+                    filter=HasFocus(DEFAULT_BUFFER)
+                    & ~IsDone()
+                    & Condition(lambda: self.highlight_matching_brackets),
+                ),
+                # Show auto-suggestion in lines other than the last line.
+                ConditionalProcessor(
+                    processor=AppendAutoSuggestionInAnyLine(),
+                    filter=HasFocus(DEFAULT_BUFFER)
+                    & ~IsDone()
+                    & Condition(
+                        lambda: isinstance(
+                            self.auto_suggest, NavigableAutoSuggestFromHistory
+                        )
+                    ),
+                ),
+            ],
+        }
         if not PTK3:
             options['inputhook'] = self.inputhook
 
diff --git a/IPython/terminal/shortcuts/__init__.py b/IPython/terminal/shortcuts/__init__.py
index ad4dc39d870..fc870f0c01c 100644
--- a/IPython/terminal/shortcuts/__init__.py
+++ b/IPython/terminal/shortcuts/__init__.py
@@ -52,6 +52,18 @@ def has_focus(value: FocusableElement):
     return Condition(tester)
 
 
+@Condition
+def has_line_below() -> bool:
+    document = get_app().current_buffer.document
+    return document.cursor_position_row < len(document.lines) - 1
+
+
+@Condition
+def has_line_above() -> bool:
+    document = get_app().current_buffer.document
+    return document.cursor_position_row != 0
+
+
 def create_ipython_shortcuts(shell, for_all_platforms: bool = False) -> KeyBindings:
     """Set up the prompt_toolkit keyboard shortcuts for IPython.
 
@@ -332,6 +344,12 @@ def not_inside_unclosed_string():
     focused_insert_vi = has_focus(DEFAULT_BUFFER) & vi_insert_mode
 
     # autosuggestions
+    @Condition
+    def navigable_suggestions():
+        return isinstance(
+            shell.auto_suggest, auto_suggest.NavigableAutoSuggestFromHistory
+        )
+
     kb.add("end", filter=has_focus(DEFAULT_BUFFER) & (ebivim | ~vi_insert_mode))(
         auto_suggest.accept_in_vi_insert_mode
     )
@@ -343,19 +361,33 @@ def not_inside_unclosed_string():
     kb.add("c-right", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
         auto_suggest.accept_token
     )
-    kb.add("escape", filter=has_suggestion & has_focus(DEFAULT_BUFFER), eager=True)(
+    kb.add("escape", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
         auto_suggest.discard
     )
-    kb.add("up", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
-        auto_suggest.swap_autosuggestion_up(shell.auto_suggest)
+    kb.add(
+        "up",
+        filter=navigable_suggestions
+        & ~has_line_above
+        & has_suggestion
+        & has_focus(DEFAULT_BUFFER),
+    )(auto_suggest.swap_autosuggestion_up(shell.auto_suggest))
+    kb.add(
+        "down",
+        filter=navigable_suggestions
+        & ~has_line_below
+        & has_suggestion
+        & has_focus(DEFAULT_BUFFER),
+    )(auto_suggest.swap_autosuggestion_down(shell.auto_suggest))
+    kb.add("up", filter=navigable_suggestions & has_focus(DEFAULT_BUFFER))(
+        auto_suggest.up_and_update_hint
     )
-    kb.add("down", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
-        auto_suggest.swap_autosuggestion_down(shell.auto_suggest)
+    kb.add("down", filter=navigable_suggestions & has_focus(DEFAULT_BUFFER))(
+        auto_suggest.down_and_update_hint
     )
     kb.add("right", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
         auto_suggest.accept_character
     )
-    kb.add("left", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
+    kb.add("c-left", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
         auto_suggest.accept_and_move_cursor_left
     )
     kb.add("c-down", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
diff --git a/IPython/terminal/shortcuts/auto_suggest.py b/IPython/terminal/shortcuts/auto_suggest.py
index 733a46d416f..7898a5514d6 100644
--- a/IPython/terminal/shortcuts/auto_suggest.py
+++ b/IPython/terminal/shortcuts/auto_suggest.py
@@ -10,12 +10,43 @@
 from prompt_toolkit.document import Document
 from prompt_toolkit.history import History
 from prompt_toolkit.shortcuts import PromptSession
+from prompt_toolkit.layout.processors import (
+    Processor,
+    Transformation,
+    TransformationInput,
+)
 
 from IPython.utils.tokenutil import generate_tokens
 
 
 def _get_query(document: Document):
-    return document.text.rsplit("\n", 1)[-1]
+    return document.lines[document.cursor_position_row]
+
+
+class AppendAutoSuggestionInAnyLine(Processor):
+    """
+    Append the auto suggestion to lines other than the last (appending to the
+    last line is natively supported by the prompt toolkit).
+    """
+
+    def __init__(self, style: str = "class:auto-suggestion") -> None:
+        self.style = style
+
+    def apply_transformation(self, ti: TransformationInput) -> Transformation:
+        is_last_line = ti.lineno == ti.document.line_count - 1
+        is_active_line = ti.lineno == ti.document.cursor_position_row
+
+        if not is_last_line and is_active_line:
+            buffer = ti.buffer_control.buffer
+
+            if buffer.suggestion and ti.document.is_cursor_at_the_end_of_line:
+                suggestion = buffer.suggestion.text
+            else:
+                suggestion = ""
+
+            return Transformation(fragments=ti.fragments + [(self.style, suggestion)])
+        else:
+            return Transformation(fragments=ti.fragments)
 
 
 class NavigableAutoSuggestFromHistory(AutoSuggestFromHistory):
@@ -208,21 +239,40 @@ def accept_and_move_cursor_left(event: KeyPressEvent):
     nc.backward_char(event)
 
 
+def _update_hint(buffer: Buffer):
+    if buffer.auto_suggest:
+        suggestion = buffer.auto_suggest.get_suggestion(buffer, buffer.document)
+        buffer.suggestion = suggestion
+
+
 def backspace_and_resume_hint(event: KeyPressEvent):
     """Resume autosuggestions after deleting last character"""
     current_buffer = event.current_buffer
 
     def resume_hinting(buffer: Buffer):
-        if buffer.auto_suggest:
-            suggestion = buffer.auto_suggest.get_suggestion(buffer, buffer.document)
-            if suggestion:
-                buffer.suggestion = suggestion
+        _update_hint(buffer)
         current_buffer.on_text_changed.remove_handler(resume_hinting)
 
     current_buffer.on_text_changed.add_handler(resume_hinting)
     nc.backward_delete_char(event)
 
 
+def up_and_update_hint(event: KeyPressEvent):
+    """Go up and update hint"""
+    current_buffer = event.current_buffer
+
+    current_buffer.auto_up(count=event.arg)
+    _update_hint(current_buffer)
+
+
+def down_and_update_hint(event: KeyPressEvent):
+    """Go down and update hint"""
+    current_buffer = event.current_buffer
+
+    current_buffer.auto_down(count=event.arg)
+    _update_hint(current_buffer)
+
+
 def accept_token(event: KeyPressEvent):
     """Fill partial autosuggestion by token"""
     b = event.current_buffer
diff --git a/IPython/terminal/tests/test_shortcuts.py b/IPython/terminal/tests/test_shortcuts.py
index a43a4ba2605..309205d4f54 100644
--- a/IPython/terminal/tests/test_shortcuts.py
+++ b/IPython/terminal/tests/test_shortcuts.py
@@ -14,6 +14,7 @@
 
 from prompt_toolkit.history import InMemoryHistory
 from prompt_toolkit.buffer import Buffer
+from prompt_toolkit.document import Document
 from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
 
 from unittest.mock import patch, Mock
@@ -26,10 +27,7 @@ def make_event(text, cursor, suggestion):
     event.current_buffer.text = text
     event.current_buffer.cursor_position = cursor
     event.current_buffer.suggestion.text = suggestion
-    event.current_buffer.document = Mock()
-    event.current_buffer.document.get_end_of_line_position = Mock(return_value=0)
-    event.current_buffer.document.text = text
-    event.current_buffer.document.cursor_position = cursor
+    event.current_buffer.document = Document(text=text, cursor_position=cursor)
     return event
 
 
@@ -252,6 +250,42 @@ def get_suggestion():
     assert get_suggestion().text == "_a"
 
 
+async def test_navigable_provider_multiline_entries():
+    provider = NavigableAutoSuggestFromHistory()
+    history = InMemoryHistory(history_strings=["very_a\nvery_b", "very_c"])
+    buffer = Buffer(history=history)
+
+    async for _ in history.load():
+        pass
+
+    buffer.cursor_position = 5
+    buffer.text = "very"
+    up = swap_autosuggestion_up(provider)
+    down = swap_autosuggestion_down(provider)
+
+    event = Mock()
+    event.current_buffer = buffer
+
+    def get_suggestion():
+        suggestion = provider.get_suggestion(buffer, buffer.document)
+        buffer.suggestion = suggestion
+        return suggestion
+
+    assert get_suggestion().text == "_c"
+
+    up(event)
+    assert get_suggestion().text == "_b"
+
+    up(event)
+    assert get_suggestion().text == "_a"
+
+    down(event)
+    assert get_suggestion().text == "_b"
+
+    down(event)
+    assert get_suggestion().text == "_c"
+
+
 def create_session_mock():
     session = Mock()
     session.default_buffer = Buffer()

From 11011b059a2bbd95006ce3a57e8d1cdc1e481eea Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 22 Jan 2023 20:29:33 +0000
Subject: [PATCH 1379/1407] Add missing line_below/line_above conditions

---
 IPython/terminal/shortcuts/__init__.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/IPython/terminal/shortcuts/__init__.py b/IPython/terminal/shortcuts/__init__.py
index fc870f0c01c..6d68c17824d 100644
--- a/IPython/terminal/shortcuts/__init__.py
+++ b/IPython/terminal/shortcuts/__init__.py
@@ -52,12 +52,14 @@ def has_focus(value: FocusableElement):
     return Condition(tester)
 
 
+@undoc
 @Condition
 def has_line_below() -> bool:
     document = get_app().current_buffer.document
     return document.cursor_position_row < len(document.lines) - 1
 
 
+@undoc
 @Condition
 def has_line_above() -> bool:
     document = get_app().current_buffer.document
@@ -378,12 +380,13 @@ def navigable_suggestions():
         & has_suggestion
         & has_focus(DEFAULT_BUFFER),
     )(auto_suggest.swap_autosuggestion_down(shell.auto_suggest))
-    kb.add("up", filter=navigable_suggestions & has_focus(DEFAULT_BUFFER))(
-        auto_suggest.up_and_update_hint
-    )
-    kb.add("down", filter=navigable_suggestions & has_focus(DEFAULT_BUFFER))(
-        auto_suggest.down_and_update_hint
-    )
+    kb.add(
+        "up", filter=has_line_above & navigable_suggestions & has_focus(DEFAULT_BUFFER)
+    )(auto_suggest.up_and_update_hint)
+    kb.add(
+        "down",
+        filter=has_line_below & navigable_suggestions & has_focus(DEFAULT_BUFFER),
+    )(auto_suggest.down_and_update_hint)
     kb.add("right", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
         auto_suggest.accept_character
     )

From b811ef130cbf93100b9e64a26cce28659b663669 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 23 Jan 2023 09:45:11 +0100
Subject: [PATCH 1380/1407] DOC: add some what's new with respect to #13888

---
 docs/source/_images/autosuggest.gif | Bin 0 -> 137790 bytes
 docs/source/whatsnew/version8.rst   |  27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 docs/source/_images/autosuggest.gif

diff --git a/docs/source/_images/autosuggest.gif b/docs/source/_images/autosuggest.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ee105489432284124c225cd13cdf6787e39250b9
GIT binary patch
literal 137790
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
UBwfqNMv;>>X9_TqHPvbj0OCM-od5s;

literal 0
HcmV?d00001

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index e1d4574e452..0d57c0a76ab 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -2,6 +2,33 @@
  8.x Series
 ============
 
+.. _version 8.9.0:
+
+IPython 8.9.0
+-------------
+
+
+The biggest improvement for 8.9 is a drastic amelioration if the
+auto-suggestions sponsored by D.E. Shaw and implmented by the more and more
+active contributor `@krassowski <https://github.com/krassowski>`.
+
+- ``right`` accepts a single character from suggestion
+- ``ctrl+right`` accepts a semantic token (macos default shortcuts take
+  precedence and need to be disabled to make this work)
+- ``backspace`` deletes a character and resumes hinting autosuggestions
+- ``left`` accepts suggestion and moves cursor left one character.
+- ``backspace`` deletes a character and resumes hinting autosuggestions
+- ``down`` moves to suggestion to later in history when no lines are present below the cursors. 
+- ``up`` moves to suggestion from earlier in history when no lines are present above the cursor.
+
+This is best described by the Gif posted by @krassowski, and in the PR itself
+:ghpull:`13888`.
+
+.. image:: ../_images/autosuggest.png
+
+Please report any feedback in order for us to improve the user experience. 
+In particular we are also working on make the shortcuts configurable.
+
 .. _version 8.8.0:
 
 IPython 8.8.0

From 8757f96eef6c1365b26810d204c380b0a3d8954f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 23 Jan 2023 01:15:22 -0800
Subject: [PATCH 1381/1407] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>
---
 docs/source/whatsnew/version8.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 0d57c0a76ab..13f0574459b 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -16,7 +16,7 @@ active contributor `@krassowski <https://github.com/krassowski>`.
 - ``ctrl+right`` accepts a semantic token (macos default shortcuts take
   precedence and need to be disabled to make this work)
 - ``backspace`` deletes a character and resumes hinting autosuggestions
-- ``left`` accepts suggestion and moves cursor left one character.
+- ``ctrl-left`` accepts suggestion and moves cursor left one character.
 - ``backspace`` deletes a character and resumes hinting autosuggestions
 - ``down`` moves to suggestion to later in history when no lines are present below the cursors. 
 - ``up`` moves to suggestion from earlier in history when no lines are present above the cursor.
@@ -27,7 +27,7 @@ This is best described by the Gif posted by @krassowski, and in the PR itself
 .. image:: ../_images/autosuggest.png
 
 Please report any feedback in order for us to improve the user experience. 
-In particular we are also working on make the shortcuts configurable.
+In particular we are also working on making the shortcuts configurable.
 
 .. _version 8.8.0:
 

From a885b478ab3b1c5979cb57dbe4614ca405dc6820 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 24 Jan 2023 10:52:26 +0100
Subject: [PATCH 1382/1407] FIX: Update vi bindings to work with nav
 auttosuggestion.

 1) dismiss the autosuggest on cursor motion
 2) in vi mode, escape already dismiss autosuggestions

closes #13901
---
 IPython/terminal/shortcuts/__init__.py     | 7 +++----
 IPython/terminal/shortcuts/auto_suggest.py | 4 ++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/IPython/terminal/shortcuts/__init__.py b/IPython/terminal/shortcuts/__init__.py
index 6d68c17824d..7ec9a2871a6 100644
--- a/IPython/terminal/shortcuts/__init__.py
+++ b/IPython/terminal/shortcuts/__init__.py
@@ -363,9 +363,9 @@ def navigable_suggestions():
     kb.add("c-right", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
         auto_suggest.accept_token
     )
-    kb.add("escape", filter=has_suggestion & has_focus(DEFAULT_BUFFER))(
-        auto_suggest.discard
-    )
+    kb.add(
+        "escape", filter=has_suggestion & has_focus(DEFAULT_BUFFER) & emacs_insert_mode
+    )(auto_suggest.discard)
     kb.add(
         "up",
         filter=navigable_suggestions
@@ -451,7 +451,6 @@ def set_input_mode(self, mode):
     if shell.editing_mode == "vi" and shell.modal_cursor:
         ViState._input_mode = InputMode.INSERT  # type: ignore
         ViState.input_mode = property(get_input_mode, set_input_mode)  # type: ignore
-
     return kb
 
 
diff --git a/IPython/terminal/shortcuts/auto_suggest.py b/IPython/terminal/shortcuts/auto_suggest.py
index 7898a5514d6..3bfd6d54b83 100644
--- a/IPython/terminal/shortcuts/auto_suggest.py
+++ b/IPython/terminal/shortcuts/auto_suggest.py
@@ -75,6 +75,7 @@ def connect(self, pt_app: PromptSession):
         # note: `on_text_changed` could be used for a bit different behaviour
         # on character deletion (i.e. reseting history position on backspace)
         pt_app.default_buffer.on_text_insert.add_handler(self.reset_history_position)
+        pt_app.default_buffer.on_cursor_position_changed.add_handler(self._dismiss)
 
     def get_suggestion(
         self, buffer: Buffer, document: Document
@@ -89,6 +90,9 @@ def get_suggestion(
 
         return None
 
+    def _dismiss(self, buffer, *args, **kwargs):
+        buffer.suggestion = None
+
     def _find_match(
         self, text: str, skip_lines: float, history: History, previous: bool
     ) -> Generator[Tuple[str, float], None, None]:

From bef3df12991797c88676dd292bebd116ed51c3b7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 24 Jan 2023 17:12:10 +0100
Subject: [PATCH 1383/1407] MAINT: don't use f-strings in logs

There are many reason not to use f-string in logs,
 - F-strings are eager, so might be slow.
 - prevent structured logging or handler to highlight.
 - Security (untrusted input can lead to DOS on formatting,
   https://discuss.python.org/t/safer-logging-methods-for-f-strings-and-new-style-formatting/13802)
 - Performance (we can filter before formatting).
---
 IPython/core/application.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/application.py b/IPython/core/application.py
index 2aa0f104399..10df0405137 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -400,7 +400,7 @@ def init_profile_dir(self):
                     self.log.fatal("Profile %r not found."%self.profile)
                     self.exit(1)
             else:
-                self.log.debug(f"Using existing profile dir: {p.location!r}")
+                self.log.debug("Using existing profile dir: %r", p.location)
         else:
             location = self.config.ProfileDir.location
             # location is fully specified
@@ -420,7 +420,7 @@ def init_profile_dir(self):
                     self.log.fatal("Profile directory %r not found."%location)
                     self.exit(1)
             else:
-                self.log.debug(f"Using existing profile dir: {p.location!r}")
+                self.log.debug("Using existing profile dir: %r", p.location)
             # if profile_dir is specified explicitly, set profile name
             dir_name = os.path.basename(p.location)
             if dir_name.startswith('profile_'):

From 2641a7b1f322673259f2f91f39b7c12daf7c2c62 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 24 Jan 2023 17:50:37 +0100
Subject: [PATCH 1384/1407] remove also a bunch of %-format

---
 IPython/core/application.py | 4 ++--
 IPython/core/shellapp.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/application.py b/IPython/core/application.py
index 10df0405137..e0a8174f153 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -310,7 +310,7 @@ def _ipython_dir_changed(self, change):
                 except OSError as e:
                     # this will not be EEXIST
                     self.log.error("couldn't create path %s: %s", path, e)
-            self.log.debug("IPYTHONDIR set to: %s" % new)
+            self.log.debug("IPYTHONDIR set to: %s", new)
 
     def load_config_file(self, suppress_errors=IPYTHON_SUPPRESS_CONFIG_ERRORS):
         """Load the config file.
@@ -467,7 +467,7 @@ def stage_default_config_file(self):
         s = self.generate_config_file()
         config_file = Path(self.profile_dir.location) / self.config_file_name
         if self.overwrite or not config_file.exists():
-            self.log.warning("Generating default config file: %r" % (config_file))
+            self.log.warning("Generating default config file: %r", (config_file))
             config_file.write_text(s, encoding="utf-8")
 
     @catch_config_error
diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py
index 180f8b1b01f..29325a0ad2b 100644
--- a/IPython/core/shellapp.py
+++ b/IPython/core/shellapp.py
@@ -278,7 +278,7 @@ def init_extensions(self):
             )
             for ext in extensions:
                 try:
-                    self.log.info("Loading IPython extension: %s" % ext)
+                    self.log.info("Loading IPython extension: %s", ext)
                     self.shell.extension_manager.load_extension(ext)
                 except:
                     if self.reraise_ipython_extension_failures:

From ceb4cbbb7d94ce6b70f30230ed4a10876af6a6d3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 26 Jan 2023 05:40:39 -0800
Subject: [PATCH 1385/1407] Update docs/source/whatsnew/version8.rst

---
 docs/source/whatsnew/version8.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 13f0574459b..e656b5edc8c 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -24,7 +24,7 @@ active contributor `@krassowski <https://github.com/krassowski>`.
 This is best described by the Gif posted by @krassowski, and in the PR itself
 :ghpull:`13888`.
 
-.. image:: ../_images/autosuggest.png
+.. image:: ../_images/autosuggest.gif
 
 Please report any feedback in order for us to improve the user experience. 
 In particular we are also working on making the shortcuts configurable.

From 4a065015a1b987ac6f30fff9180efbd93cffbed6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 26 Jan 2023 15:47:55 +0100
Subject: [PATCH 1386/1407] Remove opening/at-exit closing of devnull.

This was likely due to an issue on Python 2 seeing the date,
and does not seem useful anymore. Let's try to remove it.

Should close #13896
---
 IPython/utils/io.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/IPython/utils/io.py b/IPython/utils/io.py
index 2eac5e66cba..cef4319f92c 100644
--- a/IPython/utils/io.py
+++ b/IPython/utils/io.py
@@ -18,11 +18,6 @@
 from IPython.utils.decorators import undoc
 from .capture import CapturedIO, capture_output
 
-# setup stdin/stdout/stderr to sys.stdin/sys.stdout/sys.stderr
-devnull = open(os.devnull, "w", encoding="utf-8")
-atexit.register(devnull.close)
-
-
 class Tee(object):
     """A class to duplicate an output stream to stdout/err.
 

From 72f54950fc46a93c9c2c5a74d96702dae88fdb3c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 27 Jan 2023 10:44:31 +0100
Subject: [PATCH 1387/1407] what's new 8.9

---
 docs/source/whatsnew/version8.rst | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index e656b5edc8c..d1ca6aaf9a8 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -7,9 +7,13 @@
 IPython 8.9.0
 -------------
 
+Second release of IPython in 2023, last Friday of the month, we are back on
+track. This is a small release with a few bug-fixes, and improvements, mostly
+with respect to terminal shortcuts.
+
 
 The biggest improvement for 8.9 is a drastic amelioration if the
-auto-suggestions sponsored by D.E. Shaw and implmented by the more and more
+auto-suggestions sponsored by D.E. Shaw and implemented by the more and more
 active contributor `@krassowski <https://github.com/krassowski>`.
 
 - ``right`` accepts a single character from suggestion
@@ -18,17 +22,34 @@ active contributor `@krassowski <https://github.com/krassowski>`.
 - ``backspace`` deletes a character and resumes hinting autosuggestions
 - ``ctrl-left`` accepts suggestion and moves cursor left one character.
 - ``backspace`` deletes a character and resumes hinting autosuggestions
-- ``down`` moves to suggestion to later in history when no lines are present below the cursors. 
+- ``down`` moves to suggestion to later in history when no lines are present below the cursors.
 - ``up`` moves to suggestion from earlier in history when no lines are present above the cursor.
 
-This is best described by the Gif posted by @krassowski, and in the PR itself
-:ghpull:`13888`.
+This is best described by the Gif posted by `@krassowski
+<https://github.com/krassowski>`, and in the PR itself :ghpull:`13888`.
 
 .. image:: ../_images/autosuggest.gif
 
-Please report any feedback in order for us to improve the user experience. 
+Please report any feedback in order for us to improve the user experience.
 In particular we are also working on making the shortcuts configurable.
 
+If you are interested into better terminal shortcut, I also invite you to
+participate in issue `13879
+<https://github.com/ipython/ipython/issues/13879>`__.
+
+
+As we follow `NEP29
+<https://numpy.org/neps/nep-0029-deprecation_policy.html>`__, next version of
+IPython will officially stop supporting numpy 1.20, and will stop supporting
+Python 3.8 after April release.
+
+As usual you can find the full list of PRs on GitHub under `the 8.9 milestone
+<https://github.com/ipython/ipython/milestone/111?closed=1>`__.
+
+
+Thanks to the `D. E. Shaw group <https://deshaw.com/>`__ for sponsoring
+work on IPython and related libraries.
+
 .. _version 8.8.0:
 
 IPython 8.8.0

From 100ee27a5c8172d5b7856783b1cf2bd577faa542 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 27 Jan 2023 11:09:28 +0100
Subject: [PATCH 1388/1407] bump rTD versions

---
 docs/environment.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/environment.yml b/docs/environment.yml
index afb5eff0051..e4c6a55882a 100644
--- a/docs/environment.yml
+++ b/docs/environment.yml
@@ -3,12 +3,11 @@ channels:
  - conda-forge
  - defaults
 dependencies:
-  - python=3.8
+  - python=3.11
   - setuptools>=18.5
   - sphinx>=4.2
   - sphinx_rtd_theme>=1.0
   - numpy
-  - nose
   - testpath
   - matplotlib
   - pip:

From 25071d01eb87c0f6da9db124bce21076f45d463d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 27 Jan 2023 11:25:26 +0100
Subject: [PATCH 1389/1407] second try at trying to fix RTD;

---
 docs/environment.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/environment.yml b/docs/environment.yml
index e4c6a55882a..9961253138a 100644
--- a/docs/environment.yml
+++ b/docs/environment.yml
@@ -3,13 +3,14 @@ channels:
  - conda-forge
  - defaults
 dependencies:
-  - python=3.11
-  - setuptools>=18.5
+  - python=3.10
+  - setuptools
   - sphinx>=4.2
-  - sphinx_rtd_theme>=1.0
+  - sphinx_rtd_theme
   - numpy
   - testpath
   - matplotlib
+  - pip
   - pip:
     - docrepr
     - prompt_toolkit

From cca49a27b5b102c2e37dadb06889b84e67e1512f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 27 Jan 2023 12:56:59 +0100
Subject: [PATCH 1390/1407] release 8.9.0

---
 IPython/core/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 0416637fc7d..99cbdd58110 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,7 +20,7 @@
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-# _version_extra = ""  # Uncomment this for full releases
+_version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 14faa28ac6fe61efab730e87a965c44038869c4c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 27 Jan 2023 12:58:32 +0100
Subject: [PATCH 1391/1407] back to dev

---
 IPython/core/release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 99cbdd58110..3b7dff0f02e 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -16,11 +16,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 8
-_version_minor = 9
+_version_minor = 10
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-_version_extra = ""  # Uncomment this for full releases
+# _version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]

From 4a347f74e403f663176e0c880693a73f9a39d497 Mon Sep 17 00:00:00 2001
From: Deepyaman Datta <deepyaman.datta@utexas.edu>
Date: Fri, 27 Jan 2023 08:11:59 -0500
Subject: [PATCH 1392/1407] Fix formatting of usage examples for `set_env`
 magic

---
 IPython/core/magics/osm.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index f3fa246567b..f64f1bce6ae 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -468,9 +468,9 @@ def set_env(self, parameter_s):
         string.
 
         Usage:\\
-          %set_env var val: set value for var
-          %set_env var=val: set value for var
-          %set_env var=$val: set value for var, using python expansion if possible
+          :``%set_env var val``: set value for var
+          :``%set_env var=val``: set value for var
+          :``%set_env var=$val``: set value for var, using python expansion if possible
         """
         split = '=' if '=' in parameter_s else ' '
         bits = parameter_s.split(split, 1)

From dd89efe34477ca8e6de7f0ccdeb922e077ce4261 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sat, 28 Jan 2023 23:24:54 +0000
Subject: [PATCH 1393/1407] Fix disabling auto-suggestions

---
 IPython/terminal/interactiveshell.py           |  8 +++-----
 IPython/terminal/tests/test_interactivshell.py | 18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index c61024c124d..b5fc148ab1c 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -147,10 +147,6 @@ class PtkHistoryAdapter(History):
 
     """
 
-    auto_suggest: UnionType[
-        AutoSuggestFromHistory, NavigableAutoSuggestFromHistory, None
-    ]
-
     def __init__(self, shell):
         super().__init__()
         self.shell = shell
@@ -193,6 +189,9 @@ class TerminalInteractiveShell(InteractiveShell):
                             ).tag(config=True)
 
     pt_app: UnionType[PromptSession, None] = None
+    auto_suggest: UnionType[
+        AutoSuggestFromHistory, NavigableAutoSuggestFromHistory, None
+    ] = None
     debugger_history = None
 
     debugger_history_file = Unicode(
@@ -685,7 +684,6 @@ def init_alias(self):
 
     def __init__(self, *args, **kwargs) -> None:
         super(TerminalInteractiveShell, self).__init__(*args, **kwargs)
-        self.auto_suggest = None
         self._set_autosuggestions(self.autosuggestions_provider)
         self.init_prompt_toolkit_cli()
         self.init_term_title()
diff --git a/IPython/terminal/tests/test_interactivshell.py b/IPython/terminal/tests/test_interactivshell.py
index 68dbe372d91..01008d78369 100644
--- a/IPython/terminal/tests/test_interactivshell.py
+++ b/IPython/terminal/tests/test_interactivshell.py
@@ -7,11 +7,25 @@
 import unittest
 import os
 
+from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
+
 from IPython.core.inputtransformer import InputTransformer
 from IPython.testing import tools as tt
 from IPython.utils.capture import capture_output
 
 from IPython.terminal.ptutils import _elide, _adjust_completion_text_based_on_context
+from IPython.terminal.shortcuts.auto_suggest import NavigableAutoSuggestFromHistory
+
+
+class TestAutoSuggest(unittest.TestCase):
+    def test_changing_provider(self):
+        ip = get_ipython()
+        ip.autosuggestions_provider = None
+        self.assertEqual(ip.auto_suggest, None)
+        ip.autosuggestions_provider = "AutoSuggestFromHistory"
+        self.assertIsInstance(ip.auto_suggest, AutoSuggestFromHistory)
+        ip.autosuggestions_provider = "NavigableAutoSuggestFromHistory"
+        self.assertIsInstance(ip.auto_suggest, NavigableAutoSuggestFromHistory)
 
 
 class TestElide(unittest.TestCase):
@@ -24,10 +38,10 @@ def test_elide(self):
         )
 
         test_string = os.sep.join(["", 10 * "a", 10 * "b", 10 * "c", ""])
-        expect_stirng = (
+        expect_string = (
             os.sep + "a" + "\N{HORIZONTAL ELLIPSIS}" + "b" + os.sep + 10 * "c"
         )
-        self.assertEqual(_elide(test_string, ""), expect_stirng)
+        self.assertEqual(_elide(test_string, ""), expect_string)
 
     def test_elide_typed_normal(self):
         self.assertEqual(

From ef39cc481fc2dc690b759a2c421f02df32170288 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Krassowski?=
 <5832902+krassowski@users.noreply.github.com>
Date: Thu, 2 Feb 2023 01:09:24 +0000
Subject: [PATCH 1394/1407] Fix typos and grammar in 8.x changelog

---
 docs/source/whatsnew/version8.rst | 64 +++++++++++++++----------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index d1ca6aaf9a8..2f743ea8fff 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -12,7 +12,7 @@ track. This is a small release with a few bug-fixes, and improvements, mostly
 with respect to terminal shortcuts.
 
 
-The biggest improvement for 8.9 is a drastic amelioration if the
+The biggest improvement for 8.9 is a drastic amelioration of the
 auto-suggestions sponsored by D.E. Shaw and implemented by the more and more
 active contributor `@krassowski <https://github.com/krassowski>`.
 
@@ -33,7 +33,7 @@ This is best described by the Gif posted by `@krassowski
 Please report any feedback in order for us to improve the user experience.
 In particular we are also working on making the shortcuts configurable.
 
-If you are interested into better terminal shortcut, I also invite you to
+If you are interested in better terminal shortcuts, I also invite you to
 participate in issue `13879
 <https://github.com/ipython/ipython/issues/13879>`__.
 
@@ -59,11 +59,11 @@ First release of IPython in 2023 as there was no release at the end of
 December.
 
 This is an unusually big release (relatively speaking) with more than 15 Pull
-Requests merge.
+Requests merged.
 
 Of particular interest are:
 
- - :ghpull:`13852` that replace the greedy completer and improve
+ - :ghpull:`13852` that replaces the greedy completer and improves
    completion, in particular for dictionary keys.
  - :ghpull:`13858` that adds ``py.typed`` to ``setup.cfg`` to make sure it is
    bundled in wheels.
@@ -72,7 +72,7 @@ Of particular interest are:
    believe this also needs a recent version of Traitlets.
  - :ghpull:`13865` makes the ``inspector`` class of `InteractiveShell`
    configurable.
- - :ghpull:`13880` that remove minor-version entrypoints as the minor version
+ - :ghpull:`13880` that removes minor-version entrypoints as the minor version
    entry points that would be included in the wheel would be the one of the
    Python version that was used to build the ``whl`` file.
 
@@ -96,8 +96,8 @@ IPython 8.7.0
 
 
 Small release of IPython with a couple of bug fixes and new features for this
-month. Next month is end of year, it is unclear if there will be a release close
-the new year's eve, or if the next release will be at end of January.
+month. Next month is the end of year, it is unclear if there will be a release
+close to the new year's eve, or if the next release will be at the end of January.
 
 Here are a few of the relevant fixes,
 as usual you can find the full list of PRs on GitHub under `the 8.7 milestone
@@ -121,29 +121,29 @@ IPython 8.6.0
 
 Back to a more regular release schedule (at least I try), as Friday is
 already over by more than 24h hours. This is a slightly bigger release with a
-few new features that contain no less then 25 PRs.
+few new features that contain no less than 25 PRs.
 
 We'll notably found a couple of non negligible changes:
 
 The ``install_ext`` and related functions have been removed after being
 deprecated for years. You can use pip to install extensions. ``pip`` did not
-exists when ``install_ext`` was introduced. You can still load local extensions
+exist when ``install_ext`` was introduced. You can still load local extensions
 without installing them. Just set your ``sys.path`` for example. :ghpull:`13744`
 
-IPython now have extra entry points that that the major *and minor* version of
-python. For some of you this mean that you can do a quick ``ipython3.10`` to
+IPython now has extra entry points that use the major *and minor* version of
+python. For some of you this means that you can do a quick ``ipython3.10`` to
 launch IPython from the Python 3.10 interpreter, while still using Python 3.11
 as your main Python. :ghpull:`13743`
 
-The completer matcher API have been improved. See :ghpull:`13745`. This should
+The completer matcher API has been improved. See :ghpull:`13745`. This should
 improve the type inference and improve dict keys completions in many use case.
-Tanks ``@krassowski`` for all the works, and the D.E. Shaw group for sponsoring
+Thanks ``@krassowski`` for all the work, and the D.E. Shaw group for sponsoring
 it.
 
 The color of error nodes in tracebacks can now be customized. See
-:ghpull:`13756`. This is a private attribute until someone find the time to
-properly add a configuration option. Note that with Python 3.11 that also show
-the relevant nodes in traceback, it would be good to leverage this informations
+:ghpull:`13756`. This is a private attribute until someone finds the time to
+properly add a configuration option. Note that with Python 3.11 that also shows
+the relevant nodes in traceback, it would be good to leverage this information
 (plus the "did you mean" info added on attribute errors). But that's likely work
 I won't have time to do before long, so contributions welcome.
 
@@ -156,7 +156,7 @@ This mostly occurs in teaching context when incorrect values get passed around.
 
 
 The ``?``, ``??``, and corresponding ``pinfo``, ``pinfo2`` magics can now find
-objects insides arrays. That is to say, the following now works::
+objects inside arrays. That is to say, the following now works::
 
 
    >>> def my_func(*arg, **kwargs):pass
@@ -165,7 +165,7 @@ objects insides arrays. That is to say, the following now works::
 
 
 If ``container`` define a custom ``getitem``, this __will__ trigger the custom
-method. So don't put side effects in your ``getitems``. Thanks the D.E. Shaw
+method. So don't put side effects in your ``getitems``. Thanks to the D.E. Shaw
 group for the request and sponsoring the work.
 
 
@@ -191,17 +191,17 @@ an bug fixes.
 Many thanks to everybody who contributed PRs for your patience in review and
 merges.
 
-Here is a non exhaustive list of changes that have been implemented for IPython
+Here is a non-exhaustive list of changes that have been implemented for IPython
 8.5.0. As usual you can find the full list of issues and PRs tagged with `the
 8.5 milestone
 <https://github.com/ipython/ipython/pulls?q=is%3Aclosed+milestone%3A8.5+>`__.
 
- - Added shortcut for accepting auto suggestion. The End key shortcut for
+ - Added a shortcut for accepting auto suggestion. The End key shortcut for
    accepting auto-suggestion This binding works in Vi mode too, provided
    ``TerminalInteractiveShell.emacs_bindings_in_vi_insert_mode`` is set to be
    ``True`` :ghpull:`13566`.
 
- - No popup in window for latex generation w hen generating latex (e.g. via
+ - No popup in window for latex generation when generating latex (e.g. via
    `_latex_repr_`) no popup window is shows under Windows. :ghpull:`13679`
 
  - Fixed error raised when attempting to tab-complete an input string with
@@ -317,12 +317,12 @@ IPython 8.3.0
 
 
  - :ghpull:`13600`, ``pre_run_*``-hooks will now have a ``cell_id`` attribute on
-   the info object when frontend provide it. This has been backported to 7.33
+   the info object when frontend provides it. This has been backported to 7.33
 
  - :ghpull:`13624`, fixed :kbd:`End` key being broken after accepting an
    auto-suggestion.
 
- - :ghpull:`13657` fix issue where history from different sessions would be mixed.
+ - :ghpull:`13657` fixed an issue where history from different sessions would be mixed.
 
 .. _version 8.2.0:
 
@@ -340,8 +340,8 @@ IPython 8.2 mostly bring bugfixes to IPython.
  - Fixes to ``ultratb`` ipdb support when used outside of IPython. :ghpull:`13498`
 
 
-I am still trying to fix and investigate :ghissue:`13598`, which seem to be
-random, and would appreciate help if you find  reproducible minimal case. I've
+I am still trying to fix and investigate :ghissue:`13598`, which seems to be
+random, and would appreciate help if you find a reproducible minimal case. I've
 tried to make various changes to the codebase to mitigate it, but a proper fix
 will be difficult without understanding the cause.
 
@@ -370,7 +370,7 @@ IPython 8.1.0
 -------------
 
 IPython 8.1 is the first minor release after 8.0 and fixes a number of bugs and
-Update a few behavior that were problematic with the 8.0 as with many new major
+updates a few behaviors that were problematic with the 8.0 as with many new major
 release.
 
 Note that beyond the changes listed here, IPython 8.1.0 also contains all the
@@ -421,8 +421,8 @@ We want to remind users that IPython is part of the Jupyter organisations, and
 thus governed by a Code of Conduct. Some of the behavior we have seen on GitHub is not acceptable.
 Abuse and non-respectful comments on discussion will not be tolerated.
 
-Many thanks to all the contributors to this release, many of the above fixed issue and
-new features where done by first time contributors, showing there is still
+Many thanks to all the contributors to this release, many of the above fixed issues and
+new features were done by first time contributors, showing there is still
 plenty of easy contribution possible in IPython
 . You can find all individual contributions
 to this milestone `on github <https://github.com/ipython/ipython/milestone/91>`__.
@@ -483,7 +483,7 @@ IPython 8.0
 
 IPython 8.0 is bringing a large number of new features and improvements to both the
 user of the terminal and of the kernel via Jupyter. The removal of compatibility
-with older version of Python is also the opportunity to do a couple of
+with an older version of Python is also the opportunity to do a couple of
 performance improvements in particular with respect to startup time.
 The 8.x branch started diverging from its predecessor around IPython 7.12
 (January 2020).
@@ -492,7 +492,7 @@ This release contains 250+ pull requests, in addition to many of the features
 and backports that have made it to the 7.x branch. Please see the
 `8.0 milestone <https://github.com/ipython/ipython/milestone/73?closed=1>`__ for the full list of pull requests.
 
-Please feel free to send pull requests to updates those notes after release,
+Please feel free to send pull requests to update those notes after release,
 I have likely forgotten a few things reviewing 250+ PRs.
 
 Dependencies changes/downstream packaging
@@ -507,8 +507,8 @@ looking for help to do so.
  - minimal Python is now 3.8
  - ``nose`` is not a testing requirement anymore
  - ``pytest`` replaces nose.
- - ``iptest``/``iptest3`` cli entrypoints do not exists anymore.
- - minimum officially support ``numpy`` version has been bumped, but this should
+ - ``iptest``/``iptest3`` cli entrypoints do not exist anymore.
+ - the minimum officially ​supported ``numpy`` version has been bumped, but this should
    not have much effect on packaging.
 
 

From b7e181e25bc69705e43ad31ebce29af432562b4a Mon Sep 17 00:00:00 2001
From: Roy Reznik <royreznik@gmail.com>
Date: Sat, 4 Feb 2023 12:16:21 +0200
Subject: [PATCH 1395/1407] Fix bug when network map is disconnected

---
 IPython/core/logger.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/IPython/core/logger.py b/IPython/core/logger.py
index e3cb233cfa4..99e7ce29185 100644
--- a/IPython/core/logger.py
+++ b/IPython/core/logger.py
@@ -198,7 +198,16 @@ def log_write(self, data, kind='input'):
                 odata = u'\n'.join([u'#[Out]# %s' % s
                                    for s in data.splitlines()])
                 write(u'%s\n' % odata)
-            self.logfile.flush()
+            try:
+                self.logfile.flush()
+            except OSError:
+                print("Failed to flush the log file.")
+                print(
+                    f"Please check that {self.logfname} exists and have the right permissions."
+                )
+                print(
+                    "Also consider turning off the log with `%logstop` to avoid this warning."
+                )
 
     def logstop(self):
         """Fully stop logging and close log file.

From 329cf64882318c12d9e053c69420e9ff33df3dd3 Mon Sep 17 00:00:00 2001
From: Antony Lee <anntzer.lee@gmail.com>
Date: Sun, 5 Feb 2023 15:33:57 +0100
Subject: [PATCH 1396/1407] Adjust %matplotlib docstring re: matplotlib_inline.

set_matplotlib_formats and set_matplotlib_close have been deprecated in
IPython.display and moved out to matplotlib_inline.backend_inline;
adjust the docstring of the %matplotlib magic accordingly.
---
 IPython/core/magics/pylab.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/core/magics/pylab.py b/IPython/core/magics/pylab.py
index 0f3fff62faf..2a69453ac98 100644
--- a/IPython/core/magics/pylab.py
+++ b/IPython/core/magics/pylab.py
@@ -54,7 +54,7 @@ def matplotlib(self, line=''):
         If you are using the inline matplotlib backend in the IPython Notebook
         you can set which figure formats are enabled using the following::
 
-            In [1]: from IPython.display import set_matplotlib_formats
+            In [1]: from matplotlib_inline.backend_inline import set_matplotlib_formats
 
             In [2]: set_matplotlib_formats('pdf', 'svg')
 
@@ -65,9 +65,9 @@ def matplotlib(self, line=''):
 
             In [3]: %config InlineBackend.print_figure_kwargs = {'bbox_inches':None}
 
-        In addition, see the docstring of
-        `IPython.display.set_matplotlib_formats` and
-        `IPython.display.set_matplotlib_close` for more information on
+        In addition, see the docstrings of
+        `matplotlib_inline.backend_inline.set_matplotlib_formats` and
+        `matplotlib_inline.backend_inline.set_matplotlib_close` for more information on
         changing additional behaviors of the inline backend.
 
         Examples

From 3d033f3d481901482622c503f89cb3494e6b3888 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sun, 5 Feb 2023 22:59:24 +0000
Subject: [PATCH 1397/1407] Ignore ipynb_checkpoints

---
 docs/source/conf.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 868c0d0e346..325b3ed008f 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -183,8 +183,7 @@ def filter(self, record):
 
 # Exclude these glob-style patterns when looking for source files. They are
 # relative to the source/ directory.
-exclude_patterns = []
-
+exclude_patterns = ["**.ipynb_checkpoints"]
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 #add_function_parentheses = True

From ff322633df84175b35e80183f99f3a92381f54cb Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 6 Feb 2023 10:18:17 +0100
Subject: [PATCH 1398/1407] NEP 29, bump min numpy version

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index d196214d19a..3b796958a8f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -79,7 +79,7 @@ test_extra =
     curio
     matplotlib!=3.2.0
     nbformat
-    numpy>=1.20
+    numpy>=1.21
     pandas
     trio
 all =

From 991849c247fc208628879e7ca2923b3c218a5a75 Mon Sep 17 00:00:00 2001
From: Konstantin Weddige <konstantin.weddige@lutrasecurity.com>
Date: Sat, 3 Dec 2022 19:14:09 +0100
Subject: [PATCH 1399/1407] Fix CVE-2023-24816 by removing legacy code.

Remove legacy code that might trigger a CVE.

Currently set_term_title is only called with (semi-)trusted input that
contain the current working directory of the current IPython session. If
an attacker can control directory names, and manage to get a user cd
into this directory the attacker can execute arbitrary commands
contained in the folder names.

Example:

    - On a windows machine where python is built without _ctypes, create
      a folder called && echo "pwn" > pwn.txt. This can be done by for
      example cloning a git repository.
    - call toggled_set_term_title(True), (or have the preference to
      true)
    - Open IPython and cd into this directory.
    - the folder now contain a pwn.txt, with pwn as content, despite the
      user not asking for any code execution.

Workaround:

    Set the configuration option
    c.TerminalInteractiveShell.term_title_format='IPython' (or to any
    other fixed, safe string).
---
 IPython/__init__.py               |  2 +-
 IPython/utils/terminal.py         | 32 ++++++++-----------------------
 docs/source/whatsnew/version8.rst | 12 ++++++++++++
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/IPython/__init__.py b/IPython/__init__.py
index c224f9a8c90..7d3799ab363 100644
--- a/IPython/__init__.py
+++ b/IPython/__init__.py
@@ -63,7 +63,7 @@
 version_info = release.version_info
 # list of CVEs that should have been patched in this release.
 # this is informational and should not be relied upon.
-__patched_cves__ = {"CVE-2022-21699"}
+__patched_cves__ = {"CVE-2022-21699", "CVE-2023-24816"}
 
 
 def embed_kernel(module=None, local_ns=None, **kwargs):
diff --git a/IPython/utils/terminal.py b/IPython/utils/terminal.py
index 161a9ae6042..b09cfe0d22d 100644
--- a/IPython/utils/terminal.py
+++ b/IPython/utils/terminal.py
@@ -91,30 +91,14 @@ def _restore_term_title_xterm():
         _set_term_title = _set_term_title_xterm
         _restore_term_title = _restore_term_title_xterm
 elif sys.platform == 'win32':
-    try:
-        import ctypes
-
-        SetConsoleTitleW = ctypes.windll.kernel32.SetConsoleTitleW
-        SetConsoleTitleW.argtypes = [ctypes.c_wchar_p]
-    
-        def _set_term_title(title):
-            """Set terminal title using ctypes to access the Win32 APIs."""
-            SetConsoleTitleW(title)
-    except ImportError:
-        def _set_term_title(title):
-            """Set terminal title using the 'title' command."""
-            global ignore_termtitle
-
-            try:
-                # Cannot be on network share when issuing system commands
-                curr = os.getcwd()
-                os.chdir("C:")
-                ret = os.system("title " + title)
-            finally:
-                os.chdir(curr)
-            if ret:
-                # non-zero return code signals error, don't try again
-                ignore_termtitle = True
+    import ctypes
+
+    SetConsoleTitleW = ctypes.windll.kernel32.SetConsoleTitleW
+    SetConsoleTitleW.argtypes = [ctypes.c_wchar_p]
+
+    def _set_term_title(title):
+        """Set terminal title using ctypes to access the Win32 APIs."""
+        SetConsoleTitleW(title)
 
 
 def set_term_title(title):
diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 2f743ea8fff..50f1af61beb 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -2,6 +2,18 @@
  8.x Series
 ============
 
+
+IPython 8.9.1
+-------------
+
+Out of schedule release of IPython with minor fixes to patch a potential CVE-2023-24816.
+This is a really low severity CVE that you most likely are not affected by unless:
+
+ - You are on windows.
+ - You have a custom build of Python without ``_ctypes``
+ - You cd or start IPython or Jupyter in untrusted directory which names may be valid shell commands.
+
+
 .. _version 8.9.0:
 
 IPython 8.9.0

From eccb95c21ad60e5fa5052e07db2f1a2ffc129ff9 Mon Sep 17 00:00:00 2001
From: Yann Pellegrini <mail@yann-p.fr>
Date: Tue, 7 Feb 2023 17:37:40 +0100
Subject: [PATCH 1400/1407] Replace usage of os.devnull with subprocess.DEVNULL

---
 IPython/lib/latextools.py | 63 +++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py
index 693060ba55c..f2aa5728844 100644
--- a/IPython/lib/latextools.py
+++ b/IPython/lib/latextools.py
@@ -160,38 +160,37 @@ def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):
         with workdir.joinpath(tmpfile).open("w", encoding="utf8") as f:
             f.writelines(genelatex(s, wrap))
 
-        with open(os.devnull, 'wb') as devnull:
-            subprocess.check_call(
-                ["latex", "-halt-on-error", "-interaction", "batchmode", tmpfile],
-                cwd=workdir,
-                stdout=devnull,
-                stderr=devnull,
-                startupinfo=startupinfo,
-            )
-
-            resolution = round(150*scale)
-            subprocess.check_call(
-                [
-                    "dvipng",
-                    "-T",
-                    "tight",
-                    "-D",
-                    str(resolution),
-                    "-z",
-                    "9",
-                    "-bg",
-                    "Transparent",
-                    "-o",
-                    outfile,
-                    dvifile,
-                    "-fg",
-                    color,
-                ],
-                cwd=workdir,
-                stdout=devnull,
-                stderr=devnull,
-                startupinfo=startupinfo,
-            )
+        subprocess.check_call(
+            ["latex", "-halt-on-error", "-interaction", "batchmode", tmpfile],
+            cwd=workdir,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            startupinfo=startupinfo,
+        )
+
+        resolution = round(150 * scale)
+        subprocess.check_call(
+            [
+                "dvipng",
+                "-T",
+                "tight",
+                "-D",
+                str(resolution),
+                "-z",
+                "9",
+                "-bg",
+                "Transparent",
+                "-o",
+                outfile,
+                dvifile,
+                "-fg",
+                color,
+            ],
+            cwd=workdir,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            startupinfo=startupinfo,
+        )
 
         with workdir.joinpath(outfile).open("rb") as f:
             return f.read()

From 33fde8415bea3e744daa75578406a7b8b393f367 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 7 Feb 2023 14:44:24 +0100
Subject: [PATCH 1401/1407] MAINT: fix typing mypy 1.0

---
 IPython/core/guarded_eval.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/guarded_eval.py b/IPython/core/guarded_eval.py
index d60a5c5f1e3..3c95213734a 100644
--- a/IPython/core/guarded_eval.py
+++ b/IPython/core/guarded_eval.py
@@ -609,8 +609,8 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
 
 BUILTIN_GETITEM: Set[InstancesHaveGetItem] = {
     dict,
-    str,
-    bytes,
+    str,  # type: ignore[arg-type]
+    bytes,  # type: ignore[arg-type]
     list,
     tuple,
     collections.defaultdict,
@@ -619,7 +619,7 @@ def eval_node(node: Union[ast.AST, None], context: EvaluationContext):
     collections.ChainMap,
     collections.UserDict,
     collections.UserList,
-    collections.UserString,
+    collections.UserString,  # type: ignore[arg-type]
     _DummyNamedTuple,
     _IdentitySubscript,
 }

From fd34cf5f1f6e243243c738c6e0cf62eb682c4d68 Mon Sep 17 00:00:00 2001
From: Jacob Evan Shreve <shreve@umich.edu>
Date: Tue, 7 Feb 2023 23:36:52 -0500
Subject: [PATCH 1402/1407] Swallow potential exceptions from showtraceback()

The nbgrader project is aware of a form of cheating where students
disrupt `InteractiveShell.showtraceback` in hopes of hiding exceptions
to avoid losing points. They have implemented a solution to prevent this
cheating from working on the client side, and have some tests to
demonstrate this technique:

https://github.com/jupyter/nbgrader/blob/main/nbgrader/tests/apps/files/submitted-cheat-attempt.ipynb
https://github.com/jupyter/nbgrader/blob/main/nbgrader/tests/apps/files/submitted-cheat-attempt-alternative.ipynb

In essence, these attacks import the interactive shell and erase the
traceback handler so that their failing tests won't report failures.

    import IPython.core.interactiveshell
    IPython.core.interactiveshell.InteractiveShell.showtraceback = None

The problem is that this causes an exception inside the kernel, leading
to a stalled execution. The kernel has stopped working, but the client
continues to wait for messages. So far, nbgrader's solution to this is
to require a timeout value so the client can eventually decide it is
done. This prevents allowing a value of `None` for `Execute.timeout`
because this would cause a test case to infinitely hang.

This commit addresses the problem by making `InteractiveShell._run_cell`
a little more protective around it's call to `showtraceback()`. There is
already a try/except block around running the cell. This commit adds a
finally clause so that the method will _always_ return an
`ExecutionResult`, even if a new exception is thrown within the except
clause. For the record, the exception thrown is:

    TypeError: 'NoneType' object is not callable

Accepting this change will allow nbgrader to update
`nbgrader.preprocessors.Execute` to support a type of
`Integer(allow_none=True)` as the parent `NotebookClient` intended.

Discussion about this is ongoing in jupyter/nbgrader#1690.
---
 IPython/core/interactiveshell.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 66ceee05dd6..45ed4e23a19 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3013,7 +3013,7 @@ def _run_cell(
             runner = _pseudo_sync_runner
 
         try:
-            return runner(coro)
+            result = runner(coro)
         except BaseException as e:
             info = ExecutionInfo(
                 raw_cell, store_history, silent, shell_futures, cell_id
@@ -3021,6 +3021,7 @@ def _run_cell(
             result = ExecutionResult(info)
             result.error_in_exec = e
             self.showtraceback(running_compiled_code=True)
+        finally:
             return result
 
     def should_run_async(

From c7a9470e540392c575aac46c3ee5cf4fe5123eb1 Mon Sep 17 00:00:00 2001
From: Jacob Evan Shreve <shreve@umich.edu>
Date: Wed, 8 Feb 2023 01:29:06 -0500
Subject: [PATCH 1403/1407] Add some regression tests for this change

---
 IPython/core/tests/test_interactiveshell.py | 40 +++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 982bd5a3b22..3fb9fdf5b5d 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -1110,3 +1110,43 @@ def foo(*args, **kwargs):
 
     # clean up
     ip.Completer.custom_matchers.pop()
+
+
+class TestShowTracebacksAttack(unittest.TestCase):
+    """Test that the interactive shell is resilient against the client attack of
+    manipulating the showtracebacks method. These attacks shouldn't result in an
+    unhandled exception in the kernel."""
+
+    def test_set_show_tracebacks_none(self):
+        """Test the case of the client setting showtracebacks to None"""
+
+        result = ip.run_cell(
+            """
+            import IPython.core.interactiveshell
+            IPython.core.interactiveshell.InteractiveShell.showtraceback = None
+
+            assert False, "This should not raise an exception"
+        """
+        )
+        print(result)
+
+        assert result.result is None
+        assert isinstance(result.error_in_exec, TypeError)
+        assert str(result.error_in_exec) == "'NoneType' object is not callable"
+
+    def test_set_show_tracebacks_noop(self):
+        """Test the case of the client setting showtracebacks to a no op lambda"""
+
+        result = ip.run_cell(
+            """
+            import IPython.core.interactiveshell
+            IPython.core.interactiveshell.InteractiveShell.showtraceback = lambda *args, **kwargs: None
+
+            assert False, "This should not raise an exception"
+        """
+        )
+        print(result)
+
+        assert result.result is None
+        assert isinstance(result.error_in_exec, AssertionError)
+        assert str(result.error_in_exec) == "This should not raise an exception"

From a011765b44febfb11bae122d2ed7db763621ac8f Mon Sep 17 00:00:00 2001
From: Jacob Evan Shreve <shreve@umich.edu>
Date: Wed, 8 Feb 2023 01:50:16 -0500
Subject: [PATCH 1404/1407] Isolate the attack tests with setUp and tearDown
 methods

---
 IPython/core/tests/test_interactiveshell.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 3fb9fdf5b5d..641dcef3cf4 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -1112,11 +1112,17 @@ def foo(*args, **kwargs):
     ip.Completer.custom_matchers.pop()
 
 
-class TestShowTracebacksAttack(unittest.TestCase):
+class TestShowTracebackAttack(unittest.TestCase):
     """Test that the interactive shell is resilient against the client attack of
     manipulating the showtracebacks method. These attacks shouldn't result in an
     unhandled exception in the kernel."""
 
+    def setUp(self):
+        self.orig_showtraceback = interactiveshell.InteractiveShell.showtraceback
+
+    def tearDown(self):
+        interactiveshell.InteractiveShell.showtraceback = self.orig_showtraceback
+
     def test_set_show_tracebacks_none(self):
         """Test the case of the client setting showtracebacks to None"""
 

From 865591252a67c6907fe03228b4053305715286e6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 3 Jan 2023 14:55:37 +0100
Subject: [PATCH 1405/1407] MAINT: mock slowest test.

The slowest test of our CI is ~3sec as it use subprocess os/system.
Mocking make it instantaneous.

With our big elements matrix in CI that should save us a bunch of time
in total from PR submission to green.
---
 IPython/core/tests/test_interactiveshell.py | 31 ++++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 982bd5a3b22..4ad54744145 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -17,6 +17,7 @@
 import sys
 import tempfile
 import unittest
+import pytest
 from unittest import mock
 
 from os.path import join
@@ -635,10 +636,23 @@ def test_control_c(self, *mocks):
             )
         self.assertEqual(ip.user_ns["_exit_code"], -signal.SIGINT)
 
-    def test_magic_warnings(self):
-        for magic_cmd in ("pip", "conda", "cd"):
-            with self.assertWarnsRegex(Warning, "You executed the system command"):
-                ip.system_raw(magic_cmd)
+
+@pytest.mark.parametrize("magic_cmd", ["pip", "conda", "cd"])
+def test_magic_warnings(magic_cmd):
+    if sys.platform == "win32":
+        to_mock = "os.system"
+        expected_arg, expected_kwargs = magic_cmd, dict()
+    else:
+        to_mock = "subprocess.call"
+        expected_arg, expected_kwargs = magic_cmd, dict(
+            shell=True, executable=os.environ.get("SHELL", None)
+        )
+
+    with mock.patch(to_mock, return_value=0) as mock_sub:
+        with pytest.warns(Warning, match=r"You executed the system command"):
+            ip.system_raw(magic_cmd)
+        mock_sub.assert_called_once_with(expected_arg, **expected_kwargs)
+
 
 # TODO: Exit codes are currently ignored on Windows.
 class TestSystemPipedExitCode(ExitCodeChecks):
@@ -1089,9 +1103,12 @@ def test_run_cell_asyncio_run():
 
 
 def test_should_run_async():
-    assert not ip.should_run_async("a = 5")
-    assert ip.should_run_async("await x")
-    assert ip.should_run_async("import asyncio; await asyncio.sleep(1)")
+    assert not ip.should_run_async("a = 5", transformed_cell="a = 5")
+    assert ip.should_run_async("await x", transformed_cell="await x")
+    assert ip.should_run_async(
+        "import asyncio; await asyncio.sleep(1)",
+        transformed_cell="import asyncio; await asyncio.sleep(1)",
+    )
 
 
 def test_set_custom_completer():

From 7557ade0ed927475d5ab5b573d0ea4febfb22683 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Feb 2023 10:31:53 +0100
Subject: [PATCH 1406/1407] DOC: Update what's new for 8.10

---
 docs/source/whatsnew/version8.rst | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/docs/source/whatsnew/version8.rst b/docs/source/whatsnew/version8.rst
index 50f1af61beb..7fecb799d15 100644
--- a/docs/source/whatsnew/version8.rst
+++ b/docs/source/whatsnew/version8.rst
@@ -3,16 +3,41 @@
 ============
 
 
-IPython 8.9.1
--------------
+.. _version 8.10.0:
+   
+IPython 8.10
+------------
 
 Out of schedule release of IPython with minor fixes to patch a potential CVE-2023-24816.
 This is a really low severity CVE that you most likely are not affected by unless:
 
  - You are on windows.
  - You have a custom build of Python without ``_ctypes``
- - You cd or start IPython or Jupyter in untrusted directory which names may be valid shell commands.
+ - You cd or start IPython or Jupyter in untrusted directory which names may be
+   valid shell commands.
+
+You can read more on `the advisory
+<https://github.com/ipython/ipython/security/advisories/GHSA-29gw-9793-fvw7>`__. 
+
+In addition to fixing this CVE we also fix a couple of outstanding bugs and issues.
+
+As usual you can find the full list of PRs on GitHub under `the 8.10 milestone
+<https://github.com/ipython/ipython/milestone/112?closed=1>`__.
+
+In Particular:
+
+ - bump minimum numpy to `>=1.21` version following NEP29. :ghpull:`13930`
+ - fix for compatibility with MyPy 1.0. :ghpull:`13933`
+ - fix nbgrader stalling when IPython's ``showtraceback`` function is
+   monkeypatched. :ghpull:`13934`
+
+
+
+As this release also contains those minimal changes in addition to fixing the
+CVE I decided to bump the minor version anyway.
 
+This will not affect the normal release schedule, so IPython 8.11 is due in
+about 2 weeks.
 
 .. _version 8.9.0:
 

From 15ea1ed5a886d6c19c1cc4856f2cf04a2a547c57 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 10 Feb 2023 10:47:29 +0100
Subject: [PATCH 1407/1407] release 8.10.0

---
 IPython/core/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 3b7dff0f02e..79164040b5a 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,7 +20,7 @@
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "rc1"
-# _version_extra = ""  # Uncomment this for full releases
+_version_extra = ""  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]