Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-16 01:21:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

ubuntutools/archive: deprecate passing 'lp' object to SourcePackage()

Browse Source 
There is no point to doing this, as the Launchpad object is a singleton;
the caller should just call Launchpad.login_with() directly and leave
the SourcePackage class out of it.

Signed-off-by: Dan Streetman <ddstreet@canonical.com>
This commit is contained in:
Dan Streetman 2020-06-15 17:00:00 -04:00
parent cb865e3b86
commit e13a4eb45e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ubuntutools/archive.py
View File

@ -127,7 +127,6 @@ class SourcePackage(object):
latest version from the development series. latest version from the development series.
""" """
dscfile = kwargs.get('dscfile') dscfile = kwargs.get('dscfile')
lp = kwargs.get('lp')
mirrors = kwargs.get('mirrors', ()) mirrors = kwargs.get('mirrors', ())
workdir = kwargs.get('workdir', '.') workdir = kwargs.get('workdir', '.')
series = kwargs.get('series') series = kwargs.get('series')
@ -138,8 +137,14 @@ class SourcePackage(object):
assert (package is not None or dscfile is not None) assert (package is not None or dscfile is not None)
if 'lp' in kwargs:
# deprecated - please don't use this; if you want to use an
# existing lp object, just call login_existing() directly
Logger.warning("Deprecation warning: please don't pass 'lp' to SourcePackage")
if not Launchpad.logged_in:
Launchpad.login_existing(kwargs['lp'])
self.source = package self.source = package
self._lp = lp
self.binary = None self.binary = None
self.try_binary = try_binary self.try_binary = try_binary
self.workdir = workdir self.workdir = workdir
@ -185,12 +190,6 @@ class SourcePackage(object):
if self._spph: if self._spph:
return self._spph return self._spph
if not Launchpad.logged_in:
if self._lp:
Launchpad.login_existing(self._lp)
else:
Launchpad.login_anonymously()
archive = self.getArchive() archive = self.getArchive()
params = {} params = {}
if self._version: if self._version: