[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py - import directly from zope.sequencesort

Yvo Schubbe y.2010 at wcm-solutions.de
Fri Jun 18 06:13:41 EDT 2010


Log message for revision 113614:
  - import directly from zope.sequencesort

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py	2010-06-18 09:55:31 UTC (rev 113613)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py	2010-06-18 10:13:40 UTC (rev 113614)
@@ -17,17 +17,15 @@
 
 import urllib
 
-from DocumentTemplate import sequence
-from ZTUtils import Batch
-from ZTUtils import LazyFilter
-
+from five.formlib.formbase import PageForm
+from zope.formlib import form
 from zope import schema
 from zope.schema.vocabulary import SimpleTerm
 from zope.schema.vocabulary import SimpleVocabulary
+from zope.sequencesort.ssort import sort
+from ZTUtils import Batch
+from ZTUtils import LazyFilter
 
-from five.formlib.formbase import PageForm
-from zope.formlib import form
-
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 
 from Products.CMFCore.interfaces import IDynamicType
@@ -389,9 +387,8 @@
     def _get_items(self):
         key, reverse = self._get_sorting()
         items = self.contents
-        return sequence.sort(items,
-                             ((key, 'cmp', reverse and 'desc' or 'asc'),))
-    
+        return sort(items, ((key, 'cmp', reverse and 'desc' or 'asc'),))
+
     @memoize
     def listBatchItems(self):
         """Return the widgets for the form in the interface field order"""
@@ -602,8 +599,8 @@
         self.context.setDefaultSorting(key, reverse)
         self.status = _(u"Sort order changed")
         return self._setRedirect('portal_types', 'object/new_contents')
-        
 
+
 class FolderView(BatchViewBase):
 
     """View for IFolderish.
@@ -613,8 +610,7 @@
     def _get_items(self):
         (key, reverse) = self.context.getDefaultSorting()
         items = self.context.contentValues()
-        items = sequence.sort(items,
-                              ((key, 'cmp', reverse and 'desc' or 'asc'),))
+        items = sort(items, ((key, 'cmp', reverse and 'desc' or 'asc'),))
         return LazyFilter(items, skip='View')
 
     @memoize



More information about the checkins mailing list