From 8fc5005dfe3eb66a46470ad8a8c7b95fc4d6bdca Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 6 Aug 2009 21:11:27 +0000
Subject: merge 0.6 series to trunk.

---
 lib/sqlalchemy/sql/visitors.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'lib/sqlalchemy/sql/visitors.py')

diff --git a/lib/sqlalchemy/sql/visitors.py b/lib/sqlalchemy/sql/visitors.py
index a5bd497ae..4471d4fb0 100644
--- a/lib/sqlalchemy/sql/visitors.py
+++ b/lib/sqlalchemy/sql/visitors.py
@@ -34,13 +34,10 @@ class VisitableType(type):
     """
     
     def __init__(cls, clsname, bases, clsdict):
-        if cls.__name__ == 'Visitable':
+        if cls.__name__ == 'Visitable' or not hasattr(cls, '__visit_name__'):
             super(VisitableType, cls).__init__(clsname, bases, clsdict)
             return
         
-        assert hasattr(cls, '__visit_name__'), "`Visitable` descendants " \
-                                               "should define `__visit_name__`"
-        
         # set up an optimized visit dispatch function
         # for use by the compiler
         visit_name = cls.__visit_name__
-- 
cgit v1.2.1