From 66b1787722fb8c9c996c9b9ce69f458f8f095de4 Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 13 Nov 2016 19:30:17 +0100 Subject: [PATCH] put all extensions in a new file --- api/core.py | 8 ++------ api/exceptions.py | 8 -------- api/extensions.py | 5 +++++ api/models/__init__.py | 2 ++ api/models/category.py | 4 +++- api/models/contract_customer.py | 2 +- api/models/designer.py | 4 +++- api/models/i18n.py | 3 ++- api/models/inquiry.py | 4 +++- api/models/locale.py | 4 +++- api/models/market.py | 3 ++- api/models/product.py | 2 +- api/resources/server.py | 3 ++- api/validators.py | 8 +++++++- tests/test_validators.py | 3 +-- 15 files changed, 37 insertions(+), 26 deletions(-) delete mode 100644 api/exceptions.py create mode 100644 api/extensions.py diff --git a/api/core.py b/api/core.py index ebf253f..b068756 100644 --- a/api/core.py +++ b/api/core.py @@ -1,11 +1,7 @@ from flask import Flask, jsonify, Response, request -from flask_sqlalchemy import SQLAlchemy -from esales.flask_esales import Esales +from api.extensions import db, esales from api.helpers import check_api_key -from api.exceptions import ValidationError - -db = SQLAlchemy() -esales = Esales() +from api.validators import ValidationError def create_app(config_name='config'): diff --git a/api/exceptions.py b/api/exceptions.py deleted file mode 100644 index a3de8bf..0000000 --- a/api/exceptions.py +++ /dev/null @@ -1,8 +0,0 @@ -# coding=UTF-8 - - -class ValidationError(Exception): - - def __init__(self, message): - Exception.__init__(self) - self.message = message diff --git a/api/extensions.py b/api/extensions.py new file mode 100644 index 0000000..f941f76 --- /dev/null +++ b/api/extensions.py @@ -0,0 +1,5 @@ +from flask_sqlalchemy import SQLAlchemy +from esales.flask_esales import Esales + +db = SQLAlchemy() +esales = Esales() diff --git a/api/models/__init__.py b/api/models/__init__.py index 775abaa..0527000 100644 --- a/api/models/__init__.py +++ b/api/models/__init__.py @@ -1,3 +1,5 @@ +# coding=UTF-8 + from .designer import Designer from .category import Category from .contract_customer import ContractCustomer diff --git a/api/models/category.py b/api/models/category.py index 1332744..ef799fa 100644 --- a/api/models/category.py +++ b/api/models/category.py @@ -1,4 +1,6 @@ -from api import db +# coding=UTF-8 + +from api.extensions import db from api.lib.slugify import slugify from api.models.locale import Locale diff --git a/api/models/contract_customer.py b/api/models/contract_customer.py index ff9a631..dbb4239 100644 --- a/api/models/contract_customer.py +++ b/api/models/contract_customer.py @@ -1,7 +1,7 @@ # coding=UTF-8 +from api.extensions import db from flask_sqlalchemy import BaseQuery -from api import db class ContractCustomerQuery(BaseQuery): diff --git a/api/models/designer.py b/api/models/designer.py index 31d08d5..d139052 100644 --- a/api/models/designer.py +++ b/api/models/designer.py @@ -1,4 +1,6 @@ -from api import db +# coding=UTF-8 + +from api.extensions import db from api.lib.slugify import slugify diff --git a/api/models/i18n.py b/api/models/i18n.py index 74f967a..d0b8f88 100644 --- a/api/models/i18n.py +++ b/api/models/i18n.py @@ -1,6 +1,7 @@ # coding=UTF-8 + +from api.extensions import db from datetime import datetime -from api import db class Text(db.Model): diff --git a/api/models/inquiry.py b/api/models/inquiry.py index 16bdd1a..c64f469 100644 --- a/api/models/inquiry.py +++ b/api/models/inquiry.py @@ -1,4 +1,6 @@ -from api import db +# coding=UTF-8 + +from api.extensions import db class Inquiry(db.Model): diff --git a/api/models/locale.py b/api/models/locale.py index 50eb93d..ea7f14b 100644 --- a/api/models/locale.py +++ b/api/models/locale.py @@ -1,4 +1,6 @@ -from api import db +# coding=UTF-8 + +from api.extensions import db class Locale(db.Model): diff --git a/api/models/market.py b/api/models/market.py index 6f6fc2e..035e3a2 100644 --- a/api/models/market.py +++ b/api/models/market.py @@ -1,5 +1,6 @@ # coding=UTF-8 -from api import db + +from api.extensions import db from .product import Currencies diff --git a/api/models/product.py b/api/models/product.py index 7914254..69f0d76 100644 --- a/api/models/product.py +++ b/api/models/product.py @@ -1,7 +1,7 @@ # coding=UTF-8 +from api.extensions import db from flask_sqlalchemy import BaseQuery -from api import db class Currencies(db.Model): diff --git a/api/resources/server.py b/api/resources/server.py index 1a7c14f..4f7d15f 100644 --- a/api/resources/server.py +++ b/api/resources/server.py @@ -10,9 +10,10 @@ def status(): } return jsonify(data) + @mod.route("/health", methods=["GET"]) def health(): data = { 'status': 'ok' } - return jsonify(data) \ No newline at end of file + return jsonify(data) diff --git a/api/validators.py b/api/validators.py index 33f5083..126569d 100644 --- a/api/validators.py +++ b/api/validators.py @@ -1,6 +1,12 @@ # coding=UTF-8 from api.models.market import iter_markets -from api.exceptions import ValidationError + + +class ValidationError(Exception): + + def __init__(self, message): + Exception.__init__(self) + self.message = message def validate_keys_exists(obj, *keys): diff --git a/tests/test_validators.py b/tests/test_validators.py index e8fe779..df61fd9 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -1,6 +1,5 @@ import unittest2 -from api.validators import validate_keys_exists, validate_territory, validate_number -from api.exceptions import ValidationError +from api.validators import ValidationError, validate_keys_exists, validate_territory, validate_number class TestValidation(unittest2.TestCase):