Skip to content

Commit ef93417

Browse files
committed
[resources.py] remove demjson, just use json
1 parent 93f47c3 commit ef93417

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Scrapy>=1.0.0
22
service-identity>=1.0.0
3-
demjson>=2.2.4
43
six>=1.12.0
54
jmespath==0.10.0
65
pyasn1>=0.4.8

scrapyrt/resources.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import json
33
from urllib.parse import unquote
44

5-
import demjson
65
from scrapy.utils.misc import load_object
76
from scrapy.utils.serialize import ScrapyJSONEncoder
87
from twisted.internet.defer import Deferred
@@ -158,12 +157,11 @@ def render_POST(self, request, **kwargs):
158157
"""
159158
request_body = request.content.getvalue()
160159
try:
161-
# TODO replace demjson with json.loads
162-
api_params = demjson.decode(request_body)
163-
except demjson.JSONDecodeError as e:
160+
api_params = json.loads(request_body)
161+
except Exception as e:
164162
message = "Invalid JSON in POST body. {}"
165-
message = message.format(e.pretty_description())
166-
# TODO should be integer not string
163+
message = message.format(e)
164+
# TODO should be integer not string?
167165
raise Error('400', message=message)
168166

169167
log.msg("{}".format(api_params))

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
install_requires=[
4040
'Twisted>=14.0.0',
4141
'Scrapy>=1.0.0',
42-
'demjson',
4342
'six>=1.5.2'
4443
],
4544
package_data={

0 commit comments

Comments
 (0)