Skip to content

Removing remaining references to Curl from ARM pack manager #3283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2016
Merged

Removing remaining references to Curl from ARM pack manager #3283

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions tools/arm_pack_manager/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ def display_counter (self, message) :
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
Expand Down Expand Up @@ -117,10 +115,10 @@ def pdsc_to_pack (self, url) :
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
Expand Down Expand Up @@ -433,6 +431,6 @@ def cache_and_parse(self, url) :
: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)