[kupu-checkins] r42342 - in kupu/trunk/kupu/plone: . kupu_plone_layer
limi at codespeak.net
limi at codespeak.net
Thu Apr 26 01:23:12 CEST 2007
Author: limi
Date: Thu Apr 26 01:23:10 2007
New Revision: 42342
Modified:
kupu/trunk/kupu/plone/exportimport.py
kupu/trunk/kupu/plone/html2captioned.py
kupu/trunk/kupu/plone/kupu2html.py
kupu/trunk/kupu/plone/kupu_plone_layer/contentUsesKupu.py
kupu/trunk/kupu/plone/kupu_plone_layer/convertContentForKupu.py
kupu/trunk/kupu/plone/kupu_plone_layer/kupuUploadImage.py
kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py
kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
kupu/trunk/kupu/plone/librarytool.py
kupu/trunk/kupu/plone/plonedrawers.py
kupu/trunk/kupu/plone/plonelibrarytool.py
kupu/trunk/kupu/plone/util.py
Log:
Removing the getUtility workarounds now that it has been undeprecated in CMF.
Modified: kupu/trunk/kupu/plone/exportimport.py
==============================================================================
--- kupu/trunk/kupu/plone/exportimport.py (original)
+++ kupu/trunk/kupu/plone/exportimport.py Thu Apr 26 01:23:10 2007
@@ -20,7 +20,7 @@
from Globals import package_home
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
from Products.GenericSetup.utils import CONVERTER
from Products.GenericSetup.utils import DEFAULT
Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py (original)
+++ kupu/trunk/kupu/plone/html2captioned.py Thu Apr 26 01:23:10 2007
@@ -10,7 +10,7 @@
from Products.PortalTransforms.interfaces import itransform
from DocumentTemplate.DT_Util import html_quote
from DocumentTemplate.DT_Var import newline_to_br
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
import re
from cgi import escape
from urlparse import urlsplit, urljoin, urlunsplit
Modified: kupu/trunk/kupu/plone/kupu2html.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu2html.py (original)
+++ kupu/trunk/kupu/plone/kupu2html.py Thu Apr 26 01:23:10 2007
@@ -9,7 +9,7 @@
from Products.PortalTransforms.interfaces import itransform
from Products.kupu.plone import html2captioned
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
class KupuOutputTransform(html2captioned.HTMLToCaptioned):
"""Transform which adds captions to images embedded in HTML"""
Modified: kupu/trunk/kupu/plone/kupu_plone_layer/contentUsesKupu.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/contentUsesKupu.py (original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/contentUsesKupu.py Thu Apr 26 01:23:10 2007
@@ -6,7 +6,7 @@
##bind script=script
##bind subpath=traverse_subpath
##parameters=fieldname
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
from Products.CMFCore.utils import getToolByName
tool = getToolByName(context, 'kupu_library_tool')
Modified: kupu/trunk/kupu/plone/kupu_plone_layer/convertContentForKupu.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/convertContentForKupu.py (original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/convertContentForKupu.py Thu Apr 26 01:23:10 2007
@@ -6,7 +6,7 @@
##bind script=script
##bind subpath=traverse_subpath
##parameters=fieldname, content
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
from Products.PythonScripts.standard import structured_text, newline_to_br
field = context.getField(fieldname)
Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuUploadImage.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuUploadImage.py (original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuUploadImage.py Thu Apr 26 01:23:10 2007
@@ -6,7 +6,7 @@
##bind subpath=traverse_subpath
##parameters=node_prop_title, node_prop_desc, node_prop_image
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
from Products.PythonScripts.standard import html_quote, newline_to_br
request = context.REQUEST
RESPONSE = request.RESPONSE
Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt (original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt Thu Apr 26 01:23:10 2007
@@ -10,7 +10,7 @@
>
<tal:with define="
- getToolByName nocall:modules/Products.kupu.plone.util/getToolByName;
+ getToolByName nocall:modules/Products.CMFCore.utils/getToolByName;
kupu_tool python:getToolByName(context, 'kupu_library_tool');
libraries python:kupu_tool.getCookedLibraries(context);
">
Modified: kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py (original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/resolveuid.py Thu Apr 26 01:23:10 2007
@@ -7,7 +7,7 @@
##bind subpath=traverse_subpath
##parameters=
# (reference_url is supposed to do the same thing, but is broken)
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
from Products.PythonScripts.standard import html_quote
request = context.REQUEST
Modified: kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py (original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py Thu Apr 26 01:23:10 2007
@@ -11,7 +11,7 @@
# Make a copy of this script called 'kupu-customisation-policy'
# in any skin folder on your site and edit it to set up your own
# preferred kupu configuration.
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
RESOURCES = dict(
linkable = ('Document', 'Image', 'File', 'News Item', 'Event', 'Folder', 'Large Plone Folder'),
Modified: kupu/trunk/kupu/plone/librarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/librarytool.py (original)
+++ kupu/trunk/kupu/plone/librarytool.py Thu Apr 26 01:23:10 2007
@@ -18,7 +18,7 @@
from Products.CMFCore.Expression import Expression, createExprContext
from Products.PageTemplates.Expressions import getEngine, SecureModuleImporter
from Products.kupu.plone.interfaces import IKupuLibraryTool
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
class KupuError(Exception): pass
NEWTYPE_IGNORE, NEWTYPE_ADD = 0, 1
Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py (original)
+++ kupu/trunk/kupu/plone/plonedrawers.py Thu Apr 26 01:23:10 2007
@@ -22,7 +22,7 @@
from Products.Archetypes.interfaces.referenceable import IReferenceable
from Products.PythonScripts.standard import html_quote, newline_to_br
from Products.kupu.plone.librarytool import KupuError
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
import html2captioned
try:
Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py (original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py Thu Apr 26 01:23:10 2007
@@ -29,7 +29,7 @@
from Products.kupu.plone.librarytool import KupuLibraryTool
from Products.kupu.plone import permissions, scanner, plonedrawers, util, helpers
-from Products.kupu.plone.util import getToolByName
+from Products.CMFCore.utils import getToolByName
from Products.kupu import kupu_globals
from Products.kupu.config import TOOLNAME, TOOLTITLE
from StringIO import StringIO
Modified: kupu/trunk/kupu/plone/util.py
==============================================================================
--- kupu/trunk/kupu/plone/util.py (original)
+++ kupu/trunk/kupu/plone/util.py Thu Apr 26 01:23:10 2007
@@ -6,16 +6,12 @@
from Products.MimetypesRegistry import MimeTypeItem
from Products.kupu import kupu_globals
-from AccessControl import ModuleSecurityInfo
-security = ModuleSecurityInfo('Products.kupu.plone.util')
-
kupu_package_dir = package_home(kupu_globals)
# trying to get rid of some deprecation warnings in a
# backwards compatible way
from Products.CMFCore.utils import getToolByName
-
def register_layer(self, relpath, name, out, add=True):
"""Register a file system directory as skin layer
"""
More information about the kupu-checkins
mailing list