From 2b004a2a55a4a9092f015f34d4c1eb95d1e23ef7 Mon Sep 17 00:00:00 2001
From: Adam Coddington <me@adamcoddington.net>
Date: Mon, 20 Jun 2016 20:35:46 -0700
Subject: [PATCH] Minor alterations to AccountService.

---
 pyicloud/services/account.py | 40 +++++++++++++++++++++++++-----------
 pyicloud/utils.py            |  8 ++++++++
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/pyicloud/services/account.py b/pyicloud/services/account.py
index ddf8392..a309ae0 100644
--- a/pyicloud/services/account.py
+++ b/pyicloud/services/account.py
@@ -1,5 +1,9 @@
 import sys
 
+import six
+
+from pyicloud.utils import underscore_to_camelcase
+
 
 class AccountService(object):
     def __init__(self, service_root, session, params):
@@ -24,16 +28,28 @@ class AccountService(object):
         return self._devices
 
 
-class AccountDevice(object):
+@six.python_2_unicode_compatible
+class AccountDevice(dict):
     def __init__(self, device_info):
-        self.serialNumber = device_info['serialNumber']
-        self.osVersion = device_info['osVersion']
-        self.modelLargePhotoURL2x = device_info['modelLargePhotoURL2x']
-        self.modelLargePhotoURL1x = device_info['modelLargePhotoURL1x']
-        self.name = device_info['name']
-        self.imei = device_info['imei']
-        self.model = device_info['model']
-        self.udid = device_info['udid']
-        self.modelSmallPhotoURL2x = device_info['modelSmallPhotoURL2x']
-        self.modelSmallPhotoURL1x = device_info['modelSmallPhotoURL1x']
-        self.modelDisplayName = device_info['modelDisplayName']
+        super(AccountDevice, self).__init__(device_info)
+
+    def __getattr__(self, name):
+        try:
+            return self[underscore_to_camelcase(name)]
+        except KeyError:
+            raise AttributeError(name)
+
+    def __str__(self):
+        return u"{display_name}: {name}".format(
+            display_name=self.model_display_name,
+            name=self.name,
+        )
+
+    def __repr__(self):
+        return '<{display}>'.format(
+            display=(
+                six.text_type(self)
+                if sys.version_info[0] >= 3 else
+                six.text_type(self).encode('utf8', 'replace')
+            )
+        )
diff --git a/pyicloud/utils.py b/pyicloud/utils.py
index 8981d30..378b52c 100644
--- a/pyicloud/utils.py
+++ b/pyicloud/utils.py
@@ -62,3 +62,11 @@ def delete_password_in_keyring(username):
         KEYRING_SYSTEM,
         username,
     )
+
+
+def underscore_to_camelcase(word, initial_capital=False):
+    words = [x.capitalize() or '_' for x in word.split('_')]
+    if not initial_capital:
+        words[0] = words[0].lower()
+
+    return ''.join(words)