capture restores stdout even if function func() fails #1168

smichr · 2012-03-25T01:01:17Z

Previously, if you made a mistake in the function you passed
    to capture, it would not restore the output to stdout.

    e.g.

>>> capture(pprint(x/y))
x
-
y
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
    File "sympy\utilities\iterables.py", line 461, in capture
        func()
    TypeError: 'NoneType' object is not callable
>>> print 1 # output still captured by StringIO
>>>

goodok · 2012-03-25T07:03:19Z

sympy/utilities/iterables.py

    >>> def foo():
    ...     print 'hello world!'
    ...
    >>> 'hello' in capture(foo) # foo, not foo()
    True
+    >>> capture(lambda: pprint(2/x))
+    '2\n-\nx\n'
+


Don't understand, but test report point out about those lines.

ValueError: line 16 of the docstring for sympy.utilities.iterables.capture has inconsistent leading whitespace: '-'

Previously, if you made a mistake in the function you passed to capture, it would not restore the output to stdout. e.g. >>> capture(pprint(x/y)) x - y Traceback (most recent call last): File "<stdin>", line 1, in <module> File "sympy\utilities\iterables.py", line 461, in capture func() TypeError: 'NoneType' object is not callable >>> print 1 # output still captured by StringIO >>>

smichr · 2012-03-25T08:45:51Z

the doctest has been fixed by escaping the \n

smichr · 2012-03-25T10:59:09Z

@goodok , are you ok with this now?

goodok · 2012-03-25T11:30:22Z

Yes, I can merge it.

It solve the problems with sys.stdout restoring.

capture restores stdout even if function func() fails

goodok reviewed Mar 25, 2012
View reviewed changes

goodok added a commit that referenced this pull request Mar 25, 2012

Merge pull request #1168 from smichr/capture

3400a17

capture restores stdout even if function func() fails

goodok merged commit 3400a17 into sympy:master Mar 25, 2012

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

capture restores stdout even if function func() fails #1168

capture restores stdout even if function func() fails #1168

smichr commented Mar 25, 2012

goodok Mar 25, 2012

smichr commented Mar 25, 2012

smichr commented Mar 25, 2012

goodok commented Mar 25, 2012

capture restores stdout even if function func() fails #1168

capture restores stdout even if function func() fails #1168

Conversation

smichr commented Mar 25, 2012

goodok Mar 25, 2012

Choose a reason for hiding this comment

smichr commented Mar 25, 2012

smichr commented Mar 25, 2012

goodok commented Mar 25, 2012