From bae611f216ac7b1f1a24a506da6dffc518d09d5b Mon Sep 17 00:00:00 2001
From: Arvydas Sidorenko <asido4@gmail.com>
Date: Sun, 1 Jul 2012 18:21:27 +0200
Subject: Simplified preferredencoding()

Not sure what is the point to use yield to return encoding, thus
it will simplify the whole function.

Signed-off-by: Arvydas Sidorenko <asido4@gmail.com>
---
 youtube_dl/utils.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 2853ba50f..7faa046c8 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -32,15 +32,13 @@ def preferredencoding():
 	Returns the best encoding scheme for the system, based on
 	locale.getpreferredencoding() and some further tweaks.
 	"""
-	def yield_preferredencoding():
-		try:
-			pref = locale.getpreferredencoding()
-			u'TEST'.encode(pref)
-		except:
-			pref = 'UTF-8'
-		while True:
-			yield pref
-	return yield_preferredencoding().next()
+	try:
+		pref = locale.getpreferredencoding()
+		u'TEST'.encode(pref)
+	except:
+		pref = 'UTF-8'
+
+	return pref
 
 
 def htmlentity_transform(matchobj):
-- 
cgit v1.2.3


From 891d7f232959f85810011fe32b107a0dfd5db85b Mon Sep 17 00:00:00 2001
From: Joel Verhagen <joel.verhagen@gmail.com>
Date: Sat, 14 Jul 2012 16:47:19 -0400
Subject: Added options to set download buffer size and disable automatic
 buffer resizing.

---
 README.md                    |   3 +++
 youtube-dl                   | Bin 40554 -> 40754 bytes
 youtube-dl.exe               | Bin 3989631 -> 3989797 bytes
 youtube_dl/FileDownloader.py |   7 +++++--
 youtube_dl/__init__.py       |  12 ++++++++++++
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f04b96128..fc9c1a6b8 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,9 @@ which means you can modify it, redistribute it or use it however you like.
     -i, --ignore-errors      continue on download errors
     -r, --rate-limit LIMIT   download rate limit (e.g. 50k or 44.6m)
     -R, --retries RETRIES    number of retries (default is 10)
+    -b, --buffer-size SIZE   size of download buffer (e.g. 1024 or 16k) (default
+                             is 1024)
+    --no-resize-buffer       do not automatically adjust the buffer size
     --dump-user-agent        display the current browser identification
     --list-extractors        List all supported extractors and the URLs they
                              would handle
diff --git a/youtube-dl b/youtube-dl
index b3e0cd422..6e6932b52 100755
Binary files a/youtube-dl and b/youtube-dl differ
diff --git a/youtube-dl.exe b/youtube-dl.exe
index c55f5fa8d..4ff820dc8 100755
Binary files a/youtube-dl.exe and b/youtube-dl.exe differ
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index 14e872a98..724de17c7 100644
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -61,6 +61,8 @@ class FileDownloader(object):
 	ratelimit:        Download speed limit, in bytes/sec.
 	nooverwrites:     Prevent overwriting files.
 	retries:          Number of times to retry for HTTP error 5xx
+	buffersize:       Size of download buffer in bytes.
+	noresizebuffer:   Do not automatically resize the download buffer.
 	continuedl:       Try to continue downloads if possible.
 	noprogress:       Do not print the progress bar.
 	playliststart:    Playlist item to start at.
@@ -633,7 +635,7 @@ class FileDownloader(object):
 			data_len = long(data_len) + resume_len
 		data_len_str = self.format_bytes(data_len)
 		byte_counter = 0 + resume_len
-		block_size = 1024
+		block_size = self.params.get('buffersize', 1024)
 		start = time.time()
 		while True:
 			# Download and write
@@ -659,7 +661,8 @@ class FileDownloader(object):
 			except (IOError, OSError), err:
 				self.trouble(u'\nERROR: unable to write data: %s' % str(err))
 				return False
-			block_size = self.best_block_size(after - before, len(data_block))
+			if not self.params.get('noresizebuffer', False):
+				block_size = self.best_block_size(after - before, len(data_block))
 
 			# Progress message
 			speed_str = self.calc_speed(start, time.time(), byte_counter - resume_len)
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index f10822db1..7983b24eb 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -187,6 +187,11 @@ def parseOpts():
 			dest='ratelimit', metavar='LIMIT', help='download rate limit (e.g. 50k or 44.6m)')
 	general.add_option('-R', '--retries',
 			dest='retries', metavar='RETRIES', help='number of retries (default is 10)', default=10)
+	general.add_option('-b', '--buffer-size',
+			dest='buffersize', metavar='SIZE', help='size of download buffer (e.g. 1024 or 16k) (default is 1024)', default="1024")
+	general.add_option('--no-resize-buffer',
+			action='store_true', dest='noresizebuffer',
+			help='do not automatically adjust the buffer size', default=False)
 	general.add_option('--dump-user-agent',
 			action='store_true', dest='dump_user_agent',
 			help='display the current browser identification', default=False)
@@ -428,6 +433,11 @@ def _real_main():
 			opts.retries = long(opts.retries)
 		except (TypeError, ValueError), err:
 			parser.error(u'invalid retry count specified')
+	if opts.buffersize is not None:
+		numeric_buffersize = FileDownloader.parse_bytes(opts.buffersize)
+		if numeric_buffersize is None:
+			parser.error(u'invalid buffer size specified')
+		opts.buffersize = numeric_buffersize
 	try:
 		opts.playliststart = int(opts.playliststart)
 		if opts.playliststart <= 0:
@@ -475,6 +485,8 @@ def _real_main():
 		'ratelimit': opts.ratelimit,
 		'nooverwrites': opts.nooverwrites,
 		'retries': opts.retries,
+		'buffersize': opts.buffersize,
+		'noresizebuffer': opts.noresizebuffer,
 		'continuedl': opts.continue_dl,
 		'noprogress': opts.noprogress,
 		'playliststart': opts.playliststart,
-- 
cgit v1.2.3


From aab4fca4225d1d7935154486b72c3edf73ecf77a Mon Sep 17 00:00:00 2001
From: Joel Verhagen <joel.verhagen@gmail.com>
Date: Mon, 16 Jul 2012 10:59:21 -0400
Subject: Updated --no-resize-buffer docs, removed -b option

---
 README.md              |   6 ++++--
 youtube-dl             | Bin 40754 -> 40781 bytes
 youtube-dl.exe         | Bin 3989797 -> 3989826 bytes
 youtube_dl/__init__.py |   4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index fc9c1a6b8..0d0552a47 100644
--- a/README.md
+++ b/README.md
@@ -17,9 +17,11 @@ which means you can modify it, redistribute it or use it however you like.
     -i, --ignore-errors      continue on download errors
     -r, --rate-limit LIMIT   download rate limit (e.g. 50k or 44.6m)
     -R, --retries RETRIES    number of retries (default is 10)
-    -b, --buffer-size SIZE   size of download buffer (e.g. 1024 or 16k) (default
+    --buffer-size SIZE       size of download buffer (e.g. 1024 or 16k) (default
                              is 1024)
-    --no-resize-buffer       do not automatically adjust the buffer size
+    --no-resize-buffer       do not automatically adjust the buffer size. By
+                             default, the buffer size is automatically resized
+                             from an initial value of SIZE.
     --dump-user-agent        display the current browser identification
     --list-extractors        List all supported extractors and the URLs they
                              would handle
diff --git a/youtube-dl b/youtube-dl
index 6e6932b52..f615f6f9b 100755
Binary files a/youtube-dl and b/youtube-dl differ
diff --git a/youtube-dl.exe b/youtube-dl.exe
index 4ff820dc8..f74249a20 100755
Binary files a/youtube-dl.exe and b/youtube-dl.exe differ
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 7983b24eb..15f835a31 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -187,11 +187,11 @@ def parseOpts():
 			dest='ratelimit', metavar='LIMIT', help='download rate limit (e.g. 50k or 44.6m)')
 	general.add_option('-R', '--retries',
 			dest='retries', metavar='RETRIES', help='number of retries (default is 10)', default=10)
-	general.add_option('-b', '--buffer-size',
+	general.add_option('--buffer-size',
 			dest='buffersize', metavar='SIZE', help='size of download buffer (e.g. 1024 or 16k) (default is 1024)', default="1024")
 	general.add_option('--no-resize-buffer',
 			action='store_true', dest='noresizebuffer',
-			help='do not automatically adjust the buffer size', default=False)
+			help='do not automatically adjust the buffer size. By default, the buffer size is automatically resized from an initial value of SIZE.', default=False)
 	general.add_option('--dump-user-agent',
 			action='store_true', dest='dump_user_agent',
 			help='display the current browser identification', default=False)
-- 
cgit v1.2.3


From f2ad10a97d59a7abf994facdd2180a356fdd701f Mon Sep 17 00:00:00 2001
From: Christian Albrecht <christian.albrecht@mayflower.de>
Date: Sun, 26 Aug 2012 09:11:19 +0200
Subject: Add arte.tv Info Extractor

---
 youtube_dl/InfoExtractors.py | 155 +++++++++++++++++++++++++++++++++++++++++++
 youtube_dl/__init__.py       |   1 +
 2 files changed, 156 insertions(+)

diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index ddb4aa16b..82459e7a8 100644
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -1077,6 +1077,161 @@ class VimeoIE(InfoExtractor):
 		}]
 
 
+class ArteTvIE(InfoExtractor):
+        """arte.tv information extractor."""
+
+        _VALID_URL = r'(?:http://)?videos\.arte\.tv/(?:fr|de)/videos/.*'
+        _LIVE_URL = r'index-[0-9]+\.html$'
+
+        IE_NAME = u'arte.tv'
+
+        def __init__(self, downloader=None):
+                InfoExtractor.__init__(self, downloader)
+
+        def report_download_webpage(self, video_id):
+                """Report webpage download."""
+                self._downloader.to_screen(u'[arte.tv] %s: Downloading webpage' % video_id)
+
+        def report_extraction(self, video_id):
+                """Report information extraction."""
+                self._downloader.to_screen(u'[arte.tv] %s: Extracting information' % video_id)
+
+        def fetch_webpage(self, url):
+                self._downloader.increment_downloads()
+                request = urllib2.Request(url)
+                try:
+                        self.report_download_webpage(url)
+                        webpage = urllib2.urlopen(request).read()
+                except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+                        self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % str(err))
+                        return
+                except ValueError, err:
+                        self._downloader.trouble(u'ERROR: Invalid URL: %s' % url)
+                        return
+                return webpage
+
+        def grep_webpage(self, url, regex, regexFlags, matchTuples):
+                page = self.fetch_webpage(url)
+                mobj = re.search(regex, page, regexFlags)
+                info = {}
+
+                if mobj is None:
+                    self._downloader.trouble(u'ERROR: Invalid URL: %s' % url)
+                    return
+
+                for (i, key, err) in matchTuples:
+                    if mobj.group(i) is None:
+                        self._downloader.trouble(err)
+                        return
+                    else:
+                        info[key] = mobj.group(i)
+
+                return info
+
+        def extractLiveStream(self, url):
+
+                video_lang = url.split('/')[-4]
+
+                info = self.grep_webpage(
+                    url,
+                    r'src="(.*?/videothek_js.*?\.js)',
+                    0,
+                    [
+                        (1, 'url', u'ERROR: Invalid URL: %s' % url)
+                    ]
+                )
+
+                http_host = url.split('/')[2]
+                next_url = 'http://%s%s' % (http_host, urllib.unquote(info.get('url')))
+
+                info = self.grep_webpage(
+                    next_url,
+                    r'(s_artestras_scst_geoFRDE_' + video_lang + '.*?)\'.*?' +
+                     '(http://.*?\.swf).*?' +
+                     '(rtmp://.*?)\'',
+                    re.DOTALL,
+                    [
+                        (1, 'path',   u'ERROR: could not extract video path: %s' % url),
+                        (2, 'player', u'ERROR: could not extract video player: %s' % url),
+                        (3, 'url',    u'ERROR: could not extract video url: %s' % url)
+                    ]
+                )
+
+                video_url = u'%s/%s' % (info.get('url'), info.get('path'))
+
+                print u'rtmpdump --swfVfy \'%s\' --rtmp \'%s\' --live -o arte-live.mp4' % (info.get('player'), video_url)
+
+        def extractPlus7Stream(self, url):
+
+                video_lang = url.split('/')[-3]
+
+                info = self.grep_webpage(
+                    url,
+                    r'param name="movie".*?videorefFileUrl=(http[^\'"&]*)',
+                    0,
+                    [
+                        (1, 'url', u'ERROR: Invalid URL: %s' % url)
+                    ]
+                )
+
+                next_url = urllib.unquote(info.get('url'))
+
+                info = self.grep_webpage(
+                    next_url,
+                    r'<video lang="%s" ref="(http[^\'"&]*)' % video_lang,
+                    0,
+                    [
+                        (1, 'url', u'ERROR: Could not find <video> tag: %s' % url)
+                    ]
+                )
+
+                next_url = urllib.unquote(info.get('url'))
+
+                info = self.grep_webpage(
+                    next_url,
+                    r'<video id="(.*?)".*?>.*?' +
+                     '<name>(.*?)</name>.*?' +
+                     '<dateVideo>(.*?)</dateVideo>.*?' +
+                     '<url quality="hd">(.*?)</url>',
+                    re.DOTALL,
+                    [
+                        (1, 'id',    u'ERROR: could not extract video id: %s' % url),
+                        (2, 'title', u'ERROR: could not extract video title: %s' % url),
+                        (3, 'date',  u'ERROR: could not extract video date: %s' % url),
+                        (4, 'url',   u'ERROR: could not extract video url: %s' % url)
+                    ]
+                )
+
+                return {
+                    'id':           info.get('id'),
+                    'url':          urllib.unquote(info.get('url')),
+                    'uploader':     u'arte.tv',
+                    'upload_date':  info.get('date'),
+                    'title':        info.get('title'),
+                    'ext':          u'mp4',
+                    'format':       u'NA',
+                    'player_url':   None,
+                }
+
+        def _real_extract(self, url):
+
+                video_id = url.split('/')[-1]
+
+                self.report_extraction(video_id)
+
+                if re.search(self._LIVE_URL, video_id) is not None:
+                    self.extractLiveStream(url)
+                    return
+                else:
+                    info = self.extractPlus7Stream(url)
+
+                try:
+                        # Process video information
+                        self._downloader.process_info(info)
+                except UnavailableVideoError, err:
+                        self._downloader.trouble(u'\nERROR: unable to download video')
+
+
 class GenericIE(InfoExtractor):
 	"""Generic last-resort information extractor."""
 
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 86951840d..13cf77896 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -351,6 +351,7 @@ def gen_extractors():
 		MixcloudIE(),
 		StanfordOpenClassroomIE(),
 		MTVIE(),
+                ArteTvIE(),
 
 		GenericIE()
 	]
-- 
cgit v1.2.3


From 2ebc6e6a92ae7dd7cdc281f3cf402a031ba6aa03 Mon Sep 17 00:00:00 2001
From: Christian Albrecht <alab1001101@gmail.com>
Date: Sun, 26 Aug 2012 09:57:49 +0200
Subject: Make youtube-dl

---
 youtube-dl | Bin 40997 -> 42099 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/youtube-dl b/youtube-dl
index 789cb58f5..3d173e4ce 100755
Binary files a/youtube-dl and b/youtube-dl differ
-- 
cgit v1.2.3


From 65adb79fb6e6d5d5d9c3978e2ce6bd26fe89f36b Mon Sep 17 00:00:00 2001
From: Eitan Adler <lists@eitanadler.com>
Date: Mon, 15 Oct 2012 21:45:56 -0400
Subject: Fix mandoc nits

---
 youtube-dl.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube-dl.1 b/youtube-dl.1
index a3100e9e4..c7315a4f9 100644
--- a/youtube-dl.1
+++ b/youtube-dl.1
@@ -1,4 +1,4 @@
-.TH youtube-dl 1 "" 
+.TH YOUTUBE-DL 1 ""
 .SH NAME
 .PP
 youtube-dl
-- 
cgit v1.2.3


From e02066e7ff5e5bea988c6634bbe0e3f4afdc10ed Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 16:15:15 +0100
Subject: Windows build for 2012.11.28

---
 youtube-dl.exe | Bin 3995263 -> 3989886 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 youtube-dl.exe

diff --git a/youtube-dl.exe b/youtube-dl.exe
old mode 100755
new mode 100644
index 48ca04c29..639361569
Binary files a/youtube-dl.exe and b/youtube-dl.exe differ
-- 
cgit v1.2.3


From 02531431f2e4fcf7e9888299a4e6a56fd7a672d5 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 16:27:35 +0100
Subject: Extended documentation for output format in README (Closes #268)

---
 README.md    | 22 ++++++++++++++++++++++
 youtube-dl.1 | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/README.md b/README.md
index 5cf082a7c..f251788ce 100644
--- a/README.md
+++ b/README.md
@@ -108,6 +108,28 @@ which means you can modify it, redistribute it or use it however you like.
 
 You can configure youtube-dl by placing default arguments (such as `--extract-audio --no-mtime` to always extract the audio and not copy the mtime) into `/etc/youtube-dl.conf` and/or `~/.local/config/youtube-dl.conf`.
 
+# OUTPUT TEMPLATE
+
+The `-o` option allows users to indicate a template for the output file names. The basic usage is not to set any template arguments when downloading a single file, like in `youtube-dl -o funny_video.flv "http://some/video"`. However, it may contain special sequences that will be replaced when downloading each video. The special sequences have the format `%(NAME)s`. To clarify, that is a percent symbol followed by a name in parenthesis, followed by a lowercase S. Allowed names are:
+
+ - `id`: The sequence will be replaced by the video identifier.
+ - `url`: The sequence will be replaced by the video URL.
+ - `uploader`: The sequence will be replaced by the nickname of the person who uploaded the video.
+ - `upload_date`: The sequence will be replaced by the upload date in YYYYMMDD format.
+ - `title`: The sequence will be replaced by the video title.
+ext`: The sequence will be replaced by the appropriate extension (like flv or mp4).
+epoch`: The sequence will be replaced by the Unix epoch when creating the file.
+autonumber`: The sequence will be replaced by a five-digit number that will be increased with each download, starting at zero.
+
+The current default template is `%(id)s.%(ext)s`, but that will be switchted to `%(title)s-%(id)s.%(ext)s` (which can be requested with `-t` at the moment).
+
+In some cases, you don't want special characters such as 中, spaces, or &, such as when transferring the downloaded filename to a Windows system or the filename through an 8bit-unsafe channel. In these cases, add the `--restrict-filenames` flag to get a shorter title:
+
+    $ youtube-dl --get-filename -o "%(title)s.%(ext)s" BaW_jenozKc
+    youtube-dl test video ''_ä↭𝕐.mp4    # All kinds of weird characters
+    $ youtube-dl --get-filename -o "%(title)s.%(ext)s" BaW_jenozKc --restrict-filenames
+    youtube-dl_test_video_.mp4          # A simple file name
+
 # FAQ
 
 ### Can you please put the -b option back?
diff --git a/youtube-dl.1 b/youtube-dl.1
index ae303b672..b94b9d419 100644
--- a/youtube-dl.1
+++ b/youtube-dl.1
@@ -139,6 +139,54 @@ You can configure youtube-dl by placing default arguments (such as
 \f[C]--extract-audio\ --no-mtime\f[] to always extract the audio and not
 copy the mtime) into \f[C]/etc/youtube-dl.conf\f[] and/or
 \f[C]~/.local/config/youtube-dl.conf\f[].
+.SH OUTPUT TEMPLATE
+.PP
+The \f[C]-o\f[] option allows users to indicate a template for the
+output file names.
+The basic usage is not to set any template arguments when downloading a
+single file, like in
+\f[C]youtube-dl\ -o\ funny_video.flv\ "http://some/video"\f[].
+However, it may contain special sequences that will be replaced when
+downloading each video.
+The special sequences have the format \f[C]%(NAME)s\f[].
+To clarify, that is a percent symbol followed by a name in parenthesis,
+followed by a lowercase S.
+Allowed names are:
+.IP \[bu] 2
+\f[C]id\f[]: The sequence will be replaced by the video identifier.
+.IP \[bu] 2
+\f[C]url\f[]: The sequence will be replaced by the video URL.
+.IP \[bu] 2
+\f[C]uploader\f[]: The sequence will be replaced by the nickname of the
+person who uploaded the video.
+.IP \[bu] 2
+\f[C]upload_date\f[]: The sequence will be replaced by the upload date
+in YYYYMMDD format.
+.IP \[bu] 2
+\f[C]title\f[]: The sequence will be replaced by the video title.
+ext\f[C]:\ The\ sequence\ will\ be\ replaced\ by\ the\ appropriate\ extension\ (like\ flv\ or\ mp4).\ epoch\f[]:
+The sequence will be replaced by the Unix epoch when creating the file.
+autonumber`: The sequence will be replaced by a five-digit number that
+will be increased with each download, starting at zero.
+.PP
+The current default template is \f[C]%(id)s.%(ext)s\f[], but that will
+be switchted to \f[C]%(title)s-%(id)s.%(ext)s\f[] (which can be
+requested with \f[C]-t\f[] at the moment).
+.PP
+In some cases, you don\[aq]t want special characters such as 中, spaces,
+or &, such as when transferring the downloaded filename to a Windows
+system or the filename through an 8bit-unsafe channel.
+In these cases, add the \f[C]--restrict-filenames\f[] flag to get a
+shorter title:
+.IP
+.nf
+\f[C]
+$\ youtube-dl\ --get-filename\ -o\ "%(title)s.%(ext)s"\ BaW_jenozKc
+youtube-dl\ test\ video\ \[aq]\[aq]_ä↭𝕐.mp4\ \ \ \ #\ All\ kinds\ of\ weird\ characters
+$\ youtube-dl\ --get-filename\ -o\ "%(title)s.%(ext)s"\ BaW_jenozKc\ --restrict-filenames
+youtube-dl_test_video_.mp4\ \ \ \ \ \ \ \ \ \ #\ A\ simple\ file\ name
+\f[]
+.fi
 .SH FAQ
 .SS Can you please put the -b option back?
 .PP
-- 
cgit v1.2.3


From 877f4c45d3c42045cca9295a92f336e551c7eab8 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 16:28:21 +0100
Subject: Fix output format doc

---
 README.md    |  6 +++---
 youtube-dl.1 | 13 +++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index f251788ce..f49194a0b 100644
--- a/README.md
+++ b/README.md
@@ -117,9 +117,9 @@ The `-o` option allows users to indicate a template for the output file names. T
  - `uploader`: The sequence will be replaced by the nickname of the person who uploaded the video.
  - `upload_date`: The sequence will be replaced by the upload date in YYYYMMDD format.
  - `title`: The sequence will be replaced by the video title.
-ext`: The sequence will be replaced by the appropriate extension (like flv or mp4).
-epoch`: The sequence will be replaced by the Unix epoch when creating the file.
-autonumber`: The sequence will be replaced by a five-digit number that will be increased with each download, starting at zero.
+ - `ext`: The sequence will be replaced by the appropriate extension (like flv or mp4).
+ - `epoch`: The sequence will be replaced by the Unix epoch when creating the file.
+ - `autonumber`: The sequence will be replaced by a five-digit number that will be increased with each download, starting at zero.
 
 The current default template is `%(id)s.%(ext)s`, but that will be switchted to `%(title)s-%(id)s.%(ext)s` (which can be requested with `-t` at the moment).
 
diff --git a/youtube-dl.1 b/youtube-dl.1
index b94b9d419..2f7f25f31 100644
--- a/youtube-dl.1
+++ b/youtube-dl.1
@@ -164,10 +164,15 @@ person who uploaded the video.
 in YYYYMMDD format.
 .IP \[bu] 2
 \f[C]title\f[]: The sequence will be replaced by the video title.
-ext\f[C]:\ The\ sequence\ will\ be\ replaced\ by\ the\ appropriate\ extension\ (like\ flv\ or\ mp4).\ epoch\f[]:
-The sequence will be replaced by the Unix epoch when creating the file.
-autonumber`: The sequence will be replaced by a five-digit number that
-will be increased with each download, starting at zero.
+.IP \[bu] 2
+\f[C]ext\f[]: The sequence will be replaced by the appropriate extension
+(like flv or mp4).
+.IP \[bu] 2
+\f[C]epoch\f[]: The sequence will be replaced by the Unix epoch when
+creating the file.
+.IP \[bu] 2
+\f[C]autonumber\f[]: The sequence will be replaced by a five-digit
+number that will be increased with each download, starting at zero.
 .PP
 The current default template is \f[C]%(id)s.%(ext)s\f[], but that will
 be switchted to \f[C]%(title)s-%(id)s.%(ext)s\f[] (which can be
-- 
cgit v1.2.3


From cc872b68a895bae05bd266cc59d53f6e3c638f6c Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 16:42:50 +0100
Subject: Actually merge #379

---
 README.md                    |  5 +++++
 youtube-dl.1                 |  5 +++++
 youtube-dl.bash-completion   |  2 +-
 youtube_dl/FileDownloader.py |  7 +++++--
 youtube_dl/__init__.py       | 12 ++++++++++++
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f49194a0b..c0a0fa557 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,11 @@ which means you can modify it, redistribute it or use it however you like.
     -i, --ignore-errors      continue on download errors
     -r, --rate-limit LIMIT   download rate limit (e.g. 50k or 44.6m)
     -R, --retries RETRIES    number of retries (default is 10)
+    --buffer-size SIZE       size of download buffer (e.g. 1024 or 16k) (default
+                             is 1024)
+    --no-resize-buffer       do not automatically adjust the buffer size. By
+                             default, the buffer size is automatically resized
+                             from an initial value of SIZE.
     --dump-user-agent        display the current browser identification
     --user-agent UA          specify a custom user agent
     --list-extractors        List all supported extractors and the URLs they
diff --git a/youtube-dl.1 b/youtube-dl.1
index 2f7f25f31..17455136f 100644
--- a/youtube-dl.1
+++ b/youtube-dl.1
@@ -24,6 +24,11 @@ redistribute it or use it however you like.
 -i,\ --ignore-errors\ \ \ \ \ \ continue\ on\ download\ errors
 -r,\ --rate-limit\ LIMIT\ \ \ download\ rate\ limit\ (e.g.\ 50k\ or\ 44.6m)
 -R,\ --retries\ RETRIES\ \ \ \ number\ of\ retries\ (default\ is\ 10)
+--buffer-size\ SIZE\ \ \ \ \ \ \ size\ of\ download\ buffer\ (e.g.\ 1024\ or\ 16k)\ (default
+\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ is\ 1024)
+--no-resize-buffer\ \ \ \ \ \ \ do\ not\ automatically\ adjust\ the\ buffer\ size.\ By
+\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ default,\ the\ buffer\ size\ is\ automatically\ resized
+\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ from\ an\ initial\ value\ of\ SIZE.
 --dump-user-agent\ \ \ \ \ \ \ \ display\ the\ current\ browser\ identification
 --user-agent\ UA\ \ \ \ \ \ \ \ \ \ specify\ a\ custom\ user\ agent
 --list-extractors\ \ \ \ \ \ \ \ List\ all\ supported\ extractors\ and\ the\ URLs\ they
diff --git a/youtube-dl.bash-completion b/youtube-dl.bash-completion
index dee191cd4..3a2f62efb 100644
--- a/youtube-dl.bash-completion
+++ b/youtube-dl.bash-completion
@@ -3,7 +3,7 @@ __youtube-dl()
     local cur prev opts
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
-    opts="--all-formats --audio-format --audio-quality --auto-number --batch-file --console-title --continue --cookies --dump-user-agent --extract-audio --format --get-description --get-filename --get-format --get-thumbnail --get-title --get-url --help --id --ignore-errors --keep-video --list-extractors --list-formats --literal --match-title --max-downloads --max-quality --netrc --no-continue --no-mtime --no-overwrites --no-part --no-progress --output --password --playlist-end --playlist-start --prefer-free-formats --quiet --rate-limit --reject-title --restrict-filenames --retries --simulate --skip-download --srt-lang --title --update --user-agent --username --verbose --version --write-description --write-info-json --write-srt"
+    opts="--all-formats --audio-format --audio-quality --auto-number --batch-file --buffer-size --console-title --continue --cookies --dump-user-agent --extract-audio --format --get-description --get-filename --get-format --get-thumbnail --get-title --get-url --help --id --ignore-errors --keep-video --list-extractors --list-formats --literal --match-title --max-downloads --max-quality --netrc --no-continue --no-mtime --no-overwrites --no-part --no-progress --no-resize-buffer --output --password --playlist-end --playlist-start --prefer-free-formats --quiet --rate-limit --reject-title --restrict-filenames --retries --simulate --skip-download --srt-lang --title --update --user-agent --username --verbose --version --write-description --write-info-json --write-srt"
 
     if [[ ${cur} == * ]] ; then
         COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index b6aebe4ac..bd0f75773 100644
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -62,6 +62,8 @@ class FileDownloader(object):
 	ratelimit:         Download speed limit, in bytes/sec.
 	nooverwrites:      Prevent overwriting files.
 	retries:           Number of times to retry for HTTP error 5xx
+	buffersize:        Size of download buffer in bytes.
+	noresizebuffer:    Do not automatically resize the download buffer.
 	continuedl:        Try to continue downloads if possible.
 	noprogress:        Do not print the progress bar.
 	playliststart:     Playlist item to start at.
@@ -644,7 +646,7 @@ class FileDownloader(object):
 			data_len = long(data_len) + resume_len
 		data_len_str = self.format_bytes(data_len)
 		byte_counter = 0 + resume_len
-		block_size = 1024
+		block_size = self.params.get('buffersize', 1024)
 		start = time.time()
 		while True:
 			# Download and write
@@ -670,7 +672,8 @@ class FileDownloader(object):
 			except (IOError, OSError), err:
 				self.trouble(u'\nERROR: unable to write data: %s' % str(err))
 				return False
-			block_size = self.best_block_size(after - before, len(data_block))
+			if not self.params.get('noresizebuffer', False):
+				block_size = self.best_block_size(after - before, len(data_block))
 
 			# Progress message
 			speed_str = self.calc_speed(start, time.time(), byte_counter - resume_len)
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 5fc39184a..92478aa6b 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -187,6 +187,11 @@ def parseOpts():
 			dest='ratelimit', metavar='LIMIT', help='download rate limit (e.g. 50k or 44.6m)')
 	general.add_option('-R', '--retries',
 			dest='retries', metavar='RETRIES', help='number of retries (default is %default)', default=10)
+	general.add_option('--buffer-size',
+			dest='buffersize', metavar='SIZE', help='size of download buffer (e.g. 1024 or 16k) (default is %default)', default="1024")
+	general.add_option('--no-resize-buffer',
+			action='store_true', dest='noresizebuffer',
+			help='do not automatically adjust the buffer size. By default, the buffer size is automatically resized from an initial value of SIZE.', default=False)
 	general.add_option('--dump-user-agent',
 			action='store_true', dest='dump_user_agent',
 			help='display the current browser identification', default=False)
@@ -443,6 +448,11 @@ def _real_main():
 			opts.retries = long(opts.retries)
 		except (TypeError, ValueError), err:
 			parser.error(u'invalid retry count specified')
+	if opts.buffersize is not None:
+		numeric_buffersize = FileDownloader.parse_bytes(opts.buffersize)
+		if numeric_buffersize is None:
+			parser.error(u'invalid buffer size specified')
+		opts.buffersize = numeric_buffersize
 	try:
 		opts.playliststart = int(opts.playliststart)
 		if opts.playliststart <= 0:
@@ -493,6 +503,8 @@ def _real_main():
 		'ratelimit': opts.ratelimit,
 		'nooverwrites': opts.nooverwrites,
 		'retries': opts.retries,
+		'buffersize': opts.buffersize,
+		'noresizebuffer': opts.noresizebuffer,
 		'continuedl': opts.continue_dl,
 		'noprogress': opts.noprogress,
 		'playliststart': opts.playliststart,
-- 
cgit v1.2.3


From d94adc26383050aea502e1707fb015598398b4ae Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 16:58:50 +0100
Subject: Actually fix manpage (#473)

---
 README.md    | 2 +-
 youtube-dl.1 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c0a0fa557..f2567e077 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-% youtube-dl(1)
+% YOUTUBE-DL(1)
 
 # NAME
 youtube-dl
diff --git a/youtube-dl.1 b/youtube-dl.1
index c66374a56..4508622d2 100644
--- a/youtube-dl.1
+++ b/youtube-dl.1
@@ -1,4 +1,4 @@
-.TH YOUTUBE-DL 1 ""
+.TH YOUTUBE-DL 1 "" 
 .SH NAME
 .PP
 youtube-dl
-- 
cgit v1.2.3


From 4d47921c9e848fceb6c475e01112e758ff9d1289 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 17:01:12 +0100
Subject: ignore kate swap files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e51512d4f..b2163f118 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *~
 wine-py2exe/
 py2exe.log
+*.kate-swp
-- 
cgit v1.2.3


From dffe658bac71531dc6aa72088c4d98f6a556bfbf Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 17:15:33 +0100
Subject: Remove exclamation mark in --restrict-filenames mode

---
 test/test_utils.py  | 2 +-
 youtube_dl/utils.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/test_utils.py b/test/test_utils.py
index e7d4e0330..a3a23fbb4 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -56,7 +56,7 @@ class TestUtil(unittest.TestCase):
 		self.assertEqual(sanitize_filename(u'aäb中国的c', restricted=True), u'a_b_c')
 		self.assertTrue(sanitize_filename(u'ö', restricted=True) != u'') # No empty filename
 
-		forbidden = u'"\0\\/&: \'\t\n'
+		forbidden = u'"\0\\/&!: \'\t\n'
 		for fc in forbidden:
 			for fbc in forbidden:
 				self.assertTrue(fbc not in sanitize_filename(fc, restricted=True))
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 4ace22c2f..a0c41081a 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -208,7 +208,7 @@ def sanitize_filename(s, restricted=False):
 			return '_-' if restricted else ' -'
 		elif char in '\\/|*<>':
 			return '_'
-		if restricted and (char in '&\'' or char.isspace()):
+		if restricted and (char in '!&\'' or char.isspace()):
 			return '_'
 		if restricted and ord(char) > 127:
 			return '_'
@@ -316,7 +316,7 @@ class ContentTooShortError(Exception):
 
 class Trouble(Exception):
 	"""Trouble helper exception
