Skip to content
Open
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
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,11 @@ coverage.xml
docs/_build/

main.db

*.xml
*.iml
*.idea

# Default ignored files
/shelf/
/workspace.xml
2 changes: 1 addition & 1 deletion app.py
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
10 changes: 5 additions & 5 deletions resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down