Critical bug-fix class_traits interaction.

This bug could cause an attribute add to fail, when it shouldn't. A check for the Disallow trait fixes that.
enthought · Dec 11, 2012 · 25755e2 · 25755e2
1 parent 0c22537
commit 25755e2
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/enaml/core/declarative.py b/enaml/core/declarative.py
@@ -298,11 +298,12 @@ class and is not a user defined attribute, an exception will be
         class_traits = cls.__class_traits__
         if name in class_traits:
             trait_type = class_traits[name].trait_type
-            if not isinstance(trait_type, (UserAttribute, UserEvent)):
-                msg = ("can't add '%s' attribute. The '%s' attribute on "
-                       "enamldef '%s.%s' already exists.")
-                items = (name, name, cls.__module__, cls.__name__)
-                raise TypeError(msg % items)
+            if trait_type is not Disallow:
+                if not isinstance(trait_type, (UserAttribute, UserEvent)):
+                    msg = ("can't add '%s' attribute. The '%s' attribute on "
+                           "enamldef '%s.%s' already exists.")
+                    items = (name, name, cls.__module__, cls.__name__)
+                    raise TypeError(msg % items)
 
         trait_cls = UserEvent if is_event else UserAttribute
         try: