From a04c4dc42cf4c3c35163b59a78f05efe47547dc0 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 29 Jan 2010 02:01:11 +0000 Subject: - inline some code and turn some instance-level defaults into class level --- lib/sqlalchemy/sql/expression.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib/sqlalchemy/sql') diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 5edb6e47f..f0f55ed72 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -3925,7 +3925,8 @@ class _UpdateBase(_Executable, ClauseElement): if m: self._returning = kwargs.pop(k) util.warn_deprecated( - "The %r argument is deprecated. Please use statement.returning(col1, col2, ...)" % k + "The %r argument is deprecated. Please " + "use statement.returning(col1, col2, ...)" % k ) return kwargs @@ -4007,6 +4008,8 @@ class Insert(_ValuesBase): _prefixes = () + kwargs = util.frozendict() + def __init__(self, table, values=None, @@ -4022,8 +4025,9 @@ class Insert(_ValuesBase): self._returning = returning if prefixes: self._prefixes = tuple([_literal_as_text(p) for p in prefixes]) - - self.kwargs = self._process_deprecated_kw(kwargs) + + if kwargs: + self.kwargs = self._process_deprecated_kw(kwargs) def get_children(self, **kwargs): if self.select is not None: -- cgit v1.2.1