Drop support for simplejson

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

diff --git a/htsworkflow/pipelines/retrieve_config.py b/htsworkflow/pipelines/retrieve_config.py
index 26ff2d1cec0dab22467e97b9b486d0fe554459f3..a2153d055230d9b35e94cf8f39e9aecc3b73a339 100644 (file)
--- a/htsworkflow/pipelines/retrieve_config.py
+++ b/htsworkflow/pipelines/retrieve_config.py
@@ -8,11 +8,9 @@ import os
 import sys
 import types
 import six
+from six.moves import urllib
 
-try:
-    import json
-except ImportError as e:
-    import simplejson as json
+import json
 
 from htsworkflow.auth import apidata
 from htsworkflow.util import api
@@ -46,9 +44,9 @@ def retrieve_flowcell_info(base_host_url, flowcell):
     url = api.flowcell_url(base_host_url, flowcell)
 
     try:
-        apipayload = urllib.urlencode(apidata)
-        web = urllib2.urlopen(url, apipayload)
-    except urllib2.URLError as e:
+        apipayload = urllib.parse.urlencode(apidata)
+        web = urllib.request.urlopen(url, apipayload)
+    except urllib.request.HTTPError as e:
         errmsg = 'URLError: %d %s' % (e.code, e.msg)
         LOGGER.error(errmsg)
         LOGGER.error('opened %s' % (url,))
@@ -408,8 +406,7 @@ def format_pooled_libraries(shared, library):
         return [shared]
     elif isinstance(sequences, dict):
         pooled = []
-        multiplex_ids = sequences.keys()
-        multiplex_ids.sort(key=natural_sort_key)
+        multiplex_ids = sorted(sequences.keys(), key=natural_sort_key)
         for multiplex_id in multiplex_ids:
             sample = {}
             sample.update(shared)