From: Jason Robinson <jaywink@basshero.org>
Date: Sat, 29 Jun 2013 20:17:40 +0000 (+0300)
Subject: Fix Contacts.get actually returning real User classes with guid in correct place... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dcd4498586fefe16ee706a353c81d1c7665edcb3;p=diaspy.git

Fix Contacts.get actually returning real User classes with guid in correct place. Also add handle to User class and add option not to fetch posts, which is used when fetching contacts
---

diff --git a/diaspy/people.py b/diaspy/people.py
index 9377b48..c77b6c2 100644
--- a/diaspy/people.py
+++ b/diaspy/people.py
@@ -20,12 +20,13 @@ class User:
     data = {}
     stream = []
 
-    def __init__(self, connection, guid='', handle=''):
+    def __init__(self, connection, guid='', handle='', fetchposts=True):
         self._connection = connection
-        self.guid, self.handle = guid, handle
-        if handle and guid: self.fetchguid(guid)
-        elif guid and not handle: self.fetchguid(guid)
-        elif handle and not guid: self.fetchhandle(handle)
+        self.guid, self.handle, self.fetchposts = guid, handle, fetchposts
+        if self.fetchposts:
+            if handle and guid: self.fetchguid(guid)
+            elif guid and not handle: self.fetchguid(guid)
+            elif handle and not guid: self.fetchhandle(handle)
 
     def __getitem__(self, key):
         return self.data[key]
@@ -55,7 +56,7 @@ class User:
         else:
             request = request.json()
 
-        if not len(request): raise ('Cannot extract user data: no posts to analyze')
+        if not len(request): raise Exception('Cannot extract user data: no posts to analyze')
         data = request[0]['author']
         final = {}
         names = [('id', 'id'),
@@ -132,5 +133,5 @@ class Contacts():
         request = self._connection.get('contacts.json', params=params)
         if request.status_code != 200:
             raise Exception('status code {0}: cannot get contacts'.format(request.status_code))
-        contacts = [User(user['guid']) for user in request.json()]
+        contacts = [User(self._connection, user['guid'], user['handle'], False) for user in request.json()]
         return contacts