Enable combined coverage reports under tox and branch coveragecombined-coverage

Fixes #91

Remove many (or most) now-redundant 'pragma: no cover'.

A few minor test changes to get full branch coverage.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/zope/interface/verify.py b/src/zope/interface/verify.py
index 5a0e684..098b484 100644
--- a/src/zope/interface/verify.py
+++ b/src/zope/interface/verify.py
@@ -66,10 +66,10 @@ def _verify(iface, candidate, tentative=0, vtype=None):
             continue
 
         if isinstance(attr, FunctionType):
-            if sys.version[0] == '3' and isinstance(candidate, type):
+            if sys.version_info[0] >= 3 and isinstance(candidate, type):
                 # This is an "unbound method" in Python 3.
                 meth = fromFunction(attr, iface, name=name,
-                                    imlevel=1) # pragma: no cover
+                                    imlevel=1)
             else:
                 # Nope, just a normal function
                 meth = fromFunction(attr, iface, name=name)
@@ -85,7 +85,7 @@ def _verify(iface, candidate, tentative=0, vtype=None):
                 raise BrokenMethodImplementation(name, "Not a method")
             # sigh, it's callable, but we don't know how to introspect it, so
             # we have to give it a pass.
-            continue # pragma: no cover
+            continue
 
         # Make sure that the required and implemented method signatures are
         # the same.