-	
+
 	This is an exception to be handled with
 	FileDownloader.trouble
 	"""
-- 
cgit v1.2.3


From 26396311b557696491152fd002f6d55e8126228b Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 17:16:49 +0100
Subject: Add Christian Albrecht (Arte.tv IE) to authors

---
 youtube_dl/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index f7a49e13a..d940b92e4 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -18,6 +18,7 @@ __authors__  = (
 	'Ori Avtalion',
 	'shizeeg',
 	'Filippo Valsorda',
+	'Christian Albrecht',
 	)
 
 __license__ = 'Public Domain'
-- 
cgit v1.2.3


From dcd60025f89d3e87c0766b1163f7577c5e673342 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 18:27:46 +0100
Subject: Fix filename sanitation (Closes #555)

---
 youtube_dl/FileDownloader.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index bd0f75773..d7d5b1521 100644
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -327,8 +327,10 @@ class FileDownloader(object):
 		"""Generate the output filename."""
 		try:
 			template_dict = dict(info_dict)
-			template_dict['epoch'] = unicode(int(time.time()))
-			template_dict['autonumber'] = unicode('%05d' % self._num_downloads)
+			template_dict['epoch'] = int(time.time())
+			template_dict['autonumber'] = u'%05d' % self._num_downloads
+
+			template_dict = dict((k, sanitize_filename(compat_str(v), self.params.get('restrictfilenames'))) for k,v in template_dict.items())
 			filename = self.params['outtmpl'] % template_dict
 			return filename
 		except (ValueError, KeyError), err:
@@ -368,7 +370,6 @@ class FileDownloader(object):
 				raise MaxDownloadsReached()
 
 		filename = self.prepare_filename(info_dict)
-		filename = sanitize_filename(filename, self.params.get('restrictfilenames'))
 
 		# Forced printings
 		if self.params.get('forcetitle', False):
-- 
cgit v1.2.3


From f8d8b39bba9bc8b140f8471c2698bdf31ac4bb5d Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 18:30:34 +0100
Subject: Prepare 2012.11.29 release

---
 LATEST_VERSION         |   2 +-
 youtube-dl             | Bin 45276 -> 46327 bytes
 youtube_dl/__init__.py |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LATEST_VERSION b/LATEST_VERSION
index 6023b6d49..d645a4c7a 100644
--- a/LATEST_VERSION
+++ b/LATEST_VERSION
@@ -1 +1 @@
-2012.11.28
+2012.11.29
diff --git a/youtube-dl b/youtube-dl
index ebe8bd8bf..ca4e467ff 100755
Binary files a/youtube-dl and b/youtube-dl differ
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index d940b92e4..75ae7e838 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -22,7 +22,7 @@ __authors__  = (
 	)
 
 __license__ = 'Public Domain'
-__version__ = '2012.11.28'
+__version__ = '2012.11.29'
 
 UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl'
 UPDATE_URL_VERSION = 'https://raw.github.com/rg3/youtube-dl/master/LATEST_VERSION'
-- 
cgit v1.2.3


From 88db5ef279e2cb4679b049ef3f002a3856609010 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 18:36:43 +0100
Subject: 2012.11.29

---
 youtube-dl.exe | Bin 3989886 -> 3989886 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/youtube-dl.exe b/youtube-dl.exe
index 639361569..2ee57c593 100644
Binary files a/youtube-dl.exe and b/youtube-dl.exe differ
-- 
cgit v1.2.3


From 0969bdd3053fc95c5f545caabdbc77628afec4b5 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 18:49:18 +0100
Subject: unify spacing

---
 youtube_dl/utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 40d6823a0..45582ca11 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -27,9 +27,9 @@ std_headers = {
 }
 
 try:
-    compat_str = unicode # Python 2
+	compat_str = unicode # Python 2
 except NameError:
-    compat_str = str
+	compat_str = str
 
 def preferredencoding():
 	"""Get preferred encoding.
