diff options
Diffstat (limited to 'lib/sqlalchemy/ext')
| -rw-r--r-- | lib/sqlalchemy/ext/declarative/__init__.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/ext/declarative/api.py | 26 | ||||
| -rw-r--r-- | lib/sqlalchemy/ext/declarative/base.py | 8 |
3 files changed, 1 insertions, 35 deletions
diff --git a/lib/sqlalchemy/ext/declarative/__init__.py b/lib/sqlalchemy/ext/declarative/__init__.py index d79dd1960..6dc4d23c8 100644 --- a/lib/sqlalchemy/ext/declarative/__init__.py +++ b/lib/sqlalchemy/ext/declarative/__init__.py @@ -7,7 +7,6 @@ from .api import AbstractConcreteBase from .api import as_declarative -from .api import comparable_using from .api import ConcreteBase from .api import declarative_base from .api import DeclarativeMeta @@ -22,7 +21,6 @@ __all__ = [ "declarative_base", "synonym_for", "has_inherited_table", - "comparable_using", "instrument_declarative", "declared_attr", "as_declarative", diff --git a/lib/sqlalchemy/ext/declarative/api.py b/lib/sqlalchemy/ext/declarative/api.py index ca7d3a022..b1574339d 100644 --- a/lib/sqlalchemy/ext/declarative/api.py +++ b/lib/sqlalchemy/ext/declarative/api.py @@ -20,7 +20,6 @@ from ... import exc from ... import inspection from ... import util from ...orm import attributes -from ...orm import comparable_property from ...orm import exc as orm_exc from ...orm import interfaces from ...orm import relationships @@ -122,31 +121,6 @@ def synonym_for(name, map_column=False): return decorate -def comparable_using(comparator_factory): - """Decorator, allow a Python @property to be used in query criteria. - - This is a decorator front end to - :func:`~sqlalchemy.orm.comparable_property` that passes - through the comparator_factory and the function being decorated:: - - @comparable_using(MyComparatorType) - @property - def prop(self): - return 'special sauce' - - The regular ``comparable_property()`` is also usable directly in a - declarative setting and may be convenient for read/write properties:: - - prop = comparable_property(MyComparatorType) - - """ - - def decorate(fn): - return comparable_property(comparator_factory, fn) - - return decorate - - class declared_attr(interfaces._MappedAttribute, property): """Mark a class-level method as representing the definition of a mapped property or special declarative member name. 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) |