diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index f5a0cf7fb..0a99616a8 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -1019,8 +1019,8 @@ class YoutubeDL(object):
                 except (ContentTooShortError, ) as err:
                     self.report_error('content too short (expected %s bytes and served %s)' % (err.expected, err.downloaded))
                     return
-		except StopDownloads:
-		    return
+                except StopDownloads
+                    return
 
             if success:
                 try:
@@ -1032,16 +1032,16 @@ class YoutubeDL(object):
         self.record_download_archive(info_dict)
 
     def get_stop_state(self):
-	return self._stop_state
+        return self._stop_state
         
     def get_pause_state(self):
-	return self._pause_state
+        return self._pause_state
 
     def set_stop_state(self, stop_state):
-	self._stop_state = stop_state
+        self._stop_state = stop_state
         
     def set_pause_state(self, pause_state):
-	self._pause_state = pause_state
+        self._pause_state = pause_state
         
     def download(self, url_list):
         """Download a given list of URLs."""
diff --git a/youtube_dl/downloader/common.py b/youtube_dl/downloader/common.py
index e16f97d5b..eac7e0311 100644
--- a/youtube_dl/downloader/common.py
+++ b/youtube_dl/downloader/common.py
@@ -158,7 +158,7 @@ class FileDownloader(object):
         speed = float(byte_counter) / elapsed
         if speed > rate_limit:
             time.sleep((byte_counter - rate_limit * (now - start_time)) / rate_limit)
-            
+
     def temp_name(self, filename):
         """Returns a temporary filename for the given filename."""
         if self.params.get('nopart', False) or filename == u'-' or \
@@ -302,23 +302,23 @@ class FileDownloader(object):
             ph(status)
 
     def _check_stop_handler(self):
-	if self._stop_handler is not None:
-	    if self._stop_handler():
-		raise StopDownloads()
+        if self._stop_handler is not None:
+            if self._stop_handler():
+                raise StopDownloads()
       
     def _check_pause_handler(self):
-	if self._pause_handler is not None:
-	    while self._pause_handler():
-		if self._stop_handler(): break
-		time.sleep(1)
+        if self._pause_handler is not None:
+            while self._pause_handler():
+                if self._stop_handler(): break
+                time.sleep(1)
     
     def set_stop_handler(self, stop_handler):
-	""" stop_handler gets checked. If True raise StopDownloads """
-	self._stop_handler = stop_handler
+        """ stop_handler gets checked. If True raise StopDownloads """
+        self._stop_handler = stop_handler
       
     def set_pause_handler(self, pause_handler):
-	""" pause_handler gets checked. If True pause downloads """
-	self._pause_handler = pause_handler
+        """ pause_handler gets checked. If True pause downloads """
+        self._pause_handler = pause_handler
     
     def add_progress_hook(self, ph):
         """ ph gets called on download progress, with a dictionary with the entries