[Mpuls-commits] r759 - in wasko/branches/2.0: . waskaweb/config

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-19 17:29:22 +0100 (Tue, 19 Jan 2010)
New Revision: 759

Modified:
   wasko/branches/2.0/ChangeLog.txt
   wasko/branches/2.0/waskaweb/config/environment.py
Log:
* waskaweb/config/environment.py: Improve formatting


Modified: wasko/branches/2.0/ChangeLog.txt
===================================================================
--- wasko/branches/2.0/ChangeLog.txt	2010-01-19 16:25:00 UTC (rev 758)
+++ wasko/branches/2.0/ChangeLog.txt	2010-01-19 16:29:22 UTC (rev 759)
@@ -1,5 +1,9 @@
 2010-01-19  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/config/environment.py: Improve formatting
+
+2010-01-19  Bernhard Herzog  <bh at intevation.de>
+
 	* environment.py (load_environment): Initialize application with
 	the correct paths immediately instead of overriding them after
 	initialization

Modified: wasko/branches/2.0/waskaweb/config/environment.py
===================================================================
--- wasko/branches/2.0/waskaweb/config/environment.py	2010-01-19 16:25:00 UTC (rev 758)
+++ wasko/branches/2.0/waskaweb/config/environment.py	2010-01-19 16:29:22 UTC (rev 759)
@@ -1,27 +1,29 @@
 # Copyright 2007, 2008, 2010 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.
+
 """Pylons environment configuration"""
+
 import os
 import logging
 
@@ -35,9 +37,7 @@
 log = logging.getLogger(__name__)
 
 def load_environment(global_conf, app_conf):
-    """Configure the Pylons environment via the ``pylons.config``
-    object
-    """
+    """Configure the Pylons environment via the ``pylons.config`` object"""
     # Pylons paths
     root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -49,12 +49,12 @@
         template_urls.append(custom_templates)
     template_urls.append(os.path.join(root, 'templates'))
 
-    # Static content (images, styles, formed...) 
+    # Static content (images, styles, formed...)
     static_url = os.path.join(root, 'public')
     if global_conf.get('mpuls.app.path.public'):
-        static_url = global_conf.get('mpuls.app.path.public') 
+        static_url = global_conf.get('mpuls.app.path.public')
         log.info('Custom "public" directory: %s' % static_url)
-    
+
     paths = dict(root=root,
                  controllers=os.path.join(root, 'controllers'),
                  static_files=static_url,