summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-01-02 18:59:26 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2014-01-02 18:59:26 -0500
commit6d3e563a575bcdc57c966980abc5038337505566 (patch)
tree006534cf0d982766ea4acd2f738df70b64fb816d /lib/sqlalchemy/orm
parent8a7fdd4e5cf5e4d9ba71c66a06bcba6b1054cfef (diff)
downloadsqlalchemy-6d3e563a575bcdc57c966980abc5038337505566.tar.gz
- Fixed regression where we don't check the given name against the
correct string class when setting up a backref based on a name, therefore causing the error "too many values to unpack". This was related to the Py3k conversion. [ticket:2901]
Diffstat (limited to 'lib/sqlalchemy/orm')
-rw-r--r--lib/sqlalchemy/orm/relationships.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py
index a4d1d43e3..da402fbf3 100644
--- a/lib/sqlalchemy/orm/relationships.py
+++ b/lib/sqlalchemy/orm/relationships.py
@@ -1560,7 +1560,7 @@ class RelationshipProperty(StrategizedProperty):
if not self.is_primary():
return
if self.backref is not None and not self.back_populates:
- if isinstance(self.backref, str):
+ if isinstance(self.backref, util.string_types):
backref_key, kwargs = self.backref, {}
else:
backref_key, kwargs = self.backref