-- 
cgit v1.2.3


From b514df2034a7291971427588977dd612c4b5581f Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 18:55:35 +0100
Subject: Clean up with the help of pep8

---
 youtube_dl/utils.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 45582ca11..68a6fae1b 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -126,8 +126,10 @@ class IDParser(HTMLParser.HTMLParser):
 	handle_decl = handle_pi = unknown_decl = find_startpos
 
 	def get_result(self):
-		if self.result == None: return None
-		if len(self.result) != 3: return None
+		if self.result is None:
+			return None
+		if len(self.result) != 3:
+			return None
 		lines = self.html.split('\n')
 		lines = lines[self.result[1][0]-1:self.result[2][0]]
 		lines[0] = lines[0][self.result[1][1]:]
-- 
cgit v1.2.3


From dd109dee8ebd51a019529fa494e56651162ad6d9 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 19:02:37 +0100
Subject: Remove mentions of unicode

---
 youtube_dl/FileDownloader.py |   4 +-
 youtube_dl/InfoExtractors.py | 112 +++++++++++++++++++++----------------------
 youtube_dl/utils.py          |  13 +++--
 3 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index d7d5b1521..777a52545 100644
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -330,7 +330,7 @@ class FileDownloader(object):
 			template_dict['epoch'] = int(time.time())
 			template_dict['autonumber'] = u'%05d' % self._num_downloads
 
