[Zope3-checkins] CVS: Zope3/src/zope/app/interfaces - annotation.py:1.1.2.2 container.py:1.1.2.2 event.py:1.1.2.2 forms.py:1.1.2.2 rdb.py:1.1.2.2 schemagen.py:1.1.2.2

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/interfaces
In directory cvs.zope.org:/tmp/cvs-serv5112/app/interfaces

Modified Files:
      Tag: NameGeddon-branch
	annotation.py container.py event.py forms.py rdb.py 
	schemagen.py 
Log Message:
corrected interface Attribute imports

=== Zope3/src/zope/app/interfaces/annotation.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/interfaces/annotation.py:1.1.2.1	Mon Dec 23 14:31:41 2002
+++ Zope3/src/zope/app/interfaces/annotation.py	Mon Dec 23 15:49:36 2002
@@ -68,8 +68,7 @@
 
 $Id$
 """
-from zope.interface import Interface
-from zope.interface.element import Attribute
+from zope.interface import Interface, Attribute
 
 class IAnnotatable(Interface):
     """


=== Zope3/src/zope/app/interfaces/container.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/interfaces/container.py:1.1.2.1	Mon Dec 23 14:31:41 2002
+++ Zope3/src/zope/app/interfaces/container.py	Mon Dec 23 15:49:36 2002
@@ -177,7 +177,7 @@
 $Id$
 """
 
-from zope.interface.element import Attribute
+from zope.interface import Attribute
 
 from zope.component.interfaces import IView
 


=== Zope3/src/zope/app/interfaces/event.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/interfaces/event.py:1.1.2.1	Mon Dec 23 14:31:41 2002
+++ Zope3/src/zope/app/interfaces/event.py	Mon Dec 23 15:49:36 2002
@@ -42,7 +42,7 @@
 """
 
 from zope.interfaces.event import IEvent
-from zope.interface.element import Attribute
+from zope.interface import Attribute
 
 class IObjectEvent(IEvent):
     """Something has happened to an object.


=== Zope3/src/zope/app/interfaces/forms.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/interfaces/forms.py:1.1.2.1	Mon Dec 23 14:31:41 2002
+++ Zope3/src/zope/app/interfaces/forms.py	Mon Dec 23 15:49:36 2002
@@ -74,7 +74,7 @@
 $Id$
 """
 from zope.component.interfaces import IView
-from zope.interface.element import Attribute
+from zope.interface import Attribute
 
 class IWidget(IView):
     """Generically describes the behavior of a widget.


=== Zope3/src/zope/app/interfaces/rdb.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/interfaces/rdb.py:1.1.2.1	Mon Dec 23 14:31:41 2002
+++ Zope3/src/zope/app/interfaces/rdb.py	Mon Dec 23 15:49:36 2002
@@ -28,8 +28,7 @@
 """
 $Id$
 """
-from zope.interface import Interface
-from zope.interface.element import Attribute
+from zope.interface import Interface, Attribute
 
 class IDBITypeInfo(Interface):
     """Database adapter specific information"""
@@ -153,8 +152,7 @@
 $Id$
 """
 
-from zope.interface import Interface
-from zope.interface.element import Attribute
+from zope.interface import Interface, Attribute
 
 class ICursor(Interface):
     """DB API ICursor interface"""
@@ -271,8 +269,7 @@
 """
 $Id$
 """
-from zope.interface import Interface
-from zope.interface.element import Attribute
+from zope.interface import Interface, Attribute
 
 
 class IResultSet(Interface):
@@ -310,8 +307,7 @@
 """
 $Id$
 """
-from zope.interface import Interface
-from zope.interface.element import Attribute
+from zope.interface import Interface, Attribute
 
 arraysize = 1 # default constant, symbolic
 
@@ -491,8 +487,7 @@
 """
 $Id$
 """
-from zope.interface import Interface
-from zope.interface.element import Attribute
+from zope.interface import Interface, Attribute
 
 class ISQLCommand(Interface):
     """Static SQL commands."""


=== Zope3/src/zope/app/interfaces/schemagen.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/interfaces/schemagen.py:1.1.2.1	Mon Dec 23 14:31:41 2002
+++ Zope3/src/zope/app/interfaces/schemagen.py	Mon Dec 23 15:49:36 2002
@@ -18,8 +18,7 @@
 $Id$
 """
 
-from zope.interface import Interface
-from zope.interface.element import Attribute
+from zope.interface import Interface, Attribute
     
 class ITypeRepresentation(Interface):
     """Provide a textual representation of object