[svn] added xrange as default builtin

--HG--
branch : trunk

diff --git a/jinja/defaults.py b/jinja/defaults.py
index d5d0b86dabc8451c305ec3c4d2500acef9d5b0b9..454370b7bd462ebf23500e646d6455fee98ad24d 100644 (file)
--- a/jinja/defaults.py
+++ b/jinja/defaults.py
@@ -12,6 +12,6 @@ from jinja.filters import FILTERS as DEFAULT_FILTERS
 from jinja.tests import TESTS as DEFAULT_TESTS
 
 
-#: for global objects in later jinja releases. (add stuff like debug())
 DEFAULT_NAMESPACE = {
+    'range':                xrange
 }

diff --git a/jinja/environment.py b/jinja/environment.py
index 3311c8d47209d0f66a81becf2815d591f3a3994a..5c478f186a0fe99c20c9768d4e043d650e9a2bf5 100644 (file)
--- a/jinja/environment.py
+++ b/jinja/environment.py
@@ -60,7 +60,7 @@ class Environment(object):
 
         # global namespace
         self.globals = namespace is None and DEFAULT_NAMESPACE.copy() \
-                       or namespace or {}
+                       or namespace
 
         # create lexer
         self.lexer = Lexer(self)