Merge lp:~davewalker/loco-team-portal/unauthed_lp_api into lp:loco-team-portal

[Dave Walker]

[Dave Walker (davewalker)]

Closes Bug #510735

[Daniel Holbach (dholbach)]

Nice work!

review: Approve

=== modified file 'loco_directory/common/launchpad.py'
--- loco_directory/common/launchpad.py	2010-01-18 14:41:22 +0000
+++ loco_directory/common/launchpad.py	2010-01-22 10:49:11 +0000
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 from launchpadlib.launchpad import Launchpad
-from launchpadlib.credentials import Credentials
 from launchpadlib.errors import HTTPError
 from launchpadlib.launchpad import EDGE_SERVICE_ROOT
 
@@ -13,26 +12,12 @@
 
 def lp_login(lp_instance=EDGE_SERVICE_ROOT):
     cachedir = os.path.join(settings.PROJECT_PATH, 'lp_data/cache')
-    creddir = os.path.join(settings.PROJECT_PATH, 'lp_data/lp_credentials')
-    if not os.path.isdir(creddir):
-        os.makedirs(creddir)
-    cred = os.path.join(creddir, 'loco-directory.credentials')
-    
-    if os.path.exists(cred):
-        credentials = Credentials()
-        credentials.load(open(cred))
-        launchpad = Launchpad(credentials, lp_instance, cachedir)
-    else:
-        try:
-            launchpad = Launchpad.get_token_and_login('loco-directory',
-                                                      lp_instance, cachedir)
-        except HTTPError, e:
-            print >> sys.stderr, 'Error connecting to Launchpad: %s' % str(e)
-            sys.exit(1)
-        f = open(cred, 'w')
-        os.chmod(cred, 0600)
-        launchpad.credentials.save(f)
-        f.close()
+    client_ident = getattr(settings, 'LP_PROJECT_NAME', "LoCo Directory")
+    try:
+        launchpad = Launchpad.login_anonymously(client_ident, lp_instance, cachedir)
+    except:
+        # Support for launchpadlib pre 1.5.4.
+        launchpad = Launchpad.login(client_ident, "", "", lp_instance, cachedir)
     return launchpad
 
 def is_user_on_loco_council(user):