openstack
/
python-novaclient
Code Issues Proposed changes

removed unicode casts

This commit is contained in:
Sandy Walsh 2011-09-26 12:58:03 -07:00
parent 4a53b06e0e
commit 9cd9635c42
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
novaclient/client.py
View File

@ -155,7 +155,7 @@ class HTTPClient(httplib2.Http):
attr='region',
filter_value=self.region_name)
return None
except KeyError, e:
except KeyError:
raise exceptions.AuthorizationFailure()
except exceptions.EndpointNotFound:
print "Could not find any suitable endpoint. Correct region?"

13
novaclient/service_catalog.py
View File

@ -26,22 +26,21 @@ class ServiceCatalog(object):
self.catalog = resource_dict
def get_token(self):
return self.catalog[u'access'][u'token'][u'id']
return self.catalog['access']['token']['id']
def url_for(self, attr=None, filter_value=None):
"""Fetch the public URL from the Compute service for
a particular endpoint attribute. If none given, return
the first. See tests for sample service catalog."""
catalog = self.catalog[u'access'][u'serviceCatalog']
catalog = self.catalog['access']['serviceCatalog']
for service in catalog:
if service[u'type'] != u'compute':
if service['type'] != 'compute':
continue
endpoints = service[u'endpoints']
endpoints = service['endpoints']
for endpoint in endpoints:
if filter_value == None or endpoint[attr] == \
unicode(filter_value):
return endpoint[u'publicURL']
if filter_value == None or endpoint[attr] == filter_value:
return endpoint['publicURL']
raise novaclient.exceptions.EndpointNotFound()