diff --git a/VERSION b/VERSION index fd1e0dc0..66610d06 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.7 (2012-04-05 18:51:12) dev +Version 1.99.7 (2012-04-05 19:06:57) dev diff --git a/gluon/__init__.py b/gluon/__init__.py index 41204842..f5bfa2cd 100644 --- a/gluon/__init__.py +++ b/gluon/__init__.py @@ -25,11 +25,23 @@ if 0: from globals import Request, Response, Session from cache import Cache from languages import translator + from tools import Auth, Crud, Mail, Service, PluginManager + + # API objects request = Request() response = Response() session = Session() cache = Cache(request) T = translator(request) + + # Objects commonly defined in application model files + # (names are conventions only -- not part of API) + db = DAL() + auth = Auth(db) + crud = Crud(db) + mail = Mail() + service = Service() + plugins = PluginManager()