From c8495264b503a595fbc89e6c8a83a402eff445c6 Mon Sep 17 00:00:00 2001

From: Mathieu Pillard <m@virgule.net>

Date: Sun, 25 May 2014 14:09:33 +0200

Subject: [PATCH] Use get_template() when dealing with django templates

---

 compressor/offline/django.py | 16 +++++++---------

 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/compressor/offline/django.py b/compressor/offline/django.py

index 6541471..3986562 100644

--- a/compressor/offline/django.py

+++ b/compressor/offline/django.py

@@ -1,13 +1,12 @@

 from __future__ import absolute_import

-import io

 from copy import copy

 from django import template

 from django.conf import settings

-from django.template import Template

 from django.template import Context

 from django.template.base import Node, VariableNode, TextNode, NodeList

 from django.template.defaulttags import IfNode

+from django.template.loader import get_template

 from django.template.loader_tags import ExtendsNode, BlockNode, BlockContext

@@ -93,13 +92,12 @@ def __init__(self, charset):

         self.charset = charset

     def parse(self, template_name):

-        with io.open(template_name, mode='rb') as file:

-            try:

-                return Template(file.read().decode(self.charset))

-            except template.TemplateSyntaxError as e:

-                raise TemplateSyntaxError(str(e))

-            except template.TemplateDoesNotExist as e:

-                raise TemplateDoesNotExist(str(e))

+        try:

+            return get_template(template_name)

+        except template.TemplateSyntaxError as e:

+            raise TemplateSyntaxError(str(e))

+        except template.TemplateDoesNotExist as e:

+            raise TemplateDoesNotExist(str(e))

     def process_template(self, template, context):

         return True