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 a16712e2164805193ca44d45adf4245adcc27b36..8dad7801a1720afc8b0a7c551a5fc6676f5a650b 100644 (file)
--- 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
     }
 
     # 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}),
                          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
 
     # Create the combined context

-    context = dict(question_context, **tag_context)
+    context = dict(question_context.items() + tag_context.items())

 
     return context
 
 
     return context