Adjust coverage config for py2 only tests; fix typo; finish replacing…

… self with cls

.coveragerc

@@ -8,3 +8,4 @@ exclude_lines =
     class I[A-Z]\w+\((Interface|I[A-Z].*)\):
     raise NotImplementedError
     self\.fail
+    @_skip_under_py2

src/zope/interface/tests/test_advice.py

@@ -221,7 +221,7 @@ class Meta(type):
         self.assertEqual(self._callFUT((Meta, type)), Metameta)
 
     @_skip_under_py2
-    def test_meta_of_class_py3k(self): # pragma: no cover (tox runs coverage on Python 2)
+    def test_meta_of_class_py3k(self):
         # Work around SyntaxError under Python2.
         EXEC = '\n'.join([
         'class Metameta(type):',
@@ -249,7 +249,7 @@ class B(type):
         self.assertEqual(self._callFUT((A, B,)), Meta_B)
 
     @_skip_under_py2
-    def test_multiple_in_hierarchy_py3k(self): # pragma: no cover (tox runs coverage on Python 2)
+    def test_multiple_in_hierarchy_py3k(self):
         # Work around SyntaxError under Python2.
         EXEC = '\n'.join([
         'class Meta_A(type):',
@@ -282,7 +282,7 @@ class B(type):
         self.assertRaises(TypeError, self._callFUT, (A, B,))
 
     @_skip_under_py2
-    def test_multiple_not_in_hierarchy_py3k(self): # pragma: no cover (tox runs coverage on Python 2)
+    def test_multiple_not_in_hierarchy_py3k(self):
         # Work around SyntaxError under Python2.
         EXEC = '\n'.join([
         'class Meta_A(type):',

src/zope/interface/tests/test_declarations.py

@@ -964,10 +964,10 @@ class MetaClass(type):
             def __getattribute__(cls, name):
                 # Emulate metaclass whose base is not the type object.
                 if name == '__class__':
-                    return self
+                    return cls
                 # Under certain circumstances, the implementedByFallback
                 # can get here for __dict__
-                return type.__getattribute__(self, name) # pragma: no cover
+                return type.__getattribute__(cls, name) # pragma: no cover
 
         class Foo(object):
             __metaclass__ = MetaClass

src/zope/interface/tests/test_interface.py

@@ -1520,7 +1520,7 @@ def _errorsEqual(self, has_invariant, error_len, error_msgs, iface):
         e = []
         try:
             iface.validateInvariants(has_invariant, e)
-            self.fail("validateInvariants should always rais")
+            self.fail("validateInvariants should always raise")
         except Invalid as error:
             self.assertEqual(error.args[0], e)