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, 4 insertions, 4 deletions

diff --git a/src/zope/interface/_compat.py b/src/zope/interface/_compat.py
index b9c19dc..fb61e13 100644
--- a/src/zope/interface/_compat.py
+++ b/src/zope/interface/_compat.py
@@ -16,7 +16,7 @@
 import sys
 import types
 
-if sys.version_info[0] < 3: #pragma NO COVER
+if sys.version_info[0] < 3:
 
     def _normalize_name(name):
         if isinstance(name, basestring):
@@ -31,7 +31,7 @@ if sys.version_info[0] < 3: #pragma NO COVER
     PYTHON3 = False
     PYTHON2 = True
 
-else: # pragma: no cover
+else:
 
     def _normalize_name(name):
         if isinstance(name, bytes):
@@ -48,11 +48,11 @@ else: # pragma: no cover
     PYTHON3 = True
     PYTHON2 = False
 
-def _skip_under_py3k(test_method): # pragma: no cover
+def _skip_under_py3k(test_method):
     import unittest
     return unittest.skipIf(sys.version_info[0] >= 3, "Only on Python 2")(test_method)
 
 
-def _skip_under_py2(test_method): # pragma: no cover
+def _skip_under_py2(test_method):
     import unittest
     return unittest.skipIf(sys.version_info[0] < 3, "Only on Python 3")(test_method)