Merge lp:~daker/loco-team-portal/fix.734520 into lp:loco-team-portal

[Adnane Belmadiaf]

Workarround to get mugshot working

[Chris Johnston (cjohnston)]

I'm still getting a link to https://api.launchpad.net/1.0/~persaudsamuel/logo in one of the events which results in: Object: <canonical.launchpad.rest.bytestorage.LibraryBackedByteStorage object at 0x2b007914e450>, name: 'logo'

review: Needs Fixing

[Adnane Belmadiaf (daker)]

That's wired , are you sure this user was updated when running update-profiles command ?

[Adnane Belmadiaf (daker)]

Can someone retest this pls.

[Chris Johnston (cjohnston)]

Text conflict in loco_directory/templates/events/team_event_detail_attendees.inc.html
1 conflicts encountered.

Please fix the conflict and I will test again. Thanks

review: Needs Fixing

[Adnane Belmadiaf (daker)]

Can you retest it pls ?

[Chris Johnston (cjohnston)]

review: Approve

[Tarmac WebDev (tarmac-webdev)]

Attempt to merge into lp:loco-team-portal failed due to conflicts:

text conflict in loco_directory/templates/events/team_event_detail_attendees.inc.html

[lp:~daker/loco-team-portal/fix.734520]

470. By Adnane Belmadiaf on 2012-06-20

Fixed the merge conflict

=== modified file 'loco_directory/common/launchpad.py'
--- loco_directory/common/launchpad.py	2011-10-05 00:50:53 +0000
+++ loco_directory/common/launchpad.py	2012-06-20 10:51:18 +0000
@@ -8,6 +8,7 @@
 
 import os
 import sys
+import urllib2
 
 def is_debug_user(username):
     try:
@@ -58,16 +59,17 @@
     if is_debug_user(username):
         return True
 
-def get_mugshot_url(lp, identity):
-    # Not ideal, but until LP #336943
+def get_mugshot_url(url):
+    # Not ideal, but until LP #713873
     # or similar, we are in a hard spot.
     # When this bug is fixed, this can be made cleaner.
     try:
-       lp.people[identity].mugshot.open()
-       return lp.people[identity].mugshot_link or "https://api.launchpad.net/1.0/~%s/mugshot" % (identity)
-    except HTTPError:
-       # 404 or some other issue that means we should default to False
-       return "https://api.launchpad.net/1.0/ubuntu/mugshot"
+        con = urllib2.urlopen(url)
+        con.close()
+        return url
+    except urllib2.HTTPError, e:
+        # 404 or some other issue that means we should default to False
+        return "https://launchpad.net/@@/person-logo"
 
 def get_user_timezone(username, lp=None):
     timezone = 'UTC'

=== modified file 'loco_directory/userprofiles/management/commands/update-profiles.py'
--- loco_directory/userprofiles/management/commands/update-profiles.py	2010-12-28 21:41:10 +0000
+++ loco_directory/userprofiles/management/commands/update-profiles.py	2012-06-20 10:51:18 +0000
@@ -25,13 +25,11 @@
             if not ld_user.username in USER_BLACKLIST:
                 profile, created = UserProfile.objects.get_or_create(user=ld_user)
                 try:
+                    print "updating %s" % ld_user
                     lp_user = lp.people[ld_user.username]
                     profile.tz = lp_user.time_zone or "UTC"
                     profile.realname = lp_user.display_name or user.username
-                    if lp_user.logo_link.startswith("https://") :
-                       profile.mugshot = lp_user.logo_link
-                    else:
-                       profile.mugshot = "https://launchpad.net/@@/person-logo"
+                    profile.mugshot = launchpad.get_mugshot_url(lp_user.logo_link)
                     profile.save()
                 except Exception, e:
                     print "Error updating %s" % ld_user