tyree88
diff --git a/‎tests/test_base_resource.py
Lines changed: 23 additions & 0 deletions b/‎tests/test_base_resource.py
Lines changed: 23 additions & 0 deletions
diff --git a/‎twilio/rest/resources/base.py
Lines changed: 7 additions & 1 deletion b/‎twilio/rest/resources/base.py
Lines changed: 7 additions & 1 deletion
@@ -24,6 +24,7 @@ def test_resource_init():
     assert_equal(r.base_uri, base_uri)
     assert_equal(r.auth, auth)
     assert_equal(r.uri, uri)
+    assert_equal(r.content, {})
 
 
 def test_equivalence():
@@ -82,6 +83,13 @@ def testInstanceLoading(self):
 
         assert_true(isinstance(instance, InstanceResource))
         assert_equal(instance.sid, "foo")
+        assert_equal(instance.content, {"sid": "foo"})
+
+    def testInstanceSerialize(self):
+        instance = self.r.load_instance({"sid": "foo"})
+
+        assert_true(isinstance(instance, InstanceResource))
+        assert_equal(instance.serialize(), {"sid": "foo"})
 
     def testListResourceCreateResponse200(self):
         """We should accept 200 OK in response to a POST creating a resource."""
@@ -142,6 +150,7 @@ def test_instance_loading(self):
 
         assert_true(isinstance(instance, NextGenInstanceResource))
         assert_equal(instance.sid, "foo")
+        assert_equal(instance.serialize(), {"sid": "foo"})
 
 
 class testInstanceResourceInit(unittest.TestCase):
@@ -153,15 +162,18 @@ def setUp(self):
 
     def testInit(self):
         assert_equal(self.r.uri, self.uri)
+        assert_equal(self.r.content, {})
 
     def testLoad(self):
         self.r.load({"hey": "you"})
         assert_equal(self.r.hey, "you")
+        assert_equal(self.r.content, {"hey": "you"})
 
     def testLoadWithUri(self):
         self.r.load({"hey": "you", "uri": "foobar"})
         assert_equal(self.r.hey, "you")
         assert_equal(self.r.uri, self.uri)
+        assert_equal(self.r.content, {"hey": "you"})
 
     def testLoadDateCreated(self):
         self.r.load({"date_created": "Sat, 29 Sep 2012 12:47:54 +0000",
@@ -186,6 +198,11 @@ def testLoadSubresources(self):
         self.r.load_subresources()
         m.assert_called_with(self.r.uri, self.r.auth, self.r.timeout)
 
+    def testSerialize(self):
+        self.r.load({"hey": "you", "uri": "foobar"})
+        assert_equal(self.r.content, {"hey": "you"})
+        assert_equal(self.r.serialize(), {"hey": "you"})
+
 
 class NextGenInstanceResourceTest(unittest.TestCase):
     def setUp(self):
@@ -195,6 +212,12 @@ def setUp(self):
     def test_load(self):
         self.r.load({"hey": "you"})
         assert_equal(self.r.hey, "you")
+        assert_equal(self.r.content, {"hey": "you"})
+
+    def test_serialize(self):
+        self.r.load({"hey": "you"})
+        assert_equal(self.r.content, {"hey": "you"})
+        assert_equal(self.r.serialize(), {"hey": "you"})
 
     def test_iso_date_parser(self):
         self.r.load({"date_created": "2015-01-01T00:00:00Z"})
 
@@ -176,6 +176,7 @@ def __init__(self, base_uri, auth, timeout=UNSET_TIMEOUT):
         self.base_uri = base_uri
         self.auth = auth
         self.timeout = timeout
+        self.content = {}
 
     def __eq__(self, other):
         return (isinstance(other, self.__class__) and
@@ -211,6 +212,9 @@ def uri(self):
         format = (self.base_uri, self.name)
         return "%s/%s" % format
 
+    def serialize(self):
+        return self.content
+
 
 class InstanceResource(Resource):
     """ The object representation of an instance response from the Twilio API
@@ -249,6 +253,7 @@ def load(self, entries):
                 entries[key] = self._parse_date(entries[key])
 
         self.__dict__.update(entries)
+        self.content.update(entries)
 
     def load_subresources(self):
         """
@@ -261,6 +266,7 @@ def load_subresources(self):
                 self.parent.timeout
             )
             self.__dict__[list_resource.key] = list_resource
+            self.content[list_resource.key] = list_resource
 
     def update_instance(self, **kwargs):
         """ Make a POST request to the API to update an object's properties
@@ -269,7 +275,7 @@ def update_instance(self, **kwargs):
         :raises: a :class:`~twilio.rest.RestException` on failure
         """
         a = self.parent.update(self.name, **kwargs)
-        self.load(a.__dict__)
+        self.load(a.content)
 
     def delete_instance(self):
         """ Make a DELETE request to the API to delete the object