From b61fede2633b4edba5cece7737856960e85457a6 Mon Sep 17 00:00:00 2001 From: Michael Murtaugh Date: Wed, 2 Mar 2016 23:27:04 +0100 Subject: [PATCH] support partial url --- etherdump/commands/common.py | 2 ++ etherdump/commands/list.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/etherdump/commands/common.py b/etherdump/commands/common.py index e8907ed..eadd28d 100644 --- a/etherdump/commands/common.py +++ b/etherdump/commands/common.py @@ -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 diff --git a/etherdump/commands/list.py b/etherdump/commands/list.py index 5edce33..1344686 100644 --- a/etherdump/commands/list.py +++ b/etherdump/commands/list.py @@ -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: