diff options
Diffstat (limited to 'lib/sqlalchemy/ext/associationproxy.py')
| -rw-r--r-- | lib/sqlalchemy/ext/associationproxy.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/ext/associationproxy.py b/lib/sqlalchemy/ext/associationproxy.py index 33eb5d240..315142d8e 100644 --- a/lib/sqlalchemy/ext/associationproxy.py +++ b/lib/sqlalchemy/ext/associationproxy.py @@ -487,7 +487,7 @@ class _AssociationList(object): raise TypeError("%s objects are unhashable" % type(self).__name__) for func_name, func in locals().items(): - if (callable(func) and func.func_name == func_name and + if (util.callable(func) and func.func_name == func_name and not func.__doc__ and hasattr(list, func_name)): func.__doc__ = getattr(list, func_name).__doc__ del func_name, func @@ -663,7 +663,7 @@ class _AssociationDict(object): raise TypeError("%s objects are unhashable" % type(self).__name__) for func_name, func in locals().items(): - if (callable(func) and func.func_name == func_name and + if (util.callable(func) and func.func_name == func_name and not func.__doc__ and hasattr(dict, func_name)): func.__doc__ = getattr(dict, func_name).__doc__ del func_name, func @@ -890,7 +890,7 @@ class _AssociationSet(object): raise TypeError("%s objects are unhashable" % type(self).__name__) for func_name, func in locals().items(): - if (callable(func) and func.func_name == func_name and + if (util.callable(func) and func.func_name == func_name and not func.__doc__ and hasattr(set, func_name)): func.__doc__ = getattr(set, func_name).__doc__ del func_name, func |