From: David Lord <davidism@gmail.com>
Date: Wed, 5 Jul 2017 18:58:34 +0000 (-0700)
Subject: Merge branch 'master' into unique-filter
X-Git-Tag: 2.10~20^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2fc06d3acc88baf75e253bc336a26fe98c1b132;p=thirdparty%2Fjinja.git

Merge branch 'master' into unique-filter
---

f2fc06d3acc88baf75e253bc336a26fe98c1b132
diff --cc tests/test_filters.py
index d6c5a759,54aa16b8..3cf94ac3
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@@ -13,17 -14,8 +14,17 @@@ from jinja2 import Markup, Environmen
  from jinja2._compat import text_type, implements_to_string
  
  
 +@implements_to_string
 +class Magic(object):
 +    def __init__(self, value):
 +        self.value = value
 +
 +    def __str__(self):
 +        return text_type(self.value)
 +
 +
  @pytest.mark.filter
- class TestFilter():
+ class TestFilter(object):
  
      def test_filter_calling(self, env):
          rv = env.call_filter('sum', [1, 2, 3])