[Zope3-checkins] CVS: Zope3/src/zope/app/interfaces - dublincore.py:1.3

[Jeremy Hylton]

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

Modified Files:
	dublincore.py 
Log Message:
Cleanup merged module


=== Zope3/src/zope/app/interfaces/dublincore.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/interfaces/dublincore.py:1.2	Wed Dec 25 09:12:56 2002
+++ Zope3/src/zope/app/interfaces/dublincore.py	Mon Dec 30 16:43:05 2002
@@ -15,6 +15,9 @@
 $Id$
 """
 
+from zope.app.interfaces.annotation import IAnnotatable
+from zope.app.dublincore.general \
+     import IGeneralDublinCore, IWritableGeneralDublinCore
 from zope.interface import Interface
 from zope.schema import Text, TextLine, Datetime, Sequence
 
@@ -104,15 +107,6 @@
         value_types = (TextLine(),),
         )
 
-
-
-
-"""
-$Id$
-"""
-
-from zope.interface import Interface
-
 class ICMFDublinCore(Interface):
     """This interface duplicates the CMF dublinc core interface.
     """
@@ -271,21 +265,6 @@
         string is formatted  'YYYY-MM-DD H24:MN:SS TZ'.
         """
 
-
-
-__doc__ = ICMFDublinCore.__doc__ + __doc__
-
-
-"""
-$Id$
-"""
-
-from zope.app.dublincore.general \
-     import IGeneralDublinCore, IWritableGeneralDublinCore
-
-
-
-
 class IZopeDublinCore(
     IGeneralDublinCore,
     IWritableGeneralDublinCore,
@@ -295,24 +274,11 @@
     IDCPublishing,
     IDCExtended,
     ):
-    """Zope Dublin Core properties
-    """
-
-__doc__ = IZopeDublinCore.__doc__ + __doc__
-
-
-"""
-$Id$
-"""
-
-from zope.app.interfaces.annotation import IAnnotatable
+    """Zope Dublin Core properties"""
 
 class IZopeDublinCoreAnnotatable(IAnnotatable):
     """Objects that can be annotated with Zope Dublin-Core meta data
 
     This is a marker interface that indicates the intent to have
     Zope Dublin-Core meta data associated with an object.
-
     """
-
-__doc__ = IZopeDublinCoreAnnotatable.__doc__ + __doc__