diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-02-17 00:09:48 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-02-17 00:09:48 +0000 |
| commit | 67f020f69cbca55150c2d793ba3f9fcb95749838 (patch) | |
| tree | e3f0df92eea862767eb9358479cab12507b01a04 /lib/sqlalchemy | |
| parent | f4c7027950cd38d2bf0a65ca830456fdd17903a1 (diff) | |
| download | sqlalchemy-67f020f69cbca55150c2d793ba3f9fcb95749838.tar.gz | |
- small fix to BoundMetaData to accept unicode or string URLs
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/engine/url.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/schema.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/engine/url.py b/lib/sqlalchemy/engine/url.py index f492ce425..2345a399b 100644 --- a/lib/sqlalchemy/engine/url.py +++ b/lib/sqlalchemy/engine/url.py @@ -80,7 +80,7 @@ def make_url(name_or_url): the given string is parsed according to the rfc1738 spec. if an existing URL object is passed, just returns the object.""" - if isinstance(name_or_url, str) or isinstance(name_or_url, unicode): + if isinstance(name_or_url, basestring): return _parse_rfc1738_args(name_or_url) else: return name_or_url diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py index a2d328bf3..323d30da5 100644 --- a/lib/sqlalchemy/schema.py +++ b/lib/sqlalchemy/schema.py @@ -914,7 +914,7 @@ class BoundMetaData(MetaData): """builds upon MetaData to provide the capability to bind to an Engine implementation.""" def __init__(self, engine_or_url, name=None, **kwargs): super(BoundMetaData, self).__init__(name, **kwargs) - if isinstance(engine_or_url, str): + if isinstance(engine_or_url, basestring): self._engine = sqlalchemy.create_engine(engine_or_url, **kwargs) else: self._engine = engine_or_url |
