Re-silence Py3k whines.

1 files changed, 44 insertions, 31 deletions

diff --git a/src/zope/interface/tests/test_advice.py b/src/zope/interface/tests/test_advice.py
index 195b935..e9875a7 100644
--- a/src/zope/interface/tests/test_advice.py
+++ b/src/zope/interface/tests/test_advice.py
@@ -32,15 +32,27 @@ from zope.interface._compat import _skip_under_py2
 from zope.interface._compat import _skip_under_py3k
 
 
-class FrameInfoTest(unittest.TestCase):
+class _SilencePy3Deprecations(unittest.TestCase):
+    # silence deprecation warnings under py3
+
+    def failUnless(self, expr):
+        # St00pid speling.
+        return self.assertTrue(expr)
+
+    def failIf(self, expr):
+        # St00pid speling.
+        return self.assertFalse(expr)
+
+
+class FrameInfoTest(_SilencePy3Deprecations):
 
     def test_w_module(self):
         from zope.interface.tests import advisory_testing
         (kind, module,
          f_locals, f_globals) = advisory_testing.moduleLevelFrameInfo
-        self.assertEquals(kind, "module")
+        self.assertEqual(kind, "module")
         for d in module.__dict__, f_locals, f_globals:
-            self.assert_(d is advisory_testing.my_globals)
+            self.failUnless(d is advisory_testing.my_globals)
 
     @_skip_under_py3k
     def test_w_ClassicClass(self):
@@ -51,11 +63,12 @@ class FrameInfoTest(unittest.TestCase):
          module,
          f_locals,
          f_globals) = advisory_testing.ClassicClass.classLevelFrameInfo
-        self.assertEquals(kind, "class")
+        self.assertEqual(kind, "class")
 
-        self.assert_(f_locals is advisory_testing.ClassicClass.__dict__)  # ???
+        self.failUnless(
+            f_locals is advisory_testing.ClassicClass.__dict__)  # ???
         for d in module.__dict__, f_globals:
-            self.assert_(d is advisory_testing.my_globals)
+            self.failUnless(d is advisory_testing.my_globals)
 
     def test_w_NewStyleClass(self):
         from zope.interface.tests import advisory_testing
@@ -63,28 +76,28 @@ class FrameInfoTest(unittest.TestCase):
          module,
          f_locals,
          f_globals) = advisory_testing.NewStyleClass.classLevelFrameInfo
-        self.assertEquals(kind, "class")
+        self.assertEqual(kind, "class")
 
         for d in module.__dict__, f_globals:
-            self.assert_(d is advisory_testing.my_globals)
+            self.failUnless(d is advisory_testing.my_globals)
 
     def test_inside_function_call(self):
         from zope.interface.advice import getFrameInfo
         kind, module, f_locals, f_globals = getFrameInfo(sys._getframe())
-        self.assertEquals(kind, "function call")
-        self.assert_(f_locals is locals()) # ???
+        self.assertEqual(kind, "function call")
+        self.failUnless(f_locals is locals()) # ???
         for d in module.__dict__, f_globals:
-            self.assert_(d is globals())
+            self.failUnless(d is globals())
 
     def test_inside_exec(self):
         from zope.interface.advice import getFrameInfo
         _globals = {'getFrameInfo': getFrameInfo}
         _locals = {}
         exec(_FUNKY_EXEC, _globals, _locals)
-        self.assertEquals(_locals['kind'], "exec")
-        self.assert_(_locals['f_locals'] is _locals)
-        self.assert_(_locals['module'] is None)
-        self.assert_(_locals['f_globals'] is _globals)
+        self.assertEqual(_locals['kind'], "exec")
+        self.failUnless(_locals['f_locals'] is _locals)
+        self.failUnless(_locals['module'] is None)
+        self.failUnless(_locals['f_globals'] is _globals)
 
 
 _FUNKY_EXEC = """\
@@ -92,7 +105,7 @@ import sys
 kind, module, f_locals, f_globals = getFrameInfo(sys._getframe())
 """
 
-class AdviceTests(unittest.TestCase):
+class AdviceTests(_SilencePy3Deprecations):
 
     @_skip_under_py3k
     def test_order(self):
@@ -105,10 +118,10 @@ class AdviceTests(unittest.TestCase):
 
         # Strip the list nesting
         for i in 1, 2, 3:
-            self.assert_(isinstance(Foo, list))
+            self.failUnless(isinstance(Foo, list))
             Foo, = Foo
 
