Checking for Company before dict in setter (as Company is a dict subclass).

jkeyes · jkeyes · commit 67a857e58375 · 2013-11-26T07:01:19.000Z
diff --git a/intercom/user.py b/intercom/user.py
@@ -317,10 +317,10 @@ def company(self, company):
         >>> user.company = {'id':6, 'name': 'Intercom', 'created_at': 103201}
 
         """
-        if isinstance(company, dict):
-            self['companies'] = [Company(**company)]
-        elif isinstance(company, Company):
+        if isinstance(company, Company):
             self['companies'] = [company]
+        elif isinstance(company, dict):
+            self['companies'] = [Company(**company)]
         else:
             raise ValueError("company must be set as a dict or Company object")
 
diff --git a/tests/unit/test_user.py b/tests/unit/test_user.py
@@ -162,6 +162,13 @@ def test_company_properties():
 @raises(ValueError)
 def test_user_company():
     user = User()
+    # use a Company object
+    user.company = Company({
+        'id': 1,
+        'name': 'Intercom',
+        'created_at': datetime.fromtimestamp(1331764344)
+    })
+
     # use a dict object
     user.company = {
         'id': 1,
