From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 30 May 2011 14:52:01 +0000 (-0400)
Subject: the "property" argument here is not used
X-Git-Tag: rel_0_7_1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e93195f5cf233fc3afe9fe9090531b6302e1740;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

the "property" argument here is not used
---

diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index ba262266b6..9ac7ed8e62 100644
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -1222,7 +1222,7 @@ def register_attribute_impl(class_, key,
     return manager[key]
 
 def register_descriptor(class_, key, comparator=None, 
-                                parententity=None, property_=None, doc=None):
+                                parententity=None, doc=None):
     manager = manager_of_class(class_)
 
     descriptor = InstrumentedAttribute(class_, key, comparator=comparator,
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index b4ef7235cd..dc12c105db 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -102,7 +102,6 @@ class ColumnProperty(StrategizedProperty):
             self.key, 
             comparator=self.comparator_factory(self, mapper), 
             parententity=mapper,
-            property_=self,
             doc=self.doc
             )
 
@@ -277,7 +276,6 @@ class RelationshipProperty(StrategizedProperty):
             self.key, 
             comparator=self.comparator_factory(self, mapper), 
             parententity=mapper,
-            property_=self,
             doc=self.doc,
             )