[Zope-Checkins] CVS: Zope3/lib/python/Interface/tests - framework.py:1.3 testDocument.py:1.4 testImplements.py:1.3 testInterface.py:1.5 testVerify.py:1.3 unitfixtures.py:1.4

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Interface/tests
In directory cvs.zope.org:/tmp/cvs-serv17445/lib/python/Interface/tests

Modified Files:
	framework.py testDocument.py testImplements.py 
	testInterface.py testVerify.py unitfixtures.py 
Log Message:
Merged Zope-3x-branch into newly forked Zope3 CVS Tree.


=== Zope3/lib/python/Interface/tests/framework.py 1.2 => 1.3 ===
 # 
 ##############################################################################
-if not sys.modules.has_key('Testing'):
+if not ('Testing' in sys.modules):
     p0 = sys.path[0]
     if p0 and __name__ == '__main__':
         os.chdir(p0)


=== Zope3/lib/python/Interface/tests/testDocument.py 1.3 => 1.4 ===
 from unittest import TestCase, TestSuite, main, makeSuite
 from Interface import Interface
-from Interface._Attribute import Attribute
+from Interface.Attribute import Attribute
 
 class Test(TestCase):
 
@@ -43,9 +43,9 @@
 
  Methods:
 
-  f21() -- f21 doc
-
   f22() -- no documentation
+
+  f21() -- f21 doc
 
   f23() -- f23 doc
 


=== Zope3/lib/python/Interface/tests/testImplements.py 1.2 => 1.3 ===
 # 
 ##############################################################################
-from __future__ import nested_scopes
+
 from Interface import Interface
 from Interface.Implements import implements
 from Interface.Exceptions import DoesNotImplement, BrokenImplementation


=== Zope3/lib/python/Interface/tests/testInterface.py 1.4 => 1.5 ===
 from Interface.Implements import objectImplements
 from Interface import Interface
-from Interface._Attribute import Attribute
+from Interface.Attribute import Attribute
 
 class InterfaceTests(unittest.TestCase):
 
@@ -128,10 +128,10 @@
     def f11(): pass
     def f12(): pass
 
-class __I1(_I1): pass
-class ___I1(__I1): pass
+class _I1_(_I1): pass
+class _I1__(_I1_): pass
 
-class _I2(___I1):
+class _I2(_I1__):
     def f21(): pass
     def f22(): pass
     def f23(): pass


=== Zope3/lib/python/Interface/tests/testVerify.py 1.2 => 1.3 ===
 $Id$
 """
-from __future__ import nested_scopes
 
 
 from Interface import Interface


=== Zope3/lib/python/Interface/tests/unitfixtures.py 1.3 => 1.4 ===
 ##############################################################################
 from Interface import Interface
-from Interface._Attribute import Attribute
+from Interface.Attribute import Attribute
 
 class mytest(Interface):
     pass