[Checkins] SVN: CMF/branches/2.1/ Rename getToolByInterfaceName to getUtilityByInterfaceName. Kept a getToolByInterfaceName bbb method with a short deprecation period.

Wichert Akkerman wichert at wiggy.net
Thu Jul 12 10:31:42 EDT 2007


Log message for revision 77744:
  Rename getToolByInterfaceName to getUtilityByInterfaceName. Kept a getToolByInterfaceName bbb method with a short deprecation period.

Changed:
  U   CMF/branches/2.1/CMFCore/utils.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_content/metadata_edit_control.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_content/metadata_edit_form.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_control/members_add_control.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_control/portal_config_control.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_control/undo.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_control/validatePassword.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_generic/RSS.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_generic/breadcrumbs.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_generic/discitem_delete.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_generic/discussion_reply.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_generic/getMainGlobals.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_generic/get_permalink.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_generic/join_form.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_generic/logged_in.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_generic/password_email.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_generic/password_form.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_generic/permalink.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_generic/reconfig_form.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_generic/registered_email.py
  U   CMF/branches/2.1/CMFDefault/skins/zpt_generic/synPropertiesForm.py
  U   CMF/branches/2.1/docs/ToolsAreUtilities.stx

-=-
Modified: CMF/branches/2.1/CMFCore/utils.py
===================================================================
--- CMF/branches/2.1/CMFCore/utils.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFCore/utils.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -127,6 +127,15 @@
 
 security.declarePublic('getToolByInterfaceName')
 def getToolByInterfaceName(dotted_name, default=_marker):
