[CMF-checkins] CVS: CMF/CMFDefault - DefaultWorkflow.py:1.16 DiscussionItem.py:1.30 DiscussionTool.py:1.13

[Yvo Schubbe]

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

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

=== CMF/CMFDefault/DefaultWorkflow.py 1.15 => 1.16 ===
--- CMF/CMFDefault/DefaultWorkflow.py:1.15	Mon Jan  6 15:41:34 2003
+++ CMF/CMFDefault/DefaultWorkflow.py	Tue Feb  4 17:31:59 2003
@@ -1,25 +1,26 @@
 ##############################################################################
 #
-# 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
-# 
+#
 ##############################################################################
-''' A simple submit/review/publish workflow.
+""" A simple submit/review/publish workflow.
 
 $Id$
-'''
+"""
 
-import sys
-import Globals
 from Acquisition import aq_base, aq_inner, aq_parent
 from AccessControl import ClassSecurityInfo
 from DateTime import DateTime
+from Globals import InitializeClass
+
 from Products.CMFCore.utils import _modifyPermissionMappings
 from Products.CMFCore.utils import _checkPermission
 from Products.CMFCore.utils import getToolByName
@@ -316,7 +317,7 @@
                   }
         return _modifyPermissionMappings(ob, new_map)
 
-Globals.InitializeClass(DefaultWorkflowDefinition)
+InitializeClass(DefaultWorkflowDefinition)
 
 addWorkflowClass(DefaultWorkflowDefinition)
 


=== CMF/CMFDefault/DiscussionItem.py 1.29 => 1.30 ===
--- CMF/CMFDefault/DiscussionItem.py:1.29	Mon Jan  6 15:41:34 2003
+++ CMF/CMFDefault/DiscussionItem.py	Tue Feb  4 17:31:59 2003
@@ -1,18 +1,22 @@
 ##############################################################################
 #
-# 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
-# 
+#
 ##############################################################################
+""" Discussion item portal type.
 
-import urllib, string
-from Globals import HTMLFile, Persistent, PersistentMapping, InitializeClass
+$Id$
+"""
+
+from Globals import Persistent, PersistentMapping, InitializeClass
 from AccessControl import ClassSecurityInfo
 from Acquisition import Implicit, aq_base, aq_inner, aq_parent
 from OFS.Traversable import Traversable


=== CMF/CMFDefault/DiscussionTool.py 1.12 => 1.13 ===
--- CMF/CMFDefault/DiscussionTool.py:1.12	Mon Jan  6 15:41:44 2003
+++ CMF/CMFDefault/DiscussionTool.py	Tue Feb  4 17:31:59 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 portal discussion access tool.