mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-20 10:57:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Hashing simplification pointed out by Thomas Wouters.

Browse source
This commit is contained in:
Collin Winter 2007-03-09 23:30:39 +00:00
parent 2456a3c02a
commit 9453e5dce5
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/unittest.py
View file

@ -245,7 +245,7 @@ class TestCase:
return not self == other return not self == other
def __hash__(self): def __hash__(self):
return hash(str(hash(type(self))) + str(hash(self._testMethodName))) return hash((type(self), self._testMethodName))
def __str__(self): def __str__(self):
return "%s (%s)" % (self._testMethodName, _strclass(self.__class__)) return "%s (%s)" % (self._testMethodName, _strclass(self.__class__))
@ -502,9 +502,8 @@ class FunctionTestCase(TestCase):
return not self == other return not self == other
def __hash__(self): 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): def __str__(self):
return "%s (%s)" % (_strclass(self.__class__), self.__testFunc.__name__) return "%s (%s)" % (_strclass(self.__class__), self.__testFunc.__name__)