[CMF-checkins] CVS: CMF/CMFTopic - AbstractCriterion.py:1.6.18.1 DateCriteria.py:1.7.18.1 ListCriterion.py:1.12.18.1 SimpleIntCriterion.py:1.10.18.1 SimpleStringCriterion.py:1.10.18.1 SortCriterion.py:1.6.18.1 Topic.py:1.32.4.2 TopicPermissions.py:1.5.18.1 __init__.py:1.13.18.1 version.txt:1.7.18.6

Sidnei da Silva sidnei at awkly.org
Thu Apr 22 13:48:30 EDT 2004


Update of /cvs-repository/CMF/CMFTopic
In directory cvs.zope.org:/tmp/cvs-serv30596/CMFTopic

Modified Files:
      Tag: CMF-1_4-branch
	AbstractCriterion.py DateCriteria.py ListCriterion.py 
	SimpleIntCriterion.py SimpleStringCriterion.py 
	SortCriterion.py Topic.py TopicPermissions.py __init__.py 
	version.txt 
Log Message:
Fix version.txt to right version. Run reindent.py for removing extra tabs and whitespaces


=== CMF/CMFTopic/AbstractCriterion.py 1.6 => 1.6.18.1 ===
--- CMF/CMFTopic/AbstractCriterion.py:1.6	Thu Aug  1 15:05:13 2002
+++ CMF/CMFTopic/AbstractCriterion.py	Thu Apr 22 13:47:55 2004
@@ -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
-# 
+#
 ##############################################################################
 """ Home of the abstract Criterion base class.
 
@@ -66,7 +66,7 @@
             attribute.
         """
         return self.meta_type
-    
+
     security.declareProtected( AccessContentsInformation, 'Field' )
     def Field( self ):
         """
@@ -84,7 +84,7 @@
         """
         strip = string.strip
         split = string.split
