From: Diane Trout <diane@ghic.org>
Date: Fri, 20 Mar 2015 23:25:20 +0000 (-0700)
Subject: Use six.moves to find urlencode and urlopen
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=c9ba20c5bbaa1b0ccb52d18214cf844994d0d0a7

Use six.moves to find urlencode and urlopen
---

diff --git a/htsworkflow/pipelines/retrieve_config.py b/htsworkflow/pipelines/retrieve_config.py
index 69d8558..7c64050 100644
--- a/htsworkflow/pipelines/retrieve_config.py
+++ b/htsworkflow/pipelines/retrieve_config.py
@@ -8,6 +8,7 @@ import os
 import sys
 import types
 import six
+from six.moves import urllib
 
 try:
     import json
@@ -46,9 +47,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,))