From bf1d03a9e58a0256db0b1f7389e23a6d11c4a964 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 17 Feb 2016 15:21:00 -0500 Subject: - do the trailing comma logic of tuple repr() exactly --- lib/sqlalchemy/sql/util.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'lib/sqlalchemy/sql') diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py index 98d9cc944..d40bf48f1 100644 --- a/lib/sqlalchemy/sql/util.py +++ b/lib/sqlalchemy/sql/util.py @@ -311,8 +311,9 @@ class _repr_row(_repr_base): def __repr__(self): trunc = self.trunc - return "(%s)" % ( - "".join(trunc(value) + "," for value in self.row) + return "(%s%s)" % ( + ", ".join(trunc(value) for value in self.row), + "," if len(self.row) == 1 else "" ) @@ -391,8 +392,10 @@ class _repr_params(_repr_base): ) ) elif typ is self._TUPLE: - return "(%s)" % ( - "".join(trunc(value) + "," for value in params) + return "(%s%s)" % ( + ", ".join(trunc(value) for value in params), + "," if len(params) == 1 else "" + ) else: return "[%s]" % ( -- cgit v1.2.1