Merge branch 'master' of github.com:CouchPotato/CouchPotato

Conflicts:
	couchpotato/core/plugins/searcher/__init__.py
This commit is contained in:
Ruud committed 2011-08-19 16:15:51 +02:00
commit 892ee283ef
37 files changed
+1183 -81

No files matched your search

@@ -34,6 +34,7 @@ class Blackhole(Downloader):
log.debug('Failed download file: %s' % data.get('name'))
return False
else:
log.info('Downloading: %s' % data.get('url'))
file = urllib.urlopen(data.get('url')).read()
with open(fullPath, 'wb') as f: