← Back to branch summary

~ellisonbg/ipython/trunk-dev

« back to all changes in this revision

Viewing changes to IPython/quarantine/InterpreterExec.py

  • Committer: Brian Granger
  • Date: 2010-01-31 23:57:46 UTC
  • mfrom: (1109.1.113 ipython)
  • Revision ID: ellisonbg@gmail.com-20100131235746-rj81qa8klooepq2m
Merging from upstream trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
IPython/quarantine/InterpreterExec.py
14
14
#  the file COPYING, distributed as part of this software.
15
15
#*****************************************************************************
16
16
 
17
 
# TODO: deprecated
 
17
 
18
18
def prefilter_shell(self,line,continuation):
19
19
    """Alternate prefilter, modified for shell-like functionality.
20
20
 
43
43
        return self._prefilter(line,continuation)
44
44
 
45
45
# Rebind this to be the new IPython prefilter:
46
 
from IPython.iplib import InteractiveShell
 
46
from IPython.core.iplib import InteractiveShell
47
47
InteractiveShell.prefilter = prefilter_shell
48
48
# Clean up the namespace.
49
49
del InteractiveShell,prefilter_shell
50
50
 
51
51
# Provide pysh and further shell-oriented services
52
52
import os,sys,shutil
53
 
from IPython.genutils import system,shell,getoutput,getoutputerror
 
53
from IPython.utils.process import system,shell,getoutput,getoutputerror
54
54
 
55
55
# Short aliases for getting shell output as a string and a list
56
56
sout = getoutput