[Checkins] SVN: zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_ Silence Py3k whining.

[Tres Seaver]

Log message for revision 124974:
  Silence Py3k whining.

Changed:
  U   zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_adapter.py
  U   zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_interface.py
  U   zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_registry.py

-=-
Modified: zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_adapter.py
===================================================================
--- zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_adapter.py	2012-04-05 19:04:09 UTC (rev 124973)
+++ zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_adapter.py	2012-04-05 19:04:14 UTC (rev 124974)
@@ -1236,7 +1236,7 @@
         self.failUnless(derived2._changed is orig)
 
 
-class Test_utils(unittest.TestCase):
+class Test_utils(_SilencePy3Deprecations):
 
     def test__convert_None_to_Interface_w_None(self):
         from zope.interface.adapter import _convert_None_to_Interface

Modified: zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_interface.py
===================================================================
--- zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_interface.py	2012-04-05 19:04:09 UTC (rev 124973)
+++ zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_interface.py	2012-04-05 19:04:14 UTC (rev 124974)
@@ -350,7 +350,7 @@
         spec._v_attrs = 'Foo'
         spec._implied[I] = ()
         spec.changed(spec)
-        self.assert_(getattr(spec, '_v_attrs', self) is self)
+        self.failUnless(getattr(spec, '_v_attrs', self) is self)
         self.failIf(I in spec._implied)
 
 
@@ -1089,7 +1089,7 @@
         class AnInterface(Interface):
             pass
 
-        self.assert_(Interface.providedBy(AnInterface))
+        self.failUnless(Interface.providedBy(AnInterface))
 
     def test_names_simple(self):
         from zope.interface import Attribute
@@ -1481,15 +1481,15 @@
         try:
             iface.validateInvariants(has_invariant, e)
         except Invalid as error:
-            self.assertEquals(error.args[0], e)
+            self.assertEqual(error.args[0], e)
         else:
             self._assert(0) # validateInvariants should always raise
             # Invalid
-        self.assertEquals(len(e), error_len)
+        self.assertEqual(len(e), error_len)
         msgs = [error.args[0] for error in e]
         msgs.sort()
         for msg in msgs:
-            self.assertEquals(msg, error_msgs.pop(0))
+            self.assertEqual(msg, error_msgs.pop(0))
 
     def test_invariant_simple(self):
         from zope.interface import Attribute
@@ -1566,7 +1566,7 @@
         # for a happy ending, we'll make the invariants happy
         has_invariant.foo = 1
         has_invariant.bar = 2
-        self.assertEquals(IInvariant.validateInvariants(has_invariant), None)
+        self.assertEqual(IInvariant.validateInvariants(has_invariant), None)
 
     def test_invariant_mutandis(self):
         from zope.interface import Attribute
@@ -1617,7 +1617,7 @@
         # for another happy ending, we'll make the invariants happy again
         has_invariant.foo = 1
         has_invariant.bar = 2
-        self.assertEquals(IInvariant.validateInvariants(has_invariant), None)
+        self.assertEqual(IInvariant.validateInvariants(has_invariant), None)
         # clean up
         IInvariant.setTaggedValue('invariants', old_invariants)
 
@@ -1696,8 +1696,8 @@
         class HasInvariant(object):
             pass
 
-        self.assertEquals(ITagged.getTaggedValue('qux'), 'Spam')
-        self.assert_('qux' in ITagged.getTaggedValueTags())
+        self.assertEqual(ITagged.getTaggedValue('qux'), 'Spam')
+        self.failUnless('qux' in ITagged.getTaggedValueTags())
 
     def test_description_cache_management(self):
         # See https://bugs.launchpad.net/zope.interface/+bug/185974
@@ -1746,7 +1746,7 @@
             pass
 
         c = C()
-        self.assert_(I(c) is c)
+        self.failUnless(I(c) is c)
 
     def test___call___miss_wo_alternate(self):
         from zope.interface import Interface
@@ -1770,7 +1770,7 @@
             pass
 
         c = C()
-        self.assert_(I(c, self) is self)
+        self.failUnless(I(c, self) is self)
 
     def test___call___w_adapter_hook(self):
         from zope.interface import Interface
@@ -1794,7 +1794,7 @@
         old_adapter_hooks = adapter_hooks[:]
         adapter_hooks[:] = [_miss, _hit]
         try:
-            self.assert_(I(c) is self)
+            self.failUnless(I(c) is self)
         finally:
             adapter_hooks[:] = old_adapter_hooks
 

Modified: zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_registry.py
===================================================================
--- zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_registry.py	2012-04-05 19:04:09 UTC (rev 124973)
+++ zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_registry.py	2012-04-05 19:04:14 UTC (rev 124974)
@@ -1938,7 +1938,7 @@
 # callers (Component.registerUtility, Component.registerAdapter).
 
 
-class UtilityRegistrationTests(unittest.TestCase):
+class UtilityRegistrationTests(_SilencePy3Deprecations):
 
     def _getTargetClass(self):
         from zope.interface.registry import UtilityRegistration
@@ -2123,7 +2123,7 @@
         self.failUnless(ur2 >= ur)
 
 
-class AdapterRegistrationTests(unittest.TestCase):
+class AdapterRegistrationTests(_SilencePy3Deprecations):
 
     def _getTargetClass(self):
         from zope.interface.registry import AdapterRegistration
@@ -2369,7 +2369,7 @@
         verifyObject(ISubscriptionAdapterRegistration, sar)
 
 
-class HandlerRegistrationTests(unittest.TestCase):
+class HandlerRegistrationTests(_SilencePy3Deprecations):
 
     def _getTargetClass(self):
         from zope.interface.registry import HandlerRegistration