Merge lp:~dobey/tarmac/login-with into lp:tarmac

[dobey]

Use Launchpad.login_with instead of managing credentials manually

Tests still pass for me with both launchpadlib 1.6.2 and 1.9.7.

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'tarmac/bin/commands.py'
--- tarmac/bin/commands.py	2011-02-14 15:19:59 +0000
+++ tarmac/bin/commands.py	2011-03-07 18:10:30 +0000
@@ -7,7 +7,7 @@
 from bzrlib.commands import Command
 from bzrlib.errors import PointlessMerge
 from bzrlib.help import help_commands
-from launchpadlib.launchpad import (Credentials, Launchpad)
+from launchpadlib.launchpad import Launchpad
 from launchpadlib.uris import (LPNET_SERVICE_ROOT,
     STAGING_SERVICE_ROOT)
 
@@ -81,18 +81,10 @@
             self.logger.debug("  Fetching new credentials from {0}".format(
                 SERVICE_ROOT))
 
-            launchpad = Launchpad.get_token_and_login(
-                'Tarmac', SERVICE_ROOT, self.config.CACHE_HOME)
-            launchpad.credentials.save(file(filename, 'w'))
-
-            self.logger.debug("  Credentials saved to {0}".format(filename))
-        else:
-            credentials = Credentials()
-            credentials.load(open(filename))
-            self.logger.debug("  Credentials loaded".format(filename))
-
-            launchpad = Launchpad(
-                credentials, SERVICE_ROOT, self.config.CACHE_HOME)
+        launchpad = Launchpad.login_with(
+            u'Tarmac', service_root=SERVICE_ROOT,
+            credentials_file=filename,
+            launchpadlib_dir=self.config.CACHE_HOME)
 
         self.logger.debug("Connected")
         return launchpad