Hashing simplification pointed out by Thomas Wouters.

9453e5dc · Collin Winter · 2456a3c0 · 9453e5dc
Commit 9453e5dc authored Mar 09, 2007 by Collin Winter
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

Lib/unittest.py Lib/unittest.py +3 -4

No files found.
--- a/Lib/unittest.py
+++ b/Lib/unittest.py
@@ -245,7 +245,7 @@ class TestCase:
        return not self == other
    def __hash__(self):
-        return hash(str(hash(type(self))) + str(hash(self._testMethodName)))
+        return hash((type(self), self._testMethodName))
    def __str__(self):
        return "%s (%s)" % (self._testMethodName, _strclass(self.__class__))
@@ -502,9 +502,8 @@ class FunctionTestCase(TestCase):
        return not self == other
    def __hash__(self):
-        return hash(''.join(str(hash(x)) for x in [
+        return hash((type(self), self.__setUpFunc, self.__tearDownFunc,
-            type(self), self.__setUpFunc, self.__tearDownFunc, self.__testFunc,
+                                           self.__testFunc, self.__description))
-            self.__description]))
    def __str__(self):
        return "%s (%s)" % (_strclass(self.__class__), self.__testFunc.__name__)