From 78a2626d13a817c0371db665ecdbeef7a616cb32 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Tue, 12 Dec 2017 09:07:38 -0500 Subject: [PATCH 1/2] Fixes genome decode handling. dbkey was either unicode or str here variously, and the previous change broke the case where it was unicode. --- lib/galaxy/visualization/genomes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/visualization/genomes.py b/lib/galaxy/visualization/genomes.py index f4931a4afb3..ad0218db9fa 100644 --- a/lib/galaxy/visualization/genomes.py +++ b/lib/galaxy/visualization/genomes.py @@ -26,7 +26,7 @@ messages = Bunch( def decode_dbkey(dbkey): """ Decodes dbkey and returns tuple ( username, dbkey )""" - if isinstance(dbkey, str) and ':' in dbkey: + if isinstance(dbkey, basestring) and ':' in dbkey: return dbkey.split(':') else: return None, dbkey From f6fbe634465bb2305ad968ec3413e7df64fc5224 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Tue, 12 Dec 2017 09:27:53 -0500 Subject: [PATCH 2/2] use six.string_types instead of basestring for isinstance --- lib/galaxy/visualization/genomes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/visualization/genomes.py b/lib/galaxy/visualization/genomes.py index ad0218db9fa..6c81630fa8a 100644 --- a/lib/galaxy/visualization/genomes.py +++ b/lib/galaxy/visualization/genomes.py @@ -4,6 +4,7 @@ import re import sys from json import loads +import six from bx.seq.twobit import TwoBitFile from galaxy.util.bunch import Bunch @@ -26,7 +27,7 @@ messages = Bunch( def decode_dbkey(dbkey): """ Decodes dbkey and returns tuple ( username, dbkey )""" - if isinstance(dbkey, basestring) and ':' in dbkey: + if isinstance(dbkey, six.string_types) and ':' in dbkey: return dbkey.split(':') else: return None, dbkey