[Checkins] SVN: zope.interface/branches/tseaver-no_2to3/src/zope/interface/ Coverage under Py3k.

[Tres Seaver]

Log message for revision 124986:
  Coverage under Py3k.

Changed:
  U   zope.interface/branches/tseaver-no_2to3/src/zope/interface/advice.py
  U   zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_advice.py

-=-
Modified: zope.interface/branches/tseaver-no_2to3/src/zope/interface/advice.py
===================================================================
--- zope.interface/branches/tseaver-no_2to3/src/zope/interface/advice.py	2012-04-06 04:14:21 UTC (rev 124985)
+++ zope.interface/branches/tseaver-no_2to3/src/zope/interface/advice.py	2012-04-06 04:14:27 UTC (rev 124986)
@@ -28,9 +28,10 @@
 from types import FunctionType
 try:
     from types import ClassType
+except ImportError:  #pragma NO COVER Python > 3.x
+    __python3 = True
+else: #pragma NO COVER Python < 3.x
     __python3 = False
-except ImportError:  #pragma NO COVER
-    __python3 = True
     
 import sys
 

Modified: zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_advice.py
===================================================================
--- zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_advice.py	2012-04-06 04:14:21 UTC (rev 124985)
+++ zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_advice.py	2012-04-06 04:14:27 UTC (rev 124986)
@@ -33,7 +33,6 @@
 
 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 @@
         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 @@
         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 @@
         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}