From: Edward Loper Date: Thu, 26 Aug 2004 03:00:24 +0000 (+0000) Subject: Changed OutputChecker.output_difference to expect an Example object, X-Git-Tag: v2.4a3~104 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca9111eef31dc46077dfeffa1f17575dfde564d4;p=python Changed OutputChecker.output_difference to expect an Example object, rather than an expected output string. This gives the output_difference method access to more information, such as the indentation of the example, which might be useful. --- diff --git a/Lib/doctest.py b/Lib/doctest.py index d7978fda21..c01dd64e83 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -1282,8 +1282,7 @@ class DocTestRunner: Report that the given example failed. """ out(self._failure_header(test, example) + - self._checker.output_difference(example.want, got, - self.optionflags)) + self._checker.output_difference(example, got, self.optionflags)) def report_unexpected_exception(self, out, test, example, exc_info): """ @@ -1608,13 +1607,14 @@ class OutputChecker: # The other diff types need at least a few lines to be helpful. return want.count('\n') > 2 and got.count('\n') > 2 - def output_difference(self, want, got, optionflags): + def output_difference(self, example, got, optionflags): """ Return a string describing the differences between the - expected output for an example (`want`) and the actual output - (`got`). `optionflags` is the set of option flags used to - compare `want` and `got`. + expected output for a given example (`example`) and the actual + output (`got`). `optionflags` is the set of option flags used + to compare `want` and `got`. """ + want = example.want # If s are being used, then replace blank lines # with in the actual output string. if not (optionflags & DONT_ACCEPT_BLANKLINE):