Commit b3886d74 authored by 's avatar

Merged fix to handle property sheets without an xml_namespace method

parent 041d9b1b
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
############################################################################## ##############################################################################
"""Property sheets""" """Property sheets"""
__version__='$Revision: 1.59 $'[11:-2] __version__='$Revision: 1.60 $'[11:-2]
import time, string, App.Management, Globals import time, string, App.Management, Globals
from ZPublisher.Converters import type_converters from ZPublisher.Converters import type_converters
...@@ -662,7 +662,8 @@ class PropertySheets(Traversable, Implicit, App.Management.Tabs): ...@@ -662,7 +662,8 @@ class PropertySheets(Traversable, Implicit, App.Management.Tabs):
def get(self, name, default=None): def get(self, name, default=None):
for propset in self.__propsets__(): for propset in self.__propsets__():
if propset.getId()==name or propset.xml_namespace()==name: if propset.id==name or (hasattr(propset, 'xml_namespace') and \
propset.xml_namespace()==name):
return propset.__of__(self) return propset.__of__(self)
return default return default
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment