diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-10-11 20:08:27 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-10-11 20:08:27 -0400 |
| commit | f7b119705aef79e7e8957ae6eb654b9057cea45f (patch) | |
| tree | dfe707eaf27538c82aa5504584941dc4b46ce933 /lib/sqlalchemy/util/langhelpers.py | |
| parent | 216b88894d95c17a1bd18b9d574e96530fb6f1cb (diff) | |
| parent | 690532131d8ce8250c62f1d3e27405902df03e70 (diff) | |
| download | sqlalchemy-f7b119705aef79e7e8957ae6eb654b9057cea45f.tar.gz | |
Merge remote-tracking branch 'origin/pr/140' into pr140
Diffstat (limited to 'lib/sqlalchemy/util/langhelpers.py')
| -rw-r--r-- | lib/sqlalchemy/util/langhelpers.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py index 95369783d..f6da9a87d 100644 --- a/lib/sqlalchemy/util/langhelpers.py +++ b/lib/sqlalchemy/util/langhelpers.py @@ -490,7 +490,7 @@ def generic_repr(obj, additional_kw=(), to_inspect=None, omit_kwarg=()): val = getattr(obj, arg, missing) if val is not missing and val != defval: output.append('%s=%r' % (arg, val)) - except: + except Exception: pass if additional_kw: @@ -499,7 +499,7 @@ def generic_repr(obj, additional_kw=(), to_inspect=None, omit_kwarg=()): val = getattr(obj, arg, missing) if val is not missing and val != defval: output.append('%s=%r' % (arg, val)) - except: + except Exception: pass return "%s(%s)" % (obj.__class__.__name__, ", ".join(output)) @@ -1198,7 +1198,7 @@ def warn_exception(func, *args, **kwargs): """ try: return func(*args, **kwargs) - except: + except Exception: warn("%s('%s') ignored" % sys.exc_info()[0:2]) |