summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorBaptiste Mispelon <bmispelon@gmail.com>2013-12-06 00:55:31 +0100
committerBaptiste Mispelon <bmispelon@gmail.com>2013-12-06 00:55:31 +0100
commitaba75b0d71808ed9ebc625e31a47da158f25b29d (patch)
treee813bca101767738f547c2c289cb930a74688906 /django
parent38662d11c4201c9fe9ba810515c2ed0b939065c0 (diff)
Fixed TypeError when rendering ModelState with multiple bases.
Diffstat (limited to 'django')
-rw-r--r--django/db/migrations/state.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/migrations/state.py b/django/db/migrations/state.py
index 0dd8d85e10..53c24cb8da 100644
--- a/django/db/migrations/state.py
+++ b/django/db/migrations/state.py
@@ -176,7 +176,7 @@ class ModelState(object):
for base in self.bases
)
if None in bases:
- raise InvalidBasesError("Cannot resolve one or more bases from %r" % self.bases)
+ raise InvalidBasesError("Cannot resolve one or more bases from %r" % (self.bases,))
# Turn fields into a dict for the body, add other bits
body = dict(self.fields)
body['Meta'] = meta