From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 4 Mar 2013 00:17:03 +0000 (-0500)
Subject: fix non2.5 compat @property usage
X-Git-Tag: rel_0_8_0~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f014926f440e3ee93f26fd70a7dec759d34a188;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix non2.5 compat @property usage
---

diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index 37d222739c..9d977b2218 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -1130,15 +1130,13 @@ class RelationshipProperty(StrategizedProperty):
                               "cause dependency issues during flush"
                               % (self.key, self.parent, inheriting))
 
-    @property
-    def cascade(self):
+    def _get_cascade(self):
         """Return the current cascade setting for this
         :class:`.RelationshipProperty`.
         """
         return self._cascade
 
-    @cascade.setter
-    def cascade(self, cascade):
+    def _set_cascade(self, cascade):
         cascade = CascadeOptions(cascade)
         if 'mapper' in self.__dict__:
             self._check_cascade_settings(cascade)
@@ -1147,6 +1145,8 @@ class RelationshipProperty(StrategizedProperty):
         if self._dependency_processor:
             self._dependency_processor.cascade = cascade
 
+    cascade = property(_get_cascade, _set_cascade)
+
     def _check_cascade_settings(self, cascade):
         if cascade.delete_orphan and not self.single_parent \
             and (self.direction is MANYTOMANY or self.direction