[Zope3-checkins] CVS: Products3/z3checkins - configure.zcml:1.16 folder.py:1.4 interfaces.py:1.10 message.py:1.30

[Marius Gedminas]

Update of /cvs-repository/Products3/z3checkins
In directory cvs.zope.org:/tmp/cvs-serv10436

Modified Files:
	configure.zcml folder.py interfaces.py message.py 
Log Message:
Keep up with packagegeddon.



=== Products3/z3checkins/configure.zcml 1.15 => 1.16 ===
--- Products3/z3checkins/configure.zcml:1.15	Fri Feb 27 07:06:11 2004
+++ Products3/z3checkins/configure.zcml	Wed Mar  3 08:46:34 2004
@@ -29,10 +29,10 @@
   <content class=".folder.CheckinsFolder">
 
      <require permission="zope.View"
-              interface="zope.app.interfaces.container.IReadContainer" />
+              interface="zope.app.container.interfaces.IReadContainer" />
 
      <require permission="zope.ManageContent"
-              interface="zope.app.interfaces.container.IWriteContainer" />
+              interface="zope.app.container.interfaces.IWriteContainer" />
 
      <require permission="zope.ManageContent"
               set_schema=".interfaces.ICheckinsFolder" />
@@ -47,7 +47,7 @@
 
 <!-- Utilities -->
 
-  <adapter for="zope.app.interfaces.container.IReadContainer"
+  <adapter for="zope.app.container.interfaces.IReadContainer"
            factory=".message.MessageContainerAdapter"
            permission="zope.View"
            provides=".interfaces.IMessageArchive" />
@@ -55,12 +55,12 @@
   <adapter for=".interfaces.ICheckinsFolder"
            factory=".folder.MessageNameChooser"
            permission="zope.View"
-           provides="zope.app.interfaces.container.INameChooser" />
+           provides="zope.app.container.interfaces.INameChooser" />
 
   <adapter for=".interfaces.IMessage"
            factory=".folder.MessageSized"
            permission="zope.View"
-           provides="zope.app.interfaces.size.ISized" />
+           provides="zope.app.size.interfaces.ISized" />
 
 
   <utility factory=".message.CheckinMessageParser"
@@ -102,7 +102,7 @@
     class=".message.MessageUpload"
     permission="zope.ManageContent"
     view="CheckinMessage" />
-    
+
   <browser:addform
     name="CheckinFolder"
     schema=".interfaces.ICheckinsFolderSchema"
@@ -124,9 +124,9 @@
     permission="zope.ManageContent"
     class="zope.app.browser.container.adding.Adding">
 
-   <page name="index.html" attribute="index" /> 
+   <page name="index.html" attribute="index" />
    <page name="action.html" attribute="action" />
-    
+
   </browser:view>
 
   <browser:editform
@@ -135,7 +135,7 @@
     label="Change properties of a checkin message folder"
     menu="zmi_views" title="Edit"
     permission="zope.ManageContent" />
-    
+
 <!-- Browser views: email message -->
 
   <browser:page


=== Products3/z3checkins/folder.py 1.3 => 1.4 ===
--- Products3/z3checkins/folder.py:1.3	Tue Feb 10 11:20:28 2004
+++ Products3/z3checkins/folder.py	Wed Mar  3 08:46:34 2004
@@ -8,9 +8,9 @@
 
 from zope.interface import implements
 from zope.app.container.btree import BTreeContainer
-from zope.app.interfaces.container import INameChooser
-from zope.app.interfaces.container import IContainerNamesContainer
-from zope.app.interfaces.size import ISized
+from zope.app.container.interfaces import INameChooser
+from zope.app.container.interfaces import IContainerNamesContainer
+from zope.app.size.interfaces import ISized
 from interfaces import ICheckinsFolder
 
 class CheckinsFolder(BTreeContainer):


=== Products3/z3checkins/interfaces.py 1.9 => 1.10 ===
--- Products3/z3checkins/interfaces.py:1.9	Fri Feb 27 07:06:11 2004
+++ Products3/z3checkins/interfaces.py	Wed Mar  3 08:46:34 2004
@@ -6,7 +6,7 @@
 
 from zope.interface import Interface, Attribute
 from zope.app.folder.interfaces import IFolder
-from zope.app.interfaces.container import IContainer, IContained
+from zope.app.container.interfaces import IContainer, IContained
 from zope.app.container.constraints import ContainerTypesConstraint
 from zope.app.container.constraints import ItemTypePrecondition
 from zope.schema import Field, Text, TextLine


=== Products3/z3checkins/message.py 1.29 => 1.30 ===
--- Products3/z3checkins/message.py:1.29	Thu Feb 19 04:33:02 2004
+++ Products3/z3checkins/message.py	Wed Mar  3 08:46:34 2004
@@ -11,22 +11,22 @@
 import rfc822
 import mailbox
 import time
-
 from StringIO import StringIO
 from datetime import datetime, tzinfo, timedelta
+
 from persistence import Persistent
-from zope.interface import implements
-from zope.component import getUtility, getAdapter, queryAdapter
 from zope.app.browser.form.widget import FileWidget
-from zope.app.form.widget import CustomWidgetFactory
-from zope.app.interfaces.container import IReadContainer
-from zope.proxy import removeAllProxies
+from zope.app.container.interfaces import IReadContainer
 from zope.app.datetimeutils import parseDatetimetz, DateTimeError
-from zope.component import getView
-from zope.publisher.browser import BrowserView
+from zope.app.form.widget import CustomWidgetFactory
+from zope.app.dublincore.interfaces import IZopeDublinCore
 from zope.app.pagetemplate import ViewPageTemplateFile
-from zope.app.interfaces.dublincore import IZopeDublinCore
+from zope.component import getUtility, getAdapter, queryAdapter
+from zope.component import getView
 from zope.exceptions import DuplicationError
+from zope.interface import implements
+from zope.proxy import removeAllProxies
+from zope.publisher.browser import BrowserView
 
 from interfaces import IMessage, ICheckinMessage, IBookmark, IMessageContained
 from interfaces import IMessageUpload