Merge lp:~jelmer/bzr-builddeb/newlplib into lp:bzr-builddeb

[Jelmer Vernooij]

Support the new mechanism for logging in in launchpadlib.

[James Westby (james-w)]

Hi,

This change doesn't preserve this existing behaviour.

22 + if not os.path.exists(creds_path):
23 + return None

Maybe we don't want that any more, but if not we should
drop it from both code paths.

Thanks,

James

review: Needs Fixing

[Jelmer Vernooij (jelmer)]

> This change doesn't preserve this existing behaviour.
>
> 22 + if not os.path.exists(creds_path):
> 23 + return None
>
> Maybe we don't want that any more, but if not we should
> drop it from both code paths.
In what way is that incompatible? Because we'll now perhaps prompt the user to log in ?

I guess we could use "Launchpad.login_anonymously" as an alternative.

Cheers,

Jelmer

[James Westby (james-w)]

On Fri, 04 Mar 2011 19:06:17 -0000, Jelmer Vernooij <email address hidden> wrote:
> > This change doesn't preserve this existing behaviour.
> >
> > 22 + if not os.path.exists(creds_path):
> > 23 + return None
> >
> > Maybe we don't want that any more, but if not we should
> > drop it from both code paths.
> In what way is that incompatible? Because we'll now perhaps prompt the user to log in ?

Yeah. IIRC this was done so that you had to explicitly configure it, as
I didn't want to prompt everyone for credentials when this is a feature
that won't have any effect in the vast majority of cases, except for the
importer.

> I guess we could use "Launchpad.login_anonymously" as an alternative.

That would at least avoid the prompt wouldn't it? I'm still not sure it
is worth the round trips, given that the feature is mainly useful for
the importer.

Thanks,

James

[James Westby (james-w)]

19 + return Launchpad.login_anonymously("bzr-builddeb", "production")

I think I would prefer the keyword form of the service_root argument there
(assuming it has one), but other than that this looks good now.

Thanks,

James

review: Approve

[Jelmer Vernooij (jelmer)]

> 19 + return Launchpad.login_anonymously("bzr-builddeb",
> "production")
>
> I think I would prefer the keyword form of the service_root argument there
> (assuming it has one), but other than that this looks good now.
WFM, fixed and merged.

Cheers,

Jelmer

=== modified file 'launchpad.py'
--- launchpad.py	2010-09-10 02:46:41 +0000
+++ launchpad.py	2011-03-05 01:24:25 +0000
@@ -33,17 +33,19 @@
 
 
 def _get_launchpad():
-    creds_path = os.path.join(config_dir(), "builddeb.lp_creds.txt")
-    if not os.path.exists(creds_path):
-        return None
-    creds = Credentials("bzr-builddeb")
-    f = open(creds_path)
     try:
-        creds.load(f)
-    finally:
-        f.close()
-    lp = Launchpad(creds, service_root=LPNET_SERVICE_ROOT)
-    return lp
+        return Launchpad.login_anonymously("bzr-builddeb", "production")
+    except AttributeError: # older version of launchpadlib
+        creds_path = os.path.join(config_dir(), "builddeb.lp_creds.txt")
+        if not os.path.exists(creds_path):
+            return None
+        creds = Credentials("bzr-builddeb")
+        f = open(creds_path)
+        try:
+            creds.load(f)
+        finally:
+            f.close()
+        return Launchpad(creds, service_root=LPNET_SERVICE_ROOT)
 
 
 def ubuntu_bugs_for_debian_bug(bug_id):