summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ext
diff options
context:
space:
mode:
authorJason Kirtland <jek@discorporate.us>2008-03-29 15:54:50 +0000
committerJason Kirtland <jek@discorporate.us>2008-03-29 15:54:50 +0000
commit4fef0a23a175e64475955a67dd557347cc99f19a (patch)
treef961af4b2443dd6d1d3cb168cc430fc46447a275 /lib/sqlalchemy/ext
parent99ed3922678ac050888dad7ca1c2a2195d65e2c0 (diff)
downloadsqlalchemy-4fef0a23a175e64475955a67dd557347cc99f19a.tar.gz
- Added PendingDeprecationWarning support
- Deprecation decorator is now a real decorator
Diffstat (limited to 'lib/sqlalchemy/ext')
-rw-r--r--lib/sqlalchemy/ext/assignmapper.py2
-rw-r--r--lib/sqlalchemy/ext/declarative.py5
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/sqlalchemy/ext/assignmapper.py b/lib/sqlalchemy/ext/assignmapper.py
index 0fe203f9d..5a28fbe68 100644
--- a/lib/sqlalchemy/ext/assignmapper.py
+++ b/lib/sqlalchemy/ext/assignmapper.py
@@ -69,4 +69,4 @@ def assign_mapper(ctx, class_, *args, **kwargs):
return m
assign_mapper = util.deprecated(
- assign_mapper, "assign_mapper is deprecated. Use scoped_session() instead.")
+ "assign_mapper is deprecated. Use scoped_session() instead.")(assign_mapper)
diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index d8576d79b..04203f5bb 100644
--- a/lib/sqlalchemy/ext/declarative.py
+++ b/lib/sqlalchemy/ext/declarative.py
@@ -251,10 +251,9 @@ def _deferred_relation(cls, prop):
return prop
def declared_synonym(prop, name):
- """deprecated. use synonym(name, descriptor=prop)."""
-
+ """Deprecated. Use synonym(name, descriptor=prop)."""
return _orm_synonym(name, descriptor=prop)
-declared_synonym = util.deprecated(declared_synonym)
+declared_synonym = util.deprecated(None, False)(declared_synonym)
def synonym_for(name, map_column=False):
"""Decorator, make a Python @property a query synonym for a column.