summaryrefslogtreecommitdiff
path: root/lib/thandy/download.py
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-11-16 22:47:01 +0000
committerNick Mathewson <nickm@torproject.org>2008-11-16 22:47:01 +0000
commit089508b5dfdeff9bd5345a1527d603d59e1df45d (patch)
tree21bd1568de76d789ff93435508ffcc873838b6a1 /lib/thandy/download.py
parent48adf40595f127c2bd167aa6774f4ba67e191c0f (diff)
Support socks.
git-svn-id: file:///home/or/svnrepo/updater/trunk@17295 55e972cd-5a19-0410-ae62-a4d7a52db4cd
Diffstat (limited to 'lib/thandy/download.py')
-rw-r--r--lib/thandy/download.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/thandy/download.py b/lib/thandy/download.py
index ef7f475..aaa8215 100644
--- a/lib/thandy/download.py
+++ b/lib/thandy/download.py
@@ -185,7 +185,7 @@ class DownloadJob:
tp, val, tb = sys.exc_info()
logging.warn("Internal during download: %s, %s", val,
traceback.format_exc())
- sys.exit(1)
+ return False
def _download(self):
# Implementation function. Unlike download(), can throw exceptions.
@@ -292,7 +292,7 @@ class ThandyDownloadJob(DownloadJob):
for c in m['contents']:
if self._supportedURLTypes is not None:
- urltype = urllib2.splittype(m['urlbase'][0])
+ urltype = urllib2.splittype(m['urlbase'])[0]
if urltype.lower() not in self._supportedURLTypes:
continue