Merge branch 'master' into fork_master

[youtube-dl] / youtube_dl / __main__.py

diff --git a/youtube_dl/__main__.py b/youtube_dl/__main__.py
index 6f20402e249c8528834af8c268bcd8ce99b9d475..7022ea4bec75fb864cd58c3c3c9b5f2a15bc5d7a 100755 (executable)
--- a/youtube_dl/__main__.py
+++ b/youtube_dl/__main__.py
@@ -1,7 +1,17 @@
 #!/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
+    sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+import youtube_dl
 
 if __name__ == '__main__':
-       __init__.main()
+    youtube_dl.main()