X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=blobdiff_plain;f=youtube_dl%2F__main__.py;h=138f5fbec39f1e0e84051b092ff0cae6974212cf;hp=6f20402e249c8528834af8c268bcd8ce99b9d475;hb=6cd452acffe8d79c895a2ebd0346e2ba7f9e112f;hpb=9e6dd238761e6628d7bd0b6bdb7a997604de3757

diff --git a/youtube_dl/__main__.py b/youtube_dl/__main__.py
index 6f20402e2..138f5fbec 100755
--- a/youtube_dl/__main__.py
+++ b/youtube_dl/__main__.py
@@ -1,7 +1,19 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
-import __init__
+# Execute with
+# $ python youtube_dl/__main__.py (2.6+)
+# $ python -m youtube_dl          (2.7+)
+
+import sys
+
+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.insert(0, os.path.dirname(os.path.dirname(path)))
+
+import youtube_dl
 
 if __name__ == '__main__':
-	__init__.main()
+    youtube_dl.main()