summaryrefslogtreecommitdiff
path: root/postgresqleu/util/backendviews.py
diff options
context:
space:
mode:
authorMagnus Hagander2019-01-06 11:45:35 +0000
committerMagnus Hagander2019-01-10 19:44:30 +0000
commitee2472bd429be09f183dc3f5345ad2f03c1c1393 (patch)
treeb6031e83a5f8cde50aa72d26ec2e1e19826b7ba2 /postgresqleu/util/backendviews.py
parente6e526e5d4e2c483e9a7c9736a031c33a4339eb9 (diff)
Generic changes for python3 from 2to3
Diffstat (limited to 'postgresqleu/util/backendviews.py')
-rw-r--r--postgresqleu/util/backendviews.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/postgresqleu/util/backendviews.py b/postgresqleu/util/backendviews.py
index 13bc187b..c6696571 100644
--- a/postgresqleu/util/backendviews.py
+++ b/postgresqleu/util/backendviews.py
@@ -80,7 +80,7 @@ def backend_process_form(request, urlname, formclass, id, cancel_url='../', save
instance = instancemaker()
# Set initial values on newly created instance, if any are set
- for k, v in formclass.get_initial().items():
+ for k, v in list(formclass.get_initial().items()):
setattr(instance, k, v)
else:
if bypass_conference_filter:
@@ -100,8 +100,8 @@ def backend_process_form(request, urlname, formclass, id, cancel_url='../', save
if to_delete:
to_delete = [d for d in flatten_list(to_delete[0]) if d._meta.model_name not in formclass.auto_cascade_delete_to]
if to_delete:
- pieces = [unicode(to_delete[n]) for n in range(0, min(5, len(to_delete))) if not isinstance(to_delete[n], list)]
- extra_error = u"This {0} cannot be deleted. It would have resulted in the following other objects also being deleted: {1}".format(formclass.Meta.model._meta.verbose_name, u', '.join(pieces))
+ pieces = [str(to_delete[n]) for n in range(0, min(5, len(to_delete))) if not isinstance(to_delete[n], list)]
+ extra_error = "This {0} cannot be deleted. It would have resulted in the following other objects also being deleted: {1}".format(formclass.Meta.model._meta.verbose_name, ', '.join(pieces))
else:
messages.info(request, "{0} {1} deleted.".format(formclass.Meta.model._meta.verbose_name.capitalize(), instance))
instance.delete()
@@ -176,7 +176,7 @@ def backend_process_form(request, urlname, formclass, id, cancel_url='../', save
'helplink': form.helplink,
'allow_delete': allow_delete and instance.pk,
'adminurl': adminurl,
- 'linked': [(url, handler, handler.get_list(form.instance)) for url, handler in form.linked_objects.items() if form.instance],
+ 'linked': [(url, handler, handler.get_list(form.instance)) for url, handler in list(form.linked_objects.items()) if form.instance],
})
@@ -350,7 +350,7 @@ def backend_handle_copy_previous(request, formclass, restpieces, conference):
sourceconf = get_authenticated_conference(request, confid=sourceconfid)
if request.method == "POST":
- idlist = sorted([int(k[2:]) for k, v in request.POST.items() if k.startswith('c_') and v == '1'])
+ idlist = sorted([int(k[2:]) for k, v in list(request.POST.items()) if k.startswith('c_') and v == '1'])
if formclass.copy_transform_form:
# First validate the transform form
transform_form = formclass.copy_transform_form(conference, sourceconf, data=request.POST)