[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/Image/Views/Browser - ImageData.py:1.1.2.2 browser.zcml:1.1.2.2

[Stephan Richter]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Content/Image/Views/Browser
In directory cvs.zope.org:/tmp/cvs-serv429/App/OFS/Content/Image/Views/Browser

Modified Files:
      Tag: Zope-3x-branch
	ImageData.py browser.zcml 
Log Message:
- Fixed some last buglets.

Now the merge is complete! MUCH THANKS GOES TO STEVE ALEXANDER FOR HELPING
ME TO DEBUG THE MESS!



=== Zope3/lib/python/Zope/App/OFS/Content/Image/Views/Browser/ImageData.py 1.1.2.1 => 1.1.2.2 ===
         image = self.getContext()
         if REQUEST is not None:
-            REQUEST['RESPONSE'].setHeader('content-type',
+            REQUEST.getResponse().setHeader('content-type',
                                           image.getContentType()) 
         return image.getData()
 


=== Zope3/lib/python/Zope/App/OFS/Content/Image/Views/Browser/browser.zcml 1.1.2.1 => 1.1.2.2 ===
 
   <browser:view name="DataFieldView"
-    for="Zope.App.OFS.Image.Image.IImage."
+    for="Zope.App.OFS.Content.Image.Image.IImage."
     factory="Zope.App.OFS.Content.Image.ImageFields.DataField. 
              Zope.App.Formulator.Widgets.Browser.FileWidget." />
 
   <browser:view name="ContentTypeFieldView"
-    for="Zope.App.OFS.Image.Image.IImage."
+    for="Zope.App.OFS.Content.Image.Image.IImage."
     factory="Zope.App.OFS.Content.Image.ImageFields.ContentTypeField. 
              Zope.App.Formulator.Widgets.Browser.TextWidget." />