R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "[jsinterp] Avoid double key lookup for setting new key"

Browse Source 
This reverts commit 7c05097633138459e9bdf7e10738e021b04689a7.
This commit is contained in:
Philipp Hagemeister 2016-06-20 13:29:13 +02:00
parent 819707920a
commit 1f749b6658
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/jsinterp.py
View File

@ -131,8 +131,9 @@ class JSInterpreter(object):
if variable in local_vars: if variable in local_vars:
obj = local_vars[variable] obj = local_vars[variable]
else: else:
obj = self._objects.setdefault( if variable not in self._objects:
variable, self.extract_object(variable)) self._objects[variable] = self.extract_object(variable)
obj = self._objects[variable]
if arg_str is None: if arg_str is None:
# Member access # Member access
@ -203,7 +204,8 @@ class JSInterpreter(object):
argvals = tuple([ argvals = tuple([
int(v) if v.isdigit() else local_vars[v] int(v) if v.isdigit() else local_vars[v]
for v in m.group('args').split(',')]) for v in m.group('args').split(',')])
self._functions.setdefault(fname, self.extract_function(fname)) if fname not in self._functions:
self._functions[fname] = self.extract_function(fname)
return self._functions[fname](argvals) return self._functions[fname](argvals)
raise ExtractorError('Unsupported JS expression %r' % expr) raise ExtractorError('Unsupported JS expression %r' % expr)