[Archetypes-checkins] r7205 - Archetypes/branches/1.4

[alecm <svn...@pl...>]

Author: alecm
Date: Mon Nov 27 18:37:19 2006
New Revision: 7205

Modified:
   Archetypes/branches/1.4/AllowedTypesByIface.py
   Archetypes/branches/1.4/HISTORY.txt
Log:
Add a try: finally: clause in AllowedTypesByIfaceMixin when deleting the typeinfo "temporarily" Fixes #5314 (plone tracker)


Modified: Archetypes/branches/1.4/AllowedTypesByIface.py
==============================================================================
--- Archetypes/branches/1.4/AllowedTypesByIface.py	(original)
+++ Archetypes/branches/1.4/AllowedTypesByIface.py	Mon Nov 27 18:37:19 2006
@@ -135,6 +135,8 @@
         tmp_name = '%s_TMP' % self.portal_type
         ti = pt.getTypeInfo(self.portal_type)
         pt.manage_delObjects([self.portal_type])
-        value = BaseFolder._verifyObjectPaste(self, object, validate_src)
-        pt._setObject(self.portal_type, ti)
+        try:
+            value = BaseFolder._verifyObjectPaste(self, object, validate_src)
+        finally:
+            pt._setObject(self.portal_type, ti)
         return value

Modified: Archetypes/branches/1.4/HISTORY.txt
==============================================================================
--- Archetypes/branches/1.4/HISTORY.txt	(original)
+++ Archetypes/branches/1.4/HISTORY.txt	Mon Nov 27 18:37:19 2006
@@ -1,6 +1,10 @@
 Unreleased
 ==========
 
+  * Add a try: finally: clause in AllowedTypesByIfaceMixin when deleting
+    the typeinfo "temporarily" Fixes http://dev.plone.org/plone/ticket/5314
+    [alecm]
+
   * Silenced more catalog unindexing log error messages by checking if
     an object exists in the catalog before uncataloging.
     [rocky]
@@ -9,7 +13,7 @@
     "documentFirstHeading" class applied.
     http://dev.plone.org/plone/ticket/5963
     [spliter]
-  
+
   * Fixed #5929. UID catalog rebuild broke path convention.
     http://dev.plone.org/plone/ticket/5929.
     [hannosch]
@@ -1746,4 +1750,5 @@
    [tiran]
 
  * Fixed [ 988898 ] Don't swallow ConflictError (SQL missing)
-   [tiran]
\ No newline at end of file
+   [tiran]
+