Merge 2d48d3c into 58011a3

setup.py

@@ -1,7 +1,7 @@
 """Setup file for handling packaging and distribution."""
 from setuptools import setup
 
-__version__ = "2.4.0"
+__version__ = "2.4.1"
 
 setup(
     name="ipdbugger",

tests/test_debug.py

@@ -2,7 +2,6 @@
 from __future__ import absolute_import
 
 import pytest
-from IPython.utils.capture import capture_output
 
 from ipdbugger import debug
 
@@ -19,7 +18,8 @@ def test_debugging_raising_function():
     def should_raise():
         raise Exception()
 
-    with capture_output(), patch('bdb.Bdb.set_trace') as set_trace:
+    with patch('IPython.terminal.debugger.TerminalPdb.__init__'), \
+            patch('bdb.Bdb.set_trace') as set_trace:
         should_raise()
         assert set_trace.called
 
@@ -33,7 +33,8 @@ def should_raise(self):
     a = A()
     a.should_raise = debug(a.should_raise)
 
-    with capture_output(), patch('bdb.Bdb.set_trace') as set_trace:
+    with patch('IPython.terminal.debugger.TerminalPdb.__init__'), \
+            patch('bdb.Bdb.set_trace') as set_trace:
         a.should_raise()
         assert set_trace.called
 
@@ -45,7 +46,8 @@ def test_debugging_function_twice():
     def should_raise():
         raise Exception()
 
-    with capture_output(), patch('bdb.Bdb.set_trace') as set_trace:
+    with patch('IPython.terminal.debugger.TerminalPdb.__init__'), \
+            patch('bdb.Bdb.set_trace') as set_trace:
         should_raise()
         assert set_trace.called_once
 
@@ -56,7 +58,8 @@ def test_debugging_non_raising_function():
     def non_raising_function():
         pass
 
-    with capture_output(), patch('bdb.Bdb.set_trace') as set_trace:
+    with patch('IPython.terminal.debugger.TerminalPdb.__init__'), \
+            patch('bdb.Bdb.set_trace') as set_trace:
         non_raising_function()
         assert not set_trace.called
 
@@ -73,11 +76,13 @@ def second_method(self):
 
     debugged_object = DebuggedClass()
 
-    with capture_output(), patch('bdb.Bdb.set_trace') as set_trace:
+    with patch('IPython.terminal.debugger.TerminalPdb.__init__'), \
+            patch('bdb.Bdb.set_trace') as set_trace:
         debugged_object.first_method()
         assert set_trace.called
 
-    with capture_output(), patch('bdb.Bdb.set_trace') as set_trace:
+    with patch('IPython.terminal.debugger.TerminalPdb.__init__'), \
+            patch('bdb.Bdb.set_trace') as set_trace:
         debugged_object.second_method()
         assert set_trace.called
 
@@ -122,7 +127,8 @@ def func():
 
     func = debug(func, catch_exception=AssertionError)
 
-    with capture_output(), patch('bdb.Bdb.set_trace') as set_trace:
+    with patch('IPython.terminal.debugger.TerminalPdb.__init__'), \
+            patch('bdb.Bdb.set_trace') as set_trace:
         func()
         assert set_trace.called
 
@@ -162,7 +168,8 @@ def func():
 
     func = debug(func)
 
-    with capture_output(), patch('bdb.Bdb.set_trace') as set_trace:
+    with patch('IPython.terminal.debugger.TerminalPdb.__init__'), \
+            patch('bdb.Bdb.set_trace') as set_trace:
         func()
         assert set_trace.called
 
@@ -176,7 +183,8 @@ def func():
         except ValueError:
             raise
 
-    with capture_output(), patch('bdb.Bdb.set_trace') as set_trace:
+    with patch('IPython.terminal.debugger.TerminalPdb.__init__'), \
+            patch('bdb.Bdb.set_trace') as set_trace:
         func()
         assert set_trace.called_once
 
@@ -209,7 +217,8 @@ def func():
         except KeyError:
             pass
 
-    with capture_output(), patch('bdb.Bdb.set_trace') as set_trace:
+    with patch('IPython.terminal.debugger.TerminalPdb.__init__'), \
+            patch('bdb.Bdb.set_trace') as set_trace:
         func()
         assert set_trace.call_count == 0
 
@@ -223,7 +232,8 @@ def func():
         if raise_exc:
             raise ValueError()
 
-    with capture_output(), patch('bdb.Bdb.set_trace') as set_trace:
+    with patch('IPython.terminal.debugger.TerminalPdb.__init__'), \
+            patch('bdb.Bdb.set_trace') as set_trace:
         func()
         assert set_trace.called_once
 
@@ -253,8 +263,8 @@ def func_upper():
 
     func_upper = debug(func_upper, depth=0)
 
-    with capture_output(), patch('bdb.Bdb.set_trace',
-                                 SaveFuncName()) as name_saver:
+    with patch('IPython.terminal.debugger.TerminalPdb.__init__'), \
+            patch('bdb.Bdb.set_trace', SaveFuncName()) as name_saver:
         func_upper()
         assert name_saver.func_name == "func_upper"
 
@@ -275,8 +285,8 @@ def func_upper():
 
     func_upper = debug(func_upper, depth=1)
 
-    with capture_output(), patch('bdb.Bdb.set_trace',
-                                 SaveFuncName()) as name_saver:
+    with patch('IPython.terminal.debugger.TerminalPdb.__init__'), \
+            patch('bdb.Bdb.set_trace', SaveFuncName()) as name_saver:
         func_upper()
         assert name_saver.func_name == "func_middle"
 
@@ -297,8 +307,8 @@ def func_upper():
 
     func_upper = debug(func_upper, depth=-1)
 
-    with capture_output(), patch('bdb.Bdb.set_trace',
-                                 SaveFuncName()) as name_saver:
+    with patch('IPython.terminal.debugger.TerminalPdb.__init__'), \
+            patch('bdb.Bdb.set_trace', SaveFuncName()) as name_saver:
         func_upper()
         assert name_saver.func_name == "func_lowest"
 
@@ -321,6 +331,7 @@ def test_using_debug_as_decorator_with_kwargs():
     def func():
         raise ValueError()
 
-    with capture_output(), patch('bdb.Bdb.set_trace') as set_trace:
+    with patch('IPython.terminal.debugger.TerminalPdb.__init__'), \
+            patch('bdb.Bdb.set_trace') as set_trace:
         func()
         assert set_trace.called

tox.ini

@@ -6,7 +6,7 @@ extras = dev
 commands =
     flake8 setup.py ipdbugger
     pylint setup.py ipdbugger
-    pytest -s
+    pytest
 
 [pytest]
 testpaths = tests/