From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Mon, 1 Aug 2011 11:13:52 +0000 (+0000)
Subject: Resolves Jira-735, take another approach to merge the two dicts
X-Git-Tag: live~167
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/9694fb0873b055992c5d2d00ff12f946b2f26c08

Resolves Jira-735, take another approach to merge the two dicts

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1146 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/views/readers.py b/forum/views/readers.py
index a16712e..8dad780 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -119,15 +119,15 @@ def tag(request, tag):
     }
 
     # The context returned by the question_list function, contains info about the questions
-    question_context = question_list(request,
+    question_context = dict(question_list(request,
                          questions,
                          mark_safe(_(u'questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
                          None,
                          mark_safe(_(u'Questions Tagged With %(tag)s') % {'tag': tag}),
-                         False)
+                         False))
 
     # Create the combined context
-    context = dict(question_context, **tag_context)
+    context = dict(question_context.items() + tag_context.items())
 
     return context