maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Remove six dependency

Browse source
This commit is contained in:
Daniel Neuhäuser 2013-05-22 21:40:30 +02:00
parent 135c53a5f2
commit a0801719f8
9 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
flask/json.py
View file

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