Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lnt/server/ui/app.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import io
import json
import logging
import logging.handlers
import sys
Expand Down Expand Up @@ -46,7 +47,7 @@ def __call__(self, environ, start_response):
return self.app(environ, start_response)


class LNTObjectJSONEncoder(flask.json.JSONEncoder):
class LNTObjectJSONEncoder(json.JSONEncoder):
"""Take SQLAlchemy objects and jsonify them. If the object has an __json__
method, use that instead."""

Expand Down Expand Up @@ -74,7 +75,7 @@ def default(self, obj):

return fields

return flask.json.JSONEncoder.default(self, obj)
return json.JSONEncoder.default(self, obj)


class Request(flask.Request):
Expand Down
4 changes: 2 additions & 2 deletions lnt/server/ui/regression_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def name(cls):
return cls.__class__.__name__


class LNTEncoder(flask.json.JSONEncoder):
class LNTEncoder(json.JSONEncoder):
"""Encode all the common LNT objects."""
def default(self, obj):
# Most of our objects have a __json__ defined.
Expand All @@ -276,7 +276,7 @@ def default(self, obj):
return
if name(obj) == "SampleField":
return obj.name
return flask.json.JSONEncoder.default(self, obj)
return json.JSONEncoder.default(self, obj)


@v4_route("/regressions/<int:id>", methods=["GET", "POST"])
Expand Down
2 changes: 1 addition & 1 deletion requirements.client.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
.
.
14 changes: 7 additions & 7 deletions requirements.server.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# These requirements are what you would install on a production server.
.
aniso8601==1.2.0
click==6.7
Flask-RESTful==0.3.4
Flask-WTF==0.12
Flask==0.12.2
click==8.1.8
Flask-RESTful==0.3.10
Flask-WTF==1.2.0
Flask==3.1.2
gunicorn==19.9.0
itsdangerous==0.24
Jinja2==2.11.3
Jinja2==3.1.6
MarkupSafe==1.1.1
progressbar2
psycopg2==2.9.10
python-gnupg==0.3.7
pytz==2016.10
pyyaml==5.1.2
pyyaml==6.0
SQLAlchemy==1.3.24
Werkzeug==0.15.6
Werkzeug==3.1.3
WTForms==2.0.2
Loading