← Back to branch summary

~ellisonbg/ipython/trunk-dev

« back to all changes in this revision

Viewing changes to IPython/deathrow/GnuplotInteractive.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/deathrow/GnuplotInteractive.py
16
16
           'gphelp']
17
17
 
18
18
import IPython.GnuplotRuntime as GRun
19
 
from IPython.genutils import page,warn
 
19
from IPython.utils.genutils import warn
 
20
from IPython.core.page import page
20
21
 
21
22
# Set global names for interactive use
22
23
Gnuplot  = GRun.Gnuplot
140
141
    print """*** Type `gphelp` for help on the Gnuplot integration features."""
141
142
 
142
143
    # Add the new magic functions to the class dict
143
 
    from IPython.iplib import InteractiveShell
 
144
    from IPython.core.iplib import InteractiveShell
144
145
    InteractiveShell.magic_gpc = magic_gpc
145
146
    InteractiveShell.magic_gp_set_default = magic_gp_set_default
146
147