Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #6024: Django's doctest no longer clashes with coverage.py. Tha…

…nks to Ned Batchelder for the original fix, and Todd O'Brian for his update to make it work with Django.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit d38cb0b2535efa7b210132dd6c01d4ec5d1d9d4d 1 parent 953e695
Jacob Kaplan-Moss authored December 02, 2007

Showing 1 changed file with 11 additions and 0 deletions. Show diff stats Hide diff stats

  1. 11  django/test/_doctest.py
11  django/test/_doctest.py
@@ -354,8 +354,19 @@ class _OutputRedirectingPdb(pdb.Pdb):
354 354
     """
355 355
     def __init__(self, out):
356 356
         self.__out = out
  357
+        self.__debugger_used = False
357 358
         pdb.Pdb.__init__(self)
358 359
 
  360
+    def set_trace(self):
  361
+        self.__debugger_used = True
  362
+        pdb.Pdb.set_trace(self)
  363
+
  364
+    def set_continue(self):
  365
+        # Calling set_continue unconditionally would break unit test coverage
  366
+        # reporting, as Bdb.set_continue calls sys.settrace(None).
  367
+        if self.__debugger_used:
  368
+            pdb.Pdb.set_continue(self)
  369
+
359 370
     def trace_dispatch(self, *args):
360 371
         # Redirect stdout to the given stream.
361 372
         save_stdout = sys.stdout

0 notes on commit d38cb0b

Please sign in to comment.
Something went wrong with that request. Please try again.