Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

fix missing imports in core.interactiveshell #2373

Merged
merged 1 commit into from

3 participants

@minrk
Owner

introduced in cf15c8f

closes #2372

@travisbot

This pull request passes (merged 5b09a81 into 6f74560).

@takluyver
Owner

Looks fine, thanks. Merging.

@takluyver takluyver merged commit c678a87 into ipython:master
@minrk minrk referenced this pull request from a commit
@minrk minrk Backport PR #2373: fix missing imports in core.interactiveshell
introduced in cf15c8f

closes #2372
59eda29
@minrk minrk deleted the minrk:imports branch
@yarikoptic yarikoptic referenced this pull request from a commit in yarikoptic/ipython
@yarikoptic yarikoptic Merge tag 'rel-0.13.1' into debian-01X
* tag 'rel-0.13.1': (27 commits)
  remove rc for 0.13.1 final
  0.13.1.rc3
  qtconsole extras_require to whatsnew
  Backport PR #2492: add missing 'qtconsole' extras_require
  add 2480 to whatsnew
  Backport PR #2480: Add deprecation warnings for sympyprinting
  PR 2384 to whatsnew
  mark 0.13.1.rc2
  Backport PR #2384: Adapt inline backend to changes in matplotlib
  mark 0.13.1.rc1
  update 0.13.1 whatsnew lists
  Backport PR #2479: use new _winapi instead of removed _subprocess
  Backport PR #2437: don't let log cleanup prevent engine start
  Backport PR #2405: clarify TaskScheduler.hwm doc
  Backport PR #2377: Fix installation of man pages in Python 3
  start 0.13.1 whatsnew
  Backport PR #2373: fix missing imports in core.interactiveshell
  Backport PR #2365: fix names of notebooks for download/save
  Backport PR #2345: Remove references to 'version' no longer in argparse. Github issue #2343.
  Backport PR #2347: adjust division error message checking to account for Python 3
  ...
12b344d
@yarikoptic yarikoptic referenced this pull request from a commit in yarikoptic/ipython
@yarikoptic yarikoptic Merge tag 'rel-0.13.1' (mtheirs) into releases
* tag 'rel-0.13.1': (51 commits)
  remove rc for 0.13.1 final
  0.13.1.rc3
  qtconsole extras_require to whatsnew
  Backport PR #2492: add missing 'qtconsole' extras_require
  add 2480 to whatsnew
  Backport PR #2480: Add deprecation warnings for sympyprinting
  PR 2384 to whatsnew
  mark 0.13.1.rc2
  Backport PR #2384: Adapt inline backend to changes in matplotlib
  mark 0.13.1.rc1
  update 0.13.1 whatsnew lists
  Backport PR #2479: use new _winapi instead of removed _subprocess
  Backport PR #2437: don't let log cleanup prevent engine start
  Backport PR #2405: clarify TaskScheduler.hwm doc
  Backport PR #2377: Fix installation of man pages in Python 3
  start 0.13.1 whatsnew
  Backport PR #2373: fix missing imports in core.interactiveshell
  Backport PR #2365: fix names of notebooks for download/save
  Backport PR #2345: Remove references to 'version' no longer in argparse. Github issue #2343.
  Backport PR #2347: adjust division error message checking to account for Python 3
  ...
39b9601
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 1, 2012
  1. @minrk

    fix missing imports in core.interactiveshell

    minrk authored
    introduced in cf15c8f
    
    closes #2372
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 8 deletions.
  1. +2 −8 IPython/core/interactiveshell.py
View
10 IPython/core/interactiveshell.py
@@ -29,17 +29,11 @@
import sys
import tempfile
import types
-
-# 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
+import urllib
+from io import open as io_open
from IPython.config.configurable import SingletonConfigurable
from IPython.core import debugger, oinspect
-from IPython.core import history as ipcorehist
from IPython.core import magic
from IPython.core import page
from IPython.core import prefilter
Something went wrong with that request. Please try again.