Use isinstance(object, (types)) pattern instead of type(object) == types.Type

[htsworkflow.git] / htsworkflow / pipelines / retrieve_config.py

diff --git a/htsworkflow/pipelines/retrieve_config.py b/htsworkflow/pipelines/retrieve_config.py
index c8fa9d23021a0de0a7acbbc52fce5cfd2a7d1c99..26ff2d1cec0dab22467e97b9b486d0fe554459f3 100644 (file)
--- a/htsworkflow/pipelines/retrieve_config.py
+++ b/htsworkflow/pipelines/retrieve_config.py
@@ -7,8 +7,7 @@ from optparse import OptionParser, IndentedHelpFormatter
 import os
 import sys
 import types
-import urllib
-import urllib2
+import six
 
 try:
     import json
@@ -403,12 +402,11 @@ def format_pooled_libraries(shared, library):
     sequences = library.get('index_sequence', None)
     if sequences is None:
         return []
-    elif (type(sequences) in types.StringTypes and
-          sequences.lower().startswith('err')):
+    elif isinstance(sequences, six.string_types):
         shared['Index'] = ''
         shared['SampleProject'] = library['library_id']
         return [shared]
-    elif (type(sequences) == types.DictType):
+    elif isinstance(sequences, dict):
         pooled = []
         multiplex_ids = sequences.keys()
         multiplex_ids.sort(key=natural_sort_key)