summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2012-04-06 04:14:27 +0000
committerTres Seaver <tseaver@palladion.com>2012-04-06 04:14:27 +0000
commitec600824cdad96913bd8e0fa20c778c6c7465565 (patch)
treeb290a7b36044fea181bb0742e9f9b9264007a5c4 /src
parentd5b273843aa3b7e806140e15a84d2f309e54625d (diff)
downloadzope-interface-ec600824cdad96913bd8e0fa20c778c6c7465565.tar.gz
Coverage under Py3k.
Diffstat (limited to 'src')
-rw-r--r--src/zope/interface/advice.py5
-rw-r--r--src/zope/interface/tests/test_advice.py4
2 files changed, 3 insertions, 6 deletions
diff --git a/src/zope/interface/advice.py b/src/zope/interface/advice.py
index 28f4805..7e0257c 100644
--- a/src/zope/interface/advice.py
+++ b/src/zope/interface/advice.py
@@ -28,9 +28,10 @@ Visit the PEAK home page at http://peak.telecommunity.com for more information.
from types import FunctionType
try:
from types import ClassType
- __python3 = False
-except ImportError: #pragma NO COVER
+except ImportError: #pragma NO COVER Python > 3.x
__python3 = True
+else: #pragma NO COVER Python < 3.x
+ __python3 = False
import sys
diff --git a/src/zope/interface/tests/test_advice.py b/src/zope/interface/tests/test_advice.py
index d7e1fe6..04c403b 100644
--- a/src/zope/interface/tests/test_advice.py
+++ b/src/zope/interface/tests/test_advice.py
@@ -33,7 +33,6 @@ from zope.interface._compat import _skip_under_py3k
class FrameInfoTest(unittest.TestCase):
- @_skip_under_py3k
def test_w_module(self):
from zope.interface.tests import advisory_testing
(kind, module,
@@ -57,7 +56,6 @@ class FrameInfoTest(unittest.TestCase):
for d in module.__dict__, f_globals:
self.assert_(d is advisory_testing.my_globals)
- @_skip_under_py3k
def test_w_NewStyleClass(self):
from zope.interface.tests import advisory_testing
(kind,
@@ -69,7 +67,6 @@ class FrameInfoTest(unittest.TestCase):
for d in module.__dict__, f_globals:
self.assert_(d is advisory_testing.my_globals)
- @_skip_under_py3k
def test_inside_function_call(self):
from zope.interface.advice import getFrameInfo
kind, module, f_locals, f_globals = getFrameInfo(sys._getframe())
@@ -78,7 +75,6 @@ class FrameInfoTest(unittest.TestCase):
for d in module.__dict__, f_globals:
self.assert_(d is globals())
- @_skip_under_py3k
def test_inside_exec(self):
from zope.interface.advice import getFrameInfo
_globals = {'getFrameInfo': getFrameInfo}