[CMF-checkins] CVS: CMF/CMFCore - MembershipTool.py:1.31 PortalContent.py:1.41 PortalObject.py:1.8

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv1617/CMFCore

Modified Files:
	MembershipTool.py PortalContent.py PortalObject.py 
Log Message:
Merged yuppie-buglets1-branch:
- Fixed buglets. (Collector #94 and #95)
- Removed string functions and useless imports.

=== CMF/CMFCore/MembershipTool.py 1.30 => 1.31 ===
--- CMF/CMFCore/MembershipTool.py:1.30	Mon Jan  6 15:35:50 2003
+++ CMF/CMFCore/MembershipTool.py	Tue Feb  4 17:17:40 2003
@@ -1,22 +1,21 @@
 ##############################################################################
 #
-# 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 membership tool.
 
 $Id$
 """
 
-from string import find
 from utils import UniqueObject, _getAuthenticatedUser, _checkPermission
 from utils import getToolByName, _dtmldir
 from OFS.SimpleItem import SimpleItem


=== CMF/CMFCore/PortalContent.py 1.40 => 1.41 ===
--- CMF/CMFCore/PortalContent.py:1.40	Mon Jan  6 15:36:04 2003
+++ CMF/CMFCore/PortalContent.py	Tue Feb  4 17:17:40 2003
@@ -1,22 +1,21 @@
 ##############################################################################
 #
-# 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
-# 
+#
 ##############################################################################
 """ PortalContent: Base class for all CMF content.
 
 $Id$
 """
 
-import string, urllib
-
 from DateTime import DateTime
 from Globals import InitializeClass
 from Acquisition import aq_base
@@ -27,7 +26,7 @@
 
 from interfaces.Contentish import Contentish
 from DynamicType import DynamicType
-from utils import _checkPermission, _getViewFor
+from utils import _getViewFor
 
 from CMFCatalogAware import CMFCatalogAware
 


=== CMF/CMFCore/PortalObject.py 1.7 => 1.8 ===
--- CMF/CMFCore/PortalObject.py:1.7	Sun Aug  4 19:32:36 2002
+++ CMF/CMFCore/PortalObject.py	Tue Feb  4 17:17:40 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
-# 
+#
 ##############################################################################
 """ PortalObject: The portal root object class
 
@@ -16,10 +17,16 @@
 """
 
 from Globals import InitializeClass
+
 from PortalFolder import PortalFolder
 from Skinnable import SkinnableObjectManager
-from CMFCorePermissions import *
-from utils import getToolByName
+from CMFCorePermissions import AddPortalMember
+from CMFCorePermissions import SetOwnPassword
+from CMFCorePermissions import SetOwnProperties
+from CMFCorePermissions import MailForgottenPassword
+from CMFCorePermissions import RequestReview
+from CMFCorePermissions import ReviewPortalContent
+from CMFCorePermissions import AccessFuturePortalContent
 
 PORTAL_SKINS_TOOL_ID = 'portal_skins'