Repository :
http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
---------------------------------------------------------------
commit 690a00118d910eb4e38a9311a149247f24c10665
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Tue Feb 12 15:06:15 2013 +0100
Reorganize the import, add a __version__ and import the config file is one is
provided
---------------------------------------------------------------
fedocal/__init__.py | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/fedocal/__init__.py b/fedocal/__init__.py
index bf79ee6..9fcfe52 100644
--- a/fedocal/__init__.py
+++ b/fedocal/__init__.py
@@ -28,14 +28,15 @@
__requires__ = ['SQLAlchemy >= 0.7', 'jinja2 >= 2.4']
import pkg_resources
+__version__ = '0.1.0'
import datetime
-from dateutil.relativedelta import relativedelta
-import vobject
-from sqlalchemy.exc import SQLAlchemyError
-
import flask
+import os
+import vobject
+from dateutil.relativedelta import relativedelta
from flask_fas import FAS, cla_plus_one_required
+from sqlalchemy.exc import SQLAlchemyError
import forms as forms
import fedocal.fedocallib as fedocallib
@@ -48,10 +49,14 @@ APP = flask.Flask(__name__)
# set up FAS
FAS = FAS(APP)
APP.config.from_object('fedocal.default_config')
-APP.config.from_envvar('FEDOCAL_CONFIG')
+
+if 'FEDOCAL_CONFIG' in os.environ:
+ APP.config.from_envvar('FEDOCAL_CONFIG')
+
SESSION = fedocallib.create_session(APP.config['DB_URL'])
+
import fedocal.api