Merge remote branch 'ericflo/master'

pystache/__init__.py

 from pystache.template import Template
 from pystache.view import View
 
-def render(template, context={}, **kwargs):
-    context = context.copy()
-    for key in kwargs:
-        context[key] = kwargs[key]
+def render(template, context=None, **kwargs):
+    context = context and context.copy() or {}
+    context.update(kwargs)
     return Template(template, context).render()

pystache/template.py

@@ -9,9 +9,9 @@ class Template(object):
         '!': 'comment'
     }
 
-    def __init__(self, template, context={}):
+    def __init__(self, template, context=None):
         self.template = template
-        self.context = context
+        self.context = context or {}
 
     def render(self, template=None, context=None):
         """Turns a Mustache template into something wonderful."""

pystache/view.py

@@ -15,12 +15,10 @@ class View(object):
     # Contents of the template.
     template = None
 
-    def __init__(self, template=None, context={}, **kwargs):
+    def __init__(self, template=None, context=None, **kwargs):
         self.template = template
-        self.context = context
-
-        for key in kwargs:
-            self.context[key] = kwargs[key]
+        self.context = context or {}
+        self.context.update(kwargs)
 
     def load_template(self):
         if self.template: