[PATCH] turbogears.url changes tgparams parameter

[imix]

The function url in turbogears/controllers.py does the following:

    if tgparams is not None:
        tgparams.update(kw)
    else:
        tgparams = kw

this changes the content of the tgparams dictionary outside the function.

Quoting from jon: ( http://groups.google.com/group/turbogears/browse_thread/thread/300430db80e21517/71caff3e9cc7f23e#71caff3e9cc7f23e)

It seems to me that this is a flat out bug: it should be the other way around, (kw.update(tgparams)) and use kw from that point on.

~jon

Which would result in the following patch:

--- controllers.py.orig 2007-06-26 15:25:08.000000000 +0200
+++ controllers.py      2007-06-26 15:26:31.000000000 +0200
@@ -488,11 +488,9 @@
     else:
         result = tgpath
     if tgparams is not None:
-        tgparams.update(kw)
-    else:
-        tgparams = kw
+        kw.update(tgparams)
     args = []
-    for key, value in tgparams.iteritems():
+    for key, value in kw.iteritems():
         if value is None:
             continue
         if isinstance(value, unicode):

[Chris Arndt]

Batch promoting 1.0.3 tickets to Milestone 1.0.4

[Chris Arndt]

I think the code should make a copy of tgparams and then update that with kw. The keyword arguments should override tgparams and not the other way round as your patch would do.

    if tgparams is not None:
        tgparams = tgparams.copy()
        tgparams.update(kw)
    else:
        tgparams = kw

[imix]

You are right, I neglected the case when a name appears both in tgparams and kw. Your solutions seems more logical to me.

[Chris Arndt]

Fixed in r3368 and r3369 and tests added.