Fixed filesizeformat

[jinja2.git] / jinja2 / defaults.py

diff --git a/jinja2/defaults.py b/jinja2/defaults.py
index 61706aea9951ccb223e5d646d1bcc83ea44815a6..d2d45443adde9d94b1319bc4ffa54a5abbe99baf 100644 (file)
--- a/jinja2/defaults.py
+++ b/jinja2/defaults.py
@@ -5,10 +5,10 @@
 
     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.utils import generate_lorem_ipsum, Cycler
+from jinja2.utils import generate_lorem_ipsum, Cycler, Joiner
 
 
 # defaults for the parser / lexer
@@ -19,6 +19,7 @@ VARIABLE_END_STRING = '}}'
 COMMENT_START_STRING = '{#'
 COMMENT_END_STRING = '#}'
 LINE_STATEMENT_PREFIX = None
+LINE_COMMENT_PREFIX = None
 TRIM_BLOCKS = False
 NEWLINE_SEQUENCE = '\n'
 
@@ -30,9 +31,10 @@ DEFAULT_NAMESPACE = {
     'range':        xrange,
     'dict':         lambda **kw: kw,
     'lipsum':       generate_lorem_ipsum,
-    'cycler':       Cycler
+    'cycler':       Cycler,
+    'joiner':       Joiner
 }
 
 
 # export all constants
-__all__ = tuple(x for x in locals() if x.isupper())
+__all__ = tuple(x for x in locals().keys() if x.isupper())