Skip to content

Commit 7df5738

Browse files
committed
assign default value for status_symbol
1 parent 24eb493 commit 7df5738

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

netfoundry/organization.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -581,14 +581,10 @@ def find_network_groups_by_organization(self, **kwargs):
581581
"""
582582
url = self.audience+'rest/v1/network-groups'
583583
headers = {"authorization": "Bearer " + self.token}
584-
try:
585-
network_groups = list()
586-
for i in find_generic_resources(url=url, headers=headers, embedded=RESOURCES['network-groups']._embedded, proxies=self.proxies, verify=self.verify, **kwargs):
587-
network_groups.extend(i)
588-
except Exception as e:
589-
raise RuntimeError(f"failed to get network_groups from url: '{url}', caught {e}")
590-
else:
591-
return(network_groups)
584+
network_groups = list()
585+
for i in find_generic_resources(url=url, headers=headers, embedded=RESOURCES['network-groups']._embedded, proxies=self.proxies, verify=self.verify, **kwargs):
586+
network_groups.extend(i)
587+
return(network_groups)
592588
get_network_groups_by_organization = find_network_groups_by_organization
593589
network_groups = get_network_groups_by_organization
594590

netfoundry/utility.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ def find_generic_resources(url: str, headers: dict, embedded: str = None, proxie
360360
logging.warn("ignoring invalid value for header 'accept': '{:s}'".format(accept))
361361

362362
try:
363+
status_symbol = "UNKNOWN"
363364
response = http.get(
364365
url,
365366
headers=headers,
@@ -370,10 +371,7 @@ def find_generic_resources(url: str, headers: dict, embedded: str = None, proxie
370371
status_symbol = STATUS_CODES._codes[response.status_code][0].upper()
371372
response.raise_for_status()
372373
except RequestException as e:
373-
logging.error('unexpected HTTP response code {:s} ({:d}) and response {:s}'.format(
374-
status_symbol,
375-
response.status_code,
376-
response.text))
374+
logging.error(f"unexpected HTTP response code {status_symbol} ({response.status_code}) and response {response.text}")
377375
raise e
378376
else:
379377
try:

0 commit comments

Comments
 (0)