summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-01-16 15:57:25 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2017-01-16 15:57:25 -0500
commit751887ad6ed6bd25751c78c383c84a8a70fc8f40 (patch)
treeafdd5b495c596d7cbef2ec20616ff4b761833913 /lib
parent2e610cf1554ffe0b15cd26b212b105219e5cb6b9 (diff)
parentd8198c2d8779d52a94dc53b0a1582279d6d58fef (diff)
downloadsqlalchemy-751887ad6ed6bd25751c78c383c84a8a70fc8f40.tar.gz
Merge branch 'master' into rel_1_1
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/engine/threadlocal.py2
-rw-r--r--lib/sqlalchemy/sql/schema.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/engine/threadlocal.py b/lib/sqlalchemy/engine/threadlocal.py
index a22b59c1d..ee31764f3 100644
--- a/lib/sqlalchemy/engine/threadlocal.py
+++ b/lib/sqlalchemy/engine/threadlocal.py
@@ -135,4 +135,4 @@ class TLEngine(base.Engine):
self._connections.trans = []
def __repr__(self):
- return 'TLEngine(%s)' % str(self.url)
+ return 'TLEngine(%r)' % self.url
diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index 793750f1c..9bb0eee43 100644
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -3811,8 +3811,8 @@ class MetaData(SchemaItem):
s = schema and (" schema '%s'" % schema) or ''
raise exc.InvalidRequestError(
'Could not reflect: requested table(s) not available '
- 'in %s%s: (%s)' %
- (bind.engine.url, s, ', '.join(missing)))
+ 'in %r%s: (%s)' %
+ (bind.engine, s, ', '.join(missing)))
load = [name for name in only if extend_existing or
name not in current]