Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Copyright switch to "The Jinja Team".

--HG--
branch : trunk
  • Loading branch information...
commit 62ccd1be3d03bc27d4f3d8e83c0e8702c31d435d 1 parent 37f58ce
@mitsuhiko authored
Showing with 75 additions and 67 deletions.
  1. +23 −3 AUTHORS
  2. +4 −2 LICENSE
  3. +0 −15 THANKS
  4. +1 −1  examples/rwbench/rwbench.py
  5. +1 −1  ext/django2jinja/django2jinja.py
  6. +1 −1  ext/djangojinja2.py
  7. +1 −1  ext/inlinegettext.py
  8. +1 −0  ext/jinja.el
  9. +1 −1  jinja2/__init__.py
  10. +1 −1  jinja2/_ipysupport.py
  11. +1 −1  jinja2/_speedups.c
  12. +1 −1  jinja2/bccache.py
  13. +1 −1  jinja2/compiler.py
  14. +1 −1  jinja2/constants.py
  15. +1 −1  jinja2/debug.py
  16. +1 −1  jinja2/defaults.py
  17. +1 −1  jinja2/environment.py
  18. +1 −1  jinja2/exceptions.py
  19. +1 −1  jinja2/ext.py
  20. +1 −1  jinja2/filters.py
  21. +1 −1  jinja2/lexer.py
  22. +1 −1  jinja2/loaders.py
  23. +1 −1  jinja2/nodes.py
  24. +1 −1  jinja2/optimizer.py
  25. +1 −1  jinja2/parser.py
  26. +1 −1  jinja2/runtime.py
  27. +1 −1  jinja2/sandbox.py
  28. +1 −1  jinja2/tests.py
  29. +1 −1  jinja2/utils.py
  30. +1 −1  jinja2/visitor.py
  31. +1 −1  tests/conftest.py
  32. +1 −1  tests/test_debug.py
  33. +1 −1  tests/test_ext.py
  34. +1 −1  tests/test_filters.py
  35. +1 −1  tests/test_forloop.py
  36. +1 −1  tests/test_i18n.py
  37. +1 −1  tests/test_ifcondition.py
  38. +1 −1  tests/test_imports.py
  39. +1 −1  tests/test_inheritance.py
  40. +1 −1  tests/test_lexer.py
  41. +1 −1  tests/test_loaders.py
  42. +1 −1  tests/test_lrucache.py
  43. +1 −1  tests/test_macros.py
  44. +1 −1  tests/test_old_bugs.py
  45. +1 −1  tests/test_parser.py
  46. +1 −1  tests/test_security.py
  47. +1 −1  tests/test_streaming.py
  48. +1 −1  tests/test_syntax.py
  49. +1 −1  tests/test_tests.py
  50. +1 −1  tests/test_undefined.py
  51. +1 −1  tests/test_various.py
View
26 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
View
6 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
View
15 THANKS
@@ -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)
View
2  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
View
2  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
View
2  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
View
2  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
View
1  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
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
View
2  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'
View
2  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
View
2  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.
*/
View
2  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
View
2  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
View
2  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.
"""
View
2  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
View
2  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
View
2  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
View
2  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.
"""
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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.
"""
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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.
"""
View
2  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
View
2  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
View
2  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.
"""
View
2  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.
"""
View
2  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
View
2  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.
"""
View
2  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
View
2  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
View
2  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
View
2  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.
"""
View
2  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
View
2  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
View
2  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
View
2  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
Please sign in to comment.
Something went wrong with that request. Please try again.