From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 13 Jul 2011 00:23:43 +0000 (-0500)
Subject: merge 3.2 (#12544)
X-Git-Tag: v3.3.0a1~1922
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08506389575285bc3c316e0465fb9ae9c77bc18f;p=thirdparty%2FPython%2Fcpython.git

merge 3.2 (#12544)
---

08506389575285bc3c316e0465fb9ae9c77bc18f
diff --cc Lib/unittest/case.py
index 5b7c29dd2688,3133907e4a9a..d82fa2092715
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@@ -209,36 -192,16 +209,15 @@@ class _AssertWarnsContext(_AssertRaises
              return
          # Now we simply try to choose a helpful failure message
          if first_matching is not None:
 -            raise self.failureException('"%s" does not match "%s"' %
 -                     (self.expected_regex.pattern, str(first_matching)))
 +            self._raiseFailure('"{}" does not match "{}"'.format(
 +                     self.expected_regex.pattern, str(first_matching)))
          if self.obj_name:
 -            raise self.failureException("{0} not triggered by {1}"
 -                .format(exc_name, self.obj_name))
 +            self._raiseFailure("{} not triggered by {}".format(exc_name,
 +                                                               self.obj_name))
          else:
 -            raise self.failureException("{0} not triggered"
 -                .format(exc_name))
 +            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.