[Checkins] SVN: zope.file/trunk/src/zope/file/ Take away all deprecations (except i18n:translate, where pertinent).

[Gary Poster]

Log message for revision 67735:
  Take away all deprecations (except i18n:translate, where pertinent).
  

Changed:
  U   zope.file/trunk/src/zope/file/adapters.py
  U   zope.file/trunk/src/zope/file/configure.zcml
  U   zope.file/trunk/src/zope/file/download.py
  U   zope.file/trunk/src/zope/file/upload.py

-=-
Modified: zope.file/trunk/src/zope/file/adapters.py
===================================================================
--- zope.file/trunk/src/zope/file/adapters.py	2006-04-28 19:16:23 UTC (rev 67734)
+++ zope.file/trunk/src/zope/file/adapters.py	2006-04-29 00:19:53 UTC (rev 67735)
@@ -11,12 +11,12 @@
 #
 ##############################################################################
 from zope import interface, component
-import zope.app.filerepresentation.interfaces
+import zope.filerepresentation.interfaces
 from zope.file import interfaces
 
 class ReadFileAdapter(object):
     component.adapts(interfaces.IFile)
-    interface.implements(zope.app.filerepresentation.interfaces.IReadFile)
+    interface.implements(zope.filerepresentation.interfaces.IReadFile)
 
     def __init__(self, context):
         self.context = context
@@ -32,7 +32,7 @@
 
 class WriteFileAdapter(object):
     component.adapts(interfaces.IFile)
-    interface.implements(zope.app.filerepresentation.interfaces.IWriteFile)
+    interface.implements(zope.filerepresentation.interfaces.IWriteFile)
 
     def __init__(self, context):
         self.context = context

Modified: zope.file/trunk/src/zope/file/configure.zcml
===================================================================
--- zope.file/trunk/src/zope/file/configure.zcml	2006-04-28 19:16:23 UTC (rev 67734)
+++ zope.file/trunk/src/zope/file/configure.zcml	2006-04-29 00:19:53 UTC (rev 67735)
@@ -16,7 +16,7 @@
         />
     <implements
         interface="
-          zope.app.annotation.interfaces.IAttributeAnnotatable
+          zope.annotation.interfaces.IAttributeAnnotatable
           "
         />
   </class>

Modified: zope.file/trunk/src/zope/file/download.py
===================================================================
--- zope.file/trunk/src/zope/file/download.py	2006-04-28 19:16:23 UTC (rev 67734)
+++ zope.file/trunk/src/zope/file/download.py	2006-04-29 00:19:53 UTC (rev 67735)
@@ -17,19 +17,16 @@
 
 import cStringIO
 
-import zope.app.publisher.interfaces.browser
 import zope.interface
 import zope.mimetype.interfaces
 import zope.publisher.interfaces.browser
 import zope.publisher.http
 
-import zope.app.publisher.interfaces.browser
 
-
 class Download(object):
 
     zope.interface.implements(
-        zope.app.publisher.interfaces.browser.IBrowserView,
+        zope.publisher.interfaces.browser.IBrowserView,
         zope.publisher.interfaces.browser.IBrowserPublisher)
 
     def __init__(self, context, request):
@@ -48,7 +45,7 @@
 class Inline(object):
 
     zope.interface.implements(
-        zope.app.publisher.interfaces.browser.IBrowserView,
+        zope.publisher.interfaces.browser.IBrowserView,
         zope.publisher.interfaces.browser.IBrowserPublisher)
 
     def __init__(self, context, request):

Modified: zope.file/trunk/src/zope/file/upload.py
===================================================================
--- zope.file/trunk/src/zope/file/upload.py	2006-04-28 19:16:23 UTC (rev 67734)
+++ zope.file/trunk/src/zope/file/upload.py	2006-04-29 00:19:53 UTC (rev 67735)
@@ -17,7 +17,7 @@
 
 import re
 import zope.app.container.interfaces
-import zope.app.event.objectevent
+import zope.lifecycleevent
 import zope.component
 import zope.event
 import zope.file.file
@@ -61,7 +61,7 @@
         f = self.request.form["form.data"]
         updateBlob(ob, f)
         zope.event.notify(
-            zope.app.event.objectevent.ObjectCreatedEvent(ob))
+            zope.lifecycleevent.ObjectCreatedEvent(ob))
         self._name = nameFinder(f)
         return ob
 
@@ -127,7 +127,7 @@
                 parameters["charset"] = new_charset.name
                 context.parameters = parameters
         zope.event.notify(
-            zope.app.event.objectevent.ObjectModifiedEvent(context))
+            zope.lifecycleevent.ObjectModifiedEvent(context))
 
 
 def updateBlob(ob, input):