[Mpuls-commits] r4672 - in base/trunk: . mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-02-21 19:30:10 +0100 (Mon, 21 Feb 2011)
New Revision: 4672

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/auth.py
Log:
* mpulsweb/controllers/auth.py: pylons.h is deprecated. Import
mpulsweb.lib.helpers as h instead.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-02-21 16:21:21 UTC (rev 4671)
+++ base/trunk/ChangeLog	2011-02-21 18:30:10 UTC (rev 4672)
@@ -1,3 +1,8 @@
+2011-02-21  Bernhard Herzog  <bh at intevation.de>
+
+	* mpulsweb/controllers/auth.py: pylons.h is deprecated. Import
+	mpulsweb.lib.helpers as h instead.
+
 2011-02-21  Ludwig Reiter <ludwig.reiter at intevation.de>
 	
 	* mpulsweb/i18n/mpulsweb.pot

Modified: base/trunk/mpulsweb/controllers/auth.py
===================================================================
--- base/trunk/mpulsweb/controllers/auth.py	2011-02-21 16:21:21 UTC (rev 4671)
+++ base/trunk/mpulsweb/controllers/auth.py	2011-02-21 18:30:10 UTC (rev 4672)
@@ -1,12 +1,14 @@
 import logging
 import md5
 
-from pylons import request, response, tmpl_context as c, h
+from pylons import request, response, tmpl_context as c
 from pylons.controllers.util import redirect_to
 
 from mpulsweb.lib.base import BaseController, render, session, auth_cookie_name
 from mpulsweb.lib.security import checkLogin, generateID, userIdentity
+import mpulsweb.lib.helpers as h
 
+
 log = logging.getLogger(__name__)
 
 class AuthController(BaseController):