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

archive: remove _lp_url()

Browse Source
This commit is contained in:
Dan Streetman 2020-01-24 17:25:09 -05:00
parent eaa07014e0
commit 11429b213c
1 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ubuntutools/archive.py
View File

@ -28,7 +28,7 @@ Approach:
""" """
from urllib.error import (URLError, HTTPError) from urllib.error import (URLError, HTTPError)
from urllib.parse import (quote, urlparse) from urllib.parse import urlparse
from urllib.request import urlopen from urllib.request import urlopen
import codecs import codecs
import json import json
@ -288,17 +288,6 @@ class SourcePackage(object):
return os.path.join(mirror, 'pool', self.component, group, return os.path.join(mirror, 'pool', self.component, group,
self.source, filename) self.source, filename)
def _lp_url(self, filename, source=False):
"Build an archive file URL on Launchpad"
if source:
suffix = '+sourcefiles/%s/%s/%s' % (
quote(self.source), quote(self.version.full_version),
quote(filename))
else:
suffix = '+files/%s' % quote(filename)
return 'https://launchpad.net/%s/+archive/primary/%s' % (
quote(self.distribution), suffix)
def _source_urls(self, name): def _source_urls(self, name):
"Generator of sources for name" "Generator of sources for name"
if self._dsc_source: if self._dsc_source:
@ -310,7 +299,6 @@ class SourcePackage(object):
yield self._mirror_url(mirror, name) yield self._mirror_url(mirror, name)
if self.lp_spph.sourceFileUrl(name): if self.lp_spph.sourceFileUrl(name):
yield self.lp_spph.sourceFileUrl(name) yield self.lp_spph.sourceFileUrl(name)
yield self._lp_url(name, source=True)
def _binary_urls(self, name, bpph): def _binary_urls(self, name, bpph):
"Generator of URLs for name" "Generator of URLs for name"
@ -323,7 +311,6 @@ class SourcePackage(object):
yield bpph.binaryFileUrl(name) yield bpph.binaryFileUrl(name)
if bpph.getUrl(): if bpph.getUrl():
yield bpph.getUrl() yield bpph.getUrl()
yield self._lp_url(name)
def pull_dsc(self): def pull_dsc(self):
"Retrieve dscfile and parse" "Retrieve dscfile and parse"
@ -765,18 +752,6 @@ class PersonalPackageArchiveSourcePackage(UbuntuSourcePackage):
self._team = None self._team = None
self._ppa = None self._ppa = None
def _lp_url(self, filename, source=False):
"Build an archive file URL on Launchpad"
if source:
suffix = '+sourcefiles/%s/%s/%s' % (
quote(self.source), quote(self.version.full_version),
quote(filename))
else:
suffix = '+files/%s' % quote(filename)
return 'https://launchpad.net/~%s/+archive/%s/%s/%s' % (
quote(self._ppateam), quote(self.distribution),
quote(self._ppaname), suffix)
class UbuntuCloudArchiveSourcePackage(PersonalPackageArchiveSourcePackage): class UbuntuCloudArchiveSourcePackage(PersonalPackageArchiveSourcePackage):
"Download / unpack an Ubuntu Cloud Archive source package" "Download / unpack an Ubuntu Cloud Archive source package"