From: Armin Ronacher Date: Sun, 4 Jan 2009 13:26:19 +0000 (+0100) Subject: Copyright switch to "The Jinja Team". X-Git-Tag: 2.2~53 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62ccd1be3d03bc27d4f3d8e83c0e8702c31d435d;p=thirdparty%2Fjinja.git Copyright switch to "The Jinja Team". --HG-- branch : trunk --- diff --git a/AUTHORS b/AUTHORS index 0b6b6b3a..5f17a832 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,10 +1,30 @@ -Jinja is written and maintained by Armin Ronacher . +Jinja is written and maintained by the Jinja Team and various +contributors: -Other contributors (as mentionend in :copyright:s) are: +Lead Developer: - Armin Ronacher + +Developers: + +- Christoph Hack - Georg Brandl -- Lawrence Journal-World. + +Contributors: + - Bryan McLemore - Mickaël Guérin - Cameron Knight +- Lawrence Journal-World. +- David Cramer + +Patches and suggestions: + +- Ronny Pfannschmidt +- Axel Böhm +- Alexey Melchakov +- Bryan McLemore +- Clovis Fabricio (nosklo) +- Cameron Knight +- Peter van Dijk (Habbie) +- Stefan Ebner diff --git a/LICENSE b/LICENSE index 859db46b..efcc6911 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,7 @@ -Copyright (c) 2006-2008 by the respective authors (see AUTHORS file). -All rights reserved. +Copyright (c) 2006-2008 by the Jinja Team and contributors (see +AUTHORS file). + +Some rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/THANKS b/THANKS deleted file mode 100644 index a4aabb5f..00000000 --- a/THANKS +++ /dev/null @@ -1,15 +0,0 @@ -Thanks To -========= - -All the people listed here helped improving Jinja a lot, provided -patches, helped working out solutions etc. Thanks to all of you! - -- Ronny Pfannschmidt -- Axel Böhm -- Alexey Melchakov -- Stefan Ebner -- Bryan McLemore -- David Cramer -- Clovis Fabricio (nosklo) -- Cameron Knight -- Peter van Dijk (Habbie) diff --git a/examples/rwbench/rwbench.py b/examples/rwbench/rwbench.py index 742e0ea9..9cb3195a 100644 --- a/examples/rwbench/rwbench.py +++ b/examples/rwbench/rwbench.py @@ -7,7 +7,7 @@ Jinja2 repository this has no real-world usefulnes (despite the name). Just go away and ignore it. NOW! - :copyright: Copyright 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ import sys diff --git a/ext/django2jinja/django2jinja.py b/ext/django2jinja/django2jinja.py index c9f3a711..9dae0095 100644 --- a/ext/django2jinja/django2jinja.py +++ b/ext/django2jinja/django2jinja.py @@ -65,7 +65,7 @@ For details about the writing process have a look at the module code. - :copyright: Copyright 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ import re diff --git a/ext/djangojinja2.py b/ext/djangojinja2.py index 492c2527..ff584b79 100644 --- a/ext/djangojinja2.py +++ b/ext/djangojinja2.py @@ -15,7 +15,7 @@ `JINJA2_CACHE_SIZE` The size of the Jinja2 template cache. ======================= ============================================= - :copyright: Copyright 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ from itertools import chain diff --git a/ext/inlinegettext.py b/ext/inlinegettext.py index 049ab3b2..cf4ed5e4 100644 --- a/ext/inlinegettext.py +++ b/ext/inlinegettext.py @@ -6,7 +6,7 @@ An example extension for Jinja2 that supports inline gettext calls. Requires the i18n extension to be loaded. - :copyright: Copyright 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ import re diff --git a/ext/jinja.el b/ext/jinja.el index bff9e830..401ba293 100644 --- a/ext/jinja.el +++ b/ext/jinja.el @@ -1,6 +1,7 @@ ;;; jinja.el --- Jinja mode highlighting ;; ;; Author: Georg Brandl +;; Copyright: (c) 2009 by the Jinja Team ;; Last modified: 2008-05-22 23:04 by gbr ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/jinja2/__init__.py b/jinja2/__init__.py index 95b2d5bc..b7a14f78 100644 --- a/jinja2/__init__.py +++ b/jinja2/__init__.py @@ -23,7 +23,7 @@ {% endblock %} - :copyright: 2008 by Armin Ronacher, Christoph Hack. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ __docformat__ = 'restructuredtext en' diff --git a/jinja2/_ipysupport.py b/jinja2/_ipysupport.py index 22ae823a..f7f807b5 100644 --- a/jinja2/_ipysupport.py +++ b/jinja2/_ipysupport.py @@ -6,7 +6,7 @@ IronPython support library. This library exports functionality from the CLR to Python that is normally available in the standard library. - :copyright: Copyright 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ from System import DateTime diff --git a/jinja2/_speedups.c b/jinja2/_speedups.c index cce9dfbb..c8ef9afb 100644 --- a/jinja2/_speedups.c +++ b/jinja2/_speedups.c @@ -8,7 +8,7 @@ * implementation of `tb_set_next` and Python implementations of the other * functions are used. * - * :copyright: 2008 by Armin Ronacher, Mickaël Guérin. + * :copyright: (c) 2009 by the Jinja Team. * :license: BSD. */ diff --git a/jinja2/bccache.py b/jinja2/bccache.py index 2c57616e..2786082e 100644 --- a/jinja2/bccache.py +++ b/jinja2/bccache.py @@ -11,7 +11,7 @@ Situations where this is useful are often forking web applications that are initialized on the first request. - :copyright: Copyright 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ from os import path, listdir diff --git a/jinja2/compiler.py b/jinja2/compiler.py index e17aa1de..0e74faf2 100644 --- a/jinja2/compiler.py +++ b/jinja2/compiler.py @@ -5,7 +5,7 @@ Compiles nodes into python code. - :copyright: Copyright 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ from cStringIO import StringIO diff --git a/jinja2/constants.py b/jinja2/constants.py index c471e79e..6e7ed906 100644 --- a/jinja2/constants.py +++ b/jinja2/constants.py @@ -5,7 +5,7 @@ Various constants. - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ diff --git a/jinja2/debug.py b/jinja2/debug.py index 53dac4d1..38fa012f 100644 --- a/jinja2/debug.py +++ b/jinja2/debug.py @@ -7,7 +7,7 @@ ugly stuff with the Python traceback system in order to achieve tracebacks with correct line numbers, locals and contents. - :copyright: Copyright 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ import sys diff --git a/jinja2/defaults.py b/jinja2/defaults.py index 3e24e7de..aacd32b4 100644 --- a/jinja2/defaults.py +++ b/jinja2/defaults.py @@ -5,7 +5,7 @@ Jinja default filters and tags. - :copyright: 2007-2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ from jinja2.utils import generate_lorem_ipsum, Cycler, Joiner diff --git a/jinja2/environment.py b/jinja2/environment.py index 9d43339a..3c53fbd5 100644 --- a/jinja2/environment.py +++ b/jinja2/environment.py @@ -5,7 +5,7 @@ Provides a class that holds runtime and parsing time options. - :copyright: 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ import sys diff --git a/jinja2/exceptions.py b/jinja2/exceptions.py index 5bfca660..c40f7de9 100644 --- a/jinja2/exceptions.py +++ b/jinja2/exceptions.py @@ -5,7 +5,7 @@ Jinja exceptions. - :copyright: 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ diff --git a/jinja2/ext.py b/jinja2/ext.py index 353f2654..cc8f4310 100644 --- a/jinja2/ext.py +++ b/jinja2/ext.py @@ -7,7 +7,7 @@ tags work. By default two example extensions exist: an i18n and a cache extension. - :copyright: Copyright 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ from collections import deque diff --git a/jinja2/filters.py b/jinja2/filters.py index afa7667c..553ce6e9 100644 --- a/jinja2/filters.py +++ b/jinja2/filters.py @@ -5,7 +5,7 @@ Bundled jinja filters. - :copyright: 2008 by Armin Ronacher, Christoph Hack. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ import re diff --git a/jinja2/lexer.py b/jinja2/lexer.py index 6b269836..19509ac2 100644 --- a/jinja2/lexer.py +++ b/jinja2/lexer.py @@ -11,7 +11,7 @@ operators we don't allow in templates. On the other hand it separates template code and python code in expressions. - :copyright: 2007-2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ import re diff --git a/jinja2/loaders.py b/jinja2/loaders.py index c61cd840..b5817c75 100644 --- a/jinja2/loaders.py +++ b/jinja2/loaders.py @@ -5,7 +5,7 @@ Jinja loader classes. - :copyright: 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ from os import path diff --git a/jinja2/nodes.py b/jinja2/nodes.py index 9d78b254..483366b1 100644 --- a/jinja2/nodes.py +++ b/jinja2/nodes.py @@ -9,7 +9,7 @@ `get_nodes` used by the parser and translator in order to normalize python and jinja nodes. - :copyright: 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ import operator diff --git a/jinja2/optimizer.py b/jinja2/optimizer.py index 43065df6..1831beb8 100644 --- a/jinja2/optimizer.py +++ b/jinja2/optimizer.py @@ -13,7 +13,7 @@ The solution would be a second syntax tree that has the scoping rules stored. - :copyright: Copyright 2008 by Christoph Hack, Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ from jinja2 import nodes diff --git a/jinja2/parser.py b/jinja2/parser.py index e8f07c5f..5aa720e8 100644 --- a/jinja2/parser.py +++ b/jinja2/parser.py @@ -5,7 +5,7 @@ Implements the template parser. - :copyright: 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ from jinja2 import nodes diff --git a/jinja2/runtime.py b/jinja2/runtime.py index 87c23546..60a9035f 100644 --- a/jinja2/runtime.py +++ b/jinja2/runtime.py @@ -5,7 +5,7 @@ Runtime helpers. - :copyright: Copyright 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ import sys diff --git a/jinja2/sandbox.py b/jinja2/sandbox.py index 7b28273d..c29bdea2 100644 --- a/jinja2/sandbox.py +++ b/jinja2/sandbox.py @@ -9,7 +9,7 @@ The behavior can be changed by subclassing the environment. - :copyright: Copyright 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ import operator diff --git a/jinja2/tests.py b/jinja2/tests.py index 6873b5a8..58dc0c05 100644 --- a/jinja2/tests.py +++ b/jinja2/tests.py @@ -5,7 +5,7 @@ Jinja test functions. Used with the "is" operator. - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ import re diff --git a/jinja2/utils.py b/jinja2/utils.py index 45be2c29..5e31779e 100644 --- a/jinja2/utils.py +++ b/jinja2/utils.py @@ -5,7 +5,7 @@ Utility functions. - :copyright: 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ import re diff --git a/jinja2/visitor.py b/jinja2/visitor.py index ad111088..c27c24ce 100644 --- a/jinja2/visitor.py +++ b/jinja2/visitor.py @@ -5,7 +5,7 @@ This module implements a visitor for the nodes. - :copyright: Copyright 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ from jinja2.nodes import Node diff --git a/tests/conftest.py b/tests/conftest.py index fa60acd1..453fbd72 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,7 +5,7 @@ Configure py.test for support stuff. - :copyright: 2007 by Armin Ronacher, Alexander Schremmer. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ diff --git a/tests/test_debug.py b/tests/test_debug.py index 7f59445d..d9c5f7a9 100644 --- a/tests/test_debug.py +++ b/tests/test_debug.py @@ -5,7 +5,7 @@ Tests the traceback rewriter. - :copyright: Copyright 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ from jinja2 import Environment diff --git a/tests/test_ext.py b/tests/test_ext.py index b425e18d..6c56c4aa 100644 --- a/tests/test_ext.py +++ b/tests/test_ext.py @@ -3,7 +3,7 @@ unit test for some extensions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ import re diff --git a/tests/test_filters.py b/tests/test_filters.py index a02d2ae5..5e45afeb 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -3,7 +3,7 @@ unit test for the filters ~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ from jinja2 import Markup, Environment diff --git a/tests/test_forloop.py b/tests/test_forloop.py index f5e4996e..fa1e03bd 100644 --- a/tests/test_forloop.py +++ b/tests/test_forloop.py @@ -3,7 +3,7 @@ unit test for loop functions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ from py.test import raises diff --git a/tests/test_i18n.py b/tests/test_i18n.py index 4890904a..7e9fb494 100644 --- a/tests/test_i18n.py +++ b/tests/test_i18n.py @@ -3,7 +3,7 @@ unit test for the i18n functions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ from py.test import raises diff --git a/tests/test_ifcondition.py b/tests/test_ifcondition.py index ec1fff4b..eff49bfb 100644 --- a/tests/test_ifcondition.py +++ b/tests/test_ifcondition.py @@ -3,7 +3,7 @@ unit test for if conditions ~~~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ diff --git a/tests/test_imports.py b/tests/test_imports.py index 224441c5..a0bb0322 100644 --- a/tests/test_imports.py +++ b/tests/test_imports.py @@ -3,7 +3,7 @@ unit test for the imports and includes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ from py.test import raises diff --git a/tests/test_inheritance.py b/tests/test_inheritance.py index bb86b418..ed7b31a2 100644 --- a/tests/test_inheritance.py +++ b/tests/test_inheritance.py @@ -3,7 +3,7 @@ unit test for the inheritance ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ from jinja2 import Environment, DictLoader diff --git a/tests/test_lexer.py b/tests/test_lexer.py index cb1e2dc1..b1631f08 100644 --- a/tests/test_lexer.py +++ b/tests/test_lexer.py @@ -3,7 +3,7 @@ unit test for the lexer ~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ diff --git a/tests/test_loaders.py b/tests/test_loaders.py index 8faf987b..d8f7b82d 100644 --- a/tests/test_loaders.py +++ b/tests/test_loaders.py @@ -3,7 +3,7 @@ unit test for the loaders ~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ diff --git a/tests/test_lrucache.py b/tests/test_lrucache.py index c53505a3..5ce43503 100644 --- a/tests/test_lrucache.py +++ b/tests/test_lrucache.py @@ -5,7 +5,7 @@ This module tests the LRU Cache - :copyright: Copyright 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ import thread diff --git a/tests/test_macros.py b/tests/test_macros.py index ee6c3532..e2e7bc2b 100644 --- a/tests/test_macros.py +++ b/tests/test_macros.py @@ -3,7 +3,7 @@ unit test for the macros ~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ diff --git a/tests/test_old_bugs.py b/tests/test_old_bugs.py index 8ce0a651..a30c9092 100644 --- a/tests/test_old_bugs.py +++ b/tests/test_old_bugs.py @@ -5,7 +5,7 @@ Unittest that test situations caused by various older bugs. - :copyright: Copyright 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ from jinja2 import Environment, DictLoader diff --git a/tests/test_parser.py b/tests/test_parser.py index 80ac4978..fb338e1c 100644 --- a/tests/test_parser.py +++ b/tests/test_parser.py @@ -3,7 +3,7 @@ unit test for the parser ~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ from jinja2 import Environment diff --git a/tests/test_security.py b/tests/test_security.py index 8ef3edf7..492a081c 100644 --- a/tests/test_security.py +++ b/tests/test_security.py @@ -3,7 +3,7 @@ unit test for security features ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ from py.test import raises diff --git a/tests/test_streaming.py b/tests/test_streaming.py index 709105ba..8e44263e 100644 --- a/tests/test_streaming.py +++ b/tests/test_streaming.py @@ -3,7 +3,7 @@ unit test for streaming interface ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ diff --git a/tests/test_syntax.py b/tests/test_syntax.py index 157720ff..8d14c665 100644 --- a/tests/test_syntax.py +++ b/tests/test_syntax.py @@ -3,7 +3,7 @@ unit test for expression syntax ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ from py.test import raises diff --git a/tests/test_tests.py b/tests/test_tests.py index c02d0b32..e210b4b3 100644 --- a/tests/test_tests.py +++ b/tests/test_tests.py @@ -3,7 +3,7 @@ unit test for the test functions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ from jinja2 import Environment, Markup diff --git a/tests/test_undefined.py b/tests/test_undefined.py index eb1e7e67..dc66d56a 100644 --- a/tests/test_undefined.py +++ b/tests/test_undefined.py @@ -3,7 +3,7 @@ unit test for the undefined types ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2008 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ from py.test import raises diff --git a/tests/test_various.py b/tests/test_various.py index 5a01037c..f0c997da 100644 --- a/tests/test_various.py +++ b/tests/test_various.py @@ -3,7 +3,7 @@ unit test for various things ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: 2007 by Armin Ronacher. + :copyright: (c) 2009 by the Jinja Team. :license: BSD, see LICENSE for more details. """ import gc