[Zope-Checkins] SVN: Zope/branches/2.13/ LP #1061247: Fix ZMI properties edit form for properties named `method`.

[Hano Schlichting]

Log message for revision 128119:
  LP #1061247: Fix ZMI properties edit form for properties named `method`.
  

Changed:
  U   Zope/branches/2.13/doc/CHANGES.rst
  U   Zope/branches/2.13/src/OFS/PropertyManager.py

-=-
Modified: Zope/branches/2.13/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.13/doc/CHANGES.rst	2012-10-21 20:05:22 UTC (rev 128118)
+++ Zope/branches/2.13/doc/CHANGES.rst	2012-10-21 20:12:27 UTC (rev 128119)
@@ -18,6 +18,8 @@
   - repoze.tm2 = 1.0
   - tempstorage = 2.12.2
 
+- LP #1061247: Fix ZMI properties edit form for properties named `method`.
+
 - LP #1058049: Fix support for zoperunner section in zope.conf.
 
 - Explicitly close all databases on shutdown, which ensures `Data.fs.index`

Modified: Zope/branches/2.13/src/OFS/PropertyManager.py
===================================================================
--- Zope/branches/2.13/src/OFS/PropertyManager.py	2012-10-21 20:05:22 UTC (rev 128118)
+++ Zope/branches/2.13/src/OFS/PropertyManager.py	2012-10-21 20:12:27 UTC (rev 128119)
@@ -299,9 +299,9 @@
             name = prop['id']
             if 'w' in prop.get('mode', 'wd'):
                 if prop['type'] == 'multiple selection':
-                    value = REQUEST.get(name, [])
+                    value = REQUEST.form.get(name, [])
                 else:
-                    value = REQUEST.get(name, '')
+                    value = REQUEST.form.get(name, '')
                 self._updateProperty(name, value)
         if REQUEST:
             message = "Saved changes."
@@ -316,8 +316,11 @@
         name=value parameters
         """
         if REQUEST is None:
-            props={}
-        else: props=REQUEST
+            props = {}
+        elif isinstance(REQUEST, dict):
+            props = REQUEST
+        else:
+            props = REQUEST.form
         if kw:
             for name, value in kw.items():
                 props[name]=value