Misc. cleanup for Python 3

This commit is contained in:
Lance Edgar 2018-02-12 14:41:40 -06:00
parent 189bc1faa8
commit ee35cc6f22
24 changed files with 49 additions and 36 deletions

View file

@ -5,7 +5,7 @@
<h2>${project_title} ${project_version}</h2>
% for name, version in packages.iteritems():
% for name, version in packages.items():
<h3>${name} ${version}</h3>
% endfor

View file

@ -39,7 +39,7 @@
## % endif
% if request.user:
${form.field_div('user_name', form.hidden('user_name', value=unicode(request.user)) + unicode(request.user), label="Your Name")}
${form.field_div('user_name', form.hidden('user_name', value=six.text_type(request.user)) + six.text_type(request.user), label="Your Name")}
% else:
${form.field_div('user_name', form.text('user_name'), label="Your Name")}
% endif

View file

@ -30,7 +30,7 @@
${h.form(request.current_route_url())}
${h.csrf_token(request)}
% for name, display in printer.required_settings.iteritems():
% for name, display in printer.required_settings.items():
<div class="field-wrapper">
<label for="${name}">${display}</label>
<div class="field">

View file

@ -31,7 +31,7 @@ ${parent.body()}
<h2>Printer Settings</h2>
<div class="form">
% for name, display in printer.required_settings.iteritems():
% for name, display in printer.required_settings.items():
<div class="field-wrapper">
<label>${display}</label>
<div class="field">${instance.get_printer_setting(name) or ''}</div>

View file

@ -8,7 +8,7 @@
var recipient_mappings = new Map([
<% last = len(available_recipients) %>
% for i, (uuid, entry) in enumerate(sorted(available_recipients.iteritems(), key=lambda r: r[1]), 1):
% for i, (uuid, entry) in enumerate(sorted(available_recipients.items(), key=lambda r: r[1]), 1):
['${uuid}', ${json.dumps(entry)|n}]${',' if i < last else ''}
% endfor
]);

View file

@ -5,7 +5,7 @@
<h2>${project_title} ${project_version}</h2>
% for name, version in packages.iteritems():
% for name, version in packages.items():
<h3>${name} ${version}</h3>
% endfor

View file

@ -241,7 +241,7 @@
</tr>
</thead>
<tbody>
% for emp in sorted(employees, key=unicode):
% for emp in sorted(employees, key=six.text_type):
<tr data-employee-uuid="${emp.uuid}">
<td class="employee">
## TODO: add link to single employee schedule / timesheet here...