-			template_dict = dict((k, sanitize_filename(compat_str(v), self.params.get('restrictfilenames'))) for k,v in template_dict.items())
+			template_dict = dict((k, sanitize_filename(u(v), self.params.get('restrictfilenames'))) for k,v in template_dict.items())
 			filename = self.params['outtmpl'] % template_dict
 			return filename
 		except (ValueError, KeyError), err:
@@ -397,7 +397,7 @@ class FileDownloader(object):
 			if dn != '' and not os.path.exists(dn): # dn is already encoded
 				os.makedirs(dn)
 		except (OSError, IOError), err:
-			self.trouble(u'ERROR: unable to create directory ' + unicode(err))
+			self.trouble(u'ERROR: unable to create directory ' + u(err))
 			return
 
 		if self.params.get('writedescription', False):
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index cea30dad8..0b0885cad 100644
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -238,7 +238,7 @@ class YoutubeIE(InfoExtractor):
 				else:
 					raise netrc.NetrcParseError('No authenticators for %s' % self._NETRC_MACHINE)
 			except (IOError, netrc.NetrcParseError), err:
-				self._downloader.to_stderr(u'WARNING: parsing .netrc: %s' % compat_str(err))
+				self._downloader.to_stderr(u'WARNING: parsing .netrc: %s' % u(err))
 				return
 
 		# Set language
