From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 18 May 2013 10:49:17 +0000 (-0700)
Subject: Merge pull request #214 from Lukasa/luk-sprint-branch
X-Git-Tag: 2.7~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d77a031aaaf4a546c19008c622e3dda0bc16ce91;p=thirdparty%2Fjinja.git

Merge pull request #214 from Lukasa/luk-sprint-branch

Sprint: More misc fixes
---

d77a031aaaf4a546c19008c622e3dda0bc16ce91
diff --cc jinja2/compiler.py
index 6ea124cf,64a75cc3..5c7f1a61
--- a/jinja2/compiler.py
+++ b/jinja2/compiler.py
@@@ -16,8 -16,15 +16,14 @@@ from jinja2.visitor import NodeVisito
  from jinja2.exceptions import TemplateAssertionError
  from jinja2.utils import Markup, concat, escape, is_python_keyword
  import six
 -from six.moves import cStringIO as StringIO
 -from six.moves import map, zip
 +from six.moves import cStringIO as StringIO, map
  
+ # TODO: Move this to the compat module.
+ try:
+     range_type = xrange
+ except NameError:
+     range_type = range
+ 
  
  operators = {
      'eq':       '==',