use six.moves to work around urllib / urllib2 / urlparse to urllib 2to3 cleanup

[htsworkflow.git] / scripts / htsw-record-runfolder

diff --git a/scripts/htsw-record-runfolder b/scripts/htsw-record-runfolder
index 674cd52fb918db49e7650d8ae6a8aa716e211722..dfd0ae11b437e1dda5a045852997aaf85cea26c8 100755 (executable)
--- a/scripts/htsw-record-runfolder
+++ b/scripts/htsw-record-runfolder
@@ -4,8 +4,7 @@ from optparse import OptionParser
 import os
 import re
 import sys
-import urllib2
-import urlparse
+from six.moves import urllib
 
 from django.conf import settings
 
@@ -42,12 +41,12 @@ def update_db(root_url, flowcells, serial, debug=False):
     Creates link between flowcell and storage device over http
     """
     for fc in flowcells:
-        url = urlparse.urljoin(root_url, '%s/%s/' % (fc, serial))
+        url = urllib.parse.urljoin(root_url, '%s/%s/' % (fc, serial))
 
-        req = urllib2.Request(url)
+        req = urllib.request.Request(url)
         try:
             response = urllib2.urlopen(req)
-        except urllib2.URLError, e:
+        except urllib.request.HTTPError, e:
             print 'ERROR - HTTP OUTPUT (Return Code: %s); use -v/--verbose for more details.' % (e.code)
             if debug:
                 print e.read()