projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mixcloud] Fix extraction (closes #14088)
[youtube-dl]
/
youtube_dl
/
compat.py
diff --git
a/youtube_dl/compat.py
b/youtube_dl/compat.py
index 9e4e13bcf6a5230995589ea1823873f5ac315c71..2a62248ef7bc6b9da459fea1e7a7e77a65e9ed95 100644
(file)
--- a/
youtube_dl/compat.py
+++ b/
youtube_dl/compat.py
@@
-6,6
+6,7
@@
import collections
import email
import getpass
import io
import email
import getpass
import io
+import itertools
import optparse
import os
import re
import optparse
import os
import re
@@
-15,7
+16,6
@@
import socket
import struct
import subprocess
import sys
import struct
import subprocess
import sys
-import itertools
import xml.etree.ElementTree
import xml.etree.ElementTree
@@
-2898,6
+2898,13
@@
else:
compat_struct_pack = struct.pack
compat_struct_unpack = struct.unpack
compat_struct_pack = struct.pack
compat_struct_unpack = struct.unpack
+try:
+ from future_builtins import zip as compat_zip
+except ImportError: # not 2.6+ or is 3.x
+ try:
+ from itertools import izip as compat_zip # < 2.5 or 3.x
+ except ImportError:
+ compat_zip = zip
__all__ = [
'compat_HTMLParseError',
__all__ = [
'compat_HTMLParseError',
@@
-2948,5
+2955,6
@@
__all__ = [
'compat_urlretrieve',
'compat_xml_parse_error',
'compat_xpath',
'compat_urlretrieve',
'compat_xml_parse_error',
'compat_xpath',
+ 'compat_zip',
'workaround_optparse_bug9161',
]
'workaround_optparse_bug9161',
]