Merge tag 'upstream/2015.11.10'

[youtubedl] / youtube_dl / __main__.py

diff --git a/youtube_dl/__main__.py b/youtube_dl/__main__.py
index 3fe29c91f416e0d6c957ed750d3f0f69950dc9c0..42a0f8c6f4e1b902e8ce159b7494fe0c54d194d1 100755 (executable)
--- a/youtube_dl/__main__.py
+++ b/youtube_dl/__main__.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import unicode_literals
 
 # Execute with
 # $ python youtube_dl/__main__.py (2.6+)
@@ -10,7 +11,7 @@ if __package__ is None and not hasattr(sys, "frozen"):
     # direct call of __main__.py
     import os.path
     path = os.path.realpath(os.path.abspath(__file__))
-    sys.path.append(os.path.dirname(os.path.dirname(path)))
+    sys.path.insert(0, os.path.dirname(os.path.dirname(path)))
 
 import youtube_dl