-        self.assertEquals(log, [(1, Foo), (2, [Foo]), (3, [[Foo]])])
+        self.assertEqual(log, [(1, Foo), (2, [Foo]), (3, [[Foo]])])
 
     def TODOtest_outside(self):
         from zope.interface.tests.advisory_testing import ping
@@ -134,7 +147,7 @@ class AdviceTests(unittest.TestCase):
             ping([],1)
 
         Concrete, = Concrete
-        self.assert_(Concrete.__class__ is Metaclass)
+        self.failUnless(Concrete.__class__ is Metaclass)
 
 
     @_skip_under_py3k
@@ -169,9 +182,9 @@ class AdviceTests(unittest.TestCase):
             __metaclass__ = Metaclass3
             ping([], 1)
 
-        self.assert_(isinstance(Derived, list))
+        self.failUnless(isinstance(Derived, list))
         Derived, = Derived
-        self.assert_(isinstance(Derived, Metaclass3))
+        self.failUnless(isinstance(Derived, Metaclass3))
 
     @_skip_under_py3k
     def test_meta_no_bases(self):
@@ -186,7 +199,7 @@ class AdviceTests(unittest.TestCase):
         self.assertEqual(type(klass), ClassType)
 
 
-class Test_isClassAdvisor(unittest.TestCase):
+class Test_isClassAdvisor(_SilencePy3Deprecations):
 
     def _callFUT(self, *args, **kw):
         from zope.interface.advice import isClassAdvisor
@@ -207,7 +220,7 @@ class Test_isClassAdvisor(unittest.TestCase):
         self.assertEqual(self._callFUT(bar), True)
 
 
-class Test_determineMetaclass(unittest.TestCase):
+class Test_determineMetaclass(_SilencePy3Deprecations):
 
     def _callFUT(self, *args, **kw):
         from zope.interface.advice import determineMetaclass
@@ -216,17 +229,17 @@ class Test_determineMetaclass(unittest.TestCase):
     @_skip_under_py3k
     def test_empty(self):
         from types import ClassType
-        self.assertEquals(self._callFUT(()), ClassType)
+        self.assertEqual(self._callFUT(()), ClassType)
 
     def test_empty_w_explicit_metatype(self):
         class Meta(type):
             pass
-        self.assertEquals(self._callFUT((), Meta), Meta)
+        self.assertEqual(self._callFUT((), Meta), Meta)
 
     def test_single(self):
         class Meta(type):
             pass
-        self.assertEquals(self._callFUT((Meta,)), type)
+        self.assertEqual(self._callFUT((Meta,)), type)
 
     @_skip_under_py3k
     def test_meta_of_class(self):
@@ -236,7 +249,7 @@ class Test_determineMetaclass(unittest.TestCase):
         class Meta(type):
             __metaclass__ = Metameta
 
-        self.assertEquals(self._callFUT((Meta, type)), Metameta)
+        self.assertEqual(self._callFUT((Meta, type)), Metameta)
 
     @_skip_under_py2
     def test_meta_of_class_py3k(self):
@@ -252,7 +265,7 @@ class Test_determineMetaclass(unittest.TestCase):
         Meta = globs['Meta']
         Metameta = globs['Metameta']
 
-        self.assertEquals(self._callFUT((Meta, type)), Metameta)
+        self.assertEqual(self._callFUT((Meta, type)), Metameta)
 
     @_skip_under_py3k
     def test_multiple_in_hierarchy(self):
@@ -264,7 +277,7 @@ class Test_determineMetaclass(unittest.TestCase):
             __metaclass__ = Meta_A
         class B(type):
             __metaclass__ = Meta_B
-        self.assertEquals(self._callFUT((A, B,)), Meta_B)
+        self.assertEqual(self._callFUT((A, B,)), Meta_B)
 
     @_skip_under_py2
     def test_multiple_in_hierarchy_py3k(self):
@@ -285,7 +298,7 @@ class Test_determineMetaclass(unittest.TestCase):
         Meta_B = globs['Meta_B']
         A = globs['A']
         B = globs['B']
-        self.assertEquals(self._callFUT((A, B)), Meta_B)
+        self.assertEqual(self._callFUT((A, B)), Meta_B)
 
     @_skip_under_py3k
     def test_multiple_not_in_hierarchy(self):
@@ -321,7 +334,7 @@ class Test_determineMetaclass(unittest.TestCase):
         self.assertRaises(TypeError, self._callFUT, (A, B))
 
 
-class Test_minimalBases(unittest.TestCase):
+class Test_minimalBases(_SilencePy3Deprecations):
 
     def _callFUT(self, klasses):
         from zope.interface.advice import minimalBases