Merge lp:~jelmer/lptools/standard-login into lp:lptools

[Jelmer Vernooij]

Use the standard Launchpad.login_with method to log in, and remove the related boiler plate code.

This means relying on a newer version of launchpadlib, which will make backporting of lptools harder. Is that a problem?

[lp:~jelmer/lptools/standard-login]

25. By Jelmer Vernooij on 2011-08-27

Use production instance by default.

[Martin Pool (mbp)]

Hooray for removing duplicated code.

It might be worth checking there is a specific version check against lplib so that people will get a clean message if it's out of date.

I think the api changes in lplib will make it a bit hard to support multiple versions and I don't think it's a priority compared to just getting the code moving on the current version.

review: Approve

=== modified file 'lptools/config.py'
--- lptools/config.py	2010-02-20 04:46:06 +0000
+++ lptools/config.py	2011-08-27 12:32:23 +0000
@@ -21,17 +21,11 @@
 __all__ = [
     "ensure_dir",
     "get_launchpad",
-    "lptools_cachedir",
-    "lptools_credentials_path",
     ]
 
 import os.path
 
-from launchpadlib.credentials import Credentials
-from launchpadlib.launchpad import EDGE_SERVICE_ROOT
-from xdg.BaseDirectory import xdg_cache_home
-
-from lptools import launchpad
+from launchpadlib.launchpad import Launchpad
 
 
 def ensure_dir(dir):
@@ -43,41 +37,10 @@
 def get_launchpad(appname):
     """Get a login to launchpad for lptools caching in cachedir.
     
-    Note that caching is not multiple-process safe in launchpadlib, and the
-    appname parameter is used to create per-app cachedirs.
-
-    :param appname: The name of the app used to create per-app cachedirs.
-    """
-    cachedir = os.path.join(xdg_cache_home, appname)
-    ensure_dir(cachedir)
-    credspath = lptools_credentials_path()
-    if os.path.exists(credspath):
-        creds = Credentials()
-        with file(credspath) as f:
-            creds.load(f)
-        return launchpad.Launchpad(creds, EDGE_SERVICE_ROOT, cachedir)
-    else:
-        result = launchpad.Launchpad.get_token_and_login('lptools',
-            EDGE_SERVICE_ROOT, cachedir)
-        with file(credspath, "w") as f:
-            result.credentials.save(f)
-        return result
-
-
-def lptools_cachedir():
-    """Return the cachedir for common lptools things.
-    
-    This is xdg_cache_home/lptools.
-    """
-    return os.path.join(xdg_cache_home, "lptools")
-
-
-def lptools_credentials_path():
-    """Return the path to the lptools credentials file.
-    
-    This also ensures the path is usable by checking it's containing directory
-    exists.
-    """
-    cachedir = lptools_cachedir()
-    ensure_dir(cachedir)
-    return os.path.join(lptools_cachedir(), 'credentials')
+    Note that caching is not multiple-process safe in launchpadlib,
+    and the appname parameter is used to create per-app cachedirs.
+
+    :param appname: The name of the app used to create per-app
+        cachedirs.
+    """
+    return Launchpad.login_with("lptools-%s" % appname, "production")