Browse Source

Revert "Adds simplejson as a testing target." (#1865)

pull/1875/head
David Lord 9 years ago
parent
commit
024fbe5a60
  1. 8
      tests/test_helpers.py
  2. 3
      tox.ini

8
tests/test_helpers.py

@ -19,10 +19,6 @@ from werkzeug.exceptions import BadRequest
from werkzeug.http import parse_cache_control_header, parse_options_header from werkzeug.http import parse_cache_control_header, parse_options_header
from werkzeug.http import http_date from werkzeug.http import http_date
from flask._compat import StringIO, text_type from flask._compat import StringIO, text_type
try:
import simplejson
except ImportError:
import json as simplejson
def has_encoding(name): def has_encoding(name):
@ -118,10 +114,6 @@ class TestJSON(object):
assert rv.mimetype == 'application/json' assert rv.mimetype == 'application/json'
assert flask.json.loads(rv.data) == d assert flask.json.loads(rv.data) == d
def test_simplejson_does_not_escape_slashes(self):
"""Test that \\/ is no longer standard behavior."""
assert '\\/' not in simplejson.dumps('/')
def test_jsonify_dicts(self): def test_jsonify_dicts(self):
"""Test jsonify with dicts and kwargs unpacking.""" """Test jsonify with dicts and kwargs unpacking."""
d = dict( d = dict(

3
tox.ini

@ -1,5 +1,5 @@
[tox] [tox]
envlist = {py26,py27,pypy}-{lowest,release,devel,simplejson}, {py33,py34,py35}-{release,devel,simplejson} envlist = {py26,py27,pypy}-{lowest,release,devel}, {py33,py34,py35}-{release,devel}
[testenv] [testenv]
commands = commands =
@ -19,7 +19,6 @@ deps=
devel: git+https://github.com/pallets/jinja.git devel: git+https://github.com/pallets/jinja.git
devel: git+https://github.com/pallets/itsdangerous.git devel: git+https://github.com/pallets/itsdangerous.git
devel: git+https://github.com/jek/blinker.git devel: git+https://github.com/jek/blinker.git
simplejson: simplejson
[testenv:docs] [testenv:docs]
deps = sphinx deps = sphinx

Loading…
Cancel
Save