diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 16 | ||||
| -rw-r--r-- | lib/sqlalchemy/test/testing.py | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 76f3617a2..b87bdc890 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -932,7 +932,7 @@ class Mapper(object): else: return None - @util.deprecated('0.7', + @util.deprecated('0.6.4', 'Call to deprecated function mapper._get_col_to_pr' 'op(). Use mapper.get_property_by_column()') def _get_col_to_prop(self, col): diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 5235a696b..1b1cfee8a 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -1270,8 +1270,10 @@ class ClauseElement(Visitable): else: return None - @util.deprecated("0.7", "Only SQL expressions which subclass :class:`.Executable` " - "may provide the :func:`.execute` method.") + @util.pending_deprecation('0.7', + 'Only SQL expressions which subclass ' + ':class:`.Executable` may provide the ' + ':func:`.execute` method.') def execute(self, *multiparams, **params): """Compile and execute this :class:`ClauseElement`. @@ -1287,11 +1289,13 @@ class ClauseElement(Visitable): raise exc.UnboundExecutionError(msg) return e._execute_clauseelement(self, multiparams, params) - @util.deprecated("0.7", "Only SQL expressions which subclass :class:`.Executable` " - "may provide the :func:`.scalar` method.") + @util.pending_deprecation('0.7', + 'Only SQL expressions which subclass ' + ':class:`.Executable` may provide the ' + ':func:`.scalar` method.') def scalar(self, *multiparams, **params): - """Compile and execute this :class:`ClauseElement`, returning the - result's scalar representation. + """Compile and execute this :class:`ClauseElement`, returning + the result's scalar representation. """ return self.execute(*multiparams, **params).scalar() diff --git a/lib/sqlalchemy/test/testing.py b/lib/sqlalchemy/test/testing.py index d09621dc8..41ba3038f 100644 --- a/lib/sqlalchemy/test/testing.py +++ b/lib/sqlalchemy/test/testing.py @@ -436,8 +436,6 @@ def resetwarnings(): # warnings.simplefilter('error') - if sys.version_info < (2, 4): - warnings.filterwarnings('ignore', category=FutureWarning) def global_cleanup_assertions(): """Check things that have to be finalized at the end of a test suite. |