support partial url

This commit is contained in:
Michael Murtaugh 2016-03-02 23:27:04 +01:00
parent 823de61ea8
commit b61fede263
2 changed files with 4 additions and 1 deletions

View File

@ -56,6 +56,8 @@ def getjson (url, max_retry=3, retry_sleep_time=0.5):
if rurl != url:
ret["_url"] = rurl
return ret
except ValueError as e:
url = "http://localhost" + url
except HTTPError as e:
print ("HTTPError {0}".format(e), file=sys.stderr)
ret["_code"] = e.code

View File

@ -4,6 +4,7 @@ from argparse import ArgumentParser
import json
from urllib import urlencode
from urllib2 import urlopen, HTTPError, URLError
from common import getjson
def main (args):
p = ArgumentParser("call listAllPads and print the results")
@ -22,7 +23,7 @@ def main (args):
if args.showurl:
print requesturl
else:
results = json.load(urlopen(requesturl))['data']['padIDs']
results = getjson(urlopen(requesturl))['data']['padIDs']
if args.format == "json":
print json.dumps(results)
else: