From c684a77996198814a27754c9010ca5a954ef44e4 Mon Sep 17 00:00:00 2001 From: Nivruth Nandigam Date: Sun, 11 Oct 2020 21:55:10 -0700 Subject: [PATCH 1/7] update imports --- app.py | 2 +- resources.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app.py b/app.py index e92371a..0774d49 100755 --- a/app.py +++ b/app.py @@ -1,7 +1,7 @@ #!/usr/bin/env python from flask import Flask -from flask.ext.restful import Api +from flask_restful import Api app = Flask(__name__) api = Api(app) diff --git a/resources.py b/resources.py index 5619ee1..268edee 100644 --- a/resources.py +++ b/resources.py @@ -2,11 +2,11 @@ from models import Todo from db import session -from flask.ext.restful import reqparse -from flask.ext.restful import abort -from flask.ext.restful import Resource -from flask.ext.restful import fields -from flask.ext.restful import marshal_with +from flask_restful import reqparse +from flask_restful import abort +from flask_restful import Resource +from flask_restful import fields +from flask_restful import marshal_with todo_fields = { 'id': fields.Integer, From 4aec9f5475c707cd809d642da8dafd1d75de6fb7 Mon Sep 17 00:00:00 2001 From: Nivruth Date: Sun, 11 Oct 2020 22:07:09 -0700 Subject: [PATCH 2/7] update .gitignore --- .gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 9a500c2..264d5b2 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,11 @@ coverage.xml docs/_build/ main.db + +*.xml +*.iml +*.idea + +# Default ignored files +/shelf/ +/workspace.xml From 11291603423813c2bf2f25981595dcb1607837bb Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Mon, 12 Oct 2020 05:04:16 +0000 Subject: [PATCH 3/7] Restyled by autopep8 --- app.py | 4 ++-- resources.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app.py b/app.py index 0774d49..188b2a6 100755 --- a/app.py +++ b/app.py @@ -1,13 +1,13 @@ #!/usr/bin/env python +from resources import TodoResource +from resources import TodoListResource from flask import Flask from flask_restful import Api app = Flask(__name__) api = Api(app) -from resources import TodoListResource -from resources import TodoResource api.add_resource(TodoListResource, '/todos', endpoint='todos') api.add_resource(TodoResource, '/todos/', endpoint='todo') diff --git a/resources.py b/resources.py index 268edee..5767e06 100644 --- a/resources.py +++ b/resources.py @@ -17,6 +17,7 @@ parser = reqparse.RequestParser() parser.add_argument('task', type=str) + class TodoResource(Resource): @marshal_with(todo_fields) def get(self, id): From e4c83ecb04991f71df0bd68b5a0916b51b9e0f35 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Mon, 12 Oct 2020 05:04:17 +0000 Subject: [PATCH 4/7] Restyled by black --- app.py | 6 +++--- resources.py | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app.py b/app.py index 188b2a6..f2cda4d 100755 --- a/app.py +++ b/app.py @@ -9,8 +9,8 @@ api = Api(app) -api.add_resource(TodoListResource, '/todos', endpoint='todos') -api.add_resource(TodoResource, '/todos/', endpoint='todo') +api.add_resource(TodoListResource, "/todos", endpoint="todos") +api.add_resource(TodoResource, "/todos/", endpoint="todo") -if __name__ == '__main__': +if __name__ == "__main__": app.run(debug=True) diff --git a/resources.py b/resources.py index 5767e06..afe9a23 100644 --- a/resources.py +++ b/resources.py @@ -1,4 +1,3 @@ - from models import Todo from db import session @@ -9,13 +8,13 @@ from flask_restful import marshal_with todo_fields = { - 'id': fields.Integer, - 'task': fields.String, - 'uri': fields.Url('todo', absolute=True), + "id": fields.Integer, + "task": fields.String, + "uri": fields.Url("todo", absolute=True), } parser = reqparse.RequestParser() -parser.add_argument('task', type=str) +parser.add_argument("task", type=str) class TodoResource(Resource): @@ -38,7 +37,7 @@ def delete(self, id): def put(self, id): parsed_args = parser.parse_args() todo = session.query(Todo).filter(Todo.id == id).first() - todo.task = parsed_args['task'] + todo.task = parsed_args["task"] session.add(todo) session.commit() return todo, 201 @@ -53,7 +52,7 @@ def get(self): @marshal_with(todo_fields) def post(self): parsed_args = parser.parse_args() - todo = Todo(task=parsed_args['task']) + todo = Todo(task=parsed_args["task"]) session.add(todo) session.commit() return todo, 201 From 2bdb222e2fc73c53b5698c38a814b17dbf7c4a42 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Mon, 12 Oct 2020 05:04:18 +0000 Subject: [PATCH 5/7] Restyled by isort --- app.py | 4 ++-- resources.py | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app.py b/app.py index f2cda4d..d901795 100755 --- a/app.py +++ b/app.py @@ -1,10 +1,10 @@ #!/usr/bin/env python -from resources import TodoResource -from resources import TodoListResource from flask import Flask from flask_restful import Api +from resources import TodoListResource, TodoResource + app = Flask(__name__) api = Api(app) diff --git a/resources.py b/resources.py index afe9a23..4560381 100644 --- a/resources.py +++ b/resources.py @@ -1,11 +1,7 @@ -from models import Todo -from db import session +from flask_restful import Resource, abort, fields, marshal_with, reqparse -from flask_restful import reqparse -from flask_restful import abort -from flask_restful import Resource -from flask_restful import fields -from flask_restful import marshal_with +from db import session +from models import Todo todo_fields = { "id": fields.Integer, From dea27e4b6fe35e46d8b41d57dd0eb41a487e78ed Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Mon, 12 Oct 2020 05:04:19 +0000 Subject: [PATCH 6/7] Restyled by reorder-python-imports --- app.py | 4 ++-- resources.py | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app.py b/app.py index d901795..aa5cabe 100755 --- a/app.py +++ b/app.py @@ -1,9 +1,9 @@ #!/usr/bin/env python - from flask import Flask from flask_restful import Api -from resources import TodoListResource, TodoResource +from resources import TodoListResource +from resources import TodoResource app = Flask(__name__) api = Api(app) diff --git a/resources.py b/resources.py index 4560381..8640b3e 100644 --- a/resources.py +++ b/resources.py @@ -1,4 +1,8 @@ -from flask_restful import Resource, abort, fields, marshal_with, reqparse +from flask_restful import abort +from flask_restful import fields +from flask_restful import marshal_with +from flask_restful import reqparse +from flask_restful import Resource from db import session from models import Todo From b61edaa947fa51f0714d922e6f35f3614c46b3ab Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Mon, 12 Oct 2020 05:04:20 +0000 Subject: [PATCH 7/7] Restyled by yapf --- app.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app.py b/app.py index aa5cabe..35bc1e4 100755 --- a/app.py +++ b/app.py @@ -8,7 +8,6 @@ app = Flask(__name__) api = Api(app) - api.add_resource(TodoListResource, "/todos", endpoint="todos") api.add_resource(TodoResource, "/todos/", endpoint="todo")