From: David Lord <davidism@gmail.com>
Date: Wed, 5 Jul 2017 17:11:00 +0000 (-0700)
Subject: Merge branch 'master' into dont-inline-random
X-Git-Tag: 2.10~21^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92c31d6a461a37d340be2c93c8b8f16ca7b867aa;p=thirdparty%2Fjinja.git

Merge branch 'master' into dont-inline-random
---

92c31d6a461a37d340be2c93c8b8f16ca7b867aa
diff --cc jinja2/filters.py
index eb8f54ba,38ac8934..81040ada
--- a/jinja2/filters.py
+++ b/jinja2/filters.py
@@@ -10,18 -10,19 +10,19 @@@
  """
  import re
  import math
 +import random
  
- from operator import itemgetter
 -from random import choice
  from itertools import groupby
+ from collections import namedtuple
  from jinja2.utils import Markup, escape, pformat, urlize, soft_unicode, \
-      unicode_urlencode
+      unicode_urlencode, htmlsafe_json_dumps
  from jinja2.runtime import Undefined
  from jinja2.exceptions import FilterArgumentError
- from jinja2._compat import imap, string_types, text_type, iteritems
+ from jinja2._compat import imap, string_types, text_type, iteritems, PY2
  
  
- _word_re = re.compile(r'\w+(?u)')
+ _word_re = re.compile(r'\w+', re.UNICODE)
+ _word_beginning_split_re = re.compile(r'([-\s\(\{\[\<]+)', re.UNICODE)
  
  
  def contextfilter(f):
diff --cc tests/test_filters.py
index ceaba509,318a347c..30e7ca55
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@@ -5,10 -5,9 +5,10 @@@
  
      Tests for the jinja filters.
  
-     :copyright: (c) 2010 by the Jinja Team.
+     :copyright: (c) 2017 by the Jinja Team.
      :license: BSD, see LICENSE for more details.
  """
 +import random
  import pytest
  from jinja2 import Markup, Environment
  from jinja2._compat import text_type, implements_to_string