mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-25 14:46:09 +00:00
Code Issues 32 Releases Wiki Activity

Merge pull request #2037 from bmispelon/invalidbaseserror

Browse Source 
Fixed TypeError when rendering ModelState with multiple bases.
This commit is contained in:
Andrew Godwin
2013-12-06 05:48:21 -08:00
parent 9a73e7f40c aba75b0d71
commit a06fd092ef
2 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/migrations/state.py
View File

@@ -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