diff --git a/beets/util/functemplate.py b/beets/util/functemplate.py index f8fabf4a8..7a309e793 100644 --- a/beets/util/functemplate.py +++ b/beets/util/functemplate.py @@ -534,8 +534,7 @@ class Template(object): def __init__(self, template): self.expr = _parse(template) self.original = template - if six.PY2: # FIXME Compiler is broken on Python 3. - self.compiled = self.translate() + self.compiled = self.translate() def __eq__(self, other): return self.original == other.original @@ -551,13 +550,11 @@ class Template(object): def substitute(self, values={}, functions={}): """Evaluate the template given the values and functions. """ - if six.PY2: # FIXME As above. - try: - res = self.compiled(values, functions) - except: # Handle any exceptions thrown by compiled version. - res = self.interpret(values, functions) - else: + try: + res = self.compiled(values, functions) + except: # Handle any exceptions thrown by compiled version. res = self.interpret(values, functions) + return res def translate(self):