Changed download to download_url

excid3 · Jul 30, 2010 · 2d3790f · 2d3790f
1 parent 5ac140b
commit 2d3790f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Download.py b/src/Download.py
@@ -80,7 +80,7 @@ def textprogress(display, current, total):
     sys.stdout.flush()
 
 
-def download(url, filename, display=None, progress=textprogress, proxy={}, username=None, password=None):
+def download_url(url, filename, display=None, progress=textprogress, proxy={}, username=None, password=None):
     """
         Downloads a file to ram and returns a string of the contents
     """

diff --git a/src/definitions/aptdef/__init__.py b/src/definitions/aptdef/__init__.py
@@ -39,7 +39,7 @@
 from DpkgVersion import DpkgVersion
 
 from DefinitionBase import DefinitionBase#, Base
-from Download import download
+from Download import download_url
 from utils import format_number
 
 info = {"name"   : "apt",
@@ -229,7 +229,7 @@ def on_update(self, reporthook=None, directory="downloads/lists", download=True)
             #TODO: Support bz2 and unarchived Packages files
             filename = "%s.gz" % filename
             if download:
-                download("%s.gz" % url, filename, display_name, proxy=self.proxy["proxy"], username=self.proxy["user"], password=self.proxy["pass"])
+                download_url("%s.gz" % url, filename, display_name, proxy=self.proxy["proxy"], username=self.proxy["user"], password=self.proxy["pass"])
             downloaded.append((repo, filename))