X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fproject.py;h=dc2e9a5812cd1b0ff30d052c38b916965818546b;hb=bd39b09580560307a1ac23be4984783d1bea9238;hp=39d24538f6622381f11c422c14fe997221c514eb;hpb=70d6f1843686f323ced68a253127fedde86a1c25;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/project.py b/osmclient/sol005/project.py index 39d2453..dc2e9a5 100644 --- a/osmclient/sol005/project.py +++ b/osmclient/sol005/project.py @@ -20,8 +20,8 @@ OSM project mgmt API """ from osmclient.common import utils +from osmclient.common.exceptions import ClientException from osmclient.common.exceptions import NotFound -from osmclient.common.exceptions import OsmHttpException import json import logging @@ -50,7 +50,7 @@ class Project(object): if resp: resp = json.loads(resp) if not resp or 'id' not in resp: - raise OsmHttpException('unexpected response from server - {}'.format( + raise ClientException('unexpected response from server - {}'.format( resp)) print(resp['id']) #else: @@ -76,7 +76,7 @@ class Project(object): if resp: resp = json.loads(resp) if not resp or 'id' not in resp: - raise OsmHttpException('unexpected response from server - {}'.format( + raise ClientException('unexpected response from server - {}'.format( resp)) print(resp['id']) elif http_code == 204: @@ -110,13 +110,13 @@ class Project(object): elif resp and 'result' in resp: print('Deleted') else: - msg = "" - if resp: - try: - msg = json.loads(resp) - except ValueError: - msg = resp - raise OsmHttpException("failed to delete project {} - {}".format(name, msg)) + msg = resp or "" + # if resp: + # try: + # msg = json.loads(resp) + # except ValueError: + # msg = resp + raise ClientException("failed to delete project {} - {}".format(name, msg)) def list(self, filter=None): """Returns the list of OSM projects