@@ -247,7 +247,7 @@ class YoutubeIE(InfoExtractor):
 			self.report_lang()
 			urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.to_stderr(u'WARNING: unable to set language: %s' % compat_str(err))
+			self._downloader.to_stderr(u'WARNING: unable to set language: %s' % u(err))
 			return
 
 		# No authentication to be performed
@@ -270,7 +270,7 @@ class YoutubeIE(InfoExtractor):
 				self._downloader.to_stderr(u'WARNING: unable to log in: bad username or password')
 				return
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.to_stderr(u'WARNING: unable to log in: %s' % compat_str(err))
+			self._downloader.to_stderr(u'WARNING: unable to log in: %s' % u(err))
 			return
 
 		# Confirm age
@@ -283,7 +283,7 @@ class YoutubeIE(InfoExtractor):
 			self.report_age_confirmation()
 			age_results = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % u(err))
 			return
 
 	def _real_extract(self, url):
@@ -305,7 +305,7 @@ class YoutubeIE(InfoExtractor):
 		try:
 			video_webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % u(err))
 			return
 
 		# Attempt to extract SWF player URL
@@ -327,7 +327,7 @@ class YoutubeIE(InfoExtractor):
 				if 'token' in video_info:
 					break
 			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-				self._downloader.trouble(u'ERROR: unable to download video info webpage: %s' % compat_str(err))
