[CMF-checkins] CVS: Products/CMFCore - ActionsTool.py:1.53.6.1
PortalContent.py:1.47.8.2 __init__.py:1.28.8.1 utils.py:1.61.2.2
Yvo Schubbe
y.2004_ at wcm-solutions.de
Tue Sep 14 12:48:44 EDT 2004
Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv4222/CMFCore
Modified Files:
Tag: yuppie-post_1_5-cleanup-branch
ActionsTool.py PortalContent.py __init__.py utils.py
Log Message:
- removed some deprecated names
=== Products/CMFCore/ActionsTool.py 1.53 => 1.53.6.1 ===
--- Products/CMFCore/ActionsTool.py:1.53 Mon Aug 30 04:59:52 2004
+++ Products/CMFCore/ActionsTool.py Tue Sep 14 12:48:13 2004
@@ -175,8 +175,4 @@
# catlist.append(action)
return filtered_actions
- # listFilteredActions() is an alias.
- security.declarePublic('listFilteredActions')
- listFilteredActions = listFilteredActionsFor
-
InitializeClass(ActionsTool)
=== Products/CMFCore/PortalContent.py 1.47.8.1 => 1.47.8.2 ===
--- Products/CMFCore/PortalContent.py:1.47.8.1 Fri Sep 10 11:41:56 2004
+++ Products/CMFCore/PortalContent.py Tue Sep 14 12:48:13 2004
@@ -30,10 +30,6 @@
from permissions import View
-# Old names that some third-party packages may need.
-NoWL = 0
-
-
class PortalContent(DynamicType, CMFCatalogAware, SimpleItem):
"""
Base class for portal objects.
=== Products/CMFCore/__init__.py 1.28 => 1.28.8.1 ===
--- Products/CMFCore/__init__.py:1.28 Thu Aug 12 11:07:39 2004
+++ Products/CMFCore/__init__.py Tue Sep 14 12:48:13 2004
@@ -34,10 +34,6 @@
from permissions import AddPortalFolders
-# Old name that some third-party packages may need.
-ADD_FOLDERS_PERMISSION = AddPortalFolders
-HAS_PAGE_TEMPLATES = 1
-
bases = (
PortalObject.PortalObjectBase,
PortalFolder.PortalFolder,
=== Products/CMFCore/utils.py 1.61.2.1 => 1.61.2.2 ===
--- Products/CMFCore/utils.py:1.61.2.1 Fri Sep 10 11:41:56 2004
+++ Products/CMFCore/utils.py Tue Sep 14 12:48:13 2004
@@ -18,7 +18,6 @@
from os import path as os_path
from os.path import abspath
import re
-from warnings import warn
from AccessControl import ClassSecurityInfo
from AccessControl import getSecurityManager
@@ -44,7 +43,6 @@
from OFS.SimpleItem import SimpleItem
from Products.PageTemplates.Expressions import getEngine
from Products.PageTemplates.Expressions import SecureModuleImporter
-from StructuredText.StructuredText import HTML
from exceptions import AccessControl_Unauthorized
from exceptions import NotFound
@@ -182,8 +180,6 @@
if role not in special_roles and role not in user_roles:
raise AccessControl_Unauthorized('Too many roles specified.')
-limitGrantedRoles = _limitGrantedRoles # XXX: Deprecated spelling
-
security.declarePrivate('_mergedLocalRoles')
def _mergedLocalRoles(object):
"""Returns a merging of object and its ancestors'
@@ -211,8 +207,6 @@
break
return merged
-mergedLocalRoles = _mergedLocalRoles # XXX: Deprecated spelling
-
security.declarePrivate('_ac_inherited_permissions')
def _ac_inherited_permissions(ob, all=0):
# Get all permissions not defined in ourself that are inherited
@@ -545,15 +539,6 @@
if not hasattr(misc_images, pid):
setattr(misc_images, pid, MiscImage(pid, {}))
getattr(misc_images, pid)[name]=icon
-
-security.declarePublic('format_stx')
-def format_stx( text, level=1 ):
- """ Render STX to HTML.
- """
- warn('format_stx() will be removed in CMF 1.6. Please use '
- 'StructuredText.StructuredText.HTML instead.',
- DeprecationWarning)
- return HTML(text, level=level, header=0)
#
# Metadata Keyword splitter utilities
More information about the CMF-checkins
mailing list