summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-11-29 18:15:52 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2013-11-29 18:15:52 -0500
commite6f67f48054d906856f879bc1803ea639aa4b670 (patch)
treedf41029eafc06b0e0d7453d7df0f50bff486f9d7 /lib/sqlalchemy
parent1e7bb35fd2d58cc5928932d920e665b5c1b02174 (diff)
downloadsqlalchemy-e6f67f48054d906856f879bc1803ea639aa4b670.tar.gz
Fixed bug where in Py2K a unicode literal would not be accepted
as the string name of a class or other argument within declarative using :func:`.relationship`.
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/ext/declarative/clsregistry.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/declarative/clsregistry.py b/lib/sqlalchemy/ext/declarative/clsregistry.py
index a669e37f4..8fef8f1bc 100644
--- a/lib/sqlalchemy/ext/declarative/clsregistry.py
+++ b/lib/sqlalchemy/ext/declarative/clsregistry.py
@@ -277,7 +277,7 @@ def _deferred_relationship(cls, prop):
for attr in ('argument', 'order_by', 'primaryjoin', 'secondaryjoin',
'secondary', '_user_defined_foreign_keys', 'remote_side'):
v = getattr(prop, attr)
- if isinstance(v, str):
+ if isinstance(v, util.string_types):
setattr(prop, attr, resolve_arg(v))
if prop.backref and isinstance(prop.backref, tuple):