New upstream version 2017.12.31

[youtubedl] / youtube_dl / __main__.py

diff --git a/youtube_dl/__main__.py b/youtube_dl/__main__.py
index 7022ea4bec75fb864cd58c3c3c9b5f2a15bc5d7a..138f5fbec39f1e0e84051b092ff0cae6974212cf 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+)
@@ -6,10 +7,11 @@
 
 import sys
 
-if __package__ is None and not hasattr(sys, "frozen"):
+if __package__ is None and not hasattr(sys, 'frozen'):
     # direct call of __main__.py
     import os.path
-    sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+    path = os.path.realpath(os.path.abspath(__file__))
+    sys.path.insert(0, os.path.dirname(os.path.dirname(path)))
 
 import youtube_dl