Merge pull request #40 from alphagov/DMSandboxEnvironment

Use new DMSandboxEnvironment class

dmcontent/__init__.py

@@ -2,4 +2,4 @@
 from .errors import ContentTemplateError, QuestionNotFoundError
 from .questions import ContentQuestion
 
-__version__ = '4.1.0'
+__version__ = '4.2.0'

dmcontent/utils.py

@@ -1,10 +1,11 @@
 import collections
 
 from jinja2 import Markup, StrictUndefined, TemplateSyntaxError, UndefinedError
-from jinja2.sandbox import SandboxedEnvironment
 from markdown import markdown
 from six import string_types
 
+from dmutils.jinja2_environment import DMSandboxedEnvironment
+
 from .errors import ContentTemplateError
 
 
@@ -23,7 +24,7 @@ def __init__(self, field_value, markdown=None):
             raise ContentTemplateError(e.message)
 
     def make_template(self, field_value):
-        env = SandboxedEnvironment(autoescape=True, undefined=StrictUndefined)
+        env = DMSandboxedEnvironment(autoescape=True, undefined=StrictUndefined)
         template = markdown(field_value, []) if self.markdown else field_value
 
         return env.from_string(template)

requirements.txt

@@ -1,2 +1,2 @@
 -e .
-git+https://github.com/alphagov/digitalmarketplace-utils.git@25.0.1#egg=digitalmarketplace-utils==25.0.1
+git+https://github.com/alphagov/digitalmarketplace-utils.git@25.1.0#egg=digitalmarketplace-utils==25.1.0