[Mpuls-commits] r1311 - in wasko/branches/2.0: . waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-08 12:43:50 +0100 (Mon, 08 Feb 2010)
New Revision: 1311

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/controllers/template.py
Log:
* waskaweb/controllers/template.py: Expand star imports.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-08 11:42:16 UTC (rev 1310)
+++ wasko/branches/2.0/ChangeLog	2010-02-08 11:43:50 UTC (rev 1311)
@@ -1,5 +1,9 @@
 2010-02-08  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/template.py: Expand star imports.
+
+2010-02-08  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/controllers/navigation.py: Fix formatting.
 
 2010-02-08  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/controllers/template.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/template.py	2010-02-08 11:42:16 UTC (rev 1310)
+++ wasko/branches/2.0/waskaweb/controllers/template.py	2010-02-08 11:43:50 UTC (rev 1311)
@@ -21,8 +21,10 @@
 # within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
 # the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and 
 # European Social Fund resources.
-from waskaweb.lib.base import *
 
+from waskaweb.lib.base import BaseController, abort
+
+
 class TemplateController(BaseController):
 
     def view(self, url):