From e45e32854d72c32cfe1fc6e723b86ca189603d31 Mon Sep 17 00:00:00 2001 From: Brandon King Date: Tue, 16 Jun 2009 18:58:13 +0000 Subject: [PATCH] Managed to use a urllib python 2.6 feature... converting code to work in 2.5 --- scripts/mark_archived_data | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/mark_archived_data b/scripts/mark_archived_data index bd83b3b..62eca10 100755 --- a/scripts/mark_archived_data +++ b/scripts/mark_archived_data @@ -11,6 +11,8 @@ from optparse import OptionParser import sys import urllib +import urllib2 + def construct_parser(): @@ -32,16 +34,19 @@ def update_db(flowcell, serial, debug=False): """ Creates link between flowcell and storage device over http """ - www = urllib.urlopen(settings.LINK_FLOWCELL_STORAGE_DEVICE_URL+'%s/%s/' % (flowcell, serial)) - httpcode = www.getcode() - if httpcode != 200: - print 'ERROR - HTTP OUTPUT (Return Code: %s); use -v/--verbose for more details.' % (httpcode) + url = settings.LINK_FLOWCELL_STORAGE_DEVICE_URL+'%s/%s/' % (flowcell, serial) + + req = urllib2.Request(url) + try: + response = urllib2.urlopen(req) + except urllib2.URLError, e: + print 'ERROR - HTTP OUTPUT (Return Code: %s); use -v/--verbose for more details.' % (e.code) if debug: - print www.read() - sys.exit(httpcode) + print e.read() + sys.exit(e.code) print "DB Update of %s & %s succeeded" % (flowcell, serial) - print www.read() + print response.read() def process_args(parser): -- 2.30.2