From 16425af8d826c4bdac3b22867b852a0c82f08978 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Sat, 13 Aug 2011 14:25:42 +0200 Subject: [PATCH] change handling of mixed unicode/non-unicode data --- xedit/browser.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xedit/browser.py b/xedit/browser.py index b6a527f..5ea67d4 100644 --- a/xedit/browser.py +++ b/xedit/browser.py @@ -46,7 +46,7 @@ class ExternalEditorView(object): r.append('content_type:' + str(context.contentType)) r.append('meta_type:' + '.'.join((context.__module__, context.__class__.__name__))) - r.append('title:' + context.title.encode('UTF-8')) + r.append('title:' + fromUnicode(context.title)) auth = self.request.get('_auth') if auth: print 'ExternalEditorView: auth = ', auth @@ -57,10 +57,11 @@ class ExternalEditorView(object): if cookie: r.append('cookie:' + cookie) r.append('') - r.append(data) + r.append(fromUnicode(data)) result = '\n'.join(r) self.setHeaders(len(result)) - return fromUnicode(result) + return result + #return fromUnicode(result) def save(self): data = self.request.get('editor.data')