[CMF-checkins] CVS: Products/CMFDefault/skins/zpt_control - folder_bottom_control.py:1.2 folder_down_control.py:1.2 folder_top_control.py:1.2 folder_up_control.py:1.2

[Yvo Schubbe]

Update of /cvs-repository/Products/CMFDefault/skins/zpt_control
In directory cvs.zope.org:/tmp/cvs-serv5169/CMFDefault/skins/zpt_control

Modified Files:
	folder_bottom_control.py folder_down_control.py 
	folder_top_control.py folder_up_control.py 
Log Message:
some more BBB cleanup


=== Products/CMFDefault/skins/zpt_control/folder_bottom_control.py 1.1 => 1.2 ===
--- Products/CMFDefault/skins/zpt_control/folder_bottom_control.py:1.1	Tue Jul  6 16:34:16 2004
+++ Products/CMFDefault/skins/zpt_control/folder_bottom_control.py	Thu Jun 16 04:22:29 2005
@@ -2,11 +2,7 @@
 ##
 subset_ids = [ obj.getId() for obj in context.listFolderContents() ]
 try:
-    try:
-        attempt = context.moveObjectsToBottom(ids, subset_ids=subset_ids)
-    except TypeError:
-        # Zope 2.7.0
-        attempt = context.moveObjectsToBottom(ids)
+    attempt = context.moveObjectsToBottom(ids, subset_ids=subset_ids)
     if attempt:
         return context.setStatus( True, '%d item%s moved to bottom.' %
                                     ( attempt, (attempt != 1 and 's' or '') ) )


=== Products/CMFDefault/skins/zpt_control/folder_down_control.py 1.1 => 1.2 ===
--- Products/CMFDefault/skins/zpt_control/folder_down_control.py:1.1	Tue Jul  6 16:34:16 2004
+++ Products/CMFDefault/skins/zpt_control/folder_down_control.py	Thu Jun 16 04:22:29 2005
@@ -2,11 +2,7 @@
 ##
 subset_ids = [ obj.getId() for obj in context.listFolderContents() ]
 try:
-    try:
-        attempt = context.moveObjectsDown(ids, delta, subset_ids=subset_ids)
-    except TypeError:
-        # Zope 2.7.0
-        attempt = context.moveObjectsDown(ids, delta)
+    attempt = context.moveObjectsDown(ids, delta, subset_ids=subset_ids)
     if attempt:
         return context.setStatus( True, '%d item%s moved down.' %
                                     ( attempt, (attempt != 1 and 's' or '') ) )


=== Products/CMFDefault/skins/zpt_control/folder_top_control.py 1.1 => 1.2 ===
--- Products/CMFDefault/skins/zpt_control/folder_top_control.py:1.1	Tue Jul  6 16:34:16 2004
+++ Products/CMFDefault/skins/zpt_control/folder_top_control.py	Thu Jun 16 04:22:29 2005
@@ -2,11 +2,7 @@
 ##
 subset_ids = [ obj.getId() for obj in context.listFolderContents() ]
 try:
-    try:
-        attempt = context.moveObjectsToTop(ids, subset_ids=subset_ids)
-    except TypeError:
-        # Zope 2.7.0
-        attempt = context.moveObjectsToTop(ids)
+    attempt = context.moveObjectsToTop(ids, subset_ids=subset_ids)
     if attempt:
         return context.setStatus( True, '%d item%s moved to top.' %
                                     ( attempt, (attempt != 1 and 's' or '') ) )


=== Products/CMFDefault/skins/zpt_control/folder_up_control.py 1.1 => 1.2 ===
--- Products/CMFDefault/skins/zpt_control/folder_up_control.py:1.1	Tue Jul  6 16:34:16 2004
+++ Products/CMFDefault/skins/zpt_control/folder_up_control.py	Thu Jun 16 04:22:29 2005
@@ -2,11 +2,7 @@
 ##
 subset_ids = [ obj.getId() for obj in context.listFolderContents() ]
 try:
-    try:
-        attempt = context.moveObjectsUp(ids, delta, subset_ids=subset_ids)
-    except TypeError:
-        # Zope 2.7.0
-        attempt = context.moveObjectsUp(ids, delta)
+    attempt = context.moveObjectsUp(ids, delta, subset_ids=subset_ids)
     if attempt:
         return context.setStatus( True, '%d item%s moved up.' %
                                     ( attempt, (attempt != 1 and 's' or '') ) )