X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fjsinterp.py;h=b4617fbad0fc40323a129ce1218f9f97590c89bb;hb=788fa208c86d7196c75bdc74d8106a489723c054;hp=95e6948ff3ab518e6cd36f9e7423d1cc71cb5785;hpb=ebe832dc3777861fd20e38cf7588013e9df80e0e;p=youtube-dl

diff --git a/youtube_dl/jsinterp.py b/youtube_dl/jsinterp.py
index 95e6948ff..b4617fbad 100644
--- a/youtube_dl/jsinterp.py
+++ b/youtube_dl/jsinterp.py
@@ -61,7 +61,7 @@ class JSInterpreter(object):
             pass
 
         m = re.match(
-            r'^(?P<var>[a-z]+)\.(?P<member>[^(]+)(?:\(+(?P<args>[^()]*)\))?$',
+            r'^(?P<var>[$a-zA-Z0-9_]+)\.(?P<member>[^(]+)(?:\(+(?P<args>[^()]*)\))?$',
             expr)
         if m:
             variable = m.group('var')
@@ -108,7 +108,7 @@ class JSInterpreter(object):
                 index, howMany = argvals
                 res = []
                 for i in range(index, min(index + howMany, len(obj))):
-                    res.append(obj.pop(i))
+                    res.append(obj.pop(index))
                 return res
 
             return obj[member](argvals)
@@ -130,7 +130,7 @@ class JSInterpreter(object):
             return a % b
 
         m = re.match(
-            r'^(?P<func>[.a-zA-Z$]+)\((?P<args>[a-z0-9,]+)\)$', expr)
+            r'^(?P<func>[a-zA-Z$]+)\((?P<args>[a-z0-9,]+)\)$', expr)
         if m:
             fname = m.group('func')
             argvals = tuple([