diff options
| author | rzhxeo <rzhxeot7z81b4700@mailcatch.com> | 2013-11-18 00:27:06 +0100 |
|---|---|---|
| committer | rzhxeo <rzhxeot7z81b4700@mailcatch.com> | 2013-11-18 00:27:06 +0100 |
| commit | 2b35c9ef742bf261078ea10c6c0bba848db1a0df (patch) | |
| tree | fe80c838c7529c8cab6f1b44d730a2849cd68c48 /youtube_dl/update.py | |
| parent | 4894fe8c5baec8b1f21ac6fdebe08175abc7f094 (diff) | |
| parent | 73c566695fac926e7e9e6922fe4e6d82c64a1850 (diff) | |
| download | youtube-dl-2b35c9ef742bf261078ea10c6c0bba848db1a0df.tar.gz youtube-dl-2b35c9ef742bf261078ea10c6c0bba848db1a0df.tar.xz youtube-dl-2b35c9ef742bf261078ea10c6c0bba848db1a0df.zip | |
Merge branch 'master' into rtmpdump
Conflicts: youtube_dl/FileDownloader.py Merge
Diffstat (limited to 'youtube_dl/update.py')
| -rw-r--r-- | youtube_dl/update.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/youtube_dl/update.py b/youtube_dl/update.py index 0689a4891..f41b4785a 100644 --- a/youtube_dl/update.py +++ b/youtube_dl/update.py @@ -2,11 +2,15 @@ import io import json import traceback import hashlib +import os import subprocess import sys from zipimport import zipimporter -from .utils import * +from .utils import ( + compat_str, + compat_urllib_request, +) from .version import __version__ def rsa_verify(message, signature, key): |