Merge pull request #956 from yarikoptic/enh/badips_categories

ENH: check badips.com response on presence of "categories" in it
pull/961/head
Yaroslav Halchenko 2015-02-14 09:30:26 -05:00
commit be75519402
1 changed files with 9 additions and 1 deletions

View File

@ -111,6 +111,8 @@ class BadIPsAction(ActionBase):
------
HTTPError
Any issues with badips.com request.
ValueError
If badips.com response didn't contain necessary information
"""
try:
response = urlopen(
@ -122,7 +124,13 @@ class BadIPsAction(ActionBase):
messages['err'])
raise
else:
categories = json.loads(response.read().decode('utf-8'))['categories']
response_json = json.loads(response.read().decode('utf-8'))
if not 'categories' in response_json:
err = "badips.com response lacked categories specification. Response was: %s" \
% (response_json,)
self._logSys.error(err)
raise ValueError(err)
categories = response_json['categories']
categories_names = set(
value['Name'] for value in categories)
if incParents: