diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-03-30 07:15:14 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-03-30 07:15:14 +0200 |
| commit | 77ffa957010fb7fe19433633223317d1147dd080 (patch) | |
| tree | 7ca2f794dffb67cb3a11975217de09974129cfca | |
| parent | 2b25cb5d7693b62736d4cdfa656289cc429c4c81 (diff) | |
| download | youtube-dl-77ffa957010fb7fe19433633223317d1147dd080.tar.gz youtube-dl-77ffa957010fb7fe19433633223317d1147dd080.tar.xz youtube-dl-77ffa957010fb7fe19433633223317d1147dd080.zip | |
[jsinterp] Better error messages
| -rw-r--r-- | youtube_dl/jsinterp.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/youtube_dl/jsinterp.py b/youtube_dl/jsinterp.py index 129a4027b..449482d3c 100644 --- a/youtube_dl/jsinterp.py +++ b/youtube_dl/jsinterp.py @@ -99,9 +99,12 @@ class JSInterpreter(object): def extract_function(self, funcname): func_m = re.search( - r'function ' + re.escape(funcname) + + (r'(?:function %s|%s\s*=\s*function)' % ( + re.escape(funcname), re.escape(funcname))) + r'\((?P<args>[a-z,]+)\){(?P<code>[^}]+)}', self.code) + if func_m is None: + raise ExtractorError('Could not find JS function %r' % funcname) argnames = func_m.group('args').split(',') def resf(args): |