fixes some smaller problems for Jinja2 on Jython.

--HG--
branch : trunk

diff --git a/.hgignore b/.hgignore
index 7a1b935bfc6edfc066659982ed07be1ad062cc27..d5acae402e6e52c3976471438824d94717442fc3 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -4,6 +4,7 @@
 ^docs/_build
 ^(build|dist|Jinja2\.egg-info)/
 \.py[co]$
+\$py\.class$
 \.DS_Store$
-^env/
+^j?env/
 ^py3k/

diff --git a/CHANGES b/CHANGES
index 05d28d745106aa04019d2992299a4cd7a3454c12..65a37b0c1d3c4d68e3ac516d2a5a83b41645e97c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
 Jinja2 Changelog
 ================
 
+Version 2.2.1
+-------------
+(bugfix release, released on September 14th 2009)
+
+- fixes some smaller problems for Jinja2 on Jython.
+
 Version 2.2
 -----------
 (codename Kong, released on September 13th 2009)

diff --git a/setup.py b/setup.py
index 09998a49744503a39039855b1ad73427a471379b..bcdc5dd6596cff962869a405ebd7e02d317152a5 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ from distutils.errors import CCompilerError, DistutilsPlatformError
 
 setup(
     name='Jinja2',
-    version='2.3',
+    version='2.2.1',
     url='http://jinja.pocoo.org/',
     license='BSD',
     author='Armin Ronacher',

diff --git a/tests/test_ext.py b/tests/test_ext.py
index ed2c683273330eca99ff7b385be70e1c8b882096..a12ca334dc9c212d3cfe757663104c58c8715308 100644 (file)
--- a/tests/test_ext.py
+++ b/tests/test_ext.py
@@ -15,7 +15,7 @@ from jinja2.lexer import Token, count_newlines
 importable_object = 23
 
 
-_gettext_re = re.compile(r'_\((.*?)\)')
+_gettext_re = re.compile(r'_\((.*?)\)(?s)')
 
 
 class TestExtension(Extension):
@@ -49,7 +49,7 @@ class StreamFilterExtension(Extension):
 
     def filter_stream(self, stream):
         for token in stream:
-            if token.type is 'data':
+            if token.type == 'data':
                 for t in self.interpolate(token):
                     yield t
             else:
@@ -132,9 +132,10 @@ def test_preprocessor_extension():
 
 def test_streamfilter_extension():
     env = Environment(extensions=[StreamFilterExtension])
-    env.globals['gettext'] = lambda x: x.title()
+    env.globals['gettext'] = lambda x: x.upper()
     tmpl = env.from_string('Foo _(bar) Baz')
-    assert tmpl.render() == 'Foo Bar Baz'
+    out = tmpl.render()
+    assert out == 'Foo BAR Baz'
 
 
 class WithExtension(Extension):

diff --git a/tests/test_filters.py b/tests/test_filters.py
index 19902ff8583d2771cf6549855d2ee2df79488bc0..574169370fa83b15e5423ab738e296d41ce81092 100644 (file)
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -89,10 +89,10 @@ def test_default():
 
 def test_dictsort():
     tmpl = env.from_string(DICTSORT)
-    out = tmpl.render(foo={"a": 0, "b": 1, "c": 2, "A": 3})
-    assert out == ("[('a', 0), ('A', 3), ('b', 1), ('c', 2)]|"
-                   "[('A', 3), ('a', 0), ('b', 1), ('c', 2)]|"
-                   "[('a', 0), ('b', 1), ('c', 2), ('A', 3)]")
+    out = tmpl.render(foo={"aa": 0, "b": 1, "c": 2, "AB": 3})
+    assert out == ("[('aa', 0), ('AB', 3), ('b', 1), ('c', 2)]|"
+                   "[('AB', 3), ('aa', 0), ('b', 1), ('c', 2)]|"
+                   "[('aa', 0), ('b', 1), ('c', 2), ('AB', 3)]")
 
 
 def test_batch():

diff --git a/tests/test_various.py b/tests/test_various.py
index 92ac6b8a8caccdc36cce00abc60bd5cb77e5b8b5..942c1c3f9ca7502ec2ecb12a93a2800ef9e6cfee 100644 (file)
--- a/tests/test_various.py
+++ b/tests/test_various.py
@@ -11,6 +11,7 @@ from jinja2 import escape, is_undefined, Environment
 from jinja2.utils import Cycler
 from jinja2.exceptions import TemplateSyntaxError
 
+from nose import SkipTest
 from nose.tools import assert_raises
 
 env = Environment()
@@ -53,6 +54,9 @@ def test_localset():
 
 
 def test_markup_leaks():
+    # this test only tests the c extension
+    if hasattr(escape, 'func_code'):
+        raise SkipTest()
     counts = set()
     for count in xrange(20):
         for item in xrange(1000):