[Mpuls-commits] r3377 - in wasko/trunk: . waskoweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-08-11 12:51:46 +0200 (Wed, 11 Aug 2010)
New Revision: 3377

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/waskoweb/controllers/formularpage.py
Log:
* waskoweb/controllers/formularpage.py: Import session from
mpulsweb.lib.base instead of from pylons in order to adapt to new
mpuls conventions.


Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2010-08-11 10:50:43 UTC (rev 3376)
+++ wasko/trunk/ChangeLog	2010-08-11 10:51:46 UTC (rev 3377)
@@ -1,5 +1,11 @@
 2010-08-11  Bernhard Herzog  <bh at intevation.de>
 
+	* waskoweb/controllers/formularpage.py: Import session from
+	mpulsweb.lib.base instead of from pylons in order to adapt to new
+	mpuls conventions.
+
+2010-08-11  Bernhard Herzog  <bh at intevation.de>
+
 	* waskoweb/controllers/formularpage.py: Various import fixes:
 	remove unused imports, reorder imports to conform to mpuls
 	conventions, expand star-imports, add log object which was

Modified: wasko/trunk/waskoweb/controllers/formularpage.py
===================================================================
--- wasko/trunk/waskoweb/controllers/formularpage.py	2010-08-11 10:50:43 UTC (rev 3376)
+++ wasko/trunk/waskoweb/controllers/formularpage.py	2010-08-11 10:51:46 UTC (rev 3377)
@@ -33,7 +33,7 @@
 
 import psycopg2
 
-from pylons import request, session, c, g
+from pylons import request, c, g
 from pylons.controllers.util import redirect_to
 
 from formed.instance.backends.postgres import DBFactory as InstanceFactory
@@ -42,7 +42,7 @@
 from mpulsweb.lib.translation import _
 from mpulsweb.lib.security import checkRole
 from mpulsweb.lib.db import db, PostgresDBInterface
-from mpulsweb.lib.base import render
+from mpulsweb.lib.base import render, session
 from mpulsweb.lib.renderer import apply_hidden_booleans
 from mpulsweb.lib.helpers import url_for