X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2F__main__.py;h=3fe29c91f416e0d6c957ed750d3f0f69950dc9c0;hb=fb53d58dcf5e407f39ac79f05d838a20e00823c1;hp=acb36e77044d0cceb7a5e4ab541b23d9ee9d2a56;hpb=59ae15a507cbf93de13f8fda8444d2d9a251747a;p=youtube-dl

diff --git a/youtube_dl/__main__.py b/youtube_dl/__main__.py
index acb36e770..3fe29c91f 100755
--- a/youtube_dl/__main__.py
+++ b/youtube_dl/__main__.py
@@ -1,7 +1,18 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
-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.append(os.path.dirname(os.path.dirname(path)))
+
+import youtube_dl
 
 if __name__ == '__main__':
-    __init__.main()
+    youtube_dl.main()