@@ -143,7 +143,12 @@ class TemplateInline(object): context = Context() context.update(self.kwargs) context['variant'] = self.variant - return render_to_string(self.get_template_name(), self.get_context(), context) + output = render_to_string(self.get_template_name(), self.get_context(), context) + # apparently in order to clean up properly we have to pop exactly twice. I need + # to trace through this to figure out exactly what's happening here, but this works. + context.pop() + context.pop() + return output class ModelInline(TemplateInline): django_inlines/inlines.py @@ -122,6 +122,16 @@ class ProcessInlinesTestCase(TestCase): } self.assertEqual(self.render(template, context), u'<p>This is my YouTube video: <div class="youtube_video">\n<b>C_ZebDKv1zo</b>\n</div>\n</p>') + def test_that_context_gets_popped(self): + inlines.registry.register('youtube', YoutubeInline) + + template = """{% load inlines %}<p>{% process_inlines body in 'youtube_inlines' %} {{ test }}</p>""" + context = { + 'body': u"This is my YouTube video: {{ youtube C_ZebDKv1zo bold=bold }} {{ youtube C_ZebDKv1zo }}", + 'test': u"green" + } + self.assertEqual(self.render(template, context), u'<p>This is my YouTube video: <div class="youtube_video">\n<b>C_ZebDKv1zo</b>\n</div>\n <div class="youtube_video">\nC_ZebDKv1zo\n</div>\n green</p>') + def test_usage_with_template_dirs_fallback(self): """ A if the a template in the specified dir doesn't exist it should fallback tests/core/tests/templatetags.py f9d724b2858dc5ecf68b7ee4fe3e93cce66d6a53 xian xian@mintchaos.com http://github.com/mintchaos/django_inlines/commit/2f06c4f831be2e58d289ecb4b9f5b999a9e4e2ac 2f06c4f831be2e58d289ecb4b9f5b999a9e4e2ac 2009-05-13T01:35:33-07:00 2009-05-13T01:35:33-07:00 Made context clean up after itself. c4d5ed80b740f78138bda130f3d8af2bc129f331 xian xian@mintchaos.com