X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Futils.py;h=017f06c42e9a019e18e25480c5e5d8d3aaaef335;hb=e3700fc9e44c7820e1c38264c84a315c5f91bb2d;hp=88d4ece13a740cdd7239020af872018189e79f6b;hpb=8cc83b8dbea6e4f34f483c4a209158307df566f0;p=youtube-dl

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 88d4ece13..017f06c42 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -311,7 +311,7 @@ def clean_html(html):
     html = re.sub('<.*?>', '', html)
     # Replace html entities
     html = unescapeHTML(html)
-    return html
+    return html.strip()
 
 
 def sanitize_open(filename, open_mode):
@@ -329,7 +329,7 @@ def sanitize_open(filename, open_mode):
             if sys.platform == 'win32':
                 import msvcrt
                 msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
-            return (sys.stdout, filename)
+            return (sys.stdout.buffer if hasattr(sys.stdout, 'buffer') else sys.stdout, filename)
         stream = open(encodeFilename(filename), open_mode)
         return (stream, filename)
     except (IOError, OSError) as err: