projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master'
[youtube-dl]
/
youtube_dl
/
__init__.py
diff --git
a/youtube_dl/__init__.py
b/youtube_dl/__init__.py
index bc6a6d180dbf20059e414ad7e557b36427c34c5f..b33a18a26486473b528760879d5b7c25ded6ea69 100644
(file)
--- a/
youtube_dl/__init__.py
+++ b/
youtube_dl/__init__.py
@@
-45,6
+45,7
@@
import sys
import warnings
import platform
import warnings
import platform
+
from .utils import *
from .update import update_self
from .version import __version__
from .utils import *
from .update import update_self
from .version import __version__
@@
-611,7
+612,7
@@
def _real_main(argv=None):
sys.exc_clear()
except:
pass
sys.exc_clear()
except:
pass
- sys.stderr.write(u'[debug] Python version %s - %s' %(platform.python_version(), platform
.platform
()) + u'\n')
+ sys.stderr.write(u'[debug] Python version %s - %s' %(platform.python_version(), platform
_name
()) + u'\n')
sys.stderr.write(u'[debug] Proxy map: ' + str(proxy_handler.proxies) + u'\n')
ydl.add_default_info_extractors()
sys.stderr.write(u'[debug] Proxy map: ' + str(proxy_handler.proxies) + u'\n')
ydl.add_default_info_extractors()