[CMF-checkins] CVS: CMF/CMFDefault - DiscussionTool.py:1.9.4.2 SyndicationTool.py:1.13.4.2

[Sidnei da Silva]

Update of /cvs-repository/CMF/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv28838/CMFDefault

Modified Files:
      Tag: CMF-1_3-branch
	DiscussionTool.py SyndicationTool.py 
Log Message:
Some whitespace cleaning, and a missing import


=== CMF/CMFDefault/DiscussionTool.py 1.9.4.1 => 1.9.4.2 ===
--- CMF/CMFDefault/DiscussionTool.py:1.9.4.1	Thu Aug  1 15:07:55 2002
+++ CMF/CMFDefault/DiscussionTool.py	Tue Dec 23 14:10:26 2003
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 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 discussion access tool.
 
@@ -51,7 +51,7 @@
 
     manage_options = (ActionProviderBase.manage_options +
                      ({ 'label' : 'Overview', 'action' : 'manage_overview' }
-                     , 
+                     ,
                      ) + SimpleItem.manage_options)
 
     #
@@ -97,11 +97,11 @@
         """
         if not self.isDiscussionAllowedFor( content ):
             raise DiscussionNotAllowed
-            
+
         talkback = getattr( content, 'talkback', None )
         if not talkback:
             talkback = self._createDiscussionFor( content )
-        
+
         return talkback
 
     security.declarePublic( 'isDiscussionAllowedFor' )


=== CMF/CMFDefault/SyndicationTool.py 1.13.4.1 => 1.13.4.2 ===
--- CMF/CMFDefault/SyndicationTool.py:1.13.4.1	Tue Feb 25 13:39:39 2003
+++ CMF/CMFDefault/SyndicationTool.py	Tue Dec 23 14:10:26 2003
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 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
-# 
+#
 ##############################################################################
 
 """ CMFDefault portal_syndication tool.
@@ -19,8 +19,8 @@
 import os
 import string
 
-from Globals import HTMLFile, package_home, InitializeClass 
-from AccessControl import ClassSecurityInfo, SecurityManagement
+from Globals import HTMLFile, package_home, InitializeClass
+from AccessControl import ClassSecurityInfo, SecurityManagement, Unauthorized
 from Acquisition import aq_base, aq_inner, aq_parent
 from DateTime import DateTime
 from OFS.SimpleItem import SimpleItem
@@ -55,7 +55,7 @@
                   , action=Expression(
                         text='string: ${folder_url}/synPropertiesForm')
                   , condition=Expression(
-                        text='python: folder is object') 
+                        text='python: folder is object')
                   , permissions=(ManageProperties,)
                   , category='folder'
                   , visible=1
@@ -63,7 +63,7 @@
                ]
 
     security = ClassSecurityInfo()
-    
+
     #Default Sitewide Values
     isAllowed = 0
     syUpdatePeriod = 'daily'
@@ -108,7 +108,7 @@
 
     security.declareProtected(ManagePortal, 'reportForm')
     reportForm = HTMLFile('synReports', _dtmldir)
-   
+
     security.declarePrivate('listActions')
     def listActions(self, info=None):
         """
@@ -340,13 +340,13 @@
             return syInfo.syUpdateFrequency
         else:
             return 'Syndication is not Allowed'
-     
+
     security.declarePublic('getUpdateBase')
     def getUpdateBase(self, obj=None):
         """
         Return the base date to be used with the update frequency
         and the update period to calculate a publishing schedule.
-        
+
         Note:  I'm not sure what's best here, creation date, last
         modified date (of the folder being syndicated) or some
         arbitrary date.  For now, I'm going to build a updateBase