orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'six' of github.com:ThomasWaldmann/flask into ThomasWaldmann-six

Browse source 
Conflicts:
	flask/testsuite/__init__.py
This commit is contained in:
Daniel Neuhäuser 2013-05-18 18:54:45 +02:00
commit 8494574fdf
13 changed files with 42 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
flask/json.py
View file

@ -17,6 +17,7 @@ from werkzeug.http import http_date
# Use the same json implementation as itsdangerous on which we
# depend anyways.
from itsdangerous import simplejson as _json
import six
# figure out if simplejson escapes slashes. This behavior was changed
@ -59,7 +60,7 @@ class JSONEncoder(_json.JSONEncoder):
if isinstance(o, uuid.UUID):
return str(o)
if hasattr(o, '__html__'):
return unicode(o.__html__())
return six.text_type(o.__html__())
return _json.JSONEncoder.default(self, o)