Rename MemberSuiteObject attribute id to membersuite_id

Author: rerb

membersuite_api_client/models.py

@@ -16,7 +16,7 @@ def __init__(self, membersuite_object_data):
         self.fields = convert_ms_object(
             membersuite_object_data["Fields"]["KeyValueOfstringanyType"])
 
-        self.id = self.fields["ID"]
+        self.membersuite_id = self.fields["ID"]
         self.extra_data = membersuite_object_data
 
     def __str__(self):

membersuite_api_client/security/models.py

@@ -30,7 +30,7 @@ def __str__(self):
         return ("<PortalUser: ID: {id}, email_address: {email_address}, "
                 "first_name: {first_name}, last_name: {last_name}, "
                 "owner: {owner}, session_id: {session_id}>".format(
-                    id=self.id,
+                    id=self.membersuite_id,
                     email_address=self.email_address,
                     first_name=self.first_name,
                     last_name=self.last_name,
@@ -41,7 +41,7 @@ def get_username(self):
         """Return a username suitable for storing in auth.User.username.
 
         """
-        return "_membersuite_id_{}".format(self.id)
+        return "_membersuite_id_{}".format(self.membersuite_id)
 
     def get_individual(self, client):
         """Return the Individual that owns this PortalUser.
@@ -90,7 +90,7 @@ def __init__(self, membersuite_object_data, portal_user=None):
     def __str__(self):
         return ("<Individual: ID: {id}, email_address: {email_address}, "
                 "first_name: {first_name}, last_name: {last_name}>".format(
-                    id=self.id,
+                    id=self.membersuite_id,
                     email_address=self.email_address,
                     first_name=self.first_name,
                     last_name=self.last_name))

membersuite_api_client/tests/test_security.py

@@ -85,7 +85,7 @@ def test_get_username(self):
         """Does get_username() work?
 
         """
-        self.portal_user.id = "fake-membersuite-id"
+        self.portal_user.membersuite_id = "fake-membersuite-id"
         self.assertEqual("_membersuite_id_fake-membersuite-id",
                          self.portal_user.get_username())
 
@@ -96,7 +96,7 @@ def test_get_individual(self):
         individual = self.portal_user.get_individual(client=self.client)
         self.assertEqual(self.portal_user.first_name, individual.first_name)
         self.assertEqual(self.portal_user.last_name, individual.last_name)
-        self.assertEqual(self.portal_user.owner, individual.id)
+        self.assertEqual(self.portal_user.owner, individual.membersuite_id)
 
 
 class IndividualTestCase(unittest.TestCase):