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 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,