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

merge tip
---

bb5a85feca1a6ed1aa7d18a04c0dfff3afa306c1
diff --cc lib/sqlalchemy/orm/attributes.py
index 2701fc879e,f91ff51f2f..a09463a4f2
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@@ -538,8 -482,9 +539,9 @@@ class MutableScalarAttributeImpl(Scalar
      """
  
      uses_objects = False
+     supports_population = True
  
 -    def __init__(self, class_, key, callable_,
 +    def __init__(self, class_, key, callable_, events,
                      class_manager, copy_function=None,
                      compare_function=None, **kwargs):
          super(ScalarAttributeImpl, self).__init__(
@@@ -604,8 -549,9 +606,9 @@@ class ScalarObjectAttributeImpl(ScalarA
  
      accepts_scalar_loader = False
      uses_objects = True
+     supports_population = True
  
 -    def __init__(self, class_, key, callable_, 
 +    def __init__(self, class_, key, callable_, events,
                      trackparent=False, extension=None, copy_function=None,
                      compare_function=None, **kwargs):
          super(ScalarObjectAttributeImpl, self).__init__(
@@@ -694,8 -640,9 +697,9 @@@ class CollectionAttributeImpl(Attribute
      """
      accepts_scalar_loader = False
      uses_objects = True
+     supports_population = True
  
 -    def __init__(self, class_, key, callable_, 
 +    def __init__(self, class_, key, callable_, events,
                      typecallable=None, trackparent=False, extension=None,
                      copy_function=None, compare_function=None, **kwargs):
          super(CollectionAttributeImpl, self).__init__(