diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2016-10-17 11:28:43 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ln3.zzzcomputing.com> | 2016-10-17 11:28:43 -0400 |
| commit | 4684cfb50836dc57107e49d4a78a8889c40d9662 (patch) | |
| tree | 942a437d62437988678ff5e09383d6c04814f005 /lib/sqlalchemy | |
| parent | d18221c542bf4d7381be2afdcd4c098698ff8eae (diff) | |
| parent | 665b92d83f3a93d8df54338a35f2b3e70e7f21a0 (diff) | |
| download | sqlalchemy-4684cfb50836dc57107e49d4a78a8889c40d9662.tar.gz | |
Merge "Check for __module__ not present in util.wrap_callable()"
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/util/langhelpers.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py index 4675f7cdb..f2ca80664 100644 --- a/lib/sqlalchemy/util/langhelpers.py +++ b/lib/sqlalchemy/util/langhelpers.py @@ -1398,7 +1398,8 @@ def wrap_callable(wrapper, fn): else: _f = wrapper _f.__name__ = fn.__class__.__name__ - _f.__module__ = fn.__module__ + if hasattr(fn, '__module__'): + _f.__module__ = fn.__module__ if hasattr(fn.__call__, '__doc__') and fn.__call__.__doc__: _f.__doc__ = fn.__call__.__doc__ |