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/sql | |
| 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/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/elements.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/schema.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py index c38d83106..444273e67 100644 --- a/lib/sqlalchemy/sql/elements.py +++ b/lib/sqlalchemy/sql/elements.py @@ -3606,7 +3606,7 @@ def _string_or_unprintable(element): else: try: return str(element) - except: + except Exception: return "unprintable element %r" % element diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py index 26d7c428e..f9c65f6f7 100644 --- a/lib/sqlalchemy/sql/schema.py +++ b/lib/sqlalchemy/sql/schema.py @@ -412,8 +412,8 @@ class Table(DialectKWArgs, SchemaItem, TableClause): table.dispatch.after_parent_attach(table, metadata) return table except: - metadata._remove_table(name, schema) - raise + with util.safe_reraise(): + metadata._remove_table(name, schema) @property @util.deprecated('0.9', 'Use ``table.schema.quote``') |