Merge pull request #2 from ipython/master

pulling changes from current master

docs/source/whatsnew/pr/incompat-no-dreload.rst

@@ -0,0 +1,3 b''
+The `--deep-reload` flag and the corresponding options to inject `dreload` or
+`reload` into the interactive namespace have been removed. You have to
+explicitly import `reload` from `IPython.lib.deepreload` to use it.

docs/source/whatsnew/pr/removed-Ipython-utils-warn.rst

@@ -0,0 +1,2 b''
+IPython.utils.warn was deprecated in IPython 4.0, and has now been removed.
+instead of Ipython.utils.warn inbuilt warning module is used.

IPython/__init__.py

@@ -22,17 +22,24 b' from __future__ import absolute_import'
 
 import os
 import sys
-import warnings
 
 #-----------------------------------------------------------------------------
 # Setup everything
 #-----------------------------------------------------------------------------
 
 # Don't forget to also update setup.py when this changes!
-v = sys.version_info
-if v[:2] < (3,3):
-    raise ImportError('IPython requires Python version 3.3 or above.')
-del v
+if sys.version_info < (3,3):
+    raise ImportError(
+"""
+IPython 6.0+ does not support Python 2.6, 2.7, 3.0, 3.1, or 3.2.
+When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
+Beginning with IPython 6.0, Python 3.3 and above is required.
+
+See IPython `README.rst` file for more information:
+
+    https://github.com/ipython/ipython/blob/master/README.rst
+
+""")
 
 # Make it easy to import extensions - they are always directly on pythonpath.
 # Therefore, non-IPython modules can be added to extensions directory.
