[Checkins]
SVN: zope.generic/trunk/src/zope/generic/configuration/adapter.py
remove savepoint and rollback
Dominik Huber
dominik.huber at perse.ch
Fri Jul 28 05:42:43 EDT 2006
Log message for revision 69282:
remove savepoint and rollback
Changed:
U zope.generic/trunk/src/zope/generic/configuration/adapter.py
-=-
Modified: zope.generic/trunk/src/zope/generic/configuration/adapter.py
===================================================================
--- zope.generic/trunk/src/zope/generic/configuration/adapter.py 2006-07-28 07:59:41 UTC (rev 69281)
+++ zope.generic/trunk/src/zope/generic/configuration/adapter.py 2006-07-28 09:42:42 UTC (rev 69282)
@@ -102,37 +102,32 @@
updated_data = {}
errors = []
- savepoint = transaction.savepoint()
- try:
- for name in keyface:
- field = keyface[name]
+ for name in keyface:
+ field = keyface[name]
- # readonly attribute cannot be updated
- if field.readonly:
- raise ValueError(name, 'Data is readonly.')
+ # readonly attribute cannot be updated
+ if field.readonly:
+ raise ValueError(name, 'Data is readonly.')
- if isconfig:
- value = getattr(data, name, field.missing_value)
- # assume dict
- else:
- try:
- value = data[name]
- except KeyError:
- continue
-
- if value != getattr(current_config, name, field.missing_value):
- setattr(current_config, name, value)
- updated_data[name] = value
+ if isconfig:
+ value = getattr(data, name, field.missing_value)
+ # assume dict
+ else:
+ try:
+ value = data[name]
+ except KeyError:
+ continue
+
+ if value != getattr(current_config, name, field.missing_value):
+ setattr(current_config, name, value)
+ updated_data[name] = value
- # notify update
- parent = self.__parent__
- if updated_data and ILocation.providedBy(parent) and parent.__parent__ is not None:
- notify(ObjectConfiguredEvent(parent,
- Configuration(keyface, updated_data)))
+ # notify update
+ parent = self.__parent__
+ if updated_data and ILocation.providedBy(parent) and parent.__parent__ is not None:
+ notify(ObjectConfiguredEvent(parent,
+ Configuration(keyface, updated_data)))
- except:
- savepoint.rollback()
- raise
def __setitem__(self, keyface, value):
# preconditions
More information about the Checkins
mailing list