From e8b02a39b2d42ba91fc25520fb9c1ac699b045d1 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 16 Aug 2011 16:20:29 +0100 Subject: [PATCH] monkeypatching doesn't work right; extend Launchpad.login instead --- syncpackage | 7 ++----- ubuntutools/lp/lpapicache.py | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/syncpackage b/syncpackage index 74ce307..a5bd5b5 100755 --- a/syncpackage +++ b/syncpackage @@ -35,7 +35,7 @@ from ubuntutools.config import UDTConfig, ubu_email from ubuntutools.requestsync.mail import (getDebianSrcPkg as requestsync_mail_getDebianSrcPkg) from ubuntutools.requestsync.lp import getDebianSrcPkg, getUbuntuSrcPkg -from ubuntutools.lp import udtexceptions, api_version +from ubuntutools.lp import udtexceptions from ubuntutools.lp.lpapicache import Distribution, Launchpad from ubuntutools.misc import split_release_pocket from ubuntutools import subprocess @@ -450,14 +450,11 @@ def main(): if args[0].endswith('.dsc'): parser.error('.dsc files can only be synced using --no-lp.') - # We need devel for now. - api_version = 'devel' - if options.lpinstance is None: options.lpinstance = config.get_value('LPINSTANCE') try: - Launchpad.login(service=options.lpinstance) + Launchpad.login(service=options.lpinstance, api_version='devel') except IOError: sys.exit(1) diff --git a/ubuntutools/lp/lpapicache.py b/ubuntutools/lp/lpapicache.py index b223333..ea7f17d 100644 --- a/ubuntutools/lp/lpapicache.py +++ b/ubuntutools/lp/lpapicache.py @@ -53,7 +53,7 @@ _POCKETS = ('Release', 'Security', 'Updates', 'Proposed', 'Backports') class _Launchpad(object): '''Singleton for LP API access.''' - def login(self, service=service): + def login(self, service=service, api_version=api_version): '''Enforce a non-anonymous login.''' if not self.logged_in: try: