projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f3308e1
)
[swfinterp] Use helper function struct_unpack for old Python 2.x releases (#3270)
author
Philipp Hagemeister
<phihag@phihag.de>
Sun, 20 Jul 2014 21:20:15 +0000
(23:20 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Sun, 20 Jul 2014 21:20:15 +0000
(23:20 +0200)
youtube_dl/swfinterp.py
patch
|
blob
|
history
diff --git
a/youtube_dl/swfinterp.py
b/youtube_dl/swfinterp.py
index 79d86152d7012648e5cd61471cd596624261d851..87ec7bcffe6986964c589c474fdacd75437be0ee 100644
(file)
--- a/
youtube_dl/swfinterp.py
+++ b/
youtube_dl/swfinterp.py
@@
-2,12
+2,12
@@
from __future__ import unicode_literals
import collections
import io
import collections
import io
-import struct
import zlib
from .utils import (
compat_str,
ExtractorError,
import zlib
from .utils import (
compat_str,
ExtractorError,
+ struct_unpack,
)
)
@@
-23,17
+23,17
@@
def _extract_tags(file_contents):
file_contents[:1])
# Determine number of bits in framesize rectangle
file_contents[:1])
# Determine number of bits in framesize rectangle
- framesize_nbits = struct
.
unpack('!B', content[:1])[0] >> 3
+ framesize_nbits = struct
_
unpack('!B', content[:1])[0] >> 3
framesize_len = (5 + 4 * framesize_nbits + 7) // 8
pos = framesize_len + 2 + 2
while pos < len(content):
framesize_len = (5 + 4 * framesize_nbits + 7) // 8
pos = framesize_len + 2 + 2
while pos < len(content):
- header16 = struct
.
unpack('<H', content[pos:pos + 2])[0]
+ header16 = struct
_
unpack('<H', content[pos:pos + 2])[0]
pos += 2
tag_code = header16 >> 6
tag_len = header16 & 0x3f
if tag_len == 0x3f:
pos += 2
tag_code = header16 >> 6
tag_len = header16 & 0x3f
if tag_len == 0x3f:
- tag_len = struct
.
unpack('<I', content[pos:pos + 4])[0]
+ tag_len = struct
_
unpack('<I', content[pos:pos + 4])[0]
pos += 4
assert pos + tag_len <= len(content), \
('Tag %d ends at %d+%d - that\'s longer than the file (%d)'
pos += 4
assert pos + tag_len <= len(content), \
('Tag %d ends at %d+%d - that\'s longer than the file (%d)'
@@
-99,7
+99,7
@@
def _read_int(reader):
for _ in range(5):
buf = reader.read(1)
assert len(buf) == 1
for _ in range(5):
buf = reader.read(1)
assert len(buf) == 1
- b = struct
.
unpack('<B', buf)[0]
+ b = struct
_
unpack('<B', buf)[0]
res = res | ((b & 0x7f) << shift)
if b & 0x80 == 0:
break
res = res | ((b & 0x7f) << shift)
if b & 0x80 == 0:
break
@@
-125,7
+125,7
@@
def _s24(reader):
bs = reader.read(3)
assert len(bs) == 3
last_byte = b'\xff' if (ord(bs[2:3]) >= 0x80) else b'\x00'
bs = reader.read(3)
assert len(bs) == 3
last_byte = b'\xff' if (ord(bs[2:3]) >= 0x80) else b'\x00'
- return struct
.
unpack('<i', bs + last_byte)[0]
+ return struct
_
unpack('<i', bs + last_byte)[0]
def _read_string(reader):
def _read_string(reader):
@@
-144,7
+144,7
@@
def _read_bytes(count, reader):
def _read_byte(reader):
resb = _read_bytes(1, reader=reader)
def _read_byte(reader):
resb = _read_bytes(1, reader=reader)
- res = struct
.
unpack('<B', resb)[0]
+ res = struct
_
unpack('<B', resb)[0]
return res
return res