+    warn('getToolByInterfaceName() is deprecated and will be removed in CMF '
+         '2.3. Use getUtilityByInterfaceName instead.',
+         DeprecationWarning, stacklevel=2)
+
+    return getUtilityByInterfaceName(dotted_name, default)
+
+
+security.declarePublic('getUtilityByInterfaceName')
+def getUtilityByInterfaceName(dotted_name, default=_marker):
     """ Get a tool by its fully-qualified dotted interface path
 
     This method replaces getToolByName for use in untrusted code.

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_content/metadata_edit_control.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_content/metadata_edit_control.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_content/metadata_edit_control.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,10 +1,10 @@
 ##parameters=allow_discussion, title=None, subject=None, description=None, contributors=None, effective_date=None, expiration_date=None, format=None, language=None, rights=None, **kw
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFDefault.exceptions import ResourceLockedError
 from Products.CMFDefault.utils import Message as _
 
-dtool = getToolByInterfaceName('Products.CMFCore.interfaces.IDiscussionTool')
+dtool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IDiscussionTool')
 
 def tuplify( value ):
 

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_content/metadata_edit_form.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_content/metadata_edit_form.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_content/metadata_edit_form.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,10 +1,10 @@
 ##parameters=change='', change_and_edit='', change_and_view=''
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFDefault.utils import decode
 from Products.CMFDefault.utils import Message as _
 
-mdtool = getToolByInterfaceName('Products.CMFCore.interfaces.IMetadataTool')
+mdtool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IMetadataTool')
 
 
 form = context.REQUEST.form

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_control/members_add_control.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_control/members_add_control.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_control/members_add_control.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,13 +1,13 @@
 ##parameters=member_id, password, member_email, send_password=False, **kw
 ##title=Add a member
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.permissions import ManageUsers
 from Products.CMFDefault.utils import Message as _
 
 mtool = getToolByName(script, 'portal_membership')
-ptool = getToolByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
+ptool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
 rtool = getToolByName(script, 'portal_registration')
 
 try:

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_control/portal_config_control.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_control/portal_config_control.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_control/portal_config_control.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,9 +1,9 @@
 ##parameters=**kw
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFDefault.utils import Message as _
 
-ptool = getToolByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
+ptool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
 
 if not ptool.hasProperty('default_charset'):
     ptool.manage_addProperty('default_charset', '', 'string')

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_control/undo.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_control/undo.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_control/undo.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,10 +1,10 @@
 ##parameters=transaction_info
 ##title=Undo transactions
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFDefault.utils import Message as _
 
-utool = getToolByInterfaceName('Products.CMFCore.interfaces.IUndoTool')
+utool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IUndoTool')
 
 utool.undo(context, transaction_info)
 

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_control/validatePassword.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_control/validatePassword.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_control/validatePassword.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -2,10 +2,10 @@
 ##parameters=password='', confirm='', **kw
 ##title=
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFCore.utils import getToolByName
 
-ptool = getToolByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
+ptool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
 rtool = getToolByName(script, 'portal_registration')
 
 if ptool.getProperty('validate_email'):

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_generic/RSS.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_generic/RSS.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_generic/RSS.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -2,10 +2,10 @@
 ##
 from ZTUtils import Batch
 from ZTUtils import LazyFilter
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFDefault.utils import decode
 
-stool = getToolByInterfaceName('Products.CMFCore.interfaces.ISyndicationTool')
+stool = getUtilityByInterfaceName('Products.CMFCore.interfaces.ISyndicationTool')
 
 
 if not stool.isSyndicationAllowed(context):

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_generic/breadcrumbs.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_generic/breadcrumbs.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_generic/breadcrumbs.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,11 +1,11 @@
 ##parameters=include_root=1
 ##title=Return breadcrumbs
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.utils import Message as _
 
-ptool = getToolByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
+ptool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
 utool = getToolByName(script, 'portal_url')
 portal_url = utool()
 result = []

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_generic/discitem_delete.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_generic/discitem_delete.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_generic/discitem_delete.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,10 +1,10 @@
 ##parameters=
 ##title=Delete reply
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFDefault.utils import Message as _
 
-dtool = getToolByInterfaceName('Products.CMFCore.interfaces.IDiscussionTool')
+dtool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IDiscussionTool')
 
 parent = context.inReplyTo()
 talkback = dtool.getDiscussionFor(parent)

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_generic/discussion_reply.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_generic/discussion_reply.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_generic/discussion_reply.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,10 +1,10 @@
 ##parameters=title, text, **kw
 ##title=Reply to content
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFDefault.utils import Message as _
 
-dtool = getToolByInterfaceName('Products.CMFCore.interfaces.IDiscussionTool')
+dtool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IDiscussionTool')
 
 talkback = dtool.getDiscussionFor(context)
 replyID = talkback.createReply(title=title, text=text)

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_generic/getMainGlobals.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_generic/getMainGlobals.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_generic/getMainGlobals.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,6 +1,6 @@
 ##parameters=
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.utils import decode
 from Products.CMFDefault.utils import getBrowserCharset
@@ -8,7 +8,7 @@
 atool = getToolByName(script, 'portal_actions')
 caltool = getToolByName(script, 'portal_calendar', None)
 mtool = getToolByName(script, 'portal_membership')
-ptool = getToolByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
+ptool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
 utool = getToolByName(script, 'portal_url')
 wtool = getToolByName(script, 'portal_workflow')
 portal_object = utool.getPortalObject()

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_generic/get_permalink.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_generic/get_permalink.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_generic/get_permalink.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -7,14 +7,14 @@
 ##parameters=
 ##title=Returns the permalink url or None
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFCore.utils import getToolByName
 
 # calculate the permalink if the uid handler tool exists, permalinks
 # are configured to be shown and the object is not folderish
 uidtool = getToolByName(context, 'portal_uidhandler', None)
 if uidtool is not None:
-    ptool = getToolByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
+    ptool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
     showPermalink = getattr(ptool, 'enable_permalink', None)
     isFolderish = getattr(context.aq_explicit, 'isPrincipiaFolderish', None)
     

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_generic/join_form.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_generic/join_form.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_generic/join_form.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,6 +1,6 @@
 ##parameters=b_start=0, member_id='', member_email='', password='', confirm='', send_password='', add='', cancel=''
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.permissions import ManageUsers
 from Products.CMFDefault.utils import decode
@@ -8,7 +8,7 @@
 
 atool = getToolByName(script, 'portal_actions')
 mtool = getToolByName(script, 'portal_membership')
-ptool = getToolByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
+ptool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
 utool = getToolByName(script, 'portal_url')
 portal_url = utool()
 validate_email = ptool.getProperty('validate_email')

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_generic/logged_in.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_generic/logged_in.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_generic/logged_in.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,12 +1,12 @@
 ##parameters=
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.utils import decode
 from Products.CMFDefault.utils import Message as _
 
 mtool = getToolByName(script, 'portal_membership')
-ptool = getToolByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
+ptool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
 stool = getToolByName(script, 'portal_skins')
 utool = getToolByName(script, 'portal_url')
 portal_url = utool()

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_generic/password_email.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_generic/password_email.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_generic/password_email.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,13 +1,13 @@
 ##parameters=member=None, password='secret'
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.utils import decode
 from Products.CMFDefault.utils import makeEmail
 from Products.CMFDefault.utils import Message as _
 
 atool = getToolByName(script, 'portal_actions')
-ptool = getToolByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
+ptool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
 utool = getToolByName(script, 'portal_url')
 portal_url = utool()
 

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_generic/password_form.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_generic/password_form.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_generic/password_form.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,13 +1,13 @@
 ##parameters=change='', cancel=''
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.utils import decode
 from Products.CMFDefault.utils import Message as _
 
 atool = getToolByName(script, 'portal_actions')
 mtool = getToolByName(script, 'portal_membership')
-ptool = getToolByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
+ptool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
 utool = getToolByName(script, 'portal_url')
 member = mtool.getAuthenticatedMember()
 portal_url = utool()

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_generic/permalink.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_generic/permalink.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_generic/permalink.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -7,10 +7,10 @@
 ##parameters=
 ##title=Returns an object by unique id
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 
 subpath = traverse_subpath[0]
-uid_handler=getToolByInterfaceName('Products.CMFUid.interfaces.UniqueIDHandler')
+uid_handler=getUtilityByInterfaceName('Products.CMFUid.interfaces.UniqueIDHandler')
 
 # appending 'isAvailable' instead of a unique id returns if
 # the site permalink feature is available.
@@ -18,7 +18,7 @@
     # no permalink feature without an uid handler tool being installed
     if uid_handler is None:
         return '0'
-    ptool = getToolByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
+    ptool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
     isAvailable = getattr(ptool, 'enable_permalink', 0)
     return str(int(isAvailable))
 

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_generic/reconfig_form.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_generic/reconfig_form.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_generic/reconfig_form.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,12 +1,12 @@
 ##parameters=change=''
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.utils import decode
 from Products.CMFDefault.utils import Message as _
 
 atool = getToolByName(script, 'portal_actions')
-ptool = getToolByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
+ptool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
 
 
 form = context.REQUEST.form

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_generic/registered_email.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_generic/registered_email.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_generic/registered_email.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,13 +1,13 @@
 ##parameters=member=None, password='secret', email='foo at example.org'
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.utils import decode
 from Products.CMFDefault.utils import makeEmail
 from Products.CMFDefault.utils import Message as _
 
 atool = getToolByName(script, 'portal_actions')
-ptool = getToolByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
+ptool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
 utool = getToolByName(script, 'portal_url')
 portal_url = utool()
 

Modified: CMF/branches/2.1/CMFDefault/skins/zpt_generic/synPropertiesForm.py
===================================================================
--- CMF/branches/2.1/CMFDefault/skins/zpt_generic/synPropertiesForm.py	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/CMFDefault/skins/zpt_generic/synPropertiesForm.py	2007-07-12 14:31:41 UTC (rev 77744)
@@ -1,9 +1,9 @@
 ##parameters=
 ##
-from Products.CMFCore.utils import getToolByInterfaceName
+from Products.CMFCore.utils import getUtilityByInterfaceName
 from Products.CMFDefault.utils import decode
 
-stool = getToolByInterfaceName('Products.CMFCore.interfaces.ISyndicationTool')
+stool = getUtilityByInterfaceName('Products.CMFCore.interfaces.ISyndicationTool')
 options = {}
 
 s_site_allowed = stool.isSiteSyndicationAllowed()

Modified: CMF/branches/2.1/docs/ToolsAreUtilities.stx
===================================================================
--- CMF/branches/2.1/docs/ToolsAreUtilities.stx	2007-07-12 14:21:48 UTC (rev 77743)
+++ CMF/branches/2.1/docs/ToolsAreUtilities.stx	2007-07-12 14:31:41 UTC (rev 77744)
@@ -36,11 +36,11 @@
 
     The new way::
 
-      from Products.CMFCore.utils import getToolByInterfaceName
-      foo_tool = getToolByInterfaceName('Products.Fooproduct.interfaces.IFooTool')
+      from Products.CMFCore.utils import getUtilityByInterfaceName
+      foo_tool = getUtilityByInterfaceName('Products.Fooproduct.interfaces.IFooTool')
 
     Since the functions from zope.component are not accessible to untrusted
-    code, a helper function 'getToolByInterfaceName' has been provided. Its
+    code, a helper function 'getUtilityByInterfaceName' has been provided. Its
     main argument is a string representing the dotted name of the interface
     for which you are looking up the utility. Just as with getToolByName, you
     may pass a 'default' argument to specify what is returned if the interface



More information about the Checkins mailing list