##// END OF EJS Templates
Merge pull request #1556 from minrk/safe_query...
Merge pull request #1556 from minrk/safe_query shallow-copy DictDB query results `db_query()` with default keys pops buffers, and this would result in actually removing the buffers from the record itself. Later calls to `get_result()` would then raise a KeyError, which would go unhandled. This PR adds shallow-copy to DictDB results, so that changes to the returned dict are not reflected in the db itself. The bug revealed a general issue: ZMQStreams are closed when an exception is raised in their `on_recv()` callback (following the IOStream pattern, and on the general principal that a socket with failing handlers should not be allowed to continue), which meant that invoking this bug would prevent any future queries to the Hub. So in addition to fixing the particular bug, a decorator is added that catches and logs exceptions, and is applied to all `on_recv()` handlers in IPython.parallel, such that other similar bugs will no longer result in the closure of the socket. Previously failing tests included at the db and client levels.

File last commit:

r5529:a1b74bc4
r6448:816e3fab merge
Show More
skipdoctest.py
38 lines | 1.4 KiB | text/x-python | PythonLexer
"""Decorators marks that a doctest should be skipped, for both python 2 and 3.
The IPython.testing.decorators module triggers various extra imports, including
numpy and sympy if they're present. Since this decorator is used in core parts
of IPython, it's in a separate module so that running IPython doesn't trigger
those imports."""
#-----------------------------------------------------------------------------
# Copyright (C) 2009-2011 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
import sys
#-----------------------------------------------------------------------------
# Decorators
#-----------------------------------------------------------------------------
def skip_doctest(f):
"""Decorator - mark a function or method for skipping its doctest.
This decorator allows you to mark a function whose docstring you wish to
omit from testing, while preserving the docstring for introspection, help,
etc."""
f.skip_doctest = True
return f
def skip_doctest_py3(f):
"""Decorator - skip the doctest under Python 3."""
f.skip_doctest = (sys.version_info[0] >= 3)
return f