@@ -143,4 +150,3 b' def start_kernel(argv=None, **kwargs):'
     """
     from IPython.kernel.zmq.kernelapp import launch_new_instance
     return launch_new_instance(argv=argv, **kwargs)
-    

IPython/core/builtin_trap.py

@@ -52,17 +52,6 b' class BuiltinTrap(Configurable):'
                               'quit': HideBuiltin,
                               'get_ipython': self.shell.get_ipython,
                               }
-        # Recursive reload function
-        try:
-            from IPython.lib import deepreload
-            if self.shell.deep_reload:
-                from warnings import warn
-                warn("Automatically replacing builtin `reload` by `deepreload.reload` is deprecated since IPython 4.0, please import `reload` explicitly from `IPython.lib.deepreload", DeprecationWarning)
-                self.auto_builtins['reload'] = deepreload._dreload
-            else:
-                self.auto_builtins['dreload']= deepreload._dreload
-        except ImportError:
-            pass
 
     def __enter__(self):
         if self._nested_level == 0:

IPython/core/interactiveshell.py

@@ -260,21 +260,6 b' class InteractiveShell(SingletonConfigurable):'
         help="Set the color scheme (NoColor, Neutral, Linux, or LightBG)."
     ).tag(config=True)
     debug = Bool(False).tag(config=True)
-    deep_reload = Bool(False, help=
-        """
-        **Deprecated**
-
-        Will be removed in IPython 6.0
-
-        Enable deep (recursive) reloading by default. IPython can use the
-        deep_reload module which reloads changes in modules recursively (it
-        replaces the reload() function, so you don't need to change anything to
-        use it). `deep_reload` forces a full reload of modules whose code may
-        have changed, which the default reload() function does not.  When
-        deep_reload is off, IPython will use the normal reload(), but
-        deep_reload will still be available as dreload().
-        """
-    ).tag(config=True)
     disable_failing_post_execute = Bool(False,
         help="Don't call post-execute functions that have failed in the past."
     ).tag(config=True)

IPython/core/tests/test_paths.py

@@ -17,7 +17,7 b' from IPython import paths'
 from IPython.testing.decorators import skip_win32
 from IPython.utils.tempdir import TemporaryDirectory
 
-TMP_TEST_DIR = tempfile.mkdtemp()
+TMP_TEST_DIR = os.path.realpath(tempfile.mkdtemp())
 HOME_TEST_DIR = os.path.join(TMP_TEST_DIR, "home_test_dir")
 XDG_TEST_DIR = os.path.join(HOME_TEST_DIR, "xdg_test_dir")
 XDG_CACHE_DIR = os.path.join(HOME_TEST_DIR, "xdg_cache_dir")

IPython/lib/deepreload.py

@@ -341,21 +341,3 b" def reload(module, exclude=('sys', 'os.path', builtin_mod_name, '__main__')):"
             return deep_reload_hook(module)
     finally:
         found_now = {}
-
-
-def _dreload(module, **kwargs):
-    """
-    **deprecated**
-
-    import reload explicitly from `IPython.lib.deepreload` to use it
-
-    """
-    # this was marked as deprecated and for 5.0 removal, but
-    # IPython.core_builtin_trap have a Deprecation warning for 6.0, so cannot
-    # remove that now.
-    warn("""
-injecting `dreload` in interactive namespace is deprecated since IPython 4.0. 
-Please import `reload` explicitly from `IPython.lib.deepreload`.
-""", DeprecationWarning, stacklevel=2)
-    reload(module, **kwargs)
-

IPython/terminal/interactiveshell.py

@@ -8,10 +8,10 b' from warnings import warn'
 
 from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC
 from IPython.utils import io
-from IPython.utils.py3compat import PY3, cast_unicode_py2, input
+from IPython.utils.py3compat import PY3, cast_unicode_py2, input, string_types
 from IPython.utils.terminal import toggle_set_term_title, set_term_title
 from IPython.utils.process import abbrev_cwd
-from traitlets import Bool, Unicode, Dict, Integer, observe, Instance, Type, default, Enum
+from traitlets import Bool, Unicode, Dict, Integer, observe, Instance, Type, default, Enum, Union
 
 from prompt_toolkit.enums import DEFAULT_BUFFER, EditingMode
 from prompt_toolkit.filters import (HasFocus, Condition, IsDone)
@@ -23,6 +23,7 b' from prompt_toolkit.layout.processors import ConditionalProcessor, HighlightMatc'
 from prompt_toolkit.styles import PygmentsStyle, DynamicStyle
 
 from pygments.styles import get_style_by_name, get_all_styles
+from pygments.style import Style
 from pygments.token import Token
 
 from .debugger import TerminalPdb, Pdb
@@ -132,8 +133,9 b' class TerminalInteractiveShell(InteractiveShell):'
         help="Enable mouse support in the prompt"
     ).tag(config=True)
 
-    highlighting_style = Unicode('legacy',
-            help="The name of a Pygments style to use for syntax highlighting: \n %s" % ', '.join(get_all_styles())
+    highlighting_style = Union([Unicode('legacy'), Type(klass=Style)],
+        help="""The name or class of a Pygments style to use for syntax
+        highlighting: \n %s""" % ', '.join(get_all_styles())
     ).tag(config=True)
 
     
@@ -143,7 +145,7 b' class TerminalInteractiveShell(InteractiveShell):'
         self.refresh_style()
 
     def refresh_style(self):
-        self._style = self._make_style_from_name(self.highlighting_style)
+        self._style = self._make_style_from_name_or_cls(self.highlighting_style)
 
 
     highlighting_style_overrides = Dict(
@@ -229,7 +231,7 b' class TerminalInteractiveShell(InteractiveShell):'
             if cell and (cell != last_cell):
                 history.append(cell)
 
-        self._style = self._make_style_from_name(self.highlighting_style)
+        self._style = self._make_style_from_name_or_cls(self.highlighting_style)
         style = DynamicStyle(lambda: self._style)
 
         editing_mode = getattr(EditingMode, self.editing_mode.upper())
@@ -249,14 +251,14 b' class TerminalInteractiveShell(InteractiveShell):'
             self._pt_app, eventloop=self._eventloop,
             output=create_output(true_color=self.true_color))
 
-    def _make_style_from_name(self, name):
+    def _make_style_from_name_or_cls(self, name_or_cls):
         """
         Small wrapper that make an IPython compatible style from a style name
 
         We need that to add style for prompt ... etc. 
         """
         style_overrides = {}
-        if name == 'legacy':
+        if name_or_cls == 'legacy':
             legacy = self.colors.lower()
             if legacy == 'linux':
                 style_cls = get_style_by_name('monokai')
@@ -287,7 +289,10 b' class TerminalInteractiveShell(InteractiveShell):'
             else :
                 raise ValueError('Got unknown colors: ', legacy)
         else :
-            style_cls = get_style_by_name(name)
+            if isinstance(name_or_cls, string_types):
+                style_cls = get_style_by_name(name_or_cls)
+            else:
+                style_cls = name_or_cls
             style_overrides = {
                 Token.Prompt: '#009900',
                 Token.PromptNum: '#00ff00 bold',

IPython/terminal/prompts.py

@@ -71,4 +71,4 b' class RichPromptDisplayHook(DisplayHook):'
             if self.shell.pt_cli:
                 self.shell.pt_cli.print_tokens(tokens)
             else:
-                print(*(s for t, s in tokens), sep='')
+                sys.stdout.write(''.join(s for t, s in tokens))

README.rst

@@ -19,7 +19,7 b' Overview'
 ========
 
 Welcome to IPython.  Our full documentation is available on `ipython.readthedocs.io
-<https://ipython.readthedocs.io/en/stable/>`_ and contain information on how to install, use
+<https://ipython.readthedocs.io/en/stable/>`_ and contains information on how to install, use and
 contribute to the project.
 
 Officially, IPython requires Python version 3.3 and above.
@@ -32,20 +32,56 b' if you want to use these.'
 
 
 
-Developement and Instant runnimg
-================================
+Development and Instant running
+===============================
 
 You can find the latest version of the development documentation on `readthedocs
-<http://ipython.readthedocs.io/en/latest/>`_. 
+<http://ipython.readthedocs.io/en/latest/>`_.
 
 You can run IPython from this directory without even installing it system-wide
 by typing at the terminal::
-    
+
    $ python -m IPython
 
-Or see the `developement installation docs
+Or see the `development installation docs
 <http://ipython.readthedocs.io/en/latest/install/install.html#installing-the-development-version>`_
-for the latest revision on read the 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>`_
+
+
+
+IPython requires Python version 3 or above
+==========================================
+
+Starting with version 6.0, IPython does not support Python 2.7, 3.0, 3.1, or
+3.2.
+
+For a version compatible with Python 2.7, please install the 5.x LTS Long Term
+Support version.
+
+If you are encountering this error message you are likely trying to install or
+use IPython from source. You need to checkout the remote 5.x branch. If you are
+using git the following should work:
+
+  $ git fetch origin
+  $ git checkout -b origin/5.x
+
+If you encounter this error message with a regular install of IPython, then you
+likely need to update your package manager, for example if you are using `pip`
+check the version of pip with
+
+  $ pip --version
+
+You will need to update pip to the version 8.2 or greater. If you are not using
+pip, please inquiry with the maintainers of the package for your package
+manager.
+
+For more information see one of our blog posts:
+
+    http://blog.jupyter.org/2016/07/08/ipython-5-0-released/
+
+As well as the following Pull-Request for discussion:
+
+    https://github.com/ipython/ipython/pull/9900

docs/source/config/details.rst

@@ -101,9 +101,10 b" is set to ``'legacy'``. It has four case-insensitive values:"
 should be legible on either dark or light terminal backgrounds. *linux* is
 optimised for dark backgrounds and *lightbg* for light ones.
 
-``TerminalInteractiveShell.highlighting_style`` determines prompt colours and syntax
-highlighting. It takes the name of a Pygments style as a string, or the special
-value ``'legacy'`` to pick a style in accordance with ``InteractiveShell.colors``.
+``TerminalInteractiveShell.highlighting_style`` determines prompt colours and
+syntax highlighting. It takes the name (as a string) or class (as a subclass of
+``pygments.style.Style``) of a Pygments style, or the special value ``'legacy'``
+to pick a style in accordance with ``InteractiveShell.colors``.
 
 You can see the Pygments styles available on your system by running::
 

setup.py

@@ -26,9 +26,18 b' import sys'
 
 # This check is also made in IPython/__init__, don't forget to update both when
 # changing Python version requirements.
-v = sys.version_info
-if v[:2] < (3,3):
-    error = "ERROR: IPython requires Python version 3.3 or above."
+if sys.version_info < (3,3):
+    error = """
+IPython 6.0+ does not support Python 2.6, 2.7, 3.0, 3.1, or 3.2.
+When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
+Beginning with IPython 6.0, Python 3.3 and above is required.
+
+See IPython `README.rst` file for more information:
+
+    https://github.com/ipython/ipython/blob/master/README.rst
+
+"""
+
     print(error, file=sys.stderr)
     sys.exit(1)