Merge branch 'issue_51' into development: closing issue #51

HISTORY.rst

@@ -3,8 +3,9 @@ History
 
 Next Release (version TBD)
 --------------------------
-* Bugfix: Passing **kwargs to Template.__init__() with no context
-  raised an exception. [cjerdonek]
+* Bugfix: Passing **kwargs to Template() modified the context. [cjerdonek]
+* Bugfix: Passing **kwargs to Template() with no context raised an
+  exception. [cjerdonek]
 * Bugfix: Whitespace surrounding sections is no longer altered, in
   accordance with the mustache spec. [heliodor]
 * A custom template loader can now be passed to a View. [cjerdonek]

pystache/init.py

@@ -18,7 +18,4 @@ def render(template, context=None, **kwargs):
     Return the given template string rendered using the given context.
 
     """
-    context = context and context.copy() or {}
-    context.update(kwargs)
-
-    return Template(template, context).render()
+    return Template(template, context, **kwargs).render()

pystache/template.py

@@ -62,6 +62,11 @@ class Template(object):
     modifiers = Modifiers()
 
     def __init__(self, template=None, context=None, **kwargs):
+        """
+        The **kwargs arguments are only supported if the context is
+        a dictionary (i.e. not a View).
+
+        """
         from .view import View
 
         self.template = template
@@ -69,8 +74,11 @@ class Template(object):
         if context is None:
             context = {}
 
-        if kwargs:
-            context.update(kwargs)
+        if not isinstance(context, View):
+            # Views do not support copy() or update().
+            context = context.copy()
+            if kwargs:
+                context.update(kwargs)
 
         self.view = context if isinstance(context, View) else View(context=context)
         self._compile_regexps()

tests/test_template.py

@@ -12,6 +12,8 @@ from pystache.template import Template
 
 class TemplateTestCase(unittest.TestCase):
 
+    """Test the Template class."""
+
     def test_init__kwargs_with_no_context(self):
         """
         Test passing **kwargs with no context.
@@ -20,3 +22,12 @@ class TemplateTestCase(unittest.TestCase):
         # This test checks that the following line raises no exception.
         template = Template(foo="bar")
 
+    def test_init__kwargs_does_not_modify_context(self):
+        """
+        Test that passing **kwargs does not modify the passed context.
+
+        """
+        context = {}
+        template = Template(context=context, foo="bar")
+        self.assertEquals(context, {})
+