Merge pull request #4002 from takluyver/drop-26-32

Drop Python 2.6 and 3.2

.travis.yml

@@ -1,13 +1,10 b''
 # http://travis-ci.org/#!/ipython/ipython
 language: python
 python:
-    - 2.6
     - 2.7
-    - 3.2
     - 3.3
 before_install:
-    - "if [[ $TRAVIS_PYTHON_VERSION == '3.2'* ]]; then pip install -Iv https://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.6.tar.gz; fi"
-    - "if [[ ! $TRAVIS_PYTHON_VERSION == '3.2'* ]]; then pip install jinja2; fi"
+    - pip install jinja2
     - easy_install -q pyzmq
     - sudo apt-get install pandoc
     - pip install pygments

IPython/config/application.py

@@ -115,10 +115,7 b' class LevelFormatter(logging.Formatter):'
             record.highlevel = self.highlevel_format % record.__dict__
         else:
             record.highlevel = ""
-        if sys.version_info[:2] > (2,6):
-            return super(LevelFormatter, self).format(record)
-        else:
-            return logging.Formatter.format(self, record)
+        return super(LevelFormatter, self).format(record)
             
 
 class Application(SingletonConfigurable):

IPython/lib/irunner.py

@@ -287,7 +287,6 b' class InteractiveRunner(object):'
 
         self.run_file(args[0],opts.interact)
 
-_ipython_cmd = "ipython3" if py3compat.PY3 else "ipython"
 
 # Specific runners for particular programs
 class IPythonRunner(InteractiveRunner):
@@ -303,15 +302,20 b' class IPythonRunner(InteractiveRunner):'
     prompts would break this.
     """
 
-    def __init__(self,program = _ipython_cmd, args=None, out=sys.stdout, echo=True):
+    def __init__(self, program='<ipython>', args=None, out=sys.stdout, echo=True):
         """New runner, optionally passing the ipython command to use."""
         args0 = ['--colors=NoColor',
                  '--no-term-title',
                  '--no-autoindent',
                  # '--quick' is important, to prevent loading default config:
                  '--quick']
-        if args is None: args = args0
-        else: args = args0 + args
+        args = args0 + (args or [])
+
+        # Special case to launch IPython with current interpreter
+        if program == '<ipython>':
+            program = sys.executable
+            args = ['-m', 'IPython'] + args
+
         prompts = [r'In \[\d+\]: ',r'   \.*: ']
         InteractiveRunner.__init__(self,program,prompts,args,out,echo)
 

IPython/parallel/client/asyncresult.py

@@ -31,15 +31,6 b' from IPython.parallel import error'
 # Functions
 #-----------------------------------------------------------------------------
 
-def _total_seconds(td):
-    """timedelta.total_seconds was added in 2.7"""
-    try:
-        # Python >= 2.7
-        return td.total_seconds()
-    except AttributeError:
-        # Python 2.6
-        return 1e-6 * (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6)
-
 def _raw_text(s):
     display_pretty(s, raw=True)
 
@@ -338,7 +329,7 b' class AsyncResult(object):'
             # handle single_result AsyncResults, where ar.stamp is single object,
             # not a list
             end = end_key(end)
-        return _total_seconds(end - start)
+        return (end - start).total_seconds()
         
     @property
     def progress(self):
@@ -361,7 +352,7 b' class AsyncResult(object):'
                 stamp = self._client.metadata[msg_id]['submitted']
                 if stamp and stamp < submitted:
                     submitted = stamp
-        return _total_seconds(now-submitted)
+        return (now-submitted).total_seconds()
     
     @property
     @check_ready
@@ -372,7 +363,7 b' class AsyncResult(object):'
         """
         t = 0
         for md in self._metadata:
-            t += _total_seconds(md['completed'] - md['started'])
+            t += (md['completed'] - md['started']).total_seconds()
         return t
     
     @property

IPython/terminal/console/interactiveshell.py

@@ -25,11 +25,6 b' import base64'
 
 from Queue import Empty
 
-try:
-    from contextlib import nested
-except:
-    from IPython.utils.nested_context import nested
-
 from IPython.core import page
 from IPython.utils.warn import warn, error
 from IPython.utils import io
@@ -303,8 +298,8 b' class ZMQTerminalInteractiveShell(TerminalInteractiveShell):'
         raw = base64.decodestring(data[mime].encode('ascii'))
         imageformat = self._imagemime[mime]
         filename = 'tmp.{0}'.format(imageformat)
