[Zope-Checkins] CVS: Zope3/lib/python/Interface - _InterfaceClass.py:1.13 _Interface.py:1.5 Implements.py:1.7

[Jeremy Hylton]

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

Modified Files:
	_InterfaceClass.py _Interface.py Implements.py 
Log Message:
Rename _InterfaceClass.Interface to _InterfaceClass.InterfaceClass.

Avoids confusion between Interface.Interface and
Interface._InterfaceClass.Interface, which were different despite
having the same name.


=== Zope3/lib/python/Interface/_InterfaceClass.py 1.12 => 1.13 ===
--- Zope3/lib/python/Interface/_InterfaceClass.py:1.12	Mon Dec  2 16:28:17 2002
+++ Zope3/lib/python/Interface/_InterfaceClass.py	Fri Dec 20 17:32:24 2002
@@ -24,7 +24,7 @@
 import Exceptions
 from _Element import Element
 
-class Interface(Element):
+class InterfaceClass(Element):
     """Prototype (scarecrow) Interfaces Implementation."""
 
     # We can't say this yet because we don't have enough
@@ -50,7 +50,7 @@
         self.__module__ = __module__
 
         for b in bases:
-            if not isinstance(b, Interface):
+            if not isinstance(b, InterfaceClass):
                 raise TypeError, 'Expected base interfaces'
         # Python expects __bases__ to be a tuple.
         self.__bases__ = tuple(bases)


=== Zope3/lib/python/Interface/_Interface.py 1.4 => 1.5 ===
--- Zope3/lib/python/Interface/_Interface.py:1.4	Mon Jun 10 19:27:40 2002
+++ Zope3/lib/python/Interface/_Interface.py	Fri Dec 20 17:32:24 2002
@@ -17,7 +17,7 @@
 $Id$
 """
 
-from _InterfaceClass import Interface as InterfaceClass
+from _InterfaceClass import InterfaceClass
 
 Interface = InterfaceClass("Interface")
 


=== Zope3/lib/python/Interface/Implements.py 1.6 => 1.7 ===
--- Zope3/lib/python/Interface/Implements.py:1.6	Fri Dec 13 17:08:43 2002
+++ Zope3/lib/python/Interface/Implements.py	Fri Dec 20 17:32:24 2002
@@ -19,7 +19,7 @@
 
 import Exceptions
 from Verify import verifyClass
-from _InterfaceClass import Interface as InterfaceClass
+from _InterfaceClass import InterfaceClass
 from types import TupleType, ClassType, StringType
 
 # Special value indicating the object supports