-        
+
         return string.join(             # Sew a string together after we:
             filter(operator.truth,      # Filter out empty lines
                    map(strip,           # strip whitespace off each line


=== CMF/CMFTopic/DateCriteria.py 1.7 => 1.7.18.1 ===
--- CMF/CMFTopic/DateCriteria.py:1.7	Sat Aug  3 22:31:31 2002
+++ CMF/CMFTopic/DateCriteria.py	Thu Apr 22 13:47:55 2004
@@ -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
-# 
+#
 ##############################################################################
 """ Various date criteria
 


=== CMF/CMFTopic/ListCriterion.py 1.12 => 1.12.18.1 ===
--- CMF/CMFTopic/ListCriterion.py:1.12	Sat Aug  3 22:31:31 2002
+++ CMF/CMFTopic/ListCriterion.py	Thu Apr 22 13:47:55 2004
@@ -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
-# 
+#
 ##############################################################################
 """ List Criterion: A criterion that is a list
 
@@ -89,7 +89,7 @@
         # filter out empty strings
         result = []
 
-        value = tuple( filter( None, self.value ) ) 
+        value = tuple( filter( None, self.value ) )
         if not value:
             return ()
         result.append( ( self.field, self.value ), )


=== CMF/CMFTopic/SimpleIntCriterion.py 1.10 => 1.10.18.1 ===
--- CMF/CMFTopic/SimpleIntCriterion.py:1.10	Sat Aug  3 22:31:31 2002
+++ CMF/CMFTopic/SimpleIntCriterion.py	Thu Apr 22 13:47:55 2004
@@ -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
-# 
+#
 ##############################################################################
 """ Simple int-matching criterion
 
@@ -28,7 +28,7 @@
 class SimpleIntCriterion( AbstractCriterion ):
     """
         Represent a simple field-match for an integer value, including
-        catalog range searches.    
+        catalog range searches.
     """
     __implements__ = ( Criterion, )
 
@@ -82,7 +82,7 @@
         from string import strip, split # XXX: WAAAA! 2.3 compatibility
 
         if type( value ) == type( '' ):
-           value = strip( value )
+            value = strip( value )
 
         if not value:
             # An empty string was passed in, which evals to None


=== CMF/CMFTopic/SimpleStringCriterion.py 1.10 => 1.10.18.1 ===
--- CMF/CMFTopic/SimpleStringCriterion.py:1.10	Sat Aug  3 22:31:31 2002
+++ CMF/CMFTopic/SimpleStringCriterion.py	Thu Apr 22 13:47:55 2004
@@ -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
-# 
+#
 ##############################################################################
 """ Simple string-matching criterion class
 
@@ -41,21 +41,21 @@
         self.id = id
         self.field = field
         self.value = ''
-        
+
     security.declareProtected( TopicPermissions.ChangeTopics, 'getEditForm' )
     def getEditForm( self ):
         """
             Return the skinned name of the edit form.
         """
         return 'ssc_edit'
-    
+
     security.declareProtected( TopicPermissions.ChangeTopics, 'edit' )
     def edit( self, value ):
         """
             Update the value we are to match up against.
         """
         self.value = str( value )
-    
+
     security.declareProtected(View, 'getCriteriaItems')
     def getCriteriaItems( self ):
         """


=== CMF/CMFTopic/SortCriterion.py 1.6 => 1.6.18.1 ===
--- CMF/CMFTopic/SortCriterion.py:1.6	Sat Aug  3 22:31:31 2002
+++ CMF/CMFTopic/SortCriterion.py	Thu Apr 22 13:47:56 2004
@@ -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
-# 
+#
 ##############################################################################
 """ Allow topic to specify sorting.
 
@@ -44,7 +44,7 @@
         self.id = id
         self.index = index
         self.reversed = 0
-        
+
     # inherit permissions
     def Field( self ):
         """
@@ -59,14 +59,14 @@
             used to edit this kind of criterion.
         """
         return 'sort_edit'
-    
+
     security.declareProtected( TopicPermissions.ChangeTopics, 'edit' )
     def edit( self, reversed ):
         """
             Update the value we are to match up against.
         """
         self.reversed = not not reversed
-    
+
     security.declareProtected(View, 'getCriteriaItems')
     def getCriteriaItems( self ):
         """


=== CMF/CMFTopic/Topic.py 1.32.4.1 => 1.32.4.2 ===
--- CMF/CMFTopic/Topic.py:1.32.4.1	Fri May  9 17:31:40 2003
+++ CMF/CMFTopic/Topic.py	Thu Apr 22 13:47:56 2004
@@ -136,7 +136,7 @@
         for mt in self._criteriaTypes:
             result.append( mt.meta_type )
         return tuple( result )
- 
+
     security.declareProtected(ChangeTopics, 'listCriteria')
     def listCriteria( self ):
         """
@@ -153,7 +153,7 @@
                 'name': ct.meta_type,
                 } )
         return out
-    
+
     security.declareProtected(ChangeTopics, 'listAvailableFields')
     def listAvailableFields( self ):
         """
@@ -184,7 +184,7 @@
         if title is not None:
             self.title = title
         self.description = description
-        
+
     security.declareProtected(View, 'buildQuery')
     def buildQuery( self ):
         """
@@ -204,9 +204,9 @@
         for criterion in self.listCriteria():
             for key, value in criterion.getCriteriaItems():
                 result[ key ] = value
-        
+
         return result
-    
+
     security.declareProtected(View, 'queryCatalog')
     def queryCatalog( self, REQUEST=None, **kw ):
         """
@@ -233,7 +233,7 @@
         if crit is None:
             # No criteria type matched passed in value
             raise NameError, 'Unknown Criterion Type: %s' % criterion_type
-        
+
         self._setObject( newid, crit )
 
     # Backwards compatibility (deprecated)


=== CMF/CMFTopic/TopicPermissions.py 1.5 => 1.5.18.1 ===
--- CMF/CMFTopic/TopicPermissions.py:1.5	Thu Aug  1 15:05:13 2002
+++ CMF/CMFTopic/TopicPermissions.py	Thu Apr 22 13:47:56 2004
@@ -24,4 +24,3 @@
 # Set up default roles for permissions
 setDefaultRoles(AddTopics, ('Manager',))
 setDefaultRoles(ChangeTopics, ('Manager', 'Owner',))
-


=== CMF/CMFTopic/__init__.py 1.13 => 1.13.18.1 ===
--- CMF/CMFTopic/__init__.py:1.13	Thu Aug  1 15:05:13 2002
+++ CMF/CMFTopic/__init__.py	Thu Apr 22 13:47:56 2004
@@ -1,20 +1,20 @@
 ##############################################################################
 #
 # 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
-# 
+#
 ##############################################################################
 """ Topic: Canned catalog queries
 
 $Id$
 """
- 
+
 import TopicPermissions
 import Topic
 import SimpleStringCriterion


=== CMF/CMFTopic/version.txt 1.7.18.5 => 1.7.18.6 ===
--- CMF/CMFTopic/version.txt:1.7.18.5	Thu Feb  5 01:06:35 2004
+++ CMF/CMFTopic/version.txt	Thu Apr 22 13:47:56 2004
@@ -1 +1,2 @@
-CMF-1.4.3-rc1
+CMF-1.4.3
+




More information about the CMF-checkins mailing list