[Mpuls-commits] r5906 - base/trunk/mpulsweb/lib

[scm-commit at wald.intevation.org]

Author: ludwig
Date: 2012-03-13 12:41:32 +0100 (Tue, 13 Mar 2012)
New Revision: 5906

Modified:
   base/trunk/mpulsweb/lib/formedrenderer.py
Log:
Issue 2738: Replace url_for from URL factory.


Modified: base/trunk/mpulsweb/lib/formedrenderer.py
===================================================================
--- base/trunk/mpulsweb/lib/formedrenderer.py	2012-03-13 10:42:08 UTC (rev 5905)
+++ base/trunk/mpulsweb/lib/formedrenderer.py	2012-03-13 11:41:32 UTC (rev 5906)
@@ -32,16 +32,16 @@
 from formed.renderer.html import RendererContext, Container, Item
 from formed.renderer.helpers import tag, escape
 
-from mpulsweb.lib.helpers import url_for,url
+from mpulsweb.lib.helpers import url
 
 
 class UrlFactory(BaseUrlFactory):
 
-    def url_for(self, controller, action, id=None):
-        url_for_args = {"controller": controller, "action":action}
+    def url(self, controller, action, id=None):
+        url_args= {"controller": controller, "action":action}
         if not id is None:
-            url_for_args["id"] = id
-        return url_for(**url_for_args)
+            url_args["id"] = id
+        return url(**url_args)
 
     def icon(self, name):
         """Return the url for the icon given by name."""