[Python-checkins] cpython (merge 3.2 -> default): Followup to #7502: add __hash__ method and tests.

[antoine.pitrou]

http://hg.python.org/cpython/rev/4ffa9992a7d8
changeset:   74057:4ffa9992a7d8
parent:      74052:6373cbafd6ec
parent:      74056:e37c71698409
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Dec 18 20:22:50 2011 +0100
summary:
  Followup to #7502: add __hash__ method and tests.

files:
  Lib/doctest.py           |  10 ++++++++++
  Lib/test/test_doctest.py |  19 +++++++++++++++++++
  2 files changed, 29 insertions(+), 0 deletions(-)


diff --git a/Lib/doctest.py b/Lib/doctest.py
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -454,6 +454,9 @@
     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 @@
     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 @@
     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
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -259,6 +259,21 @@
     >>> 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 @@
     True
     >>> test != same_test
     False
+    >>> hash(test) == hash(same_test)
+    True
     >>> docstring = '''
     ...     >>> print 42
     ...     42
@@ -383,6 +400,8 @@
     True
     >>> test_case != same_test_case
     False
+    >>> hash(test_case) == hash(same_test_case)
+    True
     >>> test == other_test_case
     False
     >>> test != other_test_case

-- 
Repository URL: http://hg.python.org/cpython