comparison MoinMoin/items/__init__.py @ 1199:a4ce283b0ca2

Text::_render_data_diff should return unicode in keeping it consistent with _render_data_diff_atom
author Shitiz Garg <mail@dragooon.net>
date Wed, 04 Jan 2012 03:52:32 +0530
parents 2aa4f4ec6a94
children 92d8f0777a9a
comparison
equal deleted inserted replaced
1198:2aa4f4ec6a94 1199:a4ce283b0ca2
1129 def _render_data_diff_atom(self, oldrev, newrev): 1129 def _render_data_diff_atom(self, oldrev, newrev):
1130 """ renders diff in HTML for atom feed """ 1130 """ renders diff in HTML for atom feed """
1131 return self._get_data_diff_html(oldrev, newrev, 'diff_text_atom.html') 1131 return self._get_data_diff_html(oldrev, newrev, 'diff_text_atom.html')
1132 1132
1133 def _render_data_diff(self, oldrev, newrev): 1133 def _render_data_diff(self, oldrev, newrev):
1134 return Markup(self._get_data_diff_html(oldrev, newrev, 'diff_text.html')) 1134 return self._get_data_diff_html(oldrev, newrev, 'diff_text.html')
1135 1135
1136 def _render_data_diff_text(self, oldrev, newrev): 1136 def _render_data_diff_text(self, oldrev, newrev):
1137 from MoinMoin.util import diff_text 1137 from MoinMoin.util import diff_text
1138 oldlines = self.data_storage_to_internal(oldrev.data.read()).split('\n') 1138 oldlines = self.data_storage_to_internal(oldrev.data.read()).split('\n')
1139 newlines = self.data_storage_to_internal(newrev.data.read()).split('\n') 1139 newlines = self.data_storage_to_internal(newrev.data.read()).split('\n')