change handling of mixed unicode/non-unicode data
This commit is contained in:
parent
3605ec6aa8
commit
16425af8d8
1 changed files with 4 additions and 3 deletions
|
@ -46,7 +46,7 @@ class ExternalEditorView(object):
|
||||||
r.append('content_type:' + str(context.contentType))
|
r.append('content_type:' + str(context.contentType))
|
||||||
r.append('meta_type:' + '.'.join((context.__module__,
|
r.append('meta_type:' + '.'.join((context.__module__,
|
||||||
context.__class__.__name__)))
|
context.__class__.__name__)))
|
||||||
r.append('title:' + context.title.encode('UTF-8'))
|
r.append('title:' + fromUnicode(context.title))
|
||||||
auth = self.request.get('_auth')
|
auth = self.request.get('_auth')
|
||||||
if auth:
|
if auth:
|
||||||
print 'ExternalEditorView: auth = ', auth
|
print 'ExternalEditorView: auth = ', auth
|
||||||
|
@ -57,10 +57,11 @@ class ExternalEditorView(object):
|
||||||
if cookie:
|
if cookie:
|
||||||
r.append('cookie:' + cookie)
|
r.append('cookie:' + cookie)
|
||||||
r.append('')
|
r.append('')
|
||||||
r.append(data)
|
r.append(fromUnicode(data))
|
||||||
result = '\n'.join(r)
|
result = '\n'.join(r)
|
||||||
self.setHeaders(len(result))
|
self.setHeaders(len(result))
|
||||||
return fromUnicode(result)
|
return result
|
||||||
|
#return fromUnicode(result)
|
||||||
|
|
||||||
def save(self):
|
def save(self):
|
||||||
data = self.request.get('editor.data')
|
data = self.request.get('editor.data')
|
||||||
|
|
Loading…
Add table
Reference in a new issue