From 0ca0d74bb62b9ed26044497bad82331fcd1939f1 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Sun, 24 Apr 2011 23:23:57 -0700 Subject: remove unpythonic properties from atom and tenant --- keystone/logic/types/atom.py | 30 ++++------------------ keystone/logic/types/tenant.py | 57 +++++++++++++----------------------------- 2 files changed, 22 insertions(+), 65 deletions(-) diff --git a/keystone/logic/types/atom.py b/keystone/logic/types/atom.py index e9066ae9..04431ce2 100644 --- a/keystone/logic/types/atom.py +++ b/keystone/logic/types/atom.py @@ -18,28 +18,8 @@ class Link(object): "An atom link" def __init__(self, rel, href, link_type=None, hreflang=None, title=None): - self.__rel = rel - self.__href = href - self.__link_type = link_type - self.__hreflang = hreflang - self.__title = title - - @property - def rel(self): - return self.__rel - - @property - def href(self): - return self.__href - - @property - def link_type(self): - return self.__link_type - - @property - def hreflang(self): - return self.__hreflang - - @property - def title(self): - return self.__title + self.rel = rel + self.href = href + self.link_type = link_type + self.hreflang = hreflang + self.title = title diff --git a/keystone/logic/types/tenant.py b/keystone/logic/types/tenant.py index e8a689dc..c788b3bb 100644 --- a/keystone/logic/types/tenant.py +++ b/keystone/logic/types/tenant.py @@ -23,12 +23,9 @@ class Tenant(object): "Describes a tenant in the auth system" def __init__(self, tenant_id, description, enabled): - self.__tenant_id = tenant_id - self.__description = description - if enabled: - self.__enabled = True - else: - self.__enabled = False + self.tenant_id = tenant_id + self.description = description + self.enabled = enabled and True or False @staticmethod def from_xml(xml_str): @@ -52,7 +49,7 @@ class Tenant(object): raise fault.BadRequestFault("Expecting Tenant Description") return Tenant(tenant_id, desc.text, set_enabled) except etree.LxmlError as e: - raise fault.BadRequestFault("Cannot parse Tenant", e.__str__()) + raise fault.BadRequestFault("Cannot parse Tenant", str(e)) @staticmethod def from_json(json_str): @@ -75,28 +72,16 @@ class Tenant(object): description = tenant["description"] return Tenant(tenant_id, description, set_enabled) except (json.decoder.JSONDecodeError, TypeError) as e: - raise fault.BadRequestFault("Cannot parse Tenant", e.__str__()) - - @property - def tenant_id(self): - return self.__tenant_id - - @property - def description(self): - return self.__description - - @property - def enabled(self): - return self.__enabled + raise fault.BadRequestFault("Cannot parse Tenant", str(e)) def to_dom(self): dom = etree.Element("tenant", xmlns="http://docs.openstack.org/idm/api/v1.0", - enabled=s.lower(self.__enabled.__str__())) - if self.__tenant_id != None: - dom.set("id", self.__tenant_id) + enabled=s.lower(str(self.enabled))) + if self.tenant_id != None: + dom.set("id", self.tenant_id) desc = etree.Element("description") - desc.text = self.__description + desc.text = self.description dom.append(desc) return dom @@ -105,10 +90,10 @@ class Tenant(object): def to_dict(self): tenant = {} - if self.__tenant_id != None: - tenant["id"] = self.__tenant_id - tenant["description"] = self.__description - tenant["enabled"] = self.__enabled + if self.tenant_id != None: + tenant["id"] = self.tenant_id + tenant["description"] = self.description + tenant["enabled"] = self.enabled ret = {} ret["tenant"] = tenant return ret @@ -121,27 +106,19 @@ class Tenants(object): "A collection of tenants." def __init__(self, values, links): - self.__values = values - self.__links = links - - @property - def values(self): - return self.__values - - @property - def links(self): - return self.__links + self.values = values + self.links = links def to_xml(self): dom = etree.Element("tenants", xmlns="http://docs.openstack.org/idm/api/v1.0") - for t in self.__values: + for t in self.values: dom.append(t.to_dom()) return etree.tostring(dom) def to_json(self): values = [] - for t in self.__values: + for t in self.values: values.append(t.to_dict()["tenant"]) v = {} v["values"] = values -- cgit From 196d27ae46e37be53f2bbc18c3585df637c7152b Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Sun, 24 Apr 2011 23:27:57 -0700 Subject: update fault to be pythonic --- keystone/logic/types/fault.py | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/keystone/logic/types/fault.py b/keystone/logic/types/fault.py index bd5b970b..782e2866 100644 --- a/keystone/logic/types/fault.py +++ b/keystone/logic/types/fault.py @@ -22,42 +22,34 @@ class IDMFault(Exception): def __init__(self, msg, details=None, code=500): self.args = (code, msg, details) - self.__code = code - self.__msg = msg - self.__details = details + self.code = code + self.msg = msg + self.details = details self.key = "idmFault" @property def message(self): - return self.__msg - - @property - def code(self): - return self.__code - - @property - def details(self): - return self.__details + return self.msg def to_xml(self): dom = etree.Element(self.key, xmlns="http://docs.openstack.org/idm/api/v1.0") - dom.set("code", self.__code.__str__()) + dom.set("code", str(self.code)) msg = etree.Element("message") - msg.text = self.__msg + msg.text = self.msg dom.append(msg) - if self.__details != None: + if self.details != None: desc = etree.Element("details") - desc.text = self.__details + desc.text = self.details dom.append(desc) return etree.tostring(dom) def to_json(self): fault = {} - fault["message"] = self.__msg - fault["code"] = self.__code.__str__() - if self.__details != None: - fault["details"] = self.__details + fault["message"] = self.msg + fault["code"] = str(self.code) + if self.details != None: + fault["details"] = self.details ret = {} ret[self.key] = fault return json.dumps(ret) @@ -125,9 +117,5 @@ class OverlimitFault(IDMFault): def __init__(self, msg, details=None, code=409, retry_at=None): super(OverlimitFault, self).__init__(msg, details, code) self.args = (code, msg, details, retry_at) - self.__retry_at = retry_at + self.retry_at = retry_at self.key = "overLimit" - - @property - def retry_at(self): - return self.__retry_at -- cgit