# HG changeset patch # User Jan Kanis # Date 1400690075 -7200 # Node ID b15a20c2372aed58320ef3cdb80023b75a2f241d # Parent bfc82a8aa3c9714dcd5275d689b56c56e832de73 fix python 2 compatibility diff -r bfc82a8aa3c9 -r b15a20c2372a blast2html.py --- a/blast2html.py Wed May 21 18:17:03 2014 +0200 +++ b/blast2html.py Wed May 21 18:34:35 2014 +0200 @@ -13,6 +13,7 @@ import warnings from os import path from itertools import repeat +import six import argparse from lxml import objectify import jinja2 @@ -22,7 +23,7 @@ _filters = {} def filter(func_or_name): "Decorator to register a function as filter in the current jinja environment" - if isinstance(func_or_name, str): + if isinstance(func_or_name, six.string_types): def inner(func): _filters[func_or_name] = func.__name__ return func diff -r bfc82a8aa3c9 -r b15a20c2372a blast2html.xml --- a/blast2html.xml Wed May 21 18:17:03 2014 +0200 +++ b/blast2html.xml Wed May 21 18:34:35 2014 +0200 @@ -4,6 +4,7 @@ blast_datatypes + six argparse lxml jinja2 diff -r bfc82a8aa3c9 -r b15a20c2372a tool_dependencies.xml --- a/tool_dependencies.xml Wed May 21 18:17:03 2014 +0200 +++ b/tool_dependencies.xml Wed May 21 18:34:35 2014 +0200 @@ -25,7 +25,18 @@ The Python argparse library. This is included in the stdlib for python 2.7 and up, but not for 2.6 - + + + + + + six >= 1.3.0 + + + + The Python six library for python 2/3 compatibility + +