From: Thomas Waldmann Date: Fri, 17 May 2013 23:07:52 +0000 (+0200) Subject: update docs / changelog about python requirement, add myself to AUTHORS X-Git-Tag: 2.7~85 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50f6965f2e515b95d499e71d73776fc334c0a168;p=thirdparty%2Fjinja.git update docs / changelog about python requirement, add myself to AUTHORS also added 2 FIXMEs to intro.rst about the debugsupport for python 2.4 that needs to get removed --- diff --git a/AUTHORS b/AUTHORS index c6cd9ba2..d5c4b7bd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -29,3 +29,4 @@ Patches and suggestions: - Peter van Dijk (Habbie) - Stefan Ebner - Rene Leonhardt +- Thomas Waldmann diff --git a/CHANGES b/CHANGES index 6539c5fd..7b204dac 100644 --- a/CHANGES +++ b/CHANGES @@ -15,6 +15,8 @@ Version 2.7 want to change this encoding they can override the filter. - Accessing `last` on the loop context no longer causes the iterator to be consumed into a list. +- Python requirement changed: 2.6, 2.7 or >= 3.3 are required now, + supported by same source code, using the "six" compatibility library. Version 2.6 ----------- diff --git a/docs/intro.rst b/docs/intro.rst index b08947d4..4ea65a83 100644 --- a/docs/intro.rst +++ b/docs/intro.rst @@ -2,8 +2,7 @@ Introduction ============ This is the documentation for the Jinja2 general purpose templating language. -Jinja2 is a library for Python 2.4 and onwards that is designed to be flexible, -fast and secure. +Jinja2 is a library for Python that is designed to be flexible, fast and secure. If you have any exposure to other text-based template languages, such as Smarty or Django, you should feel right at home with Jinja2. It's both designer and @@ -13,9 +12,11 @@ useful for templating environments. Prerequisites ------------- -Jinja2 needs at least **Python 2.4** to run. Additionally a working C-compiler -that can create python extensions should be installed for the debugger if you -are using Python 2.4. +Jinja2 works with Python 2.6.x, 2.7.x and >= 3.3. + +FIXME - this is outdated, code should get removed, docs fixed: +Additionally a working C-compiler that can create python extensions should be +installed for the debugger if you are using Python 2.4. If you don't have a working C-compiler and you are trying to install the source release with the debugsupport you will get a compiler error. @@ -100,6 +101,7 @@ By default Jinja2 will not compile the debug support module. Enabling this will fail if you don't have the Python headers or a working compiler. This is often the case if you are installing Jinja2 from a windows machine. +FIXME - outdated: Because the debug support is only necessary for Python 2.4 you will not have to do this unless you run 2.4:: @@ -136,7 +138,7 @@ indeed using unicode internally. Experimental Python 3 Support ----------------------------- -Jinja 2.3 brings experimental support for Python 3. It means that all +Jinja 2.7 brings experimental support for Python >=3.3. It means that all unittests pass on the new version, but there might still be small bugs in there and behavior might be inconsistent. If you notice any bugs, please provide feedback in the `Jinja bug tracker`_.