Copyright switch to "The Jinja Team".

--HG-- branch : trunk
pallets · Jan 4, 2009 · 62ccd1b · 62ccd1b
1 parent 37f58ce
commit 62ccd1b
Show file tree

Hide file tree

Showing 51 changed files with 75 additions and 67 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,10 +1,30 @@
-Jinja is written and maintained by Armin Ronacher <armin.ronacher@active-4.com>.
+Jinja is written and maintained by the Jinja Team and various
+contributors:
 
-Other contributors (as mentionend in :copyright:s) are:
+Lead Developer:
 
 - Armin Ronacher <armin.ronacher@active-4.com>
+
+Developers:
+
+- Christoph Hack
 - Georg Brandl
-- Lawrence Journal-World.
+
+Contributors:
+
 - Bryan McLemore
 - Mickaël Guérin <kael@crocobox.org>
 - 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
@@ -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
diff --git 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
@@ -65,7 +65,7 @@ def write_my_node(writer, node):
         
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.
 """