From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 15 Aug 2010 00:55:47 +0000 (-0400)
Subject: merge tip
X-Git-Tag: rel_0_7b1~252^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb15c61cc0a6ce128e6ef96d0977eaeb7d8437af;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge tip
---

fb15c61cc0a6ce128e6ef96d0977eaeb7d8437af
diff --cc lib/sqlalchemy/orm/attributes.py
index 01f697edd6,800f3889f7..0ee06cca74
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@@ -1439,8 -1465,9 +1448,9 @@@ def register_attribute_impl(class_, key
      manager[key].impl = impl
      
      manager.post_configure_attribute(key)
+ 
      
 -def register_descriptor(class_, key, proxy_property=None, comparator=None, 
 +def register_descriptor(class_, key, comparator=None, 
                                  parententity=None, property_=None, doc=None):
      manager = manager_of_class(class_)