Fixed filesizeformat

[jinja2.git] / jinja2 / defaults.py

diff --git a/jinja2/defaults.py b/jinja2/defaults.py
index 4deb8e53f97a6df8cae2855fe1772eb351325cae..d2d45443adde9d94b1319bc4ffa54a5abbe99baf 100644 (file)
--- a/jinja2/defaults.py
+++ b/jinja2/defaults.py
@@ -5,17 +5,36 @@
 
     Jinja default filters and tags.
 
-    :copyright: 2007-2008 by Armin Ronacher.
+    :copyright: (c) 2010 by the Jinja Team.
     :license: BSD, see LICENSE for more details.
 """
-from jinja2.filters import FILTERS as DEFAULT_FILTERS
-from jinja.tests import TESTS as DEFAULT_TESTS
+from jinja2.utils import generate_lorem_ipsum, Cycler, Joiner
+
+
+# defaults for the parser / lexer
+BLOCK_START_STRING = '{%'
+BLOCK_END_STRING = '%}'
+VARIABLE_START_STRING = '{{'
+VARIABLE_END_STRING = '}}'
+COMMENT_START_STRING = '{#'
+COMMENT_END_STRING = '#}'
+LINE_STATEMENT_PREFIX = None
+LINE_COMMENT_PREFIX = None
+TRIM_BLOCKS = False
+NEWLINE_SEQUENCE = '\n'
 
 
+# default filters, tests and namespace
+from jinja2.filters import FILTERS as DEFAULT_FILTERS
+from jinja2.tests import TESTS as DEFAULT_TESTS
 DEFAULT_NAMESPACE = {
     'range':        xrange,
-    # fake translators so that {% trans %} is a noop by default
-    '_':            lambda x: x,
-    'gettext':      lambda x: x,
-    'ngettext':     lambda s, p, n: (s, p)[n != 1]
+    'dict':         lambda **kw: kw,
+    'lipsum':       generate_lorem_ipsum,
+    'cycler':       Cycler,
+    'joiner':       Joiner
 }
+
+
+# export all constants
+__all__ = tuple(x for x in locals().keys() if x.isupper())