Merge tag 'upstream/2014.01.17.2'

[youtubedl] / youtube_dl / __main__.py

diff --git a/youtube_dl/__main__.py b/youtube_dl/__main__.py
index 6f20402e249c8528834af8c268bcd8ce99b9d475..3fe29c91f416e0d6c957ed750d3f0f69950dc9c0 100755 (executable)
--- 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()