Simplified pystache.render(): now shares code with Template.__init__().

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

@@ -73,7 +73,8 @@ class Template(object):
 
         if context is None:
             context = {}
-        elif not isinstance(context, View):
+
+        if not isinstance(context, View):
             # Views do not support copy() or update().
             context = context.copy()
             if kwargs: