Merge tag 'upstream/2016.06.25'

[youtubedl] / youtube_dl / jsinterp.py

diff --git a/youtube_dl/jsinterp.py b/youtube_dl/jsinterp.py
index a7440c58242079ea1c6874e1bed0abe756fdc814..9737f70021d3285a4e8df616467b764de1a91fa2 100644 (file)
--- a/youtube_dl/jsinterp.py
+++ b/youtube_dl/jsinterp.py
@@ -232,7 +232,7 @@ class JSInterpreter(object):
     def extract_function(self, funcname):
         func_m = re.search(
             r'''(?x)
     def extract_function(self, funcname):
         func_m = re.search(
             r'''(?x)

-                (?:function\s+%s|[{;,]%s\s*=\s*function|var\s+%s\s*=\s*function)\s*
+                (?:function\s+%s|[{;,]\s*%s\s*=\s*function|var\s+%s\s*=\s*function)\s*

                 \((?P<args>[^)]*)\)\s*
                 \{(?P<code>[^}]+)\}''' % (
                 re.escape(funcname), re.escape(funcname), re.escape(funcname)),
                 \((?P<args>[^)]*)\)\s*
                 \{(?P<code>[^}]+)\}''' % (
                 re.escape(funcname), re.escape(funcname), re.escape(funcname)),