Merged the dev branch (many-chars-per-player) and made some more error checking in the migrations.

This commit is contained in:
Griatch 2013-05-12 22:13:05 +02:00
parent 4854661889
commit c843f15d42
2 changed files with 5 additions and 1 deletions

View file

@ -366,12 +366,13 @@ class Migration(DataMigration):
mclass = CTYPEGET(model=data.db_model).model_class()
try:
return mclass.objects.get(id=data.id)
except AttributeError:
try:
return mclass.objects.get(id=data.id)
except mclass.DoesNotExist: # could happen if object was deleted in the interim.
return None
except TypeError, e:
print e
def iter_id2db(item):
"""