From 127b8bf62db3a159293884cb45e6b02c8d0f5ba8 Mon Sep 17 00:00:00 2001
From: Niclas <niclas_hanraths@web.de>
Date: Sun, 10 Mar 2019 21:00:31 +0100
Subject: [PATCH 001/370] allow type of already existing class instances to be
 updated

---
 IPython/extensions/autoreload.py | 52 ++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index 4edd3b3a97d..7bb5a5422ab 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -115,6 +115,7 @@
 import traceback
 import types
 import weakref
+import inspect
 from importlib import import_module
 from importlib.util import source_from_cache
 from imp import reload
@@ -267,6 +268,54 @@ def update_function(old, new):
             pass
 
 
+def update_instances(old, new, objects=None):
+    """Iterate through objects recursively, searching for instances of old and
+    replace their __class__ reference with new. If no objects are given, start 
+    with the current ipython workspace.
+    """
+    if not objects:
+        # find ipython workspace stack frame
+        frame = next(frame_nfo.frame for frame_nfo in inspect.stack() 
+                     if 'trigger' in frame_nfo.function)
+        # build generator for non-private variable values from workspace
+        shell = frame.f_locals['self'].shell
+        user_ns = shell.user_ns
+        user_ns_hidden = shell.user_ns_hidden
+        nonmatching = object()
+        objects = ( value for key, value in user_ns.items()
+                if not key.startswith('_') 
+                and (value is not user_ns_hidden.get(key, nonmatching)) 
+                and not inspect.ismodule(value))
+    
+    # use dict values if objects is a dict but don't touch private variables
+    if hasattr(objects, 'items'):
+        objects = (value for key, value in objects.items()
+                       if not str(key).startswith('_')
+                       and not inspect.ismodule(value) )
+
+    # try if objects is iterable
+    try:
+        for obj in objects:
+
+            # update, if object is instance of old_class (but no subclasses)
+            if type(obj) is old:
+                obj.__class__ = new
+                
+
+            # if object is instance of other class, look for nested instances
+            if hasattr(obj, '__dict__') and not (inspect.isfunction(obj)
+                                                 or inspect.ismethod(obj)):
+                update_instances(old, new, obj.__dict__)
+
+            # if object is a container, search it
+            if hasattr(obj, 'items') or (hasattr(obj, '__contains__')
+                                         and not isinstance(obj, str)):
+                update_instances(old, new, obj)
+
+    except TypeError:
+        pass
+
+        
 def update_class(old, new):
     """Replace stuff in the __dict__ of a class, and upgrade
     method code objects, and add new methods, if any"""
@@ -300,6 +349,9 @@ def update_class(old, new):
             except (AttributeError, TypeError):
                 pass # skip non-writable attributes
 
+    # update all instances of class
+    update_instances(old, new)
+
 
 def update_property(old, new):
     """Replace get/set/del functions of a property"""

From f3c5ecdf9d43f46eb51d2d5d159a69bd85376625 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 19 Mar 2019 13:58:00 -0700
Subject: [PATCH 002/370] Try to fix updating classes in Autoreload.

There seem to have been some infinite recursion in the previous version
of the code, so implement a more classical graph finding algorithm.

This should still be properly tested
---
 IPython/extensions/autoreload.py            | 58 ++++++++++++++++++++-
 IPython/extensions/tests/test_autoreload.py |  4 +-
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index 7bb5a5422ab..5bd38b3b2dc 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -268,6 +268,60 @@ def update_function(old, new):
             pass
 
 
+def _find_instances(old_type):
+    """Try to find all instances of a class that need updating.
+
+    Classic graph exploration, we want to avoid re-visiting object multiple times.
+    """
+    # find ipython workspace stack frame, this is just to bootstrap where we
+    # find the object that need updating.
+    frame = next(frame_nfo.frame for frame_nfo in inspect.stack()
+                 if 'trigger' in frame_nfo.function)
+    # build generator for non-private variable values from workspace
+    shell = frame.f_locals['self'].shell
+    user_ns = shell.user_ns
+    user_ns_hidden = shell.user_ns_hidden
+    nonmatching = object()
+    objects = ( value for key, value in user_ns.items()
+            if not key.startswith('_')
+            and (value is not user_ns_hidden.get(key, nonmatching))
+            and not inspect.ismodule(value))
+
+    # note:  in the following we do use dict as object might not be hashable.
+    # list of objects we found that will need an update.
+    to_update = {}
+
+    # list of object we have not recursed into yet
+    open_set = {}
+
+    # list of object we have visited already
+    closed_set = {}
+
+    open_set.update({id(o):o for o in objects})
+
+    it = 0
+    while len(open_set) > 0:
+        it += 1
+        if it > 100_000:
+            raise ValueError('infinite')
+        (current_id,current) =  next(iter(open_set.items()))
+        if type(current) is old_type:
+            to_update[current_id] = current
+        if hasattr(current, '__dict__') and not (inspect.isfunction(current)
+                                                 or inspect.ismethod(current)):
+            potential_new = {id(o):o for o in current.__dict__.values() if id(o) not in closed_set.keys()}
+            open_set.update(potential_new)
+        # if object is a container, search it
+        if hasattr(current, 'items') or (hasattr(current, '__contains__')
+                                         and not isinstance(current, str)):
+            potential_new = (value for key, value in current.items()
+                       if not str(key).startswith('_')
+                       and not inspect.ismodule(value) and not id(value) in closed_set.keys())
+            open_set.update(potential_new)
+        del open_set[id(current)]
+        closed_set[id(current)] = current
+    return to_update.values()
+
 def update_instances(old, new, objects=None):
     """Iterate through objects recursively, searching for instances of old and
     replace their __class__ reference with new. If no objects are given, start 
@@ -319,6 +373,7 @@ def update_instances(old, new, objects=None):
 def update_class(old, new):
     """Replace stuff in the __dict__ of a class, and upgrade
     method code objects, and add new methods, if any"""
+    print('old is', old)
     for key in list(old.__dict__.keys()):
         old_obj = getattr(old, key)
         try:
@@ -350,7 +405,8 @@ def update_class(old, new):
                 pass # skip non-writable attributes
 
     # update all instances of class
-    update_instances(old, new)
+    for instance in _find_instances(old):
+        instance.__class__ = new
 
 
 def update_property(old, new):
diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index 74e01256bda..40d63ffbf8e 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -35,10 +35,12 @@
 
 noop = lambda *a, **kw: None
 
-class FakeShell(object):
+class FakeShell:
 
     def __init__(self):
         self.ns = {}
+        self.user_ns = {}
+        self.user_ns_hidden = {}
         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)

From 386ca8cdde295b91a9106e8f3ecbc4882c7e5e51 Mon Sep 17 00:00:00 2001
From: Akshay Paropkari <paropkari.1@gmail.com>
Date: Thu, 21 Mar 2019 14:16:49 -0700
Subject: [PATCH 003/370] back to development

---
 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 2071cef1ee0..62e260050a8 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 4
+_version_minor = 5
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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 fa4bd6d15087f3881f3e557da2a45849ed621982 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 22 Mar 2019 09:49:17 -0700
Subject: [PATCH 004/370] 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 5efdacaa098..f36634caa70 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -42,7 +42,7 @@ Miscelanious
  - Fix improper acceptation of ``return`` outside of functions. :ghpull:`11641`.
  - Fixed PyQt 5.11 backwards incompatibility causing sip import failure.
    :ghpull:`11613`.
- - Fix Bug where ``type?`` woudl crash IPython. :ghpull:`1608`.
+ - Fix Bug where ``type?`` would crash IPython. :ghpull:`1608`.
  - Allow to apply ``@needs_local_scope`` to cell magics for convenience.
    :ghpull:`11542`.
 

From 560d4dce0a1a7e579ae1c7d2eb5a779e1b4e5b6c Mon Sep 17 00:00:00 2001
From: Nick Tallant <ndtallant@uchicago.edu>
Date: Fri, 22 Mar 2019 21:00:09 -0500
Subject: [PATCH 005/370] Verbose error message when displaying an Image with a
 data path that does not exist

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

diff --git a/IPython/core/display.py b/IPython/core/display.py
index db75659e97d..22cfaebd643 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -1250,7 +1250,11 @@ def _repr_mimebundle_(self, include=None, exclude=None):
 
     def _data_and_metadata(self, always_both=False):
         """shortcut for returning metadata with shape information, if defined"""
-        b64_data = b2a_base64(self.data).decode('ascii')
+        try:
+            b64_data = b2a_base64(self.data).decode('ascii')
+        except TypeError:
+            raise FileNotFoundError(
+                "No such file or directory: '%s'" % (self.data))
         md = {}
         if self.metadata:
             md.update(self.metadata)
@@ -1266,12 +1270,10 @@ def _data_and_metadata(self, always_both=False):
             return b64_data
 
     def _repr_png_(self):
-        if self.embed and self.format == self._FMT_PNG:
-            return self._data_and_metadata()
+        return self._data_and_metadata()
 
     def _repr_jpeg_(self):
-        if self.embed and self.format == self._FMT_JPEG:
-            return self._data_and_metadata()
+        return self._data_and_metadata()
 
     def _find_ext(self, s):
         return s.split('.')[-1].lower()

From c841e6d78a398e81fda89bc5ddc661112297c5a0 Mon Sep 17 00:00:00 2001
From: Nick Tallant <ndtallant@uchicago.edu>
Date: Fri, 22 Mar 2019 21:06:19 -0500
Subject: [PATCH 006/370] Restoring two lines I accidentally removed in
 display.py

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

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 22cfaebd643..0957623570a 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -1270,10 +1270,12 @@ def _data_and_metadata(self, always_both=False):
             return b64_data
 
     def _repr_png_(self):
-        return self._data_and_metadata()
+        if self.embed and self.format == self._FMT_PNG:
+            return self._data_and_metadata()
 
     def _repr_jpeg_(self):
-        return self._data_and_metadata()
+        if self.embed and self.format == self._FMT_JPEG:
+            return self._data_and_metadata()
 
     def _find_ext(self, s):
         return s.split('.')[-1].lower()

From d05065c04115748d7aa9cbe5540970147e8c55d4 Mon Sep 17 00:00:00 2001
From: Niclas <niclas_hanraths@web.de>
Date: Mon, 1 Apr 2019 01:13:47 +0200
Subject: [PATCH 007/370] Combined recursive approach with check for already
 visited objects to avoid infinite recursion.

This should pass the already existing autoreload tests, however, new tests for this feature still need to be implemented.
---
 IPython/extensions/autoreload.py | 75 +++++---------------------------
 1 file changed, 12 insertions(+), 63 deletions(-)

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index 5bd38b3b2dc..353124ae855 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -268,66 +268,14 @@ def update_function(old, new):
             pass
 
 
-def _find_instances(old_type):
-    """Try to find all instances of a class that need updating.
-
-    Classic graph exploration, we want to avoid re-visiting object multiple times.
-    """
-    # find ipython workspace stack frame, this is just to bootstrap where we
-    # find the object that need updating.
-    frame = next(frame_nfo.frame for frame_nfo in inspect.stack()
-                 if 'trigger' in frame_nfo.function)
-    # build generator for non-private variable values from workspace
-    shell = frame.f_locals['self'].shell
-    user_ns = shell.user_ns
-    user_ns_hidden = shell.user_ns_hidden
-    nonmatching = object()
-    objects = ( value for key, value in user_ns.items()
-            if not key.startswith('_')
-            and (value is not user_ns_hidden.get(key, nonmatching))
-            and not inspect.ismodule(value))
-
-    # note:  in the following we do use dict as object might not be hashable.
-    # list of objects we found that will need an update.
-    to_update = {}
-
-    # list of object we have not recursed into yet
-    open_set = {}
-
-    # list of object we have visited already
-    closed_set = {}
-
-    open_set.update({id(o):o for o in objects})
-
-    it = 0
-    while len(open_set) > 0:
-        it += 1
-        if it > 100_000:
-            raise ValueError('infinite')
-        (current_id,current) =  next(iter(open_set.items()))
-        if type(current) is old_type:
-            to_update[current_id] = current
-        if hasattr(current, '__dict__') and not (inspect.isfunction(current)
-                                                 or inspect.ismethod(current)):
-            potential_new = {id(o):o for o in current.__dict__.values() if id(o) not in closed_set.keys()}
-            open_set.update(potential_new)
-        # if object is a container, search it
-        if hasattr(current, 'items') or (hasattr(current, '__contains__')
-                                         and not isinstance(current, str)):
-            potential_new = (value for key, value in current.items()
-                       if not str(key).startswith('_')
-                       and not inspect.ismodule(value) and not id(value) in closed_set.keys())
-            open_set.update(potential_new)
-        del open_set[id(current)]
-        closed_set[id(current)] = current
-    return to_update.values()
-
-def update_instances(old, new, objects=None):
+def update_instances(old, new, objects=None, visited={}):
     """Iterate through objects recursively, searching for instances of old and
     replace their __class__ reference with new. If no objects are given, start 
     with the current ipython workspace.
     """
-    if not objects:
+    if objects is None:
+        # make sure visited is cleaned when not called recursively
+        visited = {}
         # find ipython workspace stack frame
         frame = next(frame_nfo.frame for frame_nfo in inspect.stack() 
                      if 'trigger' in frame_nfo.function)
@@ -349,7 +297,9 @@ def update_instances(old, new, objects=None):
 
     # try if objects is iterable
     try:
-        for obj in objects:
+        for obj in (obj for obj in objects if id(obj) not in visited):
+            # add current object to visited to avoid revisiting
+            visited.update({id(obj):obj})
 
             # update, if object is instance of old_class (but no subclasses)
             if type(obj) is old:
@@ -359,21 +309,21 @@ def update_instances(old, new, objects=None):
             # if object is instance of other class, look for nested instances
             if hasattr(obj, '__dict__') and not (inspect.isfunction(obj)
                                                  or inspect.ismethod(obj)):
-                update_instances(old, new, obj.__dict__)
+                update_instances(old, new, obj.__dict__, visited)
 
             # if object is a container, search it
             if hasattr(obj, 'items') or (hasattr(obj, '__contains__')
                                          and not isinstance(obj, str)):
-                update_instances(old, new, obj)
+                update_instances(old, new, obj, visited)
 
     except TypeError:
         pass
 
-        
+
 def update_class(old, new):
     """Replace stuff in the __dict__ of a class, and upgrade
     method code objects, and add new methods, if any"""
-    print('old is', old)
+    print('old is', id(old))
     for key in list(old.__dict__.keys()):
         old_obj = getattr(old, key)
         try:
@@ -405,8 +355,7 @@ def update_class(old, new):
                 pass # skip non-writable attributes
 
     # update all instances of class
-    for instance in _find_instances(old):
-        instance.__class__ = new
+    update_instances(old, new)
 
 
 def update_property(old, new):

From a062bb7bbe4d6826269e474bcd738f629876fed4 Mon Sep 17 00:00:00 2001
From: stef-ubuntu <stef@webempath.com>
Date: Wed, 3 Apr 2019 16:09:44 +0900
Subject: [PATCH 008/370] Add element_id to Audio widget for javascript
 interaction

---
 IPython/lib/display.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index fe66f4f2bf6..6caef9a3278 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -89,7 +89,8 @@ class Audio(DisplayObject):
     """
     _read_flags = 'rb'
 
-    def __init__(self, data=None, filename=None, url=None, embed=None, rate=None, autoplay=False, normalize=True):
+    def __init__(self, data=None, filename=None, url=None, embed=None, rate=None, autoplay=False, normalize=True,
+                 element_id=None):
         if filename is None and url is None and data is None:
             raise ValueError("No audio data found. Expecting filename, url, or data.")
         if embed is False and url is None:
@@ -100,6 +101,7 @@ def __init__(self, data=None, filename=None, url=None, embed=None, rate=None, au
         else:
             self.embed = True
         self.autoplay = autoplay
+        self.element_id = element_id
         super(Audio, self).__init__(data=data, url=url, filename=filename)
 
         if self.data is not None and not isinstance(self.data, bytes):
@@ -198,12 +200,13 @@ def _data_and_metadata(self):
 
     def _repr_html_(self):
         src = """
-                <audio controls="controls" {autoplay}>
+                <audio {element_id} controls="controls" {autoplay}>
                     <source src="{src}" type="{type}" />
                     Your browser does not support the audio element.
                 </audio>
               """
-        return src.format(src=self.src_attr(),type=self.mimetype, autoplay=self.autoplay_attr())
+        return src.format(src=self.src_attr(), type=self.mimetype, autoplay=self.autoplay_attr(),
+                          element_id=self.element_id_attr())
 
     def src_attr(self):
         import base64
@@ -221,6 +224,12 @@ def autoplay_attr(self):
             return 'autoplay="autoplay"'
         else:
             return ''
+    
+    def element_id_attr(self):
+        if (self.element_id):
+            return 'id="{element_id}"'.format(element_id=self.element_id)
+        else:
+            return ''
 
 class IFrame(object):
     """

From 0f57ee4dc0a5c5b831d9920146855a01f7b51212 Mon Sep 17 00:00:00 2001
From: Andreas <akc@apkc.net>
Date: Wed, 3 Apr 2019 15:31:09 -0700
Subject: [PATCH 009/370] Ignored virtualenv folder.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f3141570400..878e58a6e04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ __pycache__
 .vscode
 .pytest_cache
 .python-version
+venv*/

From b9bde81a503633e610544eef3dd47bead31a2832 Mon Sep 17 00:00:00 2001
From: Andreas <akc@apkc.net>
Date: Wed, 3 Apr 2019 15:53:55 -0700
Subject: [PATCH 010/370] Ignored idea folder.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 878e58a6e04..4471ae7e307 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ __pycache__
 .pytest_cache
 .python-version
 venv*/
+.idea/

From 1810073b76c6d91b8ee8c66a251a04d6dd213b6d Mon Sep 17 00:00:00 2001
From: Andreas <akc@apkc.net>
Date: Wed, 3 Apr 2019 23:11:30 -0700
Subject: [PATCH 011/370] Added support to list available object types, to use
 on object type matching in magic function %psearch.

---
 IPython/core/magics/namespace.py | 16 ++++++++++++++--
 IPython/core/oinspect.py         | 10 +++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/IPython/core/magics/namespace.py b/IPython/core/magics/namespace.py
index 7e644cf6c11..6a19e6aba9b 100644
--- a/IPython/core/magics/namespace.py
+++ b/IPython/core/magics/namespace.py
@@ -173,6 +173,9 @@ 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.
 
           'Builtin' contains the python module builtin, 'user' contains all
           user data, 'alias' only contain the shell aliases and no python
@@ -200,6 +203,10 @@ 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
         """
         try:
             parameter_s.encode('ascii')
@@ -211,10 +218,15 @@ def psearch(self, parameter_s=''):
         def_search = ['user_local', 'user_global', 'builtin']
 
         # Process options/args
-        opts,args = self.parse_options(parameter_s,'cias:e:',list_all=True)
+        opts,args = self.parse_options(parameter_s,'cias:e:l',list_all=True)
         opt = opts.get
         shell = self.shell
         psearch = shell.inspector.psearch
+        
+        # select list object types
+        list_types = False
+        if 'l' in opts:
+            list_types = True
 
         # select case options
         if 'i' in opts:
@@ -232,7 +244,7 @@ def psearch(self, parameter_s=''):
         # Call the actual search
         try:
             psearch(args,shell.ns_table,ns_search,
-                    show_all=opt('a'),ignore_case=ignore_case)
+                    show_all=opt('a'),ignore_case=ignore_case, list_types=list_types)
         except:
             shell.showtraceback()
 
diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 3fc2d0f5bf8..b7487e40270 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -35,6 +35,7 @@
 from IPython.utils.path import compress_user
 from IPython.utils.text import indent
 from IPython.utils.wildcard import list_namespace
+from IPython.utils.wildcard import typestr2type
 from IPython.utils.coloransi import TermColors, ColorScheme, ColorSchemeTable
 from IPython.utils.py3compat import cast_unicode
 from IPython.utils.colorable import Colorable
@@ -962,7 +963,7 @@ def _source_contains_docstring(src, doc):
             return False
 
     def psearch(self,pattern,ns_table,ns_search=[],
-                ignore_case=False,show_all=False):
+                ignore_case=False,show_all=False, list_types=False):
         """Search namespaces with wildcards for objects.
 
         Arguments:
@@ -981,6 +982,8 @@ 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
 
@@ -988,6 +991,11 @@ def psearch(self,pattern,ns_table,ns_search=[],
         type_pattern = 'all'
         filter = ''
 
+        # list all object types
+        if list_types:
+            page.page('\n'.join(sorted(typestr2type)))
+            return
+
         cmds = pattern.split()
         len_cmds  =  len(cmds)
         if len_cmds == 1:

From 9c03d28b60b5c7fca753fda86565407f0a0f745e Mon Sep 17 00:00:00 2001
From: Sebastian Witowski <witowski.sebastian@gmail.com>
Date: Mon, 8 Apr 2019 09:08:50 +0200
Subject: [PATCH 012/370] Update StoreMagic docstring on how to remove an alias

---
 IPython/extensions/storemagic.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/extensions/storemagic.py b/IPython/extensions/storemagic.py
index f2e593120c6..dae325afe6a 100644
--- a/IPython/extensions/storemagic.py
+++ b/IPython/extensions/storemagic.py
@@ -112,6 +112,7 @@ def store(self, parameter_s=''):
         python types can be safely %store'd.
 
         Also aliases can be %store'd across sessions.
+        To remove an alias from the storage, use the %unalias magic.
         """
 
         opts,argsl = self.parse_options(parameter_s,'drz',mode='string')

From a03a60dd609444f5edf0d1735ba982e74c2662ab Mon Sep 17 00:00:00 2001
From: Sebastian Witowski <witowski.sebastian@gmail.com>
Date: Thu, 11 Apr 2019 09:20:46 +0200
Subject: [PATCH 013/370] docs: typo fix

---
 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 f58f1006cee..08ac1867437 100644
--- a/docs/source/interactive/reference.rst
+++ b/docs/source/interactive/reference.rst
@@ -698,7 +698,7 @@ your Python programs for this to work (detailed examples follow later)::
     embed() # this call anywhere in your program will start IPython
 
 You can also embed an IPython *kernel*, for use with qtconsole, etc. via
-``IPython.embed_kernel()``. This should function work the same way, but you can
+``IPython.embed_kernel()``. This should work the same way, but you can
 connect an external frontend (``ipython qtconsole`` or ``ipython console``),
 rather than interacting with it in the terminal.
 

From 4ab3299baf0fd35a5ac97460c308c9eb426b08e1 Mon Sep 17 00:00:00 2001
From: Sebastian Witowski <witowski.sebastian@gmail.com>
Date: Fri, 12 Apr 2019 11:01:53 +0200
Subject: [PATCH 014/370] docs: update the aiohttp usage in autoawait.rst

* Updates the documentation in the "Asynchronous in REPL" section, so
the code used there works with aiohttpd version>=2.0.0 (closes #11688).
---
 docs/source/interactive/autoawait.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/source/interactive/autoawait.rst b/docs/source/interactive/autoawait.rst
index 61611dc8e86..f87379d2ca0 100644
--- a/docs/source/interactive/autoawait.rst
+++ b/docs/source/interactive/autoawait.rst
@@ -29,7 +29,8 @@ Python REPL::
     [GCC 4.2.1]
     Type "help", "copyright", "credits" or "license" for more information.
     >>> import aiohttp
-    >>> result = aiohttp.get('https://api.github.com')
+    >>> session = aiohttp.ClientSession()
+    >>> result = session.get('https://api.github.com')
     >>> response = await result
       File "<stdin>", line 1
         response = await result
@@ -43,7 +44,8 @@ Should behave as expected in the IPython REPL::
     IPython 7.0.0 -- An enhanced Interactive Python. Type '?' for help.
 
     In [1]: import aiohttp
-       ...: result = aiohttp.get('https://api.github.com')
+       ...: session = aiohttp.ClientSession()
+       ...: result = session.get('https://api.github.com')
 
     In [2]: response = await result
     <pause for a few 100s ms>

From 64e3b8563e70b28af60f1aa6b2013420207e42d9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 19 Apr 2019 16:22:52 -0700
Subject: [PATCH 015/370] make element_id kwarg only.

---
 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 6caef9a3278..51a638b05aa 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -89,7 +89,7 @@ class Audio(DisplayObject):
     """
     _read_flags = 'rb'
 
-    def __init__(self, data=None, filename=None, url=None, embed=None, rate=None, autoplay=False, normalize=True,
+    def __init__(self, data=None, filename=None, url=None, embed=None, rate=None, autoplay=False, normalize=True, *,
                  element_id=None):
         if filename is None and url is None and data is None:
             raise ValueError("No audio data found. Expecting filename, url, or data.")

From 2b0d146378b532c432d970c64e0fd3fc12627498 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 19 Apr 2019 16:29:55 -0700
Subject: [PATCH 016/370] made list_types kwarg only.

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

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index b7487e40270..749f97959e6 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -963,7 +963,7 @@ def _source_contains_docstring(src, doc):
             return False
 
     def psearch(self,pattern,ns_table,ns_search=[],
-                ignore_case=False,show_all=False, list_types=False):
+                ignore_case=False,show_all=False, *, list_types=False):
         """Search namespaces with wildcards for objects.
 
         Arguments:

From 6a4263bab9f4e8d08b8954ad6be10d8c08d83561 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 22 Apr 2019 16:30:01 -0700
Subject: [PATCH 017/370] Mention the ipywidget's Audio widget.

---
 IPython/lib/display.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index 51a638b05aa..8127e90492c 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -86,6 +86,11 @@ class Audio(DisplayObject):
         Audio(b'RAW_WAV_DATA..)  # From bytes
         Audio(data=b'RAW_WAV_DATA..)
 
+    See Also
+    --------
+    
+    See also the ``Audio`` widgets form the ``ipywidget`` package for more flexibility and options.
+    
     """
     _read_flags = 'rb'
 

From 4f3b0574b572b51422aab6e9ed3d89fec31eaeab Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 22 Apr 2019 17:00:50 -0700
Subject: [PATCH 018/370] Fix applying @needs_global_scope to cell magics.

There was some side effect in some magic to allow passing
needs_local_scope. We know pass the global_scope to cell magice when
using @needs_local_scope, but at the same time this means that we can't
rely on the existance of local_ns from within the magic to know wheter
we are cell-called or line called.

Fixes #11659
---
 IPython/core/interactiveshell.py |  2 +-
 IPython/core/magics/execution.py |  9 ++++-----
 IPython/core/tests/test_magic.py | 10 ++++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index ef572558438..ce8ceb196c8 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2345,7 +2345,7 @@ def run_cell_magic(self, magic_name, line, cell):
                 magic_arg_s = self.var_expand(line, stack_depth)
             kwargs = {}
             if getattr(fn, "needs_local_scope", False):
-                kwargs['local_ns'] = sys._getframe(stack_depth).f_locals
+                kwargs['local_ns'] = self.user_ns
 
             with self.builtin_trap:
                 args = (magic_arg_s, cell)
diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index d58fa3c47d2..510750ea01a 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -1127,8 +1127,8 @@ def timeit(self, line='', cell=None, local_ns=None):
         ns = {}
         glob = self.shell.user_ns
         # handles global vars with same name as local vars. We store them in conflict_globs.
-        if local_ns is not None:
-            conflict_globs = {}
+        conflict_globs = {}
+        if local_ns and cell is None:
             for var_name, var_val in glob.items():
                 if var_name in local_ns:
                     conflict_globs[var_name] = var_val
@@ -1154,9 +1154,8 @@ def timeit(self, line='', cell=None, local_ns=None):
         timeit_result = TimeitResult(number, repeat, best, worst, all_runs, tc, precision)
 
         # Restore global vars from conflict_globs
-        if local_ns is not None:
-            if len(conflict_globs) > 0:
-                glob.update(conflict_globs)
+        if conflict_globs:
+           glob.update(conflict_globs)
                 
         if not quiet :
             # Check best timing is greater than zero to avoid a
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 7914d486ad1..f8ce2388769 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -419,6 +419,16 @@ def test_time3():
                     "run = 0\n"
                     "run += 1")
 
+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']
+
 def test_doctest_mode():
     "Toggle doctest_mode twice, it should be a no-op and run without error"
     _ip.magic('doctest_mode')

From 376391a525037bfc49134135bfe44955e5e0c0ea Mon Sep 17 00:00:00 2001
From: Ivan Tham <pickfire@riseup.net>
Date: Tue, 23 Apr 2019 04:03:57 +0000
Subject: [PATCH 019/370] Add code block

---
 docs/source/interactive/tips.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/source/interactive/tips.rst b/docs/source/interactive/tips.rst
index c6cf3cbcf2d..33436cea24b 100644
--- a/docs/source/interactive/tips.rst
+++ b/docs/source/interactive/tips.rst
@@ -22,12 +22,12 @@ Run doctests
 ------------
 
 Run your doctests from within IPython for development and debugging. The
-special %doctest_mode command toggles a mode where the prompt, output and
+special ``%doctest_mode`` command toggles a mode where the prompt, output and
 exceptions display matches as closely as possible that of the default Python
 interpreter. In addition, this mode allows you to directly paste in code that
 contains leading '>>>' prompts, even if they have extra leading whitespace
-(as is common in doctest files). This combined with the ``%history -t`` call
-to see your translated history allows for an easy doctest workflow, where you
+(as is common in doctest files). This combined with the ``%hist -t`` call to
+see your translated history allows for an easy doctest workflow, where you
 can go from doctest to interactive execution to pasting into valid Python code
 as needed.
 

From f4ba0d151032e152cdb8a79a893bcb19b84db71e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 23 Apr 2019 09:44:40 -0700
Subject: [PATCH 020/370] update Whats New for 7.5

---
 docs/source/whatsnew/development.rst | 30 +---------------------------
 docs/source/whatsnew/version7.rst    | 13 ++++++++++++
 2 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 69869e8f871..532ba742778 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -23,38 +23,10 @@ Need to be updated:
    pr/*
 
 
-Unicode name completions
-========================
-
-Previously, we provided completion for a unicode name with its relative symbol.
-With this, now IPython provides complete suggestions to unicode name symbols.
-
-As on the PR, if user types ``\LAT<tab>``, IPython provides a list of
-possible completions. In this case, it would be something like:
-
-'LATIN CAPITAL LETTER A',
-'LATIN CAPITAL LETTER B',
-'LATIN CAPITAL LETTER C',
-'LATIN CAPITAL LETTER D',
-....
-
-This help to type unicode character that do not have short latex aliases, and
-have long unicode names. for example ``Ͱ``, ``\GREEK CAPITAL LETTER HETA``.
-
-This feature was contributed by Luciana Marques `ghpull:`#11583`.
-
-Make audio normalization optional
-=================================
-
-Added 'normalize' argument to `IPython.display.Audio`. This argument applies
-when audio data is given as an array of samples. The default of `normalize=True`
-preserves prior behavior of normalizing the audio to the maximum possible range.
-Setting to `False` disables normalization.
-
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 
 
 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.
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index f36634caa70..5d0ed63c7a8 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -4,6 +4,19 @@
 
 .. _whatsnew740:
 
+IPython 7.5.0
+=============
+
+IPython 7.5.0 consist mostly of bug-fixes, and documentation updates, with one
+minor new feature. The `Audio` display element can now be assigned an element
+id when displayed in browser. See :ghpull:`11670`
+
+The major outstanding bug fix correct a change of behavior that was introduce
+in 7.4.0 where some cell magics would not be able to access or modify global
+scope when using the ``@needs_local_scope`` decorator. This was typically
+encountered with the ``%%time`` and ``%%timeit`` magics. See :ghissue:`11659`
+and :ghpull:`11698`.
+
 IPython 7.4.0
 =============
 

From e6236ce93410ff5ab4414f633afaa71e2e934609 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 23 Apr 2019 11:53:16 -0700
Subject: [PATCH 021/370] Bring back documentation from old 5.x series

Closes #11661
---
 docs/source/whatsnew/version5.rst | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/docs/source/whatsnew/version5.rst b/docs/source/whatsnew/version5.rst
index 4ca5775748f..4244b3f876b 100644
--- a/docs/source/whatsnew/version5.rst
+++ b/docs/source/whatsnew/version5.rst
@@ -2,6 +2,12 @@
  5.x Series
 ============
 
+.. _whatsnew580
+
+IPython 5.8.0
+=============
+
+* Update inspecting function/methods for future-proofing. :ghpull:`11139`
 
 .. _whatsnew570:
 
@@ -80,8 +86,10 @@ Misc
 You can see all the PR marked for the `5.5. milestone <https://github.com/ipython/ipython/pulls?q=is%3Apr%20milestone%3A5.5%20is%3Aclosed%20NOT%20%22Backport%20PR%22>`_,
 and all the `backport versions <https://github.com/ipython/ipython/pulls?utf8=%E2%9C%93&q=is%3Apr%20milestone%3A5.5%20is%3Aclosed%20%22Backport%20PR%22%20>`_.
 
-
-
+IPython 5.4.1
+=============
+Released a few hours after 5.4, fix a crash when
+``backports.shutil-get-terminal-size`` is not installed. :ghissue:`10629`
 
 .. _whatsnew540:
 
@@ -107,14 +115,13 @@ that allow to customize the class used to start the terminal frontend. This
 should allow user to use custom interfaces, like reviving the former readline
 interface which is now a separate package not maintained by the core team.
 
-
 Define ``_repr_mimebundle_``
 ----------------------------
 
 Object can now define `_repr_mimebundle_` in place of multiple `_repr_*_`
 methods and return a full mimebundle. This greatly simplify many implementation
 and allow to publish custom mimetypes (like geojson, plotly, dataframes....).
-See the ``Custom Display Logic`` example notebook for more information.
+See the ``Custom Display Logic`` example notebook for more informations.
 
 Execution Heuristics
 --------------------
@@ -156,7 +163,7 @@ Miscs
 * Faster shutdown. :ghpull:`10408` 
 * Fix a crash in reverse search. :ghpull:`10371`
 * added ``Completer.backslash_combining_completions`` boolean option to
-  deactivate backslash-tab completion that may conflict with windows path.
+  deactivate backslash-tab completion that may conflict with windows path. 
 
 IPython 5.3
 ===========
@@ -436,5 +443,3 @@ Known Issues:
 
 - Color styles might not adapt to terminal emulator themes. This will need new
   version of Pygments to be released, and can be mitigated with custom themes.
-
-

From 2d68a23879d16cef39004fd8bfa9dc69dfc8ff78 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Wed, 24 Apr 2019 14:48:04 -0700
Subject: [PATCH 022/370] missing :

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

diff --git a/docs/source/whatsnew/version5.rst b/docs/source/whatsnew/version5.rst
index 4244b3f876b..62aea160870 100644
--- a/docs/source/whatsnew/version5.rst
+++ b/docs/source/whatsnew/version5.rst
@@ -2,7 +2,7 @@
  5.x Series
 ============
 
-.. _whatsnew580
+.. _whatsnew580:
 
 IPython 5.8.0
 =============

From 8c47bbcb30a9a3842c8f870dc6610a69f2b06d97 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Wed, 24 Apr 2019 15:18:01 -0700
Subject: [PATCH 023/370] release 7.5.0

---
 IPython/core/release.py                 |  2 +-
 docs/source/whatsnew/github-stats-7.rst | 21 +++++++++++++++++++++
 tools/release_helper.sh                 |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 62e260050a8..803ff843af3 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -24,7 +24,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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]
diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index 98a37e96b83..491c75b6e8a 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -1,6 +1,27 @@
 Issues closed in the 7.x development cycle
 ==========================================
 
+Issues closed in 7.5
+--------------------
+
+GitHub stats for 2019/03/21 - 2019/04/24 (tag: 7.4.0)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 2 issues and merged 9 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A7.5>`__
+
+The following 7 authors contributed 28 commits.
+
+* Akshay Paropkari
+* Benjamin Ragan-Kelley
+* Ivan Tham
+* Matthias Bussonnier
+* Nick Tallant
+* Sebastian Witowski
+* stef-ubuntu
+
+
 Issues closed in 7.4
 --------------------
 
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 3a0aa95e920..55e7b409e77 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -15,7 +15,7 @@ echo "updating what's new with informations from docs/source/whatsnew/pr"
 python tools/update_whatsnew.py
 
 echo
-echo "please move the contents of developents.rst ot version-X.rst"
+echo "please move the contents of "docs/source/whatsnew/development.rst" to version-X.rst"
 echo "Press enter to continue"
 read
 

From f14271fe2b0f9627f64848466de944befc7c29c9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Wed, 24 Apr 2019 15:19:00 -0700
Subject: [PATCH 024/370] back to development

---
 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 803ff843af3..1208a65f8c9 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 5
+_version_minor = 6
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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 c69876f58fbdc5bec01a64c3898f1db406d084c1 Mon Sep 17 00:00:00 2001
From: zzzz-qq <zzzz-qq@outlook.com>
Date: Thu, 18 Apr 2019 20:37:08 +0800
Subject: [PATCH 025/370] Lazy load unicode names

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

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index ad4f9710daa..262a65be038 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -168,12 +168,6 @@
 
 _deprecation_readline_sentinel = object()
 
-names = []
-for c in range(0,0x10FFFF + 1):
-    try:
-        names.append(unicodedata.name(chr(c)))
-    except ValueError:
-        pass
 
 class ProvisionalCompleterWarning(FutureWarning):
     """
@@ -998,6 +992,8 @@ 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"""
@@ -2073,14 +2069,21 @@ 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]:
-        # initial code based on latex_matches() method
+        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:
             s = text[slashpos+1:]
-            candidates = [x for x in names if x.startswith(s)]
+            candidates = [x for x in self._names if x.startswith(s)]
             if candidates:
-                return s, [x for x in names if x.startswith(s)]
+                return s, candidates
             else:
                 return '', ()
         

From 756d0ce8cdc7d7a0b22489a05495434289a0fca1 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Sun, 5 May 2019 10:17:02 -0400
Subject: [PATCH 026/370] draft compat 3.8

---
 IPython/core/compilerop.py       | 12 ++++++++++++
 IPython/core/interactiveshell.py | 15 +++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/IPython/core/compilerop.py b/IPython/core/compilerop.py
index 6a055f93361..c14ac95183d 100644
--- a/IPython/core/compilerop.py
+++ b/IPython/core/compilerop.py
@@ -35,6 +35,7 @@
 import linecache
 import operator
 import time
+from contextlib import contextmanager
 
 #-----------------------------------------------------------------------------
 # Constants
@@ -134,6 +135,17 @@ def cache(self, code, number=0):
         linecache._ipython_cache[name] = entry
         return name
 
+    @contextmanager
+    def extra_flags(self, flags):
+        old_flags = self.flags
+        self.flags = self.flags | flags
+        print('flags', old_flags ,'->', self.flags)
+        try:
+            yield
+        finally:
+            self.flags = old_flags
+
+
 def check_linecache_ipython(*args):
     """Call linecache.checkcache() safely protecting our cached values.
     """
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index ce8ceb196c8..d741b591988 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -210,6 +210,8 @@ def _ast_asyncify(cell:str, wrapper_name:str) -> ast.Module:
     """
 
     from ast import Expr, Await, Return
+    if sys.version_info >= (3,8):
+        return ast.parse(cell)
     tree = ast.parse(_asyncify(cell))
 
     function_def = tree.body[0]
@@ -3194,11 +3196,12 @@ def run_ast_nodes(self, nodelist:ListType[AST], cell_name:str, interactivity='la
         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:
+            if _async and sys.version_info < (3,8):
                 # If interactivity is async the semantics of run_code are
                 # completely different Skip usual machinery.
                 mod = Module(nodelist, [])
@@ -3215,9 +3218,11 @@ def run_ast_nodes(self, nodelist:ListType[AST], cell_name:str, interactivity='la
                         return True
 
                 for i, node in enumerate(to_run_interactive):
+                    print('B: interactive, async=', _async, nodelist)
                     mod = ast.Interactive([node])
-                    code = compiler(mod, cell_name, "single")
-                    if (yield from self.run_code(code, result)):
+                    with compiler.extra_flags(0x2000 if _async else 0x0):
+                        code = compiler(mod, cell_name, "single")
+                    if (yield from self.run_code(code, result, async_=_async)):
                         return True
 
             # Flush softspace
@@ -3288,10 +3293,12 @@ def run_code(self, code_obj, result=None, *, async_=False):
         try:
             try:
                 self.hooks.pre_run_code_hook()
-                if async_:
+                if async_ and sys.version_info < (3,8):
                     last_expr = (yield from self._async_exec(code_obj, self.user_ns))
                     code = compile('last_expr', 'fake', "single")
                     exec(code, {'last_expr': last_expr})
+                elif async_ :
+                    res = yield from eval(code_obj, self.user_ns)
                 else:
                     exec(code_obj, self.user_global_ns, self.user_ns)
             finally:

From 6db4fa691474c9de782bbea51a464e54bceffb53 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Sun, 5 May 2019 11:12:13 -0400
Subject: [PATCH 027/370] work, cleanup

---
 IPython/core/compilerop.py       |  1 -
 IPython/core/interactiveshell.py | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/IPython/core/compilerop.py b/IPython/core/compilerop.py
index c14ac95183d..a8037ea509e 100644
--- a/IPython/core/compilerop.py
+++ b/IPython/core/compilerop.py
@@ -139,7 +139,6 @@ def cache(self, code, number=0):
     def extra_flags(self, flags):
         old_flags = self.flags
         self.flags = self.flags | flags
-        print('flags', old_flags ,'->', self.flags)
         try:
             yield
         finally:
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index d741b591988..f51a4acb2a8 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3202,6 +3202,7 @@ def run_ast_nodes(self, nodelist:ListType[AST], cell_name:str, interactivity='la
             raise ValueError("Interactivity was %r" % interactivity)
         try:
             if _async and sys.version_info < (3,8):
+                raise ValueError
                 # If interactivity is async the semantics of run_code are
                 # completely different Skip usual machinery.
                 mod = Module(nodelist, [])
@@ -3211,18 +3212,26 @@ def run_ast_nodes(self, nodelist:ListType[AST], cell_name:str, interactivity='la
                 if (yield from self.run_code(async_code, result, async_=True)):
                     return True
             else:
+                def compare(code):
+                    import inspect
+                    is_async = (inspect.CO_COROUTINE & code.co_flags == inspect.CO_COROUTINE)
+                    print('async=', _async, 'autodetect=', is_async)
+                    return is_async
                 for i, node in enumerate(to_run_exec):
                     mod = Module([node], [])
                     code = compiler(mod, cell_name, "exec")
+                    compare(code)
                     if (yield from self.run_code(code, result)):
                         return True
 
                 for i, node in enumerate(to_run_interactive):
                     print('B: interactive, async=', _async, nodelist)
                     mod = ast.Interactive([node])
-                    with compiler.extra_flags(0x2000 if _async else 0x0):
+                    with compiler.extra_flags(ast.ast.PyCF_ALLOW_TOP_LEVEL_AWAIT if _async else 0x0):
                         code = compiler(mod, cell_name, "single")
-                    if (yield from self.run_code(code, result, async_=_async)):
+                        asy = compare(code)
+
+                    if (yield from self.run_code(code, result, async_=asy)):
                         return True
 
             # Flush softspace
@@ -3298,7 +3307,7 @@ def run_code(self, code_obj, result=None, *, async_=False):
                     code = compile('last_expr', 'fake', "single")
                     exec(code, {'last_expr': last_expr})
                 elif async_ :
-                    res = yield from eval(code_obj, self.user_ns)
+                    yield from eval(code_obj, self.user_global_ns, self.user_ns)
                 else:
                     exec(code_obj, self.user_global_ns, self.user_ns)
             finally:

From 8d2fb55d27a149516d5d7e1dc36223f1c1a806ee Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Sun, 5 May 2019 11:18:51 -0400
Subject: [PATCH 028/370] dont rely on other parsing

---
 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 f51a4acb2a8..4de02333594 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3227,7 +3227,7 @@ def compare(code):
                 for i, node in enumerate(to_run_interactive):
                     print('B: interactive, async=', _async, nodelist)
                     mod = ast.Interactive([node])
-                    with compiler.extra_flags(ast.ast.PyCF_ALLOW_TOP_LEVEL_AWAIT if _async else 0x0):
+                    with compiler.extra_flags(ast.PyCF_ALLOW_TOP_LEVEL_AWAIT if self.autoawait else 0x0):
                         code = compiler(mod, cell_name, "single")
                         asy = compare(code)
 

From f1dac1e1cdbe058f1382289de978331b1bedcc83 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Sun, 5 May 2019 11:31:36 -0400
Subject: [PATCH 029/370] workign async with

---
 IPython/core/async_helpers.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/IPython/core/async_helpers.py b/IPython/core/async_helpers.py
index 46d2147fd08..13de7b07c84 100644
--- a/IPython/core/async_helpers.py
+++ b/IPython/core/async_helpers.py
@@ -13,6 +13,7 @@
 
 import ast
 import sys
+import inspect
 from textwrap import dedent, indent
 
 
@@ -98,6 +99,8 @@ class _AsyncSyntaxErrorVisitor(ast.NodeVisitor):
     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__()
 
@@ -150,9 +153,11 @@ def _should_be_async(cell: str) -> bool:
     try:
         # we can't limit ourself to ast.parse, as it __accepts__ to parse on
         # 3.7+, but just does not _compile_
-        compile(cell, "<>", "exec")
-        return False
+        code = compile(cell, "<>", "exec", flags=ast.PyCF_ALLOW_TOP_LEVEL_AWAIT)
+        return inspect.CO_COROUTINE & code.co_flags == inspect.CO_COROUTINE
     except SyntaxError:
+        #if sys.version_info > (3, 8):
+        #    raise
         try:
             parse_tree = _async_parse_cell(cell)
 

From b2d2ca21b3514f2bd5d0bbd0f942dc77353ef2ac Mon Sep 17 00:00:00 2001
From: Piers Titus van der Torren <pierstitus@gmail.com>
Date: Mon, 6 May 2019 02:04:07 +0200
Subject: [PATCH 030/370] Fix UnicodeEncodeError and crash. Fixes #11706

---
 IPython/core/displayhook.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/IPython/core/displayhook.py b/IPython/core/displayhook.py
index d6d3be20cdf..6839b6a95ff 100644
--- a/IPython/core/displayhook.py
+++ b/IPython/core/displayhook.py
@@ -187,7 +187,12 @@ def write_format_data(self, format_dict, md_dict=None):
                 # But avoid extraneous empty lines.
                 result_repr = '\n' + result_repr
 
-        print(result_repr)
+        try:
+            print(result_repr)
+        except UnicodeEncodeError:
+            # If a character is not supported by the terminal encoding replace
+            # it with its \u or \x representation
+            print(result_repr.encode(sys.stdout.encoding,'backslashreplace').decode(sys.stdout.encoding))
 
     def update_user_ns(self, result):
         """Update user_ns with various things like _, __, _1, etc."""

From 3e12a7886f1d6adbf07cdacfb9419aca38d76bf2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Mon, 6 May 2019 20:11:28 -0700
Subject: [PATCH 031/370] more work

---
 IPython/core/async_helpers.py    |  3 ++-
 IPython/core/interactiveshell.py | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/IPython/core/async_helpers.py b/IPython/core/async_helpers.py
index 13de7b07c84..187666f61ea 100644
--- a/IPython/core/async_helpers.py
+++ b/IPython/core/async_helpers.py
@@ -153,7 +153,8 @@ def _should_be_async(cell: str) -> bool:
     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", flags=ast.PyCF_ALLOW_TOP_LEVEL_AWAIT)
+        # code = compile(cell, "<>", "exec", flags=getattr(ast,'PyCF_ALLOW_TOP_LEVEL_AWAIT', 0x0))
+        code = compile(cell, "<>", "exec")
         return inspect.CO_COROUTINE & code.co_flags == inspect.CO_COROUTINE
     except SyntaxError:
         #if sys.version_info > (3, 8):
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 4de02333594..01310d27496 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3045,7 +3045,8 @@ def error_before_exec(value):
                 # Execute the user code
                 interactivity = "none" if silent else self.ast_node_interactivity
                 if _run_async:
-                    interactivity = 'async'
+                    print(interactivity)
+                    interactivity = 'last_expr'
 
                 has_raised = yield from self.run_ast_nodes(code_ast.body, cell_name,
                        interactivity=interactivity, compiler=compiler, result=result)
@@ -3167,6 +3168,9 @@ def run_ast_nodes(self, nodelist:ListType[AST], cell_name:str, interactivity='la
         """
         if not nodelist:
             return
+        if interactivity == 'async':
+            interactivify = 'last'
+
         if interactivity == 'last_expr_or_assign':
             if isinstance(nodelist[-1], _assign_nodes):
                 asg = nodelist[-1]
@@ -3200,6 +3204,8 @@ def run_ast_nodes(self, nodelist:ListType[AST], cell_name:str, interactivity='la
             _async = True
         else:
             raise ValueError("Interactivity was %r" % interactivity)
+
+        print('interactivity:', interactivity)
         try:
             if _async and sys.version_info < (3,8):
                 raise ValueError
@@ -3217,17 +3223,20 @@ def compare(code):
                     is_async = (inspect.CO_COROUTINE & code.co_flags == inspect.CO_COROUTINE)
                     print('async=', _async, 'autodetect=', is_async)
                     return is_async
+
+                # refactor that to just change the mod constructor.
                 for i, node in enumerate(to_run_exec):
                     mod = Module([node], [])
-                    code = compiler(mod, cell_name, "exec")
-                    compare(code)
-                    if (yield from self.run_code(code, result)):
+                    with compiler.extra_flags(getattr(ast, 'PyCF_ALLOW_TOP_LEVEL_AWAIT', 0x0) if self.autoawait else 0x0):
+                        code = compiler(mod, cell_name, "exec")
+                        asy = compare(code)
+                    if (yield from self.run_code(code, result,  async_=asy)):
                         return True
 
                 for i, node in enumerate(to_run_interactive):
                     print('B: interactive, async=', _async, nodelist)
                     mod = ast.Interactive([node])
-                    with compiler.extra_flags(ast.PyCF_ALLOW_TOP_LEVEL_AWAIT 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, "single")
                         asy = compare(code)
 

From ded0fb172c89c4532b4d9c168b588a1a890d5d4b Mon Sep 17 00:00:00 2001
From: Robin Gustafsson <robin@rgson.se>
Date: Sat, 11 May 2019 00:05:19 +0200
Subject: [PATCH 032/370] Remove leading empty lines

When running a cell, the leading indentation on the first line is
removed from all of the cell's lines. This causes indentation errors
on subsequent lines in case the first line consists entirely of
whitespace matching a valid level of indentation that is greater than
the least indented line.

This change avoids the issue by first removing any leading,
whitespace-only lines.

Closes #11594
---
 IPython/core/inputtransformer2.py             | 14 ++++++++++
 .../core/tests/test_inputtransformer2_line.py | 28 +++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index 0bf22a138d3..04f423274da 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -18,6 +18,19 @@
 
 _indent_re = re.compile(r'^[ \t]+')
 
+def leading_empty_lines(lines):
+    """Remove leading empty lines
+
+    If the leading lines are empty or contain only whitespace, they will be
+    removed.
+    """
+    if not lines:
+        return lines
+    for i, line in enumerate(lines):
+        if line and not line.isspace():
+            return lines[i:]
+    return lines
+
 def leading_indent(lines):
     """Remove leading indentation.
 
@@ -510,6 +523,7 @@ class TransformerManager:
     """
     def __init__(self):
         self.cleanup_transforms = [
+            leading_empty_lines,
             leading_indent,
             classic_prompt,
             ipython_prompt,
diff --git a/IPython/core/tests/test_inputtransformer2_line.py b/IPython/core/tests/test_inputtransformer2_line.py
index 13a18d2d537..102f4497660 100644
--- a/IPython/core/tests/test_inputtransformer2_line.py
+++ b/IPython/core/tests/test_inputtransformer2_line.py
@@ -86,3 +86,31 @@ def test_leading_indent():
     for sample, expected in [INDENT_SPACES, INDENT_TABS]:
         nt.assert_equal(ipt2.leading_indent(sample.splitlines(keepends=True)),
                         expected.splitlines(keepends=True))
+
+LEADING_EMPTY_LINES = ("""\
+    \t
+
+if True:
+    a = 3
+
+b = 4
+""", """\
+if True:
+    a = 3
+
+b = 4
+""")
+
+ONLY_EMPTY_LINES = ("""\
+    \t
+
+""", """\
+    \t
+
+""")
+
+def leading_empty_lines():
+    for sample, expected in [LEADING_EMPTY_LINES, ONLY_EMPTY_LINES]:
+        nt.assert_equal(
+                ipt2.leading_empty_lines(sample.splitlines(keepends=True)),
+                expected.splitlines(keepends=True))

From 248128dfaabb33e922b1e36a298fd7ec0c730069 Mon Sep 17 00:00:00 2001
From: stonebig <stonebig34@gmail.com>
Date: Sat, 11 May 2019 14:19:20 +0200
Subject: [PATCH 033/370] Python-3.8 PEP570 positional only argument

---
 IPython/core/interactiveshell.py | 54 ++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index ce8ceb196c8..8cc89e41927 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -138,23 +138,43 @@ def removed_co_newlocals(function:types.FunctionType) -> types.FunctionType:
     from types import CodeType, FunctionType
     CO_NEWLOCALS = 0x0002
     code = function.__code__
-    new_code = CodeType(
-        code.co_argcount, 
-        code.co_kwonlyargcount,
-        code.co_nlocals, 
-        code.co_stacksize, 
-        code.co_flags & ~CO_NEWLOCALS,
-        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
-    )
+    if sys.version_info > (3,8):
+        new_code = CodeType(
+            code.co_argcount,
+            code.co_posonlyargcount, # Python-3.8 PEP570 positional only argument
+            code.co_kwonlyargcount,
+            code.co_nlocals, 
+            code.co_stacksize, 
+            code.co_flags & ~CO_NEWLOCALS,
+            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
+        )
+    else:
+        new_code = CodeType(
+            code.co_argcount,
+            code.co_kwonlyargcount,
+            code.co_nlocals, 
+            code.co_stacksize, 
+            code.co_flags & ~CO_NEWLOCALS,
+            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__)
 
 

From 3b160421894ef3495781a6d76fe0edd0fe44ea2d Mon Sep 17 00:00:00 2001
From: stonebig <stonebig34@gmail.com>
Date: Sat, 11 May 2019 14:31:54 +0200
Subject: [PATCH 034/370] be more precise : >3.8.0a3

---
 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 8cc89e41927..c102b2352d2 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -138,7 +138,7 @@ def removed_co_newlocals(function:types.FunctionType) -> types.FunctionType:
     from types import CodeType, FunctionType
     CO_NEWLOCALS = 0x0002
     code = function.__code__
-    if sys.version_info > (3,8):
+    if sys.version_info > (3, 8, 0, 'alpha', 3):
         new_code = CodeType(
             code.co_argcount,
             code.co_posonlyargcount, # Python-3.8 PEP570 positional only argument

From e1b53e9ef91a43b9e275bb9e48b4253218375d87 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 12 May 2019 09:05:11 -0700
Subject: [PATCH 035/370] Properly don't require numpy to run tests.

Import explicitly instead of *-import to make sure we do not use
non-mocked features.

And skip tests that would actually require numpy.

Make it easier to test on nightly when numpy is hard to build.

Closes #11709
---
 IPython/core/tests/test_completer.py    |  4 ++--
 IPython/core/tests/test_run.py          |  2 +-
 IPython/external/decorators/__init__.py |  6 ++----
 IPython/lib/tests/test_display.py       | 15 ++++++++++++++-
 IPython/testing/decorators.py           |  4 ++--
 IPython/testing/iptest.py               |  2 +-
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 5876cc4151c..204c81c105a 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -183,7 +183,7 @@ def test_forward_unicode_completion():
     nt.assert_equal(matches[0], 'Ⅴ')
 
 @nt.nottest # now we have a completion for \jmath
-@decorators.dec.knownfailureif(sys.platform == 'win32', 'Fails if there is a C:\\j... path')
+@decorators.knownfailureif(sys.platform == 'win32', 'Fails if there is a C:\\j... path')
 def test_no_ascii_back_completion():
     ip = get_ipython()
     with TemporaryWorkingDirectory():  # Avoid any filename completions
@@ -234,7 +234,7 @@ def test_has_open_quotes4():
         nt.assert_false(completer.has_open_quotes(s))
 
 
-@decorators.dec.knownfailureif(sys.platform == 'win32', "abspath completions fail on Windows")
+@decorators.knownfailureif(sys.platform == 'win32', "abspath completions fail on Windows")
 def test_abspath_file_completions():
     ip = get_ipython()
     with TemporaryDirectory() as tmpdir:
diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index 847059c96f7..2afa5ba7c51 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -538,7 +538,7 @@ def test_run_tb():
         nt.assert_in("RuntimeError", out)
         nt.assert_equal(out.count("---->"), 3)
 
-@dec.dec.knownfailureif(sys.platform == 'win32', "writes to io.stdout aren't captured on Windows")
+@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
index 420be60bdac..074f61449e0 100644
--- a/IPython/external/decorators/__init__.py
+++ b/IPython/external/decorators/__init__.py
@@ -1,9 +1,7 @@
 try:
-    from numpy.testing import *
-    from numpy.testing import dec
-    from numpy.testing.noseclasses import KnownFailure
+    from numpy.testing.noseclasses import KnownFailure, knownfailureif
 except ImportError:
-    from ._decorators import *
+    from ._decorators import knownfailureif
     try:
         from ._numpy_testing_noseclasses import KnownFailure
     except ImportError:
diff --git a/IPython/lib/tests/test_display.py b/IPython/lib/tests/test_display.py
index 9854ba635f1..a72c626ebbf 100644
--- a/IPython/lib/tests/test_display.py
+++ b/IPython/lib/tests/test_display.py
@@ -26,11 +26,17 @@
 
 # Third-party imports
 import nose.tools as nt
-import numpy
+
+try:
+    import numpy
+except ImportError:
+    pass
 
 # Our own imports
 from IPython.lib import display
 
+from IPython.testing.decorators import skipif_not_numpy
+
 #-----------------------------------------------------------------------------
 # Classes and functions
 #-----------------------------------------------------------------------------
@@ -188,19 +194,24 @@ def test_audio_from_file():
     display.Audio(filename=path)
 
 class TestAudioDataWithNumpy(TestCase):
+
+    @skipif_not_numpy
     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))
 
+    @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))
 
+    @skipif_not_numpy
     def test_audio_from_numpy_array_without_rate_raises(self):
         nt.assert_raises(ValueError, display.Audio, get_test_tone())
 
+    @skipif_not_numpy
     def test_audio_data_normalization(self):
         expected_max_value = numpy.iinfo(numpy.int16).max
         for scale in [1, 0.5, 2]:
@@ -208,6 +219,7 @@ def test_audio_data_normalization(self):
             actual_max_value = numpy.max(numpy.abs(read_wav(audio.data)))
             nt.assert_equal(actual_max_value, expected_max_value)
 
+    @skipif_not_numpy
     def test_audio_data_without_normalization(self):
         max_int16 = numpy.iinfo(numpy.int16).max
         for scale in [1, 0.5, 0.2]:
@@ -233,6 +245,7 @@ def simulate_numpy_not_installed():
 class TestAudioDataWithoutNumpy(TestAudioDataWithNumpy):
     # All tests from `TestAudioDataWithNumpy` are inherited.
 
+    @skipif_not_numpy
     def test_audio_raises_for_nested_list(self):
         stereo_signal = [list(get_test_tone())] * 2
         nt.assert_raises(
diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
index 876611d5849..fff6221a20c 100644
--- a/IPython/testing/decorators.py
+++ b/IPython/testing/decorators.py
@@ -47,7 +47,7 @@
 # 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 *
+from IPython.external.decorators import knownfailureif
 
 #-----------------------------------------------------------------------------
 # Classes and functions
@@ -333,7 +333,7 @@ def skip_file_no_x11(name):
 
 skipif_not_sympy = skip_without('sympy')
 
-skip_known_failure = dec.knownfailureif(True,'This test is known to fail')
+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
diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index 14fd40bdc02..8efcc97201c 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -37,7 +37,7 @@
 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, dec
+from IPython.external.decorators import KnownFailure, knownfailureif
 
 pjoin = path.join
 

From 90afb0fcbbbef663a37de09e867e15c9258c66bc Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 12 May 2019 14:07:50 -0700
Subject: [PATCH 036/370] more skipping numpy when not installed

---
 IPython/lib/tests/test_display.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/IPython/lib/tests/test_display.py b/IPython/lib/tests/test_display.py
index a72c626ebbf..20963e23a1f 100644
--- a/IPython/lib/tests/test_display.py
+++ b/IPython/lib/tests/test_display.py
@@ -239,7 +239,11 @@ def test_audio_data_without_normalization_raises_for_invalid_data(self):
             lambda: display.Audio([-1.001], rate=44100, normalize=False))
 
 def simulate_numpy_not_installed():
-    return mock.patch('numpy.array', mock.MagicMock(side_effect=ImportError))
+    try:
+        import numpy
+        return mock.patch('numpy.array', mock.MagicMock(side_effect=ImportError))
+    except ModuleNotFoundError:
+        return lambda x:x
 
 @simulate_numpy_not_installed()
 class TestAudioDataWithoutNumpy(TestAudioDataWithNumpy):
@@ -252,6 +256,7 @@ def test_audio_raises_for_nested_list(self):
             TypeError,
             lambda: display.Audio(stereo_signal, rate=44100))
 
+@skipif_not_numpy
 def get_test_tone(scale=1):
     return numpy.sin(2 * numpy.pi * 440 * numpy.linspace(0, 1, 44100)) * scale
 

From dc697639639a2f23e1416ddcb63319b50339990e Mon Sep 17 00:00:00 2001
From: Kevin Sheppard <kevin.k.sheppard@gmail.com>
Date: Wed, 15 May 2019 10:38:16 +0100
Subject: [PATCH 037/370] BUG: Fix savefig path in Windows

Replace os.path which uses platform-specific separator with Path.as_posix
which always uses forward slash
---
 IPython/sphinxext/ipython_directive.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/IPython/sphinxext/ipython_directive.py b/IPython/sphinxext/ipython_directive.py
index 1add8f6a6f9..ce5825f3e02 100644
--- a/IPython/sphinxext/ipython_directive.py
+++ b/IPython/sphinxext/ipython_directive.py
@@ -188,6 +188,7 @@
 import atexit
 import errno
 import os
+import pathlib
 import re
 import sys
 import tempfile
@@ -415,11 +416,13 @@ def process_image(self, decorator):
         source_dir = self.source_dir
         saveargs = decorator.split(' ')
         filename = saveargs[1]
-        # insert relative path to image file in source (as absolute path for Sphinx)
-        outfile = '/' + os.path.relpath(os.path.join(savefig_dir,filename),
-                                        source_dir)
+        # 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)
 
-        imagerows = ['.. image:: %s'%outfile]
+        imagerows = ['.. image:: %s' % outfile]
 
         for kwarg in saveargs[2:]:
             arg, val = kwarg.split('=')

From 8684a09d79979bdd4bdb281d193f72ea9f2ac0d1 Mon Sep 17 00:00:00 2001
From: Thomas A Caswell <tcaswell@gmail.com>
Date: Sun, 19 May 2019 18:18:12 -0400
Subject: [PATCH 038/370] FIX: make sure the QSocketNotifier is disabled

This fixes issues that Matplotlib was seeing with Qt5 + IPython with
PT on OSX (see https://github.com/matplotlib/matplotlib/issues/13066)
---
 IPython/terminal/pt_inputhooks/qt.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/IPython/terminal/pt_inputhooks/qt.py b/IPython/terminal/pt_inputhooks/qt.py
index 2ceda6bdc70..ce0a9da86bd 100644
--- a/IPython/terminal/pt_inputhooks/qt.py
+++ b/IPython/terminal/pt_inputhooks/qt.py
@@ -7,6 +7,7 @@
 _appref = None
 _already_warned = False
 
+
 def inputhook(context):
     global _appref
     app = QtCore.QCoreApplication.instance()
@@ -41,9 +42,12 @@ def inputhook(context):
         # loop when there is input ready to read.
         notifier = QtCore.QSocketNotifier(context.fileno(),
                                           QtCore.QSocketNotifier.Read)
-        # connect the callback we care about before we turn it on
-        notifier.activated.connect(event_loop.exit)
-        notifier.setEnabled(True)
-        # only start the event loop we are not already flipped
-        if not context.input_is_ready():
-            event_loop.exec_()
+        try:
+            # connect the callback we care about before we turn it on
+            notifier.activated.connect(event_loop.exit)
+            notifier.setEnabled(True)
+            # only start the event loop we are not already flipped
+            if not context.input_is_ready():
+                event_loop.exec_()
+        finally:
+            notifier.setEnabled(False)

From ec6e6088e7a7212ac04af42c90281a066e67a263 Mon Sep 17 00:00:00 2001
From: Oriol Abril <oriol.abril.pla@gmail.com>
Date: Fri, 24 May 2019 23:45:01 +0200
Subject: [PATCH 039/370] Accept matplotlib backends in uppercase

Call to `str.lower()` to accept matplotlib backends written in uppercase, i.e. "Qt5" or "GTK3"
---
 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 f3c70a34072..f5d011dc8d5 100644
--- a/IPython/core/magics/pylab.py
+++ b/IPython/core/magics/pylab.py
@@ -96,7 +96,7 @@ def matplotlib(self, line=''):
             backends_list = list(backends.keys())
             print("Available matplotlib backends: %s" % backends_list)
         else:
-            gui, backend = self.shell.enable_matplotlib(args.gui)
+            gui, backend = self.shell.enable_matplotlib(args.gui.lower())
             self._show_matplotlib_backend(args.gui, backend)
 
     @skip_doctest

From 4c3eafe0c10053cea8b2c8fa450c9622ef4295b5 Mon Sep 17 00:00:00 2001
From: Pragnya Srinivasan <psrinivasan@umassd.edu>
Date: Wed, 8 May 2019 01:10:02 -0400
Subject: [PATCH 040/370] Adding fix for %%time issue

Closes #11707
---
 IPython/core/magics/execution.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 510750ea01a..b3829b3a7f1 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -1261,6 +1261,7 @@ def time(self,line='', cell=None, local_ns=None):
         # Minimum time above which compilation time will be reported
         tc_min = 0.1
 
+        expr_val=None
         if len(expr_ast.body)==1 and isinstance(expr_ast.body[0], ast.Expr):
             mode = 'eval'
             source = '<timed eval>'
@@ -1268,6 +1269,15 @@ def time(self,line='', cell=None, local_ns=None):
         else:
             mode = 'exec'
             source = '<timed exec>'
+            # multi-line %%time case
+            if len(expr_ast.body) > 1 :
+                expr_val=expr_ast.body[-1]
+                code_val = self.shell.compile(ast.Expression(expr_val.value)
+                                                , '<timed eval>'
+                                                , 'eval')
+                expr_ast=expr_ast.body[:-1]
+                expr_ast = ast.Module(expr_ast)
+
         t0 = clock()
         code = self.shell.compile(expr_ast, source, mode)
         tc = clock()-t0
@@ -1289,11 +1299,15 @@ def time(self,line='', cell=None, local_ns=None):
             st = clock2()
             try:
                 exec(code, glob, local_ns)
+                out=None
+                # multi-line %%time case
+                if expr_val and isinstance(expr_val, ast.Expr):
+                    out = eval(code_val, glob, local_ns)  
             except:
                 self.shell.showtraceback()
                 return
             end = clock2()
-            out = None
+
         wall_end = wtime()
         # Compute actual times and report
         wall_time = wall_end-wall_st

From 167e67e191308072a5716d8755b789295bc2a8a0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 25 May 2019 14:12:57 -0700
Subject: [PATCH 041/370] Add test that %%time magic return last result

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

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index f8ce2388769..148e178d3d5 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -9,6 +9,7 @@
 import re
 import sys
 import warnings
+from textwrap import dedent
 from unittest import TestCase
 from importlib import invalidate_caches
 from io import StringIO
@@ -419,6 +420,19 @@ def test_time3():
                     "run = 0\n"
                     "run += 1")
 
+def test_multiline_time():
+    """Make sure last statement from time return a value."""
+    ip = get_ipython()
+    ip.user_ns.pop('run', None)
+
+    ip.run_cell(dedent("""\
+        %%time
+        a = "ho"
+        b = "hey"
+        a+b
+        """))
+    nt.assert_equal(ip.user_ns_hidden['_'], 'hohey')
+
 def test_time_local_ns():
     """
     Test that local_ns is actually global_ns when running a cell magic

From 603b39705be5688b95b65bf32876251454bce722 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 25 May 2019 15:13:15 -0700
Subject: [PATCH 042/370] Fix reset magic not properly clearing {_, _, ___}

---
 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 d6d3be20cdf..1cce4f1920f 100644
--- a/IPython/core/displayhook.py
+++ b/IPython/core/displayhook.py
@@ -298,7 +298,7 @@ def flush(self):
         self._, self.__, self.___ = '', '', ''
 
         if '_' not in builtin_mod.__dict__:
-            self.shell.user_ns.update({'_':None,'__':None, '___':None})
+            self.shell.user_ns.update({'_':self._,'__':self.__,'___':self.___})
         import gc
         # TODO: Is this really needed?
         # IronPython blocks here forever

From 8a8867b911923ed94c6a6c043fa8d5df92ae003f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 25 May 2019 15:17:42 -0700
Subject: [PATCH 043/370] prefix test_function with test_

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

diff --git a/IPython/core/tests/test_inputtransformer2_line.py b/IPython/core/tests/test_inputtransformer2_line.py
index 102f4497660..41b6ed2935c 100644
--- a/IPython/core/tests/test_inputtransformer2_line.py
+++ b/IPython/core/tests/test_inputtransformer2_line.py
@@ -109,7 +109,7 @@ def test_leading_indent():
 
 """)
 
-def leading_empty_lines():
+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)),

From 335a8dc966e41a48b11ac2a3cf8cc015d7b4425a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 26 May 2019 13:07:29 -0700
Subject: [PATCH 044/370] fix Module usage in 3.8

---
 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 b3829b3a7f1..393ee9b40a1 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -49,6 +49,14 @@
 from logging import error
 from io import StringIO
 
+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
@@ -1276,7 +1284,7 @@ def time(self,line='', cell=None, local_ns=None):
                                                 , '<timed eval>'
                                                 , 'eval')
                 expr_ast=expr_ast.body[:-1]
-                expr_ast = ast.Module(expr_ast)
+                expr_ast = Module(expr_ast, [])
 
         t0 = clock()
         code = self.shell.compile(expr_ast, source, mode)

From 0e068ff7d19b37fc56f23cee2774593634d35f08 Mon Sep 17 00:00:00 2001
From: Nikita Bezdolniy <gooverdian@gmail.com>
Date: Mon, 27 May 2019 16:14:57 +0300
Subject: [PATCH 045/370] Fixes #11603

job.num is now calculated independently of current job count and
increments throughout all jobs
---
 IPython/lib/backgroundjobs.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/lib/backgroundjobs.py b/IPython/lib/backgroundjobs.py
index ebd70d3db39..31997e13f28 100644
--- a/IPython/lib/backgroundjobs.py
+++ b/IPython/lib/backgroundjobs.py
@@ -86,6 +86,7 @@ def __init__(self):
         self._s_running   = BackgroundJobBase.stat_running_c
         self._s_completed = BackgroundJobBase.stat_completed_c
         self._s_dead      = BackgroundJobBase.stat_dead_c
+        self._current_job_id = 0
 
     @property
     def running(self):
@@ -187,7 +188,8 @@ def new(self, func_or_exp, *args, **kwargs):
 
         if kwargs.get('daemon', False):
             job.daemon = True
-        job.num = len(self.all)+1 if self.all else 0
+        job.num = self._current_job_id
+        self._current_job_id += 1
         self.running.append(job)
         self.all[job.num] = job
         debug('Starting job # %s in a separate thread.' % job.num)

From e8d8a60c21ecc89e1b4331f75076724d68ff0af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 28 May 2019 18:58:04 +0200
Subject: [PATCH 046/370] Tests: Allow setting a custom timeout scale

Add environment variable IPYTHON_TESTING_TIMEOUT_SCALE that can
be used to scale all the timeouts in tests.

Useful on slow machines, such as Fedora armv7hl/aarch64 builders.

Fixes https://github.com/ipython/ipython/issues/11754
---
 IPython/terminal/tests/test_debug_magic.py |  5 +++--
 IPython/terminal/tests/test_embed.py       |  3 ++-
 IPython/testing/__init__.py                | 11 +++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/IPython/terminal/tests/test_debug_magic.py b/IPython/terminal/tests/test_debug_magic.py
index 9be0e24866a..d19f8277c19 100644
--- a/IPython/terminal/tests/test_debug_magic.py
+++ b/IPython/terminal/tests/test_debug_magic.py
@@ -14,6 +14,7 @@
 import os
 import sys
 from IPython.testing.decorators import skip_win32
+from IPython.testing import IPYTHON_TESTING_TIMEOUT_SCALE
 
 #-----------------------------------------------------------------------------
 # Tests
@@ -31,11 +32,11 @@ def test_debug_magic_passes_through_generators():
     env = os.environ.copy()
     child = pexpect.spawn(sys.executable, ['-m', 'IPython', '--colors=nocolor', '--simple-prompt'],
                           env=env)
-    child.timeout = 15
+    child.timeout = 15 * IPYTHON_TESTING_TIMEOUT_SCALE
 
     child.expect(in_prompt)
 
-    child.timeout = 2
+    child.timeout = 2 * IPYTHON_TESTING_TIMEOUT_SCALE
 
     child.sendline("def f(x):")
     child.sendline("    raise Exception")
diff --git a/IPython/terminal/tests/test_embed.py b/IPython/terminal/tests/test_embed.py
index de5b1e34864..98dd94653ab 100644
--- a/IPython/terminal/tests/test_embed.py
+++ b/IPython/terminal/tests/test_embed.py
@@ -17,6 +17,7 @@
 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
 
 #-----------------------------------------------------------------------------
 # Tests
@@ -72,7 +73,7 @@ def test_nest_embed():
 
     child = pexpect.spawn(sys.executable, ['-m', 'IPython', '--colors=nocolor'],
                           env=env)
-    child.timeout = 5
+    child.timeout = 5 * IPYTHON_TESTING_TIMEOUT_SCALE
     child.expect(ipy_prompt)
     child.sendline("import IPython")
     child.expect(ipy_prompt)
diff --git a/IPython/testing/__init__.py b/IPython/testing/__init__.py
index 165f503169a..552608792d9 100644
--- a/IPython/testing/__init__.py
+++ b/IPython/testing/__init__.py
@@ -8,6 +8,9 @@
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
+
+import os
+
 #-----------------------------------------------------------------------------
 # Functions
 #-----------------------------------------------------------------------------
@@ -33,6 +36,14 @@ def test(**kwargs):
         setattr(options, name, val)
     run_iptestall(options)
 
+#-----------------------------------------------------------------------------
+# Constants
+#-----------------------------------------------------------------------------
+
+# 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

From d7c43b6b39814da667d780640b3bf5bd4d4a92a9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 30 May 2019 18:57:59 -0700
Subject: [PATCH 047/370] clenup a bit

---
 IPython/core/async_helpers.py    |  7 ++-
 IPython/core/interactiveshell.py | 93 +++++++++++++++++---------------
 2 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/IPython/core/async_helpers.py b/IPython/core/async_helpers.py
index 187666f61ea..ba0791599f4 100644
--- a/IPython/core/async_helpers.py
+++ b/IPython/core/async_helpers.py
@@ -149,16 +149,15 @@ 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):
+        code = compile(cell, "<>", "exec", flags=getattr(ast,'PyCF_ALLOW_TOP_LEVEL_AWAIT', 0x0))
+        return inspect.CO_COROUTINE & code.co_flags == inspect.CO_COROUTINE
 
     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", flags=getattr(ast,'PyCF_ALLOW_TOP_LEVEL_AWAIT', 0x0))
         code = compile(cell, "<>", "exec")
-        return inspect.CO_COROUTINE & code.co_flags == inspect.CO_COROUTINE
     except SyntaxError:
-        #if sys.version_info > (3, 8):
-        #    raise
         try:
             parse_tree = _async_parse_cell(cell)
 
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 01310d27496..a137f82d67b 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -17,6 +17,7 @@
 import atexit
 import builtins as builtin_mod
 import functools
+import inspect
 import os
 import re
 import runpy
@@ -161,8 +162,9 @@ def removed_co_newlocals(function:types.FunctionType) -> types.FunctionType:
 # 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)
-
-if sys.version_info > (3, 5):
+if sys.version_info > (3, 8):
+    from .async_helpers import _curio_runner, _trio_runner
+elif sys.version_info > (3, 5):
     from .async_helpers import _curio_runner, _trio_runner, _should_be_async
 else :
     _curio_runner = _trio_runner = None
@@ -3000,23 +3002,26 @@ def error_before_exec(value):
             with self.display_trap:
                 # Compile to bytecode
                 try:
-                    if self.autoawait and _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
+                    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)
                 except self.custom_exceptions as e:
@@ -3045,8 +3050,7 @@ def error_before_exec(value):
                 # Execute the user code
                 interactivity = "none" if silent else self.ast_node_interactivity
                 if _run_async:
-                    print(interactivity)
-                    interactivity = 'last_expr'
+                    interactivity = 'async'
 
                 has_raised = yield from self.run_ast_nodes(code_ast.body, cell_name,
                        interactivity=interactivity, compiler=compiler, result=result)
@@ -3168,8 +3172,6 @@ def run_ast_nodes(self, nodelist:ListType[AST], cell_name:str, interactivity='la
         """
         if not nodelist:
             return
-        if interactivity == 'async':
-            interactivify = 'last'
 
         if interactivity == 'last_expr_or_assign':
             if isinstance(nodelist[-1], _assign_nodes):
@@ -3205,10 +3207,11 @@ def run_ast_nodes(self, nodelist:ListType[AST], cell_name:str, interactivity='la
         else:
             raise ValueError("Interactivity was %r" % interactivity)
 
-        print('interactivity:', interactivity)
         try:
-            if _async and sys.version_info < (3,8):
-                raise ValueError
+            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, [])
@@ -3218,31 +3221,33 @@ def run_ast_nodes(self, nodelist:ListType[AST], cell_name:str, interactivity='la
                 if (yield from self.run_code(async_code, result, async_=True)):
                     return True
             else:
-                def compare(code):
-                    import inspect
-                    is_async = (inspect.CO_COROUTINE & code.co_flags == inspect.CO_COROUTINE)
-                    print('async=', _async, 'autodetect=', is_async)
-                    return is_async
+                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.
-                for i, node in enumerate(to_run_exec):
-                    mod = Module([node], [])
+                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, "exec")
+                        code = compiler(mod, cell_name, mode)
                         asy = compare(code)
                     if (yield from self.run_code(code, result,  async_=asy)):
                         return True
 
-                for i, node in enumerate(to_run_interactive):
-                    print('B: interactive, async=', _async, nodelist)
-                    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, "single")
-                        asy = compare(code)
-
-                    if (yield from self.run_code(code, result, async_=asy)):
-                        return True
-
             # Flush softspace
             if softspace(sys.stdout, 0):
                 print()

From ede2c61f625463e4e1ff69c1d7898193cbf5acd5 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 30 May 2019 18:59:38 -0700
Subject: [PATCH 048/370] cleanup 3.8 compat

---
 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 a137f82d67b..a8a49c4a3d6 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2909,8 +2909,7 @@ def should_run_async(self, raw_cell: str) -> bool:
             return False
         return _should_be_async(cell)
 
-    @asyncio.coroutine
-    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) -> ExecutionResult:
         """Run a complete IPython cell asynchronously.
 
         Parameters
@@ -3052,7 +3051,7 @@ def error_before_exec(value):
                 if _run_async:
                     interactivity = 'async'
 
-                has_raised = yield from self.run_ast_nodes(code_ast.body, cell_name,
+                has_raised = await self.run_ast_nodes(code_ast.body, cell_name,
                        interactivity=interactivity, compiler=compiler, result=result)
 
                 self.last_execution_succeeded = not has_raised
@@ -3132,8 +3131,7 @@ def transform_ast(self, node):
             ast.fix_missing_locations(node)
         return node
 
-    @asyncio.coroutine
-    def run_ast_nodes(self, nodelist:ListType[AST], cell_name:str, interactivity='last_expr',
+    async def run_ast_nodes(self, nodelist:ListType[AST], cell_name:str, interactivity='last_expr',
                         compiler=compile, result=None):
         """Run a sequence of AST nodes. The execution mode depends on the
         interactivity parameter.
@@ -3218,7 +3216,7 @@ def run_ast_nodes(self, nodelist:ListType[AST], cell_name:str, interactivity='la
                 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 (yield from self.run_code(async_code, result, async_=True)):
+                if (await self.run_code(async_code, result, async_=True)):
                     return True
             else:
                 if sys.version_info > (3, 8):
@@ -3245,7 +3243,7 @@ def compare(code):
                     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 (yield from self.run_code(code, result,  async_=asy)):
+                    if (await self.run_code(code, result,  async_=asy)):
                         return True
 
             # Flush softspace
@@ -3284,8 +3282,7 @@ def _async_exec(self, code_obj: types.CodeType, user_ns: dict):
 
         return eval(code_obj, user_ns)
 
-    @asyncio.coroutine
-    def run_code(self, code_obj, result=None, *, async_=False):
+    async def run_code(self, code_obj, result=None, *, async_=False):
         """Execute a code object.
 
         When an exception occurs, self.showtraceback() is called to display a
@@ -3317,11 +3314,11 @@ def run_code(self, code_obj, result=None, *, async_=False):
             try:
                 self.hooks.pre_run_code_hook()
                 if async_ and sys.version_info < (3,8):
-                    last_expr = (yield from self._async_exec(code_obj, self.user_ns))
+                    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_ :
-                    yield from eval(code_obj, self.user_global_ns, self.user_ns)
+                    await eval(code_obj, self.user_global_ns, self.user_ns)
                 else:
                     exec(code_obj, self.user_global_ns, self.user_ns)
             finally:

From ffbc8d19246c74166a7dec9182c568385dfa5587 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 30 May 2019 19:46:59 -0700
Subject: [PATCH 049/370] re3.8

---
 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 a8a49c4a3d6..af264736fb6 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -162,9 +162,7 @@ def removed_co_newlocals(function:types.FunctionType) -> types.FunctionType:
 # 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)
-if sys.version_info > (3, 8):
-    from .async_helpers import _curio_runner, _trio_runner
-elif sys.version_info > (3, 5):
+if sys.version_info > (3, 5):
     from .async_helpers import _curio_runner, _trio_runner, _should_be_async
 else :
     _curio_runner = _trio_runner = None

From 123e53b1d1500bc2805a776228232147a9989cee Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 30 May 2019 20:19:39 -0700
Subject: [PATCH 050/370] some more fixes for 3.8

---
 IPython/core/async_helpers.py | 8 +++++---
 IPython/core/compilerop.py    | 9 +++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/IPython/core/async_helpers.py b/IPython/core/async_helpers.py
index ba0791599f4..1a7d88991db 100644
--- a/IPython/core/async_helpers.py
+++ b/IPython/core/async_helpers.py
@@ -150,9 +150,11 @@ def _should_be_async(cell: str) -> bool:
     level, it will be seen as async. This is a know limitation.
     """
     if sys.version_info > (3, 8):
-        code = compile(cell, "<>", "exec", flags=getattr(ast,'PyCF_ALLOW_TOP_LEVEL_AWAIT', 0x0))
-        return inspect.CO_COROUTINE & code.co_flags == inspect.CO_COROUTINE
-
+        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:
+            return False
     try:
         # we can't limit ourself to ast.parse, as it __accepts__ to parse on
         # 3.7+, but just does not _compile_
diff --git a/IPython/core/compilerop.py b/IPython/core/compilerop.py
index a8037ea509e..c4771af7303 100644
--- a/IPython/core/compilerop.py
+++ b/IPython/core/compilerop.py
@@ -137,12 +137,17 @@ def cache(self, code, number=0):
 
     @contextmanager
     def extra_flags(self, flags):
-        old_flags = self.flags
+        ## bits that we'll set to 1
+        turn_on_bits = ~self.flags & flags
+
+
         self.flags = self.flags | flags
         try:
             yield
         finally:
-            self.flags = old_flags
+            # turn off only the bits we turned on so that something like
+            # __future__ that set flags stays. 
+            self.flags &= ~turn_on_bits
 
 
 def check_linecache_ipython(*args):

From 6de160c0d2ace4a2abd3a34408d0a0c97cad7705 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 30 May 2019 22:00:08 -0700
Subject: [PATCH 051/370] Properly cleanup Tee, which reveals some resource
 leakage.

In particular we have a few unclose FDs. and a couple of deprecated
usage that show up, as the Tees where swallowing errors.
---
 IPython/utils/tests/test_io.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/IPython/utils/tests/test_io.py b/IPython/utils/tests/test_io.py
index 1a29a19f862..104f492eabd 100644
--- a/IPython/utils/tests/test_io.py
+++ b/IPython/utils/tests/test_io.py
@@ -32,7 +32,7 @@ def test_tee_simple():
 
 class TeeTestCase(unittest.TestCase):
 
-    def tchan(self, channel, check='close'):
+    def tchan(self, channel):
         trap = StringIO()
         chan = StringIO()
         text = 'Hello'
@@ -41,28 +41,27 @@ def tchan(self, channel, check='close'):
         setattr(sys, channel, trap)
 
         tee = Tee(chan, channel=channel)
+
         print(text, end='', file=chan)
-        setattr(sys, channel, std_ori)
         trap_val = trap.getvalue()
         nt.assert_equal(chan.getvalue(), text)
-        if check=='close':
-            tee.close()
-        else:
-            del tee
+
+        tee.close()
+
+        setattr(sys, channel, std_ori)
+        assert getattr(sys, channel) == std_ori
 
     def test(self):
         for chan in ['stdout', 'stderr']:
-            for check in ['close', 'del']:
-                self.tchan(chan, check)
+            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
-        p = Popen([sys.executable, '-c', cmd],
-                    stdout=PIPE)
-        p.wait()
-        classname = p.stdout.read().strip().decode('ascii')
+        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
@@ -79,6 +78,7 @@ def __dir__(self):
     iostream = IOStream(BadStringIO())
     iostream.write('hi, bad iostream\n')
     assert not hasattr(iostream, 'name')
+    iostream.close()
 
 def test_capture_output():
     """capture_output() context works"""

From 546cf5c0c4dac6d70c13ded8e2041ccd0294ab36 Mon Sep 17 00:00:00 2001
From: Alok Singh <8325708+alok@users.noreply.github.com>
Date: Fri, 31 May 2019 01:09:38 -0700
Subject: [PATCH 052/370] Support os.PathLike in Image

`os.path.splitext` was all that was needed. Any further processing is already handled with `os`'s support for `os.PathLike`.
---
 IPython/core/display.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 0957623570a..f1a8494eaaa 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -13,6 +13,7 @@
 import sys
 import warnings
 from copy import deepcopy
+from os.path import splitext
 
 from IPython.utils.py3compat import cast_unicode
 from IPython.testing.skipdoctest import skip_doctest
@@ -1278,7 +1279,13 @@ def _repr_jpeg_(self):
             return self._data_and_metadata()
 
     def _find_ext(self, s):
-        return s.split('.')[-1].lower()
+        base, ext = splitext(s)
+
+        if not ext:
+            return base
+
+        # `splitext` includes leading period, so we skip it
+        return ext[1:].lower()
 
 
 class Video(DisplayObject):

From fa316178580c9f72bf0fd45042320bc4231183d3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 31 May 2019 10:34:03 -0700
Subject: [PATCH 053/370] prepare whats new in 7.6

---
 docs/source/whatsnew/index.rst    | 22 ++++++++++++----------
 docs/source/whatsnew/version7.rst | 28 +++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/docs/source/whatsnew/index.rst b/docs/source/whatsnew/index.rst
index d96b53879b5..775d18cf28f 100644
--- a/docs/source/whatsnew/index.rst
+++ b/docs/source/whatsnew/index.rst
@@ -24,16 +24,6 @@ What's new in IPython
 
       development
 
-..
-   this makes a hidden toctree that keeps sphinx from complaining about
-   documents included nowhere when building docs for stable
-   
-.. only:: ipystable
-
-   .. toctree::
-      :hidden:
-
-      development
 
 This section documents the changes that have been made in various versions of
 IPython. Users should consult these pages to learn about new features, bug
@@ -67,3 +57,15 @@ development work they do here in a user friendly format.
    version0.10
    version0.9
    version0.8
+
+..
+   this makes a hidden toctree that keeps sphinx from complaining about
+   documents included nowhere when building docs for stable
+   We place it at the end as it will still be reachable via prev/next links.
+   
+.. only:: ipystable
+
+   .. toctree::
+      :hidden:
+
+      development
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 5d0ed63c7a8..c54053f8ae8 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,7 +2,31 @@
  7.x Series
 ============
 
-.. _whatsnew740:
+.. _whatsnew760:
+
+IPython 7.6.0
+=============
+
+IPython 7.6.0 contains a couple of bug fixes and number of small features
+additions as well as some compatibility with the current development version of
+Python 3.8.
+
+   - Add a ``-l`` option to :magic:`psearch` to list the available search
+     types. :ghpull:`11672`
+   - Support ``PathLike`` for ``DisplayObject`` and ``Image``. :ghpull:`11764`
+   - Configurability of timeout in the test suite for slow platforms.
+     :ghpull:`11756`
+   - Accept any casing for matplotlib backend. :ghpull:`121748`
+   - Properly skip test that requires numpy to be installed :ghpull:`11723`
+   - More support for Python 3.8 and positional only arguments (pep570)
+     :ghpull:`11720`
+   - Unicode names for the completion are loaded lazily on first use which
+     should decrease startup time. :ghpull:`11693`
+
+Special Thanks to Gabriel (@gpotter2 on GitHub), who among other took care many
+of the remaining task for 7.4 and 7.5, like updating the website.
+
+.. _whatsnew750:
 
 IPython 7.5.0
 =============
@@ -17,6 +41,8 @@ scope when using the ``@needs_local_scope`` decorator. This was typically
 encountered with the ``%%time`` and ``%%timeit`` magics. See :ghissue:`11659`
 and :ghpull:`11698`.
 
+.. _whatsnew740:
+
 IPython 7.4.0
 =============
 

From ec8e405ab1efafe7807085bd12974a470b9d4a2e Mon Sep 17 00:00:00 2001
From: Alok Singh <alokbeniwal@gmail.com>
Date: Fri, 31 May 2019 18:29:44 -0700
Subject: [PATCH 054/370] Allow passing pathlib Paths without keyword arg

Don't need to use `filename=` now. Hacky but easier than the alternative of
`os.PathLike` (which doesn't exist in 3.5).
---
 IPython/core/display.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index f1a8494eaaa..d31350cb895 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -14,6 +14,7 @@
 import warnings
 from copy import deepcopy
 from os.path import splitext
+from pathlib import Path, PurePath
 
 from IPython.utils.py3compat import cast_unicode
 from IPython.testing.skipdoctest import skip_doctest
@@ -594,6 +595,9 @@ def __init__(self, data=None, url=None, filename=None, metadata=None):
         metadata : dict
             Dict of metadata associated to be the object when displayed
         """
+        if isinstance(data, (Path, PurePath)):
+            data = str(data)
+
         if data is not None and isinstance(data, str):
             if data.startswith('http') and url is None:
                 url = data
@@ -864,6 +868,9 @@ def data(self):
 
     @data.setter
     def data(self, data):
+        if isinstance(data, (Path, PurePath)):
+            data = str(data)
+
         if isinstance(data, str):
             if getattr(self, 'filename', None) is None:
                 warnings.warn("JSON expects JSONable dict or list, not JSON strings")
@@ -1134,6 +1141,9 @@ def __init__(self, data=None, url=None, filename=None, format=None,
         Image(url='http://www.google.fr/images/srpr/logo3w.png')
 
         """
+        if isinstance(data, (Path, PurePath)):
+            data = str(data)
+
         if filename is not None:
             ext = self._find_ext(filename)
         elif url is not None:
@@ -1338,6 +1348,9 @@ def __init__(self, data=None, url=None, filename=None, embed=False,
         Video('path/to/video.mp4', embed=True)
         Video(b'raw-videodata', embed=True)
         """
+        if isinstance(data, (Path, PurePath)):
+            data = str(data)
+
         if url is None and isinstance(data, str) and data.startswith(('http:', 'https:')):
             url = data
             data = None

From c57f24abbaa8e58a238a912136cb0935f6a47f08 Mon Sep 17 00:00:00 2001
From: Luciana da Costa Marques <lucianadacostamarques@gmail.com>
Date: Sat, 1 Jun 2019 18:56:07 -0300
Subject: [PATCH 055/370] Remove popen_wait from iptestcontroller.py

---
 IPython/testing/iptestcontroller.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py
index ab76f83bb75..d349f95dc60 100644
--- a/IPython/testing/iptestcontroller.py
+++ b/IPython/testing/iptestcontroller.py
@@ -28,9 +28,6 @@
 from IPython.utils.sysinfo import get_sys_info
 from IPython.utils.tempdir import TemporaryDirectory
 
-def popen_wait(p, timeout):
-    return p.wait(timeout)
-
 class TestController(object):
     """Run tests in a subprocess
     """

From 91e7701ba55d265299a6ee11cd92e760b6b61f56 Mon Sep 17 00:00:00 2001
From: Luciana da Costa Marques <lucianadacostamarques@gmail.com>
Date: Sun, 2 Jun 2019 10:15:30 -0300
Subject: [PATCH 056/370] Fix small typo in CONTRIBUTING.md

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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1ac34f42397..3aecb233319 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -91,5 +91,5 @@ 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_alial.py
+iptest IPython/core/tests/test_alias.py
 ```

From 2b20077c5fcb5bd7582cd00083171cce68f56913 Mon Sep 17 00:00:00 2001
From: Ed OBrien <late.for.lunch@gmail.com>
Date: Tue, 4 Jun 2019 00:07:36 -0400
Subject: [PATCH 057/370] Speed up timeit arguments test

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

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 148e178d3d5..716e7cced23 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -1165,8 +1165,8 @@ def test_time_no_var_expand():
 def test_timeit_arguments():
     "Test valid timeit arguments, should not cause SyntaxError (GH #1269)"
     if sys.version_info < (3,7):
-        _ip.magic("timeit ('#')")
+        _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 a=('#')")
+        _ip.magic("timeit -n1 -r1 a=('#')")

From edecbb3ca95159b9dc1ef20f1cdcc5a25be1ba69 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Thu, 6 Jun 2019 15:53:05 +0200
Subject: [PATCH 058/370] Use CodeType.replace with Python 3.8

Via https://bugs.python.org/issue37032.
---
 IPython/core/interactiveshell.py | 44 ++++++++++----------------------
 1 file changed, 14 insertions(+), 30 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index c102b2352d2..6b6bc2063b5 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -138,43 +138,27 @@ def removed_co_newlocals(function:types.FunctionType) -> types.FunctionType:
     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 = CodeType(
-            code.co_argcount,
-            code.co_posonlyargcount, # Python-3.8 PEP570 positional only argument
-            code.co_kwonlyargcount,
-            code.co_nlocals, 
-            code.co_stacksize, 
-            code.co_flags & ~CO_NEWLOCALS,
-            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
-        )
+        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, 
-            code.co_flags & ~CO_NEWLOCALS,
-            code.co_code, 
+            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_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__)
 
 

From 1a37c55789d9e3457b8e00231be490dc6d971ac4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 11 Jun 2019 11:30:23 +0200
Subject: [PATCH 059/370] Fix state leakage and speedup in test-suite

This is mostly visible when running the test via pytest that
collect-then-run vs nose that runs as it collects.

While I was at it I've improved some tests to be faster by changing the
maximum recursion limit.
---
 IPython/core/tests/test_run.py              |  3 +-
 IPython/core/tests/test_ultratb.py          | 34 +++++++++++++++++++--
 IPython/core/ultratb.py                     |  8 ++++-
 IPython/extensions/tests/test_storemagic.py |  7 +++--
 4 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index 2afa5ba7c51..db308f1ec7d 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -35,7 +35,6 @@
 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.
     See: https://github.com/ipython/ipython/issues/141
@@ -537,6 +536,8 @@ def test_run_tb():
         nt.assert_not_in("execfile", out)
         nt.assert_in("RuntimeError", out)
         nt.assert_equal(out.count("---->"), 3)
+        del ip.user_ns['bar']
+        del ip.user_ns['foo']
 
 @dec.knownfailureif(sys.platform == 'win32', "writes to io.stdout aren't captured on Windows")
 def test_script_tb():
diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index 536a4db6505..787a7eca63b 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -10,7 +10,8 @@
 import unittest
 from unittest import mock
 
-from ..ultratb import ColorTB, VerboseTB, find_recursion
+import IPython.core.ultratb as ultratb
+from IPython.core.ultratb import ColorTB, VerboseTB, find_recursion
 
 
 from IPython.testing import tools as tt
@@ -18,8 +19,6 @@
 from IPython.utils.syspathcontext import prepended_to_syspath
 from IPython.utils.tempdir import TemporaryDirectory
 
-ip = get_ipython()
-
 file_1 = """1
 2
 3
@@ -31,6 +30,30 @@ def f():
   1/0
 """
 
+
+def recursionlimit(frames):
+    """
+    decorator to set the recursion limit temporarily
+    """
+
+    def inner(test_function):
+        def wrapper(*args, **kwargs):
+            _orig_rec_limit = ultratb._FRAME_RECURSION_LIMIT
+            ultratb._FRAME_RECURSION_LIMIT = frames - 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
+
+    return inner
+
+
 class ChangedPyFileTest(unittest.TestCase):
     def test_changing_py_file(self):
         """Traceback produced if the line where the error occurred is missing?
@@ -200,6 +223,8 @@ def bar():
         # Assert syntax error during runtime generate stacktrace
         with tt.AssertPrints(["foo()", "bar()"]):
             ip.run_cell(syntax_error_at_runtime)
+        del ip.user_ns['bar']
+        del ip.user_ns['foo']
 
     def test_changing_py_file(self):
         with TemporaryDirectory() as td:
@@ -302,14 +327,17 @@ def test_no_recursion(self):
         with tt.AssertNotPrints("frames repeated"):
             ip.run_cell("non_recurs()")
 
+    @recursionlimit(65)
     def test_recursion_one_frame(self):
         with tt.AssertPrints("1 frames repeated"):
             ip.run_cell("r1()")
 
+    @recursionlimit(65)
     def test_recursion_three_frames(self):
         with tt.AssertPrints("3 frames repeated"):
             ip.run_cell("r3o2()")
 
+    @recursionlimit(65)
     def test_find_recursion(self):
         captured = []
         def capture_exc(*args, **kwargs):
diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 3060be1f21c..03b02b47d66 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -137,6 +137,12 @@
 # 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
 
@@ -431,7 +437,7 @@ def is_recursion_error(etype, value, records):
     # a recursion error.
     return (etype is recursion_error_type) \
            and "recursion" in str(value).lower() \
-           and len(records) > 500
+           and len(records) > _FRAME_RECURSION_LIMIT
 
 def find_recursion(etype, value, records):
     """Identify the repeating stack frames from a RecursionError traceback
diff --git a/IPython/extensions/tests/test_storemagic.py b/IPython/extensions/tests/test_storemagic.py
index 373a7169261..a7b41bab533 100644
--- a/IPython/extensions/tests/test_storemagic.py
+++ b/IPython/extensions/tests/test_storemagic.py
@@ -3,10 +3,13 @@
 from traitlets.config.loader import Config
 import nose.tools as nt
 
-ip = get_ipython()
-ip.magic('load_ext storemagic')
+
+def setup_module():
+    ip.magic('load_ext storemagic')
 
 def test_store_restore():
+    assert 'bar' not in ip.user_ns, "Error: some other test leaked `bar` in user_ns"
+    assert 'foo' not in ip.user_ns, "Error: some other test leaked `foo` in user_ns"
     ip.user_ns['foo'] = 78
     ip.magic('alias bar echo "hello"')
     tmpd = tempfile.mkdtemp()

From 72306c4c0f4c274e887cac845ac4de01df3a0481 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 11 Jun 2019 11:40:53 +0200
Subject: [PATCH 060/370] expose ip as well as _ip

---
 IPython/testing/globalipapp.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IPython/testing/globalipapp.py b/IPython/testing/globalipapp.py
index bd57adf5ac7..c435f9d0873 100644
--- a/IPython/testing/globalipapp.py
+++ b/IPython/testing/globalipapp.py
@@ -122,6 +122,7 @@ def start_ipython():
     _ip = shell
     get_ipython = _ip.get_ipython
     builtin_mod._ip = _ip
+    builtin_mod.ip = _ip
     builtin_mod.get_ipython = get_ipython
 
     # Override paging, so we don't require user interaction during the tests.

From f7e055d056609377a6fa726eea1fb985b9da47ed Mon Sep 17 00:00:00 2001
From: Antony Lee <anntzer.lee@gmail.com>
Date: Wed, 12 Jun 2019 22:01:20 +0200
Subject: [PATCH 061/370] Fix docstring of `%reset`.

`_ip` doesn't exist at the toplevel, `get_ipython()` does.
---
 IPython/core/magics/namespace.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/magics/namespace.py b/IPython/core/magics/namespace.py
index 6a19e6aba9b..cef6ddba8d7 100644
--- a/IPython/core/magics/namespace.py
+++ b/IPython/core/magics/namespace.py
@@ -518,12 +518,12 @@ def reset(self, parameter_s=''):
           In [7]: a
           Out[7]: 1
 
-          In [8]: 'a' in _ip.user_ns
+          In [8]: 'a' in get_ipython().user_ns
           Out[8]: True
 
           In [9]: %reset -f
 
-          In [1]: 'a' in _ip.user_ns
+          In [1]: 'a' in get_ipython().user_ns
           Out[1]: False
 
           In [2]: %reset -f in

From 1ef15a57ca3f4d83e7347299904f197b0e9c8c2a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 11 Jun 2019 09:12:09 -0700
Subject: [PATCH 062/370] Properly close file in setupbase

---
 setupbase.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setupbase.py b/setupbase.py
index 7ee9dc06a6f..ea66d7dd3bb 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -38,7 +38,8 @@
 
 def execfile(fname, globs, locs=None):
     locs = locs or globs
-    exec(compile(open(fname).read(), fname, "exec"), globs, locs)
+    with open(fname) 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
 # exclusion on multiple endings!

From 9cb1081dab0545e060220330a0013b0efc69abee Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 11 Jun 2019 08:16:25 -0700
Subject: [PATCH 063/370] Remove leftover from cleanup.

These were support function for when the Deprecated and to be removed
calltip function was still tested.
---
 IPython/core/tests/test_oinspect.py | 40 +++--------------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

diff --git a/IPython/core/tests/test_oinspect.py b/IPython/core/tests/test_oinspect.py
index c9926200d0e..687860b21a6 100644
--- a/IPython/core/tests/test_oinspect.py
+++ b/IPython/core/tests/test_oinspect.py
@@ -8,17 +8,13 @@
 from inspect import signature, Signature, Parameter
 import os
 import re
-import sys
 
 import nose.tools as nt
 
 from .. import oinspect
-from IPython.core.magic import (Magics, magics_class, line_magic,
-                                cell_magic, line_cell_magic,
-                                register_line_magic, register_cell_magic,
-                                register_line_cell_magic)
+
 from decorator import decorator
-from IPython import get_ipython
+
 from IPython.testing.tools import AssertPrints, AssertNotPrints
 from IPython.utils.path import compress_user
 
@@ -38,7 +34,7 @@
 # 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 = 37  # Put here the actual number of this line
 
 from unittest import TestCase
 
@@ -140,36 +136,6 @@ def g(y, z=3, *a, **kw):
     pass  # no docstring
 
 
-@register_line_magic
-def lmagic(line):
-    "A line magic"
-
-
-@register_cell_magic
-def cmagic(line, cell):
-    "A cell magic"
-
-
-@register_line_cell_magic
-def lcmagic(line, cell=None):
-    "A line/cell magic"
-
-
-@magics_class
-class SimpleMagics(Magics):
-    @line_magic
-    def Clmagic(self, cline):
-        "A class-based line magic"
-        
-    @cell_magic
-    def Ccmagic(self, cline, ccell):
-        "A class-based cell magic"
-        
-    @line_cell_magic
-    def Clcmagic(self, cline, ccell=None):
-        "A class-based line/cell magic"
-
-
 class Awkward(object):
     def __getattr__(self, name):
         raise Exception(name)

From 407e8b4edc739a0cb08eccd4108fa7cfa4b8dec4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 11 Jun 2019 08:18:56 -0700
Subject: [PATCH 064/370] Cleanup iptest controller from old logic.

Not necessary as now this is mostly gone to the notebook repo
---
 IPython/testing/iptestcontroller.py | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py
index d349f95dc60..8a8c80305a3 100644
--- a/IPython/testing/iptestcontroller.py
+++ b/IPython/testing/iptestcontroller.py
@@ -28,7 +28,7 @@
 from IPython.utils.sysinfo import get_sys_info
 from IPython.utils.tempdir import TemporaryDirectory
 
-class TestController(object):
+class TestController:
     """Run tests in a subprocess
     """
     #: str, IPython test suite to be executed.
@@ -77,18 +77,6 @@ def wait(self):
         self.stdout = self.stdout_capturer.get_buffer()
         return self.process.returncode
 
-    def print_extra_info(self):
-        """Print extra information about this test run.
-        
-        If we're running in parallel and showing the concise view, this is only
-        called if the test group fails. Otherwise, it's called before the test
-        group is started.
-        
-        The base implementation does nothing, but it can be overridden by
-        subclasses.
-        """
-        return
-
     def cleanup_process(self):
         """Cleanup on exit by killing any leftover processes."""
         subp = self.process
@@ -243,8 +231,6 @@ def do_run(controller, buffer_output=True):
     try:
         try:
             controller.setup()
-            if not buffer_output:
-                controller.print_extra_info()
             controller.launch(buffer_output=buffer_output)
         except Exception:
             import traceback
@@ -367,7 +353,6 @@ def justify(ltext, rtext, width=70, fill='-'):
                 res_string = 'OK' if res == 0 else 'FAILED'
                 print(justify('Test group: ' + controller.section, res_string))
                 if res:
-                    controller.print_extra_info()
                     print(decode(controller.stdout))
                     failed.append(controller)
                     if res == -signal.SIGINT:

From df563a18a92e64994393d0e29b1cae1a9403c36c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 11 Jun 2019 08:35:05 -0700
Subject: [PATCH 065/370] Remove more unused support functions and class

---
 IPython/core/tests/test_oinspect.py | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/IPython/core/tests/test_oinspect.py b/IPython/core/tests/test_oinspect.py
index 687860b21a6..cd38e099448 100644
--- a/IPython/core/tests/test_oinspect.py
+++ b/IPython/core/tests/test_oinspect.py
@@ -123,18 +123,6 @@ def method(self, x, z=2):
         """Some method's docstring"""
 
 
-class OldStyle:
-    """An old-style class for testing."""
-    pass
-
-
-def f(x, y=2, *a, **kw):
-    """A simple function."""
-
-
-def g(y, z=3, *a, **kw):
-    pass  # no docstring
-
 
 class Awkward(object):
     def __getattr__(self, name):
@@ -227,9 +215,12 @@ def test_info_serialliar():
     # infinite loops: https://github.com/ipython/ipython/issues/9122
     nt.assert_less(fib_tracker[0], 9000)
 
+def support_function_one(x, y=2, *a, **kw):
+    """A simple function."""
+
 def test_calldef_none():
     # We should ignore __call__ for all of these.
-    for obj in [f, SimpleClass().method, any, str.upper]:
+    for obj in [support_function_one, SimpleClass().method, any, str.upper]:
         print(obj)
         i = inspector.info(obj)
         nt.assert_is(i['call_def'], None)

From 17589e2e12054f029ac74de7617cac390c9c0787 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 13 Jun 2019 11:56:14 -0700
Subject: [PATCH 066/370] Use module level setup and teardown compatible both
 nose and pytest.

Also rename some setup to test_XXX as they are test and not setups
---
 IPython/core/tests/test_compilerop.py    | 2 +-
 IPython/core/tests/test_history.py       | 2 +-
 IPython/core/tests/test_paths.py         | 4 ++--
 IPython/core/tests/test_profile.py       | 4 ++--
 IPython/utils/tests/test_module_paths.py | 4 ++--
 IPython/utils/tests/test_path.py         | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/IPython/core/tests/test_compilerop.py b/IPython/core/tests/test_compilerop.py
index f1f88e4568a..4b2f7153900 100644
--- a/IPython/core/tests/test_compilerop.py
+++ b/IPython/core/tests/test_compilerop.py
@@ -47,7 +47,7 @@ def test_cache():
     cp.cache('x=1')
     nt.assert_true(len(linecache.cache) > ncache)
 
-def setUp():
+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")
diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
index 1760e4681f9..f4f080dc83f 100644
--- a/IPython/core/tests/test_history.py
+++ b/IPython/core/tests/test_history.py
@@ -22,7 +22,7 @@
 from IPython.core.history import HistoryManager, extract_hist_ranges
 from IPython.testing.decorators import skipif
 
-def setUp():
+def test_proper_default_encoding():
     nt.assert_equal(sys.getdefaultencoding(), "utf-8")
 
 @skipif(sqlite3.sqlite_version_info > (3,24,0))
diff --git a/IPython/core/tests/test_paths.py b/IPython/core/tests/test_paths.py
index 8f09001d9f7..ab1c4132a8e 100644
--- a/IPython/core/tests/test_paths.py
+++ b/IPython/core/tests/test_paths.py
@@ -19,7 +19,7 @@
 XDG_CACHE_DIR = os.path.join(HOME_TEST_DIR, "xdg_cache_dir")
 IP_TEST_DIR = os.path.join(HOME_TEST_DIR,'.ipython')
 
-def setup():
+def setup_module():
     """Setup testenvironment for the module:
 
             - Adds dummy home dir tree
@@ -31,7 +31,7 @@ def setup():
     os.makedirs(os.path.join(XDG_CACHE_DIR, 'ipython'))
 
 
-def teardown():
+def teardown_module():
     """Teardown testenvironment for the module:
 
             - Remove dummy home dir tree
diff --git a/IPython/core/tests/test_profile.py b/IPython/core/tests/test_profile.py
index 021b31c3f17..e63fb3ef047 100644
--- a/IPython/core/tests/test_profile.py
+++ b/IPython/core/tests/test_profile.py
@@ -48,7 +48,7 @@
 # Setup/teardown functions/decorators
 #
 
-def setup():
+def setup_module():
     """Setup test environment for the module:
 
             - Adds dummy home dir tree
@@ -58,7 +58,7 @@ def setup():
     os.makedirs(IP_TEST_DIR)
 
 
-def teardown():
+def teardown_module():
     """Teardown test environment for the module:
 
             - Remove dummy home dir tree
diff --git a/IPython/utils/tests/test_module_paths.py b/IPython/utils/tests/test_module_paths.py
index 38551cf0e76..acdb770fa32 100644
--- a/IPython/utils/tests/test_module_paths.py
+++ b/IPython/utils/tests/test_module_paths.py
@@ -40,7 +40,7 @@ def make_empty_file(fname):
     open(fname, 'w').close()
 
 
-def setup():
+def setup_module():
     """Setup testenvironment for the module:
 
     """
@@ -54,7 +54,7 @@ def setup():
     make_empty_file(join(TMP_TEST_DIR, "packpyc.pyc"))
     sys.path = [TMP_TEST_DIR]
 
-def teardown():
+def teardown_module():
     """Teardown testenvironment for the module:
 
             - Remove tempdir
diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index cca238410a0..7ca2be20160 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -51,7 +51,7 @@
 # Setup/teardown functions/decorators
 #
 
-def setup():
+def setup_module():
     """Setup testenvironment for the module:
 
             - Adds dummy home dir tree
@@ -61,7 +61,7 @@ def setup():
     os.makedirs(os.path.join(HOME_TEST_DIR, 'ipython'))
 
 
-def teardown():
+def teardown_module():
     """Teardown testenvironment for the module:
 
             - Remove dummy home dir tree

From 522dc269b054580941f9f69b09d11ca0ef011227 Mon Sep 17 00:00:00 2001
From: Maor Kleinberger <kmaork@gmail.com>
Date: Fri, 7 Jun 2019 16:22:05 +0300
Subject: [PATCH 067/370] redirected output from core debugger to correct
 stdout

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

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index dc4a03ca757..3a546c684a4 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -295,7 +295,7 @@ def interaction(self, frame, traceback):
         try:
             OldPdb.interaction(self, frame, traceback)
         except KeyboardInterrupt:
-            sys.stdout.write('\n' + self.shell.get_exception_only())
+            self.stdout.write('\n' + self.shell.get_exception_only())
 
     def new_do_up(self, arg):
         OldPdb.do_up(self, arg)
@@ -339,7 +339,7 @@ def print_stack_trace(self, context=None):
         except KeyboardInterrupt:
             pass
 
-    def print_stack_entry(self,frame_lineno, prompt_prefix='\n-> ',
+    def print_stack_entry(self, frame_lineno, prompt_prefix='\n-> ',
                           context=None):
         if context is None:
             context = self.context
@@ -349,7 +349,7 @@ def print_stack_entry(self,frame_lineno, prompt_prefix='\n-> ',
                 raise ValueError("Context must be a positive integer")
         except (TypeError, ValueError):
                 raise ValueError("Context must be a positive integer")
-        print(self.format_stack_entry(frame_lineno, '', context))
+        print(self.format_stack_entry(frame_lineno, '', context), file=self.stdout)
 
         # vds: >>
         frame, lineno = frame_lineno
@@ -363,9 +363,9 @@ def format_stack_entry(self, frame_lineno, lprefix=': ', context=None):
         try:
             context=int(context)
             if context <= 0:
-                print("Context must be a positive integer")
+                print("Context must be a positive integer", file=self.stdout)
         except (TypeError, ValueError):
-                print("Context must be a positive integer")
+                print("Context must be a positive integer", file=self.stdout)
         try:
             import reprlib  # Py 3
         except ImportError:
@@ -487,7 +487,7 @@ def print_list_lines(self, filename, first, last):
                 src.append(line)
                 self.lineno = lineno
 
-            print(''.join(src))
+            print(''.join(src), file=self.stdout)
 
         except KeyboardInterrupt:
             pass
@@ -510,7 +510,7 @@ def do_list(self, arg):
                 else:
                     first = max(1, int(x) - 5)
             except:
-                print('*** Error in argument:', repr(arg))
+                print('*** Error in argument:', repr(arg), file=self.stdout)
                 return
         elif self.lineno is None:
             first = max(1, self.curframe.f_lineno - 5)

From d376f5b87aa11d0970c2d01ce68746601872606b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 17 Jun 2019 19:20:44 -0700
Subject: [PATCH 068/370] Add tests that the class attribute is properly
 updated

---
 IPython/extensions/tests/test_autoreload.py | 55 +++++++++++++++++++--
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index 40d63ffbf8e..cb046d958f9 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -39,7 +39,7 @@ class FakeShell:
 
     def __init__(self):
         self.ns = {}
-        self.user_ns = {}
+        self.user_ns = self.ns
         self.user_ns_hidden = {}
         self.events = EventManager(self, {'pre_run_cell', pre_run_cell})
         self.auto_magics = AutoreloadMagics(shell=self)
@@ -49,7 +49,7 @@ def __init__(self):
 
     def run_code(self, code):
         self.events.trigger('pre_run_cell')
-        exec(code, self.ns)
+        exec(code, self.user_ns)
         self.auto_magics.post_execute_hook()
 
     def push(self, items):
@@ -106,7 +106,7 @@ def write_file(self, filename, content):
         (because that is stored in the file).  The only reliable way
         to achieve this seems to be to sleep.
         """
-
+        content = textwrap.dedent(content)
         # Sleep one second + eps
         time.sleep(1.05)
 
@@ -115,6 +115,7 @@ def write_file(self, filename, content):
             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:
             f.write(code)
@@ -124,6 +125,17 @@ def new_module(self, code):
 # Test automatic reloading
 #-----------------------------------------------------------------------------
 
+def pickle_get_current_class(obj):
+    """
+    Original issue comes from pickle; hence the name.
+    """
+    name = obj.__class__.__name__
+    module_name = getattr(obj, "__module__", None)
+    obj2 = sys.modules[module_name]
+    for subpath in name.split("."):
+        obj2 = getattr(obj2, subpath)
+    return obj2
+
 class TestAutoreload(Fixture):
 
     @skipif(sys.version_info < (3, 6))
@@ -147,6 +159,42 @@ class MyEnum(Enum):
         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):
+        self.shell.magic_autoreload("2")
+        mod_name, mod_fn = self.new_module(
+            """
+            class Test():
+                def meth(self):
+                    return "old"
+        """
+        )
+        assert "test" not in self.shell.ns
+        assert "result" not in self.shell.ns
+
+        self.shell.run_code("from %s import Test" % mod_name)
+        self.shell.run_code("test = Test()")
+
+        self.write_file(
+            mod_fn,
+            """
+            class Test():
+                def meth(self):
+                    return "new"
+        """,
+        )
+
+        test_object = self.shell.ns["test"]
+
+        # important to trigger autoreload logic !
+        self.shell.run_code("pass")
+
+        test_class = pickle_get_current_class(test_object)
+        assert isinstance(test_object, test_class)
+
+        # extra check.
+        self.shell.run_code("import pickle")
+        self.shell.run_code("p = pickle.dumps(test)")
+
     def test_reload_class_attributes(self):
         self.shell.magic_autoreload("2")
         mod_name, mod_fn = self.new_module(textwrap.dedent("""
@@ -398,3 +446,4 @@ def test_smoketest_autoreload(self):
 
 
 
+

From 3fd58dc8d362258288fa30979cb002088f2068fb Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 17 Jun 2019 19:56:25 -0700
Subject: [PATCH 069/370] remove debug statement

---
 IPython/extensions/autoreload.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index 353124ae855..da9cc0e13ef 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -323,7 +323,6 @@ def update_instances(old, new, objects=None, visited={}):
 def update_class(old, new):
     """Replace stuff in the __dict__ of a class, and upgrade
     method code objects, and add new methods, if any"""
-    print('old is', id(old))
     for key in list(old.__dict__.keys()):
         old_obj = getattr(old, key)
         try:

From 17c73977b3216502e3d665f8a88a994bede7ae92 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 18 Jun 2019 10:29:36 -0700
Subject: [PATCH 070/370] Prepare some test for pytest in completers.

swap the context manager and the function definition.
It is undefined wither the test are collected and then run at once; or
ran while they are being yielded.

In the fist case (what pytest does) the function was called outside the
context manager, in the later case (node) it was working as expected.
---
 IPython/core/tests/test_completer.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 204c81c105a..a69cf9349e9 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -387,8 +387,8 @@ def test_greedy_completions():
     _,c = ip.complete('.',line='a[0].')
     nt.assert_false('.real' in c,
                     "Shouldn't have completed on a[0]: %s"%c)
-    with greedy_completion(), provisionalcompleter():
-        def _(line, cursor_pos, expect, message, completion):
+    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)
@@ -398,6 +398,7 @@ def _(line, cursor_pos, expect, message, completion):
                 completions = ip.Completer.completions(line, cursor_pos)
             nt.assert_in(completion, completions)
 
+    with provisionalcompleter():
         yield _, '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')
 

From 59d939198cd2c51433fc3074b705c7489431d648 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 18 Jun 2019 10:36:39 -0700
Subject: [PATCH 071/370] Remove assignment to ip in test files

This is already added in globals by the test runner
---
 IPython/core/tests/test_async_helpers.py | 3 +--
 IPython/core/tests/test_autocall.py      | 5 -----
 IPython/core/tests/test_displayhook.py   | 2 --
 IPython/core/tests/test_handlers.py      | 2 --
 IPython/core/tests/test_iplib.py         | 8 --------
 IPython/core/tests/test_logger.py        | 2 --
 IPython/core/tests/test_prefilter.py     | 2 --
 IPython/core/tests/test_prompts.py       | 4 ----
 8 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/IPython/core/tests/test_async_helpers.py b/IPython/core/tests/test_async_helpers.py
index a31c67b4e31..f23eae06acc 100644
--- a/IPython/core/tests/test_async_helpers.py
+++ b/IPython/core/tests/test_async_helpers.py
@@ -3,7 +3,6 @@
 
 Should only trigger on python 3.5+ or will have syntax errors.
 """
-
 import sys
 from itertools import chain, repeat
 import nose.tools as nt
@@ -11,7 +10,7 @@
 from unittest import TestCase
 from IPython.testing.decorators import skip_without
 
-ip = get_ipython()
+
 iprc = lambda x: ip.run_cell(dedent(x)).raise_error()
 iprc_nr = lambda x: ip.run_cell(dedent(x))
 
diff --git a/IPython/core/tests/test_autocall.py b/IPython/core/tests/test_autocall.py
index a8a3761162e..10a4e0d477d 100644
--- a/IPython/core/tests/test_autocall.py
+++ b/IPython/core/tests/test_autocall.py
@@ -8,11 +8,6 @@
 from IPython.core.splitinput import LineInfo
 from IPython.core.prefilter import AutocallChecker
 from IPython.utils import py3compat
-from IPython.testing.globalipapp import get_ipython
-
-
-ip = get_ipython()
-
 
 def doctest_autocall():
     """
diff --git a/IPython/core/tests/test_displayhook.py b/IPython/core/tests/test_displayhook.py
index 12f4a8d1fa5..7c1a9de02c4 100644
--- a/IPython/core/tests/test_displayhook.py
+++ b/IPython/core/tests/test_displayhook.py
@@ -3,8 +3,6 @@
 from IPython.core.displayhook import CapturingDisplayHook
 from IPython.utils.capture import CapturedIO
 
-ip = get_ipython()
-
 def test_output_displayed():
     """Checking to make sure that output is displayed"""
   
diff --git a/IPython/core/tests/test_handlers.py b/IPython/core/tests/test_handlers.py
index 45409d93120..e87e29dbd31 100644
--- a/IPython/core/tests/test_handlers.py
+++ b/IPython/core/tests/test_handlers.py
@@ -10,7 +10,6 @@
 # our own packages
 from IPython.core import autocall
 from IPython.testing import tools as tt
-from IPython.testing.globalipapp import get_ipython
 from IPython.utils import py3compat
 
 #-----------------------------------------------------------------------------
@@ -18,7 +17,6 @@
 #-----------------------------------------------------------------------------
 
 # Get the public instance of IPython
-ip = get_ipython()
 
 failures = []
 num_tests = 0
diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
index b5305d447ed..adadae56ab9 100644
--- a/IPython/core/tests/test_iplib.py
+++ b/IPython/core/tests/test_iplib.py
@@ -8,14 +8,6 @@
 import nose.tools as nt
 
 # our own packages
-from IPython.testing.globalipapp import get_ipython
-
-#-----------------------------------------------------------------------------
-# Globals
-#-----------------------------------------------------------------------------
-
-# Get the public instance of IPython
-ip = get_ipython()
 
 #-----------------------------------------------------------------------------
 # Test functions
diff --git a/IPython/core/tests/test_logger.py b/IPython/core/tests/test_logger.py
index 4d61ff2433d..ebebac16cfe 100644
--- a/IPython/core/tests/test_logger.py
+++ b/IPython/core/tests/test_logger.py
@@ -6,8 +6,6 @@
 import nose.tools as nt
 from IPython.utils.tempdir import TemporaryDirectory
 
-_ip = get_ipython()
-
 def test_logstart_inaccessible_file():
     try:
         _ip.logger.logstart(logfname="/")   # Opening that filename will fail.
diff --git a/IPython/core/tests/test_prefilter.py b/IPython/core/tests/test_prefilter.py
index 83d8e908427..0e61b4693f7 100644
--- a/IPython/core/tests/test_prefilter.py
+++ b/IPython/core/tests/test_prefilter.py
@@ -6,12 +6,10 @@
 import nose.tools as nt
 
 from IPython.core.prefilter import AutocallChecker
-from IPython.testing.globalipapp import get_ipython
 
 #-----------------------------------------------------------------------------
 # Tests
 #-----------------------------------------------------------------------------
-ip = get_ipython()
 
 def test_prefilter():
     """Test user input conversions"""
diff --git a/IPython/core/tests/test_prompts.py b/IPython/core/tests/test_prompts.py
index 4082b1408ef..95e6163b213 100644
--- a/IPython/core/tests/test_prompts.py
+++ b/IPython/core/tests/test_prompts.py
@@ -4,10 +4,6 @@
 import unittest
 
 from IPython.core.prompts import  LazyEvaluate
-from IPython.testing.globalipapp import get_ipython
-
-ip = get_ipython()
-
 
 class PromptTests(unittest.TestCase):
     def test_lazy_eval_unicode(self):

From 24314829e46a9fd6026623be07dcbe95395e5de2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 18 Jun 2019 11:07:22 -0700
Subject: [PATCH 072/370] Fix skip decorator.

If called w/o argument would just skip the function always.
Now raises if no message is passed.
---
 IPython/testing/decorators.py            | 6 ++++--
 IPython/testing/tests/test_decorators.py | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
index fff6221a20c..91e7193cbe6 100644
--- a/IPython/testing/decorators.py
+++ b/IPython/testing/decorators.py
@@ -245,8 +245,10 @@ def skip(msg=None):
          Decorator, which, when applied to a function, causes SkipTest
          to be raised, with the optional message added.
       """
-
-    return skipif(True,msg)
+    if msg and not isinstance(msg, str):
+        raise ValueError('invalid object passed to `@skip` decorator, did you '
+                         'meant `@skip()` with brackets ?')
+    return skipif(True, msg)
 
 
 def onlyif(condition, msg):
diff --git a/IPython/testing/tests/test_decorators.py b/IPython/testing/tests/test_decorators.py
index ef346253487..dc1ff41d7da 100644
--- a/IPython/testing/tests/test_decorators.py
+++ b/IPython/testing/tests/test_decorators.py
@@ -46,7 +46,7 @@ def trivial():
     pass
 
 
-@dec.skip
+@dec.skip()
 def test_deliberately_broken():
     """A deliberately broken test - we want to skip this one."""
     1/0

From 7957b6e013683a021576c7debe4201c80a5f6497 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 18 Jun 2019 11:32:08 -0700
Subject: [PATCH 073/370] Prepare completer for pytest.

use proper unittest class with setup and teardown methods to capture
deprecation warnings; and move support classes and function outside of
the testcase definition.

Make all standalone functions methods.

Beyond this no code change.
---
 IPython/core/tests/test_completer.py | 1736 +++++++++++++-------------
 1 file changed, 877 insertions(+), 859 deletions(-)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index a69cf9349e9..03bd2a2f4ff 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -109,943 +109,961 @@ def test_line_split():
     check_line_split(sp, [ map(str, p) for p in t] )
 
 
-def test_custom_completion_error():
-    """Test that errors from custom attribute completers are silenced."""
-    ip = get_ipython()
-    class A(object): pass
-    ip.user_ns['a'] = A()
-    
-    @complete_object.register(A)
-    def complete_A(a, existing_completions):
-        raise TypeError("this should be silenced")
-    
-    ip.complete("a.")
-
 
-def test_unicode_completions():
-    ip = get_ipython()
-    # Some strings that trigger different types of completion.  Check them both
-    # in str and unicode forms
-    s = ['ru', '%ru', 'cd /', 'floa', 'float(x)/']
-    for t in s + list(map(str, s)):
-        # We don't need to check exact completion values (they may change
-        # depending on the state of the namespace, but at least no exceptions
-        # 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))
-
-def test_latex_completions():
-    from IPython.core.latex_symbols import latex_symbols
-    import random
-    ip = get_ipython()
-    # Test some random unicode symbols
-    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])
-    # Test a more complex line
-    text, matches = ip.complete(u'print(\\alpha')
-    nt.assert_equal(text, u'\\alpha')
-    nt.assert_equal(matches[0], latex_symbols['\\alpha'])
-    # Test multiple matching latex symbols
-    text, matches = ip.complete(u'\\al')
-    nt.assert_in('\\alpha', matches)
-    nt.assert_in('\\aleph', matches)
-
-
-
-
-def test_back_latex_completion():
-    ip = get_ipython()
+class NamedInstanceMetaclass(type):
+    def __getitem__(cls, item):
+        return cls.get_instance(item)
 
-    # 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')
+class NamedInstanceClass(object, metaclass=NamedInstanceMetaclass):
+    def __init__(self, name):
+        if not hasattr(self.__class__, 'instances'):
+            self.__class__.instances = {}
+        self.__class__.instances[name] = self
 
-def test_back_unicode_completion():
-    ip = get_ipython()
-    
-    name, matches = ip.complete('\\Ⅴ')
-    nt.assert_equal(len(matches), 1)
-    nt.assert_equal(matches[0], '\\ROMAN NUMERAL FIVE')
+    @classmethod
+    def _ipython_key_completions_(cls):
+        return cls.instances.keys()
 
+    @classmethod
+    def get_instance(cls, name):
+        return cls.instances[name]
 
-def test_forward_unicode_completion():
-    ip = get_ipython()
-    
-    name, matches = ip.complete('\\ROMAN NUMERAL FIVE')
-    nt.assert_equal(len(matches), 1)
-    nt.assert_equal(matches[0], 'Ⅴ')
-
-@nt.nottest # now we have a completion for \jmath
-@decorators.knownfailureif(sys.platform == 'win32', 'Fails if there is a C:\\j... path')
-def test_no_ascii_back_completion():
-    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)
-            nt.assert_equal(matches, [])
+class KeyCompletable(object):
+    def __init__(self, things=()):
+        self.things = things
 
+    def _ipython_key_completions_(self):
+        return list(self.things)
 
 
+class TestCompleter(unittest.TestCase):
 
-class CompletionSplitterTestCase(unittest.TestCase):
     def setUp(self):
-        self.sp = completer.CompletionSplitter()
-
-    def test_delim_setting(self):
-        self.sp.delims = ' '
-        nt.assert_equal(self.sp.delims, ' ')
-        nt.assert_equal(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_has_open_quotes1():
-    for s in ["'", "'''", "'hi' '"]:
-        nt.assert_equal(completer.has_open_quotes(s), "'")
-
-
-def test_has_open_quotes2():
-    for s in ['"', '"""', '"hi" "']:
-        nt.assert_equal(completer.has_open_quotes(s), '"')
-
-
-def test_has_open_quotes3():
-    for s in ["''", "''' '''", "'hi' 'ipython'"]:
-        nt.assert_false(completer.has_open_quotes(s))
-
-
-def test_has_open_quotes4():
-    for s in ['""', '""" """', '"hi" "ipython"']:
-        nt.assert_false(completer.has_open_quotes(s))
-
-
-@decorators.knownfailureif(sys.platform == 'win32', "abspath completions fail on Windows")
-def test_abspath_file_completions():
-    ip = get_ipython()
-    with TemporaryDirectory() as tmpdir:
-        prefix = os.path.join(tmpdir, 'foo')
-        suffixes = ['1', '2']
-        names = [prefix+s for s in suffixes]
-        for n in names:
-            open(n, 'w').close()
-
-        # Check simple completion
-        c = ip.complete(prefix)[1]
-        nt.assert_equal(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)
-
-
-def test_local_file_completions():
-    ip = get_ipython()
-    with TemporaryWorkingDirectory():
-        prefix = './foo'
-        suffixes = ['1', '2']
-        names = [prefix+s for s in suffixes]
-        for n in names:
-            open(n, 'w').close()
+        """
+        We want to silence all PendingDeprecationWarning when testing the completer
+        """
+        self._assertwarns = self.assertWarns(PendingDeprecationWarning)
+        self._assertwarns.__enter__()
+
+    def tearDown(self):
+        try:
+            self._assertwarns.__exit__(None, None, None)
+        except AssertionError:
+            pass
+
+
+    def test_custom_completion_error(self):
+        """Test that errors from custom attribute completers are silenced."""
+        ip = get_ipython()
+        class A(object): pass
+        ip.user_ns['x'] = A()
+        
+        @complete_object.register(A)
+        def complete_A(a, existing_completions):
+            raise TypeError("this should be silenced")
+        
+        ip.complete("x.")
+
+    def test_unicode_completions(self):
+        ip = get_ipython()
+        # Some strings that trigger different types of completion.  Check them both
+        # in str and unicode forms
+        s = ['ru', '%ru', 'cd /', 'floa', 'float(x)/']
+        for t in s + list(map(str, s)):
+            # We don't need to check exact completion values (they may change
+            # depending on the state of the namespace, but at least no exceptions
+            # 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))
+
+    def test_latex_completions(self):
+        from IPython.core.latex_symbols import latex_symbols
+        import random
+        ip = get_ipython()
+        # Test some random unicode symbols
+        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])
+        # Test a more complex line
+        text, matches = ip.complete(u'print(\\alpha')
+        nt.assert_equal(text, u'\\alpha')
+        nt.assert_equal(matches[0], latex_symbols['\\alpha'])
+        # Test multiple matching latex symbols
+        text, matches = ip.complete(u'\\al')
+        nt.assert_in('\\alpha', matches)
+        nt.assert_in('\\aleph', 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')
+
+    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')
 
-        # Check simple completion
-        c = ip.complete(prefix)[1]
-        nt.assert_equal(c, names)
 
-        # Now check with a function call
-        cmd = 'a = f("%s' % prefix
-        c = ip.complete(prefix, cmd)[1]
-        comp = set(prefix+s for s in suffixes)
-        nt.assert_true(comp.issubset(set(c)))
+    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.nottest # now we have a completion for \jmath
+    @decorators.knownfailureif(sys.platform == 'win32', '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)
+                nt.assert_equal(matches, [])
+
+
+
+
+    class CompletionSplitterTestCase(unittest.TestCase):
+        def setUp(self):
+            self.sp = completer.CompletionSplitter()
+
+        def test_delim_setting(self):
+            self.sp.delims = ' '
+            nt.assert_equal(self.sp.delims, ' ')
+            nt.assert_equal(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_quoted_file_completions():
-    ip = get_ipython()
-    with TemporaryWorkingDirectory():
-        name = "foo'bar"
-        open(name, 'w').close()
-
-        # Don't escape Windows
-        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]
-        nt.assert_equal(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])
-
-        # 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])
-
-
-def test_jedi():
-    """
-    A couple of issue we had with Jedi
-    """
-    ip = get_ipython()
+    def test_has_open_quotes1(self):
+        for s in ["'", "'''", "'hi' '"]:
+            nt.assert_equal(completer.has_open_quotes(s), "'")
+
+
+    def test_has_open_quotes2(self):
+        for s in ['"', '"""', '"hi" "']:
+            nt.assert_equal(completer.has_open_quotes(s), '"')
+
+
+    def test_has_open_quotes3(self):
+        for s in ["''", "''' '''", "'hi' 'ipython'"]:
+            nt.assert_false(completer.has_open_quotes(s))
+
+
+    def test_has_open_quotes4(self):
+        for s in ['""', '""" """', '"hi" "ipython"']:
+            nt.assert_false(completer.has_open_quotes(s))
+
+
+    @decorators.knownfailureif(sys.platform == 'win32', "abspath completions fail on Windows")
+    def test_abspath_file_completions(self):
+        ip = get_ipython()
+        with TemporaryDirectory() as tmpdir:
+            prefix = os.path.join(tmpdir, 'foo')
+            suffixes = ['1', '2']
+            names = [prefix+s for s in suffixes]
+            for n in names:
+                open(n, 'w').close()
+
+            # Check simple completion
+            c = ip.complete(prefix)[1]
+            nt.assert_equal(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)
+
+
+    def test_local_file_completions(self):
+        ip = get_ipython()
+        with TemporaryWorkingDirectory():
+            prefix = './foo'
+            suffixes = ['1', '2']
+            names = [prefix+s for s in suffixes]
+            for n in names:
+                open(n, 'w').close()
+
+            # Check simple completion
+            c = ip.complete(prefix)[1]
+            nt.assert_equal(c, names)
+
+            # Now check with a function call
+            cmd = 'a = f("%s' % prefix
+            c = ip.complete(prefix, cmd)[1]
+            comp = set(prefix+s for s in suffixes)
+            nt.assert_true(comp.issubset(set(c)))
+
+
+    def test_quoted_file_completions(self):
+        ip = get_ipython()
+        with TemporaryWorkingDirectory():
+            name = "foo'bar"
+            open(name, 'w').close()
+
+            # Don't escape Windows
+            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]
+            nt.assert_equal(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])
+
+            # 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])
+
+
+    def test_jedi(self):
+        """
+        A couple of issue we had with Jedi
+        """
+        ip = get_ipython()
+
+        def _test_complete(reason, s, comp, start=None, end=None):
+            l = len(s)
+            start = start if start is not None else l
+            end = end if end is not None else l
+            with provisionalcompleter():
+                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)
 
-    def _test_complete(reason, s, comp, start=None, end=None):
-        l = len(s)
-        start = start if start is not None else l
-        end = end if end is not None else l
+        def _test_not_complete(reason, s, comp):
+            l = len(s)
+            with provisionalcompleter():
+                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)
+
+        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
+
+        yield _test_not_complete, 'does not mix types', 'a=(1,"foo");a[0].', 'capitalize'
+
+    def test_completion_have_signature(self):
+        """
+        Lets make sure jedi is capable of pulling out the signature of the function we are completing.
+        """
+        ip = get_ipython()
         with provisionalcompleter():
             ip.Completer.use_jedi = True
-            completions = set(ip.Completer.completions(s, l))
+            completions = ip.Completer.completions('ope', 3)
+            c = next(completions)  # should be `open`
             ip.Completer.use_jedi = False
-            assert_in(Completion(start, end, comp), completions, reason)
-
-    def _test_not_complete(reason, s, comp):
-        l = len(s)
+        assert 'file' in c.signature, "Signature of function was not found by completer"
+        assert 'encoding' in c.signature, "Signature of function was not found by completer"
+
+
+    def test_deduplicate_completions(self):
+        """
+        Test that completions are correctly deduplicated (even if ranges are not the same)
+        """
+        ip = get_ipython()
+        ip.ex(textwrap.dedent('''
+        class Z:
+            zoo = 1
+        '''))
         with provisionalcompleter():
             ip.Completer.use_jedi = True
-            completions = set(ip.Completer.completions(s, l))
+            l = list(_deduplicate_completions('Z.z', ip.Completer.completions('Z.z', 3)))
             ip.Completer.use_jedi = False
-            assert_not_in(Completion(l, l, comp), 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
-
-    yield _test_not_complete, 'does not mix types', 'a=(1,"foo");a[0].', 'capitalize'
-
-def test_completion_have_signature():
-    """
-    Lets make sure jedi is capable of pulling out the signature of the function we are completing.
-    """
-    ip = get_ipython()
-    with provisionalcompleter():
-        ip.Completer.use_jedi = True
-        completions = ip.Completer.completions('ope', 3)
-        c = next(completions)  # should be `open`
-        ip.Completer.use_jedi = False
-    assert 'file' in c.signature, "Signature of function was not found by completer"
-    assert 'encoding' in c.signature, "Signature of function was not found by completer"
 
+        assert len(l) == 1, 'Completions (Z.z<tab>) correctly deduplicate: %s ' % l
+        assert l[0].text == 'zoo'  # and not `it.accumulate`
 
-def test_deduplicate_completions():
-    """
-    Test that completions are correctly deduplicated (even if ranges are not the same)
-    """
-    ip = get_ipython()
-    ip.ex(textwrap.dedent('''
-    class Z:
-        zoo = 1
-    '''))
-    with provisionalcompleter():
-        ip.Completer.use_jedi = True
-        l = list(_deduplicate_completions('Z.z', ip.Completer.completions('Z.z', 3)))
-        ip.Completer.use_jedi = False
 
-    assert len(l) == 1, 'Completions (Z.z<tab>) correctly deduplicate: %s ' % l
-    assert l[0].text == 'zoo'  # and not `it.accumulate`
+    def test_greedy_completions(self):
+        """
+        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. 
 
-def test_greedy_completions():
-    """
-    Test the capability of the Greedy completer. 
+        See the :any:`test_dict_key_completion_contexts`
 
-    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. 
+        """
+        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)
+        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)
 
-    See the :any:`test_dict_key_completion_contexts`
+                ip.Completer.use_jedi = True
+                with provisionalcompleter():
+                    completions = ip.Completer.completions(line, cursor_pos)
+                nt.assert_in(completion, completions)
 
-    """
-    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)
-    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)
-
-            ip.Completer.use_jedi = True
-            with provisionalcompleter():
-                completions = ip.Completer.completions(line, cursor_pos)
-            nt.assert_in(completion, completions)
+        with provisionalcompleter():
+            yield _, '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')
+
+            if sys.version_info > (3, 4):
+                yield _, '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):
+        # also happens to test IPCompleter as a configurable
+        ip = get_ipython()
+        ip._hidden_attr = 1
+        ip._x = {}
+        c = ip.Completer
+        ip.ex('ip=get_ipython()')
+        cfg = Config()
+        cfg.IPCompleter.omit__names = 0
+        c.update_config(cfg)
+        with provisionalcompleter():
+            c.use_jedi = False
+            s,matches = c.complete('ip.')
+            nt.assert_in('ip.__str__', matches)
+            nt.assert_in('ip._hidden_attr', matches)
 
-    with provisionalcompleter():
-        yield _, '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')
+            # 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)
 
-        if sys.version_info > (3, 4):
-            yield _, 'a[0].from_', 10, 'a[0].from_bytes', "Should have completed on a[0].from_: %s", Completion(5, 10, 'from_bytes')
 
+        cfg = Config()
+        cfg.IPCompleter.omit__names = 1
+        c.update_config(cfg)
+        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)
+
+            # 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)
+
+        cfg = Config()
+        cfg.IPCompleter.omit__names = 2
+        c.update_config(cfg)
+        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)
 
-def test_omit__names():
-    # also happens to test IPCompleter as a configurable
-    ip = get_ipython()
-    ip._hidden_attr = 1
-    ip._x = {}
-    c = ip.Completer
-    ip.ex('ip=get_ipython()')
-    cfg = Config()
-    cfg.IPCompleter.omit__names = 0
-    c.update_config(cfg)
-    with provisionalcompleter():
-        c.use_jedi = False
-        s,matches = c.complete('ip.')
-        nt.assert_in('ip.__str__', matches)
-        nt.assert_in('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)
 
-        # 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)
+        with provisionalcompleter():
+            c.use_jedi = False
+            s,matches = c.complete('ip._x.')
+            nt.assert_in('ip._x.keys', matches)
 
+            # c.use_jedi = True
+            # completions = set(c.completions('ip._x.', 6))
+            # nt.assert_in(Completion(6,6, "keys"), completions)
 
-    cfg = Config()
-    cfg.IPCompleter.omit__names = 1
-    c.update_config(cfg)
-    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)
-
-        # 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)
-
-    cfg = Config()
-    cfg.IPCompleter.omit__names = 2
-    c.update_config(cfg)
-    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)
+        del ip._hidden_attr
+        del ip._x
 
-        # 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)
 
-    with provisionalcompleter():
+    def test_limit_to__all__False_ok(self):
+        """
+        Limit to all is deprecated, once we remove it this test can go away. 
+        """
+        ip = get_ipython()
+        c = ip.Completer
         c.use_jedi = False
-        s,matches = c.complete('ip._x.')
-        nt.assert_in('ip._x.keys', matches)
+        ip.ex('class D: x=24')
+        ip.ex('d=D()')
+        cfg = Config()
+        cfg.IPCompleter.limit_to__all__ = False
+        c.update_config(cfg)
+        s, matches = c.complete('d.')
+        nt.assert_in('d.x', matches)
 
-        # c.use_jedi = True
-        # completions = set(c.completions('ip._x.', 6))
-        # nt.assert_in(Completion(6,6, "keys"), completions)
 
-    del ip._hidden_attr
-    del ip._x
+    def test_get__all__entries_ok(self):
+        class A(object):
+            __all__ = ['x', 1]
+        words = completer.get__all__entries(A())
+        nt.assert_equal(words, ['x'])
 
 
-def test_limit_to__all__False_ok():
-    """
-    Limit to all is deprecated, once we remove it this test can go away. 
-    """
-    ip = get_ipython()
-    c = ip.Completer
-    c.use_jedi = False
-    ip.ex('class D: x=24')
-    ip.ex('d=D()')
-    cfg = Config()
-    cfg.IPCompleter.limit_to__all__ = False
-    c.update_config(cfg)
-    s, matches = c.complete('d.')
-    nt.assert_in('d.x', matches)
+    def test_get__all__entries_no__all__ok(self):
+        class A(object):
+            pass
+        words = completer.get__all__entries(A())
+        nt.assert_equal(words, [])
 
 
-def test_get__all__entries_ok():
-    class A(object):
-        __all__ = ['x', 1]
-    words = completer.get__all__entries(A())
-    nt.assert_equal(words, ['x'])
+    def test_func_kw_completions(self):
+        ip = get_ipython()
+        c = ip.Completer
+        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)
+        # Simulate completing with cursor right after b (pos==10):
+        s, matches = c.complete(None, 'myfunc(1,b)', 10)
+        nt.assert_in('b=', matches)
+        s, matches = c.complete(None, 'myfunc(a="escaped\\")string",b')
+        nt.assert_in('b=', matches)
+        #builtin function
+        s, matches = c.complete(None, 'min(k, k')
+        nt.assert_in('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'])
+        #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'])
+        #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'])
+
+    def test_line_magics(self):
+        ip = get_ipython()
+        c = ip.Completer
+        s, matches = c.complete(None, 'lsmag')
+        nt.assert_in('%lsmagic', matches)
+        s, matches = c.complete(None, '%lsmag')
+        nt.assert_in('%lsmagic', matches)
+
+
+    def test_cell_magics(self):
+        from IPython.core.magic import register_cell_magic
+
+        @register_cell_magic
+        def _foo_cellm(line, cell):
+            pass
+        
+        ip = get_ipython()
+        c = ip.Completer
 
+        s, matches = c.complete(None, '_foo_ce')
+        nt.assert_in('%%_foo_cellm', matches)
+        s, matches = c.complete(None, '%%_foo_ce')
+        nt.assert_in('%%_foo_cellm', matches)
 
-def test_get__all__entries_no__all__ok():
-    class A(object):
-        pass
-    words = completer.get__all__entries(A())
-    nt.assert_equal(words, [])
 
+    def test_line_cell_magics(self):
+        from IPython.core.magic import register_line_cell_magic
 
-def test_func_kw_completions():
-    ip = get_ipython()
-    c = ip.Completer
-    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)
-    # Simulate completing with cursor right after b (pos==10):
-    s, matches = c.complete(None, 'myfunc(1,b)', 10)
-    nt.assert_in('b=', matches)
-    s, matches = c.complete(None, 'myfunc(a="escaped\\")string",b')
-    nt.assert_in('b=', matches)
-    #builtin function
-    s, matches = c.complete(None, 'min(k, k')
-    nt.assert_in('key=', matches)
-
-
-def test_default_arguments_from_docstring():
-    ip = get_ipython()
-    c = ip.Completer
-    kwd = c._default_arguments_from_docstring(
-        'min(iterable[, key=func]) -> value')
-    nt.assert_equal(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'])
-    #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'])
-
-def test_line_magics():
-    ip = get_ipython()
-    c = ip.Completer
-    s, matches = c.complete(None, 'lsmag')
-    nt.assert_in('%lsmagic', matches)
-    s, matches = c.complete(None, '%lsmag')
-    nt.assert_in('%lsmagic', matches)
+        @register_line_cell_magic
+        def _bar_cellm(line, cell):
+            pass
+        
+        ip = get_ipython()
+        c = ip.Completer
+
+        # The policy here is trickier, see comments in completion code.  The
+        # returned values depend on whether the user passes %% or not explicitly,
+        # 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)
+        s, matches = c.complete(None, '%_bar_ce')
+        nt.assert_in('%_bar_cellm', matches)
+        nt.assert_in('%%_bar_cellm', matches)
+        s, matches = c.complete(None, '%%_bar_ce')
+        nt.assert_not_in('%_bar_cellm', matches)
+        nt.assert_in('%%_bar_cellm', matches)
+
+
+    def test_magic_completion_order(self):
+        ip = get_ipython()
+        c = ip.Completer
+
+        # Test ordering of line and cell magics.
+        text, matches = c.complete("timeit")
+        nt.assert_equal(matches, ["%timeit", "%%timeit"])
+
+
+    def test_magic_completion_shadowing(self):
+        ip = get_ipython()
+        c = ip.Completer
+        c.use_jedi = False
 
+        # Before importing matplotlib, %matplotlib magic should be the only option.
+        text, matches = c.complete("mat")
+        nt.assert_equal(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"])
+
+        # 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"])
+
+    def test_magic_completion_shadowing_explicit(self):
+        """
+        If the user try to complete a shadowed magic, and explicit % start should
+        still return the completions.
+        """
+        ip = get_ipython()
+        c = ip.Completer
+
+        # Before importing matplotlib, %matplotlib magic should be the only option.
+        text, matches = c.complete("%mat")
+        nt.assert_equal(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"])
+
+    def test_magic_config(self):
+        ip = get_ipython()
+        c = ip.Completer
+
+        s, matches = c.complete(None, 'conf')
+        nt.assert_in('%config', matches)
+        s, matches = c.complete(None, 'conf')
+        nt.assert_not_in('AliasManager', matches)
+        s, matches = c.complete(None, 'config ')
+        nt.assert_in('AliasManager', matches)
+        s, matches = c.complete(None, '%config ')
+        nt.assert_in('AliasManager', matches)
+        s, matches = c.complete(None, 'config Ali')
+        nt.assert_list_equal(['AliasManager'], matches)
+        s, matches = c.complete(None, '%config Ali')
+        nt.assert_list_equal(['AliasManager'], matches)
+        s, matches = c.complete(None, 'config AliasManager')
+        nt.assert_list_equal(['AliasManager'], matches)
+        s, matches = c.complete(None, '%config AliasManager')
+        nt.assert_list_equal(['AliasManager'], matches)
+        s, matches = c.complete(None, 'config AliasManager.')
+        nt.assert_in('AliasManager.default_aliases', matches)
+        s, matches = c.complete(None, '%config AliasManager.')
+        nt.assert_in('AliasManager.default_aliases', matches)
+        s, matches = c.complete(None, 'config AliasManager.de')
+        nt.assert_list_equal(['AliasManager.default_aliases'], matches)
+        s, matches = c.complete(None, 'config AliasManager.de')
+        nt.assert_list_equal(['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)
+        s, matches = c.complete(None, 'colo')
+        nt.assert_not_in('NoColor', matches)
+        s, matches = c.complete(None, '%colors')  # No trailing space
+        nt.assert_not_in('NoColor', matches)
+        s, matches = c.complete(None, 'colors ')
+        nt.assert_in('NoColor', matches)
+        s, matches = c.complete(None, '%colors ')
+        nt.assert_in('NoColor', matches)
+        s, matches = c.complete(None, 'colors NoCo')
+        nt.assert_list_equal(['NoColor'], matches)
+        s, matches = c.complete(None, '%colors NoCo')
+        nt.assert_list_equal(['NoColor'], matches)
+
+
+    def test_match_dict_keys(self):
+        """
+        Test that match_dict_keys works on a couple of use case does return what
+        expected, and does not crash
+        """
+        delims = ' \t\n`!@#$^&*()=+[{]}\\|;:\'",<>?'
+
+
+        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_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'])
+        
+        match_dict_keys
 
-def test_cell_magics():
-    from IPython.core.magic import register_cell_magic
 
-    @register_cell_magic
-    def _foo_cellm(line, cell):
-        pass
-    
-    ip = get_ipython()
-    c = ip.Completer
+    def test_dict_key_completion_string(self):
+        """Test dictionary key completion for string keys"""
+        ip = get_ipython()
+        complete = ip.Completer.complete
 
-    s, matches = c.complete(None, '_foo_ce')
-    nt.assert_in('%%_foo_cellm', matches)
-    s, matches = c.complete(None, '%%_foo_ce')
-    nt.assert_in('%%_foo_cellm', matches)
+        ip.user_ns['d'] = {'abc': None}
 
+        # check completion at different stages
+        _, matches = complete(line_buffer="d[")
+        nt.assert_in("'abc'", matches)
+        nt.assert_not_in("'abc']", matches)
 
-def test_line_cell_magics():
-    from IPython.core.magic import register_line_cell_magic
+        _, matches = complete(line_buffer="d['")
+        nt.assert_in("abc", matches)
+        nt.assert_not_in("abc']", matches)
 
-    @register_line_cell_magic
-    def _bar_cellm(line, cell):
-        pass
-    
-    ip = get_ipython()
-    c = ip.Completer
-
-    # The policy here is trickier, see comments in completion code.  The
-    # returned values depend on whether the user passes %% or not explicitly,
-    # 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)
-    s, matches = c.complete(None, '%_bar_ce')
-    nt.assert_in('%_bar_cellm', matches)
-    nt.assert_in('%%_bar_cellm', matches)
-    s, matches = c.complete(None, '%%_bar_ce')
-    nt.assert_not_in('%_bar_cellm', matches)
-    nt.assert_in('%%_bar_cellm', matches)
-
-
-def test_magic_completion_order():
-    ip = get_ipython()
-    c = ip.Completer
+        _, matches = complete(line_buffer="d['a")
+        nt.assert_in("abc", matches)
+        nt.assert_not_in("abc']", matches)
 
-    # Test ordering of line and cell magics.
-    text, matches = c.complete("timeit")
-    nt.assert_equal(matches, ["%timeit", "%%timeit"])
+        # check use of different quoting
+        _, matches = complete(line_buffer="d[\"")
+        nt.assert_in("abc", matches)
+        nt.assert_not_in('abc\"]', matches)
 
+        _, matches = complete(line_buffer="d[\"a")
+        nt.assert_in("abc", matches)
+        nt.assert_not_in('abc\"]', matches)
 
-def test_magic_completion_shadowing():
-    ip = get_ipython()
-    c = ip.Completer
-    c.use_jedi = False
-
-    # Before importing matplotlib, %matplotlib magic should be the only option.
-    text, matches = c.complete("mat")
-    nt.assert_equal(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"])
-
-    # 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"])
-
-def test_magic_completion_shadowing_explicit():
-    """
-    If the user try to complete a shadowed magic, and explicit % start should
-    still return the completions.
-    """
-    ip = get_ipython()
-    c = ip.Completer
+        # check sensitivity to following context
+        _, matches = complete(line_buffer="d[]", cursor_pos=2)
+        nt.assert_in("'abc'", matches)
 
-    # Before importing matplotlib, %matplotlib magic should be the only option.
-    text, matches = c.complete("%mat")
-    nt.assert_equal(matches, ["%matplotlib"])
+        _, 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)
 
-    ip.run_cell("matplotlib = 1")
+        # check multiple solutions are correctly returned and that noise is not
+        ip.user_ns['d'] = {'abc': None, 'abd': None, 'bad': None, object(): None,
+                           5: None}
 
-    # After removing matplotlib from namespace, the magic should still be
-    # the only option.
-    text, matches = c.complete("%mat")
-    nt.assert_equal(matches, ["%matplotlib"])
+        _, matches = complete(line_buffer="d['a")
+        nt.assert_in("abc", matches)
+        nt.assert_in("abd", matches)
+        nt.assert_not_in("bad", 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)
+        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)
+
+        # - understands quote escaping
+        _, matches = complete(line_buffer="d['a\\'")
+        nt.assert_in("b", matches)
+
+        # - default quoting should work like repr
+        _, matches = complete(line_buffer="d[")
+        nt.assert_in("\"a'b\"", matches)
+
+        # - when opening quote with ", possible to match with unescaped apostrophe
+        _, matches = complete(line_buffer="d[\"a'")
+        nt.assert_in("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)
+
+    def test_dict_key_completion_contexts(self):
+        """Test expression contexts in which dict key completion occurs"""
+        ip = get_ipython()
+        complete = ip.Completer.complete
+        d = {'abc': None}
+        ip.user_ns['d'] = d
+
+        class C:
+            data = d
+        ip.user_ns['C'] = C
+        ip.user_ns['get'] = lambda: d
+
+        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)
+
+        def assert_completion(**kwargs):
+            _, matches = complete(**kwargs)
+            nt.assert_in("'abc'", matches)
+            nt.assert_not_in("'abc']", matches)
+
+        # no completion after string closed, even if reopened
+        assert_no_completion(line_buffer="d['a'")
+        assert_no_completion(line_buffer="d[\"a\"")
+        assert_no_completion(line_buffer="d['a' + ")
+        assert_no_completion(line_buffer="d['a' + '")
+
+        # completion in non-trivial expressions
+        assert_completion(line_buffer="+ d[")
+        assert_completion(line_buffer="(d[")
+        assert_completion(line_buffer="C.data[")
+
+        # greedy flag
+        def assert_completion(**kwargs):
+            _, matches = complete(**kwargs)
+            nt.assert_in("get()['abc']", matches)
+        
+        assert_no_completion(line_buffer="get()[")
+        with greedy_completion():
+            assert_completion(line_buffer="get()[")
+            assert_completion(line_buffer="get()['")
+            assert_completion(line_buffer="get()['a")
+            assert_completion(line_buffer="get()['ab")
+            assert_completion(line_buffer="get()['abc")
 
-def test_magic_config():
-    ip = get_ipython()
-    c = ip.Completer
-
-    s, matches = c.complete(None, 'conf')
-    nt.assert_in('%config', matches)
-    s, matches = c.complete(None, 'conf')
-    nt.assert_not_in('AliasManager', matches)
-    s, matches = c.complete(None, 'config ')
-    nt.assert_in('AliasManager', matches)
-    s, matches = c.complete(None, '%config ')
-    nt.assert_in('AliasManager', matches)
-    s, matches = c.complete(None, 'config Ali')
-    nt.assert_list_equal(['AliasManager'], matches)
-    s, matches = c.complete(None, '%config Ali')
-    nt.assert_list_equal(['AliasManager'], matches)
-    s, matches = c.complete(None, 'config AliasManager')
-    nt.assert_list_equal(['AliasManager'], matches)
-    s, matches = c.complete(None, '%config AliasManager')
-    nt.assert_list_equal(['AliasManager'], matches)
-    s, matches = c.complete(None, 'config AliasManager.')
-    nt.assert_in('AliasManager.default_aliases', matches)
-    s, matches = c.complete(None, '%config AliasManager.')
-    nt.assert_in('AliasManager.default_aliases', matches)
-    s, matches = c.complete(None, 'config AliasManager.de')
-    nt.assert_list_equal(['AliasManager.default_aliases'], matches)
-    s, matches = c.complete(None, 'config AliasManager.de')
-    nt.assert_list_equal(['AliasManager.default_aliases'], matches)
-
-
-def test_magic_color():
-    ip = get_ipython()
-    c = ip.Completer
-
-    s, matches = c.complete(None, 'colo')
-    nt.assert_in('%colors', matches)
-    s, matches = c.complete(None, 'colo')
-    nt.assert_not_in('NoColor', matches)
-    s, matches = c.complete(None, '%colors')  # No trailing space
-    nt.assert_not_in('NoColor', matches)
-    s, matches = c.complete(None, 'colors ')
-    nt.assert_in('NoColor', matches)
-    s, matches = c.complete(None, '%colors ')
-    nt.assert_in('NoColor', matches)
-    s, matches = c.complete(None, 'colors NoCo')
-    nt.assert_list_equal(['NoColor'], matches)
-    s, matches = c.complete(None, '%colors NoCo')
-    nt.assert_list_equal(['NoColor'], matches)
-
-
-def test_match_dict_keys():
-    """
-    Test that match_dict_keys works on a couple of use case does return what
-    expected, and does not crash
-    """
-    delims = ' \t\n`!@#$^&*()=+[{]}\\|;:\'",<>?'
-
-
-    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_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'])
-    
-    match_dict_keys
-
-
-def test_dict_key_completion_string():
-    """Test dictionary key completion for string keys"""
-    ip = get_ipython()
-    complete = ip.Completer.complete
-
-    ip.user_ns['d'] = {'abc': None}
-
-    # check completion at different stages
-    _, matches = complete(line_buffer="d[")
-    nt.assert_in("'abc'", matches)
-    nt.assert_not_in("'abc']", matches)
-
-    _, matches = complete(line_buffer="d['")
-    nt.assert_in("abc", matches)
-    nt.assert_not_in("abc']", matches)
-
-    _, matches = complete(line_buffer="d['a")
-    nt.assert_in("abc", matches)
-    nt.assert_not_in("abc']", matches)
-
-    # check use of different quoting
-    _, matches = complete(line_buffer="d[\"")
-    nt.assert_in("abc", matches)
-    nt.assert_not_in('abc\"]', matches)
-
-    _, matches = complete(line_buffer="d[\"a")
-    nt.assert_in("abc", matches)
-    nt.assert_not_in('abc\"]', matches)
-
-    # check sensitivity to following context
-    _, matches = complete(line_buffer="d[]", cursor_pos=2)
-    nt.assert_in("'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)
-
-    # check multiple solutions are correctly returned and that noise is not
-    ip.user_ns['d'] = {'abc': None, 'abd': None, 'bad': None, object(): None,
-                       5: None}
-
-    _, matches = complete(line_buffer="d['a")
-    nt.assert_in("abc", matches)
-    nt.assert_in("abd", matches)
-    nt.assert_not_in("bad", 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)
-    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)
-
-    # - understands quote escaping
-    _, matches = complete(line_buffer="d['a\\'")
-    nt.assert_in("b", matches)
-
-    # - default quoting should work like repr
-    _, matches = complete(line_buffer="d[")
-    nt.assert_in("\"a'b\"", matches)
-
-    # - when opening quote with ", possible to match with unescaped apostrophe
-    _, matches = complete(line_buffer="d[\"a'")
-    nt.assert_in("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)
-
-def test_dict_key_completion_contexts():
-    """Test expression contexts in which dict key completion occurs"""
-    ip = get_ipython()
-    complete = ip.Completer.complete
-    d = {'abc': None}
-    ip.user_ns['d'] = d
-
-    class C:
-        data = d
-    ip.user_ns['C'] = C
-    ip.user_ns['get'] = lambda: d
-
-    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)
-
-    def assert_completion(**kwargs):
-        _, matches = complete(**kwargs)
-        nt.assert_in("'abc'", matches)
-        nt.assert_not_in("'abc']", matches)
 
-    # no completion after string closed, even if reopened
-    assert_no_completion(line_buffer="d['a'")
-    assert_no_completion(line_buffer="d[\"a\"")
-    assert_no_completion(line_buffer="d['a' + ")
-    assert_no_completion(line_buffer="d['a' + '")
-
-    # completion in non-trivial expressions
-    assert_completion(line_buffer="+ d[")
-    assert_completion(line_buffer="(d[")
-    assert_completion(line_buffer="C.data[")
-
-    # greedy flag
-    def assert_completion(**kwargs):
-        _, matches = complete(**kwargs)
-        nt.assert_in("get()['abc']", matches)
-    
-    assert_no_completion(line_buffer="get()[")
-    with greedy_completion():
-        assert_completion(line_buffer="get()[")
-        assert_completion(line_buffer="get()['")
-        assert_completion(line_buffer="get()['a")
-        assert_completion(line_buffer="get()['ab")
-        assert_completion(line_buffer="get()['abc")
-
-
-
-def test_dict_key_completion_bytes():
-    """Test handling of bytes in dict key completion"""
-    ip = get_ipython()
-    complete = ip.Completer.complete
 
-    ip.user_ns['d'] = {'abc': None, b'abd': None}
+    def test_dict_key_completion_bytes(self):
+        """Test handling of bytes in dict key completion"""
+        ip = get_ipython()
+        complete = ip.Completer.complete
 
-    _, matches = complete(line_buffer="d[")
-    nt.assert_in("'abc'", matches)
-    nt.assert_in("b'abd'", matches)
+        ip.user_ns['d'] = {'abc': None, b'abd': None}
 
-    if False:  # not currently implemented
-        _, matches = complete(line_buffer="d[b")
+        _, matches = complete(line_buffer="d[")
+        nt.assert_in("'abc'", matches)
         nt.assert_in("b'abd'", matches)
-        nt.assert_not_in("b'abc'", matches)
 
-        _, matches = complete(line_buffer="d[b'")
-        nt.assert_in("abd", matches)
-        nt.assert_not_in("abc", 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)
 
-        _, matches = complete(line_buffer="d[B'")
-        nt.assert_in("abd", matches)
-        nt.assert_not_in("abc", matches)
+            _, matches = complete(line_buffer="d[b'")
+            nt.assert_in("abd", matches)
+            nt.assert_not_in("abc", matches)
 
-        _, matches = complete(line_buffer="d['")
-        nt.assert_in("abc", matches)
-        nt.assert_not_in("abd", matches)
+            _, matches = complete(line_buffer="d[B'")
+            nt.assert_in("abd", matches)
+            nt.assert_not_in("abc", matches)
 
+            _, matches = complete(line_buffer="d['")
+            nt.assert_in("abc", matches)
+            nt.assert_not_in("abd", matches)
 
-def test_dict_key_completion_unicode_py3():
-    """Test handling of unicode in dict key completion"""
-    ip = get_ipython()
-    complete = ip.Completer.complete
 
-    ip.user_ns['d'] = {u'a\u05d0': None}
+    def test_dict_key_completion_unicode_py3(self):
+        """Test handling of unicode in dict key completion"""
+        ip = get_ipython()
+        complete = ip.Completer.complete
 
-    # query using escape
-    if sys.platform != 'win32':
-        # Known failure on Windows
-        _, matches = complete(line_buffer="d['a\\u05d0")
-        nt.assert_in("u05d0", matches)  # tokenized after \\
+        ip.user_ns['d'] = {u'a\u05d0': None}
 
-    # query using character
-    _, matches = complete(line_buffer="d['a\u05d0")
-    nt.assert_in(u"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 \\
+        if sys.platform != 'win32':
+            # Known failure on Windows
+            _, matches = complete(line_buffer="d['a\\u05d0")
+            nt.assert_in("u05d0", matches)  # tokenized after \\
 
         # query using character
         _, matches = complete(line_buffer="d['a\u05d0")
-        nt.assert_in(u"d['a\u05d0']", matches)
+        nt.assert_in(u"a\u05d0", matches)
         
-
-
-@dec.skip_without('numpy')
-def test_struct_array_key_completion():
-    """Test dict key completion applies to numpy struct arrays"""
-    import numpy
-    ip = get_ipython()
-    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)
-    # complete on the numpy struct itself
-    dt = numpy.dtype([('my_head', [('my_dt', '>u4'), ('my_df', '>u4')]),
-                      ('my_data', '>f4', 5)])
-    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)
-    # 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]))
-
-
-@dec.skip_without('pandas')
-def test_dataframe_key_completion():
-    """Test dict key completion applies to pandas DataFrames"""
-    import pandas
-    ip = get_ipython()
-    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)
-
-
-def test_dict_key_completion_invalids():
-    """Smoke test cases dict key completion can't handle"""
-    ip = get_ipython()
-    complete = ip.Completer.complete
-
-    ip.user_ns['no_getitem'] = None
-    ip.user_ns['no_keys'] = []
-    ip.user_ns['cant_call_keys'] = dict
-    ip.user_ns['empty'] = {}
-    ip.user_ns['d'] = {'abc': 5}
-
-    _, matches = complete(line_buffer="no_getitem['")
-    _, matches = complete(line_buffer="no_keys['")
-    _, matches = complete(line_buffer="cant_call_keys['")
-    _, matches = complete(line_buffer="empty['")
-    _, matches = complete(line_buffer="name_error['")
-    _, matches = complete(line_buffer="d['\\")  # incomplete escape
-
-class KeyCompletable(object):
-    def __init__(self, things=()):
-        self.things = things
-
-    def _ipython_key_completions_(self):
-        return list(self.things)
-
-def test_object_key_completion():
-    ip = get_ipython()
-    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)
-
-
-class NamedInstanceMetaclass(type):
-    def __getitem__(cls, item):
-        return cls.get_instance(item)
-
-class NamedInstanceClass(object, metaclass=NamedInstanceMetaclass):
-    def __init__(self, name):
-        if not hasattr(self.__class__, 'instances'):
-            self.__class__.instances = {}
-        self.__class__.instances[name] = self
-
-    @classmethod
-    def _ipython_key_completions_(cls):
-        return cls.instances.keys()
-
-    @classmethod
-    def get_instance(cls, name):
-        return cls.instances[name]
-
-def test_class_key_completion():
-    ip = get_ipython()
-    NamedInstanceClass('qwerty')
-    NamedInstanceClass('qwick')
-    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)
-
-def test_tryimport():
-    """
-    Test that try-import don't crash on trailing dot, and import modules before
-    """
-    from IPython.core.completerlib import try_import
-    assert(try_import("IPython."))
-
-
-def test_aimport_module_completer():
-    ip = get_ipython()
-    _, matches = ip.complete('i', '%aimport i')
-    nt.assert_in('io', matches)
-    nt.assert_not_in('int', matches)
-
-def test_nested_import_module_completer():
-    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)
-
-def test_import_module_completer():
-    ip = get_ipython()
-    _, matches = ip.complete('i', 'import i')
-    nt.assert_in('io', matches)
-    nt.assert_not_in('int', matches)
-
-def test_from_module_completer():
-    ip = get_ipython()
-    _, matches = ip.complete('B', 'from io import B', 16)
-    nt.assert_in('BytesIO', matches)
-    nt.assert_not_in('BaseException', matches)
-
-def test_snake_case_completion():
-    ip = get_ipython()
-    ip.Completer.use_jedi = False
-    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)
-
-def test_mix_terms():
-    ip = get_ipython()
-    from textwrap import dedent
-    ip.Completer.use_jedi = False
-    ip.ex(dedent("""
-        class Test:
-            def meth(self, meth_arg1):
-                print("meth")
-
-            def meth_1(self, meth1_arg1, meth1_arg2):
-                print("meth1")
-
-            def meth_2(self, meth2_arg1, meth2_arg2):
-                print("meth2")
-        test = Test()
-        """))
-    _, matches = ip.complete(None, "test.meth(")
-    nt.assert_in('meth_arg1=', matches)
-    nt.assert_not_in('meth2_arg1=', matches)
+        with greedy_completion():
+            # query using escape
+            _, matches = complete(line_buffer="d['a\\u05d0")
+            nt.assert_in("d['a\\u05d0']", matches)  # tokenized after \\
+
+            # query using character
+            _, matches = complete(line_buffer="d['a\u05d0")
+            nt.assert_in(u"d['a\u05d0']", matches)
+            
+
+
+    @dec.skip_without('numpy')
+    def test_struct_array_key_completion(self):
+        """Test dict key completion applies to numpy struct arrays"""
+        import numpy
+        ip = get_ipython()
+        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)
+        # complete on the numpy struct itself
+        dt = numpy.dtype([('my_head', [('my_dt', '>u4'), ('my_df', '>u4')]),
+                          ('my_data', '>f4', 5)])
+        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)
+        # 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]))
+
+
+    @dec.skip_without('pandas')
+    def test_dataframe_key_completion(self):
+        """Test dict key completion applies to pandas DataFrames"""
+        import pandas
+        ip = get_ipython()
+        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)
+
+
+    def test_dict_key_completion_invalids(self):
+        """Smoke test cases dict key completion can't handle"""
+        ip = get_ipython()
+        complete = ip.Completer.complete
+
+        ip.user_ns['no_getitem'] = None
+        ip.user_ns['no_keys'] = []
+        ip.user_ns['cant_call_keys'] = dict
+        ip.user_ns['empty'] = {}
+        ip.user_ns['d'] = {'abc': 5}
+
+        _, matches = complete(line_buffer="no_getitem['")
+        _, matches = complete(line_buffer="no_keys['")
+        _, matches = complete(line_buffer="cant_call_keys['")
+        _, matches = complete(line_buffer="empty['")
+        _, matches = complete(line_buffer="name_error['")
+        _, matches = complete(line_buffer="d['\\")  # incomplete escape
+
+    def test_object_key_completion(self):
+        ip = get_ipython()
+        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)
+
+
+
+    def test_class_key_completion(self):
+        ip = get_ipython()
+        NamedInstanceClass('qwerty')
+        NamedInstanceClass('qwick')
+        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)
+
+    def test_tryimport(self):
+        """
+        Test that try-import don't crash on trailing dot, and import modules before
+        """
+        from IPython.core.completerlib import try_import
+        assert(try_import("IPython."))
+
+
+    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)
+
+    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)
+
+    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)
+
+    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)
+
+    def test_snake_case_completion(self):
+        ip = get_ipython()
+        ip.Completer.use_jedi = False
+        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)
+
+    def test_mix_terms(self):
+        ip = get_ipython()
+        from textwrap import dedent
+        ip.Completer.use_jedi = False
+        ip.ex(dedent("""
+            class Test:
+                def meth(self, meth_arg1):
+                    print("meth")
+
+                def meth_1(self, meth1_arg1, meth1_arg2):
+                    print("meth1")
+
+                def meth_2(self, meth2_arg1, meth2_arg2):
+                    print("meth2")
+            test = Test()
+            """))
+        _, matches = ip.complete(None, "test.meth(")
+        nt.assert_in('meth_arg1=', matches)
+        nt.assert_not_in('meth2_arg1=', matches)

From 40bcf3c099417f58254c70925f3e5905fa6fa6ac Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 18 Jun 2019 11:35:09 -0700
Subject: [PATCH 074/370] apply pyupgrade

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

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 03bd2a2f4ff..cd9da072791 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -114,7 +114,7 @@ class NamedInstanceMetaclass(type):
     def __getitem__(cls, item):
         return cls.get_instance(item)
 
-class NamedInstanceClass(object, metaclass=NamedInstanceMetaclass):
+class NamedInstanceClass(metaclass=NamedInstanceMetaclass):
     def __init__(self, name):
         if not hasattr(self.__class__, 'instances'):
             self.__class__.instances = {}
@@ -128,7 +128,7 @@ def _ipython_key_completions_(cls):
     def get_instance(cls, name):
         return cls.instances[name]
 
-class KeyCompletable(object):
+class KeyCompletable:
     def __init__(self, things=()):
         self.things = things
 
@@ -155,7 +155,7 @@ def tearDown(self):
     def test_custom_completion_error(self):
         """Test that errors from custom attribute completers are silenced."""
         ip = get_ipython()
-        class A(object): pass
+        class A: pass
         ip.user_ns['x'] = A()
         
         @complete_object.register(A)
@@ -190,11 +190,11 @@ def test_latex_completions(self):
             nt.assert_equal(text, k)
             nt.assert_equal(matches[0], latex_symbols[k])
         # Test a more complex line
-        text, matches = ip.complete(u'print(\\alpha')
-        nt.assert_equal(text, u'\\alpha')
+        text, matches = ip.complete('print(\\alpha')
+        nt.assert_equal(text, '\\alpha')
         nt.assert_equal(matches[0], latex_symbols['\\alpha'])
         # Test multiple matching latex symbols
-        text, matches = ip.complete(u'\\al')
+        text, matches = ip.complete('\\al')
         nt.assert_in('\\alpha', matches)
         nt.assert_in('\\aleph', matches)
 
@@ -313,7 +313,7 @@ def test_local_file_completions(self):
             # Now check with a function call
             cmd = 'a = f("%s' % prefix
             c = ip.complete(prefix, cmd)[1]
-            comp = set(prefix+s for s in suffixes)
+            comp = {prefix+s for s in suffixes}
             nt.assert_true(comp.issubset(set(c)))
 
 
@@ -528,14 +528,14 @@ def test_limit_to__all__False_ok(self):
 
 
     def test_get__all__entries_ok(self):
-        class A(object):
+        class A:
             __all__ = ['x', 1]
         words = completer.get__all__entries(A())
         nt.assert_equal(words, ['x'])
 
 
     def test_get__all__entries_no__all__ok(self):
-        class A(object):
+        class A:
             pass
         words = completer.get__all__entries(A())
         nt.assert_equal(words, [])
@@ -907,7 +907,7 @@ def test_dict_key_completion_unicode_py3(self):
         ip = get_ipython()
         complete = ip.Completer.complete
 
-        ip.user_ns['d'] = {u'a\u05d0': None}
+        ip.user_ns['d'] = {'a\u05d0': None}
 
         # query using escape
         if sys.platform != 'win32':
@@ -917,7 +917,7 @@ def test_dict_key_completion_unicode_py3(self):
 
         # query using character
         _, matches = complete(line_buffer="d['a\u05d0")
-        nt.assert_in(u"a\u05d0", matches)
+        nt.assert_in("a\u05d0", matches)
         
         with greedy_completion():
             # query using escape
@@ -926,7 +926,7 @@ def test_dict_key_completion_unicode_py3(self):
 
             # query using character
             _, matches = complete(line_buffer="d['a\u05d0")
-            nt.assert_in(u"d['a\u05d0']", matches)
+            nt.assert_in("d['a\u05d0']", matches)
             
 
 

From 59a11e2e70c0e8a555eff5e9aeba1cff760271d1 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 18 Jun 2019 11:35:46 -0700
Subject: [PATCH 075/370] apply black

---
 IPython/core/tests/test_completer.py | 688 ++++++++++++++-------------
 1 file changed, 346 insertions(+), 342 deletions(-)

diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index cd9da072791..772cefc084d 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -22,12 +22,17 @@
 from IPython.testing import decorators as dec
 
 from IPython.core.completer import (
-    Completion, provisionalcompleter, match_dict_keys, _deduplicate_completions)
+    Completion,
+    provisionalcompleter,
+    match_dict_keys,
+    _deduplicate_completions,
+)
 from nose.tools import assert_in, assert_not_in
 
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 # Test functions
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
+
 
 @contextmanager
 def greedy_completion():
@@ -39,39 +44,42 @@ def greedy_completion():
     finally:
         ip.Completer.greedy = greedy_original
 
+
 def test_protect_filename():
-    if sys.platform == 'win32':
-        pairs = [('abc','abc'),
-                 (' abc','" abc"'),
-                 ('a bc','"a bc"'),
-                 ('a  bc','"a  bc"'),
-                 ('  bc','"  bc"'),
-                 ]
+    if sys.platform == "win32":
+        pairs = [
+            ("abc", "abc"),
+            (" abc", '" abc"'),
+            ("a bc", '"a bc"'),
+            ("a  bc", '"a  bc"'),
+            ("  bc", '"  bc"'),
+        ]
     else:
-        pairs = [('abc','abc'),
-                 (' abc',r'\ abc'),
-                 ('a bc',r'a\ bc'),
-                 ('a  bc',r'a\ \ bc'),
-                 ('  bc',r'\ \ bc'),
-                 # On posix, we also protect parens and other special characters.
-                 ('a(bc',r'a\(bc'),
-                 ('a)bc',r'a\)bc'),
-                 ('a( )bc',r'a\(\ \)bc'),
-                 ('a[1]bc', r'a\[1\]bc'),
-                 ('a{1}bc', r'a\{1\}bc'),
-                 ('a#bc', r'a\#bc'),
-                 ('a?bc', r'a\?bc'),
-                 ('a=bc', r'a\=bc'),
-                 ('a\\bc', r'a\\bc'),
-                 ('a|bc', r'a\|bc'),
-                 ('a;bc', r'a\;bc'),
-                 ('a:bc', r'a\:bc'),
-                 ("a'bc", r"a\'bc"),
-                 ('a*bc', r'a\*bc'),
-                 ('a"bc', r'a\"bc'),
-                 ('a^bc', r'a\^bc'),
-                 ('a&bc', r'a\&bc'),
-                 ]
+        pairs = [
+            ("abc", "abc"),
+            (" abc", r"\ abc"),
+            ("a bc", r"a\ bc"),
+            ("a  bc", r"a\ \ bc"),
+            ("  bc", r"\ \ bc"),
+            # On posix, we also protect parens and other special characters.
+            ("a(bc", r"a\(bc"),
+            ("a)bc", r"a\)bc"),
+            ("a( )bc", r"a\(\ \)bc"),
+            ("a[1]bc", r"a\[1\]bc"),
+            ("a{1}bc", r"a\{1\}bc"),
+            ("a#bc", r"a\#bc"),
+            ("a?bc", r"a\?bc"),
+            ("a=bc", r"a\=bc"),
+            ("a\\bc", r"a\\bc"),
+            ("a|bc", r"a\|bc"),
+            ("a;bc", r"a\;bc"),
+            ("a:bc", r"a\:bc"),
+            ("a'bc", r"a\'bc"),
+            ("a*bc", r"a\*bc"),
+            ('a"bc', r"a\"bc"),
+            ("a^bc", r"a\^bc"),
+            ("a&bc", r"a\&bc"),
+        ]
     # run the actual tests
     for s1, s2 in pairs:
         s1p = completer.protect_filename(s1)
@@ -81,7 +89,7 @@ def test_protect_filename():
 def check_line_split(splitter, test_specs):
     for part1, part2, split in test_specs:
         cursor_pos = len(part1)
-        line = part1+part2
+        line = part1 + part2
         out = splitter.split_line(line, cursor_pos)
         nt.assert_equal(out, split)
 
@@ -93,30 +101,31 @@ def test_line_split():
     # and 2 are joined into the 'line' sent to the splitter, as if the cursor
     # was at the end of part1.  So an empty part2 represents someone hitting
     # tab at the end of the line, the most common case.
-    t = [('run some/scrip', '', 'some/scrip'),
-         ('run scripts/er', 'ror.py foo', 'scripts/er'),
-         ('echo $HOM', '', 'HOM'),
-         ('print sys.pa', '', 'sys.pa'),
-         ('print(sys.pa', '', 'sys.pa'),
-         ("execfile('scripts/er", '', 'scripts/er'),
-         ('a[x.', '', 'x.'),
-         ('a[x.', 'y', 'x.'),
-         ('cd "some_file/', '', 'some_file/'),
-         ]
+    t = [
+        ("run some/scrip", "", "some/scrip"),
+        ("run scripts/er", "ror.py foo", "scripts/er"),
+        ("echo $HOM", "", "HOM"),
+        ("print sys.pa", "", "sys.pa"),
+        ("print(sys.pa", "", "sys.pa"),
+        ("execfile('scripts/er", "", "scripts/er"),
+        ("a[x.", "", "x."),
+        ("a[x.", "y", "x."),
+        ('cd "some_file/', "", "some_file/"),
+    ]
     check_line_split(sp, t)
     # Ensure splitting works OK with unicode by re-running the tests with
     # all inputs turned into unicode
-    check_line_split(sp, [ map(str, p) for p in t] )
-
+    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(metaclass=NamedInstanceMetaclass):
     def __init__(self, name):
-        if not hasattr(self.__class__, 'instances'):
+        if not hasattr(self.__class__, "instances"):
             self.__class__.instances = {}
         self.__class__.instances[name] = self
 
@@ -128,6 +137,7 @@ def _ipython_key_completions_(cls):
     def get_instance(cls, name):
         return cls.instances[name]
 
+
 class KeyCompletable:
     def __init__(self, things=()):
         self.things = things
@@ -137,7 +147,6 @@ def _ipython_key_completions_(self):
 
 
 class TestCompleter(unittest.TestCase):
-
     def setUp(self):
         """
         We want to silence all PendingDeprecationWarning when testing the completer
@@ -151,24 +160,26 @@ def tearDown(self):
         except AssertionError:
             pass
 
-
     def test_custom_completion_error(self):
         """Test that errors from custom attribute completers are silenced."""
         ip = get_ipython()
-        class A: pass
-        ip.user_ns['x'] = A()
-        
+
+        class A:
+            pass
+
+        ip.user_ns["x"] = A()
+
         @complete_object.register(A)
         def complete_A(a, existing_completions):
             raise TypeError("this should be silenced")
-        
+
         ip.complete("x.")
 
     def test_unicode_completions(self):
         ip = get_ipython()
         # Some strings that trigger different types of completion.  Check them both
         # in str and unicode forms
-        s = ['ru', '%ru', 'cd /', 'floa', 'float(x)/']
+        s = ["ru", "%ru", "cd /", "floa", "float(x)/"]
         for t in s + list(map(str, s)):
             # We don't need to check exact completion values (they may change
             # depending on the state of the namespace, but at least no exceptions
@@ -181,110 +192,100 @@ def test_unicode_completions(self):
     def test_latex_completions(self):
         from IPython.core.latex_symbols import latex_symbols
         import random
+
         ip = get_ipython()
         # Test some random unicode symbols
         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(len(matches), 1)
             nt.assert_equal(text, k)
             nt.assert_equal(matches[0], 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'])
+        text, matches = ip.complete("print(\\alpha")
+        nt.assert_equal(text, "\\alpha")
+        nt.assert_equal(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)
-
-
-
+        text, matches = ip.complete("\\al")
+        nt.assert_in("\\alpha", matches)
+        nt.assert_in("\\aleph", 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('\\β')
+        name, matches = ip.complete("\\β")
         nt.assert_equal(len(matches), 1)
-        nt.assert_equal(matches[0], '\\beta')
+        nt.assert_equal(matches[0], "\\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')
 
+        name, matches = ip.complete("\\Ⅴ")
+        nt.assert_equal(len(matches), 1)
+        nt.assert_equal(matches[0], "\\ROMAN NUMERAL FIVE")
 
     def test_forward_unicode_completion(self):
         ip = get_ipython()
-        
-        name, matches = ip.complete('\\ROMAN NUMERAL FIVE')
+
+        name, matches = ip.complete("\\ROMAN NUMERAL FIVE")
         nt.assert_equal(len(matches), 1)
-        nt.assert_equal(matches[0], 'Ⅴ')
+        nt.assert_equal(matches[0], "Ⅴ")
 
-    @nt.nottest # now we have a completion for \jmath
-    @decorators.knownfailureif(sys.platform == 'win32', 'Fails if there is a C:\\j... path')
+    @nt.nottest  # now we have a completion for \jmath
+    @decorators.knownfailureif(
+        sys.platform == "win32", "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)
+            for letter in "jJ":
+                name, matches = ip.complete("\\" + letter)
                 nt.assert_equal(matches, [])
 
-
-
-
     class CompletionSplitterTestCase(unittest.TestCase):
         def setUp(self):
             self.sp = completer.CompletionSplitter()
 
         def test_delim_setting(self):
-            self.sp.delims = ' '
-            nt.assert_equal(self.sp.delims, ' ')
-            nt.assert_equal(self.sp._delim_expr, r'[\ ]')
+            self.sp.delims = " "
+            nt.assert_equal(self.sp.delims, " ")
+            nt.assert_equal(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'),
-                 ]
+            self.sp.delims = " "
+            t = [("foo", "", "foo"), ("run foo", "", "foo"), ("run foo", "bar", "foo")]
             check_line_split(self.sp, t)
 
-
     def test_has_open_quotes1(self):
         for s in ["'", "'''", "'hi' '"]:
             nt.assert_equal(completer.has_open_quotes(s), "'")
 
-
     def test_has_open_quotes2(self):
         for s in ['"', '"""', '"hi" "']:
             nt.assert_equal(completer.has_open_quotes(s), '"')
 
-
     def test_has_open_quotes3(self):
         for s in ["''", "''' '''", "'hi' 'ipython'"]:
             nt.assert_false(completer.has_open_quotes(s))
 
-
     def test_has_open_quotes4(self):
         for s in ['""', '""" """', '"hi" "ipython"']:
             nt.assert_false(completer.has_open_quotes(s))
 
-
-    @decorators.knownfailureif(sys.platform == 'win32', "abspath completions fail on Windows")
+    @decorators.knownfailureif(
+        sys.platform == "win32", "abspath completions fail on Windows"
+    )
     def test_abspath_file_completions(self):
         ip = get_ipython()
         with TemporaryDirectory() as tmpdir:
-            prefix = os.path.join(tmpdir, 'foo')
-            suffixes = ['1', '2']
-            names = [prefix+s for s in suffixes]
+            prefix = os.path.join(tmpdir, "foo")
+            suffixes = ["1", "2"]
+            names = [prefix + s for s in suffixes]
             for n in names:
-                open(n, 'w').close()
+                open(n, "w").close()
 
             # Check simple completion
             c = ip.complete(prefix)[1]
@@ -293,18 +294,17 @@ def test_abspath_file_completions(self):
             # Now check with a function call
             cmd = 'a = f("%s' % prefix
             c = ip.complete(prefix, cmd)[1]
-            comp = [prefix+s for s in suffixes]
+            comp = [prefix + s for s in suffixes]
             nt.assert_equal(c, comp)
 
-
     def test_local_file_completions(self):
         ip = get_ipython()
         with TemporaryWorkingDirectory():
-            prefix = './foo'
-            suffixes = ['1', '2']
-            names = [prefix+s for s in suffixes]
+            prefix = "./foo"
+            suffixes = ["1", "2"]
+            names = [prefix + s for s in suffixes]
             for n in names:
-                open(n, 'w').close()
+                open(n, "w").close()
 
             # Check simple completion
             c = ip.complete(prefix)[1]
@@ -313,41 +313,39 @@ def test_local_file_completions(self):
             # Now check with a function call
             cmd = 'a = f("%s' % prefix
             c = ip.complete(prefix, cmd)[1]
-            comp = {prefix+s for s in suffixes}
+            comp = {prefix + s for s in suffixes}
             nt.assert_true(comp.issubset(set(c)))
 
-
     def test_quoted_file_completions(self):
         ip = get_ipython()
         with TemporaryWorkingDirectory():
             name = "foo'bar"
-            open(name, 'w').close()
+            open(name, "w").close()
 
             # Don't escape Windows
             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]
+            c = ip.Completer._complete(
+                cursor_line=0, cursor_pos=len(text), full_text=text
+            )[1]
             nt.assert_equal(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]
+            c = ip.Completer._complete(
+                cursor_line=0, cursor_pos=len(text), full_text=text
+            )[1]
             nt.assert_equal(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]
+            text = "%ls foo"
+            c = ip.Completer._complete(
+                cursor_line=0, cursor_pos=len(text), full_text=text
+            )[1]
             nt.assert_equal(c, [escaped])
 
-
     def test_jedi(self):
         """
         A couple of issue we had with Jedi
@@ -373,14 +371,15 @@ def _test_not_complete(reason, s, comp):
                 assert_not_in(Completion(l, l, comp), completions, reason)
 
         import jedi
-        jedi_version = tuple(int(i) for i in jedi.__version__.split('.')[:3])
+
+        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
+            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
 
-        yield _test_not_complete, 'does not mix types', 'a=(1,"foo");a[0].', 'capitalize'
+        yield _test_not_complete, "does not mix types", 'a=(1,"foo");a[0].', "capitalize"
 
     def test_completion_have_signature(self):
         """
@@ -389,30 +388,36 @@ def test_completion_have_signature(self):
         ip = get_ipython()
         with provisionalcompleter():
             ip.Completer.use_jedi = True
-            completions = ip.Completer.completions('ope', 3)
+            completions = ip.Completer.completions("ope", 3)
             c = next(completions)  # should be `open`
             ip.Completer.use_jedi = False
-        assert 'file' in c.signature, "Signature of function was not found by completer"
-        assert 'encoding' in c.signature, "Signature of function was not found by completer"
-
+        assert "file" in c.signature, "Signature of function was not found by completer"
+        assert (
+            "encoding" in c.signature
+        ), "Signature of function was not found by completer"
 
     def test_deduplicate_completions(self):
         """
         Test that completions are correctly deduplicated (even if ranges are not the same)
         """
         ip = get_ipython()
-        ip.ex(textwrap.dedent('''
+        ip.ex(
+            textwrap.dedent(
+                """
         class Z:
             zoo = 1
-        '''))
+        """
+            )
+        )
         with provisionalcompleter():
             ip.Completer.use_jedi = True
-            l = list(_deduplicate_completions('Z.z', ip.Completer.completions('Z.z', 3)))
+            l = list(
+                _deduplicate_completions("Z.z", ip.Completer.completions("Z.z", 3))
+            )
             ip.Completer.use_jedi = False
 
-        assert len(l) == 1, 'Completions (Z.z<tab>) correctly deduplicate: %s ' % l
-        assert l[0].text == 'zoo'  # and not `it.accumulate`
-
+        assert len(l) == 1, "Completions (Z.z<tab>) correctly deduplicate: %s " % l
+        assert l[0].text == "zoo"  # and not `it.accumulate`
 
     def test_greedy_completions(self):
         """
@@ -425,14 +430,14 @@ 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)
+        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)
+
         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)
+                _, c = ip.complete(".", line=line, cursor_pos=cursor_pos)
                 nt.assert_in(expect, c, message % c)
 
                 ip.Completer.use_jedi = True
@@ -441,12 +446,17 @@ def _(line, cursor_pos, expect, message, completion):
                 nt.assert_in(completion, completions)
 
         with provisionalcompleter():
-            yield _, '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')
+            yield _, "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"
+            )
 
             if sys.version_info > (3, 4):
-                yield _, 'a[0].from_', 10, 'a[0].from_bytes', "Should have completed on a[0].from_: %s", Completion(5, 10, 'from_bytes')
-
+                yield _, "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):
         # also happens to test IPCompleter as a configurable
@@ -454,29 +464,28 @@ def test_omit__names(self):
         ip._hidden_attr = 1
         ip._x = {}
         c = ip.Completer
-        ip.ex('ip=get_ipython()')
+        ip.ex("ip=get_ipython()")
         cfg = Config()
         cfg.IPCompleter.omit__names = 0
         c.update_config(cfg)
         with provisionalcompleter():
             c.use_jedi = False
-            s,matches = c.complete('ip.')
-            nt.assert_in('ip.__str__', matches)
-            nt.assert_in('ip._hidden_attr', matches)
+            s, matches = c.complete("ip.")
+            nt.assert_in("ip.__str__", matches)
+            nt.assert_in("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)
 
-
         cfg = Config()
         cfg.IPCompleter.omit__names = 1
         c.update_config(cfg)
         with provisionalcompleter():
             c.use_jedi = False
-            s,matches = c.complete('ip.')
-            nt.assert_not_in('ip.__str__', matches)
+            s, matches = c.complete("ip.")
+            nt.assert_not_in("ip.__str__", matches)
             # nt.assert_in('ip._hidden_attr', matches)
 
             # c.use_jedi = True
@@ -489,9 +498,9 @@ def test_omit__names(self):
         c.update_config(cfg)
         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)
+            s, matches = c.complete("ip.")
+            nt.assert_not_in("ip.__str__", matches)
+            nt.assert_not_in("ip._hidden_attr", matches)
 
             # c.use_jedi = True
             # completions = set(c.completions('ip.', 3))
@@ -500,8 +509,8 @@ def test_omit__names(self):
 
         with provisionalcompleter():
             c.use_jedi = False
-            s,matches = c.complete('ip._x.')
-            nt.assert_in('ip._x.keys', matches)
+            s, matches = c.complete("ip._x.")
+            nt.assert_in("ip._x.keys", matches)
 
             # c.use_jedi = True
             # completions = set(c.completions('ip._x.', 6))
@@ -510,7 +519,6 @@ def test_omit__names(self):
         del ip._hidden_attr
         del ip._x
 
-
     def test_limit_to__all__False_ok(self):
         """
         Limit to all is deprecated, once we remove it this test can go away. 
@@ -518,69 +526,67 @@ def test_limit_to__all__False_ok(self):
         ip = get_ipython()
         c = ip.Completer
         c.use_jedi = False
-        ip.ex('class D: x=24')
-        ip.ex('d=D()')
+        ip.ex("class D: x=24")
+        ip.ex("d=D()")
         cfg = Config()
         cfg.IPCompleter.limit_to__all__ = False
         c.update_config(cfg)
-        s, matches = c.complete('d.')
-        nt.assert_in('d.x', matches)
-
+        s, matches = c.complete("d.")
+        nt.assert_in("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'])
+            __all__ = ["x", 1]
 
+        words = completer.get__all__entries(A())
+        nt.assert_equal(words, ["x"])
 
     def test_get__all__entries_no__all__ok(self):
         class A:
             pass
+
         words = completer.get__all__entries(A())
         nt.assert_equal(words, [])
 
-
     def test_func_kw_completions(self):
         ip = get_ipython()
         c = ip.Completer
         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)
+        ip.ex("def myfunc(a=1,b=2): return a+b")
+        s, matches = c.complete(None, "myfunc(1,b")
+        nt.assert_in("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)
+        s, matches = c.complete(None, "myfunc(1,b)", 10)
+        nt.assert_in("b=", matches)
         s, matches = c.complete(None, 'myfunc(a="escaped\\")string",b')
-        nt.assert_in('b=', matches)
-        #builtin function
-        s, matches = c.complete(None, 'min(k, k')
-        nt.assert_in('key=', matches)
-
+        nt.assert_in("b=", matches)
+        # builtin function
+        s, matches = c.complete(None, "min(k, k")
+        nt.assert_in("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"])
+        # with cython type etc
         kwd = c._default_arguments_from_docstring(
-            'min(iterable[, key=func]) -> value')
-        nt.assert_equal(kwd, ['key'])
-        #with cython type etc
+            "Minuit.migrad(self, int ncall=10000, resume=True, int nsplit=1)\n"
+        )
+        nt.assert_equal(kwd, ["ncall", "resume", "nsplit"])
+        # white spaces
         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'])
-        #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'])
+            "\n Minuit.migrad(self, int ncall=10000, resume=True, int nsplit=1)\n"
+        )
+        nt.assert_equal(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)
-        s, matches = c.complete(None, '%lsmag')
-        nt.assert_in('%lsmagic', matches)
-
+        s, matches = c.complete(None, "lsmag")
+        nt.assert_in("%lsmagic", matches)
+        s, matches = c.complete(None, "%lsmag")
+        nt.assert_in("%lsmagic", matches)
 
     def test_cell_magics(self):
         from IPython.core.magic import register_cell_magic
@@ -588,15 +594,14 @@ def test_cell_magics(self):
         @register_cell_magic
         def _foo_cellm(line, cell):
             pass
-        
+
         ip = get_ipython()
         c = ip.Completer
 
-        s, matches = c.complete(None, '_foo_ce')
-        nt.assert_in('%%_foo_cellm', matches)
-        s, matches = c.complete(None, '%%_foo_ce')
-        nt.assert_in('%%_foo_cellm', matches)
-
+        s, matches = c.complete(None, "_foo_ce")
+        nt.assert_in("%%_foo_cellm", matches)
+        s, matches = c.complete(None, "%%_foo_ce")
+        nt.assert_in("%%_foo_cellm", matches)
 
     def test_line_cell_magics(self):
         from IPython.core.magic import register_line_cell_magic
@@ -604,7 +609,7 @@ def test_line_cell_magics(self):
         @register_line_cell_magic
         def _bar_cellm(line, cell):
             pass
-        
+
         ip = get_ipython()
         c = ip.Completer
 
@@ -612,16 +617,15 @@ def _bar_cellm(line, cell):
         # returned values depend on whether the user passes %% or not explicitly,
         # 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)
-        s, matches = c.complete(None, '%_bar_ce')
-        nt.assert_in('%_bar_cellm', matches)
-        nt.assert_in('%%_bar_cellm', matches)
-        s, matches = c.complete(None, '%%_bar_ce')
-        nt.assert_not_in('%_bar_cellm', matches)
-        nt.assert_in('%%_bar_cellm', matches)
-
+        s, matches = c.complete(None, "_bar_ce")
+        nt.assert_in("%_bar_cellm", matches)
+        nt.assert_in("%%_bar_cellm", matches)
+        s, matches = c.complete(None, "%_bar_ce")
+        nt.assert_in("%_bar_cellm", matches)
+        nt.assert_in("%%_bar_cellm", matches)
+        s, matches = c.complete(None, "%%_bar_ce")
+        nt.assert_not_in("%_bar_cellm", matches)
+        nt.assert_in("%%_bar_cellm", matches)
 
     def test_magic_completion_order(self):
         ip = get_ipython()
@@ -631,7 +635,6 @@ def test_magic_completion_order(self):
         text, matches = c.complete("timeit")
         nt.assert_equal(matches, ["%timeit", "%%timeit"])
 
-
     def test_magic_completion_shadowing(self):
         ip = get_ipython()
         c = ip.Completer
@@ -675,80 +678,76 @@ def test_magic_config(self):
         ip = get_ipython()
         c = ip.Completer
 
-        s, matches = c.complete(None, 'conf')
-        nt.assert_in('%config', matches)
-        s, matches = c.complete(None, 'conf')
-        nt.assert_not_in('AliasManager', matches)
-        s, matches = c.complete(None, 'config ')
-        nt.assert_in('AliasManager', matches)
-        s, matches = c.complete(None, '%config ')
-        nt.assert_in('AliasManager', matches)
-        s, matches = c.complete(None, 'config Ali')
-        nt.assert_list_equal(['AliasManager'], matches)
-        s, matches = c.complete(None, '%config Ali')
-        nt.assert_list_equal(['AliasManager'], matches)
-        s, matches = c.complete(None, 'config AliasManager')
-        nt.assert_list_equal(['AliasManager'], matches)
-        s, matches = c.complete(None, '%config AliasManager')
-        nt.assert_list_equal(['AliasManager'], matches)
-        s, matches = c.complete(None, 'config AliasManager.')
-        nt.assert_in('AliasManager.default_aliases', matches)
-        s, matches = c.complete(None, '%config AliasManager.')
-        nt.assert_in('AliasManager.default_aliases', matches)
-        s, matches = c.complete(None, 'config AliasManager.de')
-        nt.assert_list_equal(['AliasManager.default_aliases'], matches)
-        s, matches = c.complete(None, 'config AliasManager.de')
-        nt.assert_list_equal(['AliasManager.default_aliases'], matches)
-
+        s, matches = c.complete(None, "conf")
+        nt.assert_in("%config", matches)
+        s, matches = c.complete(None, "conf")
+        nt.assert_not_in("AliasManager", matches)
+        s, matches = c.complete(None, "config ")
+        nt.assert_in("AliasManager", matches)
+        s, matches = c.complete(None, "%config ")
+        nt.assert_in("AliasManager", matches)
+        s, matches = c.complete(None, "config Ali")
+        nt.assert_list_equal(["AliasManager"], matches)
+        s, matches = c.complete(None, "%config Ali")
+        nt.assert_list_equal(["AliasManager"], matches)
+        s, matches = c.complete(None, "config AliasManager")
+        nt.assert_list_equal(["AliasManager"], matches)
+        s, matches = c.complete(None, "%config AliasManager")
+        nt.assert_list_equal(["AliasManager"], matches)
+        s, matches = c.complete(None, "config AliasManager.")
+        nt.assert_in("AliasManager.default_aliases", matches)
+        s, matches = c.complete(None, "%config AliasManager.")
+        nt.assert_in("AliasManager.default_aliases", matches)
+        s, matches = c.complete(None, "config AliasManager.de")
+        nt.assert_list_equal(["AliasManager.default_aliases"], matches)
+        s, matches = c.complete(None, "config AliasManager.de")
+        nt.assert_list_equal(["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)
-        s, matches = c.complete(None, 'colo')
-        nt.assert_not_in('NoColor', matches)
-        s, matches = c.complete(None, '%colors')  # No trailing space
-        nt.assert_not_in('NoColor', matches)
-        s, matches = c.complete(None, 'colors ')
-        nt.assert_in('NoColor', matches)
-        s, matches = c.complete(None, '%colors ')
-        nt.assert_in('NoColor', matches)
-        s, matches = c.complete(None, 'colors NoCo')
-        nt.assert_list_equal(['NoColor'], matches)
-        s, matches = c.complete(None, '%colors NoCo')
-        nt.assert_list_equal(['NoColor'], matches)
-
+        s, matches = c.complete(None, "colo")
+        nt.assert_in("%colors", matches)
+        s, matches = c.complete(None, "colo")
+        nt.assert_not_in("NoColor", matches)
+        s, matches = c.complete(None, "%colors")  # No trailing space
+        nt.assert_not_in("NoColor", matches)
+        s, matches = c.complete(None, "colors ")
+        nt.assert_in("NoColor", matches)
+        s, matches = c.complete(None, "%colors ")
+        nt.assert_in("NoColor", matches)
+        s, matches = c.complete(None, "colors NoCo")
+        nt.assert_list_equal(["NoColor"], matches)
+        s, matches = c.complete(None, "%colors NoCo")
+        nt.assert_list_equal(["NoColor"], matches)
 
     def test_match_dict_keys(self):
         """
         Test that match_dict_keys works on a couple of use case does return what
         expected, and does not crash
         """
-        delims = ' \t\n`!@#$^&*()=+[{]}\\|;:\'",<>?'
+        delims = " \t\n`!@#$^&*()=+[{]}\\|;:'\",<>?"
 
+        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"])
 
-        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_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_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'])
-        
         match_dict_keys
 
-
     def test_dict_key_completion_string(self):
         """Test dictionary key completion for string keys"""
         ip = get_ipython()
         complete = ip.Completer.complete
 
-        ip.user_ns['d'] = {'abc': None}
+        ip.user_ns["d"] = {"abc": None}
 
         # check completion at different stages
         _, matches = complete(line_buffer="d[")
@@ -764,13 +763,13 @@ def test_dict_key_completion_string(self):
         nt.assert_not_in("abc']", matches)
 
         # check use of different quoting
-        _, matches = complete(line_buffer="d[\"")
+        _, matches = complete(line_buffer='d["')
         nt.assert_in("abc", matches)
-        nt.assert_not_in('abc\"]', matches)
+        nt.assert_not_in('abc"]', matches)
 
-        _, matches = complete(line_buffer="d[\"a")
+        _, matches = complete(line_buffer='d["a')
         nt.assert_in("abc", matches)
-        nt.assert_not_in('abc\"]', matches)
+        nt.assert_not_in('abc"]', matches)
 
         # check sensitivity to following context
         _, matches = complete(line_buffer="d[]", cursor_pos=2)
@@ -782,23 +781,28 @@ def test_dict_key_completion_string(self):
         nt.assert_not_in("abc']", matches)
 
         # check multiple solutions are correctly returned and that noise is not
-        ip.user_ns['d'] = {'abc': None, 'abd': None, 'bad': None, object(): None,
-                           5: None}
+        ip.user_ns["d"] = {
+            "abc": None,
+            "abd": None,
+            "bad": None,
+            object(): None,
+            5: None,
+        }
 
         _, matches = complete(line_buffer="d['a")
         nt.assert_in("abc", matches)
         nt.assert_in("abd", matches)
         nt.assert_not_in("bad", matches)
-        assert not any(m.endswith((']', '"', "'")) for m in matches), 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}
+        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"b', matches)
         nt.assert_in("a word", matches)
-        assert not any(m.endswith((']', '"', "'")) for m in matches), 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")
@@ -810,37 +814,38 @@ def test_dict_key_completion_string(self):
 
         # - default quoting should work like repr
         _, matches = complete(line_buffer="d[")
-        nt.assert_in("\"a'b\"", matches)
+        nt.assert_in('"a\'b"', matches)
 
         # - when opening quote with ", possible to match with unescaped apostrophe
         _, matches = complete(line_buffer="d[\"a'")
         nt.assert_in("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}
+        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)
+            nt.assert_in("before-after", matches)
 
     def test_dict_key_completion_contexts(self):
         """Test expression contexts in which dict key completion occurs"""
         ip = get_ipython()
         complete = ip.Completer.complete
-        d = {'abc': None}
-        ip.user_ns['d'] = d
+        d = {"abc": None}
+        ip.user_ns["d"] = d
 
         class C:
             data = d
-        ip.user_ns['C'] = C
-        ip.user_ns['get'] = lambda: d
+
+        ip.user_ns["C"] = C
+        ip.user_ns["get"] = lambda: d
 
         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)
+            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)
 
         def assert_completion(**kwargs):
             _, matches = complete(**kwargs)
@@ -849,7 +854,7 @@ def assert_completion(**kwargs):
 
         # no completion after string closed, even if reopened
         assert_no_completion(line_buffer="d['a'")
-        assert_no_completion(line_buffer="d[\"a\"")
+        assert_no_completion(line_buffer='d["a"')
         assert_no_completion(line_buffer="d['a' + ")
         assert_no_completion(line_buffer="d['a' + '")
 
@@ -862,7 +867,7 @@ def assert_completion(**kwargs):
         def assert_completion(**kwargs):
             _, matches = complete(**kwargs)
             nt.assert_in("get()['abc']", matches)
-        
+
         assert_no_completion(line_buffer="get()[")
         with greedy_completion():
             assert_completion(line_buffer="get()[")
@@ -871,14 +876,12 @@ def assert_completion(**kwargs):
             assert_completion(line_buffer="get()['ab")
             assert_completion(line_buffer="get()['abc")
 
-
-
     def test_dict_key_completion_bytes(self):
         """Test handling of bytes in dict key completion"""
         ip = get_ipython()
         complete = ip.Completer.complete
 
-        ip.user_ns['d'] = {'abc': None, b'abd': None}
+        ip.user_ns["d"] = {"abc": None, b"abd": None}
 
         _, matches = complete(line_buffer="d[")
         nt.assert_in("'abc'", matches)
@@ -901,16 +904,15 @@ def test_dict_key_completion_bytes(self):
             nt.assert_in("abc", matches)
             nt.assert_not_in("abd", matches)
 
-
     def test_dict_key_completion_unicode_py3(self):
         """Test handling of unicode in dict key completion"""
         ip = get_ipython()
         complete = ip.Completer.complete
 
-        ip.user_ns['d'] = {'a\u05d0': None}
+        ip.user_ns["d"] = {"a\u05d0": None}
 
         # query using escape
-        if sys.platform != 'win32':
+        if sys.platform != "win32":
             # Known failure on Windows
             _, matches = complete(line_buffer="d['a\\u05d0")
             nt.assert_in("u05d0", matches)  # tokenized after \\
@@ -918,7 +920,7 @@ def test_dict_key_completion_unicode_py3(self):
         # query using character
         _, matches = complete(line_buffer="d['a\u05d0")
         nt.assert_in("a\u05d0", matches)
-        
+
         with greedy_completion():
             # query using escape
             _, matches = complete(line_buffer="d['a\\u05d0")
@@ -927,57 +929,56 @@ def test_dict_key_completion_unicode_py3(self):
             # query using character
             _, matches = complete(line_buffer="d['a\u05d0")
             nt.assert_in("d['a\u05d0']", matches)
-            
 
-
-    @dec.skip_without('numpy')
+    @dec.skip_without("numpy")
     def test_struct_array_key_completion(self):
         """Test dict key completion applies to numpy struct arrays"""
         import numpy
+
         ip = get_ipython()
         complete = ip.Completer.complete
-        ip.user_ns['d'] = numpy.array([], dtype=[('hello', 'f'), ('world', 'f')])
+        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)
         # complete on the numpy struct itself
-        dt = numpy.dtype([('my_head', [('my_dt', '>u4'), ('my_df', '>u4')]),
-                          ('my_data', '>f4', 5)])
+        dt = numpy.dtype(
+            [("my_head", [("my_dt", ">u4"), ("my_df", ">u4")]), ("my_data", ">f4", 5)]
+        )
         x = numpy.zeros(2, dtype=dt)
-        ip.user_ns['d'] = x[1]
+        ip.user_ns["d"] = x[1]
         _, matches = complete(line_buffer="d['")
         nt.assert_in("my_head", matches)
         nt.assert_in("my_data", matches)
         # complete on a nested level
         with greedy_completion():
-            ip.user_ns['d'] = numpy.zeros(2, dtype=dt)
+            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]))
 
-
-    @dec.skip_without('pandas')
+    @dec.skip_without("pandas")
     def test_dataframe_key_completion(self):
         """Test dict key completion applies to pandas DataFrames"""
         import pandas
+
         ip = get_ipython()
         complete = ip.Completer.complete
-        ip.user_ns['d'] = pandas.DataFrame({'hello': [1], 'world': [2]})
+        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)
 
-
     def test_dict_key_completion_invalids(self):
         """Smoke test cases dict key completion can't handle"""
         ip = get_ipython()
         complete = ip.Completer.complete
 
-        ip.user_ns['no_getitem'] = None
-        ip.user_ns['no_keys'] = []
-        ip.user_ns['cant_call_keys'] = dict
-        ip.user_ns['empty'] = {}
-        ip.user_ns['d'] = {'abc': 5}
+        ip.user_ns["no_getitem"] = None
+        ip.user_ns["no_keys"] = []
+        ip.user_ns["cant_call_keys"] = dict
+        ip.user_ns["empty"] = {}
+        ip.user_ns["d"] = {"abc": 5}
 
         _, matches = complete(line_buffer="no_getitem['")
         _, matches = complete(line_buffer="no_keys['")
@@ -988,71 +989,72 @@ def test_dict_key_completion_invalids(self):
 
     def test_object_key_completion(self):
         ip = get_ipython()
-        ip.user_ns['key_completable'] = KeyCompletable(['qwerty', 'qwick'])
+        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)
-
-
+        nt.assert_in("qwerty", matches)
+        nt.assert_in("qwick", matches)
 
     def test_class_key_completion(self):
         ip = get_ipython()
-        NamedInstanceClass('qwerty')
-        NamedInstanceClass('qwick')
-        ip.user_ns['named_instance_class'] = NamedInstanceClass
+        NamedInstanceClass("qwerty")
+        NamedInstanceClass("qwick")
+        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)
+        nt.assert_in("qwerty", matches)
+        nt.assert_in("qwick", matches)
 
     def test_tryimport(self):
         """
         Test that try-import don't crash on trailing dot, and import modules before
         """
         from IPython.core.completerlib import try_import
-        assert(try_import("IPython."))
 
+        assert try_import("IPython.")
 
     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)
+        _, matches = ip.complete("i", "%aimport i")
+        nt.assert_in("io", matches)
+        nt.assert_not_in("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)
+        _, 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)
 
     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)
+        _, matches = ip.complete("i", "import i")
+        nt.assert_in("io", matches)
+        nt.assert_not_in("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)
+        _, matches = ip.complete("B", "from io import B", 16)
+        nt.assert_in("BytesIO", matches)
+        nt.assert_not_in("BaseException", matches)
 
     def test_snake_case_completion(self):
         ip = get_ipython()
         ip.Completer.use_jedi = False
-        ip.user_ns['some_three'] = 3
-        ip.user_ns['some_four'] = 4
+        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)
+        nt.assert_in("some_three", matches)
+        nt.assert_in("some_four", matches)
 
     def test_mix_terms(self):
         ip = get_ipython()
         from textwrap import dedent
+
         ip.Completer.use_jedi = False
-        ip.ex(dedent("""
+        ip.ex(
+            dedent(
+                """
             class Test:
                 def meth(self, meth_arg1):
                     print("meth")
@@ -1063,7 +1065,9 @@ def meth_1(self, meth1_arg1, meth1_arg2):
                 def meth_2(self, meth2_arg1, meth2_arg2):
                     print("meth2")
             test = Test()
-            """))
+            """
+            )
+        )
         _, matches = ip.complete(None, "test.meth(")
-        nt.assert_in('meth_arg1=', matches)
-        nt.assert_not_in('meth2_arg1=', matches)
+        nt.assert_in("meth_arg1=", matches)
+        nt.assert_not_in("meth2_arg1=", matches)

From 2a757b6d8094862176411c6e70d18777410ed609 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 18 Jun 2019 11:58:33 -0700
Subject: [PATCH 076/370] Properly close some leaked resources.

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

diff --git a/IPython/utils/openpy.py b/IPython/utils/openpy.py
index d544f41919a..3046c31587d 100644
--- a/IPython/utils/openpy.py
+++ b/IPython/utils/openpy.py
@@ -32,12 +32,12 @@ def source_to_unicode(txt, errors='replace', skip_encoding_cookie=True):
     except SyntaxError:
         encoding = "ascii"
     buffer.seek(0)
-    text = TextIOWrapper(buffer, encoding, errors=errors, line_buffering=True)
-    text.mode = 'r'
-    if skip_encoding_cookie:
-        return u"".join(strip_encoding_cookie(text))
-    else:
-        return text.read()
+    with TextIOWrapper(buffer, encoding, errors=errors, line_buffering=True) as text:
+        text.mode = 'r'
+        if skip_encoding_cookie:
+            return u"".join(strip_encoding_cookie(text))
+        else:
+            return text.read()
 
 def strip_encoding_cookie(filelike):
     """Generator to pull lines from a text-mode file, skipping the encoding

From 7343335486704822cfc4ef545c3fc12d7bb7d538 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 18 Jun 2019 13:51:40 -0700
Subject: [PATCH 077/370] properly  close resource

---
 IPython/utils/tests/test_openpy.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/utils/tests/test_openpy.py b/IPython/utils/tests/test_openpy.py
index 5a01ac4bca6..a1d995171a3 100644
--- a/IPython/utils/tests/test_openpy.py
+++ b/IPython/utils/tests/test_openpy.py
@@ -13,7 +13,8 @@ def test_detect_encoding():
     nt.assert_equal(enc, 'iso-8859-5')
 
 def test_read_file():
-    read_specified_enc = io.open(nonascii_path, encoding='iso-8859-5').read()
+    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 u'coding: iso-8859-5' in read_detected_enc

From 1e9ebf139ae76eddfe8dd01290e41735e7d1011b Mon Sep 17 00:00:00 2001
From: Alok Singh <alokbeniwal@gmail.com>
Date: Tue, 18 Jun 2019 13:53:26 -0700
Subject: [PATCH 078/370] Rewrite syntax to be Python 3.5+

Used <https://github.com/asottile/pyupgrade/>
---
 IPython/utils/tests/test_openpy.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/utils/tests/test_openpy.py b/IPython/utils/tests/test_openpy.py
index a1d995171a3..183d2621ffb 100644
--- a/IPython/utils/tests/test_openpy.py
+++ b/IPython/utils/tests/test_openpy.py
@@ -17,10 +17,10 @@ def test_read_file():
         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 u'coding: iso-8859-5' in read_detected_enc
+    assert 'coding: iso-8859-5' in read_detected_enc
     
     read_strip_enc_cookie = openpy.read_py_file(nonascii_path, skip_encoding_cookie=True)
-    assert u'coding: iso-8859-5' not in read_strip_enc_cookie
+    assert 'coding: iso-8859-5' not in read_strip_enc_cookie
 
 def test_source_to_unicode():
     with io.open(nonascii_path, 'rb') as f:
@@ -29,4 +29,4 @@ def test_source_to_unicode():
                     source_bytes.decode('iso-8859-5').splitlines())
 
     source_no_cookie = openpy.source_to_unicode(source_bytes, skip_encoding_cookie=True)
-    nt.assert_not_in(u'coding: iso-8859-5', source_no_cookie)
+    nt.assert_not_in('coding: iso-8859-5', source_no_cookie)

From 29618b483ccc0c95625f92b02d6da68b136456a8 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 18 Jun 2019 13:54:49 -0700
Subject: [PATCH 079/370] apply black on the file

---
 IPython/utils/tests/test_openpy.py | 31 ++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/IPython/utils/tests/test_openpy.py b/IPython/utils/tests/test_openpy.py
index 183d2621ffb..9e66d43df3e 100644
--- a/IPython/utils/tests/test_openpy.py
+++ b/IPython/utils/tests/test_openpy.py
@@ -5,28 +5,35 @@
 from IPython.utils import openpy
 
 mydir = os.path.dirname(__file__)
-nonascii_path = os.path.join(mydir, '../../core/tests/nonascii.py')
+nonascii_path = os.path.join(mydir, "../../core/tests/nonascii.py")
+
 
 def test_detect_encoding():
-    with open(nonascii_path, 'rb') as f:
+    with open(nonascii_path, "rb") as f:
         enc, lines = openpy.detect_encoding(f.readline)
-    nt.assert_equal(enc, 'iso-8859-5')
+    nt.assert_equal(enc, "iso-8859-5")
+
 
 def test_read_file():
-    with io.open(nonascii_path, encoding='iso-8859-5') as f:
+    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 'coding: iso-8859-5' in read_detected_enc
-    
-    read_strip_enc_cookie = openpy.read_py_file(nonascii_path, skip_encoding_cookie=True)
-    assert 'coding: iso-8859-5' not in read_strip_enc_cookie
+    assert "coding: iso-8859-5" in read_detected_enc
+
+    read_strip_enc_cookie = openpy.read_py_file(
+        nonascii_path, skip_encoding_cookie=True
+    )
+    assert "coding: iso-8859-5" not in read_strip_enc_cookie
+
 
 def test_source_to_unicode():
-    with io.open(nonascii_path, 'rb') as f:
+    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())
+    nt.assert_equal(
+        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)
+    nt.assert_not_in("coding: iso-8859-5", source_no_cookie)

From 7c1c99767f18af8d5f12cb7212ba757c58423197 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 18 Jun 2019 14:14:18 -0700
Subject: [PATCH 080/370] Do not return filehandle as unused

---
 IPython/testing/tests/test_tools.py | 3 +--
 IPython/testing/tools.py            | 7 +++----
 IPython/utils/io.py                 | 8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/IPython/testing/tests/test_tools.py b/IPython/testing/tests/test_tools.py
index 4fa5c96986d..2a6b9e49a50 100644
--- a/IPython/testing/tests/test_tools.py
+++ b/IPython/testing/tests/test_tools.py
@@ -62,9 +62,8 @@ def test_parser():
 
 def test_temp_pyfile():
     src = 'pass\n'
-    fname, fh = tt.temp_pyfile(src)
+    fname = tt.temp_pyfile(src)
     assert os.path.isfile(fname)
-    fh.close()
     with open(fname) as fh2:
         src2 = fh2.read()
     nt.assert_equal(src2, src)
diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py
index 1d16f11900a..b2d7df407ed 100644
--- a/IPython/testing/tools.py
+++ b/IPython/testing/tools.py
@@ -269,20 +269,19 @@ class TempFileMixin(object):
 
     def mktmp(self, src, ext='.py'):
         """Make a valid python temp file."""
-        fname, f = temp_pyfile(src, ext)
+        fname = temp_pyfile(src, ext)
         if not hasattr(self, 'tmps'):
             self.tmps=[]
-        self.tmps.append((f, fname))
+        self.tmps.append(fname)
         self.fname = fname
 
     def tearDown(self):
         # If the tmpfile wasn't made because of skipped tests, like in
         # win32, there's nothing to cleanup.
         if hasattr(self, 'tmps'):
-            for f,fname in self.tmps:
+            for fname in self.tmps:
                 # If the tmpfile wasn't made because of skipped tests, like in
                 # win32, there's nothing to cleanup.
-                f.close()
                 try:
                     os.unlink(fname)
                 except:
diff --git a/IPython/utils/io.py b/IPython/utils/io.py
index b59a1a11606..fab9bae7971 100644
--- a/IPython/utils/io.py
+++ b/IPython/utils/io.py
@@ -205,10 +205,10 @@ 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]
-    f = open(fname,'w')
-    f.write(src)
-    f.flush()
-    return fname, f
+    with open(fname,'w') as f:
+        f.write(src)
+        f.flush()
+    return fname
 
 @undoc
 def atomic_writing(*args, **kwargs):

From 53375cf194cdeee752ed94f1296af459ca2b46c6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 18 Jun 2019 17:37:12 -0700
Subject: [PATCH 081/370] Use proper xunit format for some test.

In particular we now can use proper methods to check that some warnings
are raised instead of making sure the test is printed. As pytest
captures warning by default this add compatibility with pytest.
---
 IPython/utils/tests/test_io.py   | 51 ++++++++++++++++----------------
 IPython/utils/tests/test_path.py | 51 +++++++++++++++++---------------
 2 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/IPython/utils/tests/test_io.py b/IPython/utils/tests/test_io.py
index 104f492eabd..e6af8c25a43 100644
--- a/IPython/utils/tests/test_io.py
+++ b/IPython/utils/tests/test_io.py
@@ -66,28 +66,29 @@ def test_io_init():
         # just test for string equality.
         assert 'IPython.utils.io.IOStream' in classname, classname
 
-def test_IOStream_init():
-    """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(StringIO, self).__dir__()
-            attrs.append('name')
-            return attrs
-
-    iostream = IOStream(BadStringIO())
-    iostream.write('hi, bad iostream\n')
-    assert not hasattr(iostream, 'name')
-    iostream.close()
-
-def test_capture_output():
-    """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')
-
-
+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"""
+        
+        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')
diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index 7ca2be20160..a4c1fc814b8 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -263,28 +263,31 @@ def test_get_long_path_name():
     p = path.get_long_path_name('/usr/local')
     nt.assert_equal(p,'/usr/local')
 
-@dec.skip_win32 # can't create not-user-writable dir on win
-@with_environment
-def test_not_writable_ipdir():
-    tmpdir = tempfile.mkdtemp()
-    os.name = "posix"
-    env.pop('IPYTHON_DIR', None)
-    env.pop('IPYTHONDIR', None)
-    env.pop('XDG_CONFIG_HOME', None)
-    env['HOME'] = tmpdir
-    ipdir = os.path.join(tmpdir, '.ipython')
-    os.mkdir(ipdir, 0o555)
-    try:
-        open(os.path.join(ipdir, "_foo_"), 'w').close()
-    except IOError:
-        pass
-    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")
-    with AssertPrints('is not a writable location', channel='stderr'):
-        ipdir = paths.get_ipython_dir()
-    env.pop('IPYTHON_DIR', None)
+
+class TestRaiseDeprecation(unittest.TestCase):
+
+    @dec.skip_win32 # can't create not-user-writable dir on win
+    @with_environment
+    def test_not_writable_ipdir(self):
+        tmpdir = tempfile.mkdtemp()
+        os.name = "posix"
+        env.pop('IPYTHON_DIR', None)
+        env.pop('IPYTHONDIR', None)
+        env.pop('XDG_CONFIG_HOME', None)
+        env['HOME'] = tmpdir
+        ipdir = os.path.join(tmpdir, '.ipython')
+        os.mkdir(ipdir, 0o555)
+        try:
+            open(os.path.join(ipdir, "_foo_"), 'w').close()
+        except IOError:
+            pass
+        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")
+        with self.assertWarnsRegex(UserWarning, 'is not a writable location'):
+            ipdir = paths.get_ipython_dir()
+        env.pop('IPYTHON_DIR', None)
 
 @with_environment
 def test_get_py_filename():
@@ -313,7 +316,7 @@ def test_unicode_in_filename():
     """
     try:
         # these calls should not throw unicode encode exceptions
-        path.get_py_filename('fooéè.py', force_win32=False)
+        path.get_py_filename('fooéè.py')
     except IOError as ex:
         str(ex)
 
@@ -406,7 +409,7 @@ def test_ensure_dir_exists():
         with nt.assert_raises(IOError):
             path.ensure_dir_exists(f)
 
-class TestLinkOrCopy(object):
+class TestLinkOrCopy(unittest.TestCase):
     def setUp(self):
         self.tempdir = TemporaryDirectory()
         self.src = self.dst("src")

From 90c67b40c376c477f2377068c41612c95d8af707 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 18 Jun 2019 19:31:35 -0700
Subject: [PATCH 082/370] Restore trace function after exiting debugger.

This should bump coverage; as pdb test where removing the coverage
function.
---
 IPython/core/magics/execution.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 393ee9b40a1..0a7ea0ef548 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -934,6 +934,7 @@ def _run_with_debugger(self, code, code_ns, filename=None,
                 deb._exec_filename = filename
             while True:
                 try:
+                    trace = sys.gettrace()
                     deb.run(code, code_ns)
                 except Restart:
                     print("Restarting")
@@ -943,6 +944,8 @@ def _run_with_debugger(self, code, code_ns, filename=None,
                     continue
                 else:
                     break
+                finally:
+                    sys.settrace(trace)
             
 
         except:

From 3ac478452ce14fd8264b70a59f793a984a95c110 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Wed, 19 Jun 2019 15:12:29 -0700
Subject: [PATCH 083/370] Fix Mixin Inheritence in Xunit unittest.

Some unittest were weird mixin, properly make the base class an
TestCase, and use setup/teardown to set local attributes.

This adds compatibility with PyTest
---
 IPython/core/tests/test_interactiveshell.py | 23 +++++++++++++++------
 IPython/core/tests/test_run.py              |  2 +-
 IPython/extensions/tests/test_autoreload.py |  4 +++-
 IPython/testing/tests/test_tools.py         |  2 +-
 IPython/testing/tools.py                    |  3 ++-
 IPython/utils/tests/test_process.py         |  2 +-
 6 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 1c0565330a1..f57e9c29dd6 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -530,6 +530,10 @@ def test_1(self):
         ip.safe_execfile(self.fname, {}, raise_exceptions=True)
 
 class ExitCodeChecks(tt.TempFileMixin):
+
+    def setUp(self):
+        self.system = ip.system_raw
+
     def test_exit_code_ok(self):
         self.system('exit 0')
         self.assertEqual(ip.user_ns['_exit_code'], 0)
@@ -559,8 +563,11 @@ def test_exit_code_signal_csh(self):
                 del os.environ['SHELL']
 
 
-class TestSystemRaw(ExitCodeChecks, unittest.TestCase):
-    system = ip.system_raw
+class TestSystemRaw(ExitCodeChecks):
+
+    def setUp(self):
+        super().setUp()
+        self.sytem = ip.system_raw
 
     @onlyif_unicode_paths
     def test_1(self):
@@ -580,8 +587,11 @@ def test_control_c(self, *mocks):
         self.assertEqual(ip.user_ns['_exit_code'], -signal.SIGINT)
 
 # TODO: Exit codes are currently ignored on Windows.
-class TestSystemPipedExitCode(ExitCodeChecks, unittest.TestCase):
-    system = ip.system_piped
+class TestSystemPipedExitCode(ExitCodeChecks):
+
+    def setUp(self):
+        super().setUp()
+        self.sytem = ip.system_piped
 
     @skip_win32
     def test_exit_code_ok(self):
@@ -595,7 +605,7 @@ def test_exit_code_error(self):
     def test_exit_code_signal(self):
         ExitCodeChecks.test_exit_code_signal(self)
 
-class TestModules(tt.TempFileMixin, unittest.TestCase):
+class TestModules(tt.TempFileMixin):
     def test_extraneous_loads(self):
         """Test we're not loading modules on startup that we shouldn't.
         """
@@ -944,7 +954,7 @@ def wrn():
 
 class TestImportNoDeprecate(tt.TempFileMixin):
 
-    def setup(self):
+    def setUp(self):
         """Make a valid python temp file."""
         self.mktmp("""
 import warnings
@@ -954,6 +964,7 @@ def wrn():
         DeprecationWarning
     )
 """)
+        super().setUp()
 
     def test_no_dep(self):
         """
diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index db308f1ec7d..42f2e5c422e 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -165,7 +165,7 @@ def doctest_reset_del():
 
 class TestMagicRunPass(tt.TempFileMixin):
 
-    def setup(self):
+    def setUp(self):
         content = "a = [1,2,3]\nb = 1"
         self.mktmp(content)
         
diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index cb046d958f9..6300b1b67fe 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -24,6 +24,8 @@
 import nose.tools as nt
 import IPython.testing.tools as tt
 
+from unittest import TestCase
+
 from IPython.testing.decorators import skipif
 
 from IPython.extensions.autoreload import AutoreloadMagics
@@ -63,7 +65,7 @@ def magic_aimport(self, parameter, stream=None):
         self.auto_magics.post_execute_hook()
 
 
-class Fixture(object):
+class Fixture(TestCase):
     """Fixture for creating test module files"""
 
     test_dir = None
diff --git a/IPython/testing/tests/test_tools.py b/IPython/testing/tests/test_tools.py
index 2a6b9e49a50..33c65dfaca4 100644
--- a/IPython/testing/tests/test_tools.py
+++ b/IPython/testing/tests/test_tools.py
@@ -85,7 +85,7 @@ def func():
         self.assertRaises(AssertionError, func)
 
 
-class Test_ipexec_validate(unittest.TestCase, tt.TempFileMixin):
+class Test_ipexec_validate(tt.TempFileMixin):
     def test_main_path(self):
         """Test with only stdout results.
         """
diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py
index b2d7df407ed..0db926ab243 100644
--- a/IPython/testing/tools.py
+++ b/IPython/testing/tools.py
@@ -13,6 +13,7 @@
 import re
 import sys
 import tempfile
+import unittest
 
 from contextlib import contextmanager
 from io import StringIO
@@ -262,7 +263,7 @@ def ipexec_validate(fname, expected_out, expected_err='',
     nt.assert_equal("\n".join(out.strip().splitlines()), "\n".join(expected_out.strip().splitlines()))
 
 
-class TempFileMixin(object):
+class TempFileMixin(unittest.TestCase):
     """Utility class to create temporary Python/IPython files.
 
     Meant as a mixin class for test cases."""
diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index 249f90caafd..956b2abbae2 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -90,7 +90,7 @@ def test_arg_split_win32():
         nt.assert_equal(arg_split(argstr), argv)
 
 
-class SubProcessTestCase(TestCase, tt.TempFileMixin):
+class SubProcessTestCase(tt.TempFileMixin):
     def setUp(self):
         """Make a valid python temp file."""
         lines = [ "import sys",

From b078d2569f255915e05f8a8f752c7a0c6953d854 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 21 Jun 2019 09:44:55 -0700
Subject: [PATCH 084/370] Misc modifications for pytest comppatibility

1) remove objects creations `ip = get_ipython()` which is anyway
injected in builtins.

2) use proper xunit test cases for capturing warnings.

3) Use proper assertWarns instead of assert print, as pytest captures
warnings.

4) fix recusrsion limit in pytest whcih need to be higher

5) properly capture context in yielded tests.
---
 IPython/core/tests/test_interactiveshell.py | 56 ++++++++++-----------
 IPython/core/tests/test_magic_terminal.py   |  3 +-
 IPython/core/tests/test_ultratb.py          |  8 +--
 IPython/utils/tests/test_tokenutil.py       |  4 +-
 4 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index f57e9c29dd6..23278ef3514 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -36,7 +36,6 @@
 # Globals
 #-----------------------------------------------------------------------------
 # This is used by every single test, no point repeating it ad nauseam
-ip = get_ipython()
 
 #-----------------------------------------------------------------------------
 # Tests
@@ -127,8 +126,8 @@ def test_gh_597(self):
         """Pretty-printing lists of objects with non-ascii reprs may cause
         problems."""
         class Spam(object):
-          def __repr__(self):
-            return "\xe9"*50
+            def __repr__(self):
+                return "\xe9"*50
         import IPython.core.formatters
         f = IPython.core.formatters.PlainTextFormatter()
         f([Spam(),Spam()])
@@ -766,7 +765,7 @@ def test_unregistering(self):
         err_transformer = ErrorTransformer()
         ip.ast_transformers.append(err_transformer)
         
-        with tt.AssertPrints("unregister", channel='stderr'):
+        with self.assertWarnsRegex(UserWarning, "It will be unregistered"):
             ip.run_cell("1 + 2")
         
         # This should have been removed.
@@ -882,9 +881,6 @@ def test_user_expression():
     
     # back to text only
     ip.display_formatter.active_types = ['text/plain']
-    
-
-
 
 
 class TestSyntaxErrorTransformer(unittest.TestCase):
@@ -918,25 +914,25 @@ def test_syntaxerror_input_transformer(self):
             ip.run_cell('3456')
 
 
-
-def test_warning_suppression():
-    ip.run_cell("import warnings")
-    try:
-        with tt.AssertPrints("UserWarning: asdf", channel="stderr"):
-            ip.run_cell("warnings.warn('asdf')")
-        # Here's the real test -- if we run that again, we should get the
-        # warning again. Traditionally, each warning was only issued once per
-        # IPython session (approximately), even if the user typed in new and
-        # different code that should have also triggered the warning, leading
-        # to much confusion.
-        with tt.AssertPrints("UserWarning: asdf", channel="stderr"):
-            ip.run_cell("warnings.warn('asdf')")
-    finally:
-        ip.run_cell("del warnings")
+class TestWarningSupression(unittest.TestCase):
+    def test_warning_suppression(self):
+        ip.run_cell("import warnings")
+        try:
+            with self.assertWarnsRegex(UserWarning, "asdf"):
+                ip.run_cell("warnings.warn('asdf')")
+            # Here's the real test -- if we run that again, we should get the
+            # warning again. Traditionally, each warning was only issued once per
+            # IPython session (approximately), even if the user typed in new and
+            # different code that should have also triggered the warning, leading
+            # to much confusion.
+            with self.assertWarnsRegex(UserWarning, "asdf"):
+                ip.run_cell("warnings.warn('asdf')")
+        finally:
+            ip.run_cell("del warnings")
 
 
-def test_deprecation_warning():
-    ip.run_cell("""
+    def test_deprecation_warning(self):
+        ip.run_cell("""
 import warnings
 def wrn():
     warnings.warn(
@@ -944,12 +940,12 @@ def wrn():
         DeprecationWarning
     )
         """)
-    try:
-        with tt.AssertPrints("I AM  A WARNING", channel="stderr"):
-            ip.run_cell("wrn()")
-    finally:
-        ip.run_cell("del warnings")
-        ip.run_cell("del wrn")
+        try:
+            with self.assertWarnsRegex(DeprecationWarning, "I AM  A WARNING"):
+                ip.run_cell("wrn()")
+        finally:
+            ip.run_cell("del warnings")
+            ip.run_cell("del wrn")
 
 
 class TestImportNoDeprecate(tt.TempFileMixin):
diff --git a/IPython/core/tests/test_magic_terminal.py b/IPython/core/tests/test_magic_terminal.py
index a9dd7ac937f..0981c7b6b27 100644
--- a/IPython/core/tests/test_magic_terminal.py
+++ b/IPython/core/tests/test_magic_terminal.py
@@ -18,7 +18,6 @@
 #-----------------------------------------------------------------------------
 # Globals
 #-----------------------------------------------------------------------------
-ip = get_ipython()
 
 #-----------------------------------------------------------------------------
 # Test functions begin
@@ -170,7 +169,7 @@ def test_paste_echo(self):
             ip.write = writer
         nt.assert_equal(ip.user_ns['a'], 100)
         nt.assert_equal(ip.user_ns['b'], 200)
-        nt.assert_equal(out, code+"\n## -- End pasted text --\n")
+        assert out == code+"\n## -- End pasted text --\n"
 
     def test_paste_leading_commas(self):
         "Test multiline strings with leading commas"
diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index 787a7eca63b..e77f44416c3 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -39,7 +39,7 @@ def recursionlimit(frames):
     def inner(test_function):
         def wrapper(*args, **kwargs):
             _orig_rec_limit = ultratb._FRAME_RECURSION_LIMIT
-            ultratb._FRAME_RECURSION_LIMIT = frames - 50
+            ultratb._FRAME_RECURSION_LIMIT = 50
 
             rl = sys.getrecursionlimit()
             sys.setrecursionlimit(frames)
@@ -327,17 +327,17 @@ def test_no_recursion(self):
         with tt.AssertNotPrints("frames repeated"):
             ip.run_cell("non_recurs()")
 
-    @recursionlimit(65)
+    @recursionlimit(150)
     def test_recursion_one_frame(self):
         with tt.AssertPrints("1 frames repeated"):
             ip.run_cell("r1()")
 
-    @recursionlimit(65)
+    @recursionlimit(150)
     def test_recursion_three_frames(self):
         with tt.AssertPrints("3 frames repeated"):
             ip.run_cell("r3o2()")
 
-    @recursionlimit(65)
+    @recursionlimit(150)
     def test_find_recursion(self):
         captured = []
         def capture_exc(*args, **kwargs):
diff --git a/IPython/utils/tests/test_tokenutil.py b/IPython/utils/tests/test_tokenutil.py
index 253d0a4daf5..4ffe7afefc2 100644
--- a/IPython/utils/tests/test_tokenutil.py
+++ b/IPython/utils/tests/test_tokenutil.py
@@ -128,6 +128,6 @@ def test_muliline_statement():
 map()
 """
     for c in range(16, 22):
-        yield lambda: expect_token("int", cell, c)
+        yield lambda cell, c: expect_token("int", cell, c), cell, c
     for c in range(22, 28):
-        yield lambda: expect_token("map", cell, c)
+        yield lambda cell, c: expect_token("map", cell, c), cell, c

From ea4ab3aa772cb62f5641f12c8188e49fd8055e6c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 29 May 2019 19:11:18 -0700
Subject: [PATCH 085/370] Also run test with Pytest.

This now run many of the tests using pytest.
Many of previous pull-requests brought pytest compatibility; this now
actually would run a passing test suite.

This does not mean we can drop nose; in particular we still have plugins
fro doctests using iptest; which pytest does not run;
and we are still limited to pytest 3 (pytest 4 does not support
yield-test anymore)

There is thus still much work to do.
---
 .travis.yml                               |  2 +
 IPython/conftest.py                       | 69 +++++++++++++++++++++++
 IPython/core/tests/test_alias.py          |  9 ++-
 IPython/core/tests/test_magic.py          |  4 +-
 IPython/core/tests/test_magic_terminal.py |  4 --
 IPython/core/tests/test_oinspect.py       | 12 ++--
 IPython/external/decorators/__init__.py   |  2 +-
 IPython/testing/iptestcontroller.py       |  3 +-
 IPython/testing/ipunittest.py             |  3 +-
 MANIFEST.in                               |  1 +
 pytest.ini                                |  2 +
 11 files changed, 92 insertions(+), 19 deletions(-)
 create mode 100644 IPython/conftest.py
 create mode 100644 pytest.ini

diff --git a/.travis.yml b/.travis.yml
index 75cf14fbcca..3369a9695f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,7 @@ install:
   - pip install setuptools --upgrade
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
   - pip install trio curio
+  - pip install 'pytest<4' matplotlib
   - pip install codecov check-manifest --upgrade
 
 script:
@@ -49,6 +50,7 @@ script:
        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
     fi
   - cd /tmp && iptest --coverage xml && cd -
+  - pytest 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
diff --git a/IPython/conftest.py b/IPython/conftest.py
new file mode 100644
index 00000000000..b9d1f065353
--- /dev/null
+++ b/IPython/conftest.py
@@ -0,0 +1,69 @@
+import types
+import sys
+import builtins
+import os
+import pytest
+import pathlib
+import shutil
+
+from IPython.testing import tools
+
+
+def get_ipython():
+    from IPython.terminal.interactiveshell import TerminalInteractiveShell
+    if TerminalInteractiveShell._instance:
+        return TerminalInteractiveShell.instance()
+
+    config = tools.default_config()
+    config.TerminalInteractiveShell.simple_prompt = True
+
+    # Create and initialize our test-friendly IPython instance.
+    shell = TerminalInteractiveShell.instance(config=config)
+    return shell
+
+
+@pytest.fixture(scope='session', autouse=True)
+def work_path():
+    path = pathlib.Path("./tmp-ipython-pytest-profiledir")
+    os.environ["IPYTHONDIR"] = str(path.absolute())
+    if path.exists():
+        raise ValueError('IPython dir temporary path already exists ! Did previous test run exit successfully ?')
+    path.mkdir()
+    yield 
+    shutil.rmtree(str(path.resolve()))
+
+
+def nopage(strng, start=0, screen_lines=0, pager_cmd=None):
+    if isinstance(strng, dict):
+        strng = strng.get("text/plain", "")
+    print(strng)
+
+
+def xsys(self, cmd):
+    """Replace the default system call with a capturing one for doctest.
+    """
+    # We use getoutput, but we need to strip it because pexpect captures
+    # the trailing newline differently from commands.getoutput
+    print(self.getoutput(cmd, split=False, depth=1).rstrip(), end="", file=sys.stdout)
+    sys.stdout.flush()
+
+
+# for things to work correctly we would need this as a session fixture;
+# unfortunately this will fail on some test that get executed as _collection_
+# time (before the fixture run), in particular parametrized test that contain
+# yields. so for now execute at import time.
+#@pytest.fixture(autouse=True, scope='session')
+def inject():
+
+    builtins.get_ipython = get_ipython
+    builtins._ip = get_ipython()
+    builtins.ip = get_ipython()
+    builtins.ip.system = types.MethodType(xsys, ip)
+    builtins.ip.builtin_trap.activate()
+    from IPython.core import page
+
+    page.pager_page = nopage
+    # yield
+
+
+inject()
diff --git a/IPython/core/tests/test_alias.py b/IPython/core/tests/test_alias.py
index 7417e95513c..d99079661a4 100644
--- a/IPython/core/tests/test_alias.py
+++ b/IPython/core/tests/test_alias.py
@@ -39,7 +39,7 @@ def test_alias_args_error():
         _ip.run_cell('parts 1')
 
     nt.assert_equal(cap.stderr.split(':')[0], 'UsageError')
-    
+
 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')
@@ -47,7 +47,10 @@ def test_alias_args_commented():
     with capture_output() as cap:
         _ip.run_cell('commetarg')
     
-    nt.assert_equal(cap.stdout, 'this is %s a commented out arg')
+    # strip() is for pytest compat; testing via iptest patch IPython shell
+    # in testin.globalipapp and replace the system call which messed up the
+    # \r\n
+    assert cap.stdout.strip() ==  'this is %s a commented out arg'
 
 def test_alias_args_commented_nargs():
     """Check that alias correctly counts args, excluding those commented out"""
@@ -59,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)
\ No newline at end of file
+    nt.assert_equal(thealias.nargs, 1)
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 716e7cced23..e137c931179 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -33,9 +33,6 @@
 from IPython.utils.process import find_cmd
 
 
-
-_ip = get_ipython()
-
 @magic.magics_class
 class DummyMagics(magic.Magics): pass
 
@@ -150,6 +147,7 @@ def test_rehashx():
     # rehashx must fill up syscmdlist
     scoms = _ip.db['syscmdlist']
     nt.assert_true(len(scoms) > 10)
+            
 
 
 def test_magic_parse_options():
diff --git a/IPython/core/tests/test_magic_terminal.py b/IPython/core/tests/test_magic_terminal.py
index 0981c7b6b27..79e2d3ed4a5 100644
--- a/IPython/core/tests/test_magic_terminal.py
+++ b/IPython/core/tests/test_magic_terminal.py
@@ -15,10 +15,6 @@
 
 from IPython.testing import tools as tt
 
-#-----------------------------------------------------------------------------
-# Globals
-#-----------------------------------------------------------------------------
-
 #-----------------------------------------------------------------------------
 # Test functions begin
 #-----------------------------------------------------------------------------
diff --git a/IPython/core/tests/test_oinspect.py b/IPython/core/tests/test_oinspect.py
index cd38e099448..8bdcfad98ce 100644
--- a/IPython/core/tests/test_oinspect.py
+++ b/IPython/core/tests/test_oinspect.py
@@ -23,8 +23,12 @@
 # Globals and constants
 #-----------------------------------------------------------------------------
 
-inspector = oinspect.Inspector()
-ip = get_ipython()
+inspector = None
+
+def setup_module():
+    global inspector
+    inspector = oinspect.Inspector()
+
 
 #-----------------------------------------------------------------------------
 # Local utilities
@@ -34,7 +38,7 @@
 # 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 = 37  # Put here the actual number of this line
+THIS_LINE_NUMBER = 41  # Put here the actual number of this line
 
 from unittest import TestCase
 
@@ -123,7 +127,6 @@ def method(self, x, z=2):
         """Some method's docstring"""
 
 
-
 class Awkward(object):
     def __getattr__(self, name):
         raise Exception(name)
@@ -221,7 +224,6 @@ def support_function_one(x, y=2, *a, **kw):
 def test_calldef_none():
     # We should ignore __call__ for all of these.
     for obj in [support_function_one, SimpleClass().method, any, str.upper]:
-        print(obj)
         i = inspector.info(obj)
         nt.assert_is(i['call_def'], None)
 
diff --git a/IPython/external/decorators/__init__.py b/IPython/external/decorators/__init__.py
index 074f61449e0..1db80edd357 100644
--- a/IPython/external/decorators/__init__.py
+++ b/IPython/external/decorators/__init__.py
@@ -1,5 +1,5 @@
 try:
-    from numpy.testing.noseclasses import KnownFailure, knownfailureif
+    from numpy.testing import KnownFailure, knownfailureif
 except ImportError:
     from ._decorators import knownfailureif
     try:
diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py
index 8a8c80305a3..b522f60f376 100644
--- a/IPython/testing/iptestcontroller.py
+++ b/IPython/testing/iptestcontroller.py
@@ -49,7 +49,7 @@ def __init__(self):
         self.env = {}
         self.dirs = []
 
-    def setup(self):
+    def setUp(self):
         """Create temporary directories etc.
         
         This is only called when we know the test group will be run. Things
@@ -440,7 +440,6 @@ def find_code_units(self, morfs):
                     'all tests.')
 argparser.add_argument('--all', action='store_true',
                     help='Include slow tests not run by default.')
-argparser.add_argument('--url', help="URL to use for the JS tests.")
 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.')
diff --git a/IPython/testing/ipunittest.py b/IPython/testing/ipunittest.py
index 139c3052211..56146d1de26 100644
--- a/IPython/testing/ipunittest.py
+++ b/IPython/testing/ipunittest.py
@@ -38,6 +38,7 @@
 import re
 import unittest
 from doctest import DocTestFinder, DocTestRunner, TestResults
+from IPython.terminal.interactiveshell import InteractiveShell
 
 #-----------------------------------------------------------------------------
 # Classes and functions
@@ -78,7 +79,7 @@ def __call__(self, ds):
         dnew = self.rps1.sub(pyps1, dnew)
         dnew = self.rps2.sub(pyps2, dnew)
         dnew = self.rout.sub(pyout, dnew)
-        ip = globalipapp.get_ipython()
+        ip = InteractiveShell.instance()
 
         # Convert input IPython source into valid Python.
         out = []
diff --git a/MANIFEST.in b/MANIFEST.in
index 3a19fbf8c5b..dee45a2c408 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include LICENSE
 include setupbase.py
 include setupegg.py
 include MANIFEST.in
+include pytest.ini
 include .mailmap
 
 recursive-exclude tools *
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 00000000000..537ebeb2674
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts = --duration=10

From 38b5fb817dd6deede84101655f8443df958965db Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Mon, 24 Jun 2019 14:48:21 -0700
Subject: [PATCH 086/370] some updates to WN

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

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index c54053f8ae8..66c716f209a 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -22,6 +22,34 @@ Python 3.8.
      :ghpull:`11720`
    - Unicode names for the completion are loaded lazily on first use which
      should decrease startup time. :ghpull:`11693`
+   - Autoreload now fix the types of reloaded objects; this for example allow
+     pickling of reloaded objects. :ghpull:`11644`
+
+
+Prepare migration to pytest (instead of nose) for testing
+---------------------------------------------------------
+
+Most of the work between 7.5 and 7.6 was to prepare the migration from our
+testing framework to pytest. Most of the test suite should now work by simply
+issuing ``pytest`` from the root of the repository.
+
+The migration to pytest is just at its beginning. Many of our test still rely
+on IPython-specific plugins for nose using pytest (doctest using IPython syntax
+is one example of this where test appear as "passing", while no code has been
+ran). Many test also need to be updated like ``yield-test`` to be properly
+parametrized tests.
+
+Migration to pytest allowed me to discover a number of issues in our test
+suite; which was hiding a number of subtle issues – or not actually running
+some of the tests in our test suite – I have thus corrected many of those; like
+improperly closed resources; or used of deprecated features. I also made use of
+the ``pytest --durations=...`` to find some of our slowest test and speed them
+up (our test suite can now be up to 10% faster). Pytest as also a variety of
+plugins and flags which will make the code quality of IPython and the testing
+experience better.
+
+Misc
+----
 
 Special Thanks to Gabriel (@gpotter2 on GitHub), who among other took care many
 of the remaining task for 7.4 and 7.5, like updating the website.

From 5749ca682e23e0fc5d607c757f05b90344233f4b Mon Sep 17 00:00:00 2001
From: "Brandon T. Willard" <brandonwillard@gmail.com>
Date: Wed, 26 Jun 2019 21:41:44 -0500
Subject: [PATCH 087/370] Fix wording in docstrings

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

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 262a65be038..bc39dc39d03 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -67,8 +67,8 @@
 
 Starting with IPython 6.0, this module can make use of the Jedi library to
 generate completions both using static analysis of the code, and dynamically
-inspecting multiple namespaces. Jedi is an autocompletion and static analysis 
-for Python. The APIs attached to this new mechanism is unstable and will 
+inspecting multiple namespaces. Jedi is an autocompletion and static analysis
+for Python. The APIs attached to this new mechanism is unstable and will
 raise unless use in an :any:`provisionalcompleter` context manager.
 
 You will find that the following are experimental:
@@ -185,11 +185,11 @@ def provisionalcompleter(action='ignore'):
     """
 
 
-    This contest manager has to be used in any place where unstable completer
+    This context manager has to be used in any place where unstable completer
     behavior and API may be called.
 
     >>> with provisionalcompleter():
-    ...     completer.do_experimetal_things() # works
+    ...     completer.do_experimental_things() # works
 
     >>> completer.do_experimental_things() # raises.
 
@@ -198,12 +198,11 @@ def provisionalcompleter(action='ignore'):
         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.
 
-        You also understand that if the API is not to you liking you should report
-        a bug to explain your use case upstream and improve the API and will loose
-        credibility if you complain after the API is make stable.
+        You also understand that, if the API is not to your liking, you should report
+        a bug to explain your use case upstream.
 
-        We'll be happy to get your feedback , feature request and improvement on
-        any of the unstable APIs !
+        We'll be happy to get your feedback, feature requests, and improvements on
+        any of the unstable APIs!
     """
     with warnings.catch_warnings():
         warnings.filterwarnings(action, category=ProvisionalCompleterWarning)
@@ -1138,7 +1137,7 @@ def matchers(self):
 
     def all_completions(self, text) -> List[str]:
         """
-        Wrapper around the completions method for the benefit of emacs.
+        Wrapper around the completion methods for the benefit of emacs.
         """
         prefix = text[:text.rfind(".") + 1]
         with provisionalcompleter():
@@ -1557,7 +1556,7 @@ def python_func_kw_matches(self,text):
                     argMatches.append(u"%s=" %namedArg)
         except:
             pass
-            
+
         return argMatches
 
     def dict_key_matches(self, text):
@@ -2067,7 +2066,7 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
         self.matches = _matches
 
         return text, _matches, origins, completions
-        
+
     def fwd_unicode_match(self, text:str) -> Tuple[str, list]:
         if self._names is None:
             self._names = []
@@ -2086,7 +2085,7 @@ def fwd_unicode_match(self, text:str) -> Tuple[str, list]:
                 return s, candidates
             else:
                 return '', ()
-        
+
         # if text does not start with slash
         else:
             return u'', ()

From 32b9294f2a195686fd21b95817bf2a4b26314935 Mon Sep 17 00:00:00 2001
From: "Brandon T. Willard" <brandonwillard@gmail.com>
Date: Wed, 26 Jun 2019 23:38:39 -0500
Subject: [PATCH 088/370] Fix all_completions output for both Jedi and non-Jedi
 cases

Closes #11802.
---
 IPython/core/completer.py            |  6 +++---
 IPython/core/tests/test_completer.py | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index bc39dc39d03..e7bb0f8bb97 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1139,10 +1139,10 @@ def all_completions(self, text) -> List[str]:
         """
         Wrapper around the completion methods for the benefit of emacs.
         """
-        prefix = text[:text.rfind(".") + 1]
+        prefix = text.rpartition('.')[0]
         with provisionalcompleter():
-            return list(map(lambda c: prefix + c.text,
-                   self.completions(text, len(text))))
+            return ['.'.join([prefix, c.text]) if prefix and self.use_jedi else c.text
+                    for c in self.completions(text, len(text))]
 
         return self.complete(text)[1]
 
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 772cefc084d..d364d1c1a10 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -346,6 +346,24 @@ def test_quoted_file_completions(self):
             )[1]
             nt.assert_equal(c, [escaped])
 
+    def test_all_completions_dups(self):
+        """
+        Make sure the output of `IPCompleter.all_completions` does not have
+        duplicated prefixes.
+        """
+        ip = get_ipython()
+        c = ip.Completer
+        ip.ex("class TestClass():\n\ta=1\n\ta1=2")
+        for jedi_status in [True, False]:
+            with provisionalcompleter():
+                ip.Completer.use_jedi = jedi_status
+                matches = c.all_completions("TestCl")
+                assert matches == ['TestClass'], jedi_status
+                matches = c.all_completions("TestClass.")
+                assert len(matches) > 2, jedi_status
+                matches = c.all_completions("TestClass.a")
+                assert matches == ['TestClass.a', 'TestClass.a1'], jedi_status
+
     def test_jedi(self):
         """
         A couple of issue we had with Jedi

From 63e0eb526cd8e3ec02b0c67e8348ea686bea0854 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Thu, 27 Jun 2019 10:24:26 -0700
Subject: [PATCH 089/370] update relase toom and mailmap

---
 .mailmap                | 1 +
 tools/release_helper.sh | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index 0e37a652753..8d4757e6865 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
 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>
 Benjamin Ragan-Kelley <benjaminrk@gmail.com> <minrk@Mercury.local>
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 55e7b409e77..79d25fa1b26 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -1,13 +1,13 @@
 # Simple tool to help for release
 # when releasing with bash, simplei source it to get asked questions. 
 
-echo -n PREV_RELEASE:
+echo -n 'PREV_RELEASE (X.y.z):'
 read PREV_RELEASE
-echo -n MILESTONE:
+echo -n 'MILESTONE (X.y):'
 read MILESTONE
-echo -n VERSION:
+echo -n 'VERSION (X.y.z):'
 read VERSION
-echo -n branch:
+echo -n 'branch (master|X.y):'
 read branch
 
 echo 

From 4f2ffacaa04552ee4c995f280f42275970078a5f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Thu, 27 Jun 2019 10:32:58 -0700
Subject: [PATCH 090/370] updates to whatsnew in 7.6

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

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 66c716f209a..8924d859b1a 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -22,8 +22,9 @@ Python 3.8.
      :ghpull:`11720`
    - Unicode names for the completion are loaded lazily on first use which
      should decrease startup time. :ghpull:`11693`
-   - Autoreload now fix the types of reloaded objects; this for example allow
+   - Autoreload now update the types of reloaded objects; this for example allow
      pickling of reloaded objects. :ghpull:`11644`
+   - Fix a big where ``%%time`` magic would suppress cell output. :ghpull:`11716`
 
 
 Prepare migration to pytest (instead of nose) for testing
@@ -51,6 +52,10 @@ experience better.
 Misc
 ----
 
+We skipped the release of 7.6 at the end of May, but will attempt to get back
+on schedule. We are starting to think about making introducing backward
+incompatible change and start the 8.0 series.
+
 Special Thanks to Gabriel (@gpotter2 on GitHub), who among other took care many
 of the remaining task for 7.4 and 7.5, like updating the website.
 

From a66c22aa90045ea86fcda43106a7ab81af9fe213 Mon Sep 17 00:00:00 2001
From: juanis2112 <juanitagomezr2112@gmail.com>
Date: Fri, 28 Jun 2019 01:55:33 -0500
Subject: [PATCH 091/370] Fixing duplicated definition of magic aliases after
 reset

---
 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 6b6bc2063b5..b80b3ebe8c3 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1450,7 +1450,10 @@ def reset(self, new_session=True):
         # GUI or web frontend
         if os.name == 'posix':
             for cmd in ('clear', 'more', 'less', 'man'):
-                self.alias_manager.soft_define_alias(cmd, cmd)
+                try:
+                    name = self.magics_manager.magics['line'][cmd]
+                except KeyError:
+                    self.alias_manager.soft_define_alias(cmd, cmd)
 
         # Flush the private list of module references kept for script
         # execution protection

From 7e04d91de6bc2812d927940ea57514cfe70085e1 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 28 Jun 2019 16:16:22 -0700
Subject: [PATCH 092/370] update stats

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

diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index 491c75b6e8a..ade355db986 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -1,6 +1,39 @@
 Issues closed in the 7.x development cycle
 ==========================================
 
+Issues closed in 7.6
+--------------------
+
+GitHub stats for 2019/04/24 - 2019/06/28 (tag: 7.5.0)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 9 issues and merged 43 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A7.6>`__
+
+The following 19 authors contributed 144 commits.
+
+* Alok Singh
+* Andreas
+* Antony Lee
+* Daniel Hahler
+* Ed OBrien
+* Kevin Sheppard
+* Luciana da Costa Marques
+* Maor Kleinberger
+* Matthias Bussonnier
+* Miro Hrončok
+* Niclas
+* Nikita Bezdolniy
+* Oriol Abril
+* Piers Titus van der Torren
+* Pragnya Srinivasan
+* Robin Gustafsson
+* stonebig
+* Thomas A Caswell
+* zzzz-qq
+
+
 Issues closed in 7.5
 --------------------
 

From edbca8cd18673e5aaed71333c20ee46962fafd3f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 28 Jun 2019 16:30:51 -0700
Subject: [PATCH 093/370] release 7.6.0

---
 IPython/core/release.py |  2 +-
 tools/release_helper.sh | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 1208a65f8c9..849176a9488 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -24,7 +24,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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]
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 79d25fa1b26..a9777f0216c 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -10,6 +10,9 @@ read VERSION
 echo -n 'branch (master|X.y):'
 read branch
 
+RED=$(tput setaf 1)
+NOR=$(tput sgr0)
+
 echo 
 echo "updating what's new with informations from docs/source/whatsnew/pr"
 python tools/update_whatsnew.py
@@ -37,7 +40,8 @@ read
 echo "Cleaning repository"
 git clean -xfdi
 
-echo "please update version number in IPython/core/release.py"
+echo "please update version number in ${RED}IPython/core/release.py${NOR} , Do not commit
+yet – we'll do it later."
 
 echo "Press enter to continue"
 read
@@ -55,3 +59,9 @@ echo "Attempting to build package..."
 
 tools/build_release
 
+echo
+echo "Let\'s commit : git commit -am \"release $VERSION\" -S"
+echo "Press enter to continue"
+read
+git commit -am "release $VERSION"
+

From 223d17f2e85507fc0ce8be1e0bd25ce0afea1c62 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 28 Jun 2019 16:33:21 -0700
Subject: [PATCH 094/370] back to development

---
 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 849176a9488..87c0e84dd19 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 6
+_version_minor = 7
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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 fcc010a5fa585022d22946cf13236af6a7d0b6fa Mon Sep 17 00:00:00 2001
From: Po-Chuan Hsieh <sunpoet@sunpoet.net>
Date: Sat, 29 Jun 2019 18:06:49 +0000
Subject: [PATCH 095/370] Fix manpage path in FreeBSD

FreeBSD stores manpages under ${PREFIX}/man (defaults to /usr/local/man)
rather than ${PREFIX}/share/man.
---
 setupbase.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setupbase.py b/setupbase.py
index ea66d7dd3bb..084c341aa19 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -162,7 +162,10 @@ def find_data_files():
     Just man pages at this point.
     """
 
-    manpagebase = pjoin('share', 'man', 'man1')
+    if "freebsd" in sys.platform:
+        manpagebase = pjoin('man', 'man1')
+    else:
+        manpagebase = pjoin('share', 'man', 'man1')
 
     # Simple file lists can be made by hand
     manpages = [f for f in glob(pjoin('docs','man','*.1.gz')) if isfile(f)]

From 72570a0e789d4ceff891ceca1a4875797924d548 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 2 Jul 2019 11:35:55 -0700
Subject: [PATCH 096/370] add time test

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

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index e137c931179..3206b19a2e5 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -400,6 +400,15 @@ def test_time():
         with tt.AssertPrints("hihi", suppress=False):
             ip.run_cell("f('hi')")
 
+def test_time_last_not_expression():
+    ip.run_cell("%%time\n"
+                "var_1 = 1\n"
+                "var_2 = 2\n")
+    assert ip.user_ns['var_1'] == 1
+    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():

From a25c6cc93f8a8fa87f19320b39fb30fdf7b29ce9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 2 Jul 2019 12:49:44 -0700
Subject: [PATCH 097/370] Only split ast if last item is expression.

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

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 0a7ea0ef548..9031e470c32 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -1281,13 +1281,11 @@ def time(self,line='', cell=None, local_ns=None):
             mode = 'exec'
             source = '<timed exec>'
             # multi-line %%time case
-            if len(expr_ast.body) > 1 :
-                expr_val=expr_ast.body[-1]
-                code_val = self.shell.compile(ast.Expression(expr_val.value)
-                                                , '<timed eval>'
-                                                , 'eval')
-                expr_ast=expr_ast.body[:-1]
+            if len(expr_ast.body) > 1 and isinstance(expr_ast.body[-1], ast.Expr):
+                expr_val= expr_ast.body[-1]
+                expr_ast = expr_ast.body[:-1]
                 expr_ast = Module(expr_ast, [])
+                expr_val = ast.Expression(expr_val.value)
 
         t0 = clock()
         code = self.shell.compile(expr_ast, source, mode)
@@ -1312,8 +1310,9 @@ def time(self,line='', cell=None, local_ns=None):
                 exec(code, glob, local_ns)
                 out=None
                 # multi-line %%time case
-                if expr_val and isinstance(expr_val, ast.Expr):
-                    out = eval(code_val, glob, local_ns)  
+                if expr_val is not None:
+                    code_2 = self.shell.compile(expr_val, source, 'eval')
+                    out = eval(code_2, glob, local_ns)
             except:
                 self.shell.showtraceback()
                 return

From 98e3997b9aea92ff40dbafb5c4abb113b5550dfe Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 2 Jul 2019 13:19:22 -0700
Subject: [PATCH 098/370] Documetation in WN

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

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 8924d859b1a..938bd45cea7 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,15 @@
  7.x Series
 ============
 
+.. _version761:
+
+IPython 7.6.1
+=============
+
+IPython 7.6.1 contain a critical bugfix in the ``%timeit`` magic, which would
+crash on some inputs as a side effect of :ghpull:`11716`. See :ghpull:`11812`
+
+
 .. _whatsnew760:
 
 IPython 7.6.0
@@ -24,7 +33,7 @@ Python 3.8.
      should decrease startup time. :ghpull:`11693`
    - Autoreload now update the types of reloaded objects; this for example allow
      pickling of reloaded objects. :ghpull:`11644`
-   - Fix a big where ``%%time`` magic would suppress cell output. :ghpull:`11716`
+   - Fix a bug where ``%%time`` magic would suppress cell output. :ghpull:`11716`
 
 
 Prepare migration to pytest (instead of nose) for testing

From 3a0e83735e7fd5dbb6c658ab7f2e57d94e08a598 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Wed, 3 Jul 2019 09:42:21 -0700
Subject: [PATCH 099/370] release 7.6.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 87c0e84dd19..15f8f64828e 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 7
-_version_patch = 0
+_version_minor = 6
+_version_patch = 1
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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 1f0807dbd528fb191edfba330ca0c7345cfe3e65 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Wed, 3 Jul 2019 09:44:21 -0700
Subject: [PATCH 100/370] back to development

---
 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 15f8f64828e..87c0e84dd19 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 6
-_version_patch = 1
+_version_minor = 7
+_version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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 7d03acba8b4ac820bd4e9e1719b5dbe0dd7166c0 Mon Sep 17 00:00:00 2001
From: "Oriol (Prodesk)" <oriol.abril.pla@gmail.com>
Date: Thu, 4 Jul 2019 02:17:51 +0200
Subject: [PATCH 101/370] Fix %matplotlib

args.gui may not be a str
---
 IPython/core/magics/pylab.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/IPython/core/magics/pylab.py b/IPython/core/magics/pylab.py
index f5d011dc8d5..376d891f578 100644
--- a/IPython/core/magics/pylab.py
+++ b/IPython/core/magics/pylab.py
@@ -37,7 +37,7 @@
 @magics_class
 class PylabMagics(Magics):
     """Magics related to matplotlib's pylab support"""
-    
+
     @skip_doctest
     @line_magic
     @magic_arguments.magic_arguments()
@@ -46,23 +46,23 @@ class PylabMagics(Magics):
     @magic_gui_arg
     def matplotlib(self, line=''):
         """Set up matplotlib to work interactively.
-        
+
         This function lets you activate matplotlib interactive support
         at any point during an IPython session. It does not import anything
         into the interactive namespace.
-        
+
         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 [2]: set_matplotlib_formats('pdf', 'svg')
 
         The default for inline figures sets `bbox_inches` to 'tight'. This can
         cause discrepancies between the displayed image and the identical
         image created using `savefig`. This behavior can be disabled using the
         `%config` magic::
-            
+
             In [3]: %config InlineBackend.print_figure_kwargs = {'bbox_inches':None}
 
         In addition, see the docstring of
@@ -73,7 +73,7 @@ def matplotlib(self, line=''):
         Examples
         --------
         To enable the inline backend for usage with the IPython Notebook::
-        
+
             In [1]: %matplotlib inline
 
         In this case, where the matplotlib default is TkAgg::
@@ -96,7 +96,7 @@ def matplotlib(self, line=''):
             backends_list = list(backends.keys())
             print("Available matplotlib backends: %s" % backends_list)
         else:
-            gui, backend = self.shell.enable_matplotlib(args.gui.lower())
+            gui, backend = self.shell.enable_matplotlib(args.gui.lower() if isinstance(args.gui, str) else args.gui)
             self._show_matplotlib_backend(args.gui, backend)
 
     @skip_doctest
@@ -105,7 +105,7 @@ def matplotlib(self, line=''):
     @magic_arguments.argument(
         '--no-import-all', action='store_true', default=None,
         help="""Prevent IPython from performing ``import *`` into the interactive namespace.
-        
+
         You can govern the default behavior of this flag with the
         InteractiveShellApp.pylab_import_all configurable.
         """
@@ -116,23 +116,23 @@ def pylab(self, line=''):
 
         This function lets you activate pylab (matplotlib, numpy and
         interactive support) at any point during an IPython session.
-        
+
         %pylab makes the following imports::
-        
+
             import numpy
             import matplotlib
             from matplotlib import pylab, mlab, pyplot
             np = numpy
             plt = pyplot
-            
+
             from IPython.display import display
             from IPython.core.pylabtools import figsize, getfigs
-            
+
             from pylab import *
             from numpy import *
 
         If you pass `--no-import-all`, the last two `*` imports will be excluded.
-        
+
         See the %matplotlib magic for more details about activating matplotlib
         without affecting the interactive namespace.
         """
@@ -159,7 +159,7 @@ def pylab(self, line=''):
             warn("pylab import has clobbered these variables: %s"  % clobbered +
             "\n`%matplotlib` prevents importing * from pylab and numpy"
             )
-    
+
     def _show_matplotlib_backend(self, gui, backend):
         """show matplotlib message backend message"""
         if not gui or gui == 'auto':

From 0e6cca83625ea4aa07ce0c76bebfdfb9c02763d0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 16 May 2019 16:07:29 -0700
Subject: [PATCH 102/370] autoformat with black

---
 IPython/terminal/shortcuts.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 28aa5b4eb1b..11bd4480305 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -87,10 +87,23 @@ def create_ipython_shortcuts(shell):
 
 
 def newline_or_execute_outer(shell):
+
+    import black
     def newline_or_execute(event):
         """When the user presses return, insert a newline or execute the code."""
         b = event.current_buffer
         d = b.document
+        def try_reformat():
+            try:
+                tbc = b.delete_before_cursor(len(d.text[:d.cursor_position]))
+                fmt= black.format_str(tbc, mode=black.FileMode())
+                if not tbc.endswith('\n') and fmt.endswith('\n'):
+                    fmt = fmt[:-1]
+                b.insert_text(fmt)
+                #print(f'no eexc |{tbc[-1]}|,|{d.text[-1]}|, |{fmt[-3:-1]}|')
+            except Exception as e:
+                b.insert_text(tbc)
+
 
         if b.complete_state:
             cc = b.complete_state.current_completion
@@ -118,9 +131,11 @@ def newline_or_execute(event):
             return
 
         if (status != 'incomplete') and b.accept_handler:
+            try_reformat()
             b.validate_and_handle()
         else:
             if shell.autoindent:
+                try_reformat()
                 b.insert_text('\n' + indent)
             else:
                 b.insert_text('\n')

From e962a2b0e1032f5ac3f0c0cd1d40f9f0c177584b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 6 Jul 2019 21:30:28 -0700
Subject: [PATCH 103/370] some more work

---
 IPython/terminal/interactiveshell.py | 24 +++++++++++++++++
 IPython/terminal/shortcuts.py        | 39 +++++++++++++++++-----------
 2 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index be738f8f4de..1a4d5627957 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -87,6 +87,14 @@ 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):
+    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]
+    return formatted_text
+
+
 class TerminalInteractiveShell(InteractiveShell):
     space_for_menu = Integer(6, help='Number of line at the bottom of the screen '
                                      'to reserve for the completion menu'
@@ -120,6 +128,11 @@ def debugger_cls(self):
         help="Shortcut style to use at the prompt. 'vi' or 'emacs'.",
     ).tag(config=True)
 
+    autoformatter = Unicode(None,
+        help="Autoformatter to reformat Terminal code. Can be `'black'` or `None`",
+        allow_none=True
+    ).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)
@@ -150,6 +163,16 @@ def _editing_mode(self, change):
         if self.pt_app:
             self.pt_app.editing_mode = u_mode
 
+    @observe('autoformatter')
+    def _autoformatter_changed(self, change):
+        formatter = change.new
+        if formatter is None:
+            self.reformat_handler = lambda x:x
+        elif formatter == 'black':
+            self.reformat_handler = black_reformat_handler
+        else:
+            raise ValueError
+
     @observe('highlighting_style')
     @observe('colors')
     def _highlighting_style_changed(self, change):
@@ -246,6 +269,7 @@ def init_display_formatter(self):
         self.display_formatter.ipython_display_formatter.enabled = False
 
     def init_prompt_toolkit_cli(self):
+        self.reformat_handler = lambda x:x
         if self.simple_prompt:
             # Fall back to plain non-interactive output for tests.
             # This is very limited.
diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index 11bd4480305..ef0f65c5558 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -44,6 +44,15 @@ def create_ipython_shortcuts(shell):
                             & 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('escape', 'enter', filter=(has_focus(DEFAULT_BUFFER)
+                            & ~has_selection
+                            & insert_mode
+                                      ))(reformat_and_execute)
+
     kb.add('c-\\')(force_exit)
 
     kb.add('c-p', filter=(vi_insert_mode & has_focus(DEFAULT_BUFFER))
@@ -86,24 +95,21 @@ def create_ipython_shortcuts(shell):
     return kb
 
 
+def reformat_text_before_cursor(buffer, document, shell):
+    text = buffer.delete_before_cursor(len(document.text[:document.cursor_position]))
+    try:
+        formatted_text = shell.reformat_handler(text)
+        buffer.insert_text(formatted_text)
+    except Exception as e:
+        buffer.insert_text(text)
+
+
 def newline_or_execute_outer(shell):
 
-    import black
     def newline_or_execute(event):
         """When the user presses return, insert a newline or execute the code."""
         b = event.current_buffer
         d = b.document
-        def try_reformat():
-            try:
-                tbc = b.delete_before_cursor(len(d.text[:d.cursor_position]))
-                fmt= black.format_str(tbc, mode=black.FileMode())
-                if not tbc.endswith('\n') and fmt.endswith('\n'):
-                    fmt = fmt[:-1]
-                b.insert_text(fmt)
-                #print(f'no eexc |{tbc[-1]}|,|{d.text[-1]}|, |{fmt[-3:-1]}|')
-            except Exception as e:
-                b.insert_text(tbc)
-
 
         if b.complete_state:
             cc = b.complete_state.current_completion
@@ -120,7 +126,11 @@ def try_reformat():
         else:
             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
+        if d.text[d.cursor_position:].isspace():
+            reformat_text_before_cursor(b, d, shell)
         if not (d.on_last_line or
                 d.cursor_position_row >= d.line_count - d.empty_line_count_at_the_end()
                 ):
@@ -131,11 +141,10 @@ def try_reformat():
             return
 
         if (status != 'incomplete') and b.accept_handler:
-            try_reformat()
+            reformat_text_before_cursor(b, d, shell)
             b.validate_and_handle()
         else:
             if shell.autoindent:
-                try_reformat()
                 b.insert_text('\n' + indent)
             else:
                 b.insert_text('\n')

From fd7c548d378a053e63209cb9da6d9d10acef989d Mon Sep 17 00:00:00 2001
From: techassetskris <knewsome@techassets.com>
Date: Sun, 14 Jul 2019 22:01:21 -0400
Subject: [PATCH 104/370] Fix #11820 - Broken links in tutorial.

---
 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 5a70345190b..390d4e21901 100644
--- a/docs/source/interactive/tutorial.rst
+++ b/docs/source/interactive/tutorial.rst
@@ -10,11 +10,11 @@ more than the standard prompt. Some key features are described here. For more
 information, check the :ref:`tips page <tips>`, or look at examples in the
 `IPython cookbook <https://github.com/ipython/ipython/wiki/Cookbook%3A-Index>`_.
 
-If you haven't done that yet see `how to install ipython <install>`_ .
+If you haven't done that yet see `how to install ipython <https://ipython.readthedocs.io/en/stable/install/index.html>`_ .
 
 If you've never used Python before, you might want to look at `the official
 tutorial <http://docs.python.org/tutorial/>`_ or an alternative, `Dive into
-Python <http://diveintopython.net/toc/index.html>`_.
+Python <https://www.diveinto.org/python3/table-of-contents.html>`_.
 
 Start IPython by issuing the ``ipython`` command from your shell, you should be
 greeted by the following::

From 2069edca586b3ad0decd4e7893b28b77b2667730 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Mon, 15 Jul 2019 18:55:17 -0700
Subject: [PATCH 105/370] fix instlal link

---
 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 390d4e21901..e1000e0f974 100644
--- a/docs/source/interactive/tutorial.rst
+++ b/docs/source/interactive/tutorial.rst
@@ -10,7 +10,7 @@ more than the standard prompt. Some key features are described here. For more
 information, check the :ref:`tips page <tips>`, or look at examples in the
 `IPython cookbook <https://github.com/ipython/ipython/wiki/Cookbook%3A-Index>`_.
 
-If you haven't done that yet see `how to install ipython <https://ipython.readthedocs.io/en/stable/install/index.html>`_ .
+If you haven't done that yet see :ref:`how to install ipython <install>`.
 
 If you've never used Python before, you might want to look at `the official
 tutorial <http://docs.python.org/tutorial/>`_ or an alternative, `Dive into

From e2c2c36ea84997499403d2bbd2da01428c377422 Mon Sep 17 00:00:00 2001
From: Min ho Kim <minho42@gmail.com>
Date: Mon, 22 Jul 2019 01:57:37 +1000
Subject: [PATCH 106/370] Fix typos

---
 IPython/core/application.py            | 2 +-
 IPython/core/displayhook.py            | 2 +-
 IPython/core/page.py                   | 2 +-
 IPython/core/ultratb.py                | 2 +-
 IPython/extensions/sympyprinting.py    | 2 +-
 IPython/testing/plugin/ipdoctest.py    | 2 +-
 docs/source/whatsnew/version0.11.rst   | 2 +-
 examples/Embedding/embed_class_long.py | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/IPython/core/application.py b/IPython/core/application.py
index fea2b50f561..93639d88e2c 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -293,7 +293,7 @@ def load_config_file(self, suppress_errors=IPYTHON_SUPPRESS_CONFIG_ERRORS):
         printed on screen. For testing, the suppress_errors option is set
         to False, so errors will make tests fail.
 
-        `supress_errors` default value is to be `None` in which case the
+        `suppress_errors` default value is to be `None` in which case the
         behavior default to the one of `traitlets.Application`.
 
         The default value can be set :
diff --git a/IPython/core/displayhook.py b/IPython/core/displayhook.py
index d4ff9a657e8..2128c82d12f 100644
--- a/IPython/core/displayhook.py
+++ b/IPython/core/displayhook.py
@@ -252,7 +252,7 @@ def finish_displayhook(self):
     def __call__(self, result=None):
         """Printing with history cache management.
 
-        This is invoked everytime the interpreter needs to print, and is
+        This is invoked every time the interpreter needs to print, and is
         activated by setting the variable sys.displayhook to it.
         """
         self.check_for_underscore()
diff --git a/IPython/core/page.py b/IPython/core/page.py
index 1a966e1836f..b5d5b1f56d1 100644
--- a/IPython/core/page.py
+++ b/IPython/core/page.py
@@ -96,7 +96,7 @@ def _detect_screen_size(screen_lines_def):
     # There is a bug in curses, where *sometimes* it fails to properly
     # initialize, and then after the endwin() call is made, the
     # terminal is left in an unusable state.  Rather than trying to
-    # check everytime for this (by requesting and comparing termios
+    # check every time for this (by requesting and comparing termios
     # flags each time), we just save the initial terminal state and
     # unconditionally reset it every time.  It's cheaper than making
     # the checks.
diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 03b02b47d66..0864ba456ef 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -41,7 +41,7 @@
 .. note::
 
   The verbose mode print all variables in the stack, which means it can
-  potentially leak sensitive information like access keys, or unencryted
+  potentially leak sensitive information like access keys, or unencrypted
   password.
 
 Installation instructions for VerboseTB::
diff --git a/IPython/extensions/sympyprinting.py b/IPython/extensions/sympyprinting.py
index 7f9fb2ef98a..e6a83cd34b6 100644
--- a/IPython/extensions/sympyprinting.py
+++ b/IPython/extensions/sympyprinting.py
@@ -14,7 +14,7 @@
 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 compatablitiy with old SymPy versions.
+maintained here for backwards compatibility with old SymPy versions.
 
 """
 #-----------------------------------------------------------------------------
diff --git a/IPython/testing/plugin/ipdoctest.py b/IPython/testing/plugin/ipdoctest.py
index 4babb2c5c7d..3b8667e72ff 100644
--- a/IPython/testing/plugin/ipdoctest.py
+++ b/IPython/testing/plugin/ipdoctest.py
@@ -574,7 +574,7 @@ def run(self, test, compileflags=None, out=None, clear_globs=True):
         # 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 unconconditionally updating test.globs here
+        # 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
diff --git a/docs/source/whatsnew/version0.11.rst b/docs/source/whatsnew/version0.11.rst
index b03293717f6..a557c3141ac 100644
--- a/docs/source/whatsnew/version0.11.rst
+++ b/docs/source/whatsnew/version0.11.rst
@@ -264,7 +264,7 @@ reference docs.
 Refactoring
 -----------
 
-As of this release, a signifiant portion of IPython has been refactored.  This
+As of this release, a significant portion of IPython has been refactored.  This
 refactoring is founded on a number of new abstractions.  The main new classes
 that implement these abstractions are:
 
diff --git a/examples/Embedding/embed_class_long.py b/examples/Embedding/embed_class_long.py
index 943fa8cdf18..53a31cf2a5a 100755
--- a/examples/Embedding/embed_class_long.py
+++ b/examples/Embedding/embed_class_long.py
@@ -83,7 +83,7 @@ def out_prompt_tokens(self):
 # messages. The IPython banner (which actually may contain initialization
 # messages) is available as get_ipython().banner in case you want it.
 
-# InteractiveShellEmbed instances print the following information everytime they
+# InteractiveShellEmbed instances print the following information every time they
 # start:
 
 # - A global startup banner.

From babedc8aaec671afd2cceddf373221fe9264aaf7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 21 Jul 2019 20:57:45 -0700
Subject: [PATCH 107/370] no mention os setup.py install

---
 IPython/testing/plugin/Makefile   | 2 +-
 IPython/testing/plugin/README.txt | 7 +------
 tools/alldeps/README.txt          | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/IPython/testing/plugin/Makefile b/IPython/testing/plugin/Makefile
index 6f999a38fd3..c626da4e3c0 100644
--- a/IPython/testing/plugin/Makefile
+++ b/IPython/testing/plugin/Makefile
@@ -67,7 +67,7 @@ all: base ipython
 
 # Main plugin and cleanup
 IPython_doctest_plugin.egg-info: $(SRC)
-	python setup.py install --prefix=$(PREFIX)
+	pip install . --prefix=$(PREFIX)
 	touch $@
 
 clean:
diff --git a/IPython/testing/plugin/README.txt b/IPython/testing/plugin/README.txt
index 6b34f9e5e10..a85e5a12a10 100644
--- a/IPython/testing/plugin/README.txt
+++ b/IPython/testing/plugin/README.txt
@@ -12,12 +12,7 @@ install the plugin by using standard Python procedures (``setup.py install``
 with appropriate arguments).
 
 To install the plugin using the Makefile, edit its first line to reflect where
-you'd like the installation.  If you want it system-wide, you may want to edit
-the install line in the plugin target to use sudo and no prefix::
-
-  sudo python setup.py install
-
-instead of the code using `--prefix` that's in there.
+you'd like the installation.
 
 Once you've set the prefix, simply build/install the plugin with::
 
diff --git a/tools/alldeps/README.txt b/tools/alldeps/README.txt
index f40ec7a6e86..ebe026bd02b 100644
--- a/tools/alldeps/README.txt
+++ b/tools/alldeps/README.txt
@@ -43,7 +43,7 @@ It is meant to be used in an environment where you have your ``$PATH``,
 ``$PYTHONPATH``, etc variables properly configured, so that the installation of
 packages can be made with (using ``~/usr/local`` as an example)::
 
-    python setup.py install --prefix=~/usr/local
+    pip install . --prefix=~/usr/local
 
 For an explanation of how to do this, see below.
 

From b63e87e42eb6b9db4711bf59114fd2c2fb7ec953 Mon Sep 17 00:00:00 2001
From: lllf <littlelightlittlefire@gmail.com>
Date: Tue, 23 Jul 2019 14:32:27 +1000
Subject: [PATCH 108/370] Sets error_before_exec to be the value of the
 exception instead of the stack trace

---
 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 9a2518537b4..5774d342204 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2988,7 +2988,7 @@ def error_before_exec(value):
             self.showtraceback(preprocessing_exc_tuple)
             if store_history:
                 self.execution_count += 1
-            return error_before_exec(preprocessing_exc_tuple[2])
+            return error_before_exec(preprocessing_exc_tuple[1])
 
         # Our own compiler remembers the __future__ environment. If we want to
         # run code with a separate __future__ environment, use the default

From 746a8d8e423db6060605e77788c972ee9a9f67ee Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 23 Jul 2019 14:44:54 -0700
Subject: [PATCH 109/370] Add a test for reset behavior

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

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 716e7cced23..47db895e581 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -371,6 +371,31 @@ def test_reset_in_length():
     _ip.run_cell("reset -f in")
     nt.assert_equal(len(_ip.user_ns['In']), _ip.displayhook.prompt_count+1)
 
+class TestResetErrors(TestCase):
+
+    def test_reset_redefine(self):
+
+        @magics_class
+        class KernelMagics(Magics):
+              @line_magic
+              def less(self, shell): pass
+
+        _ip.register_magics(KernelMagics)
+
+        with self.assertLogs() as cm:
+            # hack, we want to just capture logs, but assertLogs fails if not
+            # logs get produce.
+            # so log one things we ignore.
+            import logging as log_mod
+            log = log_mod.getLogger()
+            log.info('Nothing')
+            # end hack.
+            _ip.run_cell("reset -f")
+
+        assert len(cm.output) == 1
+        for out in cm.output:
+            assert "Invalid alias" not in out
+
 def test_tb_syntaxerror():
     """test %tb after a SyntaxError"""
     ip = get_ipython()

From 3e56e52edf524b83e6e72b1a7b521b6e0c437147 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 23 Jul 2019 14:50:42 -0700
Subject: [PATCH 110/370] use explicit checking instead of tr/except

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

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index b80b3ebe8c3..be1971279dc 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1435,9 +1435,9 @@ def reset(self, new_session=True):
         drop_keys.discard('__name__')
         for k in drop_keys:
             del ns[k]
-        
+
         self.user_ns_hidden.clear()
-        
+
         # Restore the user namespaces to minimal usability
         self.init_user_ns()
 
@@ -1450,9 +1450,7 @@ def reset(self, new_session=True):
         # GUI or web frontend
         if os.name == 'posix':
             for cmd in ('clear', 'more', 'less', 'man'):
-                try:
-                    name = self.magics_manager.magics['line'][cmd]
-                except KeyError:
+                if cmd not in self.magics_manager.magics['line']:
                     self.alias_manager.soft_define_alias(cmd, cmd)
 
         # Flush the private list of module references kept for script

From fb8ac7fe30545f3fb8b79c3dc35af0de0527b470 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Wed, 24 Jul 2019 15:00:28 -0700
Subject: [PATCH 111/370] Create 7.7.0 release notes

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

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 938bd45cea7..760edf2a3fa 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,31 @@
  7.x Series
 ============
 
+.. _version770:
+
+IPython 7.7.0
+=============
+
+IPython 7.7.0 contain multiple bug fixes and documentation updates; Here are a
+few of the outstanding issue fixed:
+
+   - Fix a bug introduced in 7.6 where the ``%matplotlib`` magic would fail on
+     previously acceptable arguments :ghpull:`11814`.
+   - Fix the manage location on freebsd :ghpull:`11808`.
+   - Fix error message about aliases after ``%reset`` call in ipykernel
+     :ghpull:`11806`
+   - Fix Duplication completions in emacs :ghpull:`11803`
+
+We are planning to adopt `NEP29 <https://github.com/numpy/numpy/pull/14086>`_
+(still currently in draft) which may make this minor version of IPython the
+last one to support Python 3.5 and will make the code base more aggressive
+toward removing compatibility with older versions of Python.
+
+GitHub now support to give only "Triage" permissions to users; if you'd like to
+help close stale issues and labels issues please reach to us with your GitHub
+Username and we'll add you to the triage team. It is a great way to start
+contributing and a path toward getting commit rights.
+
 .. _version761:
 
 IPython 7.6.1

From 288c935fa1ddba6e33803c6e194df83f5debbe41 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Jul 2019 15:10:49 -0700
Subject: [PATCH 112/370] Add  stats and some early checks in release script

---
 docs/source/whatsnew/github-stats-7.rst | 21 +++++++++++++++++++++
 tools/release_helper.sh                 | 10 ++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index ade355db986..48f282dfe29 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -1,6 +1,27 @@
 Issues closed in the 7.x development cycle
 ==========================================
 
+Issues closed in 7.7
+--------------------
+
+GitHub stats for 2019/07/03 - 2019/07/26 (tag: 7.6.1)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 5 issues and merged 9 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A7.7>`__
+
+The following 8 authors contributed 26 commits.
+
+* Brandon T. Willard
+* juanis2112
+* lllf
+* Matthias Bussonnier
+* Min ho Kim
+* Oriol (Prodesk)
+* Po-Chuan Hsieh
+* techassetskris
+
 Issues closed in 7.6
 --------------------
 
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index a9777f0216c..c60fffe4d2b 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -1,6 +1,13 @@
 # Simple tool to help for release
 # when releasing with bash, simplei 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'
+
 echo -n 'PREV_RELEASE (X.y.z):'
 read PREV_RELEASE
 echo -n 'MILESTONE (X.y):'
@@ -40,8 +47,7 @@ read
 echo "Cleaning repository"
 git clean -xfdi
 
-echo "please update version number in ${RED}IPython/core/release.py${NOR} , Do not commit
-yet – we'll do it later."
+echo "please update version number in ${RED}IPython/core/release.py${NOR} , Do not commit yet – we'll do it later."
 
 echo "Press enter to continue"
 read

From 741169a0094d1f18312b73a87a320a08526ac21c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Jul 2019 15:12:26 -0700
Subject: [PATCH 113/370] release 7.7.0

---
 IPython/core/release.py | 2 +-
 tools/release_helper.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 87c0e84dd19..e07a15ef7c3 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -24,7 +24,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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]
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index c60fffe4d2b..779ccb43708 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -7,6 +7,7 @@ python -c 'import keyring'
 python -c 'import twine'
 python -c 'import sphinx'
 python -c 'import sphinx_rtd_theme'
+python -c 'import nose'
 
 echo -n 'PREV_RELEASE (X.y.z):'
 read PREV_RELEASE

From 1879ed27bb0ec3be5fee499ac177ad14a9ef7cfd Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Jul 2019 15:15:46 -0700
Subject: [PATCH 114/370] back to development

---
 IPython/core/release.py |  4 ++--
 tools/release_helper.sh | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index e07a15ef7c3..bf80392e89e 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 7
+_version_minor = 8
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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]
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 779ccb43708..23c7138590d 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -68,7 +68,15 @@ tools/build_release
 
 echo
 echo "Let\'s commit : git commit -am \"release $VERSION\" -S"
+echo $"Press enter to continue"
+read
+git commit -am "release $VERSION" -S
+
+echo
+echo "git push origin \$BRANCH ?"
 echo "Press enter to continue"
 read
-git commit -am "release $VERSION"
+git push origin $BRANCH
+# git tag -am "release $VERSION" "$VERSION" -s
+# git push origin $VERSION
 

From f91fc4e1dd915a1afd5a8913a8eba83c5024f285 Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Tue, 30 Jul 2019 17:27:20 +0200
Subject: [PATCH 115/370] Enable changing the font color for LaTeX rendering

---
 IPython/lib/latextools.py            | 18 ++++++++++--------
 IPython/lib/tests/test_latextools.py | 25 ++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py
index b56b360ba4e..0acd16d2077 100644
--- a/IPython/lib/latextools.py
+++ b/IPython/lib/latextools.py
@@ -22,7 +22,7 @@ class LaTeXTool(SingletonConfigurable):
     """An object to store configuration of the LaTeX tool."""
     def _config_default(self):
         return get_config()
-    
+
     backends = List(
         Unicode(), ["matplotlib", "dvipng"],
         help="Preferred backend to draw LaTeX math equations. "
@@ -55,7 +55,7 @@ def _config_default(self):
         ).tag(config=True)
 
 
-def latex_to_png(s, encode=False, backend=None, wrap=False):
+def latex_to_png(s, encode=False, backend=None, wrap=False, color='Black'):
     """Render a LaTeX string to PNG.
 
     Parameters
@@ -68,6 +68,8 @@ def latex_to_png(s, encode=False, backend=None, wrap=False):
         Backend for producing PNG data.
     wrap : bool
         If true, Automatically wrap `s` as a LaTeX equation.
+    color : string
+        Foreground color name among dvipsnames.
 
     None is returned when the backend cannot be used.
 
@@ -84,13 +86,13 @@ def latex_to_png(s, encode=False, backend=None, wrap=False):
         f = latex_to_png_dvipng
     else:
         raise ValueError('No such backend {0}'.format(backend))
-    bin_data = f(s, wrap)
+    bin_data = f(s, wrap, color)
     if encode and bin_data:
         bin_data = encodebytes(bin_data)
     return bin_data
 
 
-def latex_to_png_mpl(s, wrap):
+def latex_to_png_mpl(s, wrap, color='Black'):
     try:
         from matplotlib import mathtext
         from pyparsing import ParseFatalException
@@ -105,13 +107,13 @@ def latex_to_png_mpl(s, wrap):
     try:
         mt = mathtext.MathTextParser('bitmap')
         f = BytesIO()
-        mt.to_png(f, s, fontsize=12)
+        mt.to_png(f, s, fontsize=12, color=color)
         return f.getvalue()
     except (ValueError, RuntimeError, ParseFatalException):
         return None
 
 
-def latex_to_png_dvipng(s, wrap):
+def latex_to_png_dvipng(s, wrap, color='Black'):
     try:
         find_cmd('latex')
         find_cmd('dvipng')
@@ -133,8 +135,8 @@ def latex_to_png_dvipng(s, wrap):
 
             subprocess.check_call(
                 ["dvipng", "-T", "tight", "-x", "1500", "-z", "9",
-                 "-bg", "transparent", "-o", outfile, dvifile], cwd=workdir,
-                stdout=devnull, stderr=devnull)
+                 "-bg", "transparent", "-o", outfile, dvifile, "-fg", color],
+                 cwd=workdir, stdout=devnull, stderr=devnull)
 
         with open(outfile, "rb") as f:
             return f.read()
diff --git a/IPython/lib/tests/test_latextools.py b/IPython/lib/tests/test_latextools.py
index 27727843d83..35e5309040e 100644
--- a/IPython/lib/tests/test_latextools.py
+++ b/IPython/lib/tests/test_latextools.py
@@ -62,7 +62,7 @@ def mock_kpsewhich(filename):
 @skipif_not_matplotlib
 def test_latex_to_html():
     img = latextools.latex_to_html("$x^2$")
-    nt.assert_in("data:image/png;base64,iVBOR", img) 
+    nt.assert_in("data:image/png;base64,iVBOR", img)
 
 
 def test_genelatex_no_wrap():
@@ -132,3 +132,26 @@ def mock_kpsewhich(filename):
 \begin{document}
 $$x^2$$
 \end{document}''')
+
+
+def test_latex_to_png_color():
+    """
+    Test color settings for latex_to_png.
+    """
+    latex_string = "$x^2$"
+    default_value = latextools.latex_to_png(latex_string, wrap=False)
+    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)
+    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])
+
+    # 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)
+
+    mpl_maroon = latextools.latex_to_png_mpl(latex_string, False, 'Maroon')
+    nt.assert_not_equal(mpl_black, mpl_maroon)

From 978f4da6ae538a1a003a4e4b887e6b30bee8d271 Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Thu, 1 Aug 2019 19:39:05 +0200
Subject: [PATCH 116/370] Better color options and added scale

---
 IPython/lib/latextools.py            | 31 +++++++++++++++++++++-------
 IPython/lib/tests/test_latextools.py | 26 ++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py
index 0acd16d2077..ace6fdf36de 100644
--- a/IPython/lib/latextools.py
+++ b/IPython/lib/latextools.py
@@ -10,6 +10,7 @@
 import shutil
 import subprocess
 from base64 import encodebytes
+from textwrap import wrap as splitstring
 
 from IPython.utils.process import find_cmd, FindCmdError
 from traitlets.config import get_config
@@ -55,7 +56,8 @@ def _config_default(self):
         ).tag(config=True)
 
 
-def latex_to_png(s, encode=False, backend=None, wrap=False, color='Black'):
+def latex_to_png(s, encode=False, backend=None, wrap=False, color='Black',
+                 scale=1.0):
     """Render a LaTeX string to PNG.
 
     Parameters
@@ -69,7 +71,10 @@ def latex_to_png(s, encode=False, backend=None, wrap=False, color='Black'):
     wrap : bool
         If true, Automatically wrap `s` as a LaTeX equation.
     color : string
-        Foreground color name among dvipsnames.
+        Foreground color name among dvipsnames, e.g. 'Maroon' or on hex RGB
+        format, e.g. '#AA20FA'.
+    scale : float
+        Scale factor for the resulting PNG.
 
     None is returned when the backend cannot be used.
 
@@ -84,15 +89,25 @@ def latex_to_png(s, encode=False, backend=None, wrap=False, color='Black'):
         f = latex_to_png_mpl
     elif backend == 'dvipng':
         f = latex_to_png_dvipng
+        if color.startswith('#'):
+            # Convert hex RGB color to LaTeX RGB color.
+            if len(color) == 7:
+                try:
+                    color = "RGB {}".format(" ".join([str(int(x, 16)) for x in
+                                                      splitstring(color[1:], 2)]))
+                except ValueError:
+                    raise ValueError('Invalid color specification {}.'.format(color))
+            else:
+                raise ValueError('Invalid color specification {}.'.format(color))
     else:
         raise ValueError('No such backend {0}'.format(backend))
-    bin_data = f(s, wrap, color)
+    bin_data = f(s, wrap, color, scale)
     if encode and bin_data:
         bin_data = encodebytes(bin_data)
     return bin_data
 
 
-def latex_to_png_mpl(s, wrap, color='Black'):
+def latex_to_png_mpl(s, wrap, color='Black', scale=1.0):
     try:
         from matplotlib import mathtext
         from pyparsing import ParseFatalException
@@ -107,13 +122,14 @@ def latex_to_png_mpl(s, wrap, color='Black'):
     try:
         mt = mathtext.MathTextParser('bitmap')
         f = BytesIO()
-        mt.to_png(f, s, fontsize=12, color=color)
+        dpi = 120*scale
+        mt.to_png(f, s, fontsize=12, dpi=dpi, color=color)
         return f.getvalue()
     except (ValueError, RuntimeError, ParseFatalException):
         return None
 
 
-def latex_to_png_dvipng(s, wrap, color='Black'):
+def latex_to_png_dvipng(s, wrap, color='Black', scale=1.0):
     try:
         find_cmd('latex')
         find_cmd('dvipng')
@@ -133,8 +149,9 @@ def latex_to_png_dvipng(s, wrap, color='Black'):
                 ["latex", "-halt-on-error", "-interaction", "batchmode", tmpfile],
                 cwd=workdir, stdout=devnull, stderr=devnull)
 
+            resolution = round(150*scale)
             subprocess.check_call(
-                ["dvipng", "-T", "tight", "-x", "1500", "-z", "9",
+                ["dvipng", "-T", "tight", "-D", str(resolution), "-z", "9",
                  "-bg", "transparent", "-o", outfile, dvifile, "-fg", color],
                  cwd=workdir, stdout=devnull, stderr=devnull)
 
diff --git a/IPython/lib/tests/test_latextools.py b/IPython/lib/tests/test_latextools.py
index 35e5309040e..2cbdb17a844 100644
--- a/IPython/lib/tests/test_latextools.py
+++ b/IPython/lib/tests/test_latextools.py
@@ -134,12 +134,16 @@ def mock_kpsewhich(filename):
 \end{document}''')
 
 
+@skipif_not_matplotlib
+@onlyif_cmds_exist('latex', 'dvipng')
 def test_latex_to_png_color():
     """
     Test color settings for latex_to_png.
     """
     latex_string = "$x^2$"
     default_value = latextools.latex_to_png(latex_string, wrap=False)
+    default_hexblack = latextools.latex_to_png(latex_string, wrap=False,
+                                               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)
@@ -147,11 +151,31 @@ def test_latex_to_png_color():
     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])
 
     # Test that dvips name colors can be used without error
-    dvipng_maroon = latextools.latex_to_png_dvipng(latex_string, False, 'Maroon')
+    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)
 
     mpl_maroon = latextools.latex_to_png_mpl(latex_string, False, 'Maroon')
     nt.assert_not_equal(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)
+
+    mpl_white_scale = latextools.latex_to_png_mpl(latex_string, False,
+                                                  'White', 1.2)
+    nt.assert_not_equal(mpl_white, mpl_white_scale)
+
+
+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"))

From e5dc064eebf20e529bd6f2dcb1c0a6e8410ba6cf Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 9 Aug 2019 10:40:13 -0700
Subject: [PATCH 117/370] Use explicit fully qualified name instead of uncommon
 alias.

We can't use 'wrap' as there is a kwarg with the same name.
---
 IPython/lib/latextools.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py
index ace6fdf36de..cbcc7d9639e 100644
--- a/IPython/lib/latextools.py
+++ b/IPython/lib/latextools.py
@@ -10,7 +10,7 @@
 import shutil
 import subprocess
 from base64 import encodebytes
-from textwrap import wrap as splitstring
+import textwrap
 
 from IPython.utils.process import find_cmd, FindCmdError
 from traitlets.config import get_config
@@ -94,7 +94,7 @@ def latex_to_png(s, encode=False, backend=None, wrap=False, color='Black',
             if len(color) == 7:
                 try:
                     color = "RGB {}".format(" ".join([str(int(x, 16)) for x in
-                                                      splitstring(color[1:], 2)]))
+                                                      textwrap.wrap(color[1:], 2)]))
                 except ValueError:
                     raise ValueError('Invalid color specification {}.'.format(color))
             else:

From cbfdf70d36f0ff2d5ebbedb61163f2d8859c487e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Wed, 31 Jul 2019 15:55:13 -0700
Subject: [PATCH 118/370] Provide hooks for arbitrary mimetypes handling.

This should allow at some point inline images, an math in the terminal.
---
 IPython/core/displayhook.py              |  2 +-
 IPython/core/displaypub.py               | 19 ++++++--
 IPython/core/interactiveshell.py         |  2 +-
 IPython/terminal/interactiveshell.py     |  2 +
 IPython/terminal/prompts.py              | 11 +++++
 docs/source/whatsnew/pr/mimerenderer.rst | 55 ++++++++++++++++++++++++
 6 files changed, 86 insertions(+), 5 deletions(-)
 create mode 100644 docs/source/whatsnew/pr/mimerenderer.rst

diff --git a/IPython/core/displayhook.py b/IPython/core/displayhook.py
index 2128c82d12f..29d41dd5e27 100644
--- a/IPython/core/displayhook.py
+++ b/IPython/core/displayhook.py
@@ -153,7 +153,7 @@ def compute_format_data(self, result):
     # This can be set to True by the write_output_prompt method in a subclass
     prompt_end_newline = False
 
-    def write_format_data(self, format_dict, md_dict=None):
+    def write_format_data(self, format_dict, md_dict=None) -> None:
         """Write the format data dict to the frontend.
 
         This default version of this method simply writes the plain text
diff --git a/IPython/core/displaypub.py b/IPython/core/displaypub.py
index 9625da2a843..d769692e969 100644
--- a/IPython/core/displaypub.py
+++ b/IPython/core/displaypub.py
@@ -19,7 +19,7 @@
 import sys
 
 from traitlets.config.configurable import Configurable
-from traitlets import List
+from traitlets import List, Dict
 
 # This used to be defined here - it is imported for backwards compatibility
 from .display import publish_display_data
@@ -28,6 +28,7 @@
 # Main payload class
 #-----------------------------------------------------------------------------
 
+
 class DisplayPublisher(Configurable):
     """A traited class that publishes display data to frontends.
 
@@ -35,6 +36,10 @@ class DisplayPublisher(Configurable):
     be accessed there.
     """
 
+    def __init__(self, shell=None, *args, **kwargs):
+        self.shell = shell
+        super().__init__(*args, **kwargs)
+
     def _validate_data(self, data, metadata=None):
         """Validate the display data.
 
@@ -53,7 +58,7 @@ def _validate_data(self, data, metadata=None):
                 raise TypeError('metadata must be a dict, got: %r' % data)
 
     # use * to indicate transient, update are keyword-only
-    def publish(self, data, metadata=None, source=None, *, transient=None, update=False, **kwargs):
+    def publish(self, data, metadata=None, source=None, *, transient=None, update=False, **kwargs) -> None:
         """Publish data and metadata to all frontends.
 
         See the ``display_data`` message in the messaging documentation for
@@ -98,7 +103,15 @@ def publish(self, data, metadata=None, source=None, *, transient=None, update=Fa
             rather than creating a new output.
         """
 
-        # The default is to simply write the plain text data using sys.stdout.
+        handlers = {}
+        if self.shell is not None:
+            handlers = self.shell.mime_renderers
+
+        for mime, handler in handlers.items():
+            if mime in data:
+                handler(data[mime], metadata.get(mime, None))
+                return
+
         if 'text/plain' in data:
             print(data['text/plain'])
 
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 6dbf307cdd5..cc7ff1dd36c 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -863,7 +863,7 @@ def init_display_formatter(self):
         self.configurables.append(self.display_formatter)
 
     def init_display_pub(self):
-        self.display_pub = self.display_pub_class(parent=self)
+        self.display_pub = self.display_pub_class(parent=self, shell=self)
         self.configurables.append(self.display_pub)
 
     def init_data_pub(self):
diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index be738f8f4de..262c574a4f9 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -88,6 +88,8 @@ def get_default_editor():
 _use_simple_prompt = ('IPY_TEST_SIMPLE_PROMPT' in os.environ) or (not _is_tty)
 
 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'
                             ).tag(config=True)
diff --git a/IPython/terminal/prompts.py b/IPython/terminal/prompts.py
index 1a7563bda78..db1b751a026 100644
--- a/IPython/terminal/prompts.py
+++ b/IPython/terminal/prompts.py
@@ -89,3 +89,14 @@ def write_output_prompt(self):
                 )
             else:
                 sys.stdout.write(prompt_txt)
+
+    def write_format_data(self, format_dict, md_dict=None) -> None:
+        if self.shell.mime_renderers:
+
+            for mime, handler in self.shell.mime_renderers.items():
+                if mime in format_dict:
+                    handler(format_dict[mime], None)
+                    return
+                
+        super().write_format_data(format_dict, md_dict)
+
diff --git a/docs/source/whatsnew/pr/mimerenderer.rst b/docs/source/whatsnew/pr/mimerenderer.rst
new file mode 100644
index 00000000000..44aeb9d6d3f
--- /dev/null
+++ b/docs/source/whatsnew/pr/mimerenderer.rst
@@ -0,0 +1,55 @@
+Arbitrary Mimetypes Handing in Terminal
+=======================================
+
+When using IPython terminal it is now possible to register function to handle
+arbitrary mimetypes (``TerminalInteractiveShell.mime_renderers`` ``Dict``
+configurable). While rendering non-text based representation was possible in
+many jupyter frontend; it was not possible in terminal IPython, as usually
+terminal are limited to displaying text. As many terminal these days provide
+escape sequences to display non-text; bringing this loved feature to IPython CLI
+made a lot of sens. This functionality will not only allow inline images; but
+allow opening of external program; for example ``fmplayer`` to "display" sound
+files.
+
+Here is a complete IPython tension to display images inline and convert math to
+png, before displaying it inline ::
+
+
+    from base64 import encodebytes
+    from IPython.lib.latextools import latex_to_png
+
+
+    def mathcat(data, meta):
+        png = latex_to_png(f'$${data}$$'.replace('\displaystyle', '').replace('$$$', '$$'))
+        imcat(png, meta)
+
+    IMAGE_CODE = '\033]1337;File=name=name;inline=true;:{}\a'
+
+    def imcat(image_data, metadata):
+        try:
+            print(IMAGE_CODE.format(encodebytes(image_data).decode()))
+        # bug workaround
+        except:
+            print(IMAGE_CODE.format(image_data))
+
+    def register_mimerenderer(ipython, mime, handler):
+        ipython.display_formatter.active_types.append(mime)
+        ipython.display_formatter.formatters[mime].enabled = True
+        ipython.mime_renderers[mime] = handler
+
+    def load_ipython_extension(ipython):
+        register_mimerenderer(ipython, 'image/png', imcat)
+        register_mimerenderer(ipython, 'image/jpeg', imcat)
+        register_mimerenderer(ipython, 'text/latex', mathcat)
+
+This example only work for iterm2 on mac os and skip error handling for brevity.
+One could also invoke an external viewer with ``subporcess.run()`` and a
+tempfile, which is left as an exercise.
+
+So far only the hooks necessary for this are in place, but no default mime
+renderers added; so inline images will only be available via extensions. We will
+progressively enable these features by default in the next few releases, and
+contribution is welcomed.
+
+
+

From 5da2c265b66d5b232a136859e6e89362e9dde06d Mon Sep 17 00:00:00 2001
From: Dan Allan <dallan@bnl.gov>
Date: Tue, 13 Aug 2019 09:16:21 -0400
Subject: [PATCH 119/370] Fix example usage of BaseFormatter.for_type_by_name.

I propose a small documentation fix for this excellent feature of
IPython.

The current example doesn't work because the type module and type name
are lumped into one string. They must be given as separate strings.

See docstring:

```
Signature: BaseFormatter.for_type_by_name(self, type_module, type_name, func=None)
```

For extra clarity, I have added a submodule to this made-up example
module so that the pattern is clear.
---
 docs/source/config/integrating.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/config/integrating.rst b/docs/source/config/integrating.rst
index ded720fee19..0a1f0ec36a0 100644
--- a/docs/source/config/integrating.rst
+++ b/docs/source/config/integrating.rst
@@ -85,7 +85,7 @@ Formatters for third-party types
 
 The user can also register formatters for types without modifying the class::
 
-    from bar import Foo
+    from bar.baz import Foo
 
     def foo_html(obj):
         return '<marquee>Foo object %s</marquee>' % obj.name
@@ -94,7 +94,7 @@ The user can also register formatters for types without modifying the class::
     html_formatter.for_type(Foo, foo_html)
 
     # Or register a type without importing it - this does the same as above:
-    html_formatter.for_type_by_name('bar.Foo', foo_html)
+    html_formatter.for_type_by_name('bar.baz', 'Foo', foo_html)
 
 Custom exception tracebacks
 ===========================

From 79c601b9541fe7606030b6e85adf03d5355ab53f Mon Sep 17 00:00:00 2001
From: Min ho Kim <minho42@gmail.com>
Date: Wed, 14 Aug 2019 06:27:48 +1000
Subject: [PATCH 120/370] Fixed typos

---
 IPython/core/formatters.py                  | 2 +-
 IPython/core/interactiveshell.py            | 2 +-
 IPython/core/magics/execution.py            | 2 +-
 IPython/core/magics/osm.py                  | 6 +++---
 IPython/core/tests/test_completerlib.py     | 8 ++++----
 IPython/core/tests/test_displayhook.py      | 2 +-
 IPython/core/tests/test_interactiveshell.py | 6 +++---
 IPython/external/qt_loaders.py              | 2 +-
 IPython/lib/deepreload.py                   | 2 +-
 IPython/lib/display.py                      | 2 +-
 IPython/lib/inputhookgtk.py                 | 2 +-
 IPython/lib/inputhookgtk3.py                | 2 +-
 IPython/lib/inputhookpyglet.py              | 2 +-
 IPython/lib/inputhookwx.py                  | 2 +-
 IPython/lib/tests/test_display.py           | 8 ++++----
 IPython/sphinxext/ipython_directive.py      | 8 ++++----
 IPython/terminal/pt_inputhooks/wx.py        | 2 +-
 IPython/utils/tests/test_tokenutil.py       | 2 +-
 docs/source/whatsnew/version0.10.rst        | 2 +-
 docs/source/whatsnew/version0.11.rst        | 2 +-
 docs/source/whatsnew/version0.9.rst         | 4 ++--
 docs/source/whatsnew/version2.0.rst         | 2 +-
 docs/source/whatsnew/version7.rst           | 2 +-
 setupext/__init__.py                        | 2 +-
 24 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/IPython/core/formatters.py b/IPython/core/formatters.py
index f51cce9840d..fd93d3747b5 100644
--- a/IPython/core/formatters.py
+++ b/IPython/core/formatters.py
@@ -1011,7 +1011,7 @@ def format_display_data(obj, include=None, exclude=None):
         format data dict. If this is set *only* the format types included
         in this list will be computed.
     exclude : list or tuple, optional
-        A list of format type string (MIME types) to exclue in the format
+        A list of format type string (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.
     """
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 6dbf307cdd5..d1b59d76c0e 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -3157,7 +3157,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
-          interactivty setting and will only run the last node if it is an
+          interactivity setting and will only run the last node if it is an
           expression. 
 
         compiler : callable
diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 9031e470c32..d9e66b545a7 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -1171,7 +1171,7 @@ def timeit(self, line='', cell=None, local_ns=None):
         if not quiet :
             # Check best timing is greater than zero to avoid a
             # ZeroDivisionError.
-            # In cases where the slowest timing is lesser than a micosecond
+            # In cases where the slowest timing is lesser than a microsecond
             # we assume that it does not really matter if the fastest
             # timing is 4 times faster than the slowest timing or not.
             if worst > 4 * best and best > 0 and worst > 1e-6:
diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index a309280f686..c6d1539bd6d 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -58,7 +58,7 @@ def __init__(self, shell=None, **kwargs):
     @skip_doctest
     def _isexec_POSIX(self, file):
         """
-            Test for executible 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
@@ -70,14 +70,14 @@ def _isexec_POSIX(self, file):
     @skip_doctest
     def _isexec_WIN(self, file):
         """
-            Test for executible 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
 
     @skip_doctest
     def isexec(self, file):
         """
-            Test for executible file on non POSIX system
+            Test for executable file on non POSIX system
         """
         if self.is_posix:
             return self._isexec_POSIX(file)
diff --git a/IPython/core/tests/test_completerlib.py b/IPython/core/tests/test_completerlib.py
index fe546685bdc..d1127048764 100644
--- a/IPython/core/tests/test_completerlib.py
+++ b/IPython/core/tests/test_completerlib.py
@@ -48,7 +48,7 @@ def tearDown(self):
         shutil.rmtree(self.BASETESTDIR)
 
     def test_1(self):
-        """Test magic_run_completer, should match two alterntives
+        """Test magic_run_completer, should match two alternatives
         """
         event = MockEvent(u"%run a")
         mockself = None
@@ -56,7 +56,7 @@ def test_1(self):
         self.assertEqual(match, {u"a.py", u"aao.py", u"adir/"})
 
     def test_2(self):
-        """Test magic_run_completer, should match one alterntive
+        """Test magic_run_completer, should match one alternative
         """
         event = MockEvent(u"%run aa")
         mockself = None
@@ -102,7 +102,7 @@ def tearDown(self):
 
     @onlyif_unicode_paths
     def test_1(self):
-        """Test magic_run_completer, should match two alterntives
+        """Test magic_run_completer, should match two alternatives
         """
         event = MockEvent(u"%run a")
         mockself = None
@@ -111,7 +111,7 @@ def test_1(self):
 
     @onlyif_unicode_paths
     def test_2(self):
-        """Test magic_run_completer, should match one alterntive
+        """Test magic_run_completer, should match one alternative
         """
         event = MockEvent(u"%run aa")
         mockself = None
diff --git a/IPython/core/tests/test_displayhook.py b/IPython/core/tests/test_displayhook.py
index 7c1a9de02c4..6ad89793442 100644
--- a/IPython/core/tests/test_displayhook.py
+++ b/IPython/core/tests/test_displayhook.py
@@ -82,7 +82,7 @@ def test_interactivehooks_ast_modes():
     finally:
         ip.ast_node_interactivity = saved_mode
 
-def test_interactivehooks_ast_modes_semi_supress():
+def test_interactivehooks_ast_modes_semi_suppress():
     """
     Test that ast nodes can be triggered with different modes and suppressed
     by semicolon
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
index 23278ef3514..578ef27d36f 100644
--- a/IPython/core/tests/test_interactiveshell.py
+++ b/IPython/core/tests/test_interactiveshell.py
@@ -566,7 +566,7 @@ class TestSystemRaw(ExitCodeChecks):
 
     def setUp(self):
         super().setUp()
-        self.sytem = ip.system_raw
+        self.system = ip.system_raw
 
     @onlyif_unicode_paths
     def test_1(self):
@@ -590,7 +590,7 @@ class TestSystemPipedExitCode(ExitCodeChecks):
 
     def setUp(self):
         super().setUp()
-        self.sytem = ip.system_piped
+        self.system = ip.system_piped
 
     @skip_win32
     def test_exit_code_ok(self):
@@ -914,7 +914,7 @@ def test_syntaxerror_input_transformer(self):
             ip.run_cell('3456')
 
 
-class TestWarningSupression(unittest.TestCase):
+class TestWarningSuppression(unittest.TestCase):
     def test_warning_suppression(self):
         ip.run_cell("import warnings")
         try:
diff --git a/IPython/external/qt_loaders.py b/IPython/external/qt_loaders.py
index a27612de566..46cd9c35cb9 100644
--- a/IPython/external/qt_loaders.py
+++ b/IPython/external/qt_loaders.py
@@ -282,7 +282,7 @@ def load_qt(api_options):
     Raises
     ------
     ImportError, if it isn't possible to import any requested
-    bindings (either becaues they aren't installed, or because
+    bindings (either because they aren't installed, or because
     an incompatible library has already been installed)
     """
     loaders = {
diff --git a/IPython/lib/deepreload.py b/IPython/lib/deepreload.py
index 586b2be8b1e..37dd21abb90 100644
--- a/IPython/lib/deepreload.py
+++ b/IPython/lib/deepreload.py
@@ -271,7 +271,7 @@ def deep_import_hook(name, globals=None, locals=None, fromlist=None, level=-1):
 
 def deep_reload_hook(m):
     """Replacement for reload()."""
-    # Hardcode this one  as it would raise a NotImplemeentedError from the
+    # Hardcode this one  as it would raise a NotImplementedError from the
     # bowels of Python and screw up the import machinery after.
     # unlike other imports the `exclude` list already in place is not enough.
 
diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index 8127e90492c..e7c427cbe91 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -500,7 +500,7 @@ def _get_display_formatter(self,
              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 subsituted for the first
+            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):
diff --git a/IPython/lib/inputhookgtk.py b/IPython/lib/inputhookgtk.py
index 2b4b656f91a..98569f54d75 100644
--- a/IPython/lib/inputhookgtk.py
+++ b/IPython/lib/inputhookgtk.py
@@ -1,6 +1,6 @@
 # encoding: utf-8
 """
-Enable pygtk to be used interacive by setting PyOS_InputHook.
+Enable pygtk to be used interactively by setting PyOS_InputHook.
 
 Authors: Brian Granger
 """
diff --git a/IPython/lib/inputhookgtk3.py b/IPython/lib/inputhookgtk3.py
index d897e193fe5..b797e862558 100644
--- a/IPython/lib/inputhookgtk3.py
+++ b/IPython/lib/inputhookgtk3.py
@@ -1,6 +1,6 @@
 # encoding: utf-8
 """
-Enable Gtk3 to be used interacive by IPython.
+Enable Gtk3 to be used interactively by IPython.
 
 Authors: Thomi Richards
 """
diff --git a/IPython/lib/inputhookpyglet.py b/IPython/lib/inputhookpyglet.py
index b82fcf5ea7c..fb91ffed177 100644
--- a/IPython/lib/inputhookpyglet.py
+++ b/IPython/lib/inputhookpyglet.py
@@ -1,6 +1,6 @@
 # encoding: utf-8
 """
-Enable pyglet to be used interacive by setting PyOS_InputHook.
+Enable pyglet to be used interactively by setting PyOS_InputHook.
 
 Authors
 -------
diff --git a/IPython/lib/inputhookwx.py b/IPython/lib/inputhookwx.py
index 3aac5261315..60520a299c3 100644
--- a/IPython/lib/inputhookwx.py
+++ b/IPython/lib/inputhookwx.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 """
-Enable wxPython to be used interacive by setting PyOS_InputHook.
+Enable wxPython to be used interactively by setting PyOS_InputHook.
 
 Authors:  Robin Dunn, Brian Granger, Ondrej Certik
 """
diff --git a/IPython/lib/tests/test_display.py b/IPython/lib/tests/test_display.py
index 20963e23a1f..f56aca4b43b 100644
--- a/IPython/lib/tests/test_display.py
+++ b/IPython/lib/tests/test_display.py
@@ -52,8 +52,8 @@ def test_instantiation_FileLink():
     if sys.version_info >= (3, 6):
         fl = display.FileLink(pathlib.PurePath('example.txt'))
 
-def test_warning_on_non_existant_path_FileLink():
-    """FileLink: Calling _repr_html_ on non-existant files returns a warning
+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>)'))
@@ -91,8 +91,8 @@ def test_instantiation_FileLinks():
     """
     fls = display.FileLinks('example')
 
-def test_warning_on_non_existant_path_FileLinks():
-    """FileLinks: Calling _repr_html_ on non-existant files returns a warning
+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>)'))
diff --git a/IPython/sphinxext/ipython_directive.py b/IPython/sphinxext/ipython_directive.py
index ce5825f3e02..60c1b51db32 100644
--- a/IPython/sphinxext/ipython_directive.py
+++ b/IPython/sphinxext/ipython_directive.py
@@ -206,10 +206,10 @@
 from IPython import InteractiveShell
 from IPython.core.profiledir import ProfileDir
 
-use_matpltolib = False
+use_matplotlib = False
 try:
     import matplotlib
-    use_matpltolib = True
+    use_matplotlib = True
 except Exception:
     pass
 
@@ -934,7 +934,7 @@ def setup(self):
             # EmbeddedSphinxShell is created, its interactive shell member
             # is the same for each instance.
 
-            if mplbackend and 'matplotlib.backends' not in sys.modules and use_matpltolib:
+            if mplbackend and 'matplotlib.backends' not in sys.modules and use_matplotlib:
                 import matplotlib
                 matplotlib.use(mplbackend)
 
@@ -1065,7 +1065,7 @@ def setup(app):
     # If the user sets this config value to `None`, then EmbeddedSphinxShell's
     # __init__ method will treat it as [].
     execlines = ['import numpy as np']
-    if use_matpltolib:
+    if use_matplotlib:
         execlines.append('import matplotlib.pyplot as plt')
     app.add_config_value('ipython_execlines', execlines, 'env')
 
diff --git a/IPython/terminal/pt_inputhooks/wx.py b/IPython/terminal/pt_inputhooks/wx.py
index 2f416d10a32..e6b4f57aafc 100644
--- a/IPython/terminal/pt_inputhooks/wx.py
+++ b/IPython/terminal/pt_inputhooks/wx.py
@@ -1,4 +1,4 @@
-"""Enable wxPython to be used interacively in prompt_toolkit
+"""Enable wxPython to be used interactively in prompt_toolkit
 """
 
 import sys
diff --git a/IPython/utils/tests/test_tokenutil.py b/IPython/utils/tests/test_tokenutil.py
index 4ffe7afefc2..0e69d5f6cb9 100644
--- a/IPython/utils/tests/test_tokenutil.py
+++ b/IPython/utils/tests/test_tokenutil.py
@@ -120,7 +120,7 @@ def test_line_at_cursor():
     nt.assert_equal(line, "pri")
     nt.assert_equal(offset, 4)
 
-def test_muliline_statement():
+def test_multiline_statement():
     cell = """a = (1,
     3)
 
diff --git a/docs/source/whatsnew/version0.10.rst b/docs/source/whatsnew/version0.10.rst
index 6073216395a..1ffbaa2e465 100644
--- a/docs/source/whatsnew/version0.10.rst
+++ b/docs/source/whatsnew/version0.10.rst
@@ -77,7 +77,7 @@ Highlights of this release:
   in remote tasks, as well as providing better control for remote task IDs.
 
 - New IPython Sphinx directive contributed by John Hunter.  You can use this
-  directive to mark blocks in reSructuredText documents as containing IPython
+  directive to mark blocks in reStructuredText documents as containing IPython
   syntax (including figures) and the will be executed during the build:
 
   .. sourcecode:: ipython
diff --git a/docs/source/whatsnew/version0.11.rst b/docs/source/whatsnew/version0.11.rst
index a557c3141ac..05d64478b0b 100644
--- a/docs/source/whatsnew/version0.11.rst
+++ b/docs/source/whatsnew/version0.11.rst
@@ -155,7 +155,7 @@ cycle from several institutions:
 .. __: http://modular.math.washington.edu/grants/compmath09
 
 - Microsoft's team working on `Python Tools for Visual Studio`__ developed the 
-  integraton of IPython into the Python plugin for Visual Studio 2010.
+  integratron of IPython into the Python plugin for Visual Studio 2010.
 
 .. __: http://pytools.codeplex.com
 
diff --git a/docs/source/whatsnew/version0.9.rst b/docs/source/whatsnew/version0.9.rst
index d0f45eba7d7..81ebba1cac8 100644
--- a/docs/source/whatsnew/version0.9.rst
+++ b/docs/source/whatsnew/version0.9.rst
@@ -33,7 +33,7 @@ New features
 
 * A new, still experimental but highly functional, WX shell by Gael Varoquaux.
   This work was sponsored by Enthought, and while it's still very new, it is
-  based on a more cleanly organized arhictecture of the various IPython
+  based on a more cleanly organized architecture of the various IPython
   components. We will continue to develop this over the next few releases as a
   model for GUI components that use IPython.
 
@@ -69,7 +69,7 @@ New features
   method that has the same syntax as the built-in `map`.  We have also defined
   a `mapper` factory interface that creates objects that implement
   :class:`IPython.kernel.mapper.IMapper` for different controllers.  Both the
-  multiengine and task controller now have mapping capabilties.
+  multiengine and task controller now have mapping capabilities.
 
 * The parallel function capabilities have been reworks.  The major changes are
   that i) there is now an `@parallel` magic that creates parallel functions,
diff --git a/docs/source/whatsnew/version2.0.rst b/docs/source/whatsnew/version2.0.rst
index e379308fd53..abdbaedbd04 100644
--- a/docs/source/whatsnew/version2.0.rst
+++ b/docs/source/whatsnew/version2.0.rst
@@ -341,7 +341,7 @@ Backwards incompatible changes
   Python versions are now 2.7 and 3.3.
 * The Transformer classes have been renamed to Preprocessor in nbconvert and
   their ``call`` methods have been renamed to ``preprocess``.
-* The ``call`` methods of nbconvert post-processsors have been renamed to
+* The ``call`` methods of nbconvert post-processors have been renamed to
   ``postprocess``.
 
 * The module ``IPython.core.fakemodule`` has been removed.
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 760edf2a3fa..47491b67103 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -142,7 +142,7 @@ preserves prior behavior of normalizing the audio to the maximum possible range.
 Setting to `False` disables normalization.
 
 
-Miscelanious
+Miscellaneous
 ------------
 
  - Fix improper acceptation of ``return`` outside of functions. :ghpull:`11641`.
diff --git a/setupext/__init__.py b/setupext/__init__.py
index c8ce0378e7f..3933cb5de09 100644
--- a/setupext/__init__.py
+++ b/setupext/__init__.py
@@ -1,3 +1,3 @@
-# load extended setup modules for distuils
+# load extended setup modules for distutils
 
 from .install_data_ext import install_data_ext

From 72841b001d5502cbdec41fd17fda8e57825124ce Mon Sep 17 00:00:00 2001
From: Tony Fast <tony.fast@gmail.com>
Date: Wed, 14 Aug 2019 17:20:57 -0400
Subject: [PATCH 121/370] A test for completely builtin names

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

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index e7bb0f8bb97..4906ae9d951 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -2014,7 +2014,7 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
 
         # Start with a clean slate of completions
         matches = []
-        custom_res = self.dispatch_custom_completer(text)
+        
         # 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
@@ -2025,29 +2025,24 @@ 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 custom_res is not None:
-            # did custom completers produce something?
-            matches = [(m, 'custom') for m in custom_res]
+                
+        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:
-            # Extend the list of completions with the results of each
-            # matcher, so we return results to the user from all
-            # namespaces.
-            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
+            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:
@@ -2056,17 +2051,20 @@ def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None,
                 filtered_matches.add(m)
                 seen.add(t)
 
-        _filtered_matches = sorted(
-            set(filtered_matches), key=lambda x: completions_sorting_key(x[0]))\
-            [:MATCHES_LIMIT]
+        _filtered_matches = sorted(filtered_matches, key=lambda x: completions_sorting_key(x[0]))
 
+        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]
 
         self.matches = _matches
 
         return text, _matches, origins, completions
-
+        
     def fwd_unicode_match(self, text:str) -> Tuple[str, list]:
         if self._names is None:
             self._names = []
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index d364d1c1a10..5f2210d4d32 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -175,6 +175,20 @@ def complete_A(a, existing_completions):
 
         ip.complete("x.")
 
+    def test_custom_completion_ordering(self):
+        """Test that errors from custom attribute completers are silenced."""
+        ip = get_ipython()
+
+        _, matches = ip.complete('in')
+        assert matches.index('input') < matches.index('int')
+
+        def complete_example(a):
+            return ['example2', 'example1']
+
+        ip.Completer.custom_completers.add_re('ex*', complete_example)
+        _, matches = ip.complete('ex')
+        assert matches.index('example2') < matches.index('example1')
+
     def test_unicode_completions(self):
         ip = get_ipython()
         # Some strings that trigger different types of completion.  Check them both

From 39e37f37783440ef6be34258e244669265bdfee3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 21 Aug 2019 14:38:08 +0200
Subject: [PATCH 122/370] Update version7.rst

---
 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 47491b67103..2830589e38d 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -143,7 +143,7 @@ Setting to `False` disables normalization.
 
 
 Miscellaneous
-------------
+-------------
 
  - Fix improper acceptation of ``return`` outside of functions. :ghpull:`11641`.
  - Fixed PyQt 5.11 backwards incompatibility causing sip import failure.

From e95b0cf4deb44ab5dd7a2779ed2086b33ac1e640 Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Tue, 20 Aug 2019 10:01:25 -0700
Subject: [PATCH 123/370] Remove dead code that also contains an error.

---
 IPython/core/debugger.py | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 3a546c684a4..0e3f6178858 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -195,21 +195,6 @@ def wrapper(*args, **kw):
     return wrapper
 
 
-def _file_lines(fname):
-    """Return the contents of a named file as a list of lines.
-
-    This function never raises an IOError exception: if the file can't be
-    read, it simply returns an empty list."""
-
-    try:
-        outfile = open(fname)
-    except IOError:
-        return []
-    else:
-        with out:
-            return outfile.readlines()
-
-
 class Pdb(OldPdb):
     """Modified Pdb class, does not load readline.
 

From c131374a844ddf8bea50190a48d3f07488862c7a Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Tue, 20 Aug 2019 10:15:47 -0700
Subject: [PATCH 124/370] Add **kwargs to Pdb and pass into base class.

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

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 0e3f6178858..bde22bf1a8e 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -204,7 +204,7 @@ class Pdb(OldPdb):
     """
 
     def __init__(self, color_scheme=None, completekey=None,
-                 stdin=None, stdout=None, context=5):
+                 stdin=None, stdout=None, context=5, **kwargs):
 
         # Parent constructor:
         try:
@@ -213,8 +213,8 @@ def __init__(self, color_scheme=None, completekey=None,
                 raise ValueError("Context must be a positive integer")
         except (TypeError, ValueError):
                 raise ValueError("Context must be a positive integer")
-
-        OldPdb.__init__(self, completekey, stdin, stdout)
+        # `kwargs` ensures full compatibility with stdlib's `pdb.Pdb`.
+        OldPdb.__init__(self, completekey, stdin, stdout, **kwargs)
 
         # IPython changes...
         self.shell = get_ipython()

From 1e60fc339a7a31054bb22028c2f97ed10273bee9 Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Tue, 20 Aug 2019 12:05:52 -0700
Subject: [PATCH 125/370] Add docstring for core.debugger.Pdb

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

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index bde22bf1a8e..9762a4ac4ea 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -205,6 +205,18 @@ 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.
+        :param stdout: Passed to pdb.Pdb.
+        :param context: 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.
+        """
 
         # Parent constructor:
         try:

From ef90f080d3cb98fba0b18e266b87fb9708d22dfd Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Tue, 20 Aug 2019 12:07:56 -0700
Subject: [PATCH 126/370] Add class-docstring for
 terminal.debugger.TerminalPdb. Overrides inherited docstring.

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

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index 45f509684bc..696603f61e9 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -19,6 +19,8 @@
 
 
 class TerminalPdb(Pdb):
+    """Standalone IPython debugger."""
+
     def __init__(self, *args, **kwargs):
         Pdb.__init__(self, *args, **kwargs)
         self._ptcomp = None

From 06a46ebacb17d484b880474d01a881d9833aa9bc Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Tue, 20 Aug 2019 12:43:02 -0700
Subject: [PATCH 127/370] add pr entry

---
 docs/source/whatsnew/pr/expose-pdb-api.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/expose-pdb-api.rst

diff --git a/docs/source/whatsnew/pr/expose-pdb-api.rst b/docs/source/whatsnew/pr/expose-pdb-api.rst
new file mode 100644
index 00000000000..87eea771aa7
--- /dev/null
+++ b/docs/source/whatsnew/pr/expose-pdb-api.rst
@@ -0,0 +1,15 @@
+Expose Pdb API
+===================
+
+Expose the built-in ``pdb.Pdb`` API. ``Pdb`` constructor arguments are generically 
+exposed, regardless of python version.
+Newly exposed arguments:
+
+- ``skip``  - Python 3.1+
+- ``nosiginnt`` - Python 3.2+
+- ``readrc`` - Python 3.6+
+
+Try it out::
+
+    from IPython.terminal.debugger import TerminalPdb
+    pdb = TerminalPdb(skip=["skipthismodule"])

From b66b470d88fb9336ab5f3844084bb8c0077830c3 Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Tue, 20 Aug 2019 12:46:08 -0700
Subject: [PATCH 128/370] add whitespace

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

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 9762a4ac4ea..9ce896ec634 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -225,6 +225,7 @@ def __init__(self, color_scheme=None, completekey=None,
                 raise ValueError("Context must be a positive integer")
         except (TypeError, ValueError):
                 raise ValueError("Context must be a positive integer")
+
         # `kwargs` ensures full compatibility with stdlib's `pdb.Pdb`.
         OldPdb.__init__(self, completekey, stdin, stdout, **kwargs)
 

From b97f9ba51941b6a832abfa3ca9090bf366833876 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 22 Aug 2019 23:04:17 +0200
Subject: [PATCH 129/370] Silence pager stderr

This is run as a test to determine if a pager is available. If there is
no pager, there is a fallback. Therefore, I think it is a bug that in
the no-pager case ipython will print

 sh: less not found

To stderr.
---
 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 b5d5b1f56d1..cf9fb21e3de 100644
--- a/IPython/core/page.py
+++ b/IPython/core/page.py
@@ -210,7 +210,7 @@ def pager_page(strng, start=0, screen_lines=0, pager_cmd=None):
                 retval = None
                 # if I use popen4, things hang. No idea why.
                 #pager,shell_out = os.popen4(pager_cmd)
-                pager = os.popen(pager_cmd, 'w')
+                pager = os.popen(pager_cmd + ' 2>/dev/null', 'w')
                 try:
                     pager_encoding = pager.encoding or sys.stdout.encoding
                     pager.write(strng)

From 92f3e0283c7a7b9d96fea8c36c639c8c86f4ddef Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 30 Aug 2019 09:34:34 -0700
Subject: [PATCH 130/370] update colors

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

diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 23c7138590d..7092e4ddf33 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -18,31 +18,38 @@ read VERSION
 echo -n 'branch (master|X.y):'
 read branch
 
+BLACK=$(tput setaf 1)
 RED=$(tput setaf 1)
+GREEN=$(tput setaf 2)
+YELLOW=$(tput setaf 3)
+BLUE=$(tput setaf 4)
+MAGENTA=$(tput setaf 5)
+CYAN=$(tput setaf 6)
+WHITE=$(tput setaf 7)
 NOR=$(tput sgr0)
 
 echo 
-echo "updating what's new with informations from docs/source/whatsnew/pr"
+echo $BLUE"Updating what's new with informations from docs/source/whatsnew/pr"$NOR
 python tools/update_whatsnew.py
 
 echo
-echo "please move the contents of "docs/source/whatsnew/development.rst" to version-X.rst"
-echo "Press enter to continue"
+echo $BLUE"please move the contents of "docs/source/whatsnew/development.rst" to version-X.rst"$NOR
+echo $GREEN"Press enter to continue"$NOR
 read
 
 echo 
-echo "here are all the authors that contributed to this release:"
+echo $BLUE"here are all the authors that contributed to this release:"$NOR
 git log --format="%aN <%aE>" $PREV_RELEASE... | sort -u -f
 
 echo 
-echo "If you see any duplicates cancel (Ctrl-C), then edit .mailmap" Press enter to continue
+echo $BLUE"If you see any duplicates cancel (Ctrl-C), then edit .mailmap."$GREEN"Press enter to continue:"$NOR
 read
 
-echo "generating stats"
+echo $BLUE"generating stats"NOR
 python tools/github_stats.py --milestone $MILESTONE > stats.rst
 
-echo "stats.rst files generated. Please merge it with the right file (github-stats-X.rst)"
-echo "press enter to continue."
+echo $BLUE"stats.rst files generated."$GREEN"Please merge it with the right file (github-stats-X.rst)"$NOR
+echo $GREEN"press enter to continue."$NOR
 read
 
 echo "Cleaning repository"

From 8d5a7ba001e35b494e4e678ea81ec596cbb79d55 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 30 Aug 2019 09:41:14 -0700
Subject: [PATCH 131/370] update 7.8 what's new

---
 docs/source/whatsnew/development.rst       |  1 +
 docs/source/whatsnew/pr/expose-pdb-api.rst | 15 -----------
 docs/source/whatsnew/version7.rst          | 29 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 15 deletions(-)
 delete mode 100644 docs/source/whatsnew/pr/expose-pdb-api.rst

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 532ba742778..27afd6f5d0e 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.
 
 
diff --git a/docs/source/whatsnew/pr/expose-pdb-api.rst b/docs/source/whatsnew/pr/expose-pdb-api.rst
deleted file mode 100644
index 87eea771aa7..00000000000
--- a/docs/source/whatsnew/pr/expose-pdb-api.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-Expose Pdb API
-===================
-
-Expose the built-in ``pdb.Pdb`` API. ``Pdb`` constructor arguments are generically 
-exposed, regardless of python version.
-Newly exposed arguments:
-
-- ``skip``  - Python 3.1+
-- ``nosiginnt`` - Python 3.2+
-- ``readrc`` - Python 3.6+
-
-Try it out::
-
-    from IPython.terminal.debugger import TerminalPdb
-    pdb = TerminalPdb(skip=["skipthismodule"])
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 2830589e38d..8e78853e4c3 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,35 @@
  7.x Series
 ============
 
+.. _version780:
+
+IPython 7.8.0
+=============
+
+IPython 7.8.0 contain a few bugfix and 2 new APIs:
+
+ - Enable changing the font color for LaTeX rendering :ghpull:`11840`
+ - and Re-Expose some PDB API (see below)
+
+Expose Pdb API
+--------------
+
+Expose the built-in ``pdb.Pdb`` API. ``Pdb`` constructor arguments are generically
+exposed, regardless of python version.
+Newly exposed arguments:
+
+- ``skip`` - Python 3.1+
+- ``nosiginnt`` - Python 3.2+
+- ``readrc`` - Python 3.6+
+
+Try it out::
+
+    from IPython.terminal.debugger import TerminalPdb
+    pdb = TerminalPdb(skip=["skipthismodule"])
+
+
+See :ghpull:`11840`
+
 .. _version770:
 
 IPython 7.7.0

From 2b8058fb2b5c4f8a0481710b8c4a7c3c8b318968 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 30 Aug 2019 09:44:19 -0700
Subject: [PATCH 132/370] update stats

---
 docs/source/whatsnew/github-stats-7.rst | 19 +++++++++++++++++++
 tools/release_helper.sh                 |  5 +++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index 48f282dfe29..f3eca4fee29 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -1,6 +1,25 @@
 Issues closed in the 7.x development cycle
 ==========================================
 
+
+Issues closed in 7.8
+--------------------
+
+GitHub stats for 2019/07/26 - 2019/08/30 (tag: 7.7.0)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 1 issues and merged 4 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A7.8>`__
+
+The following 5 authors contributed 27 commits.
+
+* Dan Allan
+* Matthias Bussonnier
+* Min ho Kim
+* Oscar Gustafsson
+* Terry Davis
+
 Issues closed in 7.7
 --------------------
 
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 7092e4ddf33..fc1b0e4d65b 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -45,10 +45,11 @@ echo
 echo $BLUE"If you see any duplicates cancel (Ctrl-C), then edit .mailmap."$GREEN"Press enter to continue:"$NOR
 read
 
-echo $BLUE"generating stats"NOR
+echo $BLUE"generating stats"$NOR
 python tools/github_stats.py --milestone $MILESTONE > stats.rst
 
-echo $BLUE"stats.rst files generated."$GREEN"Please merge it with the right file (github-stats-X.rst)"$NOR
+echo $BLUE"stats.rst files generated."$NOR
+echo $GREEN"Please merge it with the right file (github-stats-X.rst) and commit."$NOR
 echo $GREEN"press enter to continue."$NOR
 read
 

From c233c25ab8b724646b9bdc407214c3bb7294683c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 30 Aug 2019 09:49:34 -0700
Subject: [PATCH 133/370] release 7.8.0

---
 IPython/core/release.py |  2 +-
 tools/release_helper.sh | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index bf80392e89e..0ad67d00f56 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -24,7 +24,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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]
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index fc1b0e4d65b..d39726ae8b7 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -56,9 +56,9 @@ read
 echo "Cleaning repository"
 git clean -xfdi
 
-echo "please update version number in ${RED}IPython/core/release.py${NOR} , Do not commit yet – we'll do it later."
+echo $GREEN"please update version number in ${RED}IPython/core/release.py${NOR} , Do not commit yet – we'll do it later."$NOR
 
-echo "Press enter to continue"
+echo $GREEN"Press enter to continue"$NOR
 read
 
 echo 
@@ -66,19 +66,19 @@ echo "Attempting to build the docs.."
 make html -C docs
 
 echo 
-echo "Check the docs, press enter to continue"
+echo $GREEN"Check the docs, press enter to continue"$NOR
 read
 
 echo
-echo "Attempting to build package..."
+echo $BLUE"Attempting to build package..."$NOR
 
 tools/build_release
 
 echo
 echo "Let\'s commit : git commit -am \"release $VERSION\" -S"
-echo $"Press enter to continue"
+echo $GREEN"Press enter to continue"$NOR
 read
-git commit -am "release $VERSION" -S
+git commit -am "release $VERSION" # -S
 
 echo
 echo "git push origin \$BRANCH ?"

From 91d36d325aff4990062901556aa9581d2b22c897 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 30 Aug 2019 09:52:21 -0700
Subject: [PATCH 134/370] back to development

---
 IPython/core/release.py | 4 ++--
 tools/release_helper.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 0ad67d00f56..2cb20d7ac20 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 8
+_version_minor = 9
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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]
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index d39726ae8b7..67ce086859f 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -78,7 +78,7 @@ echo
 echo "Let\'s commit : git commit -am \"release $VERSION\" -S"
 echo $GREEN"Press enter to continue"$NOR
 read
-git commit -am "release $VERSION" # -S
+git commit -am "release $VERSION" -S
 
 echo
 echo "git push origin \$BRANCH ?"

From f634c37ee523a9ad83343a1ae2079af98d80ad66 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Tue, 3 Sep 2019 18:48:55 +0300
Subject: [PATCH 135/370] Fix for Python 4

---
 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 038d8ea2e5a..2f6d339c358 100644
--- a/tools/gen_latex_symbols.py
+++ b/tools/gen_latex_symbols.py
@@ -11,7 +11,7 @@
 
 import os, sys
 
-if not sys.version_info[0] == 3:
+if sys.version_info[0] < 3:
     print("This script must be run with Python 3, exiting...")
     sys.exit(1)
 

From 3e5fef7a03182eaf4eb1f8b8676876d59fd4bd10 Mon Sep 17 00:00:00 2001
From: Niclas <niclas_hanraths@web.de>
Date: Thu, 5 Sep 2019 01:50:59 +0200
Subject: [PATCH 136/370] switching to gc.get_referrers() allows for a very
 simple and (hopefully) efficient update of old class instances

---
 IPython/extensions/autoreload.py | 58 +++++---------------------------
 1 file changed, 9 insertions(+), 49 deletions(-)

diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
index da9cc0e13ef..ada680fcf08 100644
--- a/IPython/extensions/autoreload.py
+++ b/IPython/extensions/autoreload.py
@@ -115,7 +115,7 @@
 import traceback
 import types
 import weakref
-import inspect
+import gc
 from importlib import import_module
 from importlib.util import source_from_cache
 from imp import reload
@@ -268,56 +268,16 @@ def update_function(old, new):
             pass
 
 
-def update_instances(old, new, objects=None, visited={}):
-    """Iterate through objects recursively, searching for instances of old and
-    replace their __class__ reference with new. If no objects are given, start 
-    with the current ipython workspace.
-    """
-    if objects is None:
-        # make sure visited is cleaned when not called recursively
-        visited = {}
-        # find ipython workspace stack frame
-        frame = next(frame_nfo.frame for frame_nfo in inspect.stack() 
-                     if 'trigger' in frame_nfo.function)
-        # build generator for non-private variable values from workspace
-        shell = frame.f_locals['self'].shell
-        user_ns = shell.user_ns
-        user_ns_hidden = shell.user_ns_hidden
-        nonmatching = object()
-        objects = ( value for key, value in user_ns.items()
-                if not key.startswith('_') 
-                and (value is not user_ns_hidden.get(key, nonmatching)) 
-                and not inspect.ismodule(value))
+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"""
     
-    # use dict values if objects is a dict but don't touch private variables
-    if hasattr(objects, 'items'):
-        objects = (value for key, value in objects.items()
-                       if not str(key).startswith('_')
-                       and not inspect.ismodule(value) )
+    refs = gc.get_referrers(old)
 
-    # try if objects is iterable
-    try:
-        for obj in (obj for obj in objects if id(obj) not in visited):
-            # add current object to visited to avoid revisiting
-            visited.update({id(obj):obj})
-
-            # update, if object is instance of old_class (but no subclasses)
-            if type(obj) is old:
-                obj.__class__ = new
-                
-
-            # if object is instance of other class, look for nested instances
-            if hasattr(obj, '__dict__') and not (inspect.isfunction(obj)
-                                                 or inspect.ismethod(obj)):
-                update_instances(old, new, obj.__dict__, visited)
-
-            # if object is a container, search it
-            if hasattr(obj, 'items') or (hasattr(obj, '__contains__')
-                                         and not isinstance(obj, str)):
-                update_instances(old, new, obj, visited)
-
-    except TypeError:
-        pass
+    for ref in refs:
+        if type(ref) is old:
+            ref.__class__ = new
 
 
 def update_class(old, new):

From ca2480743b1047ecb42325c2fc1f94b0048c2474 Mon Sep 17 00:00:00 2001
From: Mohammad Hossein Sekhavat <sekhavat17@gmail.com>
Date: Thu, 5 Sep 2019 11:24:00 +0000
Subject: [PATCH 137/370] Prevent caching outputs in _, __, ___ when
 self.cache_size is not positive

---
 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 2128c82d12f..9f160b3ba23 100644
--- a/IPython/core/displayhook.py
+++ b/IPython/core/displayhook.py
@@ -198,7 +198,7 @@ def update_user_ns(self, result):
         """Update user_ns with various things like _, __, _1, etc."""
 
         # Avoid recursive reference when displaying _oh/Out
-        if result is not self.shell.user_ns['_oh']:
+        if self.cache_size and result is not self.shell.user_ns['_oh']:
             if len(self.shell.user_ns['_oh']) >= self.cache_size and self.do_full_cache:
                 self.cull_cache()
 

From 6c5d9c3e0ac601ba6c57c13ac1069f760fcb1999 Mon Sep 17 00:00:00 2001
From: mfh92 <48296509+mfh92@users.noreply.github.com>
Date: Wed, 18 Sep 2019 10:43:06 -0700
Subject: [PATCH 138/370] typo fix

one double-quote symbol was misplaced.
---
 IPython/core/magics/basic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py
index 3721cbc4eb0..906d3d5ebdf 100644
--- a/IPython/core/magics/basic.py
+++ b/IPython/core/magics/basic.py
@@ -124,7 +124,7 @@ def alias_magic(self, line=''):
           In [6]: %whereami
           Out[6]: u'/home/testuser'
           
-          In [7]: %alias_magic h history -p "-l 30" --line
+          In [7]: %alias_magic h history "-p -l 30" --line
           Created `%h` as an alias for `%history -l 30`.
         """
 

From b24a72067ebe33c3ed608e85713457fff7ae6749 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Tue, 24 Sep 2019 12:24:23 +0200
Subject: [PATCH 139/370] %env: hide likely secrets by default

if an environment variable contains 'KEY' or 'TOKEN' or 'SECRET'
hide it when printing the whole environment with %env
---
 IPython/core/magics/osm.py       |  8 +++++++-
 IPython/core/tests/test_magic.py | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py
index c6d1539bd6d..ddc9b6f5874 100644
--- a/IPython/core/magics/osm.py
+++ b/IPython/core/magics/osm.py
@@ -446,7 +446,13 @@ def env(self, parameter_s=''):
                     raise UsageError(err)
             if len(bits) > 1:
                 return self.set_env(parameter_s)
-        return dict(os.environ)
+        env = dict(os.environ)
+        # hide likely secrets when printing the whole environment
+        for key in list(env):
+            if any(s in key.lower() for s in ('key', 'token', 'secret')):
+                env[key] = '<hidden>'
+
+        return env
 
     @line_magic
     def set_env(self, parameter_s):
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index a845ec7db76..9882d052db1 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -11,6 +11,7 @@
 import warnings
 from textwrap import dedent
 from unittest import TestCase
+from unittest import mock
 from importlib import invalidate_caches
 from io import StringIO
 
@@ -733,6 +734,24 @@ def test_env(self):
         env = _ip.magic("env")
         self.assertTrue(isinstance(env, dict))
 
+    def test_env_secret(self):
+        env = _ip.magic("env")
+        hidden = "<hidden>"
+        with mock.patch.dict(
+            os.environ,
+            {
+                "API_KEY": "abc123",
+                "SECRET_THING": "ssshhh",
+                "JUPYTER_TOKEN": "",
+                "VAR": "abc"
+            }
+        ):
+            env = _ip.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")
         self.assertEqual(env, None)

From 753ddcfbf7c889aba4a26cc3701f274563d24e75 Mon Sep 17 00:00:00 2001
From: Joris Van den Bossche <jorisvandenbossche@gmail.com>
Date: Sat, 5 Oct 2019 20:35:38 +0200
Subject: [PATCH 140/370] IPython directive: correctly clear cout

---
 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 60c1b51db32..0481624c42c 100644
--- a/IPython/sphinxext/ipython_directive.py
+++ b/IPython/sphinxext/ipython_directive.py
@@ -585,7 +585,7 @@ def process_input(self, data, input_prompt, lineno):
                 if self.warning_is_error:
                     raise RuntimeError('Non Expected warning in `{}` line {}'.format(filename, lineno))
 
-        self.cout.truncate(0)
+        self.clear_cout()
         return (ret, input_lines, processed_output,
                 is_doctest, decorator, image_file, image_directive)
 

From ed126381f35fbda0ed28e403c247539125c390dc Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <vidartf@gmail.com>
Date: Thu, 10 Oct 2019 15:30:33 +0100
Subject: [PATCH 141/370] Easier empty, updatable display

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

diff --git a/IPython/core/display.py b/IPython/core/display.py
index d31350cb895..465c000c55a 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -296,6 +296,13 @@ def display(*objs, include=None, exclude=None, metadata=None, transient=None, di
     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
 

From 1af9c258bd27cb161cea48b8288af7dfd04bf1c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=93=D0=B5=D0=BE=D1=80=D0=B3=D0=B8=D0=B9=20=D0=A4=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=BE=D0=B2?= <gosha@fro.lv>
Date: Fri, 11 Oct 2019 11:16:38 +0300
Subject: [PATCH 142/370] restore terminal title on exit (xterm)

---
 IPython/terminal/interactiveshell.py |  9 ++++++++-
 IPython/utils/terminal.py            | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index be738f8f4de..eb49e67d329 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -8,7 +8,7 @@
 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
+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,
@@ -238,6 +238,10 @@ def init_term_title(self, change=None):
         else:
             toggle_set_term_title(False)
 
+    def restore_term_title(self):
+        if self.term_title:
+            restore_term_title()
+
     def init_display_formatter(self):
         super(TerminalInteractiveShell, self).init_display_formatter()
         # terminal only supports plain text
@@ -507,6 +511,9 @@ def mainloop(self, display_banner=DISPLAY_BANNER_DEPRECATED):
                 if hasattr(self, '_eventloop'):
                     self._eventloop.stop()
 
+                self.restore_term_title()
+
+
     _inputhook = None
     def inputhook(self, context):
         if self._inputhook is not None:
diff --git a/IPython/utils/terminal.py b/IPython/utils/terminal.py
index 949275e431f..4e1800208c0 100644
--- a/IPython/utils/terminal.py
+++ b/IPython/utils/terminal.py
@@ -58,14 +58,26 @@ def _set_term_title(*args,**kw):
     pass
 
 
+def _restore_term_title():
+    pass
+
+
 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') 
     sys.stdout.write('\033]0;%s\007' % title)
 
+
+def _restore_term_title_xterm():
+    sys.stdout.write('\033[23;0t') 
+
+
 if os.name == 'posix':
     TERM = os.environ.get('TERM','')
     if TERM.startswith('xterm'):
         _set_term_title = _set_term_title_xterm
+        _restore_term_title = _restore_term_title_xterm
 elif sys.platform == 'win32':
     try:
         import ctypes
@@ -100,6 +112,13 @@ def set_term_title(title):
     _set_term_title(title)
 
 
+def restore_term_title():
+    """Restore, if possible, terminal title to the original state"""
+    if ignore_termtitle:
+        return
+    _restore_term_title()
+
+
 def freeze_term_title():
     warnings.warn("This function is deprecated, use toggle_set_term_title()")
     global ignore_termtitle

From b732611ea58cee34d747c286a17db711f401424e Mon Sep 17 00:00:00 2001
From: Ben Lewis <ben.lewis@ga.gov.au>
Date: Thu, 17 Oct 2019 17:11:55 +1100
Subject: [PATCH 143/370] Change matplotlib.pyplot import syntax (for circular
 import bug)

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

diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index 4423ed5d408..d42c088980c 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -310,12 +310,12 @@ def activate_matplotlib(backend):
     # magic of switch_backend().
     matplotlib.rcParams['backend'] = backend
 
-    import matplotlib.pyplot
-    matplotlib.pyplot.switch_backend(backend)
+    # Due to circular imports, pyplot may be only partially initialised
+    # when this function runs.
+    # So avoid needing matplotlib attribute-lookup to access pyplot.
+    from matplotlib import pyplot as plt
 
-    # This must be imported last in the matplotlib series, after
-    # backend/interactivity choices have been made
-    import matplotlib.pyplot as plt
+    plt.switch_backend(backend)
 
     plt.show._needmain = False
     # We need to detect at runtime whether show() is called by the user.

From efbef07096df261cb1775bffaeb7c99905ce21a6 Mon Sep 17 00:00:00 2001
From: Ben Lewis <ben.lewis@ga.gov.au>
Date: Fri, 18 Oct 2019 09:44:20 +1100
Subject: [PATCH 144/370] Build fix: pip should not ignore sub-dependency
 version requirements.

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

diff --git a/.travis.yml b/.travis.yml
index 3369a9695f1..b14f7d7354f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ install:
   - pip install pip --upgrade
   - pip install setuptools --upgrade
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
-  - pip install trio curio
+  - pip install trio curio --upgrade --upgrade-strategy eager
   - pip install 'pytest<4' matplotlib
   - pip install codecov check-manifest --upgrade
 

From 60e7c6190e28d68aa4e7c7373cb5f5083260d9f5 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 22 Oct 2019 16:26:02 -0700
Subject: [PATCH 145/370] Update trio and curio dependencies eagerly.

Otherwise we get an old version of attr; which fails at runtime.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3369a9695f1..b14f7d7354f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ install:
   - pip install pip --upgrade
   - pip install setuptools --upgrade
   - pip install -e file://$PWD#egg=ipython[test] --upgrade
-  - pip install trio curio
+  - pip install trio curio --upgrade --upgrade-strategy eager
   - pip install 'pytest<4' matplotlib
   - pip install codecov check-manifest --upgrade
 

From 19e61cacb1a241ec4941e504260a3d6e9bbb883a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 22 Oct 2019 16:15:15 -0700
Subject: [PATCH 146/370] Prepare release notes for 7.9 (long due).

I will try to release this Friday.
---
 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 8e78853e4c3..7a912e62888 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,19 @@
  7.x Series
 ============
 
+.. _version 790:
+
+IPython 7.9 is a small release with a couple of improvement and bug fixes.
+
+ - Xterm terminal title should be restored on exit :ghpull:`11910`
+ - special variables ``_``,``__``, ``___`` are not set anymore when cache size
+   is 0 or less.  :ghpull:`11877`
+ - Autoreload should have regained some speed by using a new heuristic logic to
+   find all objects needing reload. This should avoid large objects traversal
+   like pandas dataframes. :ghpull:`11876`
+ - Get ready for Python 4. :ghpull:`11874`
+
+
 .. _version780:
 
 IPython 7.8.0

From 3b26543268f073b0ee48c649ff66096d1b2f0c92 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 25 Oct 2019 11:02:27 -0700
Subject: [PATCH 147/370] update version 7.rst

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

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 7a912e62888..520ad110f61 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -13,6 +13,12 @@ IPython 7.9 is a small release with a couple of improvement and bug fixes.
    find all objects needing reload. This should avoid large objects traversal
    like pandas dataframes. :ghpull:`11876`
  - Get ready for Python 4. :ghpull:`11874`
+ - `%env` Magic nonw has euristic to hide potentially sensitive values :ghpull:`11896`
+
+This is a small release despite a number of Pull Request Pending that need to
+be reviewed/worked on. Many of the core developers have been busy outside of
+IPython/Jupyter and we thanks all contributor for their patience; we'll work on
+these as soon as we have time. 
 
 
 .. _version780:

From 60b2ea96cc8146857d22ed20081c34a1d6d19327 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 25 Oct 2019 11:08:09 -0700
Subject: [PATCH 148/370] update github stats

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

diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index f3eca4fee29..23ff55c83f9 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -2,6 +2,27 @@ Issues closed in the 7.x development cycle
 ==========================================
 
 
+Issues closed in 7.9
+--------------------
+
+GitHub stats for 2019/08/30 - 2019/10/25 (tag: 7.8.0)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 1 issues and merged 9 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A7.9>`__
+
+The following 8 authors contributed 20 commits.
+
+* Benjamin Ragan-Kelley
+* Hugo
+* Matthias Bussonnier
+* mfh92
+* Mohammad Hossein Sekhavat
+* Niclas
+* Vidar Tonaas Fauske
+* Георгий Фролов
+
 Issues closed in 7.8
 --------------------
 

From 2eec187d323fa1d1c1a645a8876a69aa3be7fba1 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 25 Oct 2019 11:10:16 -0700
Subject: [PATCH 149/370] release 7.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 2cb20d7ac20..0cafd66a148 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -24,7 +24,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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 f273a59d0a7169acb0293dc6caf962336723f96d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 25 Oct 2019 11:12:18 -0700
Subject: [PATCH 150/370] back to development

---
 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 0cafd66a148..3961477ed7c 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 9
+_version_minor = 10
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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 a02911aacbdae6598000fdbd5a08139b24f96b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6kcen=20Eraslan?= <geraslan@broadinstitute.org>
Date: Sun, 27 Oct 2019 13:47:20 -0400
Subject: [PATCH 151/370] Fix restoring more than 2 variables and add support
 for storing multiple variables.

---
 IPython/extensions/storemagic.py            | 91 +++++++++++----------
 IPython/extensions/tests/test_storemagic.py | 23 ++++--
 2 files changed, 67 insertions(+), 47 deletions(-)

diff --git a/IPython/extensions/storemagic.py b/IPython/extensions/storemagic.py
index dae325afe6a..51b79ad314e 100644
--- a/IPython/extensions/storemagic.py
+++ b/IPython/extensions/storemagic.py
@@ -20,12 +20,15 @@
 from traitlets import Bool
 
 
-def restore_aliases(ip):
+def restore_aliases(ip, alias=None):
     staliases = ip.db.get('stored_aliases', {})
-    for k,v in staliases.items():
-        #print "restore alias",k,v # dbg
-        #self.alias_table[k] = v
-        ip.alias_manager.define_alias(k,v)
+    if alias is None:
+        for k,v in staliases.items():
+            #print "restore alias",k,v # dbg
+            #self.alias_table[k] = v
+            ip.alias_manager.define_alias(k,v)
+    else:
+        ip.alias_manager.define_alias(alias, staliases[alias])
 
 
 def refresh_variables(ip):
@@ -58,13 +61,13 @@ class StoreMagics(Magics):
     """Lightweight persistence for python variables.
 
     Provides the %store magic."""
-    
+
     autorestore = Bool(False, help=
         """If True, any %store-d variables will be automatically restored
         when IPython starts.
         """
     ).tag(config=True)
-    
+
     def __init__(self, shell):
         super(StoreMagics, self).__init__(shell=shell)
         self.shell.configurables.append(self)
@@ -94,13 +97,13 @@ def store(self, parameter_s=''):
 
         * ``%store``          - Show list of all variables and their current
                                 values
-        * ``%store spam``     - Store the *current* value of the variable spam
-                                to disk
+        * ``%store spam bar`` - Store the *current* value of the variables spam
+                                and bar to disk
         * ``%store -d spam``  - Remove the variable and its value from storage
         * ``%store -z``       - Remove all variables from storage
-        * ``%store -r``       - Refresh all variables from store (overwrite
-                                current vals)
-        * ``%store -r spam bar`` - Refresh specified variables from store
+        * ``%store -r``       - Refresh all variables, aliases and directory history
+                                from store (overwrite current vals)
+        * ``%store -r spam bar`` - Refresh specified variables and aliases from store
                                    (delete current val)
         * ``%store foo >a.txt``  - Store value of foo to new file a.txt
         * ``%store foo >>a.txt`` - Append value of foo to file a.txt
@@ -116,7 +119,7 @@ def store(self, parameter_s=''):
         """
 
         opts,argsl = self.parse_options(parameter_s,'drz',mode='string')
-        args = argsl.split(None,1)
+        args = argsl.split()
         ip = self.shell
         db = ip.db
         # delete
@@ -141,7 +144,10 @@ def store(self, parameter_s=''):
                     try:
                         obj = db['autorestore/' + arg]
                     except KeyError:
-                        print("no stored variable %s" % arg)
+                        try:
+                            restore_aliases(ip, alias=arg)
+                        except KeyError:
+                            print("no stored variable or alias %s" % arg)
                     else:
                         ip.user_ns[arg] = obj
             else:
@@ -189,38 +195,39 @@ def store(self, parameter_s=''):
                 return
 
             # %store foo
-            try:
-                obj = ip.user_ns[args[0]]
-            except KeyError:
-                # it might be an alias
-                name = args[0]
+            for arg in args:
                 try:
-                    cmd = ip.alias_manager.retrieve_alias(name)
-                except ValueError:
-                    raise UsageError("Unknown variable '%s'" % name)
-                
-                staliases = db.get('stored_aliases',{})
-                staliases[name] = cmd
-                db['stored_aliases'] = staliases
-                print("Alias stored: %s (%s)" % (name, cmd))
-                return
-
-            else:
-                modname = getattr(inspect.getmodule(obj), '__name__', '')
-                if modname == '__main__':
-                    print(textwrap.dedent("""\
-                    Warning:%s is %s
-                    Proper storage of interactively declared classes (or instances
-                    of those classes) is not possible! Only instances
-                    of classes in real modules on file system can be %%store'd.
-                    """ % (args[0], obj) ))
+                    obj = ip.user_ns[arg]
+                except KeyError:
+                    # it might be an alias
+                    name = arg
+                    try:
+                        cmd = ip.alias_manager.retrieve_alias(name)
+                    except ValueError:
+                        raise UsageError("Unknown variable '%s'" % name)
+
+                    staliases = db.get('stored_aliases',{})
+                    staliases[name] = cmd
+                    db['stored_aliases'] = staliases
+                    print("Alias stored: %s (%s)" % (name, cmd))
                     return
-                #pickled = pickle.dumps(obj)
-                db[ 'autorestore/' + args[0] ] = obj
-                print("Stored '%s' (%s)" % (args[0], obj.__class__.__name__))
+
+                else:
+                    modname = getattr(inspect.getmodule(obj), '__name__', '')
+                    if modname == '__main__':
+                        print(textwrap.dedent("""\
+                        Warning:%s is %s
+                        Proper storage of interactively declared classes (or instances
+                        of those classes) is not possible! Only instances
+                        of classes in real modules on file system can be %%store'd.
+                        """ % (arg, obj) ))
+                        return
+                    #pickled = pickle.dumps(obj)
+                    db[ 'autorestore/' + arg ] = obj
+                    print("Stored '%s' (%s)" % (arg, obj.__class__.__name__))
 
 
 def load_ipython_extension(ip):
     """Load the extension in IPython."""
     ip.register_magics(StoreMagics)
-    
+
diff --git a/IPython/extensions/tests/test_storemagic.py b/IPython/extensions/tests/test_storemagic.py
index a7b41bab533..6f8371d336f 100644
--- a/IPython/extensions/tests/test_storemagic.py
+++ b/IPython/extensions/tests/test_storemagic.py
@@ -10,29 +10,42 @@ def setup_module():
 def test_store_restore():
     assert 'bar' not in ip.user_ns, "Error: some other test leaked `bar` in user_ns"
     assert 'foo' not in ip.user_ns, "Error: some other test leaked `foo` in user_ns"
+    assert 'foobar' not in ip.user_ns, "Error: some other test leaked `foobar` in user_ns"
+    assert 'foobaz' not in ip.user_ns, "Error: some other test leaked `foobaz` in user_ns"
     ip.user_ns['foo'] = 78
     ip.magic('alias bar echo "hello"')
+    ip.user_ns['foobar'] = 79
+    ip.user_ns['foobaz'] = '80'
     tmpd = tempfile.mkdtemp()
     ip.magic('cd ' + tmpd)
     ip.magic('store foo')
     ip.magic('store bar')
-    
+    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')
+
     # Remove those items
     ip.user_ns.pop('foo', None)
+    ip.user_ns.pop('foobar', None)
+    ip.user_ns.pop('foobaz', None)
     ip.alias_manager.undefine_alias('bar')
     ip.magic('cd -')
     ip.user_ns['_dh'][:] = []
-    
+
     # Check restoring
-    ip.magic('store -r')
+    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') # restores _dh too
     nt.assert_in(os.path.realpath(tmpd), ip.user_ns['_dh'])
-    
+
     os.rmdir(tmpd)
 
 def test_autorestore():

From 7411df1d3d1b52349760546e857045363701e5d2 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Fri, 11 Oct 2019 13:06:10 +0100
Subject: [PATCH 152/370] ENH: Experimental input hook for wxpython phoenix

---
 IPython/terminal/pt_inputhooks/wx.py | 59 +++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/IPython/terminal/pt_inputhooks/wx.py b/IPython/terminal/pt_inputhooks/wx.py
index e6b4f57aafc..aef35d0579f 100644
--- a/IPython/terminal/pt_inputhooks/wx.py
+++ b/IPython/terminal/pt_inputhooks/wx.py
@@ -137,11 +137,66 @@ def inputhook_wx3(context):
         pass
     return 0
 
+
+def inputhook_wxphoenix(context):
+    """Run the wx event loop by processing pending events only.
+
+    This is equivalent to inputhook_wx3, but has been updated to work with
+    wxPython Phoenix.
+    """
+
+    # See inputhook_wx3 for in-line comments.
+    try:
+        app = wx.GetApp()
+        if app is not None:
+            assert wx.IsMainThread()
+
+            if not callable(signal.getsignal(signal.SIGINT)):
+                signal.signal(signal.SIGINT, signal.default_int_handler)
+
+            evtloop = wx.GUIEventLoop()
+            ea = wx.EventLoopActivator(evtloop)
+            t = clock()
+            while not context.input_is_ready():
+                while evtloop.Pending():
+                    t = clock()
+                    evtloop.Dispatch()
+
+                # Not all events will be procesed by Dispatch -
+                # we have to call ProcessPendingEvents as well
+                # to ensure that all events get processed.
+                app.ProcessPendingEvents()
+                evtloop.ProcessIdle()
+
+                used_time = clock() - t
+
+                if used_time > 10.0:
+                    time.sleep(1.0)
+                elif used_time > 0.1:
+                    time.sleep(0.05)
+                else:
+                    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 = inputhook_wx2
 else:
-    # This is our default implementation
-    inputhook = inputhook_wx3
+
+    # Get the major wx version number
+    if hasattr(wx, '__version__'):
+        major_version = wx.__version__[0]
+    else:
+        major_version = '3'
+
+    # Use the phoenix hook for wxpython >= 4
+    if int(major_version) >= 4:
+        inputhook = inputhook_wxphoenix
+    else:
+        inputhook = inputhook_wx3

From 0f50c5a5e557b355d6bcf9953ca201524b1687c0 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Fri, 18 Oct 2019 18:55:39 +0100
Subject: [PATCH 153/370] RF: Make version check a bit more robust

---
 IPython/terminal/pt_inputhooks/wx.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/IPython/terminal/pt_inputhooks/wx.py b/IPython/terminal/pt_inputhooks/wx.py
index aef35d0579f..c4115998a27 100644
--- a/IPython/terminal/pt_inputhooks/wx.py
+++ b/IPython/terminal/pt_inputhooks/wx.py
@@ -190,13 +190,14 @@ def inputhook_wxphoenix(context):
 else:
 
     # Get the major wx version number
-    if hasattr(wx, '__version__'):
-        major_version = wx.__version__[0]
-    else:
-        major_version = '3'
+    major_version = 3
+    try:
+        major_version = int(wx.__version__[0])
+    except Exception:
+        pass
 
     # Use the phoenix hook for wxpython >= 4
-    if int(major_version) >= 4:
+    if major_version >= 4:
         inputhook = inputhook_wxphoenix
     else:
         inputhook = inputhook_wx3

From dae0175ce27712307a126712009566f692bc8b77 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Sat, 19 Oct 2019 13:33:36 +0100
Subject: [PATCH 154/370] RF: Change wx strategy to that used by
 ipykernel.eventloops.loop_wx. Seems to work fine on both linux and macOS.

---
 IPython/terminal/pt_inputhooks/wx.py | 113 +++++++++++++--------------
 1 file changed, 56 insertions(+), 57 deletions(-)

diff --git a/IPython/terminal/pt_inputhooks/wx.py b/IPython/terminal/pt_inputhooks/wx.py
index c4115998a27..ce7ea40addc 100644
--- a/IPython/terminal/pt_inputhooks/wx.py
+++ b/IPython/terminal/pt_inputhooks/wx.py
@@ -139,65 +139,64 @@ def inputhook_wx3(context):
 
 
 def inputhook_wxphoenix(context):
-    """Run the wx event loop by processing pending events only.
+    """Run the wx event loop until the user provides more input.
 
-    This is equivalent to inputhook_wx3, but has been updated to work with
-    wxPython Phoenix.
+    This function uses the same approach to that used in
+    ipykernel.eventloops.loop_wx.
     """
 
-    # See inputhook_wx3 for in-line comments.
-    try:
-        app = wx.GetApp()
-        if app is not None:
-            assert wx.IsMainThread()
-
-            if not callable(signal.getsignal(signal.SIGINT)):
-                signal.signal(signal.SIGINT, signal.default_int_handler)
-
-            evtloop = wx.GUIEventLoop()
-            ea = wx.EventLoopActivator(evtloop)
-            t = clock()
-            while not context.input_is_ready():
-                while evtloop.Pending():
-                    t = clock()
-                    evtloop.Dispatch()
-
-                # Not all events will be procesed by Dispatch -
-                # we have to call ProcessPendingEvents as well
-                # to ensure that all events get processed.
-                app.ProcessPendingEvents()
-                evtloop.ProcessIdle()
-
-                used_time = clock() - t
-
-                if used_time > 10.0:
-                    time.sleep(1.0)
-                elif used_time > 0.1:
-                    time.sleep(0.05)
-                else:
-                    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.
+    app = wx.GetApp()
+
+    if app is None:
+        return
+
+     # Wx uses milliseconds
+    poll_interval = 100
+
+    # This function gets polled periodically; when
+    # input is ready, the wx main loop is stopped.
+    def wake():
+        if context.input_is_ready():
+            app.ExitMainLoop()
+
+    # We have to put the wx.Timer in a wx.Frame for it to fire properly.
+    # We make the Frame hidden when we create it in the main app below.
+    class TimerFrame(wx.Frame):
+        def __init__(self, func):
+            wx.Frame.__init__(self, None, -1)
+            self.timer = wx.Timer(self)
+            self.timer.Start(poll_interval)
+            self.Bind(wx.EVT_TIMER, self.on_timer)
+            self.func = func
+
+        def on_timer(self, event):
+            self.func()
+
+    frame = TimerFrame(wake)
+    frame.Show(False)
+
+    # 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)
+
+    app.MainLoop()
+
+# Get the major wx version number to figure out what input hook we should use.
+major_version = 3
+try:
+    major_version = int(wx.__version__[0])
+except Exception:
+    pass
+
+# Use the phoenix hook on all platforms for wxpython >= 4
+if major_version >= 4:
+    inputhook = inputhook_wxphoenix
+# 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.
+elif sys.platform == 'darwin':
     inputhook = inputhook_wx2
 else:
-
-    # Get the major wx version number
-    major_version = 3
-    try:
-        major_version = int(wx.__version__[0])
-    except Exception:
-        pass
-
-    # Use the phoenix hook for wxpython >= 4
-    if major_version >= 4:
-        inputhook = inputhook_wxphoenix
-    else:
-        inputhook = inputhook_wx3
+    inputhook = inputhook_wx3

From 73517c8eeba9b8c30a8d2affa8c9b9fd51adc121 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Sat, 19 Oct 2019 13:42:47 +0100
Subject: [PATCH 155/370] RF: Factor out keyboard interrupt catch

---
 IPython/terminal/pt_inputhooks/wx.py | 154 ++++++++++++++-------------
 1 file changed, 82 insertions(+), 72 deletions(-)

diff --git a/IPython/terminal/pt_inputhooks/wx.py b/IPython/terminal/pt_inputhooks/wx.py
index ce7ea40addc..df41e7e202e 100644
--- a/IPython/terminal/pt_inputhooks/wx.py
+++ b/IPython/terminal/pt_inputhooks/wx.py
@@ -8,30 +8,41 @@
 import wx
 
 
+def ignore_keyboardinterrupts(func):
+    """Decorator which causes KeyboardInterrupt exceptions to be
+    ignored during execution of the decorated function.
+    """
+    def wrapper(*args, **kwargs):
+        try:
+            func(*args, **kwargs)
+        except KeyboardInterrupt:
+            pass
+    return wrapper
+
+
+@ignore_keyboardinterrupts
 def inputhook_wx1(context):
     """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
+    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
     return 0
 
+
 class EventLoopTimer(wx.Timer):
 
     def __init__(self, func):
@@ -41,6 +52,7 @@ def __init__(self, func):
     def Notify(self):
         self.func()
 
+
 class EventLoopRunner(object):
 
     def Run(self, time, input_is_ready):
@@ -55,6 +67,8 @@ def check_stdin(self):
             self.timer.Stop()
             self.evtloop.Exit()
 
+
+@ignore_keyboardinterrupts
 def inputhook_wx2(context):
     """Run the wx event loop, polling for stdin.
 
@@ -69,19 +83,18 @@ def inputhook_wx2(context):
     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
-                    input_is_ready=context.input_is_ready)
-    except KeyboardInterrupt:
-        pass
+    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
+                input_is_ready=context.input_is_ready)
     return 0
 
+
+@ignore_keyboardinterrupts
 def inputhook_wx3(context):
     """Run the wx event loop by processing pending events only.
 
@@ -90,54 +103,50 @@ def inputhook_wx3(context):
     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 context.input_is_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
+    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 context.input_is_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
     return 0
 
 
+@ignore_keyboardinterrupts
 def inputhook_wxphoenix(context):
     """Run the wx event loop until the user provides more input.
 
@@ -183,6 +192,7 @@ def on_timer(self, event):
 
     app.MainLoop()
 
+
 # Get the major wx version number to figure out what input hook we should use.
 major_version = 3
 try:

From 64512e81710717447f59498de6e306c3d72d470f Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Sun, 20 Oct 2019 13:44:32 +0100
Subject: [PATCH 156/370] RF: Clean up wxphoenix input hook.

---
 IPython/terminal/pt_inputhooks/wx.py | 55 +++++++++++++++-------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/IPython/terminal/pt_inputhooks/wx.py b/IPython/terminal/pt_inputhooks/wx.py
index df41e7e202e..ebe3b1c384e 100644
--- a/IPython/terminal/pt_inputhooks/wx.py
+++ b/IPython/terminal/pt_inputhooks/wx.py
@@ -9,8 +9,12 @@
 
 
 def ignore_keyboardinterrupts(func):
-    """Decorator which causes KeyboardInterrupt exceptions to be
-    ignored during execution of the decorated function.
+    """Decorator which causes KeyboardInterrupt exceptions to be ignored during
+    execution of the decorated function.
+
+    This is used by the inputhook functions to handle the event where the user
+    presses CTRL+C while IPython is idle, and the inputhook loop is running. In
+    this case, we want to ignore interrupts.
     """
     def wrapper(*args, **kwargs):
         try:
@@ -159,34 +163,34 @@ def inputhook_wxphoenix(context):
     if app is None:
         return
 
-     # Wx uses milliseconds
+    if context.input_is_ready():
+        return
+
+    assert wx.IsMainThread()
+
+    # Wx uses milliseconds
     poll_interval = 100
 
-    # This function gets polled periodically; when
-    # input is ready, the wx main loop is stopped.
-    def wake():
+    # We have to create a dummy wx.Frame, otherwise wx.App.MainLoop will know
+    # that it has nothing to do, and will return immediately.
+    frame = getattr(inputhook_wxphoenix, '_frame', None)
+    if frame is None:
+        inputhook_wxphoenix._frame = frame = wx.Frame(None)
+        frame.Show(False)
+
+    # Use a wx.Timer to periodically check whether input is ready - as soon as
+    # it is, we exit the main loop
+    def poll(ev):
         if context.input_is_ready():
             app.ExitMainLoop()
 
-    # We have to put the wx.Timer in a wx.Frame for it to fire properly.
-    # We make the Frame hidden when we create it in the main app below.
-    class TimerFrame(wx.Frame):
-        def __init__(self, func):
-            wx.Frame.__init__(self, None, -1)
-            self.timer = wx.Timer(self)
-            self.timer.Start(poll_interval)
-            self.Bind(wx.EVT_TIMER, self.on_timer)
-            self.func = func
-
-        def on_timer(self, event):
-            self.func()
-
-    frame = TimerFrame(wake)
-    frame.Show(False)
-
-    # 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.
+    timer = wx.Timer()
+    timer.Start(poll_interval)
+    timer.Bind(wx.EVT_TIMER, poll)
+
+    # 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)
 
@@ -195,6 +199,7 @@ def on_timer(self, event):
 
 # Get the major wx version number to figure out what input hook we should use.
 major_version = 3
+
 try:
     major_version = int(wx.__version__[0])
 except Exception:

From 879050a347776f9818d0003fb0e8ea09b434e42a Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Sun, 20 Oct 2019 13:51:03 +0100
Subject: [PATCH 157/370] DOC: Clarify method in docstring

---
 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 ebe3b1c384e..1ec92ca22b0 100644
--- a/IPython/terminal/pt_inputhooks/wx.py
+++ b/IPython/terminal/pt_inputhooks/wx.py
@@ -155,7 +155,9 @@ def inputhook_wxphoenix(context):
     """Run the wx event loop until the user provides more input.
 
     This function uses the same approach to that used in
-    ipykernel.eventloops.loop_wx.
+    ipykernel.eventloops.loop_wx. The wx.MainLoop is executed, and a wx.Timer
+    is used to periodically poll the context for input. As soon as input is
+    ready, the wx.MainLoop is stopped.
     """
 
     app = wx.GetApp()

From 96ed7a3d20543c70b300728b1eecb18acabda13e Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Sun, 20 Oct 2019 14:05:53 +0100
Subject: [PATCH 158/370] DOC: More info in docstring.

---
 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 1ec92ca22b0..d918e67c330 100644
--- a/IPython/terminal/pt_inputhooks/wx.py
+++ b/IPython/terminal/pt_inputhooks/wx.py
@@ -154,7 +154,9 @@ def inputhook_wx3(context):
 def inputhook_wxphoenix(context):
     """Run the wx event loop until the user provides more input.
 
-    This function uses the same approach to that used in
+    This input hook is suitable for use with wxPython >= 4 (a.k.a. Phoenix).
+
+    It uses the same approach to that used in
     ipykernel.eventloops.loop_wx. The wx.MainLoop is executed, and a wx.Timer
     is used to periodically poll the context for input. As soon as input is
     ready, the wx.MainLoop is stopped.

From c3461c7abe1b1d0de05b88dcfb64d601f4f8a1af Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Wed, 30 Oct 2019 02:40:51 +0000
Subject: [PATCH 159/370] RF: Use SetExitOnFrameDelete instead of creating a
 frame

---
 IPython/terminal/pt_inputhooks/wx.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/IPython/terminal/pt_inputhooks/wx.py b/IPython/terminal/pt_inputhooks/wx.py
index d918e67c330..618f092b4f9 100644
--- a/IPython/terminal/pt_inputhooks/wx.py
+++ b/IPython/terminal/pt_inputhooks/wx.py
@@ -175,13 +175,6 @@ def inputhook_wxphoenix(context):
     # Wx uses milliseconds
     poll_interval = 100
 
-    # We have to create a dummy wx.Frame, otherwise wx.App.MainLoop will know
-    # that it has nothing to do, and will return immediately.
-    frame = getattr(inputhook_wxphoenix, '_frame', None)
-    if frame is None:
-        inputhook_wxphoenix._frame = frame = wx.Frame(None)
-        frame.Show(False)
-
     # Use a wx.Timer to periodically check whether input is ready - as soon as
     # it is, we exit the main loop
     def poll(ev):
@@ -198,6 +191,9 @@ def poll(ev):
     if not callable(signal.getsignal(signal.SIGINT)):
         signal.signal(signal.SIGINT, signal.default_int_handler)
 
+    # The SetExitOnFrameDelete call allows us to run the wx mainloop without
+    # having a frame open.
+    app.SetExitOnFrameDelete(False)
     app.MainLoop()
 
 

From e33e98fe8de68c8af80b9158a8458a9b626a9f5b Mon Sep 17 00:00:00 2001
From: Gerrit Buss <gerrit.buss@posteo.de>
Date: Fri, 1 Nov 2019 10:00:06 +0100
Subject: [PATCH 160/370] static message instead of function call to prevent
 shell slowdown

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

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index eb49e67d329..533c7cc5897 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -377,14 +377,12 @@ def _extra_prompt_options(self):
         """
         Return the current layout option for the current Terminal InteractiveShell
         """
-        def get_message():
-            return PygmentsTokens(self.prompts.in_prompt_tokens())
 
         return {
                 'complete_in_thread': False,
                 'lexer':IPythonPTLexer(),
                 'reserve_space_for_menu':self.space_for_menu,
-                'message': get_message,
+                'message': PygmentsTokens(self.prompts.in_prompt_tokens()),
                 'prompt_continuation': (
                     lambda width, lineno, is_soft_wrap:
                         PygmentsTokens(self.prompts.continuation_prompt_tokens(width))),

From 467667270d4d0e4ac3885d229b8f51cef72171b5 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 2 Nov 2019 20:51:25 -0700
Subject: [PATCH 161/370] Do no precompute when using vi mode.

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

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 533c7cc5897..0dda4284a8e 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -377,12 +377,24 @@ def _extra_prompt_options(self):
         """
         Return the current layout option for the current Terminal InteractiveShell
         """
+        def get_message():
+            return PygmentsTokens(self.prompts.in_prompt_tokens())
+
+        if self.editing_mode == 'emacs':
+            # with emacs mode the prompt is (usually) static, so we call only
+            # the function once. With VI mode it can toggle between [ins] and
+            # [nor] so we can't precompute.
+            # here I'm going to favor the default keybinding which almost
+            # everybody uses to decrease CPU usage.
+            # if we have issues with users with custom Prompts we can see how to
+            # work around this.
+            get_message = get_message()
 
         return {
                 'complete_in_thread': False,
                 'lexer':IPythonPTLexer(),
                 'reserve_space_for_menu':self.space_for_menu,
-                'message': PygmentsTokens(self.prompts.in_prompt_tokens()),
+                'message': get_message,
                 'prompt_continuation': (
                     lambda width, lineno, is_soft_wrap:
                         PygmentsTokens(self.prompts.continuation_prompt_tokens(width))),

From a4fabd4b48882f109c982884a492ef2665f10f15 Mon Sep 17 00:00:00 2001
From: Nicholas Bollweg <nick.bollweg@gmail.com>
Date: Mon, 4 Nov 2019 20:47:23 -0500
Subject: [PATCH 162/370] add py37/38 for appveyor

---
 appveyor.yml | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 7fbecff4318..d7406b41ac5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,10 +12,35 @@ environment:
      PYTHON_VERSION: "3.6.x"
      PYTHON_ARCH: "64"
 
+   - PYTHON: "C:\\Python37"
+     PYTHON_VERSION: "3.7.x"
+     PYTHON_ARCH: "32"
+
+   - 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%"
 
 install:
+  - ps: |
+      Set-PSDebug -Trace 1
+      if ($Env:PYTHON_VERSION.StartsWith("3.8")) {
+        if ($Env:PYTHON_ARCH -eq "64") {
+          iex "choco install python3 --version=3.8 --no-progress --params /InstallDir:$Env:PYTHON_HOME"
+        } else {
+          iex "choco install python3 --version=3.8 --no-progress --params /InstallDir:$Env:PYTHON_HOME --x86"
+        }
+      }
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "%CMD_IN_ENV%  python -m pip install --upgrade setuptools pip"
   - "%CMD_IN_ENV%  pip install nose coverage"
@@ -24,4 +49,3 @@ install:
   - "%CMD_IN_ENV%  cd results"
 test_script:
   - "%CMD_IN_ENV%  iptest --coverage xml"
-  

From 63b0de49b0e86ef79479087de7f324d0cd180714 Mon Sep 17 00:00:00 2001
From: Nicholas Bollweg <nick.bollweg@gmail.com>
Date: Mon, 4 Nov 2019 20:48:41 -0500
Subject: [PATCH 163/370] fix env var for py38 install

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

diff --git a/appveyor.yml b/appveyor.yml
index d7406b41ac5..992c7b0743a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,9 +36,9 @@ install:
       Set-PSDebug -Trace 1
       if ($Env:PYTHON_VERSION.StartsWith("3.8")) {
         if ($Env:PYTHON_ARCH -eq "64") {
-          iex "choco install python3 --version=3.8 --no-progress --params /InstallDir:$Env:PYTHON_HOME"
+          iex "choco install python3 --version=3.8 --no-progress --params /InstallDir:$Env:PYTHON"
         } else {
-          iex "choco install python3 --version=3.8 --no-progress --params /InstallDir:$Env:PYTHON_HOME --x86"
+          iex "choco install python3 --version=3.8 --no-progress --params /InstallDir:$Env:PYTHON --x86"
         }
       }
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"

From de62a081d1d8f4f7a301026fcfa7cfb7317f96b2 Mon Sep 17 00:00:00 2001
From: Nicholas Bollweg <nick.bollweg@gmail.com>
Date: Mon, 11 Nov 2019 07:59:38 -0500
Subject: [PATCH 164/370] skip %HOME% 3.8 test on windows, update docs for
 get_home_dir

---
 IPython/utils/path.py            | 3 ++-
 IPython/utils/tests/test_path.py | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index f8665975a1a..f677f1c7cd0 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -175,7 +175,8 @@ def get_home_dir(require_writable=False):
     Uses os.path.expanduser('~'), and checks for writability.
 
     See stdlib docs for how this is determined.
-    $HOME is first priority on *ALL* platforms.
+    For Python <3.8, $HOME is first priority on *ALL* platforms.
+    For Python >=3.8 on Windows, %HOME% is no longer considered.
 
     Parameters
     ----------
diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index a4c1fc814b8..26b7d321ff3 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -28,7 +28,7 @@
 
 # Platform-dependent imports
 try:
-    import winreg as wreg  
+    import winreg as wreg
 except ImportError:
     #Fake _winreg module on non-windows platforms
     import types
@@ -128,6 +128,7 @@ def test_get_home_dir_2():
     nt.assert_equal(home_dir, unfrozen)
 
 
+@skipif(sys.version_info > (3,8) and os.name == 'nt')
 @with_environment
 def test_get_home_dir_3():
     """get_home_dir() uses $HOME if set"""
@@ -247,7 +248,7 @@ def test_filefind():
 def test_get_long_path_name_win32():
     with TemporaryDirectory() as tmpdir:
 
-        # Make a long path. Expands the path of tmpdir prematurely as it may already have a long 
+        # Make a long path. Expands the path of tmpdir prematurely as it may already have a long
         # path component, so ensure we include the long form of it
         long_path = os.path.join(path.get_long_path_name(tmpdir), 'this is my long path name')
         os.makedirs(long_path)
@@ -311,7 +312,7 @@ def test_get_py_filename():
 def test_unicode_in_filename():
     """When a file doesn't exist, the exception raised should be safe to call
     str() on - i.e. in Python 2 it must only have ASCII characters.
-    
+
     https://github.com/ipython/ipython/issues/875
     """
     try:

From 93500dbe00103146a977c66d8c8afac3120c49b0 Mon Sep 17 00:00:00 2001
From: Nicholas Bollweg <nick.bollweg@gmail.com>
Date: Mon, 11 Nov 2019 08:13:14 -0500
Subject: [PATCH 165/370] add skip_win32_py38 decorator, skip another test

---
 IPython/testing/decorators.py    | 11 ++++++++---
 IPython/utils/tests/test_path.py |  7 +++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
index 91e7193cbe6..4539a72a8ca 100644
--- a/IPython/testing/decorators.py
+++ b/IPython/testing/decorators.py
@@ -108,9 +108,9 @@ def make_label_dec(label, ds=None):
     >>> 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__
@@ -280,7 +280,7 @@ def module_not_available(module):
 
 def decorated_dummy(dec, name):
     """Return a dummy function decorated with dec, with the given name.
-    
+
     Examples
     --------
     import IPython.testing.decorators as dec
@@ -318,6 +318,11 @@ def decorated_dummy(dec, name):
 
 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')
+
+
 # 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",
diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index 26b7d321ff3..b34f9ca926c 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -21,11 +21,13 @@
 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,)
+                                        onlyif_unicode_paths, skipif,
+                                        skip_win32_py38,)
 from IPython.testing.tools import make_tempfile, AssertPrints
 from IPython.utils import path
 from IPython.utils.tempdir import TemporaryDirectory
 
+
 # Platform-dependent imports
 try:
     import winreg as wreg
@@ -128,7 +130,7 @@ def test_get_home_dir_2():
     nt.assert_equal(home_dir, unfrozen)
 
 
-@skipif(sys.version_info > (3,8) and os.name == 'nt')
+@skip_win32_py38
 @with_environment
 def test_get_home_dir_3():
     """get_home_dir() uses $HOME if set"""
@@ -146,6 +148,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
 @with_environment
 def test_get_home_dir_5():
     """raise HomeDirError if $HOME is specified, but not a writable dir"""

From 0f6d2f42f2a10eeb5f78c57314b2f8cc026aed19 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Mon, 11 Nov 2019 12:41:43 -0800
Subject: [PATCH 166/370] Adopt NEP 29, Drop Python 3.5 and Numpy <1.14

This lays out the foundation of adopting NEP29 in IPython,
And drop support for older versions of Python in the metadata, setup.py
and __init__.

This does not yet remove any codepath from within IPython.
---
 .travis.yml         |  1 -
 IPython/__init__.py |  5 +++--
 README.rst          |  8 ++++++++
 setup.py            | 11 +++++------
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b14f7d7354f..f0d4dc6f126 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ addons:
 
 python:
     - 3.6
-    - 3.5
 
 sudo: false
 
diff --git a/IPython/__init__.py b/IPython/__init__.py
index 043a946ab26..4fb77107680 100644
--- a/IPython/__init__.py
+++ b/IPython/__init__.py
@@ -27,12 +27,13 @@
 #-----------------------------------------------------------------------------
 
 # Don't forget to also update setup.py when this changes!
-if sys.version_info < (3, 5):
+if sys.version_info < (3, 6):
     raise ImportError(
 """
-IPython 7.0+ supports Python 3.5 and above.
+IPython 7.10+ supports Python 3.6 and above.
 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.
 
 See IPython `README.rst` file for more information:
 
diff --git a/README.rst b/README.rst
index f708ca0ecef..9899a538544 100644
--- a/README.rst
+++ b/README.rst
@@ -10,6 +10,10 @@
 .. image:: https://www.codetriage.com/ipython/ipython/badges/users.svg
     :target: https://www.codetriage.com/ipython/ipython/
 
+.. image:: https://raster.shields.io/badge/Follows-NEP29-brightgreen.png
+    :target: https://numpy.org/neps/nep-0029-deprecation_policy.html
+
+
 ===========================================
  IPython: Productive Interactive Computing
 ===========================================
@@ -23,6 +27,10 @@ contribute to the project.
 
 **IPython versions and Python Support**
 
+Starting with IPython 7.10, IPython follows `NEP 29 <https://numpy.org/neps/nep-0029-deprecation_policy.html>`_
+
+**IPython 7.10+** requires Python version 3.6 and above.
+
 **IPython 7.0** requires Python version 3.5 and above.
 
 **IPython 6.x** requires Python version 3.3 and above.
diff --git a/setup.py b/setup.py
index 47c9af24307..638446de9e0 100755
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,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, 5):
+if sys.version_info < (3, 6):
     pip_message = 'This may be due to an out of date pip. Make sure you have pip >= 9.0.1.'
     try:
         import pip
@@ -42,9 +42,10 @@
 
 
     error = """
-IPython 7.0+ supports Python 3.5 and above.
+IPython 7.10+ supports Python 3.6 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.
 
 See IPython `README.rst` file for more information:
 
@@ -175,7 +176,7 @@
     parallel = ['ipyparallel'],
     qtconsole = ['qtconsole'],
     doc = ['Sphinx>=1.3'],
-    test = ['nose>=0.10.1', 'requests', 'testpath', 'pygments', 'nbformat', 'ipykernel', 'numpy'],
+    test = ['nose>=0.10.1', 'requests', 'testpath', 'pygments', 'nbformat', 'ipykernel', 'numpy>=1.14'],
     terminal = [],
     kernel = ['ipykernel'],
     nbformat = ['nbformat'],
@@ -199,11 +200,9 @@
 # but requires pip >= 6. pip < 6 ignores these.
 
 extras_require.update({
-    ':python_version == "3.4"': ['typing'],
     ':sys_platform != "win32"': ['pexpect'],
     ':sys_platform == "darwin"': ['appnope'],
     ':sys_platform == "win32"': ['colorama'],
-    ':sys_platform == "win32" and python_version < "3.6"': ['win_unicode_console>=0.5'],
 })
 # FIXME: re-specify above platform dependencies for pip < 6
 # These would result in non-portable bdists.
@@ -229,7 +228,7 @@
 extras_require['all'] = everything
 
 if 'setuptools' in sys.modules:
-    setuptools_extra_args['python_requires'] = '>=3.5'
+    setuptools_extra_args['python_requires'] = '>=3.6'
     setuptools_extra_args['zip_safe'] = False
     setuptools_extra_args['entry_points'] = {
         'console_scripts': find_entry_points(),

From 390d0400cfafb2270b35bc5634f19e40b2a2e249 Mon Sep 17 00:00:00 2001
From: Srinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com>
Date: Tue, 12 Nov 2019 14:25:44 +0530
Subject: [PATCH 167/370] Change absolute imports to relative imports to
 facilitate processes embedding kernel or debugger

---
 IPython/config.py            |  2 +-
 IPython/conftest.py          |  6 +++---
 IPython/core/alias.py        |  2 +-
 IPython/core/completerlib.py |  6 +++---
 IPython/core/formatters.py   | 10 +++++-----
 IPython/core/historyapp.py   |  4 ++--
 IPython/core/hooks.py        |  6 +++---
 IPython/core/magic.py        | 12 ++++++------
 IPython/core/prefilter.py    |  8 ++++----
 IPython/core/profiledir.py   |  4 ++--
 10 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/IPython/config.py b/IPython/config.py
index cf2bacafad1..964f46f10ac 100644
--- a/IPython/config.py
+++ b/IPython/config.py
@@ -7,7 +7,7 @@
 import sys
 from warnings import warn
 
-from IPython.utils.shimmodule import ShimModule, ShimWarning
+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)
diff --git a/IPython/conftest.py b/IPython/conftest.py
index b9d1f065353..8b2af8c020a 100644
--- a/IPython/conftest.py
+++ b/IPython/conftest.py
@@ -6,11 +6,11 @@
 import pathlib
 import shutil
 
-from IPython.testing import tools
+from .testing import tools
 
 
 def get_ipython():
-    from IPython.terminal.interactiveshell import TerminalInteractiveShell
+    from .terminal.interactiveshell import TerminalInteractiveShell
     if TerminalInteractiveShell._instance:
         return TerminalInteractiveShell.instance()
 
@@ -60,7 +60,7 @@ def inject():
     builtins.ip = get_ipython()
     builtins.ip.system = types.MethodType(xsys, ip)
     builtins.ip.builtin_trap.activate()
-    from IPython.core import page
+    from .core import page
 
     page.pager_page = nopage
     # yield
diff --git a/IPython/core/alias.py b/IPython/core/alias.py
index 4577becf7f6..2ad990231a0 100644
--- a/IPython/core/alias.py
+++ b/IPython/core/alias.py
@@ -25,7 +25,7 @@
 import sys
 
 from traitlets.config.configurable import Configurable
-from IPython.core.error import UsageError
+from .error import UsageError
 
 from traitlets import List, Instance
 from logging import error
diff --git a/IPython/core/completerlib.py b/IPython/core/completerlib.py
index 9b14bf7c715..9e592b0817e 100644
--- a/IPython/core/completerlib.py
+++ b/IPython/core/completerlib.py
@@ -30,9 +30,9 @@
 from zipimport import zipimporter
 
 # Our own imports
-from IPython.core.completer import expand_user, compress_user
-from IPython.core.error import TryNext
-from IPython.utils._process_common import arg_split
+from .completer import expand_user, compress_user
+from .error import TryNext
+from ..utils._process_common import arg_split
 
 # FIXME: this should be pulled in with the right call via the component system
 from IPython import get_ipython
diff --git a/IPython/core/formatters.py b/IPython/core/formatters.py
index fd93d3747b5..237b959b9a6 100644
--- a/IPython/core/formatters.py
+++ b/IPython/core/formatters.py
@@ -20,10 +20,10 @@
 from decorator import decorator
 
 from traitlets.config.configurable import Configurable
-from IPython.core.getipython import get_ipython
-from IPython.utils.sentinel import Sentinel
-from IPython.utils.dir2 import get_real_method
-from IPython.lib import pretty
+from .getipython import get_ipython
+from ..utils.sentinel import Sentinel
+from ..utils.dir2 import get_real_method
+from ..lib import pretty
 from traitlets import (
     Bool, Dict, Integer, Unicode, CUnicode, ObjectName, List,
     ForwardDeclaredInstance,
@@ -1015,7 +1015,7 @@ def format_display_data(obj, include=None, exclude=None):
         data dict. If this is set all format types will be computed,
         except for those included in this argument.
     """
-    from IPython.core.interactiveshell import InteractiveShell
+    from .interactiveshell import InteractiveShell
 
     return InteractiveShell.instance().display_formatter.format(
         obj,
diff --git a/IPython/core/historyapp.py b/IPython/core/historyapp.py
index 3bcc697a20c..a6437eff26e 100644
--- a/IPython/core/historyapp.py
+++ b/IPython/core/historyapp.py
@@ -9,9 +9,9 @@
 import sqlite3
 
 from traitlets.config.application import Application
-from IPython.core.application import BaseIPythonApplication
+from .application import BaseIPythonApplication
 from traitlets import Bool, Int, Dict
-from IPython.utils.io import ask_yes_no
+from ..utils.io import ask_yes_no
 
 trim_hist_help = """Trim the IPython history database to the last 1000 entries.
 
diff --git a/IPython/core/hooks.py b/IPython/core/hooks.py
index 66a544d7d8c..b0637d8c154 100644
--- a/IPython/core/hooks.py
+++ b/IPython/core/hooks.py
@@ -40,7 +40,7 @@ def load_ipython_extension(ip):
 import warnings
 import sys
 
-from IPython.core.error import TryNext
+from .error import TryNext
 
 # 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.
@@ -83,7 +83,7 @@ def editor(self, filename, linenum=None, wait=True):
         raise TryNext()
 
 import tempfile
-from IPython.utils.decorators import undoc
+from ..utils.decorators import undoc
 
 @undoc
 def fix_error_editor(self,filename,linenum,column,msg):
@@ -212,7 +212,7 @@ def pre_run_code_hook(self):
 def clipboard_get(self):
     """ Get text from the clipboard.
     """
-    from IPython.lib.clipboard import (
+    from ..lib.clipboard import (
         osx_clipboard_get, tkinter_clipboard_get,
         win32_clipboard_get
     )
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 2b41617bed7..bc51677f083 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -17,13 +17,13 @@
 from getopt import getopt, GetoptError
 
 from traitlets.config.configurable import Configurable
-from IPython.core import oinspect
-from IPython.core.error import UsageError
-from IPython.core.inputtransformer2 import ESC_MAGIC, ESC_MAGIC2
+from . import oinspect
+from .error import UsageError
+from .inputtransformer2 import ESC_MAGIC, ESC_MAGIC2
 from decorator import decorator
-from IPython.utils.ipstruct import Struct
-from IPython.utils.process import arg_split
-from IPython.utils.text import dedent
+from ..utils.ipstruct import Struct
+from ..utils.process import arg_split
+from ..utils.text import dedent
 from traitlets import Bool, Dict, Instance, observe
 from logging import error
 
diff --git a/IPython/core/prefilter.py b/IPython/core/prefilter.py
index 0262a29bf3b..dbf185e6a42 100644
--- a/IPython/core/prefilter.py
+++ b/IPython/core/prefilter.py
@@ -12,16 +12,16 @@
 from keyword import iskeyword
 import re
 
-from IPython.core.autocall import IPyAutocall
+from .autocall import IPyAutocall
 from traitlets.config.configurable import Configurable
-from IPython.core.inputtransformer2 import (
+from .inputtransformer2 import (
     ESC_MAGIC,
     ESC_QUOTE,
     ESC_QUOTE2,
     ESC_PAREN,
 )
-from IPython.core.macro import Macro
-from IPython.core.splitinput import LineInfo
+from .macro import Macro
+from .splitinput import LineInfo
 
 from traitlets import (
     List, Integer, Unicode, Bool, Instance, CRegExp
diff --git a/IPython/core/profiledir.py b/IPython/core/profiledir.py
index 6ab600f3004..3199dfd5d64 100644
--- a/IPython/core/profiledir.py
+++ b/IPython/core/profiledir.py
@@ -9,8 +9,8 @@
 import errno
 
 from traitlets.config.configurable import LoggingConfigurable
-from IPython.paths import get_ipython_package_dir
-from IPython.utils.path import expand_path, ensure_dir_exists
+from ..paths import get_ipython_package_dir
+from ..utils.path import expand_path, ensure_dir_exists
 from traitlets import Unicode, Bool, observe
 
 #-----------------------------------------------------------------------------

From 595fa2512d0ddadcfc71736d8de6023cdf9d40fc Mon Sep 17 00:00:00 2001
From: Nicholas Bollweg <nick.bollweg@gmail.com>
Date: Tue, 12 Nov 2019 08:19:20 -0500
Subject: [PATCH 168/370] remove choco appveyor

---
 appveyor.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 992c7b0743a..5ed18735ff0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,15 +32,6 @@ init:
   - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
 
 install:
-  - ps: |
-      Set-PSDebug -Trace 1
-      if ($Env:PYTHON_VERSION.StartsWith("3.8")) {
-        if ($Env:PYTHON_ARCH -eq "64") {
-          iex "choco install python3 --version=3.8 --no-progress --params /InstallDir:$Env:PYTHON"
-        } else {
-          iex "choco install python3 --version=3.8 --no-progress --params /InstallDir:$Env:PYTHON --x86"
-        }
-      }
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "%CMD_IN_ENV%  python -m pip install --upgrade setuptools pip"
   - "%CMD_IN_ENV%  pip install nose coverage"

From 2a6002333514150368366b10e184062e550dbda3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 12 Nov 2019 14:25:01 -0800
Subject: [PATCH 169/370] Add whats new

---
 .../whatsnew/pr/prompt-update-modifications.rst    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/prompt-update-modifications.rst

diff --git a/docs/source/whatsnew/pr/prompt-update-modifications.rst b/docs/source/whatsnew/pr/prompt-update-modifications.rst
new file mode 100644
index 00000000000..77d557b8936
--- /dev/null
+++ b/docs/source/whatsnew/pr/prompt-update-modifications.rst
@@ -0,0 +1,14 @@
+Prompt Rendering Performance improvements
+=========================================
+
+Pull Request :ghpull:`11933` introduced an optimisation in the prompt rendering
+logic that should decrease the resource usage of IPython when using the
+_default_ configuration but could potentially introduce a regression of
+functionalities if you are using a custom prompt.
+
+We know assume if you haven't changed the default keybindings that the prompt
+**will not change** during the duration of your input – which is for example
+not true when using vi insert mode that switches between `[ins]` and `[nor]`
+for the current mode.
+
+If you are experiencing any issue let us know.

From fd1a027a7f133d9adf9dd46bfc581e2afb079482 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 13 Nov 2019 20:15:57 -0800
Subject: [PATCH 170/370] Let anyone add "good first issue"

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

diff --git a/.meeseeksdev.yml b/.meeseeksdev.yml
index 924dc8eeaeb..b52022dde07 100644
--- a/.meeseeksdev.yml
+++ b/.meeseeksdev.yml
@@ -12,6 +12,7 @@ special:
     config:
       tag:
         only:
+           - good first issue
            - async/await
            - backported
            - help wanted

From 802df205b23bec291959ef495328637a1a786f2e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 17 Nov 2019 09:46:02 -0800
Subject: [PATCH 171/370] Use proper subprocess commands instead of modifying
 the command line.

This should in particular work on windows; as 2>/dev/null might not have
been proper windows syntax
---
 IPython/core/page.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/IPython/core/page.py b/IPython/core/page.py
index cf9fb21e3de..afdded29b1a 100644
--- a/IPython/core/page.py
+++ b/IPython/core/page.py
@@ -15,9 +15,11 @@
 
 
 import os
+import io
 import re
 import sys
 import tempfile
+import subprocess
 
 from io import UnsupportedOperation
 
@@ -208,9 +210,13 @@ def pager_page(strng, start=0, screen_lines=0, pager_cmd=None):
         else:
             try:
                 retval = None
-                # if I use popen4, things hang. No idea why.
-                #pager,shell_out = os.popen4(pager_cmd)
-                pager = os.popen(pager_cmd + ' 2>/dev/null', 'w')
+                # 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), proc)
                 try:
                     pager_encoding = pager.encoding or sys.stdout.encoding
                     pager.write(strng)

From da7bac9111c66c1a8b9aa5bccf464c3d8dfa93b3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 17 Nov 2019 10:10:12 -0800
Subject: [PATCH 172/370] Update documentation, and prepare inine matplotlib.

---
 IPython/terminal/interactiveshell.py       |  2 +-
 IPython/terminal/pt_inputhooks/__init__.py |  2 +-
 docs/source/config/index.rst               |  1 +
 docs/source/config/shell_mimerenderer.rst  | 60 ++++++++++++++++++++++
 docs/source/whatsnew/pr/mimerenderer.rst   | 44 ++--------------
 5 files changed, 67 insertions(+), 42 deletions(-)
 create mode 100644 docs/source/config/shell_mimerenderer.rst

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 262c574a4f9..cdc55987ced 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -516,7 +516,7 @@ def inputhook(self, context):
 
     active_eventloop = None
     def enable_gui(self, gui=None):
-        if gui:
+        if gui and (gui != 'inline') :
             self.active_eventloop, self._inputhook =\
                 get_inputhook_name_and_func(gui)
         else:
diff --git a/IPython/terminal/pt_inputhooks/__init__.py b/IPython/terminal/pt_inputhooks/__init__.py
index 3766973e826..284293ddde4 100644
--- a/IPython/terminal/pt_inputhooks/__init__.py
+++ b/IPython/terminal/pt_inputhooks/__init__.py
@@ -12,7 +12,7 @@
     'tk',
     'wx',
     'pyglet', 'glut',
-    'osx',
+    'osx'
 ]
 
 registered = {}
diff --git a/docs/source/config/index.rst b/docs/source/config/index.rst
index 0fe4f20f668..28e6994cc21 100644
--- a/docs/source/config/index.rst
+++ b/docs/source/config/index.rst
@@ -29,6 +29,7 @@ Extending and integrating with IPython
    extensions/index
    integrating
    custommagics
+   shell_mimerenderer
    inputtransforms
    callbacks
    eventloops
diff --git a/docs/source/config/shell_mimerenderer.rst b/docs/source/config/shell_mimerenderer.rst
new file mode 100644
index 00000000000..eda16142674
--- /dev/null
+++ b/docs/source/config/shell_mimerenderer.rst
@@ -0,0 +1,60 @@
+
+.. _shell_mimerenderer:
+
+
+Mime Renderer Extensions
+========================
+
+Like it's cousins, Jupyter Notebooks and JupyterLab, Terminal IPython can be
+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
+requires 4 steps:
+
+   - Define a callable that takes 2 parameters:``data`` and ``metadata``; return
+     value of the callable is so far ignored. This callable is responsible for
+     "displaying" the given mimetype. Which can be sending the right escape
+     sequences and bytes to the current terminal; or open an external program. -
+   - Appending the right mimetype to ``ipython.display_formatter.active_types``
+     for IPython to know it should not ignore those mimetypes.
+   - Enabling the given mimetype: ``ipython.display_formatter.formatters[mime].enabled = True``
+   - Registering above callable with mimetype handler:
+     ``ipython.mime_renderers[mime] = handler``
+
+
+Here is a complete IPython extension to display images inline and convert math
+to png, before displaying it inline for iterm2 on macOS ::
+
+
+    from base64 import encodebytes
+    from IPython.lib.latextools import latex_to_png
+
+
+    def mathcat(data, meta):
+        png = latex_to_png(f'$${data}$$'.replace('\displaystyle', '').replace('$$$', '$$'))
+        imcat(png, meta)
+
+    IMAGE_CODE = '\033]1337;File=name=name;inline=true;:{}\a'
+
+    def imcat(image_data, metadata):
+        try:
+            print(IMAGE_CODE.format(encodebytes(image_data).decode()))
+        # bug workaround
+        except:
+            print(IMAGE_CODE.format(image_data))
+
+    def register_mimerenderer(ipython, mime, handler):
+        ipython.display_formatter.active_types.append(mime)
+        ipython.display_formatter.formatters[mime].enabled = True
+        ipython.mime_renderers[mime] = handler
+
+    def load_ipython_extension(ipython):
+        register_mimerenderer(ipython, 'image/png', imcat)
+        register_mimerenderer(ipython, 'image/jpeg', imcat)
+        register_mimerenderer(ipython, 'text/latex', mathcat)
+
+This example only work for iterm2 on macOS and skip error handling for brevity.
+One could also invoke an external viewer with ``subporcess.run()`` and a
+temporary file, which is left as an exercise.
diff --git a/docs/source/whatsnew/pr/mimerenderer.rst b/docs/source/whatsnew/pr/mimerenderer.rst
index 44aeb9d6d3f..58d474a1515 100644
--- a/docs/source/whatsnew/pr/mimerenderer.rst
+++ b/docs/source/whatsnew/pr/mimerenderer.rst
@@ -2,54 +2,18 @@ Arbitrary Mimetypes Handing in Terminal
 =======================================
 
 When using IPython terminal it is now possible to register function to handle
-arbitrary mimetypes (``TerminalInteractiveShell.mime_renderers`` ``Dict``
-configurable). While rendering non-text based representation was possible in
+arbitrary mimetypes. While rendering non-text based representation was possible in
 many jupyter frontend; it was not possible in terminal IPython, as usually
 terminal are limited to displaying text. As many terminal these days provide
 escape sequences to display non-text; bringing this loved feature to IPython CLI
 made a lot of sens. This functionality will not only allow inline images; but
-allow opening of external program; for example ``fmplayer`` to "display" sound
+allow opening of external program; for example ``mplayer`` to "display" sound
 files.
 
-Here is a complete IPython tension to display images inline and convert math to
-png, before displaying it inline ::
-
-
-    from base64 import encodebytes
-    from IPython.lib.latextools import latex_to_png
-
-
-    def mathcat(data, meta):
-        png = latex_to_png(f'$${data}$$'.replace('\displaystyle', '').replace('$$$', '$$'))
-        imcat(png, meta)
-
-    IMAGE_CODE = '\033]1337;File=name=name;inline=true;:{}\a'
-
-    def imcat(image_data, metadata):
-        try:
-            print(IMAGE_CODE.format(encodebytes(image_data).decode()))
-        # bug workaround
-        except:
-            print(IMAGE_CODE.format(image_data))
-
-    def register_mimerenderer(ipython, mime, handler):
-        ipython.display_formatter.active_types.append(mime)
-        ipython.display_formatter.formatters[mime].enabled = True
-        ipython.mime_renderers[mime] = handler
-
-    def load_ipython_extension(ipython):
-        register_mimerenderer(ipython, 'image/png', imcat)
-        register_mimerenderer(ipython, 'image/jpeg', imcat)
-        register_mimerenderer(ipython, 'text/latex', mathcat)
-
-This example only work for iterm2 on mac os and skip error handling for brevity.
-One could also invoke an external viewer with ``subporcess.run()`` and a
-tempfile, which is left as an exercise.
-
 So far only the hooks necessary for this are in place, but no default mime
 renderers added; so inline images will only be available via extensions. We will
 progressively enable these features by default in the next few releases, and
 contribution is welcomed.
 
-
-
+We welcome any feedback on the API. See :ref:`shell_mimerenderer` for more
+informations.

From bf42a49afb349be18957d7b115e98f451c9c3af5 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 17 Nov 2019 11:09:48 -0800
Subject: [PATCH 173/370] update code to work with black more recent versions

---
 IPython/terminal/interactiveshell.py | 1 -
 IPython/terminal/shortcuts.py        | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 1a4d5627957..e02cf26a56b 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -269,7 +269,6 @@ def init_display_formatter(self):
         self.display_formatter.ipython_display_formatter.enabled = False
 
     def init_prompt_toolkit_cli(self):
-        self.reformat_handler = lambda x:x
         if self.simple_prompt:
             # Fall back to plain non-interactive output for tests.
             # This is very limited.
diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
index ef0f65c5558..e44e34277e2 100644
--- a/IPython/terminal/shortcuts.py
+++ b/IPython/terminal/shortcuts.py
@@ -129,7 +129,8 @@ def newline_or_execute(event):
        
         # if all we have after the cursor is whitespace: reformat current text
         # before cursor
-        if d.text[d.cursor_position:].isspace():
+        after_cursor = d.text[d.cursor_position:]
+        if not after_cursor.strip():
             reformat_text_before_cursor(b, d, shell)
         if not (d.on_last_line or
                 d.cursor_position_row >= d.line_count - d.empty_line_count_at_the_end()

From e498a4308f88cabc0e2cb264597dea73c91cc49f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 17 Nov 2019 12:14:48 -0800
Subject: [PATCH 174/370] add whats new

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

diff --git a/docs/source/whatsnew/pr/autoformatting.rst b/docs/source/whatsnew/pr/autoformatting.rst
new file mode 100644
index 00000000000..dff810ec766
--- /dev/null
+++ b/docs/source/whatsnew/pr/autoformatting.rst
@@ -0,0 +1,24 @@
+Code autoformatting
+===================
+
+The IPython terminal can now auto format your code just before entering a new
+line or executing a command. To do so use the
+``--TerminalInteractiveShell.autoformatter`` option and set it to ``'black'``;
+if black is installed IPython will use black to format your code when possible. 
+
+IPython cannot always properly format your code; in particular it will
+auto formatting with *black* will only work if:
+
+   - Your code does not contains magics or special python syntax. 
+
+   - There is no code after your cursor. 
+
+The Black API is also still in motion; so this may not work with all versions of
+black. 
+
+It should be possible to register custom reformatter, though the API is till in
+flux. 
+
+
+
+

From 17611ad6ef7a41a6df9f0f655c92b670f01ff14b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 17 Nov 2019 12:35:22 -0800
Subject: [PATCH 175/370] Deprecate some methods the should not be used anymore

And cleanup some code that had no effect/should be unused.
---
 IPython/core/oinspect.py | 46 ++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 749f97959e6..0ad709405de 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -76,7 +76,7 @@ def pylight(code):
                'call_def', 'call_docstring',
                # These won't be printed but will be used to determine how to
                # format the object
-               'ismagic', 'isalias', 'isclass', 'argspec', 'found', 'name'
+               'ismagic', 'isalias', 'isclass', 'found', 'name'
                ]
 
 
@@ -200,26 +200,39 @@ def is_simple_callable(obj):
     return (inspect.isfunction(obj) or inspect.ismethod(obj) or \
             isinstance(obj, _builtin_func_type) or isinstance(obj, _builtin_meth_type))
 
-
+@undoc
 def getargspec(obj):
     """Wrapper around :func:`inspect.getfullargspec` on Python 3, and
     :func:inspect.getargspec` on Python 2.
 
     In addition to functions and methods, this can also handle objects with a
     ``__call__`` attribute.
+
+    DEPRECATED: Deprecated since 7.10. Do not use, will be removed.
     """
+
+    warnings.warn('`getargspec` function is deprecated as of IPython 7.10'
+                  'and will be removed in future versions.', DeprecationWarning, stacklevel=2)
+
     if safe_hasattr(obj, '__call__') and not is_simple_callable(obj):
         obj = obj.__call__
 
     return inspect.getfullargspec(obj)
 
-
+@undoc
 def format_argspec(argspec):
     """Format argspect, convenience wrapper around inspect's.
 
     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.
     """
+    
+    warnings.warn('`format_argspec` function is deprecated as of IPython 7.10'
+                  'and will be removed in future versions.', DeprecationWarning, stacklevel=2)
+
+
     return inspect.formatargspec(argspec['args'], argspec['varargs'],
                                  argspec['varkw'], argspec['defaults'])
 
@@ -916,33 +929,6 @@ def _info(self, obj, oname='', info=None, detail_level=0) -> dict:
                 if call_ds:
                     out['call_docstring'] = call_ds
 
-        # Compute the object's argspec as a callable.  The key is to decide
-        # whether to pull it from the object itself, from its __init__ or
-        # from its __call__ method.
-
-        if inspect.isclass(obj):
-            # Old-style classes need not have an __init__
-            callable_obj = getattr(obj, "__init__", None)
-        elif callable(obj):
-            callable_obj = obj
-        else:
-            callable_obj = None
-
-        if callable_obj is not None:
-            try:
-                argspec = getargspec(callable_obj)
-            except Exception:
-                # For extensions/builtins we can't retrieve the argspec
-                pass
-            else:
-                # named tuples' _asdict() method returns an OrderedDict, but we
-                # we want a normal
-                out['argspec'] = argspec_dict = dict(argspec._asdict())
-                # We called this varkw before argspec became a named tuple.
-                # With getfullargspec it's also called varkw.
-                if 'varkw' not in argspec_dict:
-                    argspec_dict['varkw'] = argspec_dict.pop('keywords')
-
         return object_info(**out)
 
     @staticmethod

From 39b518189261f3b31d59cc9740db502785c3365e Mon Sep 17 00:00:00 2001
From: kousik <kousikmitra12@gmail.com>
Date: Mon, 18 Nov 2019 21:07:43 +0530
Subject: [PATCH 176/370] Removed codepath for Python < 3.6 #11949

---
 IPython/core/interactiveshell.py     | 11 ++---------
 IPython/lib/pretty.py                |  2 +-
 IPython/terminal/interactiveshell.py | 11 -----------
 tools/gen_latex_symbols.py           |  4 ----
 4 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index d1b59d76c0e..3eddd312ea8 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -166,13 +166,7 @@ def removed_co_newlocals(function:types.FunctionType) -> types.FunctionType:
 # 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)
-if sys.version_info > (3, 5):
-    from .async_helpers import _curio_runner, _trio_runner, _should_be_async
-else :
-    _curio_runner = _trio_runner = None
-
-    def _should_be_async(cell:str)->bool:
-        return False
+from .async_helpers import _curio_runner, _trio_runner, _should_be_async
 
 
 def _ast_asyncify(cell:str, wrapper_name:str) -> ast.Module:
@@ -2245,8 +2239,7 @@ def init_magics(self):
             m.NamespaceMagics, m.OSMagics, m.PackagingMagics,
             m.PylabMagics, m.ScriptMagics,
         )
-        if sys.version_info >(3,5):
-            self.register_magics(m.AsyncMagics)
+        self.register_magics(m.AsyncMagics)
 
         # Register Magic Aliases
         mman = self.magics_manager
diff --git a/IPython/lib/pretty.py b/IPython/lib/pretty.py
index 39d23ddcd8a..9d8935e9ee4 100644
--- a/IPython/lib/pretty.py
+++ b/IPython/lib/pretty.py
@@ -99,7 +99,7 @@ def _repr_pretty_(self, p, cycle):
 MAX_SEQ_LENGTH = 1000
 # The language spec says that dicts preserve order from 3.7, but CPython
 # does so from 3.6, so it seems likely that people will expect that.
-DICT_IS_ORDERED = sys.version_info >= (3, 6)
+DICT_IS_ORDERED = True
 _re_pattern_type = type(re.compile(''))
 
 def _safe_getattr(obj, attr, default=None):
diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 0dda4284a8e..9b0ee2bef8b 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -424,21 +424,10 @@ def prompt_for_code(self):
                 **self._extra_prompt_options())
         return text
 
-    def enable_win_unicode_console(self):
-        if sys.version_info >= (3, 6):
-            # Since PEP 528, Python uses the unicode APIs for the Windows
-            # console by default, so WUC shouldn't be needed.
-            return
-
-        import win_unicode_console
-        win_unicode_console.enable()
-
     def init_io(self):
         if sys.platform not in {'win32', 'cli'}:
             return
 
-        self.enable_win_unicode_console()
-
         import colorama
         colorama.init()
 
diff --git a/tools/gen_latex_symbols.py b/tools/gen_latex_symbols.py
index 2f6d339c358..c3fed125109 100644
--- a/tools/gen_latex_symbols.py
+++ b/tools/gen_latex_symbols.py
@@ -11,10 +11,6 @@
 
 import os, sys
 
-if sys.version_info[0] < 3:
-    print("This script must be run with Python 3, exiting...")
-    sys.exit(1)
-
 # Import the Julia LaTeX symbols
 print('Importing latex_symbols.js from Julia...')
 import requests

From aa324b5c104f090d0b24c4293f7488943faec66a Mon Sep 17 00:00:00 2001
From: kousik <kousikmitra12@gmail.com>
Date: Mon, 18 Nov 2019 22:50:23 +0530
Subject: [PATCH 177/370] Removed codepath for Python < 3.6 from test functions
 #11949

---
 IPython/core/tests/test_async_helpers.py    | 531 ++++++++++----------
 IPython/core/tests/test_completer.py        |   7 +-
 IPython/extensions/tests/test_autoreload.py |   1 -
 IPython/lib/tests/test_display.py           |   3 +-
 4 files changed, 269 insertions(+), 273 deletions(-)

diff --git a/IPython/core/tests/test_async_helpers.py b/IPython/core/tests/test_async_helpers.py
index f23eae06acc..2432d8b5e4e 100644
--- a/IPython/core/tests/test_async_helpers.py
+++ b/IPython/core/tests/test_async_helpers.py
@@ -14,298 +14,297 @@
 iprc = lambda x: ip.run_cell(dedent(x)).raise_error()
 iprc_nr = lambda x: ip.run_cell(dedent(x))
 
-if sys.version_info > (3, 5):
-    from IPython.core.async_helpers import _should_be_async
-
-    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(
-                _should_be_async(
-                    dedent(
-                        """
-                async def awaitable():
-                    pass
-            """
-                    )
+from IPython.core.async_helpers import _should_be_async
+
+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(
+            _should_be_async(
+                dedent(
+                    """
+            async def awaitable():
+                pass
+        """
                 )
             )
-
-        def _get_top_level_cases(self):
-            # These are test cases that should be valid in a function
-            # but invalid outside of a function.
-            test_cases = []
-            test_cases.append(('basic', "{val}"))
-
-            # Note, in all conditional cases, I use True instead of
-            # False so that the peephole optimizer won't optimize away
-            # the return, so CPython will see this as a syntax error:
-            #
-            # while True:
-            #    break
-            #    return
-            #
-            # But not this:
-            #
-            # while False:
-            #    return
-            #
-            # See https://bugs.python.org/issue1875
-
-            test_cases.append(('if', dedent("""
-            if True:
+        )
+
+    def _get_top_level_cases(self):
+        # These are test cases that should be valid in a function
+        # but invalid outside of a function.
+        test_cases = []
+        test_cases.append(('basic', "{val}"))
+
+        # Note, in all conditional cases, I use True instead of
+        # False so that the peephole optimizer won't optimize away
+        # the return, so CPython will see this as a syntax error:
+        #
+        # while True:
+        #    break
+        #    return
+        #
+        # But not this:
+        #
+        # while False:
+        #    return
+        #
+        # See https://bugs.python.org/issue1875
+
+        test_cases.append(('if', dedent("""
+        if True:
+            {val}
+        """)))
+
+        test_cases.append(('while', dedent("""
+        while True:
+            {val}
+            break
+        """)))
+
+        test_cases.append(('try', dedent("""
+        try:
+            {val}
+        except:
+            pass
+        """)))
+
+        test_cases.append(('except', dedent("""
+        try:
+            pass
+        except:
+            {val}
+        """)))
+
+        test_cases.append(('finally', dedent("""
+        try:
+            pass
+        except:
+            pass
+        finally:
+            {val}
+        """)))
+
+        test_cases.append(('for', dedent("""
+        for _ in range(4):
+            {val}
+        """)))
+
+
+        test_cases.append(('nested', dedent("""
+        if True:
+            while True:
                 {val}
-            """)))
+                break
+        """)))
 
-            test_cases.append(('while', dedent("""
+        test_cases.append(('deep-nested', dedent("""
+        if True:
             while True:
-                {val}
                 break
-            """)))
+                for x in range(3):
+                    if True:
+                        while True:
+                            for x in range(3):
+                                {val}
+        """)))
 
-            test_cases.append(('try', dedent("""
-            try:
-                {val}
-            except:
-                pass
-            """)))
+        return test_cases
 
-            test_cases.append(('except', dedent("""
-            try:
-                pass
-            except:
-                {val}
-            """)))
+    def _get_ry_syntax_errors(self):
+        # This is a mix of tests that should be a syntax error if
+        # return or yield whether or not they are in a function
 
-            test_cases.append(('finally', dedent("""
-            try:
-                pass
-            except:
-                pass
-            finally:
-                {val}
-            """)))
+        test_cases = []
 
-            test_cases.append(('for', dedent("""
-            for _ in range(4):
+        test_cases.append(('class', dedent("""
+        class V:
+            {val}
+        """)))
+
+        test_cases.append(('nested-class', dedent("""
+        class V:
+            class C:
                 {val}
-            """)))
+        """)))
 
+        return test_cases
 
-            test_cases.append(('nested', dedent("""
-            if True:
-                while True:
-                    {val}
-                    break
-            """)))
 
-            test_cases.append(('deep-nested', dedent("""
-            if True:
-                while True:
+    def test_top_level_return_error(self):
+        tl_err_test_cases = self._get_top_level_cases()
+        tl_err_test_cases.extend(self._get_ry_syntax_errors())
+
+        vals = ('return', 'yield', 'yield from (_ for _ in range(3))',
+                dedent('''
+                    def f():
+                        pass
+                    return
+                    '''),
+                )
+
+        for test_name, test_case in tl_err_test_cases:
+            # This example should work if 'pass' is used as the value
+            with self.subTest((test_name, 'pass')):
+                iprc(test_case.format(val='pass'))
+
+            # It should fail with all the values
+            for val in vals:
+                with self.subTest((test_name, val)):
+                    msg = "Syntax error not raised for %s, %s" % (test_name, val)
+                    with self.assertRaises(SyntaxError, msg=msg):
+                        iprc(test_case.format(val=val))
+
+    def test_in_func_no_error(self):
+        # Test that the implementation of top-level return/yield
+        # detection isn't *too* aggressive, and works inside a function
+        func_contexts = []
+
+        func_contexts.append(('func', False, dedent("""
+        def f():""")))
+
+        func_contexts.append(('method', False, dedent("""
+        class MyClass:
+            def __init__(self):
+        """)))
+
+        func_contexts.append(('async-func', True,  dedent("""
+        async def f():""")))
+
+        func_contexts.append(('async-method', True,  dedent("""
+        class MyClass:
+            async def f(self):""")))
+
+        func_contexts.append(('closure', False, dedent("""
+        def f():
+            def g():
+        """)))
+
+        def nest_case(context, case):
+            # Detect indentation
+            lines = context.strip().splitlines()
+            prefix_len = 0
+            for c in lines[-1]:
+                if c != ' ':
                     break
-                    for x in range(3):
-                        if True:
-                            while True:
-                                for x in range(3):
-                                    {val}
-            """)))
+                prefix_len += 1
 
-            return test_cases
+            indented_case = indent(case, ' ' * (prefix_len + 4))
+            return context + '\n' + indented_case
 
-        def _get_ry_syntax_errors(self):
-            # This is a mix of tests that should be a syntax error if
-            # return or yield whether or not they are in a function
+        # Gather and run the tests
 
-            test_cases = []
+        # 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))
 
-            test_cases.append(('class', dedent("""
-            class V:
-                {val}
-            """)))
-
-            test_cases.append(('nested-class', dedent("""
-            class V:
-                class C:
-                    {val}
-            """)))
-
-            return test_cases
-
-
-        def test_top_level_return_error(self):
-            tl_err_test_cases = self._get_top_level_cases()
-            tl_err_test_cases.extend(self._get_ry_syntax_errors())
-
-            vals = ('return', 'yield', 'yield from (_ for _ in range(3))',
-                    dedent('''
-                        def f():
-                            pass
-                        return
-                        '''),
-                    )
-
-            for test_name, test_case in tl_err_test_cases:
-                # This example should work if 'pass' is used as the value
-                with self.subTest((test_name, 'pass')):
-                    iprc(test_case.format(val='pass'))
-
-                # It should fail with all the values
-                for val in vals:
-                    with self.subTest((test_name, val)):
-                        msg = "Syntax error not raised for %s, %s" % (test_name, val)
-                        with self.assertRaises(SyntaxError, msg=msg):
-                            iprc(test_case.format(val=val))
-
-        def test_in_func_no_error(self):
-            # Test that the implementation of top-level return/yield
-            # detection isn't *too* aggressive, and works inside a function
-            func_contexts = []
-
-            func_contexts.append(('func', False, dedent("""
-            def f():""")))
-
-            func_contexts.append(('method', False, dedent("""
-            class MyClass:
-                def __init__(self):
-            """)))
-
-            func_contexts.append(('async-func', True,  dedent("""
-            async def f():""")))
-
-            func_contexts.append(('async-method', True,  dedent("""
-            class MyClass:
-                async def f(self):""")))
-
-            func_contexts.append(('closure', False, dedent("""
-            def f():
-                def g():
-            """)))
-
-            def nest_case(context, case):
-                # Detect indentation
-                lines = context.strip().splitlines()
-                prefix_len = 0
-                for c in lines[-1]:
-                    if c != ' ':
-                        break
-                    prefix_len += 1
-
-                indented_case = indent(case, ' ' * (prefix_len + 4))
-                return context + '\n' + indented_case
-
-            # Gather and run the tests
-
-            # 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,
-                          sys.version_info >= (3, 6),
-                          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))
-
-            tests = chain(success_tests, failure_tests)
-
-            for context_name, async_func, context in func_contexts:
-                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 or
-                                           (async_func and not async_safe))
-
-                        test_id = (context_name, test_name, val)
-                        cell = nested_case.format(val=val)
-
-                        with self.subTest(test_id):
-                            if val_should_fail:
-                                msg = ("SyntaxError not raised for %s" %
-                                       str(test_id))
-                                with self.assertRaises(SyntaxError, msg=msg):
-                                    iprc(cell)
-
-                                    print(cell)
-                            else:
-                                iprc(cell)
+        success_tests = zip(self._get_top_level_cases(), repeat(False))
+        failure_tests = zip(self._get_ry_syntax_errors(), repeat(True))
 
-        def test_nonlocal(self):
-            # fails if outer scope is not a function scope or if var not defined
-            with self.assertRaises(SyntaxError):
-                iprc("nonlocal x")
-                iprc("""
-                x = 1
-                def f():
-                    nonlocal x
-                    x = 10000
-                    yield x
-                """)
-                iprc("""
-                def f():
-                    def g():
-                        nonlocal x
-                        x = 10000
-                        yield x
-                """)
-
-            # works if outer scope is a function scope and var exists
-            iprc("""
-            def f():
-                x = 20
-                def g():
-                    nonlocal x
-                    x = 10000
-                    yield x
-            """)
+        tests = chain(success_tests, failure_tests)
 
+        for context_name, async_func, context in func_contexts:
+            for (test_name, test_case), should_fail in tests:
+                nested_case = nest_case(context, test_case)
 
-        def test_execute(self):
-            iprc("""
-            import asyncio
-            await asyncio.sleep(0.001)
-            """
-            )
+                for val, async_safe in vals:
+                    val_should_fail = (should_fail or
+                                        (async_func and not async_safe))
 
-        def test_autoawait(self):
-            iprc("%autoawait False")
-            iprc("%autoawait True")
-            iprc("""
-            from asyncio import sleep
-            await sleep(0.1)
-            """
-            )
+                    test_id = (context_name, test_name, val)
+                    cell = nested_case.format(val=val)
 
-        @skip_without('curio')
-        def test_autoawait_curio(self):
-            iprc("%autoawait curio")
+                    with self.subTest(test_id):
+                        if val_should_fail:
+                            msg = ("SyntaxError not raised for %s" %
+                                    str(test_id))
+                            with self.assertRaises(SyntaxError, msg=msg):
+                                iprc(cell)
 
-        @skip_without('trio')
-        def test_autoawait_trio(self):
-            iprc("%autoawait trio")
+                                print(cell)
+                        else:
+                            iprc(cell)
 
-        @skip_without('trio')
-        def test_autoawait_trio_wrong_sleep(self):
-            iprc("%autoawait trio")
-            res = iprc_nr("""
-            import asyncio
-            await asyncio.sleep(0)
+    def test_nonlocal(self):
+        # fails if outer scope is not a function scope or if var not defined
+        with self.assertRaises(SyntaxError):
+            iprc("nonlocal x")
+            iprc("""
+            x = 1
+            def f():
+                nonlocal x
+                x = 10000
+                yield x
             """)
-            with nt.assert_raises(TypeError):
-                res.raise_error()
-
-        @skip_without('trio')
-        def test_autoawait_asyncio_wrong_sleep(self):
-            iprc("%autoawait asyncio")
-            res = iprc_nr("""
-            import trio
-            await trio.sleep(0)
+            iprc("""
+            def f():
+                def g():
+                    nonlocal x
+                    x = 10000
+                    yield x
             """)
-            with nt.assert_raises(RuntimeError):
-                res.raise_error()
-
 
-        def tearDown(self):
-            ip.loop_runner = "asyncio"
+        # works if outer scope is a function scope and var exists
+        iprc("""
+        def f():
+            x = 20
+            def g():
+                nonlocal x
+                x = 10000
+                yield x
+        """)
+
+
+    def test_execute(self):
+        iprc("""
+        import asyncio
+        await asyncio.sleep(0.001)
+        """
+        )
+
+    def test_autoawait(self):
+        iprc("%autoawait False")
+        iprc("%autoawait True")
+        iprc("""
+        from asyncio import sleep
+        await sleep(0.1)
+        """
+        )
+
+    @skip_without('curio')
+    def test_autoawait_curio(self):
+        iprc("%autoawait curio")
+
+    @skip_without('trio')
+    def test_autoawait_trio(self):
+        iprc("%autoawait trio")
+
+    @skip_without('trio')
+    def test_autoawait_trio_wrong_sleep(self):
+        iprc("%autoawait trio")
+        res = iprc_nr("""
+        import asyncio
+        await asyncio.sleep(0)
+        """)
+        with nt.assert_raises(TypeError):
+            res.raise_error()
+
+    @skip_without('trio')
+    def test_autoawait_asyncio_wrong_sleep(self):
+        iprc("%autoawait asyncio")
+        res = iprc_nr("""
+        import trio
+        await trio.sleep(0)
+        """)
+        with nt.assert_raises(RuntimeError):
+            res.raise_error()
+
+
+    def tearDown(self):
+        ip.loop_runner = "asyncio"
diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py
index 5f2210d4d32..2920d453936 100644
--- a/IPython/core/tests/test_completer.py
+++ b/IPython/core/tests/test_completer.py
@@ -485,10 +485,9 @@ def _(line, cursor_pos, expect, message, completion):
                 5, 6, "real"
             )
 
-            if sys.version_info > (3, 4):
-                yield _, "a[0].from_", 10, "a[0].from_bytes", "Should have completed on a[0].from_: %s", Completion(
-                    5, 10, "from_bytes"
-                )
+            yield _, "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):
         # also happens to test IPCompleter as a configurable
diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index 6300b1b67fe..fe62db0c353 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -140,7 +140,6 @@ def pickle_get_current_class(obj):
 
 class TestAutoreload(Fixture):
 
-    @skipif(sys.version_info < (3, 6))
     def test_reload_enums(self):
         import enum
         mod_name, mod_fn = self.new_module(textwrap.dedent("""
diff --git a/IPython/lib/tests/test_display.py b/IPython/lib/tests/test_display.py
index f56aca4b43b..533bb46d059 100644
--- a/IPython/lib/tests/test_display.py
+++ b/IPython/lib/tests/test_display.py
@@ -49,8 +49,7 @@ def test_instantiation_FileLink():
     """FileLink: Test class can be instantiated"""
     fl = display.FileLink('example.txt')
     # TODO: remove if when only Python >= 3.6 is supported
-    if sys.version_info >= (3, 6):
-        fl = display.FileLink(pathlib.PurePath('example.txt'))
+    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

From 747cdeb276ec8c88ad646b809882c11bd63543e9 Mon Sep 17 00:00:00 2001
From: kousik <kousikmitra12@gmail.com>
Date: Wed, 20 Nov 2019 10:34:15 +0530
Subject: [PATCH 178/370] Added deprecation warning for
 enable_win_unicode_console #11953

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

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 9b0ee2bef8b..5a0aac8db20 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -424,6 +424,14 @@ def prompt_for_code(self):
                 **self._extra_prompt_options())
         return text
 
+    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)
+
     def init_io(self):
         if sys.platform not in {'win32', 'cli'}:
             return

From f612098348e7b6f8dddbc8eca767f681db458a23 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Thu, 21 Nov 2019 11:14:00 -0800
Subject: [PATCH 179/370] 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 eda16142674..0fb2ffd9862 100644
--- a/docs/source/config/shell_mimerenderer.rst
+++ b/docs/source/config/shell_mimerenderer.rst
@@ -56,5 +56,5 @@ to png, before displaying it inline for iterm2 on macOS ::
         register_mimerenderer(ipython, 'text/latex', mathcat)
 
 This example only work for iterm2 on macOS and skip error handling for brevity.
-One could also invoke an external viewer with ``subporcess.run()`` and a
+One could also invoke an external viewer with ``subprocess.run()`` and a
 temporary file, which is left as an exercise.

From 172dc6b7786c612786c130af3eaeb92e60ad7ebb Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Thu, 21 Nov 2019 11:29:08 -0800
Subject: [PATCH 180/370] Thanks original work

---
 docs/source/whatsnew/pr/mimerenderer.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/source/whatsnew/pr/mimerenderer.rst b/docs/source/whatsnew/pr/mimerenderer.rst
index 58d474a1515..339905f58e1 100644
--- a/docs/source/whatsnew/pr/mimerenderer.rst
+++ b/docs/source/whatsnew/pr/mimerenderer.rst
@@ -17,3 +17,6 @@ contribution is welcomed.
 
 We welcome any feedback on the API. See :ref:`shell_mimerenderer` for more
 informations.
+
+This is originally based on work form in :ghpull:`10610` from stephanh42
+started over two years ago, and still a lot need to be done.

From dffa2c33dea3ecc09256a66a6ddbc876ce0629a9 Mon Sep 17 00:00:00 2001
From: grey275 <pjvanderpol@gmail.com>
Date: Thu, 21 Nov 2019 12:18:13 -0800
Subject: [PATCH 181/370] remove unchanging boolean DICT_IS_ORDERED and
 dependent unreachable code

---
 IPython/lib/pretty.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/IPython/lib/pretty.py b/IPython/lib/pretty.py
index 9d8935e9ee4..49c76ad902e 100644
--- a/IPython/lib/pretty.py
+++ b/IPython/lib/pretty.py
@@ -97,9 +97,6 @@ def _repr_pretty_(self, p, cycle):
 
 
 MAX_SEQ_LENGTH = 1000
-# The language spec says that dicts preserve order from 3.7, but CPython
-# does so from 3.6, so it seems likely that people will expect that.
-DICT_IS_ORDERED = True
 _re_pattern_type = type(re.compile(''))
 
 def _safe_getattr(obj, attr, default=None):
@@ -606,11 +603,6 @@ def inner(obj, p, cycle):
         step = len(start)
         p.begin_group(step, start)
         keys = obj.keys()
-        # if dict isn't large enough to be truncated, sort keys before displaying
-        # From Python 3.7, dicts preserve order by definition, so we don't sort.
-        if not DICT_IS_ORDERED \
-                and not (p.max_seq_length and len(obj) >= p.max_seq_length):
-            keys = _sorted_for_pprint(keys)
         for idx, key in p._enumerate(keys):
             if idx:
                 p.text(',')

From 0c371883a01eafe804e9c4b6b0971b069111fd1e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Thu, 21 Nov 2019 15:26:52 -0800
Subject: [PATCH 182/370] Update readme with links to (som) similar projects.

---
 README.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.rst b/README.rst
index 9899a538544..3e13610a443 100644
--- a/README.rst
+++ b/README.rst
@@ -117,3 +117,15 @@ version::
         ...
         install_requires=install_req
     )
+
+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.
+- `bpython <https://bpython-interpreter.org/>`_
+- `mypython <https://www.asmeurer.com/mypython/>`_
+- `ptpython and ptipython <https://pypi.org/project/ptpython/>`
+- `xonsh <https://xon.sh/>`

From 13e486ebe73887527d34fea748233d9fce1268cc Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 22 Nov 2019 09:43:14 -0800
Subject: [PATCH 183/370] Add a failing test if we %run something with
 multiprocessing

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

diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index 42f2e5c422e..38d71b31740 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -539,6 +539,35 @@ def test_run_tb():
         del ip.user_ns['bar']
         del ip.user_ns['foo']
 
+
+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
+    the issue.
+    """
+    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')
+            with open(path, 'w') as f:
+                f.write("import multiprocessing\nprint('hoy')")
+            with capture_output() as io:
+                _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)
+        except:
+            raise
+        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`"""

From 13441028e1d087c9ecf96d9fe4349a0e82350afc Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Fri, 22 Nov 2019 09:45:02 -0800
Subject: [PATCH 184/370] Fix the issue with  %run-ing something with
 multiprocessing

This should fix gh-9978 and gh-11941
---
 IPython/core/magics/execution.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index d9e66b545a7..438d0b5f0ad 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -853,6 +853,8 @@ def run():
             sys.argv = save_argv
             if restore_main:
                 sys.modules['__main__'] = restore_main
+                if '__mp_main__' in sys.modules:
+                    sys.modules['__mp_main__'] = restore_main
             else:
                 # Remove from sys.modules the reference to main_mod we'd
                 # added.  Otherwise it will trap references to objects

From c16c0a7be7b43423001e7b9b0ef8c97d26d69667 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 24 Nov 2019 12:20:45 -0800
Subject: [PATCH 185/370] Update the what's new.

---
 docs/source/whatsnew/development.rst          | 61 ++++++++++++++++++-
 docs/source/whatsnew/pr/autoformatting.rst    | 24 --------
 docs/source/whatsnew/pr/mimerenderer.rst      | 22 -------
 .../pr/prompt-update-modifications.rst        | 14 -----
 4 files changed, 60 insertions(+), 61 deletions(-)
 delete mode 100644 docs/source/whatsnew/pr/autoformatting.rst
 delete mode 100644 docs/source/whatsnew/pr/mimerenderer.rst
 delete mode 100644 docs/source/whatsnew/pr/prompt-update-modifications.rst

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index 27afd6f5d0e..e2d90affc74 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -24,10 +24,69 @@ Need to be updated:
 
 
 
+Prompt Rendering Performance improvements
+=========================================
+
+Pull Request :ghpull:`11933` introduced an optimisation in the prompt rendering
+logic that should decrease the resource usage of IPython when using the
+_default_ configuration but could potentially introduce a regression of
+functionalities if you are using a custom prompt.
+
+We know assume if you haven't changed the default keybindings that the prompt
+**will not change** during the duration of your input – which is for example
+not true when using vi insert mode that switches between `[ins]` and `[nor]`
+for the current mode.
+
+If you are experiencing any issue let us know.
+
+Code autoformatting
+===================
+
+The IPython terminal can now auto format your code just before entering a new
+line or executing a command. To do so use the
+``--TerminalInteractiveShell.autoformatter`` option and set it to ``'black'``;
+if black is installed IPython will use black to format your code when possible.
+
+IPython cannot always properly format your code; in particular it will
+auto formatting with *black* will only work if:
+
+   - Your code does not contains magics or special python syntax.
+
+   - There is no code after your cursor.
+
+The Black API is also still in motion; so this may not work with all versions of
+black.
+
+It should be possible to register custom reformatter, though the API is till in
+flux.
+
+Arbitrary Mimetypes Handing in Terminal
+=======================================
+
+When using IPython terminal it is now possible to register function to handle
+arbitrary mimetypes. While rendering non-text based representation was possible in
+many jupyter frontend; it was not possible in terminal IPython, as usually
+terminal are limited to displaying text. As many terminal these days provide
+escape sequences to display non-text; bringing this loved feature to IPython CLI
+made a lot of sens. This functionality will not only allow inline images; but
+allow opening of external program; for example ``mplayer`` to "display" sound
+files.
+
+So far only the hooks necessary for this are in place, but no default mime
+renderers added; so inline images will only be available via extensions. We will
+progressively enable these features by default in the next few releases, and
+contribution is welcomed.
+
+We welcome any feedback on the API. See :ref:`shell_mimerenderer` for more
+informations.
+
+This is originally based on work form in :ghpull:`10610` from stephanh42
+started over two years ago, and still a lot need to be done.
+
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 
 
 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/autoformatting.rst b/docs/source/whatsnew/pr/autoformatting.rst
deleted file mode 100644
index dff810ec766..00000000000
--- a/docs/source/whatsnew/pr/autoformatting.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-Code autoformatting
-===================
-
-The IPython terminal can now auto format your code just before entering a new
-line or executing a command. To do so use the
-``--TerminalInteractiveShell.autoformatter`` option and set it to ``'black'``;
-if black is installed IPython will use black to format your code when possible. 
-
-IPython cannot always properly format your code; in particular it will
-auto formatting with *black* will only work if:
-
-   - Your code does not contains magics or special python syntax. 
-
-   - There is no code after your cursor. 
-
-The Black API is also still in motion; so this may not work with all versions of
-black. 
-
-It should be possible to register custom reformatter, though the API is till in
-flux. 
-
-
-
-
diff --git a/docs/source/whatsnew/pr/mimerenderer.rst b/docs/source/whatsnew/pr/mimerenderer.rst
deleted file mode 100644
index 339905f58e1..00000000000
--- a/docs/source/whatsnew/pr/mimerenderer.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-Arbitrary Mimetypes Handing in Terminal
-=======================================
-
-When using IPython terminal it is now possible to register function to handle
-arbitrary mimetypes. While rendering non-text based representation was possible in
-many jupyter frontend; it was not possible in terminal IPython, as usually
-terminal are limited to displaying text. As many terminal these days provide
-escape sequences to display non-text; bringing this loved feature to IPython CLI
-made a lot of sens. This functionality will not only allow inline images; but
-allow opening of external program; for example ``mplayer`` to "display" sound
-files.
-
-So far only the hooks necessary for this are in place, but no default mime
-renderers added; so inline images will only be available via extensions. We will
-progressively enable these features by default in the next few releases, and
-contribution is welcomed.
-
-We welcome any feedback on the API. See :ref:`shell_mimerenderer` for more
-informations.
-
-This is originally based on work form in :ghpull:`10610` from stephanh42
-started over two years ago, and still a lot need to be done.
diff --git a/docs/source/whatsnew/pr/prompt-update-modifications.rst b/docs/source/whatsnew/pr/prompt-update-modifications.rst
deleted file mode 100644
index 77d557b8936..00000000000
--- a/docs/source/whatsnew/pr/prompt-update-modifications.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-Prompt Rendering Performance improvements
-=========================================
-
-Pull Request :ghpull:`11933` introduced an optimisation in the prompt rendering
-logic that should decrease the resource usage of IPython when using the
-_default_ configuration but could potentially introduce a regression of
-functionalities if you are using a custom prompt.
-
-We know assume if you haven't changed the default keybindings that the prompt
-**will not change** during the duration of your input – which is for example
-not true when using vi insert mode that switches between `[ins]` and `[nor]`
-for the current mode.
-
-If you are experiencing any issue let us know.

From aaa90f97ebd2db14b1f25b37a0e5af22c643b01d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 24 Nov 2019 13:27:11 -0800
Subject: [PATCH 186/370] some more update to wn and migrate to the right file

---
 docs/source/whatsnew/development.rst | 65 +------------------
 docs/source/whatsnew/version7.rst    | 96 ++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 63 deletions(-)

diff --git a/docs/source/whatsnew/development.rst b/docs/source/whatsnew/development.rst
index e2d90affc74..9d4493a3a53 100644
--- a/docs/source/whatsnew/development.rst
+++ b/docs/source/whatsnew/development.rst
@@ -11,7 +11,7 @@ This document describes in-flight development work.
     `docs/source/whatsnew/pr` folder
 
 
-Released .... ...., 2017
+Released .... ...., 2019
 
 
 Need to be updated:
@@ -22,71 +22,10 @@ Need to be updated:
 
    pr/*
 
-
-
-Prompt Rendering Performance improvements
-=========================================
-
-Pull Request :ghpull:`11933` introduced an optimisation in the prompt rendering
-logic that should decrease the resource usage of IPython when using the
-_default_ configuration but could potentially introduce a regression of
-functionalities if you are using a custom prompt.
-
-We know assume if you haven't changed the default keybindings that the prompt
-**will not change** during the duration of your input – which is for example
-not true when using vi insert mode that switches between `[ins]` and `[nor]`
-for the current mode.
-
-If you are experiencing any issue let us know.
-
-Code autoformatting
-===================
-
-The IPython terminal can now auto format your code just before entering a new
-line or executing a command. To do so use the
-``--TerminalInteractiveShell.autoformatter`` option and set it to ``'black'``;
-if black is installed IPython will use black to format your code when possible.
-
-IPython cannot always properly format your code; in particular it will
-auto formatting with *black* will only work if:
-
-   - Your code does not contains magics or special python syntax.
-
-   - There is no code after your cursor.
-
-The Black API is also still in motion; so this may not work with all versions of
-black.
-
-It should be possible to register custom reformatter, though the API is till in
-flux.
-
-Arbitrary Mimetypes Handing in Terminal
-=======================================
-
-When using IPython terminal it is now possible to register function to handle
-arbitrary mimetypes. While rendering non-text based representation was possible in
-many jupyter frontend; it was not possible in terminal IPython, as usually
-terminal are limited to displaying text. As many terminal these days provide
-escape sequences to display non-text; bringing this loved feature to IPython CLI
-made a lot of sens. This functionality will not only allow inline images; but
-allow opening of external program; for example ``mplayer`` to "display" sound
-files.
-
-So far only the hooks necessary for this are in place, but no default mime
-renderers added; so inline images will only be available via extensions. We will
-progressively enable these features by default in the next few releases, and
-contribution is welcomed.
-
-We welcome any feedback on the API. See :ref:`shell_mimerenderer` for more
-informations.
-
-This is originally based on work form in :ghpull:`10610` from stephanh42
-started over two years ago, and still a lot need to be done.
-
 .. DO NOT EDIT THIS LINE BEFORE RELEASE. FEATURE INSERTION POINT.
 
 
 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.
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 520ad110f61..7cf432004f2 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,8 +2,104 @@
  7.x Series
 ============
 
+IPython 7.10.0
+==============
+
+IPython 7.10 is the first double digit minor release in the  last decade, and
+first since the release of IPython 1.0, previous double digit minor release was
+in August 2009.
+
+We've been trying to give you regular release on the last Friday of every month
+for a guaranty of rapid access to bug fixes and new features.
+
+Unlike the previous first few releases that have seen only a couple of code
+changes, 7.10 bring a number of changes, new features and bugfixes.
+
+Stop Support for Python 3.5 – Adopt NEP 29
+------------------------------------------
+
+IPython has decided to follow the informational `NEP 29
+<https://numpy.org/neps/nep-0029-deprecation_policy.html>`_ which layout a clear
+policy as to which version of (C)Python and NumPy are supported.
+
+We thus dropped support for Python 3.5, and cleaned up a number of code path
+that were Python-version dependant. If you are on 3.5 or earlier pip should
+automatically give you the latest compatible version of IPython so you do not
+need to pin to a given version.
+
+
+Prompt Rendering Performance improvements
+-----------------------------------------
+
+Pull Request :ghpull:`11933` introduced an optimisation in the prompt rendering
+logic that should decrease the resource usage of IPython when using the
+_default_ configuration but could potentially introduce a regression of
+functionalities if you are using a custom prompt.
+
+We know assume if you haven't changed the default keybindings that the prompt
+**will not change** during the duration of your input – which is for example
+not true when using vi insert mode that switches between `[ins]` and `[nor]`
+for the current mode.
+
+If you are experiencing any issue let us know.
+
+Code autoformatting
+-------------------
+
+The IPython terminal can now auto format your code just before entering a new
+line or executing a command. To do so use the
+``--TerminalInteractiveShell.autoformatter`` option and set it to ``'black'``;
+if black is installed IPython will use black to format your code when possible.
+
+IPython cannot always properly format your code; in particular it will
+auto formatting with *black* will only work if:
+
+   - Your code does not contains magics or special python syntax.
+
+   - There is no code after your cursor.
+
+The Black API is also still in motion; so this may not work with all versions of
+black.
+
+It should be possible to register custom reformatter, though the API is till in
+flux.
+
+Arbitrary Mimetypes Handing in Terminal
+---------------------------------------
+
+When using IPython terminal it is now possible to register function to handle
+arbitrary mimetypes. While rendering non-text based representation was possible in
+many jupyter frontend; it was not possible in terminal IPython, as usually
+terminal are limited to displaying text. As many terminal these days provide
+escape sequences to display non-text; bringing this loved feature to IPython CLI
+made a lot of sens. This functionality will not only allow inline images; but
+allow opening of external program; for example ``mplayer`` to "display" sound
+files.
+
+So far only the hooks necessary for this are in place, but no default mime
+renderers added; so inline images will only be available via extensions. We will
+progressively enable these features by default in the next few releases, and
+contribution is welcomed.
+
+We welcome any feedback on the API. See :ref:`shell_mimerenderer` for more
+informations.
+
+This is originally based on work form in :ghpull:`10610` from stephanh42
+started over two years ago, and still a lot need to be done.
+
+MISC
+----
+
+ - Completions can define their own ordering :ghpull:`11855`
+ - Enable Plotting in the same cell than the one that import matplotlib
+   :ghpull:`11916`
+ - Allow to store and restore multiple variables at once :ghpull:`11930`
+
 .. _version 790:
 
+IPython 7.9.0
+=============
+
 IPython 7.9 is a small release with a couple of improvement and bug fixes.
 
  - Xterm terminal title should be restored on exit :ghpull:`11910`

From ff71f9f50d7ab15e40672e1663f9db6884e12c0c Mon Sep 17 00:00:00 2001
From: anatoly techtonik <techtonik@gmail.com>
Date: Mon, 25 Nov 2019 20:35:21 +0300
Subject: [PATCH 187/370] Expand docs on how cells are executed

---
 docs/source/development/execution.rst | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/docs/source/development/execution.rst b/docs/source/development/execution.rst
index 3d5351bd0d3..817bfd5d8d5 100644
--- a/docs/source/development/execution.rst
+++ b/docs/source/development/execution.rst
@@ -1,13 +1,14 @@
 .. _execution_semantics:
 
-Execution semantics in the IPython kernel
-=========================================
+Execution of cells in the IPython kernel
+========================================
 
-The execution of user code consists of the following phases:
+When IPython kernel receives `execute_request <https://jupyter-client.readthedocs.io/en/latest/messaging.html#execute>`_
+with user code, it processes the message in the following phases:
 
 1. Fire the ``pre_execute`` event.
 2. Fire the ``pre_run_cell`` event unless silent is ``True``.
-3. Execute the ``code`` field, see below for details.
+3. Execute ``run_cell`` method to preprocess ``code``, compile and run it, see below for details.
 4. If execution succeeds, expressions in ``user_expressions`` are computed.
    This ensures that any error in the expressions don't affect the main code execution.
 5. Fire the ``post_execute`` event.
@@ -18,9 +19,15 @@ The execution of user code consists of the following phases:
     :doc:`/config/callbacks`
 
 
-To understand how the ``code`` field is executed, one must know that Python
-code can be compiled in one of three modes (controlled by the ``mode`` argument
-to the :func:`compile` builtin):
+Running user ``code``
+=====================
+
+First, the ``code`` cell is transformed to expand ``%magic`` and ``!system``
+by ``IPython.core.inputtransformer2``. Then is being compiled using standard
+Python :func:`compile` function and executed.
+
+Not specific to IPython, all Python code can be compiled in one of three modes
+(see ``mode`` argument to the standard :func:`compile` function):
 
 *single*
   Valid for a single interactive statement (though the source can contain
@@ -50,16 +57,16 @@ execution in 'single' mode, and then:
 
 - If there is more than one block:
 
-  * if the last one is a single line long, run all but the last in 'exec' mode
+  * if the last block is a single line long, run all but the last in 'exec' mode
     and the very last one in 'single' mode.  This makes it easy to type simple
     expressions at the end to see computed values.
 
-  * if the last one is no more than two lines long, run all but the last in
+  * if the last block is no more than two lines long, run all but the last in
     'exec' mode and the very last one in 'single' mode.  This makes it easy to
     type simple expressions at the end to see computed values.  - otherwise
     (last one is also multiline), run all in 'exec' mode
 
-  * otherwise (last one is also multiline), run all in 'exec' mode as a single
+  * otherwise (last block is also multiline), run all in 'exec' mode as a single
     unit.
 
 

From 7382f0c50e144bc0d9dee77336a7edbefcb0afbd Mon Sep 17 00:00:00 2001
From: anatoly techtonik <techtonik@gmail.com>
Date: Mon, 25 Nov 2019 20:40:52 +0300
Subject: [PATCH 188/370] Fill in some missing words

---
 docs/source/development/execution.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/source/development/execution.rst b/docs/source/development/execution.rst
index 817bfd5d8d5..73e386d5c8e 100644
--- a/docs/source/development/execution.rst
+++ b/docs/source/development/execution.rst
@@ -23,11 +23,11 @@ Running user ``code``
 =====================
 
 First, the ``code`` cell is transformed to expand ``%magic`` and ``!system``
-by ``IPython.core.inputtransformer2``. Then is being compiled using standard
-Python :func:`compile` function and executed.
+commands by ``IPython.core.inputtransformer2``. Then expanded cell is compiled
+using standard Python :func:`compile` function and executed.
 
-Not specific to IPython, all Python code can be compiled in one of three modes
-(see ``mode`` argument to the standard :func:`compile` function):
+Python :func:`compile` function provides ``mode`` argument to select one
+of three ways of compiling code:
 
 *single*
   Valid for a single interactive statement (though the source can contain

From c2a5384f364ecc5dded4ad892f13527880ae8517 Mon Sep 17 00:00:00 2001
From: Jonathan Slenders <jonathan@slenders.be>
Date: Tue, 14 May 2019 22:45:27 +0200
Subject: [PATCH 189/370] Support prompt_toolkit 3.0 as well.

---
 IPython/terminal/interactiveshell.py | 19 +++++++++++++++++--
 setup.py                             |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 7970ced9041..a185915f387 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -25,6 +25,7 @@
 from prompt_toolkit.shortcuts import PromptSession, CompleteStyle, print_formatted_text
 from prompt_toolkit.styles import DynamicStyle, merge_styles
 from prompt_toolkit.styles.pygments import style_from_pygments_cls, style_from_pygments_dict
+from prompt_toolkit import __version__ as ptk_version
 
 from pygments.styles import get_style_by_name
 from pygments.style import Style
@@ -38,6 +39,7 @@
 from .shortcuts import create_ipython_shortcuts
 
 DISPLAY_BANNER_DEPRECATED = object()
+PTK3 = ptk_version.startswith('3.')
 
 
 class _NoStyle(Style): pass
@@ -415,7 +417,7 @@ def get_message():
             # work around this.
             get_message = get_message()
 
-        return {
+        options = {
                 'complete_in_thread': False,
                 'lexer':IPythonPTLexer(),
                 'reserve_space_for_menu':self.space_for_menu,
@@ -432,8 +434,11 @@ def get_message():
                         processor=HighlightMatchingBracketProcessor(chars='[](){}'),
                         filter=HasFocus(DEFAULT_BUFFER) & ~IsDone() &
                             Condition(lambda: self.highlight_matching_brackets))],
-                'inputhook': self.inputhook,
                 }
+        if not PTK3:
+            options['inputhook'] = self.inputhook
+
+        return options
 
     def prompt_for_code(self):
         if self.rl_next_input:
@@ -559,6 +564,16 @@ def enable_gui(self, gui=None):
         else:
             self.active_eventloop = self._inputhook = None
 
+        # For prompt_toolkit 3.0. We have to create an asyncio event loop with
+        # this inputhook.
+        if PTK3:
+            if self._inputhook:
+                from prompt_toolkit.eventloop import set_eventloop_with_inputhook
+                set_eventloop_with_inputhook(self._inputhook)
+            else:
+                import asyncio
+                asyncio.set_event_loop(asyncio.new_event_loop())
+
     # Run !system commands directly, not through pipes, so terminal programs
     # work correctly.
     system = InteractiveShell.system_raw
diff --git a/setup.py b/setup.py
index 638446de9e0..022520db442 100755
--- a/setup.py
+++ b/setup.py
@@ -190,7 +190,7 @@
     'decorator',
     'pickleshare',
     'traitlets>=4.2',
-    'prompt_toolkit>=2.0.0,<2.1.0',
+    'prompt_toolkit>=2.0.0,<3.1.0',
     'pygments',
     'backcall',
 ]

From 6ba2738be374b724bce99df8538297e441ab2c28 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 26 Nov 2019 09:48:37 -0800
Subject: [PATCH 190/370] update whats new

---
 docs/source/whatsnew/version7.rst | 47 +++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 7cf432004f2..af17dec8e06 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -27,6 +27,14 @@ that were Python-version dependant. If you are on 3.5 or earlier pip should
 automatically give you the latest compatible version of IPython so you do not
 need to pin to a given version.
 
+Support for Prompt Toolkit 3.0
+------------------------------
+
+Prompt Toolkit 3.0 was release a week before IPython 7.10 and introduces a few
+breaking changes. We believe IPython 7.10 should be compatible with both Prompt
+Toolkit 2.x and 3.x, though it has not been extensively tested with 3.x so
+please report any issues.
+
 
 Prompt Rendering Performance improvements
 -----------------------------------------
@@ -61,11 +69,11 @@ auto formatting with *black* will only work if:
 The Black API is also still in motion; so this may not work with all versions of
 black.
 
-It should be possible to register custom reformatter, though the API is till in
+It should be possible to register custom formatter, though the API is till in
 flux.
 
-Arbitrary Mimetypes Handing in Terminal
----------------------------------------
+Arbitrary Mimetypes Handing in Terminal (Aka inline images in terminal)
+-----------------------------------------------------------------------
 
 When using IPython terminal it is now possible to register function to handle
 arbitrary mimetypes. While rendering non-text based representation was possible in
@@ -84,7 +92,7 @@ contribution is welcomed.
 We welcome any feedback on the API. See :ref:`shell_mimerenderer` for more
 informations.
 
-This is originally based on work form in :ghpull:`10610` from stephanh42
+This is originally based on work form in :ghpull:`10610` from @stephanh42
 started over two years ago, and still a lot need to be done.
 
 MISC
@@ -95,6 +103,33 @@ MISC
    :ghpull:`11916`
  - Allow to store and restore multiple variables at once :ghpull:`11930`
 
+You can see `all pull-requests <https://github.com/ipython/ipython/pulls?q=is%3Apr+milestone%3A7.10+is%3Aclosed>`_ for this release.
+
+API Changes
+-----------
+
+Change of API and exposed objects automatically detected using `frappuccino <https://pypi.org/project/frappuccino/>`_ :
+
+The following items are new in IPython 7.10:
+    + IPython.terminal.shortcuts.reformat_text_before_cursor
+    + IPython.terminal.prompts.RichPromptDisplayHook.write_format_data
+    + IPython.terminal.interactiveshell.black_reformat_handler
+
+The following signatures differ between 7.9 and 7.10:
+
+    - IPython.extensions.storemagic.restore_aliases(ip)
+    + IPython.extensions.storemagic.restore_aliases(ip, alias='None')
+
+Special Thanks
+--------------
+
+ - @stephanh42 who started the work on inline images in terminal 2 years ago
+ - @augustogoulart who spent a lot of time triaging issues and responding to
+   users.
+ - @con-f-use who is my (@Carreau) first sponsor on GitHub, as a reminder if you
+   like IPython, Jupyter and many other library of the SciPy stack you can
+   donate to numfocus.org non profit
+
 .. _version 790:
 
 IPython 7.9.0
@@ -109,12 +144,12 @@ IPython 7.9 is a small release with a couple of improvement and bug fixes.
    find all objects needing reload. This should avoid large objects traversal
    like pandas dataframes. :ghpull:`11876`
  - Get ready for Python 4. :ghpull:`11874`
- - `%env` Magic nonw has euristic to hide potentially sensitive values :ghpull:`11896`
+ - `%env` Magic now has heuristic to hide potentially sensitive values :ghpull:`11896`
 
 This is a small release despite a number of Pull Request Pending that need to
 be reviewed/worked on. Many of the core developers have been busy outside of
 IPython/Jupyter and we thanks all contributor for their patience; we'll work on
-these as soon as we have time. 
+these as soon as we have time.
 
 
 .. _version780:

From c671abf59674b09c92ff570dadbd3c97565286f7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 26 Nov 2019 13:40:22 -0800
Subject: [PATCH 191/370] update changes in API

---
 docs/source/whatsnew/version7.rst | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index af17dec8e06..6c3dbab387a 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -108,14 +108,20 @@ You can see `all pull-requests <https://github.com/ipython/ipython/pulls?q=is%3A
 API Changes
 -----------
 
-Change of API and exposed objects automatically detected using `frappuccino <https://pypi.org/project/frappuccino/>`_ :
+Change of API and exposed objects automatically detected using `frappuccino <https://pypi.org/project/frappuccino/>`_ (still in beta):
 
-The following items are new in IPython 7.10:
-    + IPython.terminal.shortcuts.reformat_text_before_cursor
-    + IPython.terminal.prompts.RichPromptDisplayHook.write_format_data
-    + IPython.terminal.interactiveshell.black_reformat_handler
+The following items are new in IPython 7.10::
 
-The following signatures differ between 7.9 and 7.10:
+    + IPython.terminal.shortcuts.reformat_text_before_cursor(buffer, document, shell)
+    + IPython.terminal.interactiveshell.PTK3
+    + IPython.terminal.interactiveshell.black_reformat_handler(text_before_cursor)
+    + IPython.terminal.prompts.RichPromptDisplayHook.write_format_data(self, format_dict, md_dict='None')
+
+The following items have been removed in 7.10::
+
+    - IPython.lib.pretty.DICT_IS_ORDERED
+
+The following signatures differ between versions::
 
     - IPython.extensions.storemagic.restore_aliases(ip)
     + IPython.extensions.storemagic.restore_aliases(ip, alias='None')

From d5e408bdc738e3320fc6110f32c08fcb2fe83d93 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 27 Nov 2019 15:16:03 -0800
Subject: [PATCH 192/370] update github stats

---
 docs/source/whatsnew/github-stats-7.rst | 27 +++++++++++++++++++++++++
 tools/release_helper.sh                 |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index 23ff55c83f9..0d8b28bcc4a 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -1,6 +1,33 @@
 Issues closed in the 7.x development cycle
 ==========================================
 
+Issues closed in 7.10
+---------------------
+
+GitHub stats for 2019/10/25 - 2019/11/27 (tag: 7.9.0)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 4 issues and merged 22 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A7.10>`__
+
+The following 15 authors contributed 101 commits.
+
+* anatoly techtonik
+* Ben Lewis
+* Benjamin Ragan-Kelley
+* Gerrit Buss
+* grey275
+* Gökcen Eraslan
+* Jonathan Slenders
+* Joris Van den Bossche
+* kousik
+* Matthias Bussonnier
+* Nicholas Bollweg
+* Paul McCarthy
+* Srinivas Reddy Thatiparthy
+* Timo Kaufmann
+* Tony Fast
 
 Issues closed in 7.9
 --------------------
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 67ce086859f..92e59ae532f 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -42,7 +42,7 @@ echo $BLUE"here are all the authors that contributed to this release:"$NOR
 git log --format="%aN <%aE>" $PREV_RELEASE... | sort -u -f
 
 echo 
-echo $BLUE"If you see any duplicates cancel (Ctrl-C), then edit .mailmap."$GREEN"Press enter to continue:"$NOR
+echo $BLUE"If you see any duplicates cancel (Ctrl-C), then edit .mailmap.\n"$GREEN"Press enter to continue:"$NOR
 read
 
 echo $BLUE"generating stats"$NOR

From cd9f5228dcee55d170f22e55ecea807ee79b3bbd Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 27 Nov 2019 15:18:18 -0800
Subject: [PATCH 193/370] release 7.10.0

---
 IPython/core/release.py | 2 +-
 tools/release_helper.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 3961477ed7c..af592917a69 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -24,7 +24,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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]
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 92e59ae532f..8935ef0e91e 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -75,8 +75,8 @@ echo $BLUE"Attempting to build package..."$NOR
 tools/build_release
 
 echo
-echo "Let\'s commit : git commit -am \"release $VERSION\" -S"
-echo $GREEN"Press enter to continue"$NOR
+echo "Let's commit : git commit -am \"release $VERSION\" -S"
+echo $GREEN"Press enter to commit"$NOR
 read
 git commit -am "release $VERSION" -S
 

From 5bac48502c470f66db3629468dfecb52639ff357 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 27 Nov 2019 16:15:43 -0800
Subject: [PATCH 194/370] back to dev

---
 IPython/core/release.py |  4 ++--
 tools/release_helper.sh | 26 ++++++++++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index af592917a69..5cf2110adf0 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 10
+_version_minor = 11
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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]
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 8935ef0e91e..d7040cc742b 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -81,10 +81,28 @@ read
 git commit -am "release $VERSION" -S
 
 echo
-echo "git push origin \$BRANCH ?"
-echo "Press enter to continue"
+echo $BLUE"git push origin \$BRANCH ($BRANCH)?"$NOR
+echo $GREEN"Make sure you can push"$NOR
+echo $GREEN"Press enter to continue"$NOR
 read
 git push origin $BRANCH
-# git tag -am "release $VERSION" "$VERSION" -s
-# git push origin $VERSION
+
+echo
+echo "Let's tag : git tag -am \"release $VERSION\" \"$VERSION\" -s"
+echo $GREEN"Press enter to wtagcommit"$NOR
+read
+git tag -am "release $VERSION" "$VERSION" -s
+
+echo
+echo $BLUE"And push the tag: git push origin \$VERSION ?"$NOR
+echo $GREEN"Press enter to continue"$NOR
+read
+git push origin $VERSION
+
+echo
+echo $BLUE"let's : git checkout $VERSION"$NOR
+echo $GREEN"Press enter to continue"$NOR
+read
+git checkout $VERSION
+
 

From 7995e64e9d85d4e8ef8dd236d5fff97524508700 Mon Sep 17 00:00:00 2001
From: Jonathan Slenders <jonathan@slenders.be>
Date: Wed, 27 Nov 2019 23:20:37 +0100
Subject: [PATCH 195/370] Run the prompt in a separate asyncio loop.

This prevents crashes from situations where the user starts scheduling new
coroutines that don't terminate. Like

    import asyncio
    async def func():
        while True:
            pass
    asyncio.ensure_future(func())

This would freeze the event loop and can't even be cancelled by pressing
control-c, because prompt_toolkit will never gain control from the event loop
to process key bindings.
---
 IPython/terminal/interactiveshell.py | 27 ++++++++++++++++++++-------
 setup.py                             |  2 +-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index a185915f387..26188aeba8a 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -1,5 +1,6 @@
 """IPython terminal interface using prompt_toolkit"""
 
+import asyncio
 import os
 import sys
 import warnings
@@ -309,6 +310,7 @@ def prompt():
 
         editing_mode = getattr(EditingMode, self.editing_mode.upper())
 
+        self.pt_loop = asyncio.new_event_loop()
         self.pt_app = PromptSession(
                             editing_mode=editing_mode,
                             key_bindings=key_bindings,
@@ -448,10 +450,21 @@ def prompt_for_code(self):
             default = ''
 
         with patch_stdout(raw=True):
-            text = self.pt_app.prompt(
-                default=default,
-#                pre_run=self.pre_prompt,# reset_current_buffer=True,
-                **self._extra_prompt_options())
+            # 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.
+
+            old_loop = asyncio.get_event_loop()
+            asyncio.set_event_loop(self.pt_loop)
+            try:
+                text = self.pt_app.prompt(
+                    default=default,
+                    **self._extra_prompt_options())
+            finally:
+                # Restore the original event loop.
+                asyncio.set_event_loop(old_loop)
         return text
 
     def enable_win_unicode_console(self):
@@ -568,11 +581,11 @@ def enable_gui(self, gui=None):
         # this inputhook.
         if PTK3:
             if self._inputhook:
-                from prompt_toolkit.eventloop import set_eventloop_with_inputhook
-                set_eventloop_with_inputhook(self._inputhook)
+                from prompt_toolkit.eventloop import new_eventloop_with_inputhook
+                self.pt_loop = new_eventloop_with_inputhook(self._inputhook)
             else:
                 import asyncio
-                asyncio.set_event_loop(asyncio.new_event_loop())
+                self.pt_loop = asyncio.new_event_loop()
 
     # Run !system commands directly, not through pipes, so terminal programs
     # work correctly.
diff --git a/setup.py b/setup.py
index 022520db442..593e3a6a0af 100755
--- a/setup.py
+++ b/setup.py
@@ -190,7 +190,7 @@
     'decorator',
     'pickleshare',
     'traitlets>=4.2',
-    'prompt_toolkit>=2.0.0,<3.1.0',
+    'prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1',
     'pygments',
     'backcall',
 ]

From a4255f1db13453f0fe7398218f3c0470400b0df5 Mon Sep 17 00:00:00 2001
From: Jonathan Slenders <jonathan@slenders.be>
Date: Sat, 30 Nov 2019 15:12:53 +0100
Subject: [PATCH 196/370] Add asyncio input hook for event loop integration.

---
 IPython/terminal/pt_inputhooks/__init__.py |  3 +-
 IPython/terminal/pt_inputhooks/asyncio.py  | 43 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 IPython/terminal/pt_inputhooks/asyncio.py

diff --git a/IPython/terminal/pt_inputhooks/__init__.py b/IPython/terminal/pt_inputhooks/__init__.py
index 284293ddde4..c7ba58dc4be 100644
--- a/IPython/terminal/pt_inputhooks/__init__.py
+++ b/IPython/terminal/pt_inputhooks/__init__.py
@@ -12,7 +12,8 @@
     'tk',
     'wx',
     'pyglet', 'glut',
-    'osx'
+    'osx',
+    'asyncio'
 ]
 
 registered = {}
diff --git a/IPython/terminal/pt_inputhooks/asyncio.py b/IPython/terminal/pt_inputhooks/asyncio.py
new file mode 100644
index 00000000000..53d49741b40
--- /dev/null
+++ b/IPython/terminal/pt_inputhooks/asyncio.py
@@ -0,0 +1,43 @@
+"""
+Inputhook for running the original asyncio event loop while we're waiting for
+input.
+
+By default, in IPython, we run the prompt with a different asyncio event loop,
+because otherwise we risk that people are freezing the prompt by scheduling bad
+coroutines. E.g., a coroutine that does a while/true and never yield back
+control to the loop. We can't cancel that.
+
+However, sometimes we want the asyncio loop to keep running while waiting for
+a prompt.
+
+The following example will print the numbers from 1 to 10 above the prompt,
+while we are waiting for input. (This works also because we use
+prompt_toolkit`s `patch_stdout`)::
+
+    In [1]: import asyncio
+
+    In [2]: %gui asyncio
+
+    In [3]: async def f():
+       ...:     for i in range(10):
+       ...:         await asyncio.sleep(1)
+       ...:         print(i)
+
+
+    In [4]: asyncio.ensure_future(f())
+
+"""
+import asyncio
+
+# 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()
+
+
+def inputhook(context):
+    def stop():
+        loop.stop()
+
+    loop.add_reader(context.fileno(), stop)
+    context.fileno()
+    loop.run_forever()

From 8768212e2f10ebffd0118d79eebfcc6f8debb6b2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 30 Nov 2019 08:48:09 -0800
Subject: [PATCH 197/370] Handle case where the shell does not have arbitrary
 mimerenderer handler.

That can be the case in test-suites; for example bokeh

Closes #11976
---
 IPython/core/displaypub.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/core/displaypub.py b/IPython/core/displaypub.py
index d769692e969..f651a2a0cf6 100644
--- a/IPython/core/displaypub.py
+++ b/IPython/core/displaypub.py
@@ -105,7 +105,7 @@ def publish(self, data, metadata=None, source=None, *, transient=None, update=Fa
 
         handlers = {}
         if self.shell is not None:
-            handlers = self.shell.mime_renderers
+            handlers = getattr(self.shell, 'mime_renderers', {})
 
         for mime, handler in handlers.items():
             if mime in data:

From f52ca01cad84187a87ee0159778886b3764dbb18 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 30 Nov 2019 09:00:14 -0800
Subject: [PATCH 198/370] Add prompt toolkit 3 compatibility to ipdb

closes #11962
closes #11975
---
 IPython/terminal/debugger.py | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index 696603f61e9..ba5ce1bada8 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -17,6 +17,9 @@
 from prompt_toolkit.enums import EditingMode
 from prompt_toolkit.formatted_text import PygmentsTokens
 
+from prompt_toolkit import __version__ as ptk_version
+PTK3 = ptk_version.startswith('3.')
+
 
 class TerminalPdb(Pdb):
     """Standalone IPython debugger."""
@@ -49,20 +52,23 @@ def get_prompt_tokens():
                                   & ~cursor_in_leading_ws
                               ))(display_completions_like_readline)
 
-        self.pt_app = PromptSession(
-                            message=(lambda: PygmentsTokens(get_prompt_tokens())),
-                            editing_mode=getattr(EditingMode, self.shell.editing_mode.upper()),
-                            key_bindings=kb,
-                            history=self.shell.debugger_history,
-                            completer=self._ptcomp,
-                            enable_history_search=True,
-                            mouse_support=self.shell.mouse_support,
-                            complete_style=self.shell.pt_complete_style,
-                            style=self.shell.style,
-                            inputhook=self.shell.inputhook,
-                            color_depth=self.shell.color_depth,
+        options = dict(
+            message=(lambda: PygmentsTokens(get_prompt_tokens())),
+            editing_mode=getattr(EditingMode, self.shell.editing_mode.upper()),
+            key_bindings=kb,
+            history=self.shell.debugger_history,
+            completer=self._ptcomp,
+            enable_history_search=True,
+            mouse_support=self.shell.mouse_support,
+            complete_style=self.shell.pt_complete_style,
+            style=self.shell.style,
+            color_depth=self.shell.color_depth,
         )
 
+        if not PTK3:
+            options['inputhook'] = self.inputhook
+        self.pt_app = PromptSession(**options)
+
     def cmdloop(self, intro=None):
         """Repeatedly issue a prompt, accept input, parse an initial prefix
         off the received input, and dispatch to action methods, passing them

From 5465c56db8e58789edb6c137c219d4cdbd9029c9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 30 Nov 2019 09:57:07 -0800
Subject: [PATCH 199/370] some updates to the release scripts

---
 tools/release_helper.sh | 79 +++++++++++++++++++++++++++--------------
 1 file changed, 53 insertions(+), 26 deletions(-)

diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index d7040cc742b..82a7bc0208e 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -9,14 +9,6 @@ python -c 'import sphinx'
 python -c 'import sphinx_rtd_theme'
 python -c 'import nose'
 
-echo -n 'PREV_RELEASE (X.y.z):'
-read PREV_RELEASE
-echo -n 'MILESTONE (X.y):'
-read MILESTONE
-echo -n 'VERSION (X.y.z):'
-read VERSION
-echo -n 'branch (master|X.y):'
-read branch
 
 BLACK=$(tput setaf 1)
 RED=$(tput setaf 1)
@@ -28,30 +20,65 @@ CYAN=$(tput setaf 6)
 WHITE=$(tput setaf 7)
 NOR=$(tput sgr0)
 
-echo 
-echo $BLUE"Updating what's new with informations from docs/source/whatsnew/pr"$NOR
-python tools/update_whatsnew.py
 
-echo
-echo $BLUE"please move the contents of "docs/source/whatsnew/development.rst" to version-X.rst"$NOR
-echo $GREEN"Press enter to continue"$NOR
-read
+echo -n "PREV_RELEASE (X.y.z) [$PREV_RELEASE]: "
+read input
+PREV_RELEASE=${input:-$PREV_RELEASE}
+echo -n "MILESTONE (X.y) [$MILESTONE]: "
+read input
+MILESTONE=${input:-$MILESTONE}
+echo -n "VERSION (X.y.z) [$VERSION]:"
+read input
+VERSION=${input:-$VERSION}
+echo -n "branch (master|X.y) [$branch]:"
+read input
+branch=${input:-$branch}
+
+ask_section(){
+    echo
+    echo $BLUE"$1"$NOR 
+    echo -n $GREEN"Press Enter to continue, S to skip: "$GREEN
+    read -n1 value
+    echo 
+    if [ -z $value ] || [ $value = 'y' ]  ; then
+        return 0
+    fi
+    return 1
+}
+
 
-echo 
-echo $BLUE"here are all the authors that contributed to this release:"$NOR
-git log --format="%aN <%aE>" $PREV_RELEASE... | sort -u -f
 
 echo 
-echo $BLUE"If you see any duplicates cancel (Ctrl-C), then edit .mailmap.\n"$GREEN"Press enter to continue:"$NOR
-read
+if ask_section "Updating what's new with informations from docs/source/whatsnew/pr"
+then
+    python tools/update_whatsnew.py
 
-echo $BLUE"generating stats"$NOR
-python tools/github_stats.py --milestone $MILESTONE > stats.rst
+    echo
+    echo $BLUE"please move the contents of "docs/source/whatsnew/development.rst" to version-X.rst"$NOR
+    echo $GREEN"Press enter to continue"$NOR
+    read
+fi
 
-echo $BLUE"stats.rst files generated."$NOR
-echo $GREEN"Please merge it with the right file (github-stats-X.rst) and commit."$NOR
-echo $GREEN"press enter to continue."$NOR
-read
+if ask_section "Gen Stats, and authors"
+then
+
+    echo 
+    echo $BLUE"here are all the authors that contributed to this release:"$NOR
+    git log --format="%aN <%aE>" $PREV_RELEASE... | sort -u -f
+
+    echo 
+    echo $BLUE"If you see any duplicates cancel (Ctrl-C), then edit .mailmap.\n"$GREEN"Press enter to continue:"$NOR
+    read
+
+    echo $BLUE"generating stats"$NOR
+    python tools/github_stats.py --milestone $MILESTONE > stats.rst
+
+    echo $BLUE"stats.rst files generated."$NOR
+    echo $GREEN"Please merge it with the right file (github-stats-X.rst) and commit."$NOR
+    echo $GREEN"press enter to continue."$NOR
+    read
+
+fi
 
 echo "Cleaning repository"
 git clean -xfdi

From 33775656cb4137d918fe38a7d38a4206cceba934 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 30 Nov 2019 09:23:06 -0800
Subject: [PATCH 200/370] print the version on crash

---
 IPython/core/crashhandler.py | 6 ++++--
 tools/release_helper.sh      | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/IPython/core/crashhandler.py b/IPython/core/crashhandler.py
index 2117edb5c0b..1e0b429d09a 100644
--- a/IPython/core/crashhandler.py
+++ b/IPython/core/crashhandler.py
@@ -29,6 +29,8 @@
 from IPython.utils.sysinfo import sys_info
 from IPython.utils.py3compat import input
 
+from IPython.core.release import __version__ as version
+
 #-----------------------------------------------------------------------------
 # Code
 #-----------------------------------------------------------------------------
@@ -68,7 +70,7 @@
 """
 
 _lite_message_template = """
-If you suspect this is an IPython bug, please report it at:
+If you suspect this is an IPython {version} bug, please report it at:
     https://github.com/ipython/ipython/issues
 or send an email to the mailing list at {email}
 
@@ -222,5 +224,5 @@ def crash_handler_lite(etype, evalue, tb):
     else:
         # we are not in a shell, show generic config
         config = "c."
-    print(_lite_message_template.format(email=author_email, config=config), file=sys.stderr)
+    print(_lite_message_template.format(email=author_email, config=config, version=version), file=sys.stderr)
 
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index d7040cc742b..7251ec1d752 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -105,4 +105,8 @@ echo $GREEN"Press enter to continue"$NOR
 read
 git checkout $VERSION
 
+# ./tools/release
+# ls ./dist
+# shasum -a 256 dist/*
+
 

From ac224067d1e05be54fcc91a3036dbf07a8a4ce68 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 30 Nov 2019 11:48:01 -0800
Subject: [PATCH 201/370] Remove useless call to u_format and redundant list
 comprehension

One step toward #11987
---
 IPython/core/tests/test_handlers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/core/tests/test_handlers.py b/IPython/core/tests/test_handlers.py
index e87e29dbd31..02860c8b4af 100644
--- a/IPython/core/tests/test_handlers.py
+++ b/IPython/core/tests/test_handlers.py
@@ -49,11 +49,11 @@ def test_handlers():
     # For many of the below, we're also checking that leading whitespace
     # turns off the esc char, which it should unless there is a continuation
     # line.
-    run([(i,py3compat.u_format(o)) for i,o in \
+    run(
         [('"no change"', '"no change"'),             # normal
          (u"lsmagic",     "get_ipython().run_line_magic('lsmagic', '')"),   # magic
          #("a = b # PYTHON-MODE", '_i'),          # emacs -- avoids _in cache
-         ]])
+         ])
 
     # Objects which are instances of IPyAutocall are *always* autocalled
     autocallable = Autocallable()

From a771dadfde60a612739274c6fbc73db783621963 Mon Sep 17 00:00:00 2001
From: Jonathan Slenders <jonathan@slenders.be>
Date: Sat, 30 Nov 2019 21:42:13 +0100
Subject: [PATCH 202/370] Improve cleanup of asyncio input hook.

---
 IPython/terminal/pt_inputhooks/asyncio.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/IPython/terminal/pt_inputhooks/asyncio.py b/IPython/terminal/pt_inputhooks/asyncio.py
index 53d49741b40..e28603864f9 100644
--- a/IPython/terminal/pt_inputhooks/asyncio.py
+++ b/IPython/terminal/pt_inputhooks/asyncio.py
@@ -38,6 +38,9 @@ def inputhook(context):
     def stop():
         loop.stop()
 
-    loop.add_reader(context.fileno(), stop)
-    context.fileno()
-    loop.run_forever()
+    fileno = context.fileno()
+    loop.add_reader(fileno, stop)
+    try:
+        loop.run_forever()
+    finally:
+        loop.remove_reader(fileno)

From c812a49785e55339d131017718e594f4a7d45154 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 30 Nov 2019 17:29:33 -0800
Subject: [PATCH 203/370] Be more explicit on how we handle osx clipboard.

The return values can only be bytes as we do bytes manipulations before.
So if we need to return text; we always need to decode.

We can now also leave the default encoding out; as py3compat.decode
takecare of that for us
---
 IPython/lib/clipboard.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/lib/clipboard.py b/IPython/lib/clipboard.py
index 1b8e756b5c6..316a8ab1f8a 100644
--- a/IPython/lib/clipboard.py
+++ b/IPython/lib/clipboard.py
@@ -32,15 +32,15 @@ def win32_clipboard_get():
         win32clipboard.CloseClipboard()
     return text
 
-def osx_clipboard_get():
+def osx_clipboard_get() -> str:
     """ Get the clipboard's text on OS X.
     """
     p = subprocess.Popen(['pbpaste', '-Prefer', 'ascii'],
         stdout=subprocess.PIPE)
-    text, stderr = p.communicate()
+    bytes_, stderr = p.communicate()
     # Text comes in with old Mac \r line endings. Change them to \n.
-    text = text.replace(b'\r', b'\n')
-    text = py3compat.cast_unicode(text, py3compat.DEFAULT_ENCODING)
+    bytes_ = bytes_.replace(b'\r', b'\n')
+    text = py3compat.decode(bytes_)
     return text
 
 def tkinter_clipboard_get():

From b70b111b3f5a6cab3a89847eb98ce6b36f9f287d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 30 Nov 2019 17:51:06 -0800
Subject: [PATCH 204/370] Enforce some more types since we are Py3only

---
 IPython/paths.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/IPython/paths.py b/IPython/paths.py
index 82fba5ab45f..73631b58288 100644
--- a/IPython/paths.py
+++ b/IPython/paths.py
@@ -12,7 +12,7 @@
     ensure_dir_exists, fs_encoding)
 from IPython.utils import py3compat
 
-def get_ipython_dir():
+def get_ipython_dir() -> str:
     """Get the IPython directory for this platform and user.
 
     This uses the logic in `get_home_dir` to find the home directory
@@ -28,10 +28,9 @@ def get_ipython_dir():
     home_dir = get_home_dir()
     xdg_dir = get_xdg_dir()
 
-    # import pdb; pdb.set_trace()  # dbg
     if 'IPYTHON_DIR' in env:
-        warn('The environment variable IPYTHON_DIR is deprecated. '
-                'Please use IPYTHONDIR instead.')
+        warn('The environment variable IPYTHON_DIR is deprecated since IPython 3.0. '
+                'Please use IPYTHONDIR instead.', DeprecationWarning)
     ipdir = env.get('IPYTHONDIR', env.get('IPYTHON_DIR', None))
     if ipdir is None:
         # not set explicitly, use ~/.ipython
@@ -67,8 +66,8 @@ def get_ipython_dir():
             warn("IPython parent '{0}' is not a writable location,"
                     " using a temp directory.".format(parent))
             ipdir = tempfile.mkdtemp()
-
-    return py3compat.cast_unicode(ipdir, fs_encoding)
+    assert isinstance(ipdir, str), "all path manipulation should be str(unicode), but are not."
+    return ipdir
 
 
 def get_ipython_cache_dir():

From 4a42866eee1d79b2d07c3fc5472d67f19929d077 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 30 Nov 2019 18:03:12 -0800
Subject: [PATCH 205/370] More cleaning and enforcing of types.

Also drop some reminder python 2 compatibility imports. And use some
context manager when appropriate instead of manual closing
---
 IPython/paths.py      |  9 +++++----
 IPython/utils/path.py | 17 +++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/IPython/paths.py b/IPython/paths.py
index 73631b58288..bbe3d5c7cad 100644
--- a/IPython/paths.py
+++ b/IPython/paths.py
@@ -70,7 +70,7 @@ def get_ipython_dir() -> str:
     return ipdir
 
 
-def get_ipython_cache_dir():
+def get_ipython_cache_dir() -> str:
     """Get the cache directory it is created if it does not exist."""
     xdgdir = get_xdg_cache_dir()
     if xdgdir is None:
@@ -81,13 +81,14 @@ def get_ipython_cache_dir():
     elif not _writable_dir(xdgdir):
         return get_ipython_dir()
 
-    return py3compat.cast_unicode(ipdir, fs_encoding)
+    return ipdir
 
 
-def get_ipython_package_dir():
+def get_ipython_package_dir() -> str:
     """Get the base directory where IPython itself is installed."""
     ipdir = os.path.dirname(IPython.__file__)
-    return py3compat.cast_unicode(ipdir, fs_encoding)
+    assert isinstance(ipdir, str)
+    return ipdir
 
 
 def get_ipython_module_path(module_str):
diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index f677f1c7cd0..5276f8617fe 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -169,7 +169,7 @@ class HomeDirError(Exception):
     pass
 
 
-def get_home_dir(require_writable=False):
+def get_home_dir(require_writable=False) -> str:
     """Return the 'home' directory, as a unicode string.
 
     Uses os.path.expanduser('~'), and checks for writability.
@@ -197,21 +197,18 @@ def get_home_dir(require_writable=False):
     if not _writable_dir(homedir) and os.name == 'nt':
         # expanduser failed, use the registry to get the 'My Documents' folder.
         try:
-            try:
-                import winreg as wreg  # Py 3
-            except ImportError:
-                import _winreg as wreg  # Py 2
-            key = wreg.OpenKey(
+            import winreg as wreg
+            with wreg.OpenKey(
                 wreg.HKEY_CURRENT_USER,
                 r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders"
-            )
-            homedir = wreg.QueryValueEx(key,'Personal')[0]
-            key.Close()
+            ) as key:
+                homedir = wreg.QueryValueEx(key,'Personal')[0]
         except:
             pass
 
     if (not require_writable) or _writable_dir(homedir):
-        return py3compat.cast_unicode(homedir, fs_encoding)
+        assert isinstance(homedir, str), "Homedir shoudl be unicode not bytes"
+        return homedir
     else:
         raise HomeDirError('%s is not a writable dir, '
                 'set $HOME environment variable to override' % homedir)

From 364457bf98c4335115906209ef7066ea03e142bc Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 30 Nov 2019 18:06:24 -0800
Subject: [PATCH 206/370] Add some missing deprecation warnings

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

diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index 5276f8617fe..f2f1ea06f5a 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -251,31 +251,31 @@ def get_xdg_cache_dir():
 
 @undoc
 def get_ipython_dir():
-    warn("get_ipython_dir has moved to the IPython.paths module since IPython 4.0.", stacklevel=2)
+    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.", stacklevel=2)
+    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.", stacklevel=2)
+    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.", stacklevel=2)
+    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.", stacklevel=2)
+    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)
 

From 8c4e8b5da7d0caa0ee88e3a11410e9b3f33551f6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 30 Nov 2019 19:15:17 -0800
Subject: [PATCH 207/370] Strange wondows regression

---
 IPython/utils/path.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index f2f1ea06f5a..d52cad0a2e5 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -198,11 +198,12 @@ def get_home_dir(require_writable=False) -> str:
         # expanduser failed, use the registry to get the 'My Documents' folder.
         try:
             import winreg as wreg
-            with wreg.OpenKey(
+            key = wreg.OpenKey(
                 wreg.HKEY_CURRENT_USER,
                 r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders"
-            ) as key:
-                homedir = wreg.QueryValueEx(key,'Personal')[0]
+            )
+            homedir = wreg.QueryValueEx(key,'Personal')[0]
+            key.Close()
         except:
             pass
 

From 595f4426a61a25c8146f9a022ef2ca66eab28aa4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 30 Nov 2019 19:24:31 -0800
Subject: [PATCH 208/370] correct patching ?

---
 IPython/utils/path.py            | 7 +++----
 IPython/utils/tests/test_path.py | 4 ++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index d52cad0a2e5..f2f1ea06f5a 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -198,12 +198,11 @@ def get_home_dir(require_writable=False) -> str:
         # expanduser failed, use the registry to get the 'My Documents' folder.
         try:
             import winreg as wreg
-            key = wreg.OpenKey(
+            with wreg.OpenKey(
                 wreg.HKEY_CURRENT_USER,
                 r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders"
-            )
-            homedir = wreg.QueryValueEx(key,'Personal')[0]
-            key.Close()
+            ) as key:
+                homedir = wreg.QueryValueEx(key,'Personal')[0]
         except:
             pass
 
diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index b34f9ca926c..987177bc101 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -171,8 +171,12 @@ def test_get_home_dir_8():
         env.pop(key, None)
 
     class key:
+        def __enter__(self):
+            pass
         def Close(self):
             pass
+        def __exit__(*args, **kwargs):
+            pass
 
     with patch.object(wreg, 'OpenKey', return_value=key()), \
          patch.object(wreg, 'QueryValueEx', return_value=[abspath(HOME_TEST_DIR)]):

From 0aac4ecaafaf327dc34f2d6790d429c7a23e2cbb Mon Sep 17 00:00:00 2001
From: Chemss Eddine Ben Hassine <bhchemss@gmail.com>
Date: Sun, 1 Dec 2019 18:35:09 +0100
Subject: [PATCH 209/370] Fix #11984 Removed unused py3compat import

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

diff --git a/IPython/core/tests/test_autocall.py b/IPython/core/tests/test_autocall.py
index 10a4e0d477d..ded9f78858a 100644
--- a/IPython/core/tests/test_autocall.py
+++ b/IPython/core/tests/test_autocall.py
@@ -7,7 +7,6 @@
 """
 from IPython.core.splitinput import LineInfo
 from IPython.core.prefilter import AutocallChecker
-from IPython.utils import py3compat
 
 def doctest_autocall():
     """

From ac70fcde4501b916215e67670ab0bbd50dc1ab55 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 1 Dec 2019 09:39:51 -0800
Subject: [PATCH 210/370] update whats new with 7.10.1 releases

---
 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 6c3dbab387a..c4ba18635b2 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,17 @@
  7.x Series
 ============
 
+.. _version 7101:
+
+IPython 7.10.1
+==============
+
+IPython 7.10.1 fix a couple of incompatibilities with Prompt toolkit 3 (please
+update Prompt toolkit to 3.0.2 at least), and fixes some interaction with
+headless IPython.
+
+.. _version 7100:
+
 IPython 7.10.0
 ==============
 

From e508b6e4dc46c2b425ec7144da590eb2c3a0cbd7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 1 Dec 2019 09:44:51 -0800
Subject: [PATCH 211/370] update v7 stats

---
 docs/source/whatsnew/github-stats-7.rst | 15 +++++++++++++++
 tools/release_helper.sh                 |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index 0d8b28bcc4a..958954ebf5d 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -1,6 +1,21 @@
 Issues closed in the 7.x development cycle
 ==========================================
 
+Issues closed in 7.10.1
+-----------------------
+
+GitHub stats for 2019/11/27 - 2019/12/01 (tag: 7.10.0)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 5 issues and merged 7 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A7.10.1>`__
+
+The following 2 authors contributed 14 commits.
+
+* Jonathan Slenders
+* Matthias Bussonnier
+
 Issues closed in 7.10
 ---------------------
 
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 82a7bc0208e..bed8ed69253 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -67,7 +67,8 @@ then
     git log --format="%aN <%aE>" $PREV_RELEASE... | sort -u -f
 
     echo 
-    echo $BLUE"If you see any duplicates cancel (Ctrl-C), then edit .mailmap.\n"$GREEN"Press enter to continue:"$NOR
+    echo $BLUE"If you see any duplicates cancel (Ctrl-C), then edit .mailmap."
+    echo $GREEN"Press enter to continue:"$NOR
     read
 
     echo $BLUE"generating stats"$NOR

From b93782e5359bff127a2da1d3cc0019ee8d75099e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 1 Dec 2019 09:49:46 -0800
Subject: [PATCH 212/370] release 7.10.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 5cf2110adf0..a928a6b8825 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 11
-_version_patch = 0
+_version_minor = 10
+_version_patch = 1
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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 24145ee1ff606ed7cf470bea13ef2dea77baf604 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 1 Dec 2019 09:54:11 -0800
Subject: [PATCH 213/370] back to dev,  and tools updates

---
 IPython/core/release.py |  6 +++---
 tools/release_helper.sh | 22 +++++++++++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index a928a6b8825..5cf2110adf0 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 10
-_version_patch = 1
+_version_minor = 11
+_version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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]
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index bed8ed69253..7f99a8ac31d 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -30,9 +30,9 @@ 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 (master|X.y) [$BRANCH]:"
 read input
-branch=${input:-$branch}
+BRANCH=${input:-$BRANCH}
 
 ask_section(){
     echo
@@ -117,7 +117,7 @@ git push origin $BRANCH
 
 echo
 echo "Let's tag : git tag -am \"release $VERSION\" \"$VERSION\" -s"
-echo $GREEN"Press enter to wtagcommit"$NOR
+echo $GREEN"Press enter to tag commit"$NOR
 read
 git tag -am "release $VERSION" "$VERSION" -s
 
@@ -127,6 +127,22 @@ echo $GREEN"Press enter to continue"$NOR
 read
 git push origin $VERSION
 
+
+echo $GREEN"please update version number and back to .dev in ${RED}IPython/core/release.py"
+echo ${BLUE}"Do not commit yet – we'll do it later."$NOR
+
+echo $GREEN"Press enter to continue"$NOR
+read
+
+echo
+echo "Let's commit : git commit -am \"back to dev\" -S"
+echo $GREEN"Press enter to commit"$NOR
+read
+git commit -am "back to dev" -S
+
+
+
+
 echo
 echo $BLUE"let's : git checkout $VERSION"$NOR
 echo $GREEN"Press enter to continue"$NOR

From efc78ade7060282fd6cecd846091f28c6a7fe1eb Mon Sep 17 00:00:00 2001
From: Quentin Peter <qaep2@cam.ac.uk>
Date: Sun, 1 Dec 2019 19:04:13 +0000
Subject: [PATCH 214/370] Add chained exception to 'Plain' mode

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

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 0864ba456ef..c05571827a3 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -530,6 +530,30 @@ 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)
+
+        chained_evalue = get_chained_exception(evalue)
+
+        if chained_evalue:
+            return chained_evalue.__class__, chained_evalue, chained_evalue.__traceback__
+
+    def prepare_chained_exception_message(self, cause):
+        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"
+
+        if cause:
+            message = [[direct_cause]]
+        else:
+            message = [[exception_during_handling]]
+        return message
+
     def set_colors(self, *args, **kw):
         """Shorthand access to the color table scheme selector method."""
 
@@ -603,7 +627,7 @@ def __call__(self, etype, value, elist):
         self.ostream.write(self.text(etype, value, elist))
         self.ostream.write('\n')
 
-    def structured_traceback(self, etype, value, elist, tb_offset=None,
+    def structured_traceback(self, etype, evalue, etb=None, tb_offset=None,
                              context=5):
         """Return a color formatted string with the traceback info.
 
@@ -612,15 +636,15 @@ def structured_traceback(self, etype, value, elist, tb_offset=None,
         etype : exception type
           Type of the exception raised.
 
-        value : object
+        evalue : object
           Data stored in the exception
 
-        elist : list
-          List of frames, see class docstring for details.
+        etb : traceback
+          Traceback of the exception.
 
         tb_offset : int, optional
           Number of frames in the traceback to skip.  If not given, the
-          instance value is used (set in constructor).
+          instance evalue is used (set in constructor).
 
         context : int, optional
           Number of lines of context information to print.
@@ -629,6 +653,14 @@ def structured_traceback(self, etype, value, elist, tb_offset=None,
         -------
         String with formatted exception.
         """
+        # if chained_exc_ids is None:
+        chained_exc_ids = set()
+        if isinstance(etb, list):
+            elist = etb
+        elif etb is not None:
+            elist = self._extract_tb(etb)
+        else:
+            elist = []
         tb_offset = self.tb_offset if tb_offset is None else tb_offset
         Colors = self.Colors
         out_list = []
@@ -641,9 +673,21 @@ def structured_traceback(self, etype, value, elist, tb_offset=None,
                             (Colors.normalEm, Colors.Normal) + '\n')
             out_list.extend(self._format_list(elist))
         # The exception info should be a single entry in the list.
-        lines = ''.join(self._format_exception_only(etype, value))
+        lines = ''.join(self._format_exception_only(etype, evalue))
         out_list.append(lines)
 
+        exception = self.get_parts_of_chained_exception(evalue)
+
+        if exception and not id(exception[1]) in chained_exc_ids:
+            etype, evalue, etb = exception
+            chained_exc_ids.add(id(exception[1])) # trace exception to avoid infinite 'cause' loop
+            chained_exceptions_tb_offset = 0
+            out_list = (self.structured_traceback(
+                etype, evalue, etb, chained_exceptions_tb_offset, context)
+                        + self.prepare_chained_exception_message(
+                            evalue.__cause__)[0]
+                        + out_list)
+
         return out_list
 
     def _format_list(self, extracted_list):
@@ -763,7 +807,7 @@ def get_exception_only(self, etype, value):
         etype : exception type
         value : exception value
         """
-        return ListTB.structured_traceback(self, etype, value, [])
+        return ListTB.structured_traceback(self, etype, value)
 
     def show_exception_only(self, etype, evalue):
         """Only print the exception type and message, without a traceback.
@@ -1013,16 +1057,6 @@ def linereader(file=file, lnum=[lnum], getline=linecache.getline):
                 _format_traceback_lines(lnum, index, lines, Colors, lvals,
                                          _line_format)))
 
-    def prepare_chained_exception_message(self, cause):
-        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"
-
-        if cause:
-            message = [[direct_cause]]
-        else:
-            message = [[exception_during_handling]]
-        return message
-
     def prepare_header(self, etype, long_version=False):
         colors = self.Colors  # just a shorthand + quicker name lookup
         colorsnormal = colors.Normal  # used a lot
@@ -1117,20 +1151,6 @@ def get_records(self, etb, number_of_lines_of_context, tb_offset):
             info('\nUnfortunately, your original traceback can not be constructed.\n')
             return None
 
-    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)
-
-        chained_evalue = get_chained_exception(evalue)
-
-        if chained_evalue:
-            return chained_evalue.__class__, chained_evalue, chained_evalue.__traceback__
-
     def structured_traceback(self, etype, evalue, etb, tb_offset=None,
                              number_of_lines_of_context=5):
         """Return a nice text document describing the traceback."""
@@ -1294,9 +1314,8 @@ def structured_traceback(self, etype, value, tb, tb_offset=None, number_of_lines
             # out-of-date source code.
             self.check_cache()
             # Now we can extract and format the exception
-            elist = self._extract_tb(tb)
             return ListTB.structured_traceback(
-                self, etype, value, elist, tb_offset, number_of_lines_of_context
+                self, etype, value, tb, tb_offset, number_of_lines_of_context
             )
 
     def stb2text(self, stb):

From 695206f27d652531276b73c43c581c1eea71947a Mon Sep 17 00:00:00 2001
From: Quentin Peter <qaep2@cam.ac.uk>
Date: Sun, 1 Dec 2019 19:15:51 +0000
Subject: [PATCH 215/370] Add test

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

diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index e77f44416c3..9190f5eb7ee 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -296,6 +296,11 @@ def test_suppress_exception_chaining(self):
              tt.AssertPrints("ValueError", suppress=False):
             ip.run_cell(self.SUPPRESS_CHAINING_CODE)
 
+    def test_plain_exception(self):
+        with tt.AssertPrints(["KeyError", "NameError", "During handling"]):
+            ip.run_cell("%xmode Plain")
+            ip.run_cell(self.EXCEPTION_DURING_HANDLING_CODE)
+
 
 class RecursionTest(unittest.TestCase):
     DEFINITIONS = """

From c273724b5b98650388e4de7e17f488dec886e585 Mon Sep 17 00:00:00 2001
From: Quentin Peter <qaep2@cam.ac.uk>
Date: Sun, 1 Dec 2019 21:27:59 +0000
Subject: [PATCH 216/370] Avoid recursive loop

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

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index c05571827a3..a56b738cae4 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -653,8 +653,10 @@ def structured_traceback(self, etype, evalue, etb=None, tb_offset=None,
         -------
         String with formatted exception.
         """
-        # if chained_exc_ids is None:
-        chained_exc_ids = set()
+        if isinstance(etb, tuple):
+            etb, chained_exc_ids = etb
+        else:
+            chained_exc_ids = set()
         if isinstance(etb, list):
             elist = etb
         elif etb is not None:
@@ -683,7 +685,8 @@ def structured_traceback(self, etype, evalue, etb=None, tb_offset=None,
             chained_exc_ids.add(id(exception[1])) # trace exception to avoid infinite 'cause' loop
             chained_exceptions_tb_offset = 0
             out_list = (self.structured_traceback(
-                etype, evalue, etb, chained_exceptions_tb_offset, context)
+                etype, evalue, (etb, chained_exc_ids),
+                chained_exceptions_tb_offset, context)
                         + self.prepare_chained_exception_message(
                             evalue.__cause__)[0]
                         + out_list)

From 42d108534cbea8a150e41cbe4de7ff9a12a28191 Mon Sep 17 00:00:00 2001
From: Quentin Peter <qaep2@cam.ac.uk>
Date: Sun, 1 Dec 2019 21:44:11 +0000
Subject: [PATCH 217/370] Reset xmode to Verbose

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

diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index 9190f5eb7ee..a8763df368f 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -300,6 +300,7 @@ def test_plain_exception(self):
         with tt.AssertPrints(["KeyError", "NameError", "During handling"]):
             ip.run_cell("%xmode Plain")
             ip.run_cell(self.EXCEPTION_DURING_HANDLING_CODE)
+            ip.run_cell("%xmode Verbose")
 
 
 class RecursionTest(unittest.TestCase):

From 2705621ca111194e778372390defdc478c58a21d Mon Sep 17 00:00:00 2001
From: Quentin Peter <qaep2@cam.ac.uk>
Date: Mon, 2 Dec 2019 08:51:03 +0000
Subject: [PATCH 218/370] Add more tests

---
 IPython/core/tests/test_ultratb.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index a8763df368f..c00b4d30afe 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -296,12 +296,25 @@ def test_suppress_exception_chaining(self):
              tt.AssertPrints("ValueError", suppress=False):
             ip.run_cell(self.SUPPRESS_CHAINING_CODE)
 
-    def test_plain_exception(self):
+    def test_plain_direct_cause_error(self):
+        with tt.AssertPrints(["KeyError", "NameError", "direct cause"]):
+            ip.run_cell("%xmode Plain")
+            ip.run_cell(self.DIRECT_CAUSE_ERROR_CODE)
+            ip.run_cell("%xmode Verbose")
+
+    def test_plain_exception_during_handling_error(self):
         with tt.AssertPrints(["KeyError", "NameError", "During handling"]):
             ip.run_cell("%xmode Plain")
             ip.run_cell(self.EXCEPTION_DURING_HANDLING_CODE)
             ip.run_cell("%xmode Verbose")
 
+    def test_plain_suppress_exception_chaining(self):
+        with tt.AssertNotPrints("ZeroDivisionError"), \
+             tt.AssertPrints("ValueError", suppress=False):
+            ip.run_cell("%xmode Plain")
+            ip.run_cell(self.SUPPRESS_CHAINING_CODE)
+            ip.run_cell("%xmode Verbose")
+
 
 class RecursionTest(unittest.TestCase):
     DEFINITIONS = """

From 7b234536d859baa939ee3a19004a2d96f86ce6cb Mon Sep 17 00:00:00 2001
From: Quentin Peter <qaep2@cam.ac.uk>
Date: Mon, 2 Dec 2019 09:00:00 +0000
Subject: [PATCH 219/370] fix 'direct cause' message

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

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index a56b738cae4..3612bc4afde 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -681,15 +681,18 @@ def structured_traceback(self, etype, evalue, etb=None, tb_offset=None,
         exception = self.get_parts_of_chained_exception(evalue)
 
         if exception and not id(exception[1]) in chained_exc_ids:
+            chained_exception_message = self.prepare_chained_exception_message(
+                evalue.__cause__)[0]
             etype, evalue, etb = exception
-            chained_exc_ids.add(id(exception[1])) # trace exception to avoid infinite 'cause' loop
+            # Trace exception to avoid infinite 'cause' loop
+            chained_exc_ids.add(id(exception[1]))
             chained_exceptions_tb_offset = 0
-            out_list = (self.structured_traceback(
-                etype, evalue, (etb, chained_exc_ids),
-                chained_exceptions_tb_offset, context)
-                        + self.prepare_chained_exception_message(
-                            evalue.__cause__)[0]
-                        + out_list)
+            out_list = (
+                self.structured_traceback(
+                    etype, evalue, (etb, chained_exc_ids),
+                    chained_exceptions_tb_offset, context)
+                + chained_exception_message
+                + out_list)
 
         return out_list
 

From 2d3a743daaeef7b18e18ae803951f32ddd6db20c Mon Sep 17 00:00:00 2001
From: Quentin Peter <qaep2@cam.ac.uk>
Date: Mon, 2 Dec 2019 09:55:18 +0000
Subject: [PATCH 220/370] Update docstring

---
 IPython/core/ultratb.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index 3612bc4afde..eef16cc650a 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -639,8 +639,9 @@ def structured_traceback(self, etype, evalue, etb=None, tb_offset=None,
         evalue : object
           Data stored in the exception
 
-        etb : traceback
-          Traceback of the exception.
+        etb : object
+          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
@@ -653,10 +654,13 @@ def structured_traceback(self, etype, evalue, etb=None, tb_offset=None,
         -------
         String with formatted exception.
         """
+        # This is a workaround to get chained_exc_ids in recursive calls
+        # etb should not be a tuple if structured_traceback is not recursive
         if isinstance(etb, tuple):
             etb, chained_exc_ids = etb
         else:
             chained_exc_ids = set()
+
         if isinstance(etb, list):
             elist = etb
         elif etb is not None:

From 74439e405d372fb90eaa6410eadc9327620f3c9f Mon Sep 17 00:00:00 2001
From: Jonathan Slenders <jonathan@slenders.be>
Date: Mon, 2 Dec 2019 18:31:46 +0100
Subject: [PATCH 221/370] Don't nest asyncio input hooks.

This fixes the "event loop already running" error.

For prompt_toolkit 2.0: this will still nest the event loops, but that's fine,
because we have the asyncio event loop running an prompt_toolkit's custom loop.
They don't interfere with each other.

For prompt_toolkit 3.0: we only use one asyncio event loop when "%gui asyncio"
is used. The terminal prompt will now use the active asyncio event loop.
---
 IPython/terminal/interactiveshell.py      | 17 ++++++++++++++---
 IPython/terminal/pt_inputhooks/asyncio.py | 18 ++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 26188aeba8a..aff48d36c5e 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -580,11 +580,22 @@ def enable_gui(self, gui=None):
         # For prompt_toolkit 3.0. We have to create an asyncio event loop with
         # this inputhook.
         if PTK3:
-            if self._inputhook:
-                from prompt_toolkit.eventloop import new_eventloop_with_inputhook
+            import asyncio
+            from prompt_toolkit.eventloop import new_eventloop_with_inputhook
+
+            if gui == 'asyncio':
+                # 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()
+
+            elif self._inputhook:
+                # If an inputhook was set, create a new asyncio event loop with
+                # this inputhook for the prompt.
                 self.pt_loop = new_eventloop_with_inputhook(self._inputhook)
             else:
-                import asyncio
+                # When there's no inputhook, run the prompt in a separate
+                # asyncio event loop.
                 self.pt_loop = asyncio.new_event_loop()
 
     # Run !system commands directly, not through pipes, so terminal programs
diff --git a/IPython/terminal/pt_inputhooks/asyncio.py b/IPython/terminal/pt_inputhooks/asyncio.py
index e28603864f9..95cf194f866 100644
--- a/IPython/terminal/pt_inputhooks/asyncio.py
+++ b/IPython/terminal/pt_inputhooks/asyncio.py
@@ -28,6 +28,10 @@
 
 """
 import asyncio
+from prompt_toolkit import __version__ as ptk_version
+
+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.
@@ -35,6 +39,19 @@
 
 
 def inputhook(context):
+    """
+    Inputhook for asyncio event loop integration.
+    """
+    # For prompt_toolkit 3.0, this input hook literally doesn't do anything.
+    # The event loop integration here is implemented in `interactiveshell.py`
+    # by running the prompt itself in the current asyncio loop. The main reason
+    # for this is that nesting asyncio event loops is unreliable.
+    if PTK3:
+        return
+
+    # For prompt_toolkit 2.0, we can run the current asyncio event loop,
+    # because prompt_toolkit 2.0 uses a different event loop internally.
+
     def stop():
         loop.stop()
 
@@ -44,3 +61,4 @@ def stop():
         loop.run_forever()
     finally:
         loop.remove_reader(fileno)
+

From 2c41244b453a729067b3a85f99b03261f0a3dd76 Mon Sep 17 00:00:00 2001
From: Jonathan Slenders <jonathan@slenders.be>
Date: Mon, 2 Dec 2019 21:07:20 +0100
Subject: [PATCH 222/370] Handle situation where the user used 'asyncio.run'
 and clears the event loop.

---
 IPython/terminal/interactiveshell.py | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index aff48d36c5e..9f7d335ead8 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -449,22 +449,28 @@ def prompt_for_code(self):
         else:
             default = ''
 
-        with patch_stdout(raw=True):
-            # 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.
+        # 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()
-            asyncio.set_event_loop(self.pt_loop)
-            try:
+        except RuntimeError:
+            # This happens when the user used `asyncio.run()`.
+            old_loop = None
+
+        asyncio.set_event_loop(self.pt_loop)
+        try:
+            with patch_stdout(raw=True):
                 text = self.pt_app.prompt(
                     default=default,
                     **self._extra_prompt_options())
-            finally:
-                # Restore the original event loop.
-                asyncio.set_event_loop(old_loop)
+        finally:
+            # Restore the original event loop.
+            asyncio.set_event_loop(old_loop)
+
         return text
 
     def enable_win_unicode_console(self):

From 1507a55d532894b51d724be83bcac218c7e8270d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 1 Dec 2019 10:17:52 -0800
Subject: [PATCH 223/370] some sections

---
 tools/release_helper.sh | 119 ++++++++++++++++++++++------------------
 1 file changed, 66 insertions(+), 53 deletions(-)

diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index a50bf0edffe..46e00d47789 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -89,68 +89,81 @@ echo $GREEN"please update version number in ${RED}IPython/core/release.py${NOR}
 echo $GREEN"Press enter to continue"$NOR
 read
 
-echo 
-echo "Attempting to build the docs.."
-make html -C docs
+if ask_section "Build the documentation ?"
+then
+    make html -C docs
+    echo 
+    echo $GREEN"Check the docs, press enter to continue"$NOR
+    read
 
-echo 
-echo $GREEN"Check the docs, press enter to continue"$NOR
-read
+fi
 
 echo
 echo $BLUE"Attempting to build package..."$NOR
 
 tools/build_release
+rm dist/*
 
-echo
-echo "Let's commit : git commit -am \"release $VERSION\" -S"
-echo $GREEN"Press enter to commit"$NOR
-read
-git commit -am "release $VERSION" -S
-
-echo
-echo $BLUE"git push origin \$BRANCH ($BRANCH)?"$NOR
-echo $GREEN"Make sure you can push"$NOR
-echo $GREEN"Press enter to continue"$NOR
-read
-git push origin $BRANCH
-
-echo
-echo "Let's tag : git tag -am \"release $VERSION\" \"$VERSION\" -s"
-echo $GREEN"Press enter to tag commit"$NOR
-read
-git tag -am "release $VERSION" "$VERSION" -s
-
-echo
-echo $BLUE"And push the tag: git push origin \$VERSION ?"$NOR
-echo $GREEN"Press enter to continue"$NOR
-read
-git push origin $VERSION
-
-
-echo $GREEN"please update version number and back to .dev in ${RED}IPython/core/release.py"
-echo ${BLUE}"Do not commit yet – we'll do it later."$NOR
-
-echo $GREEN"Press enter to continue"$NOR
-read
-
-echo
-echo "Let's commit : git commit -am \"back to dev\" -S"
-echo $GREEN"Press enter to commit"$NOR
-read
-git commit -am "back to dev" -S
-
-
+if ask_section "Shoudl we commit, tag, push... etc ? "
+then
+   echo
+   echo "Let's commit : git commit -am \"release $VERSION\" -S"
+   echo $GREEN"Press enter to commit"$NOR
+   read
+   git commit -am "release $VERSION" -S
+   
+   echo
+   echo $BLUE"git push origin \$BRANCH ($BRANCH)?"$NOR
+   echo $GREEN"Make sure you can push"$NOR
+   echo $GREEN"Press enter to continue"$NOR
+   read
+   git push origin $BRANCH
+   
+   echo
+   echo "Let's tag : git tag -am \"release $VERSION\" \"$VERSION\" -s"
+   echo $GREEN"Press enter to tag commit"$NOR
+   read
+   git tag -am "release $VERSION" "$VERSION" -s
+   
+   echo
+   echo $BLUE"And push the tag: git push origin \$VERSION ?"$NOR
+   echo $GREEN"Press enter to continue"$NOR
+   read
+   git push origin $VERSION
+   
+   
+   echo $GREEN"please update version number and back to .dev in ${RED}IPython/core/release.py"
+   echo ${BLUE}"Do not commit yet – we'll do it later."$NOR
+   
+   echo $GREEN"Press enter to continue"$NOR
+   read
+   
+   echo
+   echo "Let's commit : git commit -am \"back to dev\" -S"
+   echo $GREEN"Press enter to commit"$NOR
+   read
+   git commit -am "back to dev" -S
+   
+   echo
+   echo $BLUE"let's : git checkout $VERSION"$NOR
+   echo $GREEN"Press enter to continue"$NOR
+   read
+   git checkout $VERSION
+fi
 
+if ask_section "Should we build and release ?"
+then
 
-echo
-echo $BLUE"let's : git checkout $VERSION"$NOR
-echo $GREEN"Press enter to continue"$NOR
-read
-git checkout $VERSION
+    echo
+    echo $BLUE"Attempting to build package..."$NOR
 
-# ./tools/release
-# ls ./dist
-# shasum -a 256 dist/*
+    tools/build_release
 
+    echo '$ shasum -a 256 dist/*'
+    shasum -a 256 dist/*
 
+    if ask_section "upload packages ?"
+    then 
+       tools/build_release upload
+    fi
+fi

From 4286ee62532ee84eb8bcbdb1400fd25610867e13 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 1 Dec 2019 10:20:19 -0800
Subject: [PATCH 224/370] a few typos

---
 tools/release_helper.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 46e00d47789..c82285ecd44 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -1,5 +1,5 @@
 # Simple tool to help for release
-# when releasing with bash, simplei source it to get asked questions. 
+# when releasing with bash, simple source it to get asked questions. 
 
 # misc check before starting
 
@@ -104,7 +104,7 @@ echo $BLUE"Attempting to build package..."$NOR
 tools/build_release
 rm dist/*
 
-if ask_section "Shoudl we commit, tag, push... etc ? "
+if ask_section "Should we commit, tag, push... etc ? "
 then
    echo
    echo "Let's commit : git commit -am \"release $VERSION\" -S"

From 565504a7f2a9c4bfbea2b6441f8f222a2a325f6e Mon Sep 17 00:00:00 2001
From: Joseph Kahn <josephbkahn@gmail.com>
Date: Wed, 4 Dec 2019 11:22:45 -0500
Subject: [PATCH 225/370] revert inputhook param location

---
 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 26188aeba8a..e9ba812b310 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -438,7 +438,7 @@ def get_message():
                             Condition(lambda: self.highlight_matching_brackets))],
                 }
         if not PTK3:
-            options['inputhook'] = self.inputhook
+            options['inputhook'] = self.shell.inputhook
 
         return options
 

From bcc84fb01a46f660c08f004842cbd7be3b6c8441 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Wed, 4 Dec 2019 11:35:04 -0800
Subject: [PATCH 226/370] Fix the right inputhook

Interactive shell and debugger have similar code. The fix was applied to
the wrong one, not sure how test were passing.
---
 IPython/terminal/debugger.py         | 2 +-
 IPython/terminal/interactiveshell.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index ba5ce1bada8..715f7c19926 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -66,7 +66,7 @@ def get_prompt_tokens():
         )
 
         if not PTK3:
-            options['inputhook'] = self.inputhook
+            options['inputhook'] = self.shell.inputhook
         self.pt_app = PromptSession(**options)
 
     def cmdloop(self, intro=None):
diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
index 312b691ace7..9f7d335ead8 100644
--- a/IPython/terminal/interactiveshell.py
+++ b/IPython/terminal/interactiveshell.py
@@ -438,7 +438,7 @@ def get_message():
                             Condition(lambda: self.highlight_matching_brackets))],
                 }
         if not PTK3:
-            options['inputhook'] = self.shell.inputhook
+            options['inputhook'] = self.inputhook
 
         return options
 

From a089b78315ef964f8552ffa52db569a8a924bfc2 Mon Sep 17 00:00:00 2001
From: kousik <kousikmitra12@gmail.com>
Date: Thu, 5 Dec 2019 23:08:14 +0530
Subject: [PATCH 227/370] Code Cleanup: Remove unused unused utility functions
 from 'IPython/utils/py3compat.py' #11985

---
 IPython/utils/py3compat.py | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/IPython/utils/py3compat.py b/IPython/utils/py3compat.py
index e5716650392..9b58c6feeec 100644
--- a/IPython/utils/py3compat.py
+++ b/IPython/utils/py3compat.py
@@ -13,8 +13,6 @@
 
 from .encoding import DEFAULT_ENCODING
 
-def no_code(x, encoding=None):
-    return x
 
 def decode(s, encoding=None):
     encoding = encoding or DEFAULT_ENCODING
@@ -44,7 +42,7 @@ def buffer_to_bytes(buf):
 def _modify_str_or_docstring(str_change_func):
     @functools.wraps(str_change_func)
     def wrapper(func_or_str):
-        if isinstance(func_or_str, string_types):
+        if isinstance(func_or_str, (str,)):
             func = None
             doc = func_or_str
         else:
@@ -66,17 +64,12 @@ def safe_unicode(e):
     safe to call unicode() on.
     """
     try:
-        return unicode_type(e)
+        return str(e)
     except UnicodeError:
         pass
 
     try:
-        return str_to_unicode(str(e))
-    except UnicodeError:
-        pass
-
-    try:
-        return str_to_unicode(repr(e))
+        return repr(e)
     except UnicodeError:
         pass
 
@@ -156,16 +149,6 @@ def input(prompt=''):
 builtin_mod_name = "builtins"
 import builtins as builtin_mod
 
-str_to_unicode = no_code
-unicode_to_str = no_code
-str_to_bytes = encode
-bytes_to_str = decode
-cast_bytes_py2 = no_code
-cast_unicode_py2 = no_code
-buffer_to_bytes_py2 = no_code
-
-string_types = (str,)
-unicode_type = str
 
 which = shutil.which
 

From f984edc39a6e247c9deecafb8752464aa8c7235e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Thu, 5 Dec 2019 15:54:21 -0800
Subject: [PATCH 228/370] Remove some of the cast_unicode as we can prove they
 are not bytes.

1) inspect getdoc impementation return None if docs is not str.
2) if a value is split, joined, or concatenated with str, it must be
str, or we woudl get a type error.
---
 IPython/core/oinspect.py | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 0ad709405de..c376c22d3ae 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -23,6 +23,7 @@
 import types
 import io as stdlib_io
 from itertools import zip_longest
+from typing import Union
 
 # IPython's own
 from IPython.core import page
@@ -110,7 +111,7 @@ def get_encoding(obj):
             encoding, lines = openpy.detect_encoding(buffer.readline)
         return encoding
 
-def getdoc(obj):
+def getdoc(obj) -> Union[str,None]:
     """Stable wrapper around inspect.getdoc.
 
     This can't crash because of attribute problems.
@@ -128,11 +129,10 @@ def getdoc(obj):
         if isinstance(ds, str):
             return inspect.cleandoc(ds)
     docstr = inspect.getdoc(obj)
-    encoding = get_encoding(obj)
-    return py3compat.cast_unicode(docstr, encoding=encoding)
+    return docstr
 
 
-def getsource(obj, oname=''):
+def getsource(obj, oname='') -> Union[str,None]:
     """Wrapper around inspect.getsource.
 
     This can be modified by other projects to provide customized source
@@ -158,18 +158,15 @@ def getsource(obj, oname=''):
             if fn is not None:
                 encoding = get_encoding(fn)
                 oname_prefix = ('%s.' % oname) if oname else ''
-                sources.append(cast_unicode(
-                    ''.join(('# ', oname_prefix, attrname)),
-                    encoding=encoding))
+                sources.append(''.join(('# ', oname_prefix, attrname)))
                 if inspect.isfunction(fn):
                     sources.append(dedent(getsource(fn)))
                 else:
                     # Default str/repr only prints function name,
                     # pretty.pretty prints module name too.
-                    sources.append(cast_unicode(
-                        '%s%s = %s\n' % (
-                            oname_prefix, attrname, pretty(fn)),
-                        encoding=encoding))
+                    sources.append(
+                        '%s%s = %s\n' % (oname_prefix, attrname, pretty(fn))
+                    )
         if sources:
             return '\n'.join(sources)
         else:
@@ -191,8 +188,7 @@ def getsource(obj, oname=''):
                 except TypeError:
                     return None
 
-        encoding = get_encoding(obj)
-        return cast_unicode(src, encoding=encoding)
+        return src
 
 
 def is_simple_callable(obj):
@@ -289,7 +285,7 @@ def _get_wrapped(obj):
             return orig_obj
     return obj
 
-def find_file(obj):
+def find_file(obj) -> str:
     """Find the absolute path to the file where an object was defined.
 
     This is essentially a robust wrapper around `inspect.getabsfile`.
@@ -370,18 +366,17 @@ def __init__(self, color_table=InspectColors,
         self.str_detail_level = str_detail_level
         self.set_active_scheme(scheme)
 
-    def _getdef(self,obj,oname=''):
+    def _getdef(self,obj,oname='') -> Union[str,None]:
         """Return the call signature for any callable object.
 
         If any exception is generated, None is returned instead and the
         exception is suppressed."""
         try:
-            hdef = _render_signature(signature(obj), oname)
-            return cast_unicode(hdef)
+            return _render_signature(signature(obj), oname)
         except:
             return None
 
-    def __head(self,h):
+    def __head(self,h) -> str:
         """Return a header string with proper colors."""
         return '%s%s%s' % (self.color_table.active_colors.header,h,
                            self.color_table.active_colors.normal)
@@ -517,7 +512,7 @@ def pfile(self, obj, oname=''):
             # 0-offset, so we must adjust.
             page.page(self.format(openpy.read_py_file(ofile, skip_encoding_cookie=False)), lineno - 1)
 
-    def _format_fields(self, fields, title_width=0):
+    def _format_fields(self, fields, title_width=0) -> str:
         """Formats a list of fields for display.
 
         Parameters
@@ -536,7 +531,7 @@ def _format_fields(self, fields, title_width=0):
                 title = header(title + ':') + '\n'
             else:
                 title = header((title + ':').ljust(title_width))
-            out.append(cast_unicode(title) + cast_unicode(content))
+            out.append(title + cast_unicode(content))
         return "\n".join(out)
 
     def _mime_format(self, text, formatter=None):
@@ -1015,7 +1010,7 @@ def psearch(self,pattern,ns_table,ns_search=[],
         page.page('\n'.join(sorted(search_result)))
 
 
-def _render_signature(obj_signature, obj_name):
+def _render_signature(obj_signature, obj_name) -> str:
     """
     This was mostly taken from inspect.Signature.__str__.
     Look there for the comments.

From 537d3ccf4c280b39a029956e1d36c5c1e2da880c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Thu, 5 Dec 2019 15:57:41 -0800
Subject: [PATCH 229/370] _format_fields is unused, removing.

---
 IPython/core/oinspect.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index c376c22d3ae..27513e1fe3c 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -512,28 +512,6 @@ def pfile(self, obj, oname=''):
             # 0-offset, so we must adjust.
             page.page(self.format(openpy.read_py_file(ofile, skip_encoding_cookie=False)), lineno - 1)
 
-    def _format_fields(self, fields, title_width=0) -> str:
-        """Formats a list of fields for display.
-
-        Parameters
-        ----------
-        fields : list
-          A list of 2-tuples: (field_title, field_content)
-        title_width : int
-          How many characters to pad titles to. Default to longest title.
-        """
-        out = []
-        header = self.__head
-        if title_width == 0:
-            title_width = max(len(title) + 2 for title, _ in fields)
-        for title, content in fields:
-            if len(content.splitlines()) > 1:
-                title = header(title + ':') + '\n'
-            else:
-                title = header((title + ':').ljust(title_width))
-            out.append(title + cast_unicode(content))
-        return "\n".join(out)
-
     def _mime_format(self, text, formatter=None):
         """Return a mime bundle representation of the input text.
 

From 5a8935c7ba75e3dedd18db7008609cb39b690f25 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Thu, 5 Dec 2019 14:40:58 -0800
Subject: [PATCH 230/370] Cleanup unused imports.

---
 IPython/core/completer.py                   | 2 +-
 IPython/core/displaypub.py                  | 2 +-
 IPython/core/interactiveshell.py            | 2 +-
 IPython/core/magics/basic.py                | 1 -
 IPython/core/magics/packaging.py            | 3 +--
 IPython/core/tests/refbug.py                | 1 -
 IPython/core/tests/test_async_helpers.py    | 1 -
 IPython/core/tests/test_display.py          | 2 +-
 IPython/core/tests/test_events.py           | 1 -
 IPython/core/tests/test_handlers.py         | 1 -
 IPython/extensions/tests/test_autoreload.py | 3 ---
 IPython/utils/daemonize.py                  | 2 +-
 IPython/utils/frame.py                      | 1 -
 IPython/utils/tests/test_io.py              | 5 -----
 IPython/utils/tests/test_path.py            | 4 ++--
 IPython/utils/tests/test_process.py         | 1 -
 16 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index 4906ae9d951..0942798f3b3 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 typing import Iterator, List, Tuple, Iterable, Union
+from typing import Iterator, List, Tuple, Iterable
 from types import SimpleNamespace
 
 from traitlets.config.configurable import Configurable
diff --git a/IPython/core/displaypub.py b/IPython/core/displaypub.py
index f651a2a0cf6..1da0458cf08 100644
--- a/IPython/core/displaypub.py
+++ b/IPython/core/displaypub.py
@@ -19,7 +19,7 @@
 import sys
 
 from traitlets.config.configurable import Configurable
-from traitlets import List, Dict
+from traitlets import List
 
 # This used to be defined here - it is imported for backwards compatibility
 from .display import publish_display_data
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index dc8bd236d3b..d8bb3e59ec9 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -13,7 +13,6 @@
 
 import abc
 import ast
-import asyncio
 import atexit
 import builtins as builtin_mod
 import functools
@@ -87,6 +86,7 @@
 
 # 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
 
 try:
diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py
index 906d3d5ebdf..5c8649b5408 100644
--- a/IPython/core/magics/basic.py
+++ b/IPython/core/magics/basic.py
@@ -5,7 +5,6 @@
 from logging import error
 import io
 from pprint import pformat
-import textwrap
 import sys
 from warnings import warn
 
diff --git a/IPython/core/magics/packaging.py b/IPython/core/magics/packaging.py
index 6477c7defc7..cfee7865f5d 100644
--- a/IPython/core/magics/packaging.py
+++ b/IPython/core/magics/packaging.py
@@ -12,7 +12,6 @@
 import re
 import shlex
 import sys
-from subprocess import Popen, PIPE
 
 from IPython.core.magic import Magics, magics_class, line_magic
 
@@ -101,4 +100,4 @@ def conda(self, line):
             extra_args.extend(["--prefix", sys.prefix])
 
         self.shell.system(' '.join([conda, command] + extra_args + args))
-        print("\nNote: you may need to restart the kernel to use updated packages.")
\ No newline at end of file
+        print("\nNote: you may need to restart the kernel to use updated packages.")
diff --git a/IPython/core/tests/refbug.py b/IPython/core/tests/refbug.py
index b8de4c81078..92e2eead347 100644
--- a/IPython/core/tests/refbug.py
+++ b/IPython/core/tests/refbug.py
@@ -16,7 +16,6 @@
 #-----------------------------------------------------------------------------
 # Module imports
 #-----------------------------------------------------------------------------
-import sys
 
 from IPython import get_ipython
 
diff --git a/IPython/core/tests/test_async_helpers.py b/IPython/core/tests/test_async_helpers.py
index 2432d8b5e4e..2932189c63a 100644
--- a/IPython/core/tests/test_async_helpers.py
+++ b/IPython/core/tests/test_async_helpers.py
@@ -3,7 +3,6 @@
 
 Should only trigger on python 3.5+ or will have syntax errors.
 """
-import sys
 from itertools import chain, repeat
 import nose.tools as nt
 from textwrap import dedent, indent
diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index 1fed51127a1..0ce4ad2b429 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -14,7 +14,7 @@
 from IPython.utils.io import capture_output
 from IPython.utils.tempdir import NamedFileInTemporaryDirectory
 from IPython import paths as ipath
-from IPython.testing.tools import AssertPrints, AssertNotPrints
+from IPython.testing.tools import AssertNotPrints
 
 import IPython.testing.decorators as dec
 
diff --git a/IPython/core/tests/test_events.py b/IPython/core/tests/test_events.py
index db79b4ffc8e..a4211ecea4c 100644
--- a/IPython/core/tests/test_events.py
+++ b/IPython/core/tests/test_events.py
@@ -1,4 +1,3 @@
-from backcall import callback_prototype
 import unittest
 from unittest.mock import Mock
 import nose.tools as nt
diff --git a/IPython/core/tests/test_handlers.py b/IPython/core/tests/test_handlers.py
index 02860c8b4af..19248177295 100644
--- a/IPython/core/tests/test_handlers.py
+++ b/IPython/core/tests/test_handlers.py
@@ -10,7 +10,6 @@
 # our own packages
 from IPython.core import autocall
 from IPython.testing import tools as tt
-from IPython.utils import py3compat
 
 #-----------------------------------------------------------------------------
 # Globals
diff --git a/IPython/extensions/tests/test_autoreload.py b/IPython/extensions/tests/test_autoreload.py
index fe62db0c353..e81bf221515 100644
--- a/IPython/extensions/tests/test_autoreload.py
+++ b/IPython/extensions/tests/test_autoreload.py
@@ -26,8 +26,6 @@
 
 from unittest import TestCase
 
-from IPython.testing.decorators import skipif
-
 from IPython.extensions.autoreload import AutoreloadMagics
 from IPython.core.events import EventManager, pre_run_cell
 
@@ -141,7 +139,6 @@ def pickle_get_current_class(obj):
 class TestAutoreload(Fixture):
 
     def test_reload_enums(self):
-        import enum
         mod_name, mod_fn = self.new_module(textwrap.dedent("""
                                 from enum import Enum
                                 class MyEnum(Enum):
diff --git a/IPython/utils/daemonize.py b/IPython/utils/daemonize.py
index 0de3852c78c..44b4a2832e0 100644
--- a/IPython/utils/daemonize.py
+++ b/IPython/utils/daemonize.py
@@ -1,4 +1,4 @@
 from warnings import warn
 
-warn("IPython.utils.daemonize has moved to ipyparallel.apps.daemonize", stacklevel=2)
+warn("IPython.utils.daemonize has moved to ipyparallel.apps.daemonize since IPython 4.0", DeprecationWarning, stacklevel=2)
 from ipyparallel.apps.daemonize import daemonize
diff --git a/IPython/utils/frame.py b/IPython/utils/frame.py
index 11dab31f8d0..74c6d4197f4 100644
--- a/IPython/utils/frame.py
+++ b/IPython/utils/frame.py
@@ -15,7 +15,6 @@
 #-----------------------------------------------------------------------------
 
 import sys
-from IPython.utils import py3compat
 
 #-----------------------------------------------------------------------------
 # Code
diff --git a/IPython/utils/tests/test_io.py b/IPython/utils/tests/test_io.py
index e6af8c25a43..83367fa9e9f 100644
--- a/IPython/utils/tests/test_io.py
+++ b/IPython/utils/tests/test_io.py
@@ -5,9 +5,6 @@
 # Distributed under the terms of the Modified BSD License.
 
 
-import io as stdlib_io
-import os.path
-import stat
 import sys
 from io import StringIO
 
@@ -16,9 +13,7 @@
 
 import nose.tools as nt
 
-from IPython.testing.decorators import skipif, skip_win32
 from IPython.utils.io import IOStream, Tee, capture_output
-from IPython.utils.tempdir import TemporaryDirectory
 
 
 def test_tee_simple():
diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index 987177bc101..74f21c3b50a 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -21,9 +21,9 @@
 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, skipif,
+                                        onlyif_unicode_paths,
                                         skip_win32_py38,)
-from IPython.testing.tools import make_tempfile, AssertPrints
+from IPython.testing.tools import make_tempfile
 from IPython.utils import path
 from IPython.utils.tempdir import TemporaryDirectory
 
diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index 956b2abbae2..0c81138cd19 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -16,7 +16,6 @@
 
 import sys
 import os
-from unittest import TestCase
 
 import nose.tools as nt
 

From d525e643e56b2698f6859830c687bf9a0f5571e5 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Thu, 5 Dec 2019 16:27:41 -0800
Subject: [PATCH 231/370] cast_unicode code simplification.

Also simplify also the creation of a dictionary with dict comprehension.
---
 IPython/core/oinspect.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index 27513e1fe3c..c27d8b31d8c 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -22,7 +22,7 @@
 from textwrap import dedent
 import types
 import io as stdlib_io
-from itertools import zip_longest
+
 from typing import Union
 
 # IPython's own
@@ -83,7 +83,7 @@ def pylight(code):
 
 def object_info(**kw):
     """Make an object info dict with all fields present."""
-    infodict = dict(zip_longest(info_fields, [None]))
+    infodict = {k:None for k in info_fields}
     infodict.update(kw)
     return infodict
 
@@ -512,7 +512,8 @@ def pfile(self, obj, oname=''):
             # 0-offset, so we must adjust.
             page.page(self.format(openpy.read_py_file(ofile, skip_encoding_cookie=False)), lineno - 1)
 
-    def _mime_format(self, text, formatter=None):
+
+    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
@@ -528,7 +529,6 @@ def _mime_format(self, text, formatter=None):
         Formatters returning strings are supported but this behavior is deprecated.
 
         """
-        text = cast_unicode(text)
         defaults = {
             'text/plain': text,
             'text/html': '<pre>' + text + '</pre>'
@@ -591,7 +591,7 @@ def _get_info(self, obj, oname='', formatter=None, info=None, detail_level=0):
             'text/html': '',
         }
 
-        def append_field(bundle, title, key, formatter=None):
+        def append_field(bundle, title:str, key:str, formatter=None):
             field = info[key]
             if field is not None:
                 formatted_field = self._mime_format(field, formatter)
@@ -711,7 +711,8 @@ def _info(self, obj, oname='', info=None, detail_level=0) -> dict:
         Returns
         =======
 
-        An object info dict with known fields from `info_fields`.
+        An object info dict with known fields from `info_fields`. Keys are
+        strings, values are string or None.
         """
 
         if info is None:

From 788aabe73859ce041a0e3d05533eaa94fff1966c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Tue, 10 Dec 2019 08:58:36 -0500
Subject: [PATCH 232/370] Remove one unnecessary shell=True option in
 subprocess.

See #12023
---
 IPython/utils/sysinfo.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IPython/utils/sysinfo.py b/IPython/utils/sysinfo.py
index 7c29ed028d5..07d14fd8a48 100644
--- a/IPython/utils/sysinfo.py
+++ b/IPython/utils/sysinfo.py
@@ -55,10 +55,10 @@ def pkg_commit_hash(pkg_path):
         return "installation", _sysinfo.commit
 
     # maybe we are in a repository
-    proc = subprocess.Popen('git rev-parse --short HEAD',
+    proc = subprocess.Popen('git rev-parse --short HEAD'.split(' '),
                             stdout=subprocess.PIPE,
                             stderr=subprocess.PIPE,
-                            cwd=pkg_path, shell=True)
+                            cwd=pkg_path)
     repo_commit, _ = proc.communicate()
     if repo_commit:
         return 'repository', repo_commit.strip().decode('ascii')

From ee13e3c65f38a87cefffcf618b3387181b4883be Mon Sep 17 00:00:00 2001
From: Jonathan Slenders <jonathan@slenders.be>
Date: Wed, 11 Dec 2019 21:03:51 +0100
Subject: [PATCH 233/370] Use separate asyncio event loop for user input in
 debugger.

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

diff --git a/IPython/terminal/debugger.py b/IPython/terminal/debugger.py
index 715f7c19926..475c6b8ca94 100644
--- a/IPython/terminal/debugger.py
+++ b/IPython/terminal/debugger.py
@@ -1,3 +1,4 @@
+import asyncio
 import signal
 import sys
 
@@ -67,6 +68,7 @@ def get_prompt_tokens():
 
         if not PTK3:
             options['inputhook'] = self.shell.inputhook
+        self.pt_loop = asyncio.new_event_loop()
         self.pt_app = PromptSession(**options)
 
     def cmdloop(self, intro=None):
@@ -79,6 +81,19 @@ 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
+
+
         self.preloop()
 
         try:
@@ -93,10 +108,16 @@ def cmdloop(self, intro=None):
                 else:
                     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() # reset_current_buffer=True)
+                        line = self.pt_app.prompt()
                     except EOFError:
                         line = 'EOF'
+                    finally:
+                        # Restore the original event loop.
+                        asyncio.set_event_loop(old_loop)
+
                 line = self.precmd(line)
                 stop = self.onecmd(line)
                 stop = self.postcmd(stop, line)

From c2c3b03e6ba8ff3980946be547e6e10a8d4f63dd Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Wed, 11 Dec 2019 15:04:26 -0800
Subject: [PATCH 234/370] remove cast_unicode and add some typings

---
 IPython/core/inputsplitter.py | 8 ++++----
 IPython/utils/text.py         | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/IPython/core/inputsplitter.py b/IPython/core/inputsplitter.py
index 84aa0a71f0f..0256278acb4 100644
--- a/IPython/core/inputsplitter.py
+++ b/IPython/core/inputsplitter.py
@@ -386,7 +386,7 @@ def check_complete(self, source):
         finally:
             self.reset()
 
-    def push(self, lines):
+    def push(self, lines:str) -> bool:
         """Push one or more lines of input.
 
         This stores the given lines and returns a status code indicating
@@ -408,6 +408,7 @@ def push(self, lines):
           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)
         source = self.source
 
@@ -677,7 +678,7 @@ def transform_cell(self, cell):
         finally:
             self.reset()
 
-    def push(self, lines):
+    def push(self, lines:str) -> bool:
         """Push one or more lines of IPython input.
 
         This stores the given lines and returns a status code indicating
@@ -700,9 +701,8 @@ def push(self, lines):
           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
-        lines = cast_unicode(lines, self.encoding)
         # ''.splitlines() --> [], but we need to push the empty line to transformers
         lines_list = lines.splitlines()
         if not lines_list:
diff --git a/IPython/utils/text.py b/IPython/utils/text.py
index e844203ca0e..14405ede1f7 100644
--- a/IPython/utils/text.py
+++ b/IPython/utils/text.py
@@ -538,7 +538,7 @@ class FullEvalFormatter(Formatter):
     """
     # copied from Formatter._vformat with minor changes to allow eval
     # and replace the format_spec code with slicing
-    def vformat(self, format_string, args, kwargs):
+    def vformat(self, format_string:str, args, kwargs)->str:
         result = []
         for literal_text, field_name, format_spec, conversion in \
                 self.parse(format_string):
@@ -566,7 +566,7 @@ def vformat(self, format_string, args, kwargs):
                 # format the object and append to the result
                 result.append(self.format_field(obj, ''))
 
-        return ''.join(py3compat.cast_unicode(s) for s in result)
+        return ''.join(result)
 
 
 class DollarFormatter(FullEvalFormatter):

From 23e618db87df269d82f828cba5b2f729e5eb5d9d Mon Sep 17 00:00:00 2001
From: kousik <kousikmitra12@gmail.com>
Date: Thu, 12 Dec 2019 10:42:41 +0530
Subject: [PATCH 235/370] Removed unused py2 compact functions #12014

---
 IPython/utils/py3compat.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/IPython/utils/py3compat.py b/IPython/utils/py3compat.py
index 9b58c6feeec..50be2f872b8 100644
--- a/IPython/utils/py3compat.py
+++ b/IPython/utils/py3compat.py
@@ -157,9 +157,6 @@ def isidentifier(s, dotted=False):
         return all(isidentifier(a) for a in s.split("."))
     return s.isidentifier()
 
-xrange = range
-def iteritems(d): return iter(d.items())
-def itervalues(d): return iter(d.values())
 getcwd = os.getcwd
 
 MethodType = types.MethodType

From 0606868436f21c920b7aaff94c8526c8e3550ce7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Thu, 12 Dec 2019 10:18:16 -0800
Subject: [PATCH 236/370] Remove one appveyor test on win32.

Appveyor is often the limiting CI.

Keep both 64 and 32 on both max/min version of Python supported
---
 appveyor.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5ed18735ff0..b79c7f26ff4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,10 +12,6 @@ environment:
      PYTHON_VERSION: "3.6.x"
      PYTHON_ARCH: "64"
 
-   - PYTHON: "C:\\Python37"
-     PYTHON_VERSION: "3.7.x"
-     PYTHON_ARCH: "32"
-
    - PYTHON: "C:\\Python37-x64"
      PYTHON_VERSION: "3.7.x"
      PYTHON_ARCH: "64"

From b24c2e57e99aba62f8627083e9ed676fbaa4a736 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Thu, 12 Dec 2019 15:51:05 -0800
Subject: [PATCH 237/370] Remove Py3compat from the save magic code.

closes #12018
---
 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 41aa37ca7cf..a1841384651 100644
--- a/IPython/core/magics/code.py
+++ b/IPython/core/magics/code.py
@@ -29,7 +29,6 @@
 from IPython.core.magic import Magics, magics_class, line_magic
 from IPython.core.oinspect import find_file, find_source_lines
 from IPython.testing.skipdoctest import skip_doctest
-from IPython.utils import py3compat
 from IPython.utils.contexts import preserve_keys
 from IPython.utils.path import get_py_filename
 from warnings import warn
@@ -214,9 +213,9 @@ def save(self, parameter_s=''):
         force = 'f' in opts
         append = 'a' in opts
         mode = 'a' if append else 'w'
-        ext = u'.ipy' if raw else u'.py'
+        ext = '.ipy' if raw else '.py'
         fname, codefrom = args[0], " ".join(args[1:])
-        if not fname.endswith((u'.py',u'.ipy')):
+        if not fname.endswith(('.py','.ipy')):
             fname += ext
         file_exists = os.path.isfile(fname)
         if file_exists and not force and not append:
@@ -233,14 +232,13 @@ def save(self, parameter_s=''):
         except (TypeError, ValueError) as e:
             print(e.args[0])
             return
-        out = py3compat.cast_unicode(cmds)
         with io.open(fname, mode, encoding="utf-8") as f:
             if not file_exists or not append:
-                f.write(u"# coding: utf-8\n")
-            f.write(out)
+                f.write("# coding: utf-8\n")
+            f.write(cmds)
             # make sure we end on a newline
-            if not out.endswith(u'\n'):
-                f.write(u'\n')
+            if not cmds.endswith('\n'):
+                f.write('\n')
         print('The following commands were written to file `%s`:' % fname)
         print(cmds)
 

From e4b383a79d89b13083477517f06c606ebe98878f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Thu, 12 Dec 2019 15:59:10 -0800
Subject: [PATCH 238/370] Remove py3compat cast_unicode from utils/path.

in Python3 os.environ will always be strings, if you need bytes you
manipulate os.environb
---
 IPython/utils/path.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index f2f1ea06f5a..0fb6144e19f 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -15,13 +15,11 @@
 from warnings import warn
 
 from IPython.utils.process import system
-from IPython.utils import py3compat
 from IPython.utils.decorators import undoc
 
 #-----------------------------------------------------------------------------
 # Code
 #-----------------------------------------------------------------------------
-
 fs_encoding = sys.getfilesystemencoding()
 
 def _writable_dir(path):
@@ -226,7 +224,8 @@ def get_xdg_dir():
         # use ~/.config if empty OR not set
         xdg = env.get("XDG_CONFIG_HOME", None) or os.path.join(get_home_dir(), '.config')
         if xdg and _writable_dir(xdg):
-            return py3compat.cast_unicode(xdg, fs_encoding)
+            assert isinstance(xdg, str)
+            return xdg
 
     return None
 
@@ -244,7 +243,8 @@ def get_xdg_cache_dir():
         # use ~/.cache if empty OR not set
         xdg = env.get("XDG_CACHE_HOME", None) or os.path.join(get_home_dir(), '.cache')
         if xdg and _writable_dir(xdg):
-            return py3compat.cast_unicode(xdg, fs_encoding)
+            assert isinstance(xdg, str)
+            return xdg
 
     return None
 

From 2df0cf135595664b4d595d6bf48f748ba03ac1cf Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Thu, 12 Dec 2019 16:10:23 -0800
Subject: [PATCH 239/370] remove unused import (cast_unicode)

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

diff --git a/IPython/core/inputsplitter.py b/IPython/core/inputsplitter.py
index 0256278acb4..e7bc6e7f5a3 100644
--- a/IPython/core/inputsplitter.py
+++ b/IPython/core/inputsplitter.py
@@ -31,7 +31,6 @@
 import tokenize
 import warnings
 
-from IPython.utils.py3compat import cast_unicode
 from IPython.core.inputtransformer import (leading_indent,
                                            classic_prompt,
                                            ipy_prompt,

From cec52bd225a7f4d9dd41d27f110ddfb165edbb10 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Thu, 12 Dec 2019 16:41:15 -0800
Subject: [PATCH 240/370] Remove more references to py3compat.

`input` is unnecessary; and so is `u_format`
---
 IPython/core/tests/test_inputsplitter.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/IPython/core/tests/test_inputsplitter.py b/IPython/core/tests/test_inputsplitter.py
index 0b3e47d35b5..a39943aed80 100644
--- a/IPython/core/tests/test_inputsplitter.py
+++ b/IPython/core/tests/test_inputsplitter.py
@@ -14,8 +14,6 @@
 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.utils import py3compat
-from IPython.utils.py3compat  import input
 
 #-----------------------------------------------------------------------------
 # Semi-complete examples (also used as tests)
@@ -568,8 +566,8 @@ class CellMagicsCommon(object):
     def test_whole_cell(self):
         src = "%%cellm line\nbody\n"
         out = self.sp.transform_cell(src)
-        ref = u"get_ipython().run_cell_magic('cellm', 'line', 'body')\n"
-        nt.assert_equal(out, py3compat.u_format(ref))
+        ref = "get_ipython().run_cell_magic('cellm', 'line', 'body')\n"
+        nt.assert_equal(out, ref)
     
     def test_cellmagic_help(self):
         self.sp.push('%%cellm?')

From 939ead039136510adcf4d34c312dc9b6209c1f2b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 13 Dec 2019 19:59:57 -0800
Subject: [PATCH 241/370] 7.10.2 release notes

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

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index c4ba18635b2..87c312b8862 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,14 @@
  7.x Series
 ============
 
+.. _version 7102:
+
+IPython 7.10.2
+==============
+
+IPython 7.10.2 fix a couple of extra incompatibility between IPython, ipdb,
+asyncio and Prompt Toolkit 3.
+
 .. _version 7101:
 
 IPython 7.10.1

From 6dc6b7250c0b9cba85eed7aea6e728e95c96754c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 14 Dec 2019 10:23:22 -0800
Subject: [PATCH 242/370] 7.10.2 stats (forward port from 7.10.x branch)

---
 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 958954ebf5d..121c35a4f47 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.10.2
+-----------------------
+
+
+GitHub stats for 2019/12/01 - 2019/12/14 (tag: 7.10.1)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 3 issues and merged 10 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A7.10.2>`__
+
+The following 3 authors contributed 11 commits.
+
+* Jonathan Slenders
+* Joseph Kahn
+* Matthias Bussonnier
+
 Issues closed in 7.10.1
 -----------------------
 

From b87c2b69042bfa48f688e07343934e0d4fee759a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 14 Dec 2019 14:42:11 -0800
Subject: [PATCH 243/370] Remove try/except import for Py2 compat

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

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 9ce896ec634..ebb8dcac0d8 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -153,10 +153,7 @@ def __init__(self, colors=None):
         # at least raise that limit to 80 chars, which should be enough for
         # most interactive uses.
         try:
-            try:
-                from reprlib import aRepr  # Py 3
-            except ImportError:
-                from repr import aRepr  # Py 2
+            from reprlib import aRepr
             aRepr.maxstring = 80
         except:
             # This is only a user-facing convenience, so any error we encounter

From d670c431a5e85a930c575d3f69152dc21c38b887 Mon Sep 17 00:00:00 2001
From: Quentin Peter <qaep2@cam.ac.uk>
Date: Sun, 15 Dec 2019 05:26:59 +0000
Subject: [PATCH 244/370] fix syntax error

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

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index eef16cc650a..a770d9028cb 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -627,6 +627,12 @@ def __call__(self, etype, value, elist):
         self.ostream.write(self.text(etype, value, elist))
         self.ostream.write('\n')
 
+    def _extract_tb(self, tb):
+        if tb:
+            return traceback.extract_tb(tb)
+        else:
+            return None
+
     def structured_traceback(self, etype, evalue, etb=None, tb_offset=None,
                              context=5):
         """Return a color formatted string with the traceback info.
@@ -1303,12 +1309,6 @@ def __init__(self, mode='Plain', color_scheme='Linux', call_pdb=False,
         # set_mode also sets the tb_join_char attribute
         self.set_mode(mode)
 
-    def _extract_tb(self, tb):
-        if tb:
-            return traceback.extract_tb(tb)
-        else:
-            return None
-
     def structured_traceback(self, etype, value, tb, tb_offset=None, number_of_lines_of_context=5):
         tb_offset = self.tb_offset if tb_offset is None else tb_offset
         mode = self.mode
@@ -1409,7 +1409,10 @@ def structured_traceback(self, etype=None, value=None, tb=None,
                              tb_offset=None, number_of_lines_of_context=5):
         if etype is None:
             etype, value, tb = sys.exc_info()
-        self.tb = tb
+        if not isinstance(tb, tuple):
+            # tb is a tuple if this is a chained exception.
+            # We keep first traceback.
+            self.tb = tb
         return FormattedTB.structured_traceback(
             self, etype, value, tb, tb_offset, number_of_lines_of_context)
 

From c9fc4159fb78cfd97ed42a4acf0df259a93cd4a6 Mon Sep 17 00:00:00 2001
From: Quentin Peter <qaep2@cam.ac.uk>
Date: Sun, 15 Dec 2019 13:02:08 +0000
Subject: [PATCH 245/370] save traceback for chained exception

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

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index a770d9028cb..e1f805738a0 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -1409,9 +1409,10 @@ def structured_traceback(self, etype=None, value=None, tb=None,
                              tb_offset=None, number_of_lines_of_context=5):
         if etype is None:
             etype, value, tb = sys.exc_info()
-        if not isinstance(tb, tuple):
+        if isinstance(tb, tuple):
             # tb is a tuple if this is a chained exception.
-            # We keep first traceback.
+            self.tb = tb[0]
+        else:
             self.tb = tb
         return FormattedTB.structured_traceback(
             self, etype, value, tb, tb_offset, number_of_lines_of_context)

From a05409fd4543127086bb048d6d6015de86e31520 Mon Sep 17 00:00:00 2001
From: Naveen Honest Raj K <naveendurai19@gmail.com>
Date: Mon, 16 Dec 2019 10:49:28 +0530
Subject: [PATCH 246/370] removed snip_print fn because unused

Signed-off-by: Naveen Honest Raj K <naveendurai19@gmail.com>
---
 IPython/core/page.py | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/IPython/core/page.py b/IPython/core/page.py
index afdded29b1a..ed16b617812 100644
--- a/IPython/core/page.py
+++ b/IPython/core/page.py
@@ -341,32 +341,3 @@ def page_more():
             return False
         else:
             return True
-
-
-def snip_print(str,width = 75,print_full = 0,header = ''):
-    """Print a string snipping the midsection to fit in width.
-
-    print_full: mode control:
-    
-      - 0: only snip long strings
-      - 1: send to page() directly.
-      - 2: snip long strings and ask for full length viewing with page()
-    
-    Return 1 if snipping was necessary, 0 otherwise."""
-
-    if print_full == 1:
-        page(header+str)
-        return 0
-
-    print(header, end=' ')
-    if len(str) < width:
-        print(str)
-        snip = 0
-    else:
-        whalf = int((width -5)/2)
-        print(str[:whalf] + ' <...> ' + str[-whalf:])
-        snip = 1
-    if snip and print_full == 2:
-        if py3compat.input(header+' Snipped. View (y/n)? [N]').lower() == 'y':
-            page(str)
-    return snip

From 0546e3994ca0b297788646d3ca28e16d3b7dfe83 Mon Sep 17 00:00:00 2001
From: kousik <kousikmitra12@gmail.com>
Date: Mon, 16 Dec 2019 11:47:16 +0530
Subject: [PATCH 247/370] Removed IPython.core.page:snip_print #12038

---
 IPython/core/page.py | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/IPython/core/page.py b/IPython/core/page.py
index afdded29b1a..ed16b617812 100644
--- a/IPython/core/page.py
+++ b/IPython/core/page.py
@@ -341,32 +341,3 @@ def page_more():
             return False
         else:
             return True
-
-
-def snip_print(str,width = 75,print_full = 0,header = ''):
-    """Print a string snipping the midsection to fit in width.
-
-    print_full: mode control:
-    
-      - 0: only snip long strings
-      - 1: send to page() directly.
-      - 2: snip long strings and ask for full length viewing with page()
-    
-    Return 1 if snipping was necessary, 0 otherwise."""
-
-    if print_full == 1:
-        page(header+str)
-        return 0
-
-    print(header, end=' ')
-    if len(str) < width:
-        print(str)
-        snip = 0
-    else:
-        whalf = int((width -5)/2)
-        print(str[:whalf] + ' <...> ' + str[-whalf:])
-        snip = 1
-    if snip and print_full == 2:
-        if py3compat.input(header+' Snipped. View (y/n)? [N]').lower() == 'y':
-            page(str)
-    return snip

From 9444858e55e7d3de5433e4642f64cc9363fb2381 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 27 Dec 2019 14:12:17 +0100
Subject: [PATCH 248/370] Use update brew tap to fix test failures.

This will need to be reverted at some points in the future once
https://github.com/minrk/homebrew-python-frameworks/pull/2 is merged
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f0d4dc6f126..c0aad50b4ea 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 minrk/homebrew-python-frameworks
+        HOMEBREW_NO_AUTO_UPDATE=1 brew tap carreau/homebrew-python-frameworks
         HOMEBREW_NO_AUTO_UPDATE=1 brew cask install python-framework-${TRAVIS_PYTHON_VERSION/./}
       fi
       python3 -m pip install virtualenv

From 3697d322d153a470d45de676eb224e3cdc311d8b Mon Sep 17 00:00:00 2001
From: takuya fujiwara <mobilefujitaku@gmail.com>
Date: Sat, 21 Dec 2019 01:45:26 +0900
Subject: [PATCH 249/370] Remove unused annotate function in py3compat #12011

---
 IPython/utils/py3compat.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/IPython/utils/py3compat.py b/IPython/utils/py3compat.py
index 50be2f872b8..7a57514a340 100644
--- a/IPython/utils/py3compat.py
+++ b/IPython/utils/py3compat.py
@@ -190,18 +190,6 @@ def get_closure(f):
 PYPY = platform.python_implementation() == "PyPy"
 
 
-def annotate(**kwargs):
-    """Python 3 compatible function annotation for Python 2."""
-    if not kwargs:
-        raise ValueError('annotations must be provided as keyword arguments')
-    def dec(f):
-        if hasattr(f, '__annotations__'):
-            for k, v in kwargs.items():
-                f.__annotations__[k] = v
-        else:
-            f.__annotations__ = kwargs
-        return f
-    return dec
 
 
 # Parts below taken from six:

From d6b29e2567c6d952d9c31f4e37d04c03c7278119 Mon Sep 17 00:00:00 2001
From: Marc Hernandez Cabot <noviluni@gmail.com>
Date: Thu, 19 Dec 2019 21:56:17 +0100
Subject: [PATCH 250/370] remove duplicated entry in gitignore

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 4471ae7e307..1fc0e22a320 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ docs/source/api/generated
 docs/source/config/options
 docs/source/config/shortcuts/*.csv
 docs/source/interactive/magics-generated.txt
-docs/source/config/shortcuts/*.csv
 docs/gh-pages
 jupyter_notebook/notebook/static/mathjax
 jupyter_notebook/static/style/*.map

From 8d5912e8df4fd1d643bc214c3b6b777a3755410a Mon Sep 17 00:00:00 2001
From: Marc Hernandez Cabot <noviluni@gmail.com>
Date: Thu, 19 Dec 2019 22:00:23 +0100
Subject: [PATCH 251/370] fix ipyparallel duplicated entry

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

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 8a7a6098c3f..bd78b98ae4a 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -225,7 +225,6 @@ def is_stable(extra):
 intersphinx_mapping = {'python': ('https://docs.python.org/3/', None),
                        'rpy2': ('https://rpy2.readthedocs.io/en/version_2.8.x/', None),
                        'jupyterclient': ('https://jupyter-client.readthedocs.io/en/latest/', None),
-                       'ipyparallel': ('https://ipyparallel.readthedocs.io/en/latest/', None),
                        'jupyter': ('https://jupyter.readthedocs.io/en/latest/', None),
                        'jedi': ('https://jedi.readthedocs.io/en/latest/', None),
                        'traitlets': ('https://traitlets.readthedocs.io/en/latest/', None),

From a67a3d70b8204f42e9bc4d570587a32450e4e9b2 Mon Sep 17 00:00:00 2001
From: Marc Hernandez Cabot <noviluni@gmail.com>
Date: Thu, 19 Dec 2019 22:02:36 +0100
Subject: [PATCH 252/370] fix argument in format string

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

diff --git a/IPython/testing/ipunittest.py b/IPython/testing/ipunittest.py
index 56146d1de26..5a940a5fe91 100644
--- a/IPython/testing/ipunittest.py
+++ b/IPython/testing/ipunittest.py
@@ -155,7 +155,7 @@ def test(self):
                     # failed should contain at most one item.  More than that
                     # is a case we can't handle and should error out on
                     if len(failed) > 1:
-                        err = "Invalid number of test results:" % failed
+                        err = "Invalid number of test results: %s" % failed
                         raise ValueError(err)
                     # Report a normal failure.
                     self.fail('failed doctests: %s' % str(failed[0]))

From 003ab938319421376e3d573e27a27833a8e85d93 Mon Sep 17 00:00:00 2001
From: Jonathan Feinberg <jonathf@gmail.com>
Date: Sat, 21 Dec 2019 15:39:04 +0100
Subject: [PATCH 253/370] Adding VI-mode in prompt

From the code it is apparent that if vi-mode is enabled, it should
display in the prompt. However, as the compare done is done against an
Enum class, it will always return False.

The solution is either to access the Enum's `.value` attribute, or to
compare it to the declared Enum value directly. The latter is likely
more readable.
---
 IPython/terminal/prompts.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IPython/terminal/prompts.py b/IPython/terminal/prompts.py
index db1b751a026..ee2c5d7052e 100644
--- a/IPython/terminal/prompts.py
+++ b/IPython/terminal/prompts.py
@@ -7,6 +7,7 @@
 
 from prompt_toolkit.formatted_text import fragment_list_width, PygmentsTokens
 from prompt_toolkit.shortcuts import print_formatted_text
+from prompt_toolkit.enums import EditingMode
 
 
 class Prompts(object):
@@ -14,7 +15,7 @@ def __init__(self, shell):
         self.shell = shell
 
     def vi_mode(self):
-        if (getattr(self.shell.pt_app, 'editing_mode', None) == 'VI'
+        if (getattr(self.shell.pt_app, 'editing_mode', None) == EditingMode.VI
                 and self.shell.prompt_includes_vi_mode):
             return '['+str(self.shell.pt_app.app.vi_state.input_mode)[3:6]+'] '
         return ''

From ee3eebcc0768f845f00a516296959438fdb32384 Mon Sep 17 00:00:00 2001
From: Jonathan Feinberg <jonathf@gmail.com>
Date: Sat, 21 Dec 2019 16:07:17 +0100
Subject: [PATCH 254/370] Support vi-mode 'InputFormat' prompt

Prompt defining what vi-mode is in, is either 'vi-insert' or 'vi-navigate' (or something 'vi-...' I imagine).
From this `[3:6]` is extracted to get either 'ins' or 'nav' in the prompt.
This is consistent with the behavior I experience when manipulating a custom prompt from the most updated pip installable package.

However, in the case of installing the current master from source, the prompt is on the format 'InputFormat.INSERT' and 'InputFormat.NAVIGATION'.
---
 IPython/terminal/prompts.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/IPython/terminal/prompts.py b/IPython/terminal/prompts.py
index ee2c5d7052e..3f5c07b980e 100644
--- a/IPython/terminal/prompts.py
+++ b/IPython/terminal/prompts.py
@@ -17,7 +17,12 @@ def __init__(self, shell):
     def vi_mode(self):
         if (getattr(self.shell.pt_app, 'editing_mode', None) == EditingMode.VI
                 and self.shell.prompt_includes_vi_mode):
-            return '['+str(self.shell.pt_app.app.vi_state.input_mode)[3:6]+'] '
+            mode = str(self.shell.pt_app.app.vi_state.input_mode)
+            if mode.startswith('InputMode.'):
+                mode = mode[10:13].lower()
+            elif mode.startswith('vi-'):
+                mode = mode[3:6]
+            return '['+mode+'] '
         return ''
 
 

From 50afc8844d13a6192a0d00dd49b395787ba162ee Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Thu, 26 Dec 2019 22:06:51 -0600
Subject: [PATCH 255/370] Fix small typos: an -> and and function -> functions

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

diff --git a/docs/source/interactive/magics.rst b/docs/source/interactive/magics.rst
index bb562f44f20..b61bcdc7f85 100644
--- a/docs/source/interactive/magics.rst
+++ b/docs/source/interactive/magics.rst
@@ -13,9 +13,9 @@ Built-in magic commands
     other languages.
 
 Here is the help auto-generated from the docstrings of all the available Magics
-function that IPython ships with. 
+functions that IPython ships with. 
 
-You can create an register your own Magics with IPython. You can find many user
+You can create and register your own Magics with IPython. You can find many user
 defined Magics on `PyPI <https://pypi.io>`_. Feel free to publish your own and
 use the ``Framework :: IPython`` trove classifier. 
 

From 6a8e15d9f21966ffcb5d020f2d4099489d0c6d3e Mon Sep 17 00:00:00 2001
From: Augusto <augusto@britecore.com>
Date: Sun, 22 Dec 2019 14:17:56 -0300
Subject: [PATCH 256/370] Remove unused with_metaclass function.

---
 IPython/utils/py3compat.py | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/IPython/utils/py3compat.py b/IPython/utils/py3compat.py
index 7a57514a340..0d34735bb47 100644
--- a/IPython/utils/py3compat.py
+++ b/IPython/utils/py3compat.py
@@ -189,30 +189,3 @@ def get_closure(f):
 PY2 = not PY3
 PYPY = platform.python_implementation() == "PyPy"
 
-
-
-
-# Parts below taken from six:
-# Copyright (c) 2010-2013 Benjamin Peterson
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-def with_metaclass(meta, *bases):
-    """Create a base class with a metaclass."""
-    return meta("_NewBase", bases, {})

From fbeedc0e5e4a5195359adb2209f67b855f54c163 Mon Sep 17 00:00:00 2001
From: kousik <kousikmitra12@gmail.com>
Date: Wed, 25 Dec 2019 16:39:24 +0530
Subject: [PATCH 257/370] Removed IPython/utils/py3compat.py unused get_closure
 function. #12012

---
 IPython/utils/py3compat.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/IPython/utils/py3compat.py b/IPython/utils/py3compat.py
index 7a57514a340..5395a1be654 100644
--- a/IPython/utils/py3compat.py
+++ b/IPython/utils/py3compat.py
@@ -181,10 +181,6 @@ def u_format(s):
     Accepts a string or a function, so it can be used as a decorator."""
     return s.format(u='')
 
-def get_closure(f):
-    """Get a function's closure attribute"""
-    return f.__closure__
-
 
 PY2 = not PY3
 PYPY = platform.python_implementation() == "PyPy"

From 0c5d00ea919d258742d1d83cc00a93422be5fd0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Miedzi=C5=84ski?= <dominik@mdzn.pl>
Date: Sun, 22 Dec 2019 22:00:50 +0100
Subject: [PATCH 258/370] Fix handling of repeated NEWLINE tokens

---
 IPython/core/inputtransformer2.py            | 4 ++--
 IPython/core/tests/test_inputtransformer2.py | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/IPython/core/inputtransformer2.py b/IPython/core/inputtransformer2.py
index 04f423274da..4562fe01d2c 100644
--- a/IPython/core/inputtransformer2.py
+++ b/IPython/core/inputtransformer2.py
@@ -674,8 +674,8 @@ def check_complete(self, cell: str):
         while tokens_by_line[-1] and tokens_by_line[-1][-1].type in newline_types:
             tokens_by_line[-1].pop()
 
-        if len(tokens_by_line) == 1 and not tokens_by_line[-1]:
-            return 'incomplete', 0
+        if not tokens_by_line[-1]:
+            return 'incomplete', find_last_indent(lines)
 
         if tokens_by_line[-1][-1].string == ':':
             # The last line starts a block (e.g. 'if foo:')
diff --git a/IPython/core/tests/test_inputtransformer2.py b/IPython/core/tests/test_inputtransformer2.py
index 8d6efc1e221..cde9eca0d06 100644
--- a/IPython/core/tests/test_inputtransformer2.py
+++ b/IPython/core/tests/test_inputtransformer2.py
@@ -265,6 +265,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))
+
 def test_check_complete_II():
     """
     Test that multiple line strings are properly handled.

From fee94b46db24987b8918d26f4a146582c2dfafc6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 27 Dec 2019 19:08:52 +0100
Subject: [PATCH 259/370] update what's new for 7.11

---
 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 87c312b8862..97c9a8e2445 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,36 @@
  7.x Series
 ============
 
+.. _version 711:
+
+IPython 7.11
+============
+
+IPython 7.11 received a couple of compatibility fixes and code cleanup.
+
+A number of function in the ``py3compat`` have been removed; a number of types
+in the IPython code base are now non-ambiguous and now always ``unicode``
+instead of ``Union[Unicode,bytes]``; many of the relevant code path have thus
+been simplified/cleaned and types annotation added.
+
+IPython support several verbosity level from exceptions. ``xmode plain`` now
+support chained exceptions. :ghpull:`11999`
+
+We are starting to remove ``shell=True`` in some usages of subprocess. While not directly
+a security issue (as IPython is made to run arbitrary code anyway) it is not good
+practice and we'd like to show the example. :ghissue:`12023`. This discussion
+was started by ``@mschwager`` thanks to a new auditing tool they are working on
+with duo-labs (`dlint <https://github.com/duo-labs/dlint>`_).
+
+Work around some bugs in Python 3.9 tokenizer :ghpull:`12057`
+
+IPython will now print its version after a crash. :ghpull:`11986`
+
+This is likely the last release from the 7.x series that will see new feature.
+The master branch will soon accept large code changes and thrilling new
+features; the 7.x branch will only start to accept critical bug fixes, and
+update dependencies.
+
 .. _version 7102:
 
 IPython 7.10.2

From d3376c96d31f77d13dd34d3d465de698d9b72057 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 27 Dec 2019 19:37:43 +0100
Subject: [PATCH 260/370] update stats-7.11

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

diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index 121c35a4f47..dd366d8ad9c 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -1,6 +1,36 @@
 Issues closed in the 7.x development cycle
 ==========================================
 
+Issues closed in 7.11
+---------------------
+
+GitHub stats for 2019/12/01 - 2019/12/27 (tag: 7.10.1)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 4 issues and merged 36 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A7.11>`__
+
+The following 16 authors contributed 114 commits.
+
+* Augusto
+* Benjamin Ragan-Kelley
+* Chemss Eddine Ben Hassine
+* Danny Hermes
+* Dominik Miedziński
+* Jonathan Feinberg
+* Jonathan Slenders
+* Joseph Kahn
+* kousik
+* Kousik Mitra
+* Marc Hernandez Cabot
+* Matthias Bussonnier
+* Naveen Honest Raj K
+* Pratyay Pandey
+* Quentin Peter
+* takuya fujiwara
+
+
 Issues closed in 7.10.2
 -----------------------
 

From c6839ecd8f63381014dd37ff17d6979b8d9c1426 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 27 Dec 2019 19:38:24 +0100
Subject: [PATCH 261/370] release 7.11.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 5cf2110adf0..f47141b3312 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -24,7 +24,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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 54057a78f9c1100ec8ad8b06803ad27120fa7889 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 27 Dec 2019 19:40:08 +0100
Subject: [PATCH 262/370] 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 f47141b3312..0fe4a422092 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 11
+_version_minor = 12
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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 9a8d1a345f48b7aa85e6a6da5841b65ee1f8de63 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 28 Dec 2019 10:54:13 +0100
Subject: [PATCH 263/370] Reintroduce compatibility functions for a few
 release;

Leaving time for Cython to clean that up.

Closes #12068
---
 IPython/utils/py3compat.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/IPython/utils/py3compat.py b/IPython/utils/py3compat.py
index b8ad4e62fd2..5e1a81a9d57 100644
--- a/IPython/utils/py3compat.py
+++ b/IPython/utils/py3compat.py
@@ -185,3 +185,10 @@ def u_format(s):
 PY2 = not PY3
 PYPY = platform.python_implementation() == "PyPy"
 
+# Cython still rely on that as a Dec 28 2019
+# 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
+

From 2b346b1a3644aa59606305bef26601d66c149465 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Jan 2020 18:27:56 +0100
Subject: [PATCH 264/370] some updates to release tool

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

diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index c82285ecd44..49474477f11 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -139,10 +139,10 @@ then
    read
    
    echo
-   echo "Let's commit : git commit -am \"back to dev\" -S"
+   echo "Let's commit : "$BLUE"git commit -am \"back to dev\""$NOR
    echo $GREEN"Press enter to commit"$NOR
    read
-   git commit -am "back to dev" -S
+   git commit -am "back to dev"
    
    echo
    echo $BLUE"let's : git checkout $VERSION"$NOR
@@ -157,13 +157,15 @@ then
     echo
     echo $BLUE"Attempting to build package..."$NOR
 
-    tools/build_release
+    tools/release
 
     echo '$ shasum -a 256 dist/*'
+    echo $RED
     shasum -a 256 dist/*
+    echo $NOR
 
     if ask_section "upload packages ?"
     then 
-       tools/build_release upload
+       tools/release upload
     fi
 fi

From d96f387391d71e03d872b077e46f408eb21a0c7d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Jan 2020 18:30:00 +0100
Subject: [PATCH 265/370] whatsnew

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

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 97c9a8e2445..7a77cac5750 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,14 @@
  7.x Series
 ============
 
+.. _version 7111:
+
+IPython 7.11.1
+==============
+
+A couple of deprecated functions (no-op) have been reintroduces in py3compat as
+Cython was still relying on them, and will be removed in a couple of versions.
+
 .. _version 711:
 
 IPython 7.11

From 3544c180b971afa87022e3c6b467819713f57311 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Jan 2020 18:31:34 +0100
Subject: [PATCH 266/370] release 7.11.1

---
 IPython/core/release.py | 6 +++---
 tools/release_helper.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index 0fe4a422092..a07fa6e27a9 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 12
-_version_patch = 0
+_version_minor = 11
+_version_patch = 1
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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]
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 49474477f11..fe0828ca323 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -107,7 +107,7 @@ rm dist/*
 if ask_section "Should we commit, tag, push... etc ? "
 then
    echo
-   echo "Let's commit : git commit -am \"release $VERSION\" -S"
+   echo $BLUE"Let's commit : git commit -am \"release $VERSION\" -S"
    echo $GREEN"Press enter to commit"$NOR
    read
    git commit -am "release $VERSION" -S

From 10f852d25397921b5223ec065cb82abfed5d6ace Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Jan 2020 18:33:12 +0100
Subject: [PATCH 267/370] 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 a07fa6e27a9..0fe4a422092 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 11
-_version_patch = 1
+_version_minor = 12
+_version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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 ba155123097ad0b5c5586bb54883399e85139503 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Jan 2020 19:22:29 +0100
Subject: [PATCH 268/370] Update instesphinx for rpy2 as object.inv is gone.

---
 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 bd78b98ae4a..afdff72b5c4 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/version_2.8.x/', None),
+                       'rpy2': ('https://rpy2.readthedocs.io/en/latest/', 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 225be320674e2bb5ba2a0ee15056d39d58aeecbe Mon Sep 17 00:00:00 2001
From: takuya fujiwara <mobilefujitaku@gmail.com>
Date: Tue, 7 Jan 2020 17:46:42 +0900
Subject: [PATCH 269/370] Remove unused _print_statement_sub function in
 py3compat #12010

---
 IPython/utils/py3compat.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/IPython/utils/py3compat.py b/IPython/utils/py3compat.py
index 5e1a81a9d57..c7587873005 100644
--- a/IPython/utils/py3compat.py
+++ b/IPython/utils/py3compat.py
@@ -169,9 +169,6 @@ def execfile(fname, glob, loc=None, compiler=None):
 
 # Refactor print statements in doctests.
 _print_statement_re = re.compile(r"\bprint (?P<expr>.*)$", re.MULTILINE)
-def _print_statement_sub(match):
-    expr = match.groups('expr')
-    return "print(%s)" % expr
 
 # Abstract u'abc' syntax:
 @_modify_str_or_docstring

From 0bd2747531438878d16ddff670a325f15df1b858 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Jan 2020 18:42:38 +0100
Subject: [PATCH 270/370] reset color after asking or it stays green

---
 tools/release_helper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index fe0828ca323..d87c281f454 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -37,7 +37,7 @@ BRANCH=${input:-$BRANCH}
 ask_section(){
     echo
     echo $BLUE"$1"$NOR 
-    echo -n $GREEN"Press Enter to continue, S to skip: "$GREEN
+    echo -n $GREEN"Press Enter to continue, S to skip: "$NOR
     read -n1 value
     echo 
     if [ -z $value ] || [ $value = 'y' ]  ; then

From 0e3251db2c48a6327f80cd3fe94fdda641a584a7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 1 Jan 2020 18:46:47 +0100
Subject: [PATCH 271/370] some updates to release scripts

---
 tools/release_helper.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index d87c281f454..7489c16d756 100644
--- a/tools/release_helper.sh
+++ b/tools/release_helper.sh
@@ -143,6 +143,13 @@ then
    echo $GREEN"Press enter to commit"$NOR
    read
    git commit -am "back to dev"
+
+   echo
+   echo $BLUE"git push origin \$BRANCH ($BRANCH)?"$NOR
+   echo $GREEN"Press enter to continue"$NOR
+   read
+   git push origin $BRANCH
+
    
    echo
    echo $BLUE"let's : git checkout $VERSION"$NOR
@@ -159,8 +166,8 @@ then
 
     tools/release
 
-    echo '$ shasum -a 256 dist/*'
     echo $RED
+    echo '$ shasum -a 256 dist/*'
     shasum -a 256 dist/*
     echo $NOR
 

From 39d3e8668ef8f77a691f81fba451824bea8f842a Mon Sep 17 00:00:00 2001
From: ossdev07 <ossdev@puresoftware.com>
Date: Thu, 2 Jan 2020 06:32:46 +0000
Subject: [PATCH 272/370] Added arm64 jobs in Travis-CI

Signed-off-by: ossdev07 <ossdev@puresoftware.com>
---
 .travis.yml | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c0aad50b4ea..38da38e850c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,18 +65,38 @@ after_success:
 
 matrix:
   include:
-    - python: "3.7"
+    - arch: amd64
+      python: "3.7"
       dist: xenial
       sudo: true
-    - python: "3.8-dev"
+    - arch: arm64
+      python: "3.7"
       dist: xenial
       sudo: true
-    - python: "3.7-dev"
+    - arch: amd64
+      python: "3.8-dev"
       dist: xenial
       sudo: true
-    - python: "nightly"
+    - arch: arm64
+      python: "3.8-dev"
       dist: xenial
       sudo: true
+    - arch: amd64
+      python: "3.7-dev"
+      dist: xenial
+      sudo: true
+    - arch: arm64
+      python: "3.7-dev"
+      dist: xenial
+      sudo: true
+    - arch: amd64
+      python: "nightly"
+      dist: xenial
+      sudo: true
+    - arch: arm64
+      python: "nightly"
+      dist: bionic
+      sudo: true
     - os: osx
       language: generic
       python: 3.6

From 1e6139c81e9acd5d2c771b0718f6f4b8592892e3 Mon Sep 17 00:00:00 2001
From: Jeff Potter <jeff@enveritas.org>
Date: Sat, 4 Jan 2020 11:13:08 -0500
Subject: [PATCH 273/370] Exit non-zero when ipython is given a file path to
 run that doesn't exist

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

diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py
index a09192f255c..3147c59f9f6 100644
--- a/IPython/core/shellapp.py
+++ b/IPython/core/shellapp.py
@@ -404,6 +404,9 @@ def _run_cmd_line_code(self):
             fname = self.file_to_run
             if os.path.isdir(fname):
                 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)
             try:
                 self._exec_file(fname, shell_futures=True)
             except:

From 773930b856c4c051c67ffeb4d7dc6e2820d59985 Mon Sep 17 00:00:00 2001
From: Thomas A Caswell <tcaswell@gmail.com>
Date: Sun, 12 Jan 2020 00:09:43 -0500
Subject: [PATCH 274/370] MNT: ensure we can show un-pickled figures

For Matplotlib < 3.2 inline figures maybe re-hydrated with the canvas
attribute as None.  In that case `print_figure` will fail, this ensure
that a minimal canvas will exist.
---
 IPython/core/pylabtools.py            | 8 ++++++--
 IPython/core/tests/test_pylabtools.py | 6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
index d42c088980c..cb1ce811984 100644
--- a/IPython/core/pylabtools.py
+++ b/IPython/core/pylabtools.py
@@ -123,14 +123,18 @@ def print_figure(fig, fmt='png', bbox_inches='tight', **kwargs):
     }
     # **kwargs get higher priority
     kw.update(kwargs)
-    
+
     bytes_io = BytesIO()
+    if fig.canvas is None:
+        from matplotlib.backend_bases import FigureCanvasBase
+        FigureCanvasBase(fig)
+
     fig.canvas.print_figure(bytes_io, **kw)
     data = bytes_io.getvalue()
     if fmt == 'svg':
         data = data.decode('utf-8')
     return data
-    
+
 def retina_figure(fig, **kwargs):
     """format a figure as a pixel-doubled (retina) PNG"""
     pngdata = print_figure(fig, fmt='retina', **kwargs)
diff --git a/IPython/core/tests/test_pylabtools.py b/IPython/core/tests/test_pylabtools.py
index 181e99f9b84..7b724000f58 100644
--- a/IPython/core/tests/test_pylabtools.py
+++ b/IPython/core/tests/test_pylabtools.py
@@ -248,3 +248,9 @@ def test_qt_gtk(self):
 def test_no_gui_backends():
     for k in ['agg', 'svg', 'pdf', 'ps']:
         assert k not in pt.backend2gui
+
+
+def test_figure_no_canvas():
+    fig = Figure()
+    fig.canvas = None
+    pt.print_figure(fig)

From b1231d6020323a1680b072c992270a62c4de84b0 Mon Sep 17 00:00:00 2001
From: Thomas A Caswell <tcaswell@gmail.com>
Date: Sun, 12 Jan 2020 01:35:19 -0500
Subject: [PATCH 275/370] MNT: update pytest.ini to work with pytest > 3

---
 .travis.yml | 2 +-
 pytest.ini  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 38da38e850c..1099db1942c 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<4' matplotlib
+  - pip install pytest matplotlib
   - pip install codecov check-manifest --upgrade
 
 script:
diff --git a/pytest.ini b/pytest.ini
index 537ebeb2674..9da365334c6 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,2 +1,2 @@
 [pytest]
-addopts = --duration=10
+addopts = --durations=10

From 9ef08404eb19da18d55188cd163d8e51101b3c53 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <mbussonnier@ucmerced.edu>
Date: Mon, 13 Jan 2020 13:54:48 -0800
Subject: [PATCH 276/370] Remove some failing ARM 64, and add an environment
 variable

Env variable for better report of travis failure in the UI or the builds
are otherwise impossible to  distinguish.
---
 .travis.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 38da38e850c..626196e3b12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,23 +72,16 @@ matrix:
     - arch: arm64
       python: "3.7"
       dist: xenial
+      env: ARM64=True
       sudo: true
     - arch: amd64
       python: "3.8-dev"
       dist: xenial
       sudo: true
-    - arch: arm64
-      python: "3.8-dev"
-      dist: xenial
-      sudo: true
     - arch: amd64
       python: "3.7-dev"
       dist: xenial
       sudo: true
-    - arch: arm64
-      python: "3.7-dev"
-      dist: xenial
-      sudo: true
     - arch: amd64
       python: "nightly"
       dist: xenial
@@ -96,6 +89,7 @@ matrix:
     - arch: arm64
       python: "nightly"
       dist: bionic
+      env: ARM64=True
       sudo: true
     - os: osx
       language: generic

From f724bc8245c475324acd11568955df67c6670071 Mon Sep 17 00:00:00 2001
From: "Mark E. Haase" <mehaase@gmail.com>
Date: Tue, 14 Jan 2020 16:51:52 -0500
Subject: [PATCH 277/370] Experimental patch to keep Trio event loop alive
 between cells

Run Trio in a background thread and use trio.from_thread.run() to
schedule cells in that thread. This exports a nursery object named
GLOBAL_NURSERY that client code can use to start background tasks
without blocking the completion of the current cell.

Co-authored-by: Brian Mackintosh <bcmackintosh@gmail.com>
---
 IPython/core/async_helpers.py    | 37 +++++++++++++++++++++++++++++++-
 IPython/core/interactiveshell.py |  2 +-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/IPython/core/async_helpers.py b/IPython/core/async_helpers.py
index 1a7d88991db..fbaae707bb2 100644
--- a/IPython/core/async_helpers.py
+++ b/IPython/core/async_helpers.py
@@ -42,9 +42,44 @@ def _curio_runner(coroutine):
     return curio.run(coroutine)
 
 
+_TRIO_TOKEN = None
+_TRIO_NURSERY = None
+
+
+def _init_trio(trio):
+    global _TRIO_TOKEN
+    import traceback
+    import builtins
+    import threading
+
+    async def trio_entry():
+        global _TRIO_TOKEN, _TRIO_NURSERY
+        _TRIO_TOKEN = trio.hazmat.current_trio_token()
+        async with trio.open_nursery() as nursery:
+            _TRIO_NURSERY = nursery
+            builtins.GLOBAL_NURSERY = nursery
+            await trio.sleep_forever()
+
+    def trio_entry_sync():
+        while True:
+            try:
+                trio.run(trio_entry)
+            except Exception:
+                print("Exception in trio event loop:", traceback.format_exc())
+
+    threading.Thread(target=trio_entry_sync).start()
+    #TODO fix this race condition
+    import time
+    while not _TRIO_TOKEN:
+        time.sleep(0.1)
+
+
 def _trio_runner(async_fn):
     import trio
 
+    if not _TRIO_TOKEN:
+        _init_trio(trio)
+
     async def loc(coro):
         """
         We need the dummy no-op async def to protect from
@@ -52,7 +87,7 @@ async def loc(coro):
         """
         return await coro
 
-    return trio.run(loc, async_fn)
+    return trio.from_thread.run(loc, async_fn, trio_token=_TRIO_TOKEN)
 
 
 def _pseudo_sync_runner(coro):
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index d8bb3e59ec9..6a4fc43efb9 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2865,7 +2865,7 @@ def _run_cell(self, raw_cell:str, store_history:bool, silent:bool, shell_futures
         # when this is the case, we want to run it using the pseudo_sync_runner
         # so that code can invoke eventloops (for example via the %run , and
         # `%paste` magic.
-        if self.should_run_async(raw_cell):
+        if self.should_run_async(raw_cell) or self.loop_runner is _trio_runner:
             runner = self.loop_runner
         else:
             runner = _pseudo_sync_runner

From 018538a05b3db3e47b7c7eb4f025480e6d783a75 Mon Sep 17 00:00:00 2001
From: "Mark E. Haase" <mehaase@gmail.com>
Date: Wed, 15 Jan 2020 15:13:18 -0500
Subject: [PATCH 278/370] More work on long-lived Trio loop

-Better handling for race condition on loop startup
-Better handling of errors for tasks in the global nursery: it
 doesn't crash the global nursery, it just logs the exception
-And some other code cleanup

Co-authored-by: Brian Mackintosh <bcmackintosh@gmail.com>
---
 IPython/core/async_helpers.py | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/IPython/core/async_helpers.py b/IPython/core/async_helpers.py
index fbaae707bb2..6c0f9bacdbe 100644
--- a/IPython/core/async_helpers.py
+++ b/IPython/core/async_helpers.py
@@ -43,7 +43,6 @@ def _curio_runner(coroutine):
 
 
 _TRIO_TOKEN = None
-_TRIO_NURSERY = None
 
 
 def _init_trio(trio):
@@ -51,30 +50,36 @@ def _init_trio(trio):
     import traceback
     import builtins
     import threading
+    # We use an Event to avoid a race condition between starting the Trio thread
+    # and running Trio code.
+    thread_start = threading.Event()
+
+    def log_nursery_exc(exc):
+        import logging
+        import traceback
+        exc = '\n'.join(traceback.format_exception(type(exc), exc,
+            exc.__traceback__))
+        logging.error('An exception occurred in a global nursery task.\n%s',
+            exc)
 
     async def trio_entry():
         global _TRIO_TOKEN, _TRIO_NURSERY
         _TRIO_TOKEN = trio.hazmat.current_trio_token()
         async with trio.open_nursery() as nursery:
-            _TRIO_NURSERY = nursery
+            # TODO This hack prevents the nursery from cancelling all child
+            # tasks when but it's ugly.
+            nursery._add_exc = log_nursery_exc
             builtins.GLOBAL_NURSERY = nursery
+            thread_start.set()
             await trio.sleep_forever()
 
-    def trio_entry_sync():
-        while True:
-            try:
-                trio.run(trio_entry)
-            except Exception:
-                print("Exception in trio event loop:", traceback.format_exc())
-
-    threading.Thread(target=trio_entry_sync).start()
-    #TODO fix this race condition
-    import time
-    while not _TRIO_TOKEN:
-        time.sleep(0.1)
+    threading.Thread(target=trio.run, args=(trio_entry,)).start()
+    thread_start.wait()
 
 
 def _trio_runner(async_fn):
+    global _TRIO_TOKEN
+    import logging
     import trio
 
     if not _TRIO_TOKEN:

From 0d29159e6d8a731ae44e9ce0dfeb4d76ae05c81d Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Mon, 20 Jan 2020 21:10:12 -0800
Subject: [PATCH 279/370] Adds support for blame ignore.

Windows and non-Windows scripts are provided for initial setup.
Commit hashes to ignore are entered in the file .git-blame-ignore-revs
---
 .git-blame-ignore-revs                    |  8 ++++++++
 tools/configure-git-blame-ignore-revs.bat | 10 ++++++++++
 tools/configure-git-blame-ignore-revs.sh  | 10 ++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 .git-blame-ignore-revs
 create mode 100644 tools/configure-git-blame-ignore-revs.bat
 create mode 100644 tools/configure-git-blame-ignore-revs.sh

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 00000000000..70971c53b5a
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,8 @@
+# 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:
+# https://git-scm.com/docs/git-config#Documentation/git-config.txt-blameignoreRevsFile
+
+# Example entries:
+# <full commit hash>  # initial black-format
+# <full commit hash>  # rename something internal
diff --git a/tools/configure-git-blame-ignore-revs.bat b/tools/configure-git-blame-ignore-revs.bat
new file mode 100644
index 00000000000..3fc3c01dcf8
--- /dev/null
+++ b/tools/configure-git-blame-ignore-revs.bat
@@ -0,0 +1,10 @@
+rem Other config options for blame are markUnblamables and markIgnoredLines.
+rem See docs for more details:
+rem https://git-scm.com/docs/git-config#Documentation/git-config.txt-blameignoreRevsFile
+
+rem Uncomment below and rerun script to enable an option.
+rem git config blame.markIgnoredLines
+rem git config blame.markUnblamables
+
+git config blame.ignoreRevsFile .git-blame-ignore-revs
+git config --get blame.ignoreRevsFile
diff --git a/tools/configure-git-blame-ignore-revs.sh b/tools/configure-git-blame-ignore-revs.sh
new file mode 100644
index 00000000000..e1892ef4d05
--- /dev/null
+++ b/tools/configure-git-blame-ignore-revs.sh
@@ -0,0 +1,10 @@
+# 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
+
+# Uncomment below and rerun script to enable an option.
+# git config blame.markIgnoredLines
+# git config blame.markUnblamables
+
+git config blame.ignoreRevsFile .git-blame-ignore-revs
+git config --get blame.ignoreRevsFile

From 2cfa2568e26b50179befe20c23e00be5b5bab2ae Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Mon, 20 Jan 2020 21:11:18 -0800
Subject: [PATCH 280/370] Add section to README about enabling blame ignore
 revs.

---
 README.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/README.rst b/README.rst
index 3e13610a443..9c0c89ec8e0 100644
--- a/README.rst
+++ b/README.rst
@@ -129,3 +129,18 @@ project that you might want to use:
 - `mypython <https://www.asmeurer.com/mypython/>`_
 - `ptpython and ptipython <https://pypi.org/project/ptpython/>`
 - `xonsh <https://xon.sh/>`
+
+Ignoring commits with git blame.ignoreRevsFile
+==============================================
+
+As of git 2.23, it is possible to make formatting changes without breaking
+``git blame``. See the `git documentation
+<https://git-scm.com/docs/git-config#Documentation/git-config.txt-blameignoreRevsFile>`_
+for more details.
+
+To use this feature you must:
+
+- Install git >= 2.23
+- Configure your local git repo by running:
+   - POSIX: ``tools\configure-git-blame-ignore-revs.sh``
+   - Windows:  ``tools\configure-git-blame-ignore-revs.bat``

From 24cb49b3c9e6190f56330b7b0967932f16e3d336 Mon Sep 17 00:00:00 2001
From: yangyang <yangyang@xiachufang.com>
Date: Tue, 21 Jan 2020 16:02:21 +0800
Subject: [PATCH 281/370] catch `MemoryError` in compiling

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

diff --git a/IPython/core/async_helpers.py b/IPython/core/async_helpers.py
index 1a7d88991db..fb4cc193250 100644
--- a/IPython/core/async_helpers.py
+++ b/IPython/core/async_helpers.py
@@ -146,20 +146,20 @@ def _should_be_async(cell: str) -> bool:
 
     If it works, assume it should be async. Otherwise Return False.
 
-    Not handled yet: If the block of code has a return statement as  the top
+    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:
+        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")
-    except SyntaxError:
+    except (SyntaxError, MemoryError):
         try:
             parse_tree = _async_parse_cell(cell)
 
@@ -167,7 +167,7 @@ def _should_be_async(cell: str) -> bool:
             v = _AsyncSyntaxErrorVisitor()
             v.visit(parse_tree)
 
-        except SyntaxError:
+        except (SyntaxError, MemoryError):
             return False
         return True
     return False

From 4527b9ca0edb17e6c3d454f566cadbc78e91a7fc Mon Sep 17 00:00:00 2001
From: yangyang <yangyang@xiachufang.com>
Date: Tue, 21 Jan 2020 16:30:14 +0800
Subject: [PATCH 282/370] add test

---
 IPython/core/tests/test_async_helpers.py | 4 ++++
 IPython/core/tests/test_ultratb.py       | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/IPython/core/tests/test_async_helpers.py b/IPython/core/tests/test_async_helpers.py
index 2932189c63a..86a516ccc1f 100644
--- a/IPython/core/tests/test_async_helpers.py
+++ b/IPython/core/tests/test_async_helpers.py
@@ -276,6 +276,10 @@ def test_autoawait(self):
         """
         )
 
+    def test_memory_error(self):
+        with self.assertRaises(MemoryError):
+            iprc("(" * 200 + ")" * 200)
+
     @skip_without('curio')
     def test_autoawait_curio(self):
         iprc("%autoawait curio")
diff --git a/IPython/core/tests/test_ultratb.py b/IPython/core/tests/test_ultratb.py
index c00b4d30afe..3ab0ce3cf00 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -253,6 +253,13 @@ def test_non_syntaxerror(self):
                 ip.showsyntaxerror()
 
 
+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):
     DIRECT_CAUSE_ERROR_CODE = """
 try:

From 47d58f4213b8d1a898e1508d966f77b5b58b6e71 Mon Sep 17 00:00:00 2001
From: "Mark E. Haase" <mehaase@gmail.com>
Date: Fri, 24 Jan 2020 15:36:27 -0500
Subject: [PATCH 283/370] More work on Trio background loop

Revert changes to _async_helpers.py. Add a new _trio_runner property to
the `InteractiveShell` class for use with a PR on the `ipykernel` repo
that populates this property.

Co-authored-by: Brian Mackintosh <bcmackintosh@gmail.com>
---
 IPython/core/async_helpers.py    | 42 +-------------------------------
 IPython/core/interactiveshell.py | 14 ++++++++++-
 2 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/IPython/core/async_helpers.py b/IPython/core/async_helpers.py
index 6c0f9bacdbe..1a7d88991db 100644
--- a/IPython/core/async_helpers.py
+++ b/IPython/core/async_helpers.py
@@ -42,49 +42,9 @@ def _curio_runner(coroutine):
     return curio.run(coroutine)
 
 
-_TRIO_TOKEN = None
-
-
-def _init_trio(trio):
-    global _TRIO_TOKEN
-    import traceback
-    import builtins
-    import threading
-    # We use an Event to avoid a race condition between starting the Trio thread
-    # and running Trio code.
-    thread_start = threading.Event()
-
-    def log_nursery_exc(exc):
-        import logging
-        import traceback
-        exc = '\n'.join(traceback.format_exception(type(exc), exc,
-            exc.__traceback__))
-        logging.error('An exception occurred in a global nursery task.\n%s',
-            exc)
-
-    async def trio_entry():
-        global _TRIO_TOKEN, _TRIO_NURSERY
-        _TRIO_TOKEN = trio.hazmat.current_trio_token()
-        async with trio.open_nursery() as nursery:
-            # TODO This hack prevents the nursery from cancelling all child
-            # tasks when but it's ugly.
-            nursery._add_exc = log_nursery_exc
-            builtins.GLOBAL_NURSERY = nursery
-            thread_start.set()
-            await trio.sleep_forever()
-
-    threading.Thread(target=trio.run, args=(trio_entry,)).start()
-    thread_start.wait()
-
-
 def _trio_runner(async_fn):
-    global _TRIO_TOKEN
-    import logging
     import trio
 
-    if not _TRIO_TOKEN:
-        _init_trio(trio)
-
     async def loc(coro):
         """
         We need the dummy no-op async def to protect from
@@ -92,7 +52,7 @@ async def loc(coro):
         """
         return await coro
 
-    return trio.from_thread.run(loc, async_fn, trio_token=_TRIO_TOKEN)
+    return trio.run(loc, async_fn)
 
 
 def _pseudo_sync_runner(coro):
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 6a4fc43efb9..4cbc885cb29 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -695,6 +695,13 @@ def __init__(self, ipython_dir=None, profile_dir=None,
         self.events.trigger('shell_initialized', self)
         atexit.register(self.atexit_operations)
 
+        # The trio runner is used for running Trio in the foreground thread. It
+        # is different from `_trio_runner(async_fn)` in `async_helpers.py`
+        # which calls `trio.run()` for every cell. This runner runs all cells
+        # inside a single Trio event loop. If used, it is set from
+        # `ipykernel.kernelapp`.
+        self.trio_runner = None
+
     def get_ipython(self):
         """Return the currently running IPython instance."""
         return self
@@ -715,6 +722,9 @@ def set_autoindent(self,value=None):
         else:
             self.autoindent = value
 
+    def set_trio_runner(self, tr):
+        self.trio_runner = tr
+
     #-------------------------------------------------------------------------
     # init_* methods called by __init__
     #-------------------------------------------------------------------------
@@ -2865,7 +2875,9 @@ def _run_cell(self, raw_cell:str, store_history:bool, silent:bool, shell_futures
         # when this is the case, we want to run it using the pseudo_sync_runner
         # so that code can invoke eventloops (for example via the %run , and
         # `%paste` magic.
-        if self.should_run_async(raw_cell) or self.loop_runner is _trio_runner:
+        if self.trio_runner:
+            runner = self.trio_runner
+        elif self.should_run_async(raw_cell):
             runner = self.loop_runner
         else:
             runner = _pseudo_sync_runner

From a4e12b3d6861b726fd7a2869b1dac5f9b85e1fa6 Mon Sep 17 00:00:00 2001
From: Eric Wieser <wieser.eric@gmail.com>
Date: Mon, 27 Jan 2020 15:07:59 +0000
Subject: [PATCH 284/370] Start multi-line __repr__s on their own line

Fixes gh-12098
---
 IPython/lib/pretty.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IPython/lib/pretty.py b/IPython/lib/pretty.py
index 49c76ad902e..d58779cd2f7 100644
--- a/IPython/lib/pretty.py
+++ b/IPython/lib/pretty.py
@@ -687,7 +687,11 @@ def _repr_pprint(obj, p, cycle):
     """A pprint that just redirects to the normal repr function."""
     # Find newlines and replace them with p.break_()
     output = repr(obj)
-    for idx,output_line in enumerate(output.splitlines()):
+    lines = output.splitlines()
+    # insert a leading newline for multi-line objects that are indented
+    if len(lines) > 1 and p.indentation != p.output_width:
+        p.break_()
+    for idx, output_line in enumerate(lines):
         if idx:
             p.break_()
         p.text(output_line)

From 16865e0fe7123de7db84122246a5a005043a8774 Mon Sep 17 00:00:00 2001
From: Eric Wieser <wieser.eric@gmail.com>
Date: Mon, 27 Jan 2020 15:22:49 +0000
Subject: [PATCH 285/370] Simplify and extend the test for multiline repr

`BreakingReprParent` is not really necessary here, testing using lists is easier to understand, and lets us test multiple lengths of list.
---
 IPython/lib/tests/test_pretty.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py
index cd9fb3662f2..695012d6fc9 100644
--- a/IPython/lib/tests/test_pretty.py
+++ b/IPython/lib/tests/test_pretty.py
@@ -68,11 +68,6 @@ class BreakingRepr(object):
     def __repr__(self):
         return "Breaking(\n)"
 
-class BreakingReprParent(object):
-    def _repr_pretty_(self, p, cycle):
-        with p.group(4,"TG: ",":"):
-            p.pretty(BreakingRepr())
-
 class BadRepr(object):
     
     def __repr__(self):
@@ -151,8 +146,12 @@ def test_pprint_break_repr():
     """
     Test that p.break_ is used in repr
     """
-    output = pretty.pretty(BreakingReprParent())
-    expected = "TG: Breaking(\n    ):"
+    output = pretty.pretty([[BreakingRepr()]])
+    expected = "[[Breaking(\n  )]]"
+    nt.assert_equal(output, expected)
+
+    output = pretty.pretty([[BreakingRepr()]*2])
+    expected = "[[Breaking(\n  ),\n  Breaking(\n  )]]"
     nt.assert_equal(output, expected)
 
 def test_bad_repr():

From 5741513a995863bd5677407d4571d24d07fbe9d7 Mon Sep 17 00:00:00 2001
From: Eric Wieser <wieser.eric@gmail.com>
Date: Mon, 27 Jan 2020 17:10:43 +0000
Subject: [PATCH 286/370] Try and use groups instead

---
 IPython/lib/pretty.py | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/IPython/lib/pretty.py b/IPython/lib/pretty.py
index d58779cd2f7..7c3bffe9cf8 100644
--- a/IPython/lib/pretty.py
+++ b/IPython/lib/pretty.py
@@ -196,19 +196,22 @@ def __init__(self, output, max_width=79, newline='\n', max_seq_length=MAX_SEQ_LE
         self.group_queue = GroupQueue(root_group)
         self.indentation = 0
 
-    def _break_outer_groups(self):
+    def _break_one_group(self, group):
+        while group.breakables:
+            x = self.buffer.popleft()
+            self.output_width = x.output(self.output, self.output_width)
+            self.buffer_width -= x.width
+        while self.buffer and isinstance(self.buffer[0], Text):
+            x = self.buffer.popleft()
+            self.output_width = x.output(self.output, self.output_width)
+            self.buffer_width -= x.width
+
+    def _break_outer_groups(self, force=):
         while self.max_width < self.output_width + self.buffer_width:
             group = self.group_queue.deq()
             if not group:
                 return
-            while group.breakables:
-                x = self.buffer.popleft()
-                self.output_width = x.output(self.output, self.output_width)
-                self.buffer_width -= x.width
-            while self.buffer and isinstance(self.buffer[0], Text):
-                x = self.buffer.popleft()
-                self.output_width = x.output(self.output, self.output_width)
-                self.buffer_width -= x.width
+            self._break_one_group(group)
 
     def text(self, obj):
         """Add literal text to the output."""
@@ -248,6 +251,9 @@ def break_(self):
         """
         Explicitly insert a newline into the output, maintaining correct indentation.
         """
+        group = self.group_queue.deq()
+        if group:
+            self._break_one_group(group)
         self.flush()
         self.output.write(self.newline)
         self.output.write(' ' * self.indentation)
@@ -688,13 +694,11 @@ def _repr_pprint(obj, p, cycle):
     # Find newlines and replace them with p.break_()
     output = repr(obj)
     lines = output.splitlines()
-    # insert a leading newline for multi-line objects that are indented
-    if len(lines) > 1 and p.indentation != p.output_width:
-        p.break_()
-    for idx, output_line in enumerate(lines):
-        if idx:
-            p.break_()
-        p.text(output_line)
+    with p.group():
+        for idx, output_line in enumerate(lines):
+            if idx:
+                p.break_()
+            p.text(output_line)
 
 
 def _function_pprint(obj, p, cycle):

From deb53640dc4239b70ef95601e03224df0de28917 Mon Sep 17 00:00:00 2001
From: Augusto <augusto@britecore.com>
Date: Wed, 29 Jan 2020 23:24:35 -0300
Subject: [PATCH 287/370] The fix_error_editor hook was deprecated in version
 7.0, and no complaints have been raised as of today:

https://github.com/ipython/ipython/issues/9649
---
 IPython/core/hooks.py | 39 ---------------------------------------
 1 file changed, 39 deletions(-)

diff --git a/IPython/core/hooks.py b/IPython/core/hooks.py
index b0637d8c154..fa732f7ba82 100644
--- a/IPython/core/hooks.py
+++ b/IPython/core/hooks.py
@@ -37,7 +37,6 @@ def load_ipython_extension(ip):
 
 import os
 import subprocess
-import warnings
 import sys
 
 from .error import TryNext
@@ -82,44 +81,6 @@ def editor(self, filename, linenum=None, wait=True):
     if wait and proc.wait() != 0:
         raise TryNext()
 
-import tempfile
-from ..utils.decorators import undoc
-
-@undoc
-def fix_error_editor(self,filename,linenum,column,msg):
-    """DEPRECATED
-
-    Open the editor at the given filename, linenumber, column and
-    show an error message. This is used for correcting syntax errors.
-    The current implementation only has special support for the VIM editor,
-    and falls back on the 'editor' hook if VIM is not used.
-
-    Call ip.set_hook('fix_error_editor',yourfunc) to use your own function,
-    """
-
-    warnings.warn("""
-`fix_error_editor` is deprecated as of IPython 6.0 and will be removed
-in future versions. It appears to be used only for automatically fixing syntax
-error that has been broken for a few years and has thus been removed. If you
-happened to use this function and still need it please make your voice heard on
-the mailing list ipython-dev@python.org , or on the GitHub Issue tracker:
-https://github.com/ipython/ipython/issues/9649 """, UserWarning)
-
-    def vim_quickfix_file():
-        t = tempfile.NamedTemporaryFile()
-        t.write('%s:%d:%d:%s\n' % (filename,linenum,column,msg))
-        t.flush()
-        return t
-    if os.path.basename(self.editor) != 'vim':
-        self.hooks.editor(filename,linenum)
-        return
-    t = vim_quickfix_file()
-    try:
-        if os.system('vim --cmd "set errorformat=%f:%l:%c:%m" -q ' + t.name):
-            raise TryNext()
-    finally:
-        t.close()
-
 
 def synchronize_with_editor(self, filename, linenum, column):
         pass

From 42b7b7c21ca0aef8ef1e7d6aa136ae51ecfbefa0 Mon Sep 17 00:00:00 2001
From: ras44 <9282281+ras44@users.noreply.github.com>
Date: Fri, 31 Jan 2020 09:34:52 +0100
Subject: [PATCH 288/370] Escape character now displays on readthedocs

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

diff --git a/docs/source/interactive/reference.rst b/docs/source/interactive/reference.rst
index 08ac1867437..ccd37733252 100644
--- a/docs/source/interactive/reference.rst
+++ b/docs/source/interactive/reference.rst
@@ -77,8 +77,8 @@ prompt. What follows is a list of these.
 Caution for Windows users
 -------------------------
 
-Windows, unfortunately, uses the '\\' character as a path separator. This is a
-terrible choice, because '\\' also represents the escape character in most
+Windows, unfortunately, uses the ``\`` character as a path separator. This is a
+terrible choice, because ``\`` also represents the escape character in most
 modern programming languages, including Python. For this reason, using '/'
 character is recommended if you have problems with ``\``.  However, in Windows
 commands '/' flags options, so you can not use it for the root directory. This

From cddef04ae82729b23297bc499f4a68e61eb1ac53 Mon Sep 17 00:00:00 2001
From: Eric Wieser <wieser.eric@gmail.com>
Date: Fri, 31 Jan 2020 20:49:03 +0000
Subject: [PATCH 289/370] Update IPython/lib/pretty.py

---
 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 7c3bffe9cf8..50cec7006b1 100644
--- a/IPython/lib/pretty.py
+++ b/IPython/lib/pretty.py
@@ -206,7 +206,7 @@ def _break_one_group(self, group):
             self.output_width = x.output(self.output, self.output_width)
             self.buffer_width -= x.width
 
-    def _break_outer_groups(self, force=):
+    def _break_outer_groups(self):
         while self.max_width < self.output_width + self.buffer_width:
             group = self.group_queue.deq()
             if not group:

From 7d815833908d778d5d9fc1ac342dc69ff3c4aab4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 31 Jan 2020 13:43:30 -0800
Subject: [PATCH 290/370] Exclude .git-blame-ignore-revs to fix CI

.git-blame-ignore-revs is added so that  we can ignore revisions in .git-blame,  mostly code reformatting; but CI check that all files are explicitly included (or excluded) from manifest; so we need to list this one explicitly for travis to succeed.
---
 MANIFEST.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index dee45a2c408..d47a16d42f8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -24,6 +24,8 @@ graft docs
 exclude docs/\#*
 exclude docs/man/*.1.gz
 
+exclude .git-blame-ignore-revs
+
 # Examples
 graft examples
 

From 53f23d4d5fe3f39405d43e9d1c52ba16ffafe349 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 291/370] Remove unused sys & fallback pathlib (3.5+) imports.

---
 IPython/lib/tests/test_display.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/IPython/lib/tests/test_display.py b/IPython/lib/tests/test_display.py
index 533bb46d059..7e98a1858f4 100644
--- a/IPython/lib/tests/test_display.py
+++ b/IPython/lib/tests/test_display.py
@@ -14,11 +14,7 @@
 #-----------------------------------------------------------------------------
 from tempfile import NamedTemporaryFile, mkdtemp
 from os.path import split, join as pjoin, dirname
-import sys
-try:
-    import pathlib
-except ImportError:
-    pass
+import pathlib
 from unittest import TestCase, mock
 import struct
 import wave

From 5935424486087b165ba795ee7cdb28a5bef139e3 Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Mon, 20 Jan 2020 22:25:14 -0800
Subject: [PATCH 292/370] Remove python 2 only import in IPython.core.ultratb

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

diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
index e1f805738a0..0caf7ec9758 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -101,10 +101,7 @@
 import tokenize
 import traceback
 
-try:  # Python 2
-    generate_tokens = tokenize.generate_tokens
-except AttributeError:  # Python 3
-    generate_tokens = tokenize.tokenize
+generate_tokens = tokenize.tokenize
 
 # For purposes of monkeypatching inspect to fix a bug in it.
 from inspect import getsourcefile, getfile, getmodule, \

From 38119d16744abe88f8ccac7f38d7bf5898db1388 Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Mon, 20 Jan 2020 22:25:44 -0800
Subject: [PATCH 293/370] Remove python 2 specific line.

---
 examples/IPython Kernel/ipython-get-history.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/IPython Kernel/ipython-get-history.py b/examples/IPython Kernel/ipython-get-history.py
index 561584253a9..5e68bf5c041 100755
--- a/examples/IPython Kernel/ipython-get-history.py	
+++ b/examples/IPython Kernel/ipython-get-history.py	
@@ -35,5 +35,4 @@
     hist = HistoryAccessor()
 
     for session, lineno, cell in hist.get_range(session=session_number, raw=raw):
-      cell = cell.encode('utf-8')  # This line is only needed on Python 2.
       dest.write(cell + '\n')

From 5618e599241e06ee4d731d9368ddafbedc9adc34 Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Mon, 20 Jan 2020 22:29:18 -0800
Subject: [PATCH 294/370] Remove python 2 references from docstrings, where
 appropriate.

---
 IPython/core/oinspect.py  |  3 +--
 IPython/lib/deepreload.py |  8 +-------
 IPython/lib/lexers.py     |  2 +-
 IPython/lib/pretty.py     | 13 +------------
 IPython/utils/encoding.py |  2 +-
 IPython/utils/openpy.py   |  6 ++----
 6 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index c27d8b31d8c..ab25eeeffca 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -198,8 +198,7 @@ def is_simple_callable(obj):
 
 @undoc
 def getargspec(obj):
-    """Wrapper around :func:`inspect.getfullargspec` on Python 3, and
-    :func:inspect.getargspec` on Python 2.
+    """Wrapper around :func:`inspect.getfullargspec`
 
     In addition to functions and methods, this can also handle objects with a
     ``__call__`` attribute.
diff --git a/IPython/lib/deepreload.py b/IPython/lib/deepreload.py
index 37dd21abb90..bd8c01b2a75 100644
--- a/IPython/lib/deepreload.py
+++ b/IPython/lib/deepreload.py
@@ -7,13 +7,7 @@
 imported from that module, which is useful when you're changing files deep
 inside a package.
 
-To use this as your default reload function, type this for Python 2::
-
-    import __builtin__
-    from IPython.lib import deepreload
-    __builtin__.reload = deepreload.reload
-
-Or this for Python 3::
+To use this as your default reload function, type this::
 
     import builtins
     from IPython.lib import deepreload
diff --git a/IPython/lib/lexers.py b/IPython/lib/lexers.py
index 1677054f78e..4494da56571 100644
--- a/IPython/lib/lexers.py
+++ b/IPython/lib/lexers.py
@@ -129,7 +129,7 @@ class IPythonPartialTracebackLexer(RegexLexer):
     """
     Partial lexer for IPython tracebacks.
 
-    Handles all the non-python output. This works for both Python 2.x and 3.x.
+    Handles all the non-python output.
 
     """
     name = 'IPython Partial Traceback'
diff --git a/IPython/lib/pretty.py b/IPython/lib/pretty.py
index 50cec7006b1..cc68781ba16 100644
--- a/IPython/lib/pretty.py
+++ b/IPython/lib/pretty.py
@@ -263,18 +263,7 @@ def break_(self):
 
     def begin_group(self, indent=0, open=''):
         """
-        Begin a group.  If you want support for python < 2.5 which doesn't has
-        the with statement this is the preferred way:
-
-            p.begin_group(1, '{')
-            ...
-            p.end_group(1, '}')
-
-        The python 2.5 expression would be this:
-
-            with p.group(1, '{', '}'):
-                ...
-
+        Begin a group.
         The first parameter specifies the indentation for the next line (usually
         the width of the opening text), the second the opening text.  All
         parameters are optional.
diff --git a/IPython/utils/encoding.py b/IPython/utils/encoding.py
index 387a24700cf..69a319ef0ef 100644
--- a/IPython/utils/encoding.py
+++ b/IPython/utils/encoding.py
@@ -44,7 +44,7 @@ def getdefaultencoding(prefer_stream=True):
     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,
-    and usually ASCII on Python 2 or UTF8 on Python 3.
+    and usually UTF8 as of Python 3.
     """
     enc = None
     if prefer_stream:
diff --git a/IPython/utils/openpy.py b/IPython/utils/openpy.py
index 3046c31587d..c90d2b53a30 100644
--- a/IPython/utils/openpy.py
+++ b/IPython/utils/openpy.py
@@ -66,8 +66,7 @@ def read_py_file(filename, skip_encoding_cookie=True):
       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 - compiling a
-      unicode string with an encoding declaration is a SyntaxError in Python 2.
+      two lines, that line will be excluded from the output.
     
     Returns
     -------
@@ -91,8 +90,7 @@ def read_py_url(url, errors='replace', skip_encoding_cookie=True):
       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 - compiling a
-      unicode string with an encoding declaration is a SyntaxError in Python 2.
+      two lines, that line will be excluded from the output.
     
     Returns
     -------

From 51cd68a4315a740602b13fefe70aefca6d09f2ec Mon Sep 17 00:00:00 2001
From: Terry Davis <16829776+terrdavis@users.noreply.github.com>
Date: Mon, 20 Jan 2020 22:38:33 -0800
Subject: [PATCH 295/370] Remove python 2 only long and unicode type
 references.

---
 IPython/lib/pretty.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/IPython/lib/pretty.py b/IPython/lib/pretty.py
index cc68781ba16..3115d3f6dbf 100644
--- a/IPython/lib/pretty.py
+++ b/IPython/lib/pretty.py
@@ -764,12 +764,8 @@ def _exception_pprint(obj, p, cycle):
         _dict_pprinter_factory('mappingproxy({', '})')
     _type_pprinters[slice] = _repr_pprint
 
-try:
-    _type_pprinters[long] = _repr_pprint
-    _type_pprinters[unicode] = _repr_pprint
-except NameError:
-    _type_pprinters[range] = _repr_pprint
-    _type_pprinters[bytes] = _repr_pprint
+_type_pprinters[range] = _repr_pprint
+_type_pprinters[bytes] = _repr_pprint
 
 #: printers for types specified by name
 _deferred_type_pprinters = {

From 73e3738540026fd4549b3571cdafa3bcd062ec54 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 31 Jan 2020 17:25:07 -0800
Subject: [PATCH 296/370] update what's new for 7.12

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

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 7a77cac5750..e9d4ef3ce66 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,23 @@
  7.x Series
 ============
 
+.. _version 712:
+
+IPython 7.12
+============
+
+IPython 7.12 is a minor update that mostly brings code cleanup, removal of
+longtime deprecated function and a couple update to documentation cleanup as well.
+
+Notable changes are the following:
+
+ - Exit non-zero when ipython is given a file path to run that doesn't exist :ghpull:`12074`
+ - Test PR on ARM64 with Travis-CI :ghpull:`12073`
+ - Update CI to work with latest Pytest :ghpull:`12086`
+ - Add infrastructure to run ipykernel eventloop via trio :ghpull:`12097`
+ - Support git blame ignore revs :ghpull:`12091`
+ - Start multi-line ``__repr__`` s on their own line :ghpull:`12099`
+
 .. _version 7111:
 
 IPython 7.11.1

From b6c74215118fef50f0cd251bd37b0118568604af Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 31 Jan 2020 17:35:55 -0800
Subject: [PATCH 297/370] update stats

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

diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index dd366d8ad9c..c2abed72017 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -1,6 +1,30 @@
 Issues closed in the 7.x development cycle
 ==========================================
 
+Issues closed in 7.12
+---------------------
+
+GitHub stats for 2020/01/01 - 2020/01/31 (tag: 7.11.1)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 2 issues and merged 14 pull requests.
+The full list can be seen `on GitHub <https://github.com/ipython/ipython/issues?q=milestone%3A7.12>`__
+
+The following 11 authors contributed 48 commits.
+
+* Augusto
+* Eric Wieser
+* Jeff Potter
+* Mark E. Haase
+* Matthias Bussonnier
+* ossdev07
+* ras44
+* takuya fujiwara
+* Terry Davis
+* Thomas A Caswell
+* yangyang
+
 Issues closed in 7.11
 ---------------------
 

From 8bda98619aba4bf0aa75d92991c3f7d240d1c781 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 31 Jan 2020 17:37:48 -0800
Subject: [PATCH 298/370] release 7.12.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 0fe4a422092..b5b9c28227f 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -24,7 +24,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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 e40c4012fa1ed4087dd3b55a4403b87828b02f23 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 31 Jan 2020 17:38:53 -0800
Subject: [PATCH 299/370] 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 b5b9c28227f..feb09c0e335 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 12
+_version_minor = 13
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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 21073ffabed5ce2f676dbbcd5dde41c2933e9be4 Mon Sep 17 00:00:00 2001
From: Jonas Haag <jonas@lophus.org>
Date: Sat, 1 Feb 2020 20:05:11 +0100
Subject: [PATCH 300/370] Speedup _make_wav

When numpy is installed, ~30x speedup; otherwise, ~5x speedup
---
 IPython/lib/display.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index e7c427cbe91..de31788ab97 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -130,7 +130,6 @@ def reload(self):
     @staticmethod
     def _make_wav(data, rate, normalize):
         """ Transform a numpy array to a PCM bytestring """
-        import struct
         from io import BytesIO
         import wave
 
@@ -145,7 +144,7 @@ def _make_wav(data, rate, normalize):
         waveobj.setframerate(rate)
         waveobj.setsampwidth(2)
         waveobj.setcomptype('NONE','NONE')
-        waveobj.writeframes(b''.join([struct.pack('<h',x) for x in scaled]))
+        waveobj.writeframes(scaled)
         val = fp.getvalue()
         waveobj.close()
 
@@ -170,12 +169,17 @@ 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 = np.int16(data / normalization_factor * 32767).tolist()
-        return scaled, nchan
+        scaled = data / normalization_factor * 32767
+        return scaled.astype('<h').tostring(), nchan
 
 
     @staticmethod
     def _validate_and_normalize_without_numpy(data, normalize):
+        import array
+        import sys
+
+        data = array.array('f', data)
+
         try:
             max_abs_value = float(max([abs(x) for x in data]))
         except TypeError:
@@ -183,9 +187,11 @@ def _validate_and_normalize_without_numpy(data, normalize):
                 'supported if numpy is not installed')
 
         normalization_factor = Audio._get_normalization_factor(max_abs_value, normalize)
-        scaled = [int(x / normalization_factor * 32767) for x in data]
+        scaled = array.array('h', [int(x / normalization_factor * 32767) for x in data])
+        if sys.byteorder == 'big':
+            scaled.byteswap()
         nchan = 1
-        return scaled, nchan
+        return scaled.tobytes(), nchan
 
     @staticmethod
     def _get_normalization_factor(max_abs_value, normalize):

From 921c8373a1202839ea7211f892c7e3a28035022c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 1 Feb 2020 14:02:36 -0800
Subject: [PATCH 301/370] Attempt to fix test failure with generate_tokens

It looks like the try/except comments were wrong and generate_tokens is available on Py3
---
 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 0caf7ec9758..9e7e8fb390d 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -101,7 +101,7 @@
 import tokenize
 import traceback
 
-generate_tokens = tokenize.tokenize
+from tokenize import generate_tokens
 
 # For purposes of monkeypatching inspect to fix a bug in it.
 from inspect import getsourcefile, getfile, getmodule, \

From 108fec78d74c91b7271fd791985816a2127032a6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 6 Feb 2020 18:10:25 -0800
Subject: [PATCH 302/370] Add tool to automatically upgrade a file.

Push syntax to 36+, apply black; do the commits and add those comits to
git-ignore-revs.
---
 tools/autoformat_file | 46 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100755 tools/autoformat_file

diff --git a/tools/autoformat_file b/tools/autoformat_file
new file mode 100755
index 00000000000..3b6b71d3007
--- /dev/null
+++ b/tools/autoformat_file
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+set -ueo pipefail
+FILE=$1
+
+echo "will update $FILE"
+
+echo $LINENO $?
+pyupgrade --py36-plus --exit-zero-even-if-changed $FILE
+
+echo $LINENO $?
+git commit -am"Apply pyupgrade to $FILE
+
+    pyupgrade --py36-plus $FILE
+
+To ignore those changes when using git blame see the content of
+.git-blame-ignore-revs"
+
+HASH=$(git rev-parse HEAD)
+
+echo "$HASH # apply pyupgrade to $FILE" >> .git-blame-ignore-revs
+
+git commit -am'Update .git-blame-ignore-revs with previous commit'
+
+#####
+
+black --target-version py36 $FILE
+
+
+git commit -am"Apply black to $FILE
+
+    black --target-version py36 $FILE
+
+To ignore those changes when using git blame see the content of
+.git-blame-ignore-revs"
+
+HASH=$(git rev-parse HEAD)
+
+echo "$HASH # apply black to $FILE" >> .git-blame-ignore-revs
+
+git commit -am'Update .git-blame-ignore-revs with previous commit'
+
+echo 
+echo "Updating, reformatting and adding to .git-blame-ignore-revs successful"
+
+

From c69c6b4a89be29df0a047bfd47309c9b1619a398 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 12 Feb 2020 14:52:27 -0800
Subject: [PATCH 303/370] Backport PR #12125: 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 cccdfb3db14..a70f00a228a 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 b29d90be695c3a565e1df92c7bae4d89e2adcb00 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 13 Feb 2020 09:39:03 -0800
Subject: [PATCH 304/370] Backport PR #12122: Pop the last if path ends with
 slash

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

diff --git a/IPython/terminal/ptutils.py b/IPython/terminal/ptutils.py
index 4f21cb04e35..47fd6f40612 100644
--- a/IPython/terminal/ptutils.py
+++ b/IPython/terminal/ptutils.py
@@ -42,6 +42,8 @@ def _elide(string, *, min_elide=30):
 
     object_parts = string.split('.')
     file_parts = string.split(os.sep)
+    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])
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 7f97e7bbc218dd6a931461efa09fc35636074e63 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 27 Feb 2020 08:17:18 -0800
Subject: [PATCH 305/370] Backport PR #12130: Ensure set_custom_completer is
 working. Fixes #11272

---
 .travis.yml                                 |  2 +-
 IPython/core/completer.py                   |  4 ++++
 IPython/core/interactiveshell.py            |  2 +-
 IPython/core/tests/test_interactiveshell.py | 18 ++++++++++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a70f00a228a..9bb3a9bb0a1 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-dev"
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 b0a77c49c76da5ec3646b5f1cb39913cc5f8055d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 27 Feb 2020 08:20:27 -0800
Subject: [PATCH 306/370] Backport PR #12132: Use default shortcuts with
 terminal debugger

---
 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 a4b22e27f9f07545f97940dc67a58efaa187f8cb Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 27 Feb 2020 08:20:44 -0800
Subject: [PATCH 307/370] Backport PR #12135: 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 1c4899a271f404825675be43866adb915051a497 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 27 Feb 2020 08:24:25 -0800
Subject: [PATCH 308/370] Backport PR #12137: Fix inability to interrupt
 processes on Windows

---
 IPython/utils/_process_win32.py     | 38 ++++++++++++++-------
 IPython/utils/tests/test_process.py | 53 ++++++++++++++++++++++++++++-
 2 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py
index fb17e4c5d37..6d05bdaa12e 100644
--- a/IPython/utils/_process_win32.py
+++ b/IPython/utils/_process_win32.py
@@ -18,10 +18,12 @@
 import os
 import sys
 import ctypes
+import time
 
 from ctypes import c_int, POINTER
 from ctypes.wintypes import LPCWSTR, HLOCAL
-from subprocess import STDOUT
+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
@@ -93,15 +95,29 @@ def _find_cmd(cmd):
 def _system_body(p):
     """Callback for _system."""
     enc = DEFAULT_ENCODING
-    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)
 
-    # Wait to finish for returncode
-    return p.wait()
+    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()
+        if result is None:
+            time.sleep(0.01)
+        else:
+            return result
 
 
 def system(cmd):
@@ -116,9 +132,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
diff --git a/IPython/utils/tests/test_process.py b/IPython/utils/tests/test_process.py
index 0c81138cd19..fbc000c3eeb 100644
--- a/IPython/utils/tests/test_process.py
+++ b/IPython/utils/tests/test_process.py
@@ -15,13 +15,19 @@
 #-----------------------------------------------------------------------------
 
 import sys
+import signal
 import os
+import time
+from _thread import interrupt_main  # Py 3
+import threading
+from unittest import SkipTest
 
 import nose.tools as nt
 
 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
 
@@ -107,6 +113,49 @@ def test_system_quotes(self):
         status = system('%s -c "import sys"' % python)
         self.assertEqual(status, 0)
 
+    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.")
+
+        # 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)
+            interrupt_main()
+
+        threading.Thread(target=interrupt).start()
+        start = time.time()
+        try:
+            result = command()
+        except KeyboardInterrupt:
+            # Success!
+            pass
+        end = time.time()
+        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))
         # we can't rely on the order the line buffered streams are flushed
@@ -131,7 +180,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 +191,5 @@ def test_get_output_error_code(self):
         self.assertEqual(out, 'on stdout')
         self.assertEqual(err, 'on stderr')
         self.assertEqual(code, 0)
+
+        

From 48f691cf26e4cd58bd79d96a34667dd5263639f4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 27 Feb 2020 08:25:51 -0800
Subject: [PATCH 309/370] Backport PR #12141: 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 7af64217dd26c147a8f8149f67eea5a4b649abb4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 28 Feb 2020 13:36:40 -0800
Subject: [PATCH 310/370] Backport PR #12128: Improves detection of whether
 tab-completion is in a string and suppresses Jedi

---
 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 9a81d637f15..985ac5ab9eb 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1375,18 +1375,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 1db16b6ed04f66adcab36ccb834440ba1a6be8a3 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 28 Feb 2020 15:54:59 -0800
Subject: [PATCH 311/370] Backport PR #12158: 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 a2ff9368894619ed2d02284862d9d4f47ff939a0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 28 Feb 2020 16:37:14 -0800
Subject: [PATCH 312/370] Backport PR #12160: 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 d0b255042e339b213930fa7fb76cdab81f23af0a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 28 Feb 2020 16:45:41 -0800
Subject: [PATCH 313/370] release 7.13.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 feb09c0e335..d818b071dc5 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -24,7 +24,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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 98b1e108aab70a7574ba2a861024db75821f5834 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 28 Feb 2020 16:48:25 -0800
Subject: [PATCH 314/370] 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 d818b071dc5..feb09c0e335 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -24,7 +24,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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 c0dfe4cf6f01ae83662fdc2e80c4832c41e13c49 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 3 Mar 2020 08:00:18 -0800
Subject: [PATCH 315/370] Backport PR #12167: Set .py tempfile suffix when
 using vi/emacs editor shortcuts.

---
 IPython/terminal/interactiveshell.py | 1 +
 IPython/terminal/shortcuts.py        | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

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):
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 3ed12106b61e8d4c894434e4f460c8750e7379b7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 21 Mar 2020 10:21:28 -0700
Subject: [PATCH 316/370] Backport PR #12198: Fix typos in 7.x series release
 notes

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

diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index f54f0e5ef0c..62990dfc1e7 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -7,9 +7,9 @@
 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
+not be available on the 7.x branch. All the changes below have been backported
 from the master branch.
 
 

From ae6e88f9deefeda6671c8ad80503828a252f04f9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 28 Mar 2020 11:11:01 -0700
Subject: [PATCH 317/370] Backport PR #12208: support for unicode identifiers

---
 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 9882d052db1..877326ccfc3 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -625,6 +625,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 cfc7ad90136045f885e397bd97a41f37533b644a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 28 Mar 2020 12:07:49 -0700
Subject: [PATCH 318/370] Backport PR #12210: 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 036da90aa4bcaf583985300aebb4b40f94665487 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 17 Apr 2020 15:40:56 -0700
Subject: [PATCH 319/370] Backport PR #12235: Fix compatibility with the latest
 release of Sphinx

---
 .travis.yml                                |  5 -----
 docs/source/conf.py                        | 23 ++++++++++++++++++++++
 docs/source/development/wrapperkernels.rst |  2 +-
 docs/sphinxext/configtraits.py             |  3 +--
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9bb3a9bb0a1..0a748ebdcde 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-dev"
       dist: xenial
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.
 #
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)
 
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 ce107da41dbddbb2ff2a17eb2261855b993f902f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 10 Mar 2020 12:58:00 -0700
Subject: [PATCH 320/370] Backport PR #12184: exclude broken matplotlib in
 travis

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

diff --git a/.travis.yml b/.travis.yml
index 9bb3a9bb0a1..ed4fdad6141 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 2f2473bd178a6f5cca6bfca8b9d24022a51cf1a0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 18 Apr 2020 14:39:52 -0700
Subject: [PATCH 321/370] Backport PR #12232: ensure SVG(url=...) is set
 correctly

---
 IPython/core/display.py            | 49 +++++++++++++++++++++---------
 IPython/core/tests/test_display.py | 39 ++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/IPython/core/display.py b/IPython/core/display.py
index 465c000c55a..d8bdbfa3eeb 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,36 @@ 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
+            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
+            # 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"""
@@ -736,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
@@ -879,7 +900,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
diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py
index 0ce4ad2b429..04c93258448 100644
--- a/IPython/core/tests/test_display.py
+++ b/IPython/core/tests/test_display.py
@@ -72,6 +72,45 @@ def test_retina_png():
     nt.assert_equal(md['width'], 1)
     nt.assert_equal(md['height'], 1)
 
+def test_embed_svg_url():
+    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'))
+    
 def test_retina_jpeg():
     here = os.path.dirname(__file__)
     img = display.Image(os.path.join(here, "2x2.jpg"), retina=True)

From f29b47050ab2197d8bbfd9a9bc59f03294bd89df Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 18 Apr 2020 14:40:51 -0700
Subject: [PATCH 322/370] Backport PR #12219: Catch ValueError

---
 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 ebb8dcac0d8..5c2887ff7cf 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -622,7 +622,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 as err:
+                self.error(err)
+                return
             self.print_stack_trace(context)
         else:
             self.print_stack_trace()

From bef36f795cc639891ae2f78cddf3ea1bbbb6ba7f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 18 Apr 2020 14:43:41 -0700
Subject: [PATCH 323/370] Backport PR #12230: 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 4f4b8aacf8b577b27a5f3a8a29e8ac573b76c416 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 18 Apr 2020 14:45:18 -0700
Subject: [PATCH 324/370] Backport PR #12212: Add option to change HTML
 attributes in display.Video

---
 IPython/core/display.py                       | 29 ++++++++++++-------
 .../whatsnew/pr/video-display-attributes.rst  |  4 +++
 2 files changed, 23 insertions(+), 10 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 465c000c55a..14a3b648d09 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,14 +1346,22 @@ 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
         --------
 
-        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)
@@ -1377,6 +1385,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 +1399,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 +1420,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 51cc220c314cbb79f97152d0ee0706c6861df398 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 18 Apr 2020 20:57:34 -0700
Subject: [PATCH 325/370] Backport PR #12250: 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 937ada355f2d2123179a207e2f71fec0ca63be12 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 20 Apr 2020 13:04:54 -0700
Subject: [PATCH 326/370] Backport PR #12253: 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 e2f24a7a02ca3e374a31e43f8ed6751704315996 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 22 Apr 2020 18:38:57 -0700
Subject: [PATCH 327/370] Backport PR #12168: Make IPython.core.debugger
 interruptible by KeyboardInterrupt

---
 IPython/core/debugger.py                      | 28 +++++++++++++++++
 IPython/core/tests/test_debugger.py           | 31 +++++++++++++++++++
 .../whatsnew/pr/interruptible-debugger.rst    |  4 +++
 3 files changed, 63 insertions(+)
 create mode 100644 docs/source/whatsnew/pr/interruptible-debugger.rst

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 5c2887ff7cf..89eae383dd2 100644
--- a/IPython/core/debugger.py
+++ b/IPython/core/debugger.py
@@ -634,6 +634,34 @@ 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):
+        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:
+                self.message('--KeyboardInterrupt--')
+                raise
+
+
 def set_trace(frame=None):
     """
     Start debugging from `frame`.
diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
index dcfd9a42438..7f3720a5ab9 100644
--- a/IPython/core/tests/test_debugger.py
+++ b/IPython/core/tests/test_debugger.py
@@ -4,8 +4,16 @@
 # 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, PIPE
+import subprocess
+from unittest.mock import patch
+import builtins
+import bdb
 
 import nose.tools as nt
 
@@ -223,3 +231,26 @@ def can_exit():
 
     >>> sys.settrace(old_trace)
     '''
+
+
+def test_interruptible_core_debugger():
+    """The debugger can be interrupted.
+
+    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.
+    """
+    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.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.
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 68a63a052ca74e0817496b67d34d92b32527351a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Thu, 23 Apr 2020 09:09:31 -0700
Subject: [PATCH 328/370] Backport PR #12261: Do not exit 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 01aae92a85270fa59218e1e57eb94a112b87713e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 1 May 2020 11:52:47 -0700
Subject: [PATCH 329/370] Backport PR #12272: 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 e78905a3cb7222a00ea17a4b16a2cbc048e93e4f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 1 May 2020 12:05:31 -0700
Subject: [PATCH 330/370] release 7.14.0

---
 IPython/core/release.py                 |  4 ++--
 docs/source/whatsnew/github-stats-7.rst | 25 ++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index feb09c0e335..c01d886b892 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 13
+_version_minor = 14
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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]
diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index 91955bb2afa..2c0c5d81cf3 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -1,9 +1,31 @@
 Issues closed in the 7.x development cycle
 ==========================================
 
-Issues closed in 8.12
+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)
 
@@ -27,6 +49,7 @@ The following 12 authors contributed 108 commits.
 * Nathan Goldbaum
 * Terry Davis
 
+
 Issues closed in 7.12
 ---------------------
 

From 56db1609ad109d1d9dfd617dbaa8f3416a453676 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 1 May 2020 12:06:39 -0700
Subject: [PATCH 331/370] 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 c01d886b892..1bc5595cac9 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 14
+_version_minor = 15
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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 b8beeb3a94f0cfb113132763912b3d5cb306eaa1 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 4 May 2020 15:22:45 -0700
Subject: [PATCH 332/370] Backport PR #12280: Unify API between completers.

---
 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 985ac5ab9eb..32144e1e9b6 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1699,8 +1699,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:
@@ -1713,7 +1711,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 db177d900add8dbdea1e7973f4300c19fa12b851 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 8 May 2020 09:49:50 -0700
Subject: [PATCH 333/370] Backport PR #12296: 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 04c93258448..95f1eb622e4 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 ee0beefe0d4549d4178b7e0dddea25d6a4db2fa1 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 9 May 2020 09:58:12 -0700
Subject: [PATCH 334/370] Backport PR #12284: Try to elide long completion 
 based on user input.

---
 .travis.yml                                   |  3 +-
 IPython/core/interactiveshell.py              |  2 +-
 IPython/terminal/ptutils.py                   | 32 ++++++++++++++++---
 .../terminal/tests/test_interactivshell.py    | 30 +++++++++++++----
 4 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ad1aab7f253..c4a309e1ef0 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/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..ed7ad45eb45 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:str, *, min_elide=30)->str:
     """
     If a string is long enough, and has at least 3 dots,
     replace the middle part with ellipses.
@@ -53,6 +53,26 @@ def _elide(string, *, min_elide=30):
 
     return string
 
+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.
+    """
+
+    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:str, typed:str, min_elide=30)->str:
+    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 +109,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 +152,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):
     """
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 4d9c6ba67ff2d9b1161f9bad97868de964f14bc4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 10 May 2020 16:23:46 -0700
Subject: [PATCH 335/370] Backport PR #12303: Fix nightly parso error

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

diff --git a/.travis.yml b/.travis.yml
index c4a309e1ef0..00c5e3f6bbc 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 bd722769ea84ca8b1798cda7d3cc7c0862764d30 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 11 May 2020 17:04:40 -0700
Subject: [PATCH 336/370] Backport PR #12307: Fix some test on python 3.9
 (nightly).

---
 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 3ab0ce3cf00..3751117b692 100644
--- a/IPython/core/tests/test_ultratb.py
+++ b/IPython/core/tests/test_ultratb.py
@@ -252,12 +252,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 e3cac25bd6134de06149c3c4446ba8ed25af6e43 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 18 May 2020 16:11:23 -0700
Subject: [PATCH 337/370] Backport PR #12314: Enable high DPI scaling in qt.py

---
 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 ddc7e997d11f9f5fad220ecb5888f6c23e8b430f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 19 May 2020 08:25:52 -0700
Subject: [PATCH 338/370] Backport PR #12321: Fix broken link in docs

---
 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 33036bd61631c789b2a397f2b401d8759323475a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sat, 23 May 2020 09:43:28 -0700
Subject: [PATCH 339/370] Backport PR #12328: 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 a816d9513623f6096b738ee11c460c9e6398e851 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 25 May 2020 19:54:04 -0700
Subject: [PATCH 340/370] Backport PR #12335: 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 7f7f6b8a6bc1dba26b30faab35c8cf8053aebb51 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 25 May 2020 19:54:17 -0700
Subject: [PATCH 341/370] Backport PR #12336: Fix auto formatting to be called
 only once.

---
 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 c89c9b18168b7babbac66bf6d6c2ba08731c92ee Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 26 May 2020 09:13:32 -0700
Subject: [PATCH 342/370] Backport PR #12340: 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 cd5bdd4968bf8fe0236aad1750d852cf41882c85 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 27 May 2020 16:29:29 -0700
Subject: [PATCH 343/370] Backport PR #12305: 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 32144e1e9b6..bc114f0f66b 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1982,8 +1982,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 d7d455601d9579e0d7addd655e6c5382fc4e5ec2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 May 2020 08:00:40 -0700
Subject: [PATCH 344/370] Backport PR #12342: Fixed bug on windows where
 relative image path has wrong 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 6cf72b2a0397204b9b93d24de1724e32c3ccbafe Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 May 2020 12:51:25 -0700
Subject: [PATCH 345/370] Backport PR #12347: What's new in 7.15+ Reproducible
 build working

---
 docs/source/coredev/index.rst     | 17 +++++++
 docs/source/whatsnew/version7.rst | 84 +++++++++++++++++++++++++++++++
 setup.py                          |  2 +-
 tools/build_release               |  8 +--
 tools/make_tarball.py             |  1 -
 tools/release                     |  5 +-
 tools/release_helper.sh           | 37 +++++++++++---
 tools/retar.py                    | 60 ++++++++++++++++++++++
 8 files changed, 194 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/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index f68c8101404..c35a4651904 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,90 @@
  7.x Series
 ============
 
+.. _version 715:
+
+IPython 7.15
+============
+
+IPython 7.15 brings a number of bug fixes and user facing improvements.
+
+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.
+ - 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>`_.
+
+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
+--------------------
+
+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
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+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
diff --git a/setup.py b/setup.py
index 593e3a6a0af..daf5f55f000 100755
--- a/setup.py
+++ b/setup.py
@@ -225,7 +225,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 c19480ca30e1360d09572c1b595f66c5a13ce7de Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 May 2020 15:26:05 -0700
Subject: [PATCH 346/370] Backport PR #12352: 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 6d868182949af86df9c042a995ae31b2cc368ef4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 May 2020 15:39:32 -0700
Subject: [PATCH 347/370] Merge pull request #12354 from Carreau/docstats

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

diff --git a/docs/source/whatsnew/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index 2c0c5d81cf3..d326771e8de 100644
--- a/docs/source/whatsnew/github-stats-7.rst
+++ b/docs/source/whatsnew/github-stats-7.rst
@@ -1,6 +1,25 @@
 Issues closed in the 7.x development cycle
 ==========================================
 
+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
 ---------------------
 
@@ -27,6 +46,29 @@ The following 10 authors contributed 47 commits.
 Issues closed in 7.13
 ---------------------
 
+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)
 
 These lists are automatically generated, and may be incomplete or contain duplicates.

From 2922831acf6d7c185fb863b4436ffd7cfa665675 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 May 2020 15:46:12 -0700
Subject: [PATCH 348/370] release 7.15.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 1bc5595cac9..aae948bbb1b 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -24,7 +24,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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 368973ccabcaf67824ea557e7428a871a5c62a5b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 29 May 2020 15:47:19 -0700
Subject: [PATCH 349/370] 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 aae948bbb1b..76bed55d664 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 15
+_version_minor = 16
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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 2874a21a1d2efca947ca1721cb39e5adcc256b09 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 31 May 2020 15:57:22 -0700
Subject: [PATCH 350/370] Backport PR #12301: Exceptions raised when executing
 notebooks via the %run magic command

---
 IPython/core/magics/execution.py | 19 +++++++++++--------
 IPython/core/tests/test_run.py   | 19 +++++++++++++++++++
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/IPython/core/magics/execution.py b/IPython/core/magics/execution.py
index 438d0b5f0ad..dc6cdf00e29 100644
--- a/IPython/core/magics/execution.py
+++ b/IPython/core/magics/execution.py
@@ -688,17 +688,16 @@ 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
             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)
@@ -706,13 +705,17 @@ 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 = ""
+            else:
+                raise
 
         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
diff --git a/IPython/core/tests/test_run.py b/IPython/core/tests/test_run.py
index 38d71b31740..eff832b3fc0 100644
--- a/IPython/core/tests/test_run.py
+++ b/IPython/core/tests/test_run.py
@@ -402,6 +402,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 31133c3a5766f23a8b1c067319dc4d5c0c182355 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 2 Jun 2020 13:08:08 -0700
Subject: [PATCH 351/370] Backport PR #12360: use $SHELL in system_piped

---
 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 a7ca2e7881463080512976750d4c7f514745447d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 2 Jun 2020 16:38:55 -0700
Subject: [PATCH 352/370] Backport PR #12358: Fix retaring process for twine.

---
 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 ee4be875ffae4f1b0c71182eafa89976d0127b5e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 3 Jun 2020 16:20:50 -0700
Subject: [PATCH 353/370] Backport PR #12339: Add instruction to list the API
 changes.

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

diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index 6e2e8bf201a..dd700b56329 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 e769fcbd50ef648251128985232d4b04a86e839b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 5 Jun 2020 10:31:16 -0700
Subject: [PATCH 354/370] Backport PR #12367: PR: 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 ddc9b6f5874..90da7e22803 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 1d622dd149295be58bb9c8098cde8a8e9943b5e4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 5 Jun 2020 11:16:27 -0700
Subject: [PATCH 355/370] Backport PR #12355: Fix GUI inputhook for qt 5.15.0

---
 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 4a742600e67590652dcf630425159f7fd8bd0182 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 8 Jun 2020 11:04:19 -0700
Subject: [PATCH 356/370] Backport PR #12375: BF: wx inputhook

---
 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 7238a928f1adc516b769028bd267fe00ef71a1d7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 15 Jun 2020 15:18:00 -0700
Subject: [PATCH 357/370] Backport PR #12389: 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 ad4453ed63be4914c1abbd2e90db3a5d68f765f4 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 16 Jun 2020 14:48:50 -0700
Subject: [PATCH 358/370] Backport PR #12359: Implement understanding on
 __tracebackhide__

---
 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                       |  27 ++-
 IPython/terminal/debugger.py                  |  10 ++
 appveyor.yml                                  |   7 -
 .../source/whatsnew/pr/skip_tracebackhide.rst |  11 ++
 8 files changed, 290 insertions(+), 28 deletions(-)
 create mode 100644 docs/source/whatsnew/pr/skip_tracebackhide.rst

diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
index 89eae383dd2..a330baa450e 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):
                 raise ValueError("Context must be a positive integer")
         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
 
@@ -487,6 +507,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
         """
@@ -633,6 +663,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 f5fdba6692b..ddb1b64ea78 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 7f3720a5ab9..9fdc944e4d0 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
@@ -254,3 +258,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 9e7e8fb390d..45e22bd7b94 100644
--- a/IPython/core/ultratb.py
+++ b/IPython/core/ultratb.py
@@ -879,13 +879,36 @@ 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_records(self, records, last_unique, recursion_repeat):
         """Format the stack frames of the traceback"""
         frames = []
+
+        skipped = 0
         for r in records[:last_unique+recursion_repeat+1]:
-            #print '*** record:',file,lnum,func,lines,index  # dbg
+            if self.skip_hidden:
+                if r[0].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))
+            
+        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)
+            )
 
         if recursion_repeat:
             frames.append('... last %d frames repeated, from the frame below ...\n' % recursion_repeat)
@@ -1123,8 +1146,6 @@ 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)
 
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 737e62eb8f90c0412feaf53a5195c362d1ace462 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Jun 2020 14:58:42 -0700
Subject: [PATCH 359/370] Backport PR #12404: Update what's new for 7.16

---
 docs/source/whatsnew/development.rst          |  1 +
 docs/source/whatsnew/github-stats-7.rst       | 22 +++++++
 .../source/whatsnew/pr/skip_tracebackhide.rst | 11 ----
 docs/source/whatsnew/version7.rst             | 61 +++++++++++++++++++
 4 files changed, 84 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/github-stats-7.rst b/docs/source/whatsnew/github-stats-7.rst
index d326771e8de..6bc36c0789c 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
 ---------------------
 
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..286f16fb9f4 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,67 @@
  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`.
+
+
+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 329684047cfc82be54374e88f6f6785ac99e0bc2 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Jun 2020 15:03:46 -0700
Subject: [PATCH 360/370] release 7.16.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 76bed55d664..4e50e18b838 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -24,7 +24,7 @@
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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 5ecc01a7d617abca756be8c2bacd0a315ffcb59a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Jun 2020 15:04:29 -0700
Subject: [PATCH 361/370] 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 4e50e18b838..51597dbf83b 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 16
+_version_minor = 17
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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 20bdc6fc0db7f3cf1f0df4bad9e2f922ac5adc1e Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Jun 2020 15:31:39 -0700
Subject: [PATCH 362/370] 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 2486838d9eaa73413505ec7e72b01d6e262f30f9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Jun 2020 15:42:20 -0700
Subject: [PATCH 363/370] release 7.16.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 51597dbf83b..bba11bbaa50 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -20,11 +20,11 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 7
-_version_minor = 17
-_version_patch = 0
+_version_minor = 16
+_version_patch = 1
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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 8fcdcd384b8b5e17f9b95a10e65a52f3ca78d63f Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Nov 2021 11:19:25 -0800
Subject: [PATCH 364/370] Pin Jedi to <0.17.2.

This may not completely fix the issue, in particular pip may decide to
downgrade IPython,  but maybe this will lead to less errors.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index daf5f55f000..3e734bafe14 100755
--- a/setup.py
+++ b/setup.py
@@ -186,7 +186,7 @@
 
 install_requires = [
     'setuptools>=18.5',
-    'jedi>=0.10',
+    'jedi>=0.10,<=0.17.2',
     'decorator',
     'pickleshare',
     'traitlets>=4.2',

From bcae8e07c7eeef79d185522411d8b4cb014ee3be Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Nov 2021 11:55:54 -0800
Subject: [PATCH 365/370] Backport PR #13335: What's new 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 286f16fb9f4..6211783c099 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -4,6 +4,19 @@
 
 .. _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 138f2664f1fbd3d04c24bf098732efd8c6d1f2c6 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Nov 2021 14:23:39 -0800
Subject: [PATCH 366/370] bring back release helper from master branch

---
 tools/release_helper.sh | 45 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index dd700b56329..de88d0f0a69 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)
@@ -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}
@@ -38,18 +39,40 @@ ask_section(){
     echo
     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
 }
 
 
+maybe_edit(){
+    echo
+    echo $BLUE"$1"$NOR 
+    echo -n $GREEN"Press e to Edit $1, 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
+    fi
+}
+
+
 
 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,6 +123,11 @@ 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 | cat
+maybe_edit IPython/core/release.py
 
 echo $GREEN"Press enter to continue"$NOR
 read
@@ -142,7 +170,14 @@ 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 | 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
+
    
    echo $GREEN"Press enter to continue"$NOR
    read

From 9f477b701e3b7ba0680e24c0f94cd8bf75bca90d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Nov 2021 14:39:42 -0800
Subject: [PATCH 367/370] release 7.16.2

---
 IPython/core/release.py | 2 +-
 tools/release_helper.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/core/release.py b/IPython/core/release.py
index bba11bbaa50..c7326fe1b5f 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -21,7 +21,7 @@
 # version
 _version_major = 7
 _version_minor = 16
-_version_patch = 1
+_version_patch = 2
 _version_extra = '.dev'
 # _version_extra = 'b1'
 _version_extra = ''  # Uncomment this for full releases
diff --git a/tools/release_helper.sh b/tools/release_helper.sh
index de88d0f0a69..cf053d3459a 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 '$EDITOR' to edit files when necessary"
 echo -n "PREV_RELEASE (X.y.z) [$PREV_RELEASE]: "
 read input
 PREV_RELEASE=${input:-$PREV_RELEASE}
@@ -65,7 +65,7 @@ maybe_edit(){
 
     echo 
     if [ $value = 'e' ]  ; then
-        $EDITOR $1
+        $=EDITOR $1
     fi
 }
 

From 8df8971999886a3804a2b9231a47f6d3764b9997 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 26 Nov 2021 14:44:01 -0800
Subject: [PATCH 368/370] 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 c7326fe1b5f..431086851b7 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -21,10 +21,10 @@
 # version
 _version_major = 7
 _version_minor = 16
-_version_patch = 2
+_version_patch = 3
 _version_extra = '.dev'
 # _version_extra = 'b1'
-_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 5fa1e409d2dc126c456510c16ece18e08b524e5b Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 19 Jan 2022 14:21:24 +0100
Subject: [PATCH 369/370] Merge pull request from GHSA-pq7m-3gw7-gq5x

FIX CVE-2022-21699
---
 IPython/__init__.py               |  4 +++
 IPython/core/application.py       |  2 +-
 IPython/core/profileapp.py        |  7 ++--
 IPython/core/profiledir.py        |  4 +--
 IPython/tests/cve.py              | 56 +++++++++++++++++++++++++++++++
 docs/source/whatsnew/version7.rst |  8 +++++
 6 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 IPython/tests/cve.py

diff --git a/IPython/__init__.py b/IPython/__init__.py
index 4fb77107680..c17ec76a602 100644
--- a/IPython/__init__.py
+++ b/IPython/__init__.py
@@ -65,6 +65,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 93639d88e2c..4f679df18e3 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -133,7 +133,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 3199dfd5d64..2c48e4c2f1c 100644
--- a/IPython/core/profiledir.py
+++ b/IPython/core/profiledir.py
@@ -186,7 +186,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
@@ -198,7 +198,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/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''
+
+
+
diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
index 6211783c099..f8c88ab844b 100644
--- a/docs/source/whatsnew/version7.rst
+++ b/docs/source/whatsnew/version7.rst
@@ -2,6 +2,14 @@
  7.x Series
 ============
 
+=======
+.. _version 7.16.3:
+
+IPython 7.16.3 (CVE-2022-21699)
+===============================
+
+Fixed CVE-2022-21699, see IPython 8.0.1 release notes for informations.
+
 .. _version 716:
 
 IPython 7.16.1, 7.16.2

From d43c7c79c1c8518f1917c3cd69e5384738ef0b37 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 19 Jan 2022 14:37:30 +0100
Subject: [PATCH 370/370] release 7.16.3

---
 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 431086851b7..a6f3cf81f7d 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -24,7 +24,7 @@
 _version_patch = 3
 _version_extra = '.dev'
 # _version_extra = 'b1'
-# _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]