Merge remote-tracking branch 'upstream/master'

This commit is contained in:
rupertbaxter2 2014-08-13 04:22:45 -07:00
commit f96252b913
15 changed files with 165 additions and 81 deletions

View file

@ -295,7 +295,7 @@ class FileDownloader(object):
def real_download(self, filename, info_dict):
"""Real download process. Redefine in subclasses."""
raise NotImplementedError(u'This method must be implemented by sublcasses')
raise NotImplementedError(u'This method must be implemented by subclasses')
def _hook_progress(self, status):
for ph in self._progress_hooks: