Ansgar pushed to branch master at Debian FTP Team / dak
Commits:
-
e2097665
by Julien Cristau at 2020-11-01T10:48:47+01:00
-
7e6f8e1a
by Ansgar at 2020-11-01T10:57:37+01:00
1 changed file:
Changes:
... | ... | @@ -89,7 +89,7 @@ def footer(): |
89 | 89 |
res = "<p class=\"validate\">Timestamp: %s (UTC)</p>" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
|
90 | 90 |
res += "<p class=\"timestamp\">There are <a href="">\"/stat.html\">graphs about the queues</a> available.</p>"
|
91 | 91 |
res += "</body></html>"
|
92 |
- return res.encode('utf-8')
|
|
92 |
+ return six.ensure_str(res)
|
|
93 | 93 |
|
94 | 94 |
|
95 | 95 |
def table_header():
|
... | ... | @@ -219,7 +219,7 @@ def list_uploads(filelist, rrd_dir): |
219 | 219 |
print(header())
|
220 | 220 |
if uploads:
|
221 | 221 |
print(table_header())
|
222 |
- print(''.join(table_row(*x[1:6]) for x in uploads).encode('utf-8'))
|
|
222 |
+ print(six.ensure_str(''.join(table_row(*x[1:6]) for x in uploads)))
|
|
223 | 223 |
print(table_footer())
|
224 | 224 |
else:
|
225 | 225 |
print('<h1>Currently no deferred uploads to Debian</h1>')
|