Skip to content

Commit 6ae71e5

Browse files
committed
Fix problem displaying non-ascii names. Commit ready for merge.
- Legacy-Id: 9699
1 parent 8bf84a7 commit 6ae71e5

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

ietf/bin/merge-person-records

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ args = parser.parse_args()
2525
source = Person.objects.get(pk=args.source_id)
2626
target = Person.objects.get(pk=args.target_id)
2727

28-
print "Merging person {}({}) to {}({})".format(source.name,source.pk,target.name,target.pk)
28+
print "Merging person {}({}) to {}({})".format(source.ascii,source.pk,target.ascii,target.pk)
2929
response = raw_input('Ok to continue y/n? ')
3030
if response.lower() != 'y':
3131
sys.exit()
@@ -67,10 +67,10 @@ deletable_objects, perms_needed, protected = admin.utils.get_deleted_objects(
6767
objs, opts, user, admin_site, using)
6868

6969
if len(deletable_objects) > 1:
70-
print "Not Deleting Person: {}({})".format(source.name,source.pk)
70+
print "Not Deleting Person: {}({})".format(source.ascii,source.pk)
7171
print "Related objects remain:"
7272
pprint.pprint(deletable_objects[1])
7373

7474
else:
75-
print "Deleting Person: {}({})".format(source.name,source.pk)
75+
print "Deleting Person: {}({})".format(source.ascii,source.pk)
7676
source.delete()

0 commit comments

Comments
 (0)