Py2/3 compatibility for http.client

zeickan · Nov 27, 2012 · 348d0a7 · 348d0a7
1 parent 03f9daa
commit 348d0a7
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 59 deletions.
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import httplib
 import math
 import os
 import re
@@ -460,7 +459,7 @@ def process_info(self, info_dict):
 					success = self._do_download(filename, info_dict)
 				except (OSError, IOError) as err:
 					raise UnavailableVideoError
-				except (compat_urllib_error.URLError, httplib.HTTPException, socket.error) as err:
+				except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
 					self.trouble(u'ERROR: unable to download video data: %s' % str(err))
 					return
 				except (ContentTooShortError, ) as err: