From 1558a52c55710e51ac8db27d4e98185a747b9510 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 4 Nov 2016 19:02:40 +0000 Subject: [PATCH] django.admin.utils.get_deleted_objects() changed signature. Fixed. - Legacy-Id: 12268 --- ietf/person/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ietf/person/utils.py b/ietf/person/utils.py index 2229cf962..55e7a6929 100755 --- a/ietf/person/utils.py +++ b/ietf/person/utils.py @@ -74,9 +74,9 @@ def merge_persons(source,target,stream): user = User.objects.filter(is_superuser=True).first() admin_site = admin.site using = 'default' - - deletable_objects, perms_needed, protected = admin.utils.get_deleted_objects( - objs, opts, user, admin_site, using) + + deletable_objects, model_count, perms_needed, protected = ( + admin.utils.get_deleted_objects(objs, opts, user, admin_site, using) ) if len(deletable_objects) > 1: print >>stream, "Not Deleting Person: {}({})".format(source.ascii,source.pk)