From: Marek Marecki <triviuss@gmail.com>
Date: Wed, 3 Jul 2013 18:48:59 +0000 (+0200)
Subject: Sometginh broke Aspect().getUsers()
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=08f03d2621d69d66f18a7f5616ddd4b9dbf91e88;p=diaspy.git

Sometginh broke Aspect().getUsers()
---

diff --git a/diaspy/models.py b/diaspy/models.py
index cc4b0a4..6bc3115 100644
--- a/diaspy/models.py
+++ b/diaspy/models.py
@@ -33,16 +33,24 @@ class Aspect():
         """Returns list of GUIDs of users who are listed in this aspect.
         """
         start_regexp = re.compile('<ul +class=["\']contacts["\'] *>')
-        userline_regexp = re.compile('<a href=["\']/people/[a-z0-9]{16,16}["\']>[a-zA-Z0-9 _-]+</a>')
-        personid_regexp = 'alt="{0}" class="avatar" data-person_id="[0-9]+"'
+        userline_regexp = re.compile('<a href=["\']/people/[a-z0-9]{16,16}["\']>[a-zA-Z0-9()@. _-]+</a>')
+        personid_regexp = 'alt=["\']{0}["\'] class=["\']avatar["\'] data-person_id=["\'][0-9]+["\']'
         method_regexp = 'data-method="delete" data-person_id="{0}"'
 
         ajax = self._connection.get('aspects/{0}/edit'.format(self.id)).text
+
+        #print(ajax)
+
         begin = ajax.find(start_regexp.search(ajax).group(0))
+        #print(0)
         end = ajax.find('</ul>')
         ajax = ajax[begin:end]
 
+        #print(ajax)
+
         usernames = [(line[17:33], line[35:-4]) for line in userline_regexp.findall(ajax)]
+        for guid, name in usernames:
+            print(name, guid)
         personids = [re.compile(personid_regexp.format(name)).search(ajax).group(0) for guid, name in usernames]
         for n, line in enumerate(personids):
             i, id = -2, ''