the "property" argument here is not used

diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index ba262266b6a9f19f5db26cb72b1a45770eaea3e1..9ac7ed8e62bb5183c2bde519d0e0fcd47be52968 100644 (file)
--- 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 b4ef7235cdf4ded1221e565ba9d2827b13f5217d..dc12c105db9257cac7b68d5964b354a88c9b79ee 100644 (file)
--- 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,
             )