[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/ - tweaking

Yvo Schubbe cvs-admin at zope.org
Wed May 8 15:08:38 UTC 2013


Log message for revision 130231:
  - tweaking

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml
  U   Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml	2013-05-08 10:11:09 UTC (rev 130230)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml	2013-05-08 15:08:34 UTC (rev 130231)
@@ -210,8 +210,8 @@
 
     <genericsetup:upgradeStep
         title="Upgrade actions tool"
-        description="Add 'change_password', 'members_register' and
-                    'syndication' action if missing."
+        description="Add 'change_password', 'members_register', 'search_form',
+                     'search' and 'syndication' action if missing."
         handler=".to23.upgrade_actions_tool"
         checker=".to23.check_actions_tool"
         />

Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py	2013-05-08 10:11:09 UTC (rev 130230)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py	2013-05-08 15:08:34 UTC (rev 130231)
@@ -112,24 +112,24 @@
     """
     atool = getToolByName(tool, 'portal_actions')
     try:
-        atool.user.change_password
-    except AttributeError:
+        atool['user']['change_password']
+    except KeyError:
         return True
     try:
-        atool['global'].members_register # 'global' is a reserved word in Python
-    except (KeyError, AttributeError):
+        atool['global']['members_register']
+    except KeyError:
         return True
     try:
-        atool['global'].search_form # 'global' is a reserved word in Python
-    except (KeyError, AttributeError):
+        atool['global']['search_form']
+    except KeyError:
         return True
     try:
-        atool['global'].search # 'global' is a reserved word in Python
-    except (KeyError, AttributeError):
+        atool['global']['search']
+    except KeyError:
         return True
     try:
-        atool['global'].syndication # 'global' is a reserved word in Python
-    except (KeyError, AttributeError):
+        atool['global']['syndication']
+    except KeyError:
         return True
     return False
 



More information about the checkins mailing list