schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'jaimemf/format_spec_groups' (closes #6124)

Browse source
This commit is contained in:
Jaime Marquínez Ferrándiz 2015-08-03 15:22:51 +02:00
commit 03950c90f7
4 changed files with 323 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

6
youtube_dl/compat.py
View file

@ -436,6 +436,11 @@ except TypeError: # Python 2.6
yield n
n += step
if sys.version_info >= (3, 0):
from tokenize import tokenize as compat_tokenize_tokenize
else:
from tokenize import generate_tokens as compat_tokenize_tokenize
__all__ = [
'compat_HTTPError',
'compat_basestring',
@ -457,6 +462,7 @@ __all__ = [
'compat_socket_create_connection',
'compat_str',
'compat_subprocess_get_DEVNULL',
'compat_tokenize_tokenize',
'compat_urllib_error',
'compat_urllib_parse',
'compat_urllib_parse_unquote',