From 6ae71e505753090b98feccb9eabbd946ae8da562 Mon Sep 17 00:00:00 2001
From: Ryan Cross <rcross@amsl.com>
Date: Tue, 7 Jul 2015 00:17:32 +0000
Subject: [PATCH] Fix problem displaying non-ascii names. Commit ready for
merge. - Legacy-Id: 9699
---
ietf/bin/merge-person-records | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ietf/bin/merge-person-records b/ietf/bin/merge-person-records
index 753e40baf..300774bc0 100755
--- a/ietf/bin/merge-person-records
+++ b/ietf/bin/merge-person-records
@@ -25,7 +25,7 @@ args = parser.parse_args()
source = Person.objects.get(pk=args.source_id)
target = Person.objects.get(pk=args.target_id)
-print "Merging person {}({}) to {}({})".format(source.name,source.pk,target.name,target.pk)
+print "Merging person {}({}) to {}({})".format(source.ascii,source.pk,target.ascii,target.pk)
response = raw_input('Ok to continue y/n? ')
if response.lower() != 'y':
sys.exit()
@@ -67,10 +67,10 @@ deletable_objects, perms_needed, protected = admin.utils.get_deleted_objects(
objs, opts, user, admin_site, using)
if len(deletable_objects) > 1:
- print "Not Deleting Person: {}({})".format(source.name,source.pk)
+ print "Not Deleting Person: {}({})".format(source.ascii,source.pk)
print "Related objects remain:"
pprint.pprint(deletable_objects[1])
else:
- print "Deleting Person: {}({})".format(source.name,source.pk)
+ print "Deleting Person: {}({})".format(source.ascii,source.pk)
source.delete()