Commit b6a28286 authored by Arnaud Fontaine's avatar Arnaud Fontaine

ZODB Components: Avoid masking exceptions as much as possible when loading a Component.

parent a6699b9e
...@@ -193,13 +193,23 @@ def generatePortalTypeClass(site, portal_type_name): ...@@ -193,13 +193,23 @@ def generatePortalTypeClass(site, portal_type_name):
type_class_namespace = document_class_registry.get(type_class, '') type_class_namespace = document_class_registry.get(type_class, '')
if not (type_class_namespace.startswith('Products.ERP5Type') or if not (type_class_namespace.startswith('Products.ERP5Type') or
portal_type_name in core_portal_type_class_dict): portal_type_name in core_portal_type_class_dict):
try: import erp5.component.document
klass = getattr(__import__('erp5.component.document.' + type_class, module_fullname = 'erp5.component.document.' + type_class
fromlist=['erp5.component.document'], module_loader = erp5.component.document.find_module(module_fullname)
level=0), if module_loader is not None:
type_class) try:
except (ImportError, AttributeError): module = module_loader.load_module(module_fullname)
pass except ImportError, e:
LOG("ERP5Type.dynamic", WARNING,
"Could not load Component module '%s': %s" % (module_fullname, e))
else:
try:
klass = getattr(module, type_class)
except AttributeError:
LOG("ERP5Type.dynamic", WARNING,
"Could not get class '%s' in Component module '%s'" % \
(type_class,
module_fullname))
if klass is None: if klass is None:
type_class_path = document_class_registry.get(type_class) type_class_path = document_class_registry.get(type_class)
......
...@@ -70,12 +70,10 @@ if 1: ...@@ -70,12 +70,10 @@ if 1:
from kw. from kw.
""" """
try: try:
f = getattr(__import__('erp5.component.extension.' + self._module, component_module = __import__('erp5.component.extension.' + self._module,
fromlist=['erp5.component.extension'], fromlist=['erp5.component.extension'],
level=0), level=0)
self._function) except ImportError:
except (ImportError, AttributeError):
import Globals # for data import Globals # for data
filePath = self.filepath() filePath = self.filepath()
...@@ -93,6 +91,9 @@ if 1: ...@@ -93,6 +91,9 @@ if 1:
self.reloadIfChanged() self.reloadIfChanged()
f = None f = None
else:
f = getattr(component_module, self._function)
_v_f = getattr(self, '_v_f', None) _v_f = getattr(self, '_v_f', None)
if not _v_f or (f and f is not _v_f): if not _v_f or (f and f is not _v_f):
f = self.getFunction(f=f) f = self.getFunction(f=f)
......
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