+				self._downloader.trouble(u'ERROR: unable to download video info webpage: %s' % u(err))
 				return
 		if 'token' not in video_info:
 			if 'reason' in video_info:
@@ -390,7 +390,7 @@ class YoutubeIE(InfoExtractor):
 				try:
 					srt_list = urllib2.urlopen(request).read()
 				except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-					raise Trouble(u'WARNING: unable to download video subtitles: %s' % compat_str(err))
+					raise Trouble(u'WARNING: unable to download video subtitles: %s' % u(err))
 				srt_lang_list = re.findall(r'name="([^"]*)"[^>]+lang_code="([\w\-]+)"', srt_list)
 				srt_lang_list = dict((l[1], l[0]) for l in srt_lang_list)
 				if not srt_lang_list:
@@ -407,7 +407,7 @@ class YoutubeIE(InfoExtractor):
 				try:
 					srt_xml = urllib2.urlopen(request).read()
 				except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-					raise Trouble(u'WARNING: unable to download video subtitles: %s' % compat_str(err))
+					raise Trouble(u'WARNING: unable to download video subtitles: %s' % u(err))
 				if not srt_xml:
 					raise Trouble(u'WARNING: unable to download video subtitles')
 				video_subtitles = self._closed_captions_xml_to_srt(srt_xml.decode('utf-8'))
@@ -526,7 +526,7 @@ class MetacafeIE(InfoExtractor):
 			self.report_disclaimer()
 			disclaimer = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to retrieve disclaimer: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable to retrieve disclaimer: %s' % u(err))
 			return
 
 		# Confirm age
@@ -539,7 +539,7 @@ class MetacafeIE(InfoExtractor):
 			self.report_age_confirmation()
 			disclaimer = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % u(err))
 			return
 
 	def _real_extract(self, url):
@@ -563,7 +563,7 @@ class MetacafeIE(InfoExtractor):
 			self.report_download_webpage(video_id)
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable retrieve video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable retrieve video webpage: %s' % u(err))
 			return
 
 		# Extract URL, uploader and title from webpage
@@ -656,7 +656,7 @@ class DailymotionIE(InfoExtractor):
 			self.report_download_webpage(video_id)
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable retrieve video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable retrieve video webpage: %s' % u(err))
 			return
 
 		# Extract URL, uploader and title from webpage
@@ -754,7 +754,7 @@ class GoogleIE(InfoExtractor):
 			self.report_download_webpage(video_id)
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % u(err))
 			return
 
 		# Extract URL, uploader, and title from webpage
@@ -793,7 +793,7 @@ class GoogleIE(InfoExtractor):
 			try:
 				webpage = urllib2.urlopen(request).read()
 			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-				self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))
+				self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % u(err))
 				return
 			mobj = re.search(r'<img class=thumbnail-img (?:.* )?src=(http.*)>', webpage)
 			if mobj is None:
@@ -849,7 +849,7 @@ class PhotobucketIE(InfoExtractor):
 			self.report_download_webpage(video_id)
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % u(err))
 			return
 
 		# Extract URL, uploader, and title from webpage
@@ -919,7 +919,7 @@ class YahooIE(InfoExtractor):
 			try:
 				webpage = urllib2.urlopen(request).read()
 			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-				self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))
+				self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % u(err))
 				return
 
 			mobj = re.search(r'\("id", "([0-9]+)"\);', webpage)
@@ -943,7 +943,7 @@ class YahooIE(InfoExtractor):
 			self.report_download_webpage(video_id)
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % u(err))
 			return
 
 		# Extract uploader and title from webpage
@@ -1001,7 +1001,7 @@ class YahooIE(InfoExtractor):
 			self.report_download_webpage(video_id)
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % u(err))
 			return
 
 		# Extract media URL from playlist XML
@@ -1059,7 +1059,7 @@ class VimeoIE(InfoExtractor):
 			self.report_download_webpage(video_id)
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % u(err))
 			return
 
 		# Now we begin extracting as much information as we can from what we
@@ -1362,7 +1362,7 @@ class GenericIE(InfoExtractor):
 			self.report_download_webpage(video_id)
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % u(err))
 			return
 		except ValueError, err:
 			# since this is the last-resort InfoExtractor, if
@@ -1483,7 +1483,7 @@ class YoutubeSearchIE(InfoExtractor):
 			try:
 				data = urllib2.urlopen(request).read()
 			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-				self._downloader.trouble(u'ERROR: unable to download API page: %s' % compat_str(err))
+				self._downloader.trouble(u'ERROR: unable to download API page: %s' % u(err))
 				return
 			api_response = json.loads(data)['data']
 
@@ -1560,7 +1560,7 @@ class GoogleSearchIE(InfoExtractor):
 			try:
 				page = urllib2.urlopen(request).read()
 			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % u(err))
 				return
 
 			# Extract video identifiers
@@ -1643,7 +1643,7 @@ class YahooSearchIE(InfoExtractor):
 			try:
 				page = urllib2.urlopen(request).read()
 			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % u(err))
 				return
 
 			# Extract video identifiers
@@ -1713,7 +1713,7 @@ class YoutubePlaylistIE(InfoExtractor):
 			try:
 				page = urllib2.urlopen(request).read()
 			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % u(err))
 				return
 
 			# Extract video identifiers
@@ -1770,7 +1770,7 @@ class YoutubeChannelIE(InfoExtractor):
 			try:
 				page = urllib2.urlopen(request).read()
 			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % u(err))
 				return
 
 			# Extract video identifiers
@@ -1833,7 +1833,7 @@ class YoutubeUserIE(InfoExtractor):
 			try:
 				page = urllib2.urlopen(request).read()
 			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % u(err))
 				return
 
 			# Extract video identifiers
@@ -1905,7 +1905,7 @@ class BlipTVUserIE(InfoExtractor):
 			mobj = re.search(r'data-users-id="([^"]+)"', page)
 			page_base = page_base % mobj.group(1)
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable to download webpage: %s' % u(err))
 			return
 
 
@@ -1993,7 +1993,7 @@ class DepositFilesIE(InfoExtractor):
 			self.report_download_webpage(file_id)
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: Unable to retrieve file webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: Unable to retrieve file webpage: %s' % u(err))
 			return
 
 		# Search for the real file URL
@@ -2110,7 +2110,7 @@ class FacebookIE(InfoExtractor):
 				else:
 					raise netrc.NetrcParseError('No authenticators for %s' % self._NETRC_MACHINE)
 			except (IOError, netrc.NetrcParseError), err:
