[CMF-checkins] CVS: CMF/CMFCore - ActionInformation.py:1.12.10.1 ActionsTool.py:1.36.2.1 CachingPolicyManager.py:1.6.24.1 CatalogTool.py:1.38.2.1
Yvo Schubbe
schubbe@web.de
Sun, 12 Jan 2003 08:11:23 -0500
Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv3646/CMFCore
Modified Files:
Tag: yuppie-buglets1-branch
ActionInformation.py ActionsTool.py CachingPolicyManager.py
CatalogTool.py
Log Message:
use string methods:
- replaced string functions
- removed useless imports
- updated copyright statement
=== CMF/CMFCore/ActionInformation.py 1.12 => 1.12.10.1 ===
--- CMF/CMFCore/ActionInformation.py:1.12 Thu Oct 17 15:38:35 2002
+++ CMF/CMFCore/ActionInformation.py Sun Jan 12 08:11:21 2003
@@ -1,14 +1,15 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+# Copyright (c) 2002, 2003 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
""" Information about customizable actions.
@@ -17,14 +18,12 @@
from AccessControl import ClassSecurityInfo
from Globals import InitializeClass
-from Globals import DTMLFile
from Acquisition import aq_inner, aq_parent
from OFS.SimpleItem import SimpleItem
from Expression import Expression
from CMFCorePermissions import View
from CMFCorePermissions import ManagePortal
-from utils import _dtmldir
from utils import getToolByName
class ActionInformation( SimpleItem ):
=== CMF/CMFCore/ActionsTool.py 1.36 => 1.36.2.1 ===
--- CMF/CMFCore/ActionsTool.py:1.36 Mon Jan 6 15:35:28 2003
+++ CMF/CMFCore/ActionsTool.py Sun Jan 12 08:11:21 2003
@@ -1,14 +1,15 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+# Copyright (c) 2001-2003 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
""" Basic action list tool.
@@ -26,14 +27,11 @@
from ActionProviderBase import ActionProviderBase
from TypesTool import TypeInformation
from CMFCorePermissions import ManagePortal
-
-from utils import UniqueObject
-from utils import SimpleItemWithProperties
-from utils import _getAuthenticatedUser
from utils import _checkPermission
-from utils import getToolByName
from utils import _dtmldir
-from utils import cookString
+from utils import getToolByName
+from utils import SimpleItemWithProperties
+from utils import UniqueObject
from interfaces.portal_actions import portal_actions as IActionsTool
=== CMF/CMFCore/CachingPolicyManager.py 1.6 => 1.6.24.1 ===
--- CMF/CMFCore/CachingPolicyManager.py:1.6 Wed Apr 10 14:17:56 2002
+++ CMF/CMFCore/CachingPolicyManager.py Sun Jan 12 08:11:21 2003
@@ -1,6 +1,7 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001-2003 Zope Corporation and Contributors.
+# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
@@ -10,11 +11,11 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
-
"""Caching tool implementation.
$Id$
"""
+
from App.Common import rfc1123_date
from AccessControl import ClassSecurityInfo
@@ -38,8 +39,6 @@
from Products.CMFCore.CMFCorePermissions import ManagePortal
from Products.CMFCore.Expression import Expression
-from Products.CMFCore.utils import _getAuthenticatedUser
-from Products.CMFCore.utils import _checkPermission
from Products.CMFCore.utils import getToolByName
from Products.CMFCore.utils import _dtmldir
import time
=== CMF/CMFCore/CatalogTool.py 1.38 => 1.38.2.1 ===
--- CMF/CMFCore/CatalogTool.py:1.38 Mon Jan 6 15:35:28 2003
+++ CMF/CMFCore/CatalogTool.py Sun Jan 12 08:11:21 2003
@@ -1,35 +1,34 @@
##############################################################################
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+# Copyright (c) 2001-2003 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
""" Basic portal catalog.
$Id$
"""
-import os
-from utils import UniqueObject, _checkPermission, _getAuthenticatedUser
-from utils import getToolByName, _dtmldir
from Products.ZCatalog.ZCatalog import ZCatalog
from Globals import InitializeClass, package_home, DTMLFile
-import urllib
from DateTime import DateTime
-from string import join
from AccessControl.PermissionRole import rolesForPermissionOn
from AccessControl import ClassSecurityInfo
+from utils import _checkPermission
+from utils import _dtmldir
+from utils import _getAuthenticatedUser
from utils import _mergedLocalRoles
+from utils import UniqueObject
from ActionProviderBase import ActionProviderBase
from ActionInformation import ActionInformation
from Expression import Expression
-import os
from CMFCorePermissions import ManagePortal
from CMFCorePermissions import AccessInactivePortalContent
from Acquisition import aq_base
@@ -221,7 +220,7 @@
__call__ = searchResults
def __url(self, ob):
- return join(ob.getPhysicalPath(), '/')
+ return '/'.join( ob.getPhysicalPath() )
manage_catalogFind = DTMLFile( 'catalogFind', _dtmldir )