finish removing simplejson

6 files changed, 20 insertions, 58 deletions

diff --git a/README.md b/README.md
index 4cdd12b7..4c955004 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,6 @@ DEPENDENCIES:
 * Paste
 * PasteDeploy
 * PasteScript
-* simplejson
 * SQLAlchemy
 * SQLite3
 * webob
@@ -44,7 +43,6 @@ Install http://pypi.python.org/pypi/setuptools
     sudo easy_install pastedeploy
     sudo easy_install pastescript
     sudo easy_install pysqlite
-    sudo easy_install simplejson
     sudo easy_install sqlalchemy
     sudo easy_install webob
 
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/auth.py b/keystone/logic/types/auth.py
index b73876d6..fc5be63a 100644
--- a/keystone/logic/types/auth.py
+++ b/keystone/logic/types/auth.py
@@ -68,7 +68,7 @@ class PasswordCredentials(object):
             else:
                 tenant_id = None
             return PasswordCredentials(username, password, tenant_id)
-        except (json.decoder.JSONDecodeError, TypeError) as e:
+        except (ValueError, TypeError) as e:
             raise fault.BadRequestFault("Cannot parse password credentials",
                                         str(e))
 
diff --git a/keystone/logic/types/fault.py b/keystone/logic/types/fault.py
index 4591d92c..29bd2dc9 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
diff --git a/keystone/logic/types/tenant.py b/keystone/logic/types/tenant.py
index cad1c3af..83bd1ed5 100644
--- a/keystone/logic/types/tenant.py
+++ b/keystone/logic/types/tenant.py
@@ -25,10 +25,7 @@ class Tenant(object):
     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.enabled = enabled and True or False
 
     @staticmethod
     def from_xml(xml_str):
diff --git a/pip-requires b/pip-requires
index 2388ec9b..1ef8484b 100644
--- a/pip-requires
+++ b/pip-requires
@@ -5,6 +5,5 @@ paste
 pastedeploy
 pastescript
 pysqlite
-simplejson
 sqlalchemy
 webob