##// END OF EJS Templates
Do not generate output for empty figures in Qt console....
Do not generate output for empty figures in Qt console. Before, calling figure() would produce a big blank area. This ensures output is only returned if the figure has content. Also added basic testing for pylabtools, for which we had none.

File last commit:

r3299:827b2686
r3731:57d3cb1a
Show More
globalipapp.py
195 lines | 7.3 KiB | text/x-python | PythonLexer
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423 """Global IPython app to support test running.
We must start our own ipython object and heavily muck with it so that all the
modifications IPython makes to system behavior don't send the doctest machinery
into a fit. This code should be considered a gross hack, but it gets the job
done.
"""
from __future__ import absolute_import
Fernando Perez
Fixed broken coloring on Windows....
r2974 from __future__ import print_function
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423
#-----------------------------------------------------------------------------
Fernando Perez
Fixed broken coloring on Windows....
r2974 # Copyright (C) 2009-2010 The IPython Development Team
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 #
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423 #-----------------------------------------------------------------------------
Fernando Perez
Fixed broken coloring on Windows....
r2974 # stdlib
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423 import __builtin__
import os
import sys
Fernando Perez
Fixed broken coloring on Windows....
r2974 from types import MethodType
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423
Fernando Perez
Fixed broken coloring on Windows....
r2974 # our own
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423 from . import tools
Fernando Perez
Fixed broken coloring on Windows....
r2974 from IPython.frontend.terminal.interactiveshell import TerminalInteractiveShell
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423 #-----------------------------------------------------------------------------
# Functions
#-----------------------------------------------------------------------------
# Hack to modify the %run command so we can sync the user's namespace with the
# test globals. Once we move over to a clean magic system, this will be done
# with much less ugliness.
class py_file_finder(object):
def __init__(self,test_filename):
self.test_filename = test_filename
def __call__(self,name):
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 from IPython.utils.path import get_py_filename
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423 try:
return get_py_filename(name)
except IOError:
test_dir = os.path.dirname(self.test_filename)
new_path = os.path.join(test_dir,name)
return get_py_filename(new_path)
def _run_ns_sync(self,arg_s,runner=None):
"""Modified version of %run that syncs testing namespaces.
This is strictly needed for running doctests that call %run.
"""
Fernando Perez
Fixed broken coloring on Windows....
r2974 #print('in run_ns_sync', arg_s, file=sys.stderr) # dbg
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423 finder = py_file_finder(arg_s)
Fernando Perez
Fixed broken coloring on Windows....
r2974 return get_ipython().magic_run_ori(arg_s, runner, finder)
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423
class ipnsdict(dict):
"""A special subclass of dict for use as an IPython namespace in doctests.
This subclass adds a simple checkpointing capability so that when testing
machinery clears it (we use it as the test execution context), it doesn't
get completely destroyed.
Fernando Perez
Limit special-casing of _ variable to doctests....
r3299
In addition, it can handle the presence of the '_' key in a special manner,
which is needed because of how Python's doctest machinery operates with
'_'. See constructor and :meth:`update` for details.
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423 """
def __init__(self,*a):
dict.__init__(self,*a)
self._savedict = {}
Fernando Perez
Limit special-casing of _ variable to doctests....
r3299 # If this flag is True, the .update() method will unconditionally
# remove a key named '_'. This is so that such a dict can be used as a
# namespace in doctests that call '_'.
self.protect_underscore = False
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423
def clear(self):
dict.clear(self)
self.update(self._savedict)
Fernando Perez
Clean up and document better starting process of global IPython in tests.
r2444
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423 def _checkpoint(self):
self._savedict.clear()
self._savedict.update(self)
def update(self,other):
self._checkpoint()
dict.update(self,other)
Fernando Perez
Limit special-casing of _ variable to doctests....
r3299 if self.protect_underscore:
# If '_' is in the namespace, python won't set it when executing
# code *in doctests*, and we have multiple doctests that use '_'.
# So we ensure that the namespace is always 'clean' of it before
# it's used for test code execution.
# This flag is only turned on by the doctest machinery, so that
# normal test code can assume the _ key is updated like any other
# key and can test for its presence after cell executions.
self.pop('_', None)
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423
# The builtins namespace must *always* be the real __builtin__ module,
# else weird stuff happens. The main ipython code does have provisions
# to ensure this after %run, but since in this class we do some
# aggressive low-level cleaning of the execution namespace, we need to
# correct for that ourselves, to ensure consitency with the 'real'
# ipython.
self['__builtins__'] = __builtin__
Brian Granger
More work addressing review comments for Fernando's branch....
r2499
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423
def get_ipython():
# This will get replaced by the real thing once we start IPython below
Fernando Perez
Lots of work on exception handling, including tests for traceback printing....
r2440 return start_ipython()
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423
Brian Granger
More work addressing review comments for Fernando's branch....
r2499
Fernando Perez
Fixed broken coloring on Windows....
r2974 # A couple of methods to override those in the running IPython to interact
# better with doctest (doctest captures on raw stdout, so we need to direct
# various types of output there otherwise it will miss them).
def xsys(self, cmd):
"""Replace the default system call with a capturing one for doctest.
"""
# We use getoutput, but we need to strip it because pexpect captures
# the trailing newline differently from commands.getoutput
Fernando Perez
Fix small bug in test suite for calling ipython's getoutput.x
r3040 print(self.getoutput(cmd, split=False).rstrip(), end='', file=sys.stdout)
Fernando Perez
Fixed broken coloring on Windows....
r2974 sys.stdout.flush()
def _showtraceback(self, etype, evalue, stb):
"""Print the traceback purely on stdout for doctest to capture it.
"""
print(self.InteractiveTB.stb2text(stb), file=sys.stdout)
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423 def start_ipython():
"""Start a global IPython shell, which we need for IPython-specific syntax.
"""
global get_ipython
# This function should only ever run once!
Brian Granger
More work addressing review comments for Fernando's branch....
r2499 if hasattr(start_ipython, 'already_called'):
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423 return
start_ipython.already_called = True
# Store certain global objects that IPython modifies
_displayhook = sys.displayhook
_excepthook = sys.excepthook
_main = sys.modules.get('__main__')
Fernando Perez
Clean up and document better starting process of global IPython in tests.
r2444 # Create custom argv and namespaces for our IPython to be test-friendly
Brian Granger
More work addressing review comments for Fernando's branch....
r2499 config = tools.default_config()
Fernando Perez
Clean up and document better starting process of global IPython in tests.
r2444 # Create and initialize our test-friendly IPython instance.
Fernando Perez
Fixed broken coloring on Windows....
r2974 shell = TerminalInteractiveShell.instance(config=config,
user_ns=ipnsdict(),
user_global_ns={}
)
Fernando Perez
Clean up and document better starting process of global IPython in tests.
r2444
# A few more tweaks needed for playing nicely with doctests...
# These traps are normally only active for interactive use, set them
# permanently since we'll be mocking interactive sessions.
Fernando Perez
Speedup builtin_trap enter/exit by reducing object creation....
r2957 shell.builtin_trap.activate()
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441
Fernando Perez
Clean up and document better starting process of global IPython in tests.
r2444 # Modify the IPython system call with one that uses getoutput, so that we
# can capture subcommands and print them to Python's stdout, otherwise the
# doctest machinery would miss them.
Fernando Perez
Fixed broken coloring on Windows....
r2974 shell.system = MethodType(xsys, shell, TerminalInteractiveShell)
shell._showtraceback = MethodType(_showtraceback, shell,
TerminalInteractiveShell)
Fernando Perez
Clean up and document better starting process of global IPython in tests.
r2444
# IPython is ready, now clean up some global state...
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423 # Deactivate the various python system hooks added by ipython for
# interactive convenience so we don't confuse the doctest system
sys.modules['__main__'] = _main
sys.displayhook = _displayhook
sys.excepthook = _excepthook
# So that ipython magics and aliases can be doctested (they work by making
Fernando Perez
Lots of work on exception handling, including tests for traceback printing....
r2440 # a call into a global _ip object). Also make the top-level get_ipython
Fernando Perez
Clean up and document better starting process of global IPython in tests.
r2444 # now return this without recursively calling here again.
Brian Granger
More work addressing review comments for Fernando's branch....
r2499 _ip = shell
Fernando Perez
Add file I forgot! Thanks to J. Hunter for report.
r2423 get_ipython = _ip.get_ipython
__builtin__._ip = _ip
__builtin__.get_ipython = get_ipython
Fernando Perez
Lots of work on exception handling, including tests for traceback printing....
r2440 return _ip