From ead66c25619edde6c88842eec9289220ab9d6924 Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 28 Apr 2016 16:24:38 +0200 Subject: [PATCH] code now follows the PEP8 standard --- api/__init__.py | 16 ++++++++------- api/models/__init__.py | 2 +- api/models/designer.py | 21 ++++++++++---------- api/models/locale.py | 17 ++++++++-------- api/views/designers.py | 44 +++++++++++++++++++++++------------------- manage.py | 23 ++++++++++++---------- 6 files changed, 67 insertions(+), 56 deletions(-) diff --git a/api/__init__.py b/api/__init__.py index 3700c23..89948ec 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -4,22 +4,24 @@ from flask_sqlalchemy import SQLAlchemy app = Flask(__name__) app.config.from_object('config') + def on_404(e): - return jsonify(dict(error='Not found')), 404 + return jsonify(dict(error='Not found')), 404 app.errorhandler(404)(on_404) -#SQLAlchemy +# SQLAlchemy db = SQLAlchemy(app) from api.views import designers app.register_blueprint(designers.mod) + @app.route("/") def index(): - data = { - "info": { - "api_version": "0.0.1" + data = { + "info": { + "api_version": "0.0.1" + } } - } - return jsonify(data) + return jsonify(data) diff --git a/api/models/__init__.py b/api/models/__init__.py index 0053335..7759767 100644 --- a/api/models/__init__.py +++ b/api/models/__init__.py @@ -1 +1 @@ -from .designer import Designer \ No newline at end of file +from .designer import Designer diff --git a/api/models/designer.py b/api/models/designer.py index 7cfa798..feb6b16 100644 --- a/api/models/designer.py +++ b/api/models/designer.py @@ -1,15 +1,16 @@ from api import db + class Designer(db.Model): - __tablename__ = 'designers' + __tablename__ = 'designers' - designerid = db.Column(db.Integer, primary_key=True) - name = db.Column(db.String(100), nullable=False) - path = db.Column(db.String(100), nullable=False) + designerid = db.Column(db.Integer, primary_key=True) + name = db.Column(db.String(100), nullable=False) + path = db.Column(db.String(100), nullable=False) - def to_json(self, nested=False): - return { - 'designerid': self.designerid, - 'name': self.name, - 'path': self.path, - } \ No newline at end of file + def to_json(self, nested=False): + return { + 'designerid': self.designerid, + 'name': self.name, + 'path': self.path, + } diff --git a/api/models/locale.py b/api/models/locale.py index b2b9133..3a2d557 100644 --- a/api/models/locale.py +++ b/api/models/locale.py @@ -1,13 +1,14 @@ from api import db + class Locale(db.Model): - __tablename__ = 'locales' + __tablename__ = 'locales' - id = db.Column(db.Integer, primary_key=True) - value = db.Column(db.String(5), nullable=False) + id = db.Column(db.Integer, primary_key=True) + value = db.Column(db.String(5), nullable=False) - def to_json(self): - return { - "id": self.id, - "value": self.value - } \ No newline at end of file + def to_json(self): + return { + "id": self.id, + "value": self.value + } diff --git a/api/views/designers.py b/api/views/designers.py index a1d3e2d..6a547ae 100644 --- a/api/views/designers.py +++ b/api/views/designers.py @@ -4,38 +4,42 @@ from api.models import Designer mod = Blueprint('designers', __name__, url_prefix='/designers') + @mod.route("/", methods=["GET"]) def list(): - designers = Designer.query.all() - return jsonify(designers=[d.to_json() for d in designers]) + designers = Designer.query.all() + return jsonify(designers=[d.to_json() for d in designers]) + @mod.route("/", methods=["POST"]) def create(): - data = request.json - designer = Designer(**data) - db.session.add(designer) - db.session.commit() - return jsonify(designer.to_json()) + data = request.json + designer = Designer(**data) + db.session.add(designer) + db.session.commit() + return jsonify(designer.to_json()) @mod.route("/", methods=["GET"]) def show(id): - designer = Designer.query.get_or_404(id) - return jsonify(designer.to_json()) + designer = Designer.query.get_or_404(id) + return jsonify(designer.to_json()) + @mod.route("/", methods=["PUT"]) def update(id): - designer = Designer.query.get_or_404(id) - data = request.json - for k, v in data.items(): - setattr(designer, k, v) - db.session.add(designer) - db.session.commit() - return jsonify(designer.to_json()) + designer = Designer.query.get_or_404(id) + data = request.json + for k, v in data.items(): + setattr(designer, k, v) + db.session.add(designer) + db.session.commit() + return jsonify(designer.to_json()) + @mod.route("/", methods=["DELETE"]) def delete(id): - designer = Designer.query.get_or_404(id) - db.session.delete(designer) - db.session.commit() - return jsonify({"status": "ok"}) \ No newline at end of file + designer = Designer.query.get_or_404(id) + db.session.delete(designer) + db.session.commit() + return jsonify({"status": "ok"}) diff --git a/manage.py b/manage.py index b34e3b4..29d6733 100644 --- a/manage.py +++ b/manage.py @@ -4,24 +4,27 @@ from api.models import Designer manager = Manager(app) + @manager.command def init_db(): - db.create_all() - print("All tables created") + db.create_all() + print("All tables created") + @manager.command def drop_db(): - if prompt_bool("Are you sure you want to lose all your data?"): - db.drop_all() - print("All tables dropped") + if prompt_bool("Are you sure you want to lose all your data?"): + db.drop_all() + print("All tables dropped") + @manager.command def seed_db(): - print("Adding sample data") - designer = Designer(name="Martin", path='/martin') - db.session.add(designer) - db.session.commit() + print("Adding sample data") + designer = Designer(name="Martin", path='/martin') + db.session.add(designer) + db.session.commit() if __name__ == '__main__': - manager.run() \ No newline at end of file + manager.run()