Merge remote-tracking branch 'origin/master' into inputtransformer2

setup.cfg

@@ -0,0 +1,2 b''
+[metadata]
+license_file = LICENSE

.gitignore

@@ -24,3 +24,6 b' __pycache__'
 .cache
 .coverage
 *.swp
+.vscode
+.pytest_cache
+.python-version

.travis.yml

@@ -14,7 +14,8 b' group: edge'
 before_install:
     - 'if [[ $GROUP != js* ]]; then COVERAGE=""; fi'
 install:
-    - pip install setuptools pip --upgrade
+    - pip install pip --upgrade
+    - pip install setuptools --upgrade
     - pip install -e file://$PWD#egg=ipython[test] --upgrade
     - pip install codecov check-manifest --upgrade
     - sudo apt-get install graphviz

IPython/__init__.py

@@ -2,7 +2,7 b''
 """
 IPython: tools for interactive and parallel computing in Python.
 
-http://ipython.org
+https://ipython.org
 """
 #-----------------------------------------------------------------------------
 #  Copyright (c) 2008-2011, IPython Development Team.

IPython/core/compilerop.py

@@ -40,7 +40,7 b' import time'
 # Constants
 #-----------------------------------------------------------------------------
 
-# Roughtly equal to PyCF_MASK | PyCF_MASK_OBSOLETE as defined in pythonrun.h,
+# Roughly equal to PyCF_MASK | PyCF_MASK_OBSOLETE as defined in pythonrun.h,
 # this is used as a bitmask to extract future-related code flags.
 PyCF_MASK = functools.reduce(operator.or_,
                              (getattr(__future__, fname).compiler_flag
@@ -52,7 +52,7 b' PyCF_MASK = functools.reduce(operator.or_,'
 
 def code_name(code, number=0):
     """ Compute a (probably) unique name for code for caching.
-    
+
     This now expects code to be unicode.
     """
     hash_digest = hashlib.sha1(code.encode("utf-8")).hexdigest()
@@ -71,7 +71,7 b' class CachingCompiler(codeop.Compile):'
 
     def __init__(self):
         codeop.Compile.__init__(self)
-        
+
         # This is ugly, but it must be done this way to allow multiple
         # simultaneous ipython instances to coexist.  Since Python itself
         # directly accesses the data structures in the linecache module, and
@@ -95,7 +95,7 b' class CachingCompiler(codeop.Compile):'
     def _fix_module_ds(self, module):
         """
         Starting in python 3.7 the AST for mule have changed, and if
-        the first expressions encountered is a string it is attached to the 
+        the first expressions encountered is a string it is attached to the
         `docstring` attribute of the `Module` ast node.
 
         This breaks IPython, as if this string is the only expression, IPython
@@ -108,14 +108,14 b' class CachingCompiler(codeop.Compile):'
         new_body=[Expr(Str(docstring, lineno=1, col_offset=0), lineno=1, col_offset=0)]
         new_body.extend(module.body)
         return fix_missing_locations(Module(new_body))
-        
+
     def ast_parse(self, source, filename='<unknown>', symbol='exec'):
         """Parse code to an AST with the current compiler flags active.
-        
+
         Arguments are exactly the same as ast.parse (in the standard library),
         and are passed to the built-in compile function."""
         return self._fix_module_ds(compile(source, filename, symbol, self.flags | PyCF_ONLY_AST, 1))
-    
+
     def reset_compiler_flags(self):
         """Reset compiler flags to default state."""
         # This value is copied from codeop.Compile.__init__, so if that ever
@@ -127,10 +127,10 b' class CachingCompiler(codeop.Compile):'
         """Flags currently active in the compilation process.
         """
         return self.flags
-        
+
     def cache(self, code, number=0):
         """Make a name for a block of code, and cache the code.
-        
+
         Parameters
         ----------
         code : str
@@ -138,7 +138,7 b' class CachingCompiler(codeop.Compile):'
         number : int
           A number which forms part of the code's name. Used for the execution
           counter.
-          
+
         Returns
         -------
         The name of the cached code (as a string). Pass this as the filename

IPython/core/completer.py

@@ -1592,7 +1592,7 b' class IPCompleter(Completer):'
             $
             '''
             regexps = self.__dict_key_regexps = {
-                False: re.compile(dict_key_re_fmt % '''
+                False: re.compile(dict_key_re_fmt % r'''
                                   # identifiers separated by .
                                   (?!\d)\w+
                                   (?:\.(?!\d)\w+)*

IPython/core/completerlib.py

@@ -165,7 +165,7 b' def try_import(mod: str, only_modules=False) -> List[str]:'
     except:
         return []
 
-    m_is_init = hasattr(m, '__file__') and '__init__' in m.__file__
+    m_is_init = '__init__' in (getattr(m, '__file__', '') or '')
 
     completions = []
     if (not hasattr(m, '__file__')) or (not only_modules) or m_is_init:

IPython/core/debugger.py

@@ -176,7 +176,7 b' class Tracer(object):'
         self.debugger.set_trace(sys._getframe().f_back)
 
 
-RGX_EXTRA_INDENT = re.compile('(?<=\n)\s+')
+RGX_EXTRA_INDENT = re.compile(r'(?<=\n)\s+')
 
 
 def strip_indentation(multiline_string):

IPython/core/display.py

@@ -800,7 +800,7 b' class JSON(DisplayObject):'
     """
     # wrap data in a property, which warns about passing already-serialized JSON
     _data = None
-    def __init__(self, data=None, url=None, filename=None, expanded=False, metadata=None, **kwargs):
+    def __init__(self, data=None, url=None, filename=None, expanded=False, metadata=None, root='root', **kwargs):
         """Create a JSON display object given raw data.
 
         Parameters
@@ -817,8 +817,13 b' class JSON(DisplayObject):'
             Metadata to control whether a JSON display component is expanded.
         metadata: dict
             Specify extra metadata to attach to the json display object.
+        root : str
+            The name of the root element of the JSON tree 
         """
-        self.metadata = {'expanded': expanded}
+        self.metadata = {
+            'expanded': expanded,
+            'root': root,
+        }
         if metadata:
             self.metadata.update(metadata)
         if kwargs:
@@ -847,18 +852,25 b' class JSON(DisplayObject):'
     def _repr_json_(self):
         return self._data_and_metadata()
 
-_css_t = """$("head").append($("<link/>").attr({
-  rel:  "stylesheet",
-  type: "text/css",
-  href: "%s"
-}));
+_css_t = """var link = document.createElement("link");
+	link.ref = "stylesheet";
+	link.type = "text/css";
+	link.href = "%s";
+	document.head.appendChild(link);
 """
 
-_lib_t1 = """$.getScript("%s", function () {
-"""
-_lib_t2 = """});
+_lib_t1 = """new Promise(function(resolve, reject) {
+	var script = document.createElement("script");
+	script.onload = resolve;
+	script.onerror = reject;
+	script.src = "%s";
+	document.head.appendChild(script);
+}).then(() => {
 """
 
+_lib_t2 = """
+});"""
+
 class GeoJSON(JSON):
     """GeoJSON expects JSON-able dict
 

IPython/core/hooks.py

@@ -174,7 +174,7 b' class CommandChainDispatcher:'
 def shutdown_hook(self):
     """ default shutdown hook
 
-    Typically, shotdown hooks should raise TryNext so all shutdown ops are done
+    Typically, shutdown hooks should raise TryNext so all shutdown ops are done
     """
 
     #print "default shutdown hook ok" # dbg

IPython/core/inputsplitter.py

@@ -72,7 +72,7 b" ini_spaces_re = re.compile(r'^([ \\t\\r\\f\\v]+)')"
 
 # regexp to match pure comment lines so we don't accidentally insert 'if 1:'
 # before pure comments
-comment_line_re = re.compile('^\s*\#')
+comment_line_re = re.compile(r'^\s*\#')
 
 
 def num_ini_spaces(s):

IPython/core/inputtransformer.py

@@ -173,7 +173,7 b' class assemble_python_lines(TokenInputTransformer):'
 
 @CoroutineInputTransformer.wrap
 def assemble_logical_lines():
-    """Join lines following explicit line continuations (\)"""
+    r"""Join lines following explicit line continuations (\)"""
     line = ''
     while True:
         line = (yield line)
@@ -363,7 +363,7 b' def cellmagic(end_on_blank_line=False):'
     reset (sent None).
     """
     tpl = 'get_ipython().run_cell_magic(%r, %r, %r)'
-    cellmagic_help_re = re.compile('%%\w+\?')
+    cellmagic_help_re = re.compile(r'%%\w+\?')
     line = ''
     while True:
         line = (yield line)

IPython/core/magics/config.py

@@ -24,7 +24,7 b' from logging import error'
 # Magic implementation classes
 #-----------------------------------------------------------------------------
 
-reg = re.compile('^\w+\.\w+$')
+reg = re.compile(r'^\w+\.\w+$')
 @magics_class
 class ConfigMagics(Magics):
 

IPython/core/magics/execution.py

@@ -962,11 +962,12 b' python-profiler package from non-free.""")'
           body has access to any variables created in the setup code.
 
         Options:
-        -n<N>: execute the given statement <N> times in a loop. If this value
-        is not given, a fitting value is chosen.
+        -n<N>: execute the given statement <N> times in a loop. If <N> is not
+        provided, <N> is determined so as to get sufficient accuracy.
 
-        -r<R>: repeat the loop iteration <R> times and take the best result.
-        Default: 3
+        -r<R>: number of repeats <R>, each consisting of <N> loops, and take the
+        best result.
+        Default: 7
 
         -t: use time.time to measure the time, which is the default on Unix.
         This function measures wall time.

IPython/core/magics/script.py

@@ -8,7 +8,7 b' import os'
 import sys
 import signal
 import time
-from subprocess import Popen, PIPE
+from subprocess import Popen, PIPE, CalledProcessError
 import atexit
 
 from IPython.core import magic_arguments
@@ -54,6 +54,12 b' def script_args(f):'
             This is used only when --bg option is given.
             """
         ),
+        magic_arguments.argument(
+            '--raise-error', action="store_true",
+            help="""Whether you should raise an error message in addition to 
+            a stream on stderr if you get a nonzero exit code.
+            """
+        )
     ]
     for arg in args:
         f = arg(f)
@@ -235,6 +241,8 b' class ScriptMagics(Magics):'
         else:
             sys.stderr.write(err)
             sys.stderr.flush()
+        if args.raise_error and p.returncode!=0:
+            raise CalledProcessError(p.returncode, cell, output=out, stderr=err)
     
     def _run_script(self, p, cell, to_close):
         """callback for running the script in the background"""

IPython/core/prefilter.py

@@ -82,7 +82,7 b' class PrefilterManager(Configurable):'
     prefilter consumes lines of input and produces transformed lines of
     input.
 
-    The iplementation consists of two phases:
+    The implementation consists of two phases:
 
     1. Transformers
     2. Checkers and handlers

IPython/core/release.py

@@ -48,7 +48,7 b' IPython provides a rich toolkit to help you make the most out of using Python'
 interactively.  Its main components are:
 
 * A powerful interactive Python shell
-* A `Jupyter <http://jupyter.org/>`_ kernel to work with Python code in Jupyter
+* A `Jupyter <https://jupyter.org/>`_ kernel to work with Python code in Jupyter
   notebooks and other interactive frontends.
 
 The enhanced interactive Python shells have the following main features:

IPython/core/splitinput.py

@@ -41,7 +41,7 b' from IPython.utils.encoding import get_stream_enc'
 # ! and !! trigger if they are first char(s) *or* follow an indent
 # ? triggers as first or last char.
 
-line_split = re.compile("""
+line_split = re.compile(r"""
              ^(\s*)               # any leading space
              ([,;/%]|!!?|\?\??)?  # escape character or characters
              \s*(%{0,2}[\w\.\*]*)     # function/method, possibly with leading %
@@ -68,7 +68,7 b' def split_user_input(line, pattern=None):'
         except ValueError:
             # print "split failed for line '%s'" % line
             ifun, the_rest = line, u''
-        pre = re.match('^(\s*)(.*)',line).groups()[0]
+        pre = re.match(r'^(\s*)(.*)',line).groups()[0]
         esc = ""
     else:
         pre, esc, ifun, the_rest = match.groups()

IPython/core/tests/test_completerlib.py

@@ -16,7 +16,7 b' from os.path import join'
 
 import nose.tools as nt
 
-from IPython.core.completerlib import magic_run_completer, module_completion
+from IPython.core.completerlib import magic_run_completer, module_completion, try_import
 from IPython.utils.tempdir import TemporaryDirectory
 from IPython.testing.decorators import onlyif_unicode_paths
 
@@ -159,3 +159,20 b' def test_bad_module_all():'
             nt.assert_is_instance(r, str)
     finally:
         sys.path.remove(testsdir)
+
+
+def test_module_without_init():
+    """
+    Test module without __init__.py.
+    
+    https://github.com/ipython/ipython/issues/11226
+    """
+    fake_module_name = "foo"
+    with TemporaryDirectory() as tmpdir:
+        sys.path.insert(0, tmpdir)
+        try:
+            os.makedirs(os.path.join(tmpdir, fake_module_name))
+            s = try_import(mod=fake_module_name)
+            assert s == []
+        finally:
+            sys.path.remove(tmpdir)

IPython/core/tests/test_display.py

@@ -213,31 +213,41 b' def test_progress_iter():'
 def test_json():
     d = {'a': 5}
     lis = [d]
-    md = {'expanded': False}
-    md2 = {'expanded': True}
-    j = display.JSON(d)
-    j2 = display.JSON(d, expanded=True)
-    nt.assert_equal(j._repr_json_(), (d, md))
-    nt.assert_equal(j2._repr_json_(), (d, md2))
+    metadata = [
+        {'expanded': False, 'root': 'root'},
+        {'expanded': True,  'root': 'root'},
+        {'expanded': False, 'root': 'custom'},
+        {'expanded': True,  'root': 'custom'},
+    ]
+    json_objs = [
+        display.JSON(d),
+        display.JSON(d, expanded=True),
+        display.JSON(d, root='custom'),
+        display.JSON(d, expanded=True, root='custom'),
+    ]
+    for j, md in zip(json_objs, metadata):
+        nt.assert_equal(j._repr_json_(), (d, md))
 
     with warnings.catch_warnings(record=True) as w:
         warnings.simplefilter("always")
         j = display.JSON(json.dumps(d))
         nt.assert_equal(len(w), 1)
-        nt.assert_equal(j._repr_json_(), (d, md))
-        nt.assert_equal(j2._repr_json_(), (d, md2))
-
-    j = display.JSON(lis)
-    j2 = display.JSON(lis, expanded=True)
-    nt.assert_equal(j._repr_json_(), (lis, md))
-    nt.assert_equal(j2._repr_json_(), (lis, md2))
+        nt.assert_equal(j._repr_json_(), (d, metadata[0]))
+
+    json_objs = [
+        display.JSON(lis),
+        display.JSON(lis, expanded=True),
+        display.JSON(lis, root='custom'),
+        display.JSON(lis, expanded=True, root='custom'),
+    ]
+    for j, md in zip(json_objs, metadata):
+        nt.assert_equal(j._repr_json_(), (lis, md))
 
     with warnings.catch_warnings(record=True) as w:
         warnings.simplefilter("always")
         j = display.JSON(json.dumps(lis))
         nt.assert_equal(len(w), 1)
-        nt.assert_equal(j._repr_json_(), (lis, md))
-        nt.assert_equal(j2._repr_json_(), (lis, md2))
+        nt.assert_equal(j._repr_json_(), (lis, metadata[0]))
 
 def test_video_embedding():
     """use a tempfile, with dummy-data, to ensure that video embedding doesn't crash"""

IPython/core/tests/test_interactiveshell.py

@@ -546,7 +546,8 b' class ExitCodeChecks(tt.TempFileMixin):'
             else:
                 del os.environ['SHELL']
 
-class TestSystemRaw(unittest.TestCase, ExitCodeChecks):
+
+class TestSystemRaw(ExitCodeChecks, unittest.TestCase):
     system = ip.system_raw
 
     @onlyif_unicode_paths
@@ -567,7 +568,7 b' class TestSystemRaw(unittest.TestCase, ExitCodeChecks):'
         self.assertEqual(ip.user_ns['_exit_code'], -signal.SIGINT)
 
 # TODO: Exit codes are currently ignored on Windows.
-class TestSystemPipedExitCode(unittest.TestCase, ExitCodeChecks):
+class TestSystemPipedExitCode(ExitCodeChecks, unittest.TestCase):
     system = ip.system_piped
 
     @skip_win32
@@ -582,7 +583,7 b' class TestSystemPipedExitCode(unittest.TestCase, ExitCodeChecks):'
     def test_exit_code_signal(self):
         ExitCodeChecks.test_exit_code_signal(self)
 
-class TestModules(unittest.TestCase, tt.TempFileMixin):
+class TestModules(tt.TempFileMixin, unittest.TestCase):
     def test_extraneous_loads(self):
         """Test we're not loading modules on startup that we shouldn't.
         """

IPython/core/tests/test_shellapp.py

@@ -24,7 +24,7 b" sqlite_err_maybe = dec.module_not_available('sqlite3')"
 SQLITE_NOT_AVAILABLE_ERROR = ('WARNING: IPython History requires SQLite,'
                               ' your history will not be saved\n')
 
-class TestFileToRun(unittest.TestCase, tt.TempFileMixin):
+class TestFileToRun(tt.TempFileMixin, unittest.TestCase):
     """Test the behavior of the file_to_run parameter."""
 
     def test_py_script_file_attribute(self):

IPython/core/usage.py

@@ -60,7 +60,7 b' Usage'
     environment variable with this name and setting it to the desired path.
 
     For more information, see the manual available in HTML and PDF in your
-    installation, or online at http://ipython.org/documentation.html.
+    installation, or online at https://ipython.org/documentation.html.
 """
 
 interactive_usage = """

IPython/lib/pretty.py

@@ -85,12 +85,12 b' import re'
 import sys
 import types
 from collections import deque
+from inspect import signature
 from io import StringIO
 from warnings import warn
 
 from IPython.utils.decorators import undoc
 from IPython.utils.py3compat import PYPY
-from IPython.utils.signatures import signature
 
 __all__ = ['pretty', 'pprint', 'PrettyPrinter', 'RepresentationPrinter',
     'for_type', 'for_type_by_name']
@@ -104,7 +104,7 b" _re_pattern_type = type(re.compile(''))"
 
 def _safe_getattr(obj, attr, default=None):
     """Safe version of getattr.
-    
+
     Same as getattr, but will return ``default`` on any Exception,
     rather than raising.
     """
@@ -246,7 +246,7 b' class PrettyPrinter(_PrettyPrinterBase):'
             self.buffer.append(Breakable(sep, width, self))
             self.buffer_width += width
             self._break_outer_groups()
-            
+
     def break_(self):
         """
         Explicitly insert a newline into the output, maintaining correct indentation.
@@ -256,7 +256,7 b' class PrettyPrinter(_PrettyPrinterBase):'
         self.output.write(' ' * self.indentation)
         self.output_width = self.indentation
         self.buffer_width = 0
-        
+
 
     def begin_group(self, indent=0, open=''):
         """
@@ -282,7 +282,7 b' class PrettyPrinter(_PrettyPrinterBase):'
         self.group_stack.append(group)
         self.group_queue.enq(group)
         self.indentation += indent
-    
+
     def _enumerate(self, seq):
         """like enumerate, but with an upper limit on the number of items"""
         for idx, x in enumerate(seq):
@@ -292,7 +292,7 b' class PrettyPrinter(_PrettyPrinterBase):'
                 self.text('...')
                 return
             yield idx, x
-    
+
     def end_group(self, dedent=0, close=''):
         """End a group. See `begin_group` for more details."""
         self.indentation -= dedent
@@ -765,7 +765,7 b' if _env_type is not dict:'
 
 try:
     # In PyPy, types.DictProxyType is dict, setting the dictproxy printer
-    # using dict.setdefault avoids overwritting the dict printer
+    # using dict.setdefault avoids overwriting the dict printer
     _type_pprinters.setdefault(types.DictProxyType,
                                _dict_pprinter_factory('dict_proxy({', '})'))
     _type_pprinters[types.ClassType] = _type_pprint

IPython/testing/plugin/test_refs.py

@@ -19,9 +19,9 b' def doctest_run():'
     In [13]: run simplevars.py
     x is: 1
     """
-    
+
 def doctest_runvars():
-    """Test that variables defined in scripts get loaded correcly via %run.
+    """Test that variables defined in scripts get loaded correclty via %run.
 
     In [13]: run simplevars.py
     x is: 1

IPython/utils/frame.py

@@ -49,7 +49,7 b' def extract_vars(*names,**kw):'
     """
 
     depth = kw.get('depth',0)
-    
+
     callerNS = sys._getframe(depth+1).f_locals
     return dict((k,callerNS[k]) for k in names)
 
@@ -58,7 +58,7 b' def extract_vars_above(*names):'
     """Extract a set of variables by name from another frame.
 
     Similar to extractVars(), but with a specified depth of 1, so that names
-    are exctracted exactly from above the caller.
+    are extracted exactly from above the caller.
 
     This is simply a convenience function so that the very common case (for us)
     of skipping exactly 1 frame doesn't have to construct a special dict for
@@ -93,4 +93,3 b' def extract_module_locals(depth=0):'
     global_ns = f.f_globals
     module = sys.modules[global_ns['__name__']]
     return (module, f.f_locals)
-

IPython/utils/module_paths.py

@@ -2,14 +2,7 b''
 
 Utility functions for finding modules on sys.path.
 
-`find_mod` finds named module on sys.path.
-
-`get_init` helper function that finds __init__ file in a directory.
-
-`find_module` variant of imp.find_module in std_lib that only returns
-path to module and not an open file object as well.
-
-
+`find_module` returns a path to module or None, given certain conditions.
 
 """
 #-----------------------------------------------------------------------------
@@ -25,7 +18,7 b' path to module and not an open file object as well.'
 #-----------------------------------------------------------------------------
 
 # Stdlib imports
-import imp
+import importlib
 import os
 
 # Third-party imports
@@ -44,81 +37,34 b' import os'
 #-----------------------------------------------------------------------------
 # Classes and functions
 #-----------------------------------------------------------------------------
-def find_module(name, path=None):
-    """imp.find_module variant that only return path of module.
-    
-    The `imp.find_module` returns a filehandle that we are not interested in.
-    Also we ignore any bytecode files that `imp.find_module` finds.
-
-    Parameters
-    ----------
-    name : str
-        name of module to locate
-    path : list of str
-        list of paths to search for `name`. If path=None then search sys.path
 
-    Returns
-    -------
-    filename : str
-        Return full path of module or None if module is missing or does not have
-        .py or .pyw extension
-    """
-    if name is None:
-        return None
-    try:
-        file, filename, _ = imp.find_module(name, path)
-    except ImportError:
-        return None
-    if file is None:
-        return filename
-    else:
-        file.close()
-    if os.path.splitext(filename)[1] in [".py", ".pyc"]:
-        return filename
-    else:
-        return None
-
-def get_init(dirname):
-    """Get __init__ file path for module directory
-    
-    Parameters
-    ----------
-    dirname : str
-        Find the __init__ file in directory `dirname`
-
-    Returns
-    -------
-    init_path : str
-        Path to __init__ file
+def find_mod(module_name):
     """
-    fbase =  os.path.join(dirname, "__init__")
-    for ext in [".py", ".pyw"]:
-        fname = fbase + ext
-        if os.path.isfile(fname):
-            return fname
+    Find module `module_name` on sys.path, and return the path to module `module_name`.
 
+      - If `module_name` refers to a module directory, then return path to __init__ file. 
+        - If `module_name` is a directory without an __init__file, return None.
+      - If module is missing or does not have a `.py` or `.pyw` extension, return None.
+        - Note that we are not interested in running bytecode.
+      - Otherwise, return the fill path of the module.
 
-def find_mod(module_name):
-    """Find module `module_name` on sys.path
-    
-    Return the path to module `module_name`. If `module_name` refers to
-    a module directory then return path to __init__ file. Return full 
-    path of module or None if module is missing or does not have .py or .pyw
-    extension. We are not interested in running bytecode.
-    
     Parameters
     ----------
     module_name : str
     
     Returns
     -------
-    modulepath : str
-        Path to module `module_name`.
+    module_path : str
+        Path to module `module_name`, its __init__.py, or None,
+        depending on above conditions.
     """
-    parts = module_name.split(".")
-    basepath = find_module(parts[0])
-    for submodname in parts[1:]:
-        basepath = find_module(submodname, [basepath])
-    if basepath and os.path.isdir(basepath):
-        basepath = get_init(basepath)
-    return basepath
+    loader = importlib.util.find_spec(module_name)
+    module_path = loader.origin
+    if module_path is None:
+        return None
+    else:
+        split_path = module_path.split(".")
+        if split_path[1] in ["py", "pyw"]:
+            return module_path
+        else:
+            return None

IPython/utils/path.py

@@ -202,7 +202,7 b' def get_home_dir(require_writable=False):'
                 import _winreg as wreg  # Py 2
             key = wreg.OpenKey(
                 wreg.HKEY_CURRENT_USER,
-                "Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders"
+                r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders"
             )
             homedir = wreg.QueryValueEx(key,'Personal')[0]
             key.Close()

IPython/utils/signatures.py

@@ -5,7 +5,8 b' Fallback on backport otherwise.'
 """
 
 import warnings
-warnings.warn("{} backport for Python 2 is deprecated in IPython 6, which only supports Python 3".format(__name__),
+warnings.warn("{} backport for Python 2 is deprecated in IPython 6, which only supports "
+              "Python 3. Import directly from  standard library `inspect`".format(__name__),
     DeprecationWarning, stacklevel=2)
 
 from inspect import BoundArguments, Parameter, Signature, signature

IPython/utils/tests/test_module_paths.py

@@ -66,62 +66,42 b' def teardown():'
     shutil.rmtree(TMP_TEST_DIR)
     sys.path = old_syspath
 
-
-def test_get_init_1():
-    """See if get_init can find __init__.py in this testdir"""
-    with make_tempfile(join(TMP_TEST_DIR, "__init__.py")):
-        assert mp.get_init(TMP_TEST_DIR)
-
-def test_get_init_2():
-    """See if get_init can find __init__.pyw in this testdir"""
-    with make_tempfile(join(TMP_TEST_DIR, "__init__.pyw")):
-        assert mp.get_init(TMP_TEST_DIR)
-
-def test_get_init_3():
-    """get_init can't find __init__.pyc in this testdir"""
-    with make_tempfile(join(TMP_TEST_DIR, "__init__.pyc")):
-        nt.assert_is_none(mp.get_init(TMP_TEST_DIR))
-
-def test_get_init_4():
-    """get_init can't find __init__ in empty testdir"""
-    nt.assert_is_none(mp.get_init(TMP_TEST_DIR))
-
-
 def test_find_mod_1():
+    """
+    Search for a directory's file path.
+    Expected output: a path to that directory's __init__.py file.
+    """
     modpath = join(TMP_TEST_DIR, "xmod", "__init__.py")
     nt.assert_equal(mp.find_mod("xmod"), modpath)
 
 def test_find_mod_2():
+    """
+    Search for a directory's file path.
+    Expected output: a path to that directory's __init__.py file.
+    TODO: Confirm why this is a duplicate test.
+    """
     modpath = join(TMP_TEST_DIR, "xmod", "__init__.py")
     nt.assert_equal(mp.find_mod("xmod"), modpath)
 
 def test_find_mod_3():
+    """
+    Search for a directory + a filename without its .py extension
+    Expected output: full path with .py extension.
+    """
     modpath = join(TMP_TEST_DIR, "xmod", "sub.py")
     nt.assert_equal(mp.find_mod("xmod.sub"), modpath)
 
 def test_find_mod_4():
+    """
+    Search for a filename without its .py extension
+    Expected output: full path with .py extension
+    """
     modpath = join(TMP_TEST_DIR, "pack.py")
     nt.assert_equal(mp.find_mod("pack"), modpath)
 
 def test_find_mod_5():
-    modpath = join(TMP_TEST_DIR, "packpyc.pyc")
-    nt.assert_equal(mp.find_mod("packpyc"), modpath)
-
-def test_find_module_1():
-    modpath = join(TMP_TEST_DIR, "xmod")
-    nt.assert_equal(mp.find_module("xmod"), modpath)
-
-def test_find_module_2():
-    """Testing sys.path that is empty"""
-    nt.assert_is_none(mp.find_module("xmod", []))
-
-def test_find_module_3():
-    """Testing sys.path that is empty"""
-    nt.assert_is_none(mp.find_module(None, None))
-
-def test_find_module_4():
-    """Testing sys.path that is empty"""
-    nt.assert_is_none(mp.find_module(None))
-
-def test_find_module_5():
-    nt.assert_is_none(mp.find_module("xmod.nopack"))
+    """
+    Search for a filename with a .pyc extension
+    Expected output: TODO: do we exclude or include .pyc files?
+    """
+    nt.assert_equal(mp.find_mod("packpyc"), None)

IPython/utils/text.py

@@ -588,7 +588,7 b' class DollarFormatter(FullEvalFormatter):'
         In [4]: f.format('$a or {b}', a=1, b=2)
         Out[4]: '1 or 2'
     """
-    _dollar_pattern_ignore_single_quote = re.compile("(.*?)\$(\$?[\w\.]+)(?=([^']*'[^']*')*[^']*$)")
+    _dollar_pattern_ignore_single_quote = re.compile(r"(.*?)\$(\$?[\w\.]+)(?=([^']*'[^']*')*[^']*$)")
     def parse(self, fmt_string):
         for literal_txt, field_name, format_spec, conversion \
                     in Formatter.parse(self, fmt_string):

README.rst

@@ -55,7 +55,7 b' Or see the `development installation docs'
 for the latest revision on read the docs.
 
 Documentation and installation instructions for older version of IPython can be
-found on the `IPython website <http://ipython.org/documentation.html>`_
+found on the `IPython website <https://ipython.org/documentation.html>`_
 
 
 
@@ -87,7 +87,7 b' manager.'
 
 For more information see one of our blog posts:
 
-    http://blog.jupyter.org/2016/07/08/ipython-5-0-released/
+    https://blog.jupyter.org/2016/07/08/ipython-5-0-released/
 
 As well as the following Pull-Request for discussion:
 

docs/source/coredev/index.rst

@@ -34,7 +34,7 b' backport to.'
 
 .. note::
 
-    The ``@`` and ``[dev]`` when mentioning the bot should be optional and can
+    The ``@`` and ``[bot]`` when mentioning the bot should be optional and can
     be omitted.
 
 If the pull request cannot be automatically backported, the bot should tell you
@@ -44,7 +44,7 b' so on the PR and apply a "Need manual backport" tag to the origin PR.'
 Backport with ghpro
 -------------------
 
-We can also use `ghpro <https://pypi.python.org/pypi/ghpro>`
+We can also use `ghpro <https://pypi.python.org/pypi/ghpro>`_
 to automatically list and apply the PR on other branches. For example:
 
 .. code-block:: bash

docs/source/index.rst

@@ -22,7 +22,7 b' interactively. Its main components are:'
     :align: center
 
 
-* A `Jupyter <http://jupyter.org/>`_ kernel to work with Python code in Jupyter
+* A `Jupyter <https://jupyter.org/>`_ kernel to work with Python code in Jupyter
   notebooks and other interactive frontends.
 
 The enhanced interactive Python shells and kernel have the following main

docs/source/install/install.rst

@@ -28,7 +28,7 b' Overview'
 
 This document describes in detail the steps required to install IPython. For a
 few quick ways to get started with package managers or full Python
-distributions, see `the install page <http://ipython.org/install.html>`_ of the
+distributions, see `the install page <https://ipython.org/install.html>`_ of the
 IPython website.
 
 Please let us know if you have problems installing IPython or any of its

docs/source/interactive/index.rst

@@ -27,5 +27,5 b' done some work in the classic Python REPL.'
 
 .. seealso::
 
-    `A Qt Console for Jupyter <http://jupyter.org/qtconsole/>`__
+    `A Qt Console for Jupyter <https://jupyter.org/qtconsole/>`__
     `The Jupyter Notebook <http://jupyter-notebook.readthedocs.io/en/latest/>`__

docs/source/links.txt

@@ -17,11 +17,11 b''
    NOTE: Some of these were taken from the nipy links compendium.
 
 .. Main IPython links
-.. _ipython: http://ipython.org
-.. _`ipython manual`: http://ipython.org/documentation.html
+.. _ipython: https://ipython.org
+.. _`ipython manual`: https://ipython.org/documentation.html
 .. _ipython_github: http://github.com/ipython/ipython/
 .. _ipython_github_repo: http://github.com/ipython/ipython/
-.. _ipython_downloads: http://ipython.org/download.html
+.. _ipython_downloads: https://ipython.org/download.html
 .. _ipython_pypi: http://pypi.python.org/pypi/ipython
 .. _nbviewer: http://nbviewer.ipython.org
 

docs/source/overview.rst

@@ -218,7 +218,7 b' which will be something like ``--existing kernel-19732.json`` but with'
 different numbers which correspond to the Process ID of the kernel.
 
 You can read more about using `jupyter qtconsole
-<http://jupyter.org/qtconsole/>`_, and
+<https://jupyter.org/qtconsole/>`_, and
 `jupyter notebook <http://jupyter-notebook.readthedocs.io/en/latest/>`_. There
 is also a :ref:`message spec <messaging>` which documents the protocol for
 communication between kernels

docs/source/whatsnew/github-stats-2.0.rst

@@ -1416,7 +1416,7 b' Issues (434):'
 * :ghissue:`4759`: Application._load_config_files log parameter default fails
 * :ghissue:`3153`: docs / file menu: explain how to exit the notebook
 * :ghissue:`4791`: Did updates to ipython_directive bork support for cython magic snippets?
-* :ghissue:`4385`: "Part 4 - Markdown Cells.ipynb" nbviewer example seems not well referenced in current online documentation page http://ipython.org/ipython-doc/stable/interactive/notebook.htm
+* :ghissue:`4385`: "Part 4 - Markdown Cells.ipynb" nbviewer example seems not well referenced in current online documentation page https://ipython.org/ipython-doc/stable/interactive/notebook.htm
 * :ghissue:`4655`: prefer marked to pandoc for markdown2html
 * :ghissue:`3441`: Fix focus related problems in the notebook
 * :ghissue:`3402`: Feature Request: Save As (latex, html,..etc) as a menu option in Notebook rather than explicit need to invoke nbconvert

docs/source/whatsnew/version0.11.rst

@@ -232,7 +232,7 b' may also offer a slightly more featureful application (with menus and other GUI'
 elements), but we remain committed to always shipping this easy to embed
 widget.
 
-See the `Jupyter Qt Console site <http://jupyter.org/qtconsole>`_ for a detailed
+See the `Jupyter Qt Console site <https://jupyter.org/qtconsole>`_ for a detailed
 description of the console's features and use.
 
 

docs/source/whatsnew/version6.rst

@@ -2,6 +2,18 b''
  6.x Series
 ============
 
+.. _whatsnew650:
+
+IPython 6.5.0
+=============
+
+Miscellaneous bug fixes and compatibility with Python 3.7.
+
+* Autocompletion fix for modules with out ``__init__.py`` :ghpull:`11227`
+* update the ``%pastebin`` magic to use ``dpaste.com`` instead og GitHub Gist
+  which now requires authentication :ghpull:`11182`
+* Fix crash with multiprocessing :ghpull:`11185`
+
 .. _whatsnew640:
 
 IPython 6.4.0

examples/IPython Kernel/Rich Output.ipynb

@@ -3058,7 +3058,7 b''
        "        <iframe\n",
        "            width=\"100%\"\n",
        "            height=\"350\"\n",
-       "            src=\"http://jupyter.org\"\n",
+       "            src=\"https://jupyter.org\"\n",
        "            frameborder=\"0\"\n",
        "            allowfullscreen\n",
        "        ></iframe>\n",
@@ -3075,7 +3075,7 b''
    ],
    "source": [
     "from IPython.display import IFrame\n",
-    "IFrame('http://jupyter.org', width='100%', height=350)"
+    "IFrame('https://jupyter.org', width='100%', height=350)"
    ]
   },
   {
@@ -3263,7 +3263,7 b''
     "* When you open a notebook, rich output is only displayed if it doesn't contain security vulberabilities, ...\n",
     "* ... or if you have trusted a notebook, all rich output will run upon opening it.\n",
     "\n",
-    "A full description of the IPython security model can be found on [this page](http://ipython.org/ipython-doc/dev/notebook/security.html)."
+    "A full description of the IPython security model can be found on [this page](https://ipython.org/ipython-doc/dev/notebook/security.html)."
    ]
   },
   {

examples/Index.ipynb

@@ -18,7 +18,7 b''
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "This directory contains IPython's notebook-based documentation. This augments our [Sphinx-based documentation](http://ipython.org/ipython-doc/stable/index.html) with notebooks that contain interactive tutorials and examples. Over time, more of our documentation will be pulled into this format."
+    "This directory contains IPython's notebook-based documentation. This augments our [Sphinx-based documentation](https://ipython.org/ipython-doc/stable/index.html) with notebooks that contain interactive tutorials and examples. Over time, more of our documentation will be pulled into this format."
    ]
   },
   {

tools/tests/Confined Output.ipynb

@@ -183,7 +183,7 b''
        "        <iframe\n",
        "            width=\"900\"\n",
        "            height=\"400\"\n",
-       "            src=\"http://ipython.org\"\n",
+       "            src=\"https://ipython.org\"\n",
        "            frameborder=\"0\"\n",
        "            allowfullscreen\n",
        "        ></iframe>\n",
@@ -199,7 +199,7 b''
     }
    ],
    "source": [
-    "IFrame(src=\"http://ipython.org\", width=900, height=400)"
+    "IFrame(src=\"https://ipython.org\", width=900, height=400)"
    ]
   },
   {

tools/tests/Markdown Pandoc Limitations.ipynb

@@ -1993,7 +1993,7 b''
        "\n",
        "var mdcell = new IPython.MarkdownCell();\n",
        "mdcell.create_element();\n",
-       "mdcell.set_text('\\n![Alternate Text](http://ipython.org/_static/IPy_header.png)\\n');\n",
+       "mdcell.set_text('\\n![Alternate Text](https://ipython.org/_static/IPy_header.png)\\n');\n",
        "mdcell.render();\n",
        "$(element).append(mdcell.element)\n",
        ".removeClass()\n",
@@ -2022,10 +2022,10 b''
       "text/html": [
        "<div style='display: inline-block; width: 30%; vertical-align: top;'><div style='background: #AAFFAA; width: 100%;'>NBConvert Latex Output</div><pre class='prettyprint lang-tex' style='background: #EEFFEE; border: 1px solid #DDEEDD;'><xmp>\\begin{figure}[htbp]\n",
        "\\centering\n",
-       "\\includegraphics{http://ipython.org/_static/IPy_header.png}\n",
+       "\\includegraphics{https://ipython.org/_static/IPy_header.png}\n",
        "\\caption{Alternate Text}\n",
        "\\end{figure}</xmp></pre></div><div style='display: inline-block; width: 2%;'></div><div style='display: inline-block; width: 30%; vertical-align: top;'><div style='background: #FFAAAA; width: 100%;'>NBViewer Output</div><div style='display: inline-block; width: 100%;'><div class=\"figure\">\n",
-       "<img src=\"http://ipython.org/_static/IPy_header.png\" alt=\"Alternate Text\" /><p class=\"caption\">Alternate Text</p>\n",
+       "<img src=\"https://ipython.org/_static/IPy_header.png\" alt=\"Alternate Text\" /><p class=\"caption\">Alternate Text</p>\n",
        "</div></div></div>"
       ],
       "text/plain": [
@@ -2051,7 +2051,7 b''
    ],
    "source": [
     "compare_render(r\"\"\"\n",
-    "![Alternate Text](http://ipython.org/_static/IPy_header.png)\n",
+    "![Alternate Text](https://ipython.org/_static/IPy_header.png)\n",
     "\"\"\")"
    ]
   },
@@ -2075,7 +2075,7 b''
        "\n",
        "var mdcell = new IPython.MarkdownCell();\n",
        "mdcell.create_element();\n",
-       "mdcell.set_text('\\n<img src=\"http://ipython.org/_static/IPy_header.png\">\\n');\n",
+       "mdcell.set_text('\\n<img src=\"https://ipython.org/_static/IPy_header.png\">\\n');\n",
        "mdcell.render();\n",
        "$(element).append(mdcell.element)\n",
        ".removeClass()\n",
@@ -2102,7 +2102,7 b''
     {
      "data": {
       "text/html": [
-       "<div style='display: inline-block; width: 30%; vertical-align: top;'><div style='background: #AAFFAA; width: 100%;'>NBConvert Latex Output</div><pre class='prettyprint lang-tex' style='background: #EEFFEE; border: 1px solid #DDEEDD;'><xmp></xmp></pre></div><div style='display: inline-block; width: 2%;'></div><div style='display: inline-block; width: 30%; vertical-align: top;'><div style='background: #FFAAAA; width: 100%;'>NBViewer Output</div><div style='display: inline-block; width: 100%;'><p><img src=\"http://ipython.org/_static/IPy_header.png\"></p></div></div>"
+       "<div style='display: inline-block; width: 30%; vertical-align: top;'><div style='background: #AAFFAA; width: 100%;'>NBConvert Latex Output</div><pre class='prettyprint lang-tex' style='background: #EEFFEE; border: 1px solid #DDEEDD;'><xmp></xmp></pre></div><div style='display: inline-block; width: 2%;'></div><div style='display: inline-block; width: 30%; vertical-align: top;'><div style='background: #FFAAAA; width: 100%;'>NBViewer Output</div><div style='display: inline-block; width: 100%;'><p><img src=\"https://ipython.org/_static/IPy_header.png\"></p></div></div>"
       ],
       "text/plain": [
        "<IPython.core.display.HTML at 0x21ac450>"
@@ -2127,7 +2127,7 b''
    ],
    "source": [
     "compare_render(r\"\"\"\n",
-    "<img src=\"http://ipython.org/_static/IPy_header.png\">\n",
+    "<img src=\"https://ipython.org/_static/IPy_header.png\">\n",
     "\"\"\")"
    ]
   },