From ba67f7dbc5eb7a1ed2a3e1b56df72a837130f7bb Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 18 Oct 2012 12:29:41 -0400 Subject: - [bug] TypeDecorator now includes a generic repr() that works in terms of the "impl" type by default. This is a behavioral change for those TypeDecorator classes that specify a custom __init__ method; those types will need to re-define __repr__() if they need __repr__() to provide a faithful constructor representation. [ticket:2594] --- lib/sqlalchemy/types.py | 3 +++ lib/sqlalchemy/util/langhelpers.py | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py index ebcffca6e..e31cecfe2 100644 --- a/lib/sqlalchemy/types.py +++ b/lib/sqlalchemy/types.py @@ -817,6 +817,9 @@ class TypeDecorator(TypeEngine): """ return self.impl.compare_values(x, y) + def __repr__(self): + return util.generic_repr(self, to_inspect=self.impl) + class Variant(TypeDecorator): """A wrapping type that selects among a variety of diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py index 9761aeae9..55b78090a 100644 --- a/lib/sqlalchemy/util/langhelpers.py +++ b/lib/sqlalchemy/util/langhelpers.py @@ -281,14 +281,16 @@ def unbound_method_to_callable(func_or_cls): else: return func_or_cls -def generic_repr(obj, additional_kw=()): +def generic_repr(obj, additional_kw=(), to_inspect=None): """Produce a __repr__() based on direct association of the __init__() specification vs. same-named attributes present. """ + if to_inspect is None: + to_inspect = obj def genargs(): try: - (args, vargs, vkw, defaults) = inspect.getargspec(obj.__init__) + (args, vargs, vkw, defaults) = inspect.getargspec(to_inspect.__init__) except TypeError: return -- cgit v1.2.1