-				self._downloader.to_stderr(u'WARNING: parsing .netrc: %s' % compat_str(err))
+				self._downloader.to_stderr(u'WARNING: parsing .netrc: %s' % u(err))
 				return
 
 		if useremail is None:
@@ -2130,7 +2130,7 @@ class FacebookIE(InfoExtractor):
 				self._downloader.to_stderr(u'WARNING: unable to log in: bad username/password, or exceded login rate limit (~3/min). Check credentials or wait.')
 				return
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.to_stderr(u'WARNING: unable to log in: %s' % compat_str(err))
+			self._downloader.to_stderr(u'WARNING: unable to log in: %s' % u(err))
 			return
 
 	def _real_extract(self, url):
@@ -2147,7 +2147,7 @@ class FacebookIE(InfoExtractor):
 			page = urllib2.urlopen(request)
 			video_webpage = page.read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % u(err))
 			return
 
 		# Start extracting information
@@ -2281,13 +2281,13 @@ class BlipTVIE(InfoExtractor):
 					'urlhandle': urlh
 				}
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to download video info webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable to download video info webpage: %s' % u(err))
 			return
 		if info is None: # Regular URL
 			try:
 				json_code = urlh.read()
 			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-				self._downloader.trouble(u'ERROR: unable to read video info webpage: %s' % compat_str(err))
+				self._downloader.trouble(u'ERROR: unable to read video info webpage: %s' % u(err))
 				return
 
 			try:
@@ -2355,7 +2355,7 @@ class MyVideoIE(InfoExtractor):
 			self.report_download_webpage(video_id)
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % u(err))
 			return
 
 		self.report_extraction(video_id)
@@ -2454,7 +2454,7 @@ class ComedyCentralIE(InfoExtractor):
 			htmlHandle = urllib2.urlopen(req)
 			html = htmlHandle.read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to download webpage: %s' % unicode(err))
+			self._downloader.trouble(u'ERROR: unable to download webpage: %s' % u(err))
 			return
 		if dlNewest:
 			url = htmlHandle.geturl()
@@ -2487,7 +2487,7 @@ class ComedyCentralIE(InfoExtractor):
 			urlHandle = urllib2.urlopen(playerUrl_raw)
 			playerUrl = urlHandle.geturl()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to find out player URL: ' + unicode(err))
+			self._downloader.trouble(u'ERROR: unable to find out player URL: ' + u(err))
 			return
 
 		uri = mMovieParams[0][1]
@@ -2496,7 +2496,7 @@ class ComedyCentralIE(InfoExtractor):
 		try:
 			indexXml = urllib2.urlopen(indexUrl).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to download episode index: ' + unicode(err))
+			self._downloader.trouble(u'ERROR: unable to download episode index: ' + u(err))
 			return
 
 		results = []
@@ -2517,7 +2517,7 @@ class ComedyCentralIE(InfoExtractor):
 			try:
 				configXml = urllib2.urlopen(configReq).read()
 			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % unicode(err))
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % u(err))
 				return
 
 			cdoc = xml.etree.ElementTree.fromstring(configXml)
@@ -2600,7 +2600,7 @@ class EscapistIE(InfoExtractor):
 			m = re.match(r'text/html; charset="?([^"]+)"?', webPage.headers['Content-Type'])
 			webPage = webPageBytes.decode(m.group(1) if m else 'utf-8')
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to download webpage: ' + unicode(err))
+			self._downloader.trouble(u'ERROR: unable to download webpage: ' + u(err))
 			return
 
 		descMatch = re.search('<meta name="description" content="([^"]*)"', webPage)
@@ -2616,7 +2616,7 @@ class EscapistIE(InfoExtractor):
 		try:
 			configJSON = urllib2.urlopen(configUrl).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to download configuration: ' + unicode(err))
+			self._downloader.trouble(u'ERROR: unable to download configuration: ' + u(err))
 			return
 
 		# Technically, it's JavaScript, not JSON
@@ -2625,7 +2625,7 @@ class EscapistIE(InfoExtractor):
 		try:
 			config = json.loads(configJSON)
 		except (ValueError,), err:
-			self._downloader.trouble(u'ERROR: Invalid JSON in configuration file: ' + unicode(err))
+			self._downloader.trouble(u'ERROR: Invalid JSON in configuration file: ' + u(err))
 			return
 
 		playlist = config['playlist']
@@ -2673,7 +2673,7 @@ class CollegeHumorIE(InfoExtractor):
 		try:
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % u(err))
 			return
 
 		m = re.search(r'id="video:(?P<internalvideoid>[0-9]+)"', webpage)
@@ -2692,7 +2692,7 @@ class CollegeHumorIE(InfoExtractor):
 		try:
 			metaXml = urllib2.urlopen(xmlUrl).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to download video info XML: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable to download video info XML: %s' % u(err))
 			return
 
 		mdoc = xml.etree.ElementTree.fromstring(metaXml)
@@ -2738,7 +2738,7 @@ class XVideosIE(InfoExtractor):
 		try:
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % u(err))
 			return
 
 		self.report_extraction(video_id)
@@ -2824,7 +2824,7 @@ class SoundcloudIE(InfoExtractor):
 		try:
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % u(err))
 			return
 
 		self.report_extraction('%s/%s' % (uploader, slug_title))
@@ -2859,7 +2859,7 @@ class SoundcloudIE(InfoExtractor):
 			try:
 				upload_date = datetime.datetime.strptime(mobj.group(1), '%B %d, %Y %H:%M').strftime('%Y%m%d')
 			except Exception, e:
-				self._downloader.to_stderr(compat_str(e))
+				self._downloader.to_stderr(u(e))
 
 		# for soundcloud, a request to a cross domain is required for cookies
 		request = urllib2.Request('http://media.soundcloud.com/crossdomain.xml', std_headers)
@@ -2903,7 +2903,7 @@ class InfoQIE(InfoExtractor):
 		try:
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % u(err))
 			return
 
 		self.report_extraction(url)
@@ -3017,7 +3017,7 @@ class MixcloudIE(InfoExtractor):
 			self.report_download_json(file_url)
 			jsonData = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: Unable to retrieve file: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: Unable to retrieve file: %s' % u(err))
 			return
 
 		# parse JSON
@@ -3094,7 +3094,7 @@ class StanfordOpenClassroomIE(InfoExtractor):
 			try:
 				metaXml = urllib2.urlopen(xmlUrl).read()
 			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-				self._downloader.trouble(u'ERROR: unable to download video info XML: %s' % unicode(err))
+				self._downloader.trouble(u'ERROR: unable to download video info XML: %s' % u(err))
 				return
 			mdoc = xml.etree.ElementTree.fromstring(metaXml)
 			try:
@@ -3117,7 +3117,7 @@ class StanfordOpenClassroomIE(InfoExtractor):
 			try:
 				coursepage = urllib2.urlopen(url).read()
 			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-				self._downloader.trouble(u'ERROR: unable to download course info page: ' + unicode(err))
+				self._downloader.trouble(u'ERROR: unable to download course info page: ' + u(err))
 				return
 
 			m = re.search('<h1>([^<]+)</h1>', coursepage)
@@ -3154,7 +3154,7 @@ class StanfordOpenClassroomIE(InfoExtractor):
 			try:
 				rootpage = urllib2.urlopen(rootURL).read()
 			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-				self._downloader.trouble(u'ERROR: unable to download course info page: ' + unicode(err))
+				self._downloader.trouble(u'ERROR: unable to download course info page: ' + u(err))
 				return
 
 			info['title'] = info['id']
@@ -3201,7 +3201,7 @@ class MTVIE(InfoExtractor):
 		try:
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % u(err))
 			return
 
 		mobj = re.search(r'<meta name="mtv_vt" content="([^"]+)"/>', webpage)
@@ -3234,7 +3234,7 @@ class MTVIE(InfoExtractor):
 		try:
 			metadataXml = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to download video metadata: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: unable to download video metadata: %s' % u(err))
 			return
 
 		mdoc = xml.etree.ElementTree.fromstring(metadataXml)
@@ -3321,7 +3321,7 @@ class YoukuIE(InfoExtractor):
 			self.report_download_webpage(video_id)
 			jsondata = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:
-			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % u(err))
 			return
 
 		self.report_extraction(video_id)
