Merge pull request #5198 from dannon/fix_genome_handling

Fixes genome decode handling.

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, str) and ':' in dbkey:
+    if isinstance(dbkey, six.string_types) and ':' in dbkey:
         return dbkey.split(':')
     else:
         return None, dbkey