Merge pull request #5 from csomme/context-new-accept-context-19

Allow Context to take another Context instance in new

django/template/context.py

@@ -36,7 +36,9 @@ def __init__(self, dict_=None):
     def _reset_dicts(self, value=None):
         builtins = {'True': True, 'False': False, 'None': None}
         self.dicts = [builtins]
-        if value is not None:
+        if isinstance(value, BaseContext):
+            self.dicts += value.dicts[1:]
+        elif value is not None:
             self.dicts.append(value)
 
     def __copy__(self):

tests/template_tests/test_context.py

@@ -131,7 +131,7 @@ def test_flatten_context(self):
         a.update({'b': 4})
         a.update({'c': 8})
 
-        self.assertEqual(a.flatten(), {
+        self.assertDictEqual(a.flatten(), {
             'False': False, 'None': None, 'True': True,
             'a': 2, 'b': 4, 'c': 8
         })
@@ -150,6 +150,19 @@ def test_flatten_context_with_context(self):
             'z': '8',
         })
 
+    def test_flatten_context_new_context(self):
+        """
+        Context.new with a Context argument should work.
+        """
+        a = Context({'a': 2})
+        b = a.new(Context({'b': 4}))
+        self.assertEqual(b.flatten(), {
+            'False': False,
+	    'None': None,
+	    'True': True,
+            'b': 4
+        })
+
     def test_context_comparable(self):
         """
         #21765 -- equality comparison should work