From 5952043f33f099ed5d29210c2672d0cfe802f85f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 20 Nov 2014 15:21:11 +0100 Subject: [PATCH] default config for webservice --- webservice/bam/application/__init__.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/webservice/bam/application/__init__.py b/webservice/bam/application/__init__.py index 1646099..b883fed 100644 --- a/webservice/bam/application/__init__.py +++ b/webservice/bam/application/__init__.py @@ -43,8 +43,17 @@ from flask.ext.sqlalchemy import SQLAlchemy app = Flask(__name__) api = Api(app) auth = HTTPBasicAuth() -import config -app.config.from_object(config.Development) + +try: + import config +except ImportError: + config = None + +if config is None: + app.config["ALLOWED_EXTENSIONS"] = {'txt', 'mp4', 'png', 'jpg', 'jpeg', 'gif', 'blend', 'zip'} +else: + app.config.from_object(config.Development) + db = SQLAlchemy(app) from application.modules.admin import backend