[Mpuls-commits] r943 - in wasko/branches/2.0: . waskaweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-27 12:34:39 +0100 (Wed, 27 Jan 2010)
New Revision: 943

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/lib/helpers.py
Log:
* waskaweb/lib/helpers.py: Adapt to changes in Python 0.9.7: Add
some more imports to get more of the old helpers API back.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-27 11:07:53 UTC (rev 942)
+++ wasko/branches/2.0/ChangeLog	2010-01-27 11:34:39 UTC (rev 943)
@@ -1,5 +1,10 @@
 2010-01-27  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/lib/helpers.py: Adapt to changes in Python 0.9.7: Add
+	some more imports to get more of the old helpers API back.
+
+2010-01-27  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/lib/search.py: Fix formatting. Add some comments.
 
 2010-01-27  Torsten Irländer <torsten.irlaender at intevation.de>

Modified: wasko/branches/2.0/waskaweb/lib/helpers.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/helpers.py	2010-01-27 11:07:53 UTC (rev 942)
+++ wasko/branches/2.0/waskaweb/lib/helpers.py	2010-01-27 11:34:39 UTC (rev 943)
@@ -35,12 +35,13 @@
 import datetime
 from string import printable
 
-from pylons import c, cache, config, g, request, response, session
+from pylons import c, cache, config, g, request, response, session, url
 from pylons.i18n import _
 
 # Use url_for from prior versions
 from routes import url_for
-from webhelpers import *
+from webhelpers.html import escape, HTML, literal, url_escape
+from webhelpers.html.tags import *
 
 from waskaweb.lib.navigation import get_pagename, render_navigation
 from waskaweb.lib.security import hasRole, getKAName