aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/swfinterp.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-07-20 23:20:15 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-07-20 23:20:15 +0200
commitc13bf7c836e1befb28070fe393e474566a43409a (patch)
tree5b0226227b3165949697f145cc99631b64f7f78e /youtube_dl/swfinterp.py
parentf3308e138df3458581c8824d0d3eaa46b4b1a6d1 (diff)
[swfinterp] Use helper function struct_unpack for old Python 2.x releases (#3270)
Diffstat (limited to 'youtube_dl/swfinterp.py')
-rw-r--r--youtube_dl/swfinterp.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/youtube_dl/swfinterp.py b/youtube_dl/swfinterp.py
index 79d86152d..87ec7bcff 100644
--- a/youtube_dl/swfinterp.py
+++ b/youtube_dl/swfinterp.py
@@ -2,12 +2,12 @@ from __future__ import unicode_literals
import collections
import io
-import struct
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
- 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):
- 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:
- 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)'
@@ -99,7 +99,7 @@ def _read_int(reader):
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
@@ -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'
- return struct.unpack('<i', bs + last_byte)[0]
+ return struct_unpack('<i', bs + last_byte)[0]
def _read_string(reader):
@@ -144,7 +144,7 @@ def _read_bytes(count, 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