-        with nested(NamedFileInTemporaryDirectory(filename),
-                    open(os.devnull, 'w')) as (f, devnull):
+        with NamedFileInTemporaryDirectory(filename) as f, \
+                    open(os.devnull, 'w') as devnull:
             f.write(raw)
             f.flush()
             fmt = dict(file=f.name, format=imageformat)

IPython/terminal/embed.py

@@ -27,13 +27,6 b' from __future__ import with_statement'
 import sys
 import warnings
 
-# We need to use nested to support python 2.6, once we move to >=2.7, we can
-# use the with keyword's new builtin support for nested managers
-try:
-    from contextlib import nested
-except:
-    from IPython.utils.nested_context import nested
-
 from IPython.core import ultratb, compilerop
 from IPython.core.magic import Magics, magics_class, line_magic
 from IPython.terminal.interactiveshell import TerminalInteractiveShell
@@ -251,7 +244,7 b' class InteractiveShellEmbed(TerminalInteractiveShell):'
         # actually completes using the frame's locals/globals
         self.set_completer_frame()
 
-        with nested(self.builtin_trap, self.display_trap):
+        with self.builtin_trap, self.display_trap:
             self.interact(display_banner=display_banner)
         
         # now, purge out the local namespace of IPython's hidden variables.

IPython/terminal/interactiveshell.py

@@ -19,13 +19,6 b' import bdb'
 import os
 import sys
 
-# We need to use nested to support python 2.6, once we move to >=2.7, we can
-# use the with keyword's new builtin support for nested managers
-try:
-    from contextlib import nested
-except:
-    from IPython.utils.nested_context import nested
-
 from IPython.core.error import TryNext, UsageError
 from IPython.core.usage import interactive_usage, default_banner
 from IPython.core.inputsplitter import IPythonInputSplitter
@@ -429,7 +422,7 b' class TerminalInteractiveShell(InteractiveShell):'
         internally created default banner.
         """
 
-        with nested(self.builtin_trap, self.display_trap):
+        with self.builtin_trap, self.display_trap:
 
             while 1:
                 try:

IPython/testing/iptest.py

@@ -43,10 +43,6 b' import warnings'
 # is slow and we need it for our parametric tests to work correctly.
 from IPython.testing import nosepatch
 
-# Monkeypatch extra assert methods into nose.tools if they're not already there.
-# This can be dropped once we no longer test on Python 2.6
-from IPython.testing import nose_assert_methods
-
 # Now, proceed to import nose itself
 import nose.plugins.builtin
 from nose.plugins.xunit import Xunit

IPython/testing/tools.py

@@ -165,11 +165,7 b' def get_ipython_cmd(as_string=False):'
     as_string: bool
         Flag to allow to return the command as a string.
     """
-    # FIXME: remove workaround for 2.6 support
-    if sys.version_info[:2] > (2,6):
-        ipython_cmd = [sys.executable, "-m", "IPython"]
-    else:
-        ipython_cmd = ["ipython"]
+    ipython_cmd = [sys.executable, "-m", "IPython"]
 
     if as_string:
         ipython_cmd = " ".join(ipython_cmd)

docs/source/install/install.rst

@@ -1,8 +1,8 b''
-IPython requires Python 2.6, 2.7, or ≥ 3.2.
+IPython requires Python 2.7 or ≥ 3.3.
 
 .. note::
 
-    If you need to use Python 2.5, you can find an old version (≤0.10) of IPython
+    If you need to use Python 2.6 or 3.2, you can find IPython 1.0
     `here <http://archive.ipython.org/release/>`__.
 
 Quickstart

docs/source/overview.rst

@@ -273,10 +273,9 b' for parallel computing.'
 Portability and Python requirements
 -----------------------------------
 
-As of the 1.0 release, IPython works with Python 2.6, 2.7, 3.2 and 3.3.
-Version 0.12 introduced full support for Python 3. Version 0.11 worked with
-Python 2.6 and 2.7 only. Versions 0.9 and 0.10 worked with Python 2.4 and
-above (not including Python 3).
+As of the 2.0 release, IPython works with Python 2.7 and 3.3 or above.
+Version 1.0 additionally worked with Python 2.6 and 3.2.
+Version 0.12 was the first version to fully support Python 3.
 
 IPython is known to work on the following operating systems:
 

docs/source/whatsnew/development.rst

@@ -8,3 +8,5 b' This document describes in-flight development work.'
 Backwards incompatible changes
 ------------------------------
 
+* Python 2.6 and 3.2 are no longer supported: the minimum required
+  Python versions are now 2.7 and 3.3.