[Erp5-report] r41818 nicolas - /erp5/trunk/products/ERP5/mixin/cached_convertable.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue Dec 28 10:25:55 2010
New Revision: 41818

URL: http://svn.erp5.org?rev=41818&view=rev
Log:
Get rid of getToolByName

Modified:
    erp5/trunk/products/ERP5/mixin/cached_convertable.py

Modified: erp5/trunk/products/ERP5/mixin/cached_convertable.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/mixin/cached_convertable.py?rev=41818&r1=41817&r2=41818&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/mixin/cached_convertable.py [utf8] (original)
+++ erp5/trunk/products/ERP5/mixin/cached_convertable.py [utf8] Tue Dec 28 10:25:55 2010
@@ -36,7 +36,6 @@ import string
 from Acquisition import aq_base
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions
-from Products.CMFCore.utils import getToolByName
 from Products.ERP5Type.Cache import DEFAULT_CACHE_SCOPE
 from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
 from OFS.Image import Pdata, Image as OFSImage
@@ -79,8 +78,9 @@ class CachedConvertableMixin:
     """
     if self.getOriginalDocument() is None:
       return None
-    cache_tool = getToolByName(self, 'portal_caches')
-    preference_tool = getToolByName(self, 'portal_preferences')
+    portal = self.getPortalObject()
+    cache_tool = portal.portal_caches
+    preference_tool = portal.portal_preferences
     cache_factory_name = preference_tool.getPreferredConversionCacheFactory('document_cache_factory')
     cache_factory = cache_tool.getRamCacheRoot().get(cache_factory_name)
     #XXX This conditional statement should be remove as soon as