summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ext/declarative/base.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/ext/declarative/base.py')
-rw-r--r--lib/sqlalchemy/ext/declarative/base.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/sqlalchemy/ext/declarative/base.py b/lib/sqlalchemy/ext/declarative/base.py
index 314e96cf1..9b72fe8ab 100644
--- a/lib/sqlalchemy/ext/declarative/base.py
+++ b/lib/sqlalchemy/ext/declarative/base.py
@@ -288,8 +288,7 @@ class _MapperConfig(object):
"on declarative mixin classes."
)
elif isinstance(obj, declarative_props):
- oldclassprop = isinstance(obj, util.classproperty)
- if not oldclassprop and obj._cascading:
+ if obj._cascading:
if name in dict_:
# unfortunately, while we can use the user-
# defined attribute here to allow a clean
@@ -309,11 +308,6 @@ class _MapperConfig(object):
] = ret = obj.__get__(obj, cls)
setattr(cls, name, ret)
else:
- if oldclassprop:
- util.warn_deprecated(
- "Use of sqlalchemy.util.classproperty on "
- "declarative classes is deprecated."
- )
# access attribute using normal class access
ret = getattr(cls, name)