fix py3 html
This commit is contained in:
1 parent
f9927f4f3d
commit
73399fdee6
2 files changed
+5
-5
No files matched your search
+2
-2
@@ -453,9 +453,9 @@ class Response(Storage):
|
|||||||
for meta in iteritems((self.meta or {})):
|
for meta in iteritems((self.meta or {})):
|
||||||
k, v = meta
|
k, v = meta
|
||||||
if isinstance(v, dict):
|
if isinstance(v, dict):
|
||||||
s += '<meta' + ''.join(' %s="%s"' % (xmlescape(key), xmlescape(v[key])) for key in v) +' />\n'
|
s += '<meta' + ''.join(' %s="%s"' % (xmlescape(key), to_native(xmlescape(v[key]))) for key in v) +' />\n'
|
||||||
else:
|
else:
|
||||||
s += '<meta name="%s" content="%s" />\n' % (k, xmlescape(v))
|
s += '<meta name="%s" content="%s" />\n' % (k, to_native(xmlescape(v)))
|
||||||
self.write(s, escape=False)
|
self.write(s, escape=False)
|
||||||
|
|
||||||
def include_files(self, extensions=None):
|
def include_files(self, extensions=None):
|
||||||
|
|||||||
+3
-3
@@ -19,7 +19,7 @@ import urllib
|
|||||||
import re
|
import re
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from gluon._compat import StringIO, unichr, urllib_quote, iteritems, basestring, long, unicodeT
|
from gluon._compat import StringIO, unichr, urllib_quote, iteritems, basestring, long, unicodeT, to_native
|
||||||
from gluon.http import HTTP, redirect
|
from gluon.http import HTTP, redirect
|
||||||
from gluon.html import XmlComponent, truncate_string
|
from gluon.html import XmlComponent, truncate_string
|
||||||
from gluon.html import XML, SPAN, TAG, A, DIV, CAT, UL, LI, TEXTAREA, BR, IMG
|
from gluon.html import XML, SPAN, TAG, A, DIV, CAT, UL, LI, TEXTAREA, BR, IMG
|
||||||
@@ -1395,8 +1395,8 @@ class SQLFORM(FORM):
|
|||||||
self['hidden']['id'] = record[table._id.name]
|
self['hidden']['id'] = record[table._id.name]
|
||||||
|
|
||||||
(begin, end) = self._xml()
|
(begin, end) = self._xml()
|
||||||
self.custom.begin = XML("<%s %s>" % (self.tag, begin))
|
self.custom.begin = XML("<%s %s>" % (self.tag, to_native(begin)))
|
||||||
self.custom.end = XML("%s</%s>" % (end, self.tag))
|
self.custom.end = XML("%s</%s>" % (to_native(end), self.tag))
|
||||||
table = self.createform(xfields)
|
table = self.createform(xfields)
|
||||||
self.components = [table]
|
self.components = [table]
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user