commit 4f5008ff1917356e0d71bedc96546cf0c5db834d
author Armin Ronacher <armin.ronacher@active-4.com> Fri May 23 23:36:07 2008 +0200
committer Armin Ronacher <armin.ronacher@active-4.com> Fri May 23 23:36:07 2008 +0200
tree 13906a6d4e26c8d8227faff0446bde89dcc3c722
parent f3c35c42451ccdf8cd12fe542df483fda7cd1b70

moved environment defaults to jinja2.defaults

--HG--
branch : trunk

jinja2/environment.py

diff --git a/jinja2/environment.py b/jinja2/environment.py
index 9a00bb7..95dda11 100644
--- a/jinja2/environment.py
+++ b/jinja2/environment.py
@@ -178,8 +178,8 @@
                  comment_start_string=COMMENT_START_STRING,
                  comment_end_string=COMMENT_END_STRING,
                  line_statement_prefix=LINE_STATEMENT_PREFIX,
-                 trim_blocks=False,
-                 newline_sequence='\n',
+                 trim_blocks=TRIM_BLOCKS,
+                 newline_sequence=NEWLINE_SEQUENCE,
                  extensions=(),
                  optimized=True,
                  undefined=Undefined,
@@ -442,15 +442,15 @@
     """
 
     def __new__(cls, source,
-                block_start_string='{%',
-                block_end_string='%}',
-                variable_start_string='{{',
-                variable_end_string='}}',
-                comment_start_string='{#',
-                comment_end_string='#}',
-                line_statement_prefix=None,
-                trim_blocks=False,
-                newline_sequence='\n',
+                block_start_string=BLOCK_START_STRING,
+                block_end_string=BLOCK_END_STRING,
+                variable_start_string=VARIABLE_START_STRING,
+                variable_end_string=VARIABLE_END_STRING,
+                comment_start_string=COMMENT_START_STRING,
+                comment_end_string=COMMENT_END_STRING,
+                line_statement_prefix=LINE_STATEMENT_PREFIX,
+                trim_blocks=TRIM_BLOCKS,
+                newline_sequence=NEWLINE_SEQUENCE,
                 extensions=(),
                 optimized=True,
                 undefined=Undefined,