Browse Source

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

This reverts commit 7c05097633138459e9bdf7e10738e021b04689a7.
Philipp Hagemeister 9 years ago
parent
commit
1f749b6658
1 changed files with 5 additions and 3 deletions
  1. 5 3
      youtube_dl/jsinterp.py

+ 5 - 3
youtube_dl/jsinterp.py

@@ -131,8 +131,9 @@ class JSInterpreter(object):
             if variable in local_vars:
                 obj = local_vars[variable]
             else:
-                obj = self._objects.setdefault(
-                    variable, self.extract_object(variable))
+                if variable not in self._objects:
+                    self._objects[variable] = self.extract_object(variable)
+                obj = self._objects[variable]
 
             if arg_str is None:
                 # Member access
@@ -203,7 +204,8 @@ class JSInterpreter(object):
             argvals = tuple([
                 int(v) if v.isdigit() else local_vars[v]
                 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)
 
         raise ExtractorError('Unsupported JS expression %r' % expr)