summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-12-18 19:22:50 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-12-18 19:22:50 (GMT)
commit7bfe89945b6960bb68e27fd25fea421eee9b1fca (patch)
tree9f479b4beec9e5dc6bc6365df1a2bd29ae74c860
parent83250bb0a80cd7b5f5024965d4a71790de8b25df (diff)
parent165b1283ffe5922dd9f64ef7edb5534e6983d2f5 (diff)
downloadcpython-7bfe89945b6960bb68e27fd25fea421eee9b1fca.zip
cpython-7bfe89945b6960bb68e27fd25fea421eee9b1fca.tar.gz
cpython-7bfe89945b6960bb68e27fd25fea421eee9b1fca.tar.bz2
Followup to #7502: add __hash__ method and tests.
-rw-r--r--Lib/doctest.py10
-rw-r--r--Lib/test/test_doctest.py19
2 files changed, 29 insertions, 0 deletions
diff --git a/Lib/doctest.py b/Lib/doctest.py
index 5d315cc..aba98dc 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -454,6 +454,9 @@ class Example:
def __ne__(self, other):
return not self == other
+ def __hash__(self):
+ return hash((self.source, self.want, self.lineno, self.indent,
+ self.exc_msg))
class DocTest:
"""
@@ -517,6 +520,9 @@ class DocTest:
def __ne__(self, other):
return not self == other
+ def __hash__(self):
+ return hash((self.docstring, self.name, self.filename, self.lineno))
+
# This lets us sort tests by name:
def __lt__(self, other):
if not isinstance(other, DocTest):
@@ -2247,6 +2253,10 @@ class DocTestCase(unittest.TestCase):
def __ne__(self, other):
return not self == other
+ def __hash__(self):
+ return hash((self._dt_optionflags, self._dt_setUp, self._dt_tearDown,
+ self._dt_checker))
+
def __repr__(self):
name = self._dt_test.name.split('.')
return "%s (%s)" % (name[-1], '.'.join(name[:-1]))
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
index ac79e02..cdcd389 100644
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -259,6 +259,21 @@ unless it's `None`:
>>> e = doctest.Example('raise X()', '', exc_msg)
>>> e.exc_msg
'\n'
+
+Compare `Example`:
+ >>> example = doctest.Example('print 1', '1\n')
+ >>> same_example = doctest.Example('print 1', '1\n')
+ >>> other_example = doctest.Example('print 42', '42\n')
+ >>> example == same_example
+ True
+ >>> example != same_example
+ False
+ >>> hash(example) == hash(same_example)
+ True
+ >>> example == other_example
+ False
+ >>> example != other_example
+ True
"""
def test_DocTest(): r"""
@@ -362,6 +377,8 @@ Compare `DocTest`:
True
>>> test != same_test
False
+ >>> hash(test) == hash(same_test)
+ True
>>> docstring = '''
... >>> print 42
... 42
@@ -383,6 +400,8 @@ Compare `DocTestCase`:
True
>>> test_case != same_test_case
False
+ >>> hash(test_case) == hash(same_test_case)
+ True
>>> test == other_test_case
False
>>> test != other_test_case