From 68bd38d22dff4c64d22cdb57e134e6c3eff00d85 Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Tue, 24 Jan 2017 20:47:41 +0000 Subject: [PATCH] Fixes #2141. Resolve issue with merge_person_records caused by Django 1.8 upgrade. Commit ready for merge. - Legacy-Id: 12724 --- ietf/bin/merge-person-records | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ietf/bin/merge-person-records b/ietf/bin/merge-person-records index 3ab2e1518..96b872c39 100755 --- a/ietf/bin/merge-person-records +++ b/ietf/bin/merge-person-records @@ -165,10 +165,11 @@ def main(): user = User.objects.filter(is_superuser=True).first() admin_site = admin.site using = 'default' - deletable_objects, perms_needed, protected = admin.utils.get_deleted_objects( + deletable_objects = admin.utils.get_deleted_objects( objs, opts, user, admin_site, using) - if len(deletable_objects) > 1: + deletable_objects_summary = deletable_objects[1] + if len(deletable_objects_summary) > 1: # should only inlcude one object (Person) print "Not Deleting Person: {}({})".format(source.ascii,source.pk) print "Related objects remain:" pprint.pprint(deletable_objects[1])