From 253d96f2e2a7289755645a1cb17a1be4f36e1222 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 12 Jan 2013 22:25:54 +0100
Subject: [PATCH 1/4] Force build removal

---
 devscripts/release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devscripts/release.sh b/devscripts/release.sh
index 543634ce1..bb3180b26 100755
--- a/devscripts/release.sh
+++ b/devscripts/release.sh
@@ -81,6 +81,6 @@ ROOT=$(pwd)
     git push "$ROOT" gh-pages
     git push "$ORIGIN_URL" gh-pages
 )
-rm -r build
+rm -rf build
 
 echo "\n### DONE!"

From 4da769cccaf34efaacf620f1a2ea161cea8e9803 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 12 Jan 2013 23:04:46 +0100
Subject: [PATCH 2/4] Do not backup version.py (under version control and
 frankly, not that complex)

---
 devscripts/release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devscripts/release.sh b/devscripts/release.sh
index bb3180b26..561499ccb 100755
--- a/devscripts/release.sh
+++ b/devscripts/release.sh
@@ -25,7 +25,7 @@ make clean
 nosetests --with-coverage --cover-package=youtube_dl --cover-html test || exit 1
 
 echo "\n### Changing version in version.py..."
-sed -i~ "s/__version__ = '.*'/__version__ = '$version'/" youtube_dl/version.py
+sed -i "s/__version__ = '.*'/__version__ = '$version'/" youtube_dl/version.py
 
 echo "\n### Committing CHANGELOG README.md and youtube_dl/version.py..."
 make README.md

From 97f194c1fbda1b88874ef4f05e2c5b3862d33f8f Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 16 Jan 2013 09:55:45 +0100
Subject: [PATCH 3/4] twitch.tv: Use id as title if no title is present (Closes
 #638)

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

diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 5fbca1c05..dcd7ca647 100755
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -3541,10 +3541,12 @@ class JustinTVIE(InfoExtractor):
                 video_extension = os.path.splitext(video_url)[1][1:]
                 video_date = re.sub('-', '', clip['start_time'][:10])
                 video_uploader_id = clip.get('user_id', clip.get('channel_id'))
+                video_id = clip['id']
+                video_title = clip.get('title', video_id)
                 info.append({
-                    'id': clip['id'],
+                    'id': video_id,
                     'url': video_url,
-                    'title': clip['title'],
+                    'title': video_title,
                     'uploader': clip.get('channel_name', video_uploader_id),
                     'uploader_id': video_uploader_id,
                     'upload_date': video_date,

From 6df40dcbe0a0d6889fffbdc1dd7bf14452d3a605 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 20 Jan 2013 01:48:05 +0100
Subject: [PATCH 4/4] Guard against sys.getfilesystemencoding() == None (#503)

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

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 51c5ad920..532e8c782 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -409,7 +409,10 @@ def encodeFilename(s):
         # match Windows 9x series as well. Besides, NT 4 is obsolete.)
         return s
     else:
-        return s.encode(sys.getfilesystemencoding(), 'ignore')
+        encoding = sys.getfilesystemencoding()
+        if encoding is None:
+            encoding = 'utf-8'
+        return s.encode(encoding, 'ignore')
 
 
 class ExtractorError(Exception):