Compatibilité minimum pour que zope se lance.

diff --git a/Portfolio.py b/Portfolio.py
index 30124693149980d3275aefff6b48500d434d121d..beb1f7513a9c3480a6460425e2a4b98eb1e1413b 100755 (executable)
--- a/Portfolio.py
+++ b/Portfolio.py
@@ -11,4 +11,5 @@
 """ Deprecated Image and Portfolio classes
 """
 
 """ Deprecated Image and Portfolio classes
 """
 

-from deprecated.Portfolio import Portfolio, Photo
+# TODO: se décider à le virer pour de bon !
+# from deprecated.Portfolio import Portfolio, Photo

diff --git a/photo.py b/photo.py
index e7a10a1daed02e07ad25f9f04d53e7a3fced4cbf..a90ef42892bc9ecd62b6be82596e2978bf1e5a2a 100755 (executable)
--- a/photo.py
+++ b/photo.py
@@ -21,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


@@ -37,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

diff --git a/utils.py b/utils.py
index 4ee55201ccec07e16e4656d9564f63224a034e20..26ed830559522154c49a5a9c177f6249130c0d29 100755 (executable)
--- a/utils.py
+++ b/utils.py
@@ -12,7 +12,7 @@
 """
 
 from AccessControl import ModuleSecurityInfo
 """
 
 from AccessControl import ModuleSecurityInfo

-from Products.PageTemplates.GlobalTranslationService import getGlobalTranslationService
+#from Products.PageTemplates.GlobalTranslationService import getGlobalTranslationService

 from zope.i18nmessageid import MessageFactory
 
 security = ModuleSecurityInfo('Products.Portfolio.utils')
 from zope.i18nmessageid import MessageFactory
 
 security = ModuleSecurityInfo('Products.Portfolio.utils')


@@ -24,10 +24,12 @@ security.declarePublic('translate')
 def translate(message, context):
        """ Translate i18n message.
        """
 def translate(message, context):
        """ Translate i18n message.
        """

-       GTS = getGlobalTranslationService()
+       # TODO: touver une solution.
+       # GTS = getGlobalTranslationService()

        if isinstance(message, Exception):
                try:
                        message = message[0]
                except (TypeError, IndexError):
                        pass
        if isinstance(message, Exception):
                try:
                        message = message[0]
                except (TypeError, IndexError):
                        pass

+       return message

        return GTS.translate('portfolio', message, context=context)
        return GTS.translate('portfolio', message, context=context)