Commit ba0cf42c by Marius Gedminas

Python 3: use six.string_types instead of basestring

Reduces the number of failing tests from 35 to 17.
parent 3a50393c
...@@ -22,6 +22,7 @@ __metaclass__ = type ...@@ -22,6 +22,7 @@ __metaclass__ = type
import ast import ast
import re import re
from six import string_types
from jinja2 import Environment from jinja2 import Environment
from jinja2.loaders import FileSystemLoader from jinja2.loaders import FileSystemLoader
from jinja2.exceptions import TemplateSyntaxError, UndefinedError from jinja2.exceptions import TemplateSyntaxError, UndefinedError
...@@ -227,7 +228,7 @@ class Templar: ...@@ -227,7 +228,7 @@ class Templar:
if convert_bare: if convert_bare:
variable = self._convert_bare_variable(variable) variable = self._convert_bare_variable(variable)
if isinstance(variable, basestring): if isinstance(variable, string_types):
result = variable result = variable
if self._contains_vars(variable): if self._contains_vars(variable):
...@@ -289,7 +290,7 @@ class Templar: ...@@ -289,7 +290,7 @@ class Templar:
in jinja2 variable braces so that it is evaluated properly. in jinja2 variable braces so that it is evaluated properly.
''' '''
if isinstance(variable, basestring): if isinstance(variable, string_types):
contains_filters = "|" in variable contains_filters = "|" in variable
first_part = variable.split("|")[0].split(".")[0].split("[")[0] first_part = variable.split("|")[0].split(".")[0].split("[")[0]
if (contains_filters or first_part in self._available_variables) and self.environment.variable_start_string not in variable: if (contains_filters or first_part in self._available_variables) and self.environment.variable_start_string not in variable:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment