From 2ab00bfd78fc28ab92558a171d61f0b5bb3fa733 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 12 Feb 2018 22:17:38 -0600 Subject: [PATCH] More python 3 tweaks --- tailbone/views/batch/core.py | 2 +- tailbone/views/master.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tailbone/views/batch/core.py b/tailbone/views/batch/core.py index 5b5511da..617f38ed 100644 --- a/tailbone/views/batch/core.py +++ b/tailbone/views/batch/core.py @@ -531,7 +531,7 @@ class BatchMasterView(MasterView): def make_batch_row_grid_tools(self, batch): if self.rows_bulk_deletable and not batch.executed and self.request.has_perm('{}.delete_rows'.format(self.get_permission_prefix())): url = self.request.route_url('{}.delete_rows'.format(self.get_route_prefix()), uuid=batch.uuid) - return HTML.tag('p', c=tags.link_to("Delete all rows matching current search", url)) + return HTML.tag('p', c=[tags.link_to("Delete all rows matching current search", url)]) def make_row_grid_tools(self, batch): return (self.make_default_row_grid_tools(batch) or '') + (self.make_batch_row_grid_tools(batch) or '') diff --git a/tailbone/views/master.py b/tailbone/views/master.py index 8048e3ea..5a36bcb9 100644 --- a/tailbone/views/master.py +++ b/tailbone/views/master.py @@ -746,7 +746,10 @@ class MasterView(View): return self.redirect(self.request.current_route_url(_query=None)) if self.request.params.get('partial'): - self.request.response.content_type = b'text/html' + if six.PY3: + self.request.response.content_type = 'text/html' + else: + self.request.response.content_type = b'text/html' self.request.response.text = grid.render_grid() return self.request.response