[Python-checkins] cpython (merge 3.2 -> default): merge 3.2 (#12544)

Wed Jul 13 02:19:07 CEST 2011

http://hg.python.org/cpython/rev/47a36d2d2b44
changeset: 71302:47a36d2d2b44
parent: 71298:5992cbbedf59
parent: 71301:842f5ed06255
user: Benjamin Peterson <benjamin at python.org>
date: Tue Jul 12 19:23:43 2011 -0500
summary:
 merge 3.2 (#12544)
files:
 Lib/unittest/case.py | 25 +++----------------------
 1 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -218,27 +218,6 @@
 self._raiseFailure("{} not triggered".format(exc_name))
 
 
-class _TypeEqualityDict(object):
-
- def __init__(self, testcase):
- self.testcase = testcase
- self._store = {}
-
- def __setitem__(self, key, value):
- self._store[key] = value
-
- def __getitem__(self, key):
- value = self._store[key]
- if isinstance(value, str):
- return getattr(self.testcase, value)
- return value
-
- def get(self, key, default=None):
- if key in self._store:
- return self[key]
- return default
-
-
 class TestCase(object):
 """A class whose instances are single test cases.
 
@@ -310,7 +289,7 @@
 # Map types to custom assertEqual functions that will compare
 # instances of said type in more detail to generate a more useful
 # error message.
- self._type_equality_funcs = _TypeEqualityDict(self)
+ self._type_equality_funcs = {}
 self.addTypeEqualityFunc(dict, 'assertDictEqual')
 self.addTypeEqualityFunc(list, 'assertListEqual')
 self.addTypeEqualityFunc(tuple, 'assertTupleEqual')
@@ -643,6 +622,8 @@
 if type(first) is type(second):
 asserter = self._type_equality_funcs.get(type(first))
 if asserter is not None:
+ if isinstance(asserter, str):
+ asserter = getattr(self, asserter)
 return asserter
 
 return self._baseAssertEqual
-- 
Repository URL: http://hg.python.org/cpython
