From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 23:09:17 +0000 (+0100)
Subject: Use io.BytesIO instead of StringIO
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=03f9daab34605f538294fdffb141ef5d9fc670e6;p=youtube-dl

Use io.BytesIO instead of StringIO
---

diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 28731b895..3ddaddd7f 100644
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 import datetime
-import HTMLParser
 import httplib
 import netrc
 import os
@@ -15,11 +14,6 @@ import random
 import math
 from urlparse import parse_qs
 
-try:
-	import cStringIO as StringIO
-except ImportError:
-	import StringIO
-
 from utils import *
 
 
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index c4917012b..ebff2e8f2 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import gzip
+import io
 import locale
 import os
 import re
@@ -10,11 +11,6 @@ import zlib
 import email.utils
 import json
 
-try:
-	import cStringIO as StringIO
-except ImportError:
-	import StringIO
-
 try:
 	import urllib.request as compat_urllib_request
 except ImportError: # Python 2
@@ -400,12 +396,12 @@ class YoutubeDLHandler(compat_urllib_request.HTTPHandler):
 		old_resp = resp
 		# gzip
 		if resp.headers.get('Content-encoding', '') == 'gzip':
-			gz = gzip.GzipFile(fileobj=StringIO.StringIO(resp.read()), mode='r')
+			gz = gzip.GzipFile(fileobj=io.BytesIO(resp.read()), mode='r')
 			resp = self.addinfourl_wrapper(gz, old_resp.headers, old_resp.url, old_resp.code)
 			resp.msg = old_resp.msg
 		# deflate
 		if resp.headers.get('Content-encoding', '') == 'deflate':
-			gz = StringIO.StringIO(self.deflate(resp.read()))
+			gz = io.BytesIO(self.deflate(resp.read()))
 			resp = self.addinfourl_wrapper(gz, old_resp.headers, old_resp.url, old_resp.code)
 			resp.msg = old_resp.msg
 		return resp