Merge pull request #3283 from bridadan/remove-curl-references

Removing remaining references to Curl from ARM pack manager
pull/3322/head
Martin Kojtal 2016-11-29 18:15:57 +01:00 committed by GitHub
commit 257d6357ca
1 changed files with 4 additions and 6 deletions

View File

@ -78,8 +78,6 @@ class Cache () :
def cache_file (self, url) :
"""Low level interface to caching a single file.
:param curl: The user is responsible for providing a curl.Curl object as the curl parameter.
:type curl: curl.Curl
:param url: The URL to cache.
:type url: str
:rtype: None
@ -117,10 +115,10 @@ class Cache () :
content.package.find('name').get_text() + "." +
largest_version(content) + ".pack")
def cache_pdsc_and_pack (self, curl, url) :
self.cache_file(curl, url)
def cache_pdsc_and_pack (self, url) :
self.cache_file(url)
try :
self.cache_file(curl, self.pdsc_to_pack(url))
self.cache_file(self.pdsc_to_pack(url))
except AttributeError :
stderr.write("[ ERROR ] {} does not appear to be a conforming .pdsc file\n".format(url))
self.counter += 1
@ -433,6 +431,6 @@ class Cache () :
:return: A parsed representation of the PDSC file.
:rtype: BeautifulSoup
"""
self.cache_file(Curl(), url)
self.cache_file(url)
return self.pdsc_from_cache(url)