summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2013-05-09 14:13:15 +0100
committerAndrew Godwin <andrew@aeracode.org>2013-05-09 14:13:15 +0100
commit941d23e54890bcc9e73734c5c1f3c82193fd97d6 (patch)
tree7e0401b3a4ddc701d463b5e0b9f75a7e0c3f66ab
parentade34c44dae4f5cf9d51bf7f900bf06efa98ff12 (diff)
Whoops. Need to be good and use six.
-rw-r--r--django/db/models/fields/related.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
index 728d78ba52..7fc7a092fd 100644
--- a/django/db/models/fields/related.py
+++ b/django/db/models/fields/related.py
@@ -958,7 +958,7 @@ class ForeignObject(RelatedField):
def resolve_related_fields(self):
if len(self.from_fields) < 1 or len(self.from_fields) != len(self.to_fields):
raise ValueError('Foreign Object from and to fields must be the same non-zero length')
- if isinstance(self.rel.to, basestring):
+ if isinstance(self.rel.to, six.string_types):
raise ValueError('Related model %r cannot been resolved' % self.rel.to)
related_fields = []
for index in range(len(self.from_fields)):