[Mpuls-commits] r764 - in wasko/branches/2.0: . waskaweb/lib
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Jan 19 18:47:59 CET 2010
Author: bh
Date: 2010-01-19 18:47:59 +0100 (Tue, 19 Jan 2010)
New Revision: 764
Modified:
wasko/branches/2.0/ChangeLog.txt
wasko/branches/2.0/waskaweb/lib/app_globals.py
Log:
* waskaweb/lib/app_globals.py: Improve formatting
Modified: wasko/branches/2.0/ChangeLog.txt
===================================================================
--- wasko/branches/2.0/ChangeLog.txt 2010-01-19 17:38:30 UTC (rev 763)
+++ wasko/branches/2.0/ChangeLog.txt 2010-01-19 17:47:59 UTC (rev 764)
@@ -1,5 +1,9 @@
2010-01-19 Bernhard Herzog <bh at intevation.de>
+ * waskaweb/lib/app_globals.py: Improve formatting
+
+2010-01-19 Bernhard Herzog <bh at intevation.de>
+
* waskaweb/lib/app_globals.py (Globals.__init__): Remove the
config file logging messages that are now in MpulsConfig
Modified: wasko/branches/2.0/waskaweb/lib/app_globals.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/app_globals.py 2010-01-19 17:38:30 UTC (rev 763)
+++ wasko/branches/2.0/waskaweb/lib/app_globals.py 2010-01-19 17:47:59 UTC (rev 764)
@@ -1,43 +1,51 @@
# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
-#
-# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
# Web-Anwendungs-Server fuer Kompetenzagenturen).
-#
+#
# mpuls WASKA is free software: you can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the
# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
-#
+#
# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
# License for more details.
-#
+#
# You should have received a copy of the GNU Affero General Public
# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
-#
-# mpuls WASKA has been developed on behalf of the
+#
+# mpuls WASKA has been developed on behalf of the
# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
-# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
# European Social Fund resources.
+
"""The application's Globals object"""
+
+import sys
+import os
+import traceback
+import logging
+
import pylons
-import logging
-import os, sys, traceback
from pylons import config
from formed.meta.io.document import openDocument
-import waskaweb.lib.security as security
-from waskaweb.model.annotations import AnnotationsProvider
+import waskaweb.lib.security as security
from waskaweb.lib.timelog import setupTimeLogging
from waskaweb.lib.config import MpulsConfig
+from waskaweb.model.annotations import AnnotationsProvider
+
+
log = logging.getLogger(__name__)
class Globals(object):
+
"""Globals acts as a container for objects available throughout the
life of the application
"""
More information about the Mpuls-commits
mailing list