put all extensions in a new file

api/core.py

@@ -1,11 +1,7 @@
 from flask import Flask, jsonify, Response, request
-from flask_sqlalchemy import SQLAlchemy
+from api.extensions import db, esales
-from esales.flask_esales import Esales
 from api.helpers import check_api_key
-from api.exceptions import ValidationError
+from api.validators import ValidationError
-
-db = SQLAlchemy()
-esales = Esales()
 
 
 def create_app(config_name='config'):

api/exceptions.py

@@ -1,8 +0,0 @@
-# coding=UTF-8
-
-
-class ValidationError(Exception):
-
-    def __init__(self, message):
-        Exception.__init__(self)
-        self.message = message

api/extensions.py

@@ -0,0 +1,5 @@
+from flask_sqlalchemy import SQLAlchemy
+from esales.flask_esales import Esales
+
+db = SQLAlchemy()
+esales = Esales()

api/models/__init__.py

@@ -1,3 +1,5 @@
+# coding=UTF-8
+
 from .designer import Designer
 from .category import Category
 from .contract_customer import ContractCustomer

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
 

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):

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
 
 

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):

api/models/inquiry.py

@@ -1,4 +1,6 @@
-from api import db
+# coding=UTF-8
+
+from api.extensions import db
 
 
 class Inquiry(db.Model):

api/models/locale.py

@@ -1,4 +1,6 @@
-from api import db
+# coding=UTF-8
+
+from api.extensions import db
 
 
 class Locale(db.Model):

api/models/market.py

@@ -1,5 +1,6 @@
 # coding=UTF-8
-from api import db
+
+from api.extensions import db
 from .product import Currencies
 
 

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):

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)
+    return jsonify(data)

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):

tests/test_validators.py

@@ -1,6 +1,5 @@
 import unittest2
-from api.validators import validate_keys_exists, validate_territory, validate_number
+from api.validators import ValidationError, validate_keys_exists, validate_territory, validate_number
-from api.exceptions import ValidationError
 
 
 class TestValidation(unittest2.TestCase):