@@ -3497,7 +3497,7 @@ class GooglePlusIE(InfoExtractor):
 		try:
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: Unable to retrieve entry webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: Unable to retrieve entry webpage: %s' % u(err))
 			return
 
 		# Extract update date
@@ -3539,7 +3539,7 @@ class GooglePlusIE(InfoExtractor):
 		try:
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))
+			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % u(err))
 			return
 		self.report_extract_vid_page(video_page)
 
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 68a6fae1b..bde446bcb 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -27,9 +27,9 @@ std_headers = {
 }
 
 try:
-	compat_str = unicode # Python 2
+	u = unicode # Python 2
 except NameError:
-	compat_str = str
+	u = str
 
 def preferredencoding():
 	"""Get preferred encoding.
@@ -47,7 +47,7 @@ def preferredencoding():
 
 
 def htmlentity_transform(matchobj):
-	"""Transforms an HTML entity to a Unicode character.
+	"""Transforms an HTML entity to a character.
 
 	This function receives a match object and is intended to be used with
 	the re.sub() function.
@@ -58,7 +58,6 @@ def htmlentity_transform(matchobj):
 	if entity in htmlentitydefs.name2codepoint:
 		return unichr(htmlentitydefs.name2codepoint[entity])
 
-	# Unicode character
 	mobj = re.match(ur'(?u)#(x?\d+)', entity)
 	if mobj is not None:
 		numstr = mobj.group(1)
@@ -67,7 +66,7 @@ def htmlentity_transform(matchobj):
 			numstr = u'0%s' % numstr
 		else:
 			base = 10
-		return unichr(long(numstr, base))
+		return unichr(int(numstr, base))
 
 	# Unknown entity in name, return its literal representation
 	return (u'&%s;' % entity)
@@ -235,7 +234,7 @@ def orderedSet(iterable):
 
 def unescapeHTML(s):
 	"""
-	@param s a string (of type unicode)
+	@param s a string
 	"""
 	assert type(s) == type(u'')
 
@@ -244,7 +243,7 @@ def unescapeHTML(s):
 
 def encodeFilename(s):
 	"""
-	@param s The name of the file (of type unicode)
+	@param s The name of the file
 	"""
 
 	assert type(s) == type(u'')
-- 
cgit v1.2.3


From 3aeb78ea4e5808e30a4f9b7d8496473ad842d7ac Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 19:03:37 +0100
Subject: Better formatting (PEP 8)

---
 youtube_dl/__init__.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 75ae7e838..4fed20d54 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -127,9 +127,12 @@ def parseOpts():
 
 		opts = []
 
-		if option._short_opts: opts.append(option._short_opts[0])
-		if option._long_opts: opts.append(option._long_opts[0])
-		if len(opts) > 1: opts.insert(1, ', ')
+		if option._short_opts:
+			opts.append(option._short_opts[0])
+		if option._long_opts:
+			opts.append(option._long_opts[0])
+		if len(opts) > 1:
+			opts.insert(1, ', ')
 
 		if option.takes_value(): opts.append(' %s' % option.metavar)
 
-- 
cgit v1.2.3


From 95649b3936e10a48c4a5009eecfb7647756bde39 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 19:05:03 +0100
Subject: Replace long with int (see PEP 237)

---
 youtube_dl/FileDownloader.py | 10 +++++-----
 youtube_dl/InfoExtractors.py |  6 +++---
 youtube_dl/__init__.py       |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index 777a52545..6d52dc923 100644
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -108,7 +108,7 @@ class FileDownloader(object):
 		if bytes == 0.0:
 			exponent = 0
 		else:
-			exponent = long(math.log(bytes, 1024.0))
+			exponent = int(math.log(bytes, 1024.0))
 		suffix = 'bkMGTPEZY'[exponent]
 		converted = float(bytes) / float(1024 ** exponent)
 		return '%.2f%s' % (converted, suffix)
@@ -127,7 +127,7 @@ class FileDownloader(object):
 		if current == 0 or dif < 0.001: # One millisecond
 			return '--:--'
 		rate = float(current) / dif
-		eta = long((float(total) - float(current)) / rate)
+		eta = int((float(total) - float(current)) / rate)
 		(eta_mins, eta_secs) = divmod(eta, 60)
 		if eta_mins > 99:
 			return '--:--'
@@ -617,7 +617,7 @@ class FileDownloader(object):
 					else:
 						# Examine the reported length
 						if (content_length is not None and
-								(resume_len - 100 < long(content_length) < resume_len + 100)):
+								(resume_len - 100 < int(content_length) < resume_len + 100)):
 							# The file had already been fully downloaded.
 							# Explanation to the above condition: in issue #175 it was revealed that
 							# YouTube sometimes adds or removes a few bytes from the end of the file,
@@ -644,7 +644,7 @@ class FileDownloader(object):
 
 		data_len = data.info().get('Content-length', None)
 		if data_len is not None:
-			data_len = long(data_len) + resume_len
+			data_len = int(data_len) + resume_len
 		data_len_str = self.format_bytes(data_len)
 		byte_counter = 0 + resume_len
 		block_size = self.params.get('buffersize', 1024)
@@ -694,7 +694,7 @@ class FileDownloader(object):
 		stream.close()
 		self.report_finish()
 		if data_len is not None and byte_counter != data_len:
-			raise ContentTooShortError(byte_counter, long(data_len))
+			raise ContentTooShortError(byte_counter, int(data_len))
 		self.try_rename(tmpfilename, filename)
 
 		# Update file modification time
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 0b0885cad..85ffad18c 100644
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -1456,7 +1456,7 @@ class YoutubeSearchIE(InfoExtractor):
 			return
 		else:
 			try:
-				n = long(prefix)
+				n = int(prefix)
 				if n <= 0:
 					self._downloader.trouble(u'ERROR: invalid download number %s for query "%s"' % (n, query))
 					return
@@ -1534,7 +1534,7 @@ class GoogleSearchIE(InfoExtractor):
 			return
 		else:
 			try:
-				n = long(prefix)
+				n = int(prefix)
 				if n <= 0:
 					self._downloader.trouble(u'ERROR: invalid download number %s for query "%s"' % (n, query))
 					return
@@ -1616,7 +1616,7 @@ class YahooSearchIE(InfoExtractor):
 			return
 		else:
 			try:
-				n = long(prefix)
+				n = int(prefix)
 				if n <= 0:
 					self._downloader.trouble(u'ERROR: invalid download number %s for query "%s"' % (n, query))
 					return
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 4fed20d54..54c7d7f72 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -449,7 +449,7 @@ def _real_main():
 		opts.ratelimit = numeric_limit
 	if opts.retries is not None:
 		try:
-			opts.retries = long(opts.retries)
+			opts.retries = int(opts.retries)
 		except (TypeError, ValueError), err:
 			parser.error(u'invalid retry count specified')
 	if opts.buffersize is not None:
-- 
cgit v1.2.3


From c806f804d85dc53f08b1a13d9cfdbe0a8eb58b15 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 21:07:25 +0100
Subject: Only encode when output stream is binary

---
 youtube_dl/FileDownloader.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index 6d52dc923..4e9b55f49 100644
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -179,7 +179,7 @@ class FileDownloader(object):
 		if not self.params.get('quiet', False):
 			terminator = [u'\n', u''][skip_eol]
 			output = message + terminator
-			if 'b' not in self._screen_file.mode or sys.version_info[0] < 3: # Python 2 lies about the mode of sys.stdout/sys.stderr
+			if 'b' in getattr(self._screen_file, 'mode', '') or sys.version_info[0] < 3: # Python 2 lies about the mode of sys.stdout/sys.stderr
 				output = output.encode(preferredencoding(), 'ignore')
 			self._screen_file.write(output)
 			self._screen_file.flush()
-- 
cgit v1.2.3


From 1a84d8675b4417ca9adf40bb12325c728767896a Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 23:06:49 +0100
Subject: Use u instead of str in Python 2

---
 youtube_dl/InfoExtractors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 85ffad18c..0bbe1a6b7 100644
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -1166,7 +1166,7 @@ class ArteTvIE(InfoExtractor):
 			self.report_download_webpage(url)
 			webpage = urllib2.urlopen(request).read()
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % str(err))
+			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % u(err))
 			return
 		except ValueError, err:
 			self._downloader.trouble(u'ERROR: Invalid URL: %s' % url)
-- 
cgit v1.2.3