Revert "Upload avec script adhoc."

[Portfolio.git] / photo.py

diff --git a/photo.py b/photo.py
index 2508ebc..e66f8eb 100755 (executable)
--- a/photo.py
+++ b/photo.py
@@ -9,8 +9,6 @@
 # http://creativecommons.org/licenses/by-nc/2.0/           #
 ############################################################
 """ CMFAware Image
 # http://creativecommons.org/licenses/by-nc/2.0/           #
 ############################################################
 """ CMFAware Image

-$Id: photo.py 1202 2009-07-15 08:48:42Z pin $
-$URL: http://svn.luxia.fr/svn/labo/projects/zope/Portfolio/trunk/photo.py $

 """
 
 from Globals import InitializeClass
 """
 
 from Globals import InitializeClass


@@ -23,9 +21,11 @@ from Products.CMFCore.permissions import View, AccessContentsInformation, \
 from permissions import ViewRawImage
 from zope.component.factory import Factory
 from zope.interface import implements
 from permissions import ViewRawImage
 from zope.component.factory import Factory
 from zope.interface import implements

-from webdav.WriteLockInterface import WriteLockInterface as z2IWriteLock
+#from webdav.WriteLockInterface import WriteLockInterface as z2IWriteLock
+from webdav.interfaces import IWriteLock

 from Products.CMFCore.interfaces import IContentish
 from Products.CMFCore.interfaces import IContentish

-from Products.CMFCore.interfaces.Contentish import Contentish as z2IContentish
+from Products.CMFCore.interfaces import IDynamicType
+#from Products.CMFCore.interfaces.Contentish import Contentish as z2IContentish

 
 from Products.CMFCore.DynamicType import DynamicType
 from Products.CMFCore.CMFCatalogAware import CMFCatalogAware
 
 from Products.CMFCore.DynamicType import DynamicType
 from Products.CMFCore.CMFCatalogAware import CMFCatalogAware


@@ -39,8 +39,8 @@ from interfaces import IPhoto
 class Photo(DynamicType, CMFCatalogAware, BasePhoto, DefaultDublinCoreImpl) :
        """ Photo CMF aware """
        
 class Photo(DynamicType, CMFCatalogAware, BasePhoto, DefaultDublinCoreImpl) :
        """ Photo CMF aware """
        

-       implements(IPhoto, IContentish)
-       __implements__ = (z2IContentish, z2IWriteLock, DynamicType.__implements__)
+       implements(IPhoto, IContentish, IWriteLock, IDynamicType)
+       #__implements__ = (z2IContentish, IWriteLock, DynamicType.__implements__)

        
        meta_type = BasePhoto.meta_type
        manage_options = BasePhoto.manage_options
        
        meta_type = BasePhoto.meta_type
        manage_options = BasePhoto.manage_options


@@ -50,6 +50,7 @@ class Photo(DynamicType, CMFCatalogAware, BasePhoto, DefaultDublinCoreImpl) :
        security.declareProtected(ViewRawImage, 'getJpegImage')
                
        def __init__(self, id, title='', file='', content_type='', precondition='', **kw) :
        security.declareProtected(ViewRawImage, 'getJpegImage')
                
        def __init__(self, id, title='', file='', content_type='', precondition='', **kw) :

+               DefaultDublinCoreImpl.__init__(self, title=title)

                BasePhoto.__init__(self, id, title, file, content_type=content_type, precondition=precondition, **kw)
                self.id = id
                self.title = title
                BasePhoto.__init__(self, id, title, file, content_type=content_type, precondition=precondition, **kw)
                self.id = id
                self.title = title