[jsinterp] Renaming jsinterp to jsinterp2

test/js2tests/array_access.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS
+from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS
 
 tests = [
     {'code': 'var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2] = 7; return x;',

test/js2tests/assignments.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _OPERATORS, _ASSIGN_OPERATORS
+from youtube_dl.jsinterp2.tstream import _OPERATORS, _ASSIGN_OPERATORS
 
 tests = [
     {

test/js2tests/basic.py

@@ -1,4 +1,4 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
 
 tests = [
     {

test/js2tests/branch.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _RELATIONS
+from youtube_dl.jsinterp2.tstream import _RELATIONS
 
 skip = {'interpret': 'Interpreting if statement not yet implemented'}
 

test/js2tests/calc.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _OPERATORS
+from youtube_dl.jsinterp2.tstream import _OPERATORS
 
 tests = [
     {'code': 'return 2*a+1;',

test/js2tests/call.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _OPERATORS
+from youtube_dl.jsinterp2.tstream import _OPERATORS
 
 tests = [
     {

test/js2tests/comments.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _OPERATORS
+from youtube_dl.jsinterp2.tstream import _OPERATORS
 
 tests = [
     {

test/js2tests/debug.py

@@ -1,4 +1,4 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
 
 skip = {'interpret': 'Interpreting debugger statement not yet implemented',
         'parse': 'Test not yet implemented: missing code and ast'}

test/js2tests/do_loop.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS
+from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS
 
 skip = {'interpret': 'Interpreting do loop not yet implemented'}
 

test/js2tests/empty_return.py

@@ -1,4 +1,4 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
 
 tests = [
     {'code': 'return; y()',

test/js2tests/for_empty.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS
+from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS
 
 skip = {'interpret': 'Interpreting for empty loop not yet implemented'}
 

test/js2tests/for_in.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS
+from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS
 
 skip = {'interpret': 'Interpreting for in loop not yet implemented'}
 

test/js2tests/for_loop.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS
+from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS
 
 skip = {'interpret': 'Interpreting for loop not yet implemented'}
 

test/js2tests/func_expr.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS
+from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS
 
 skip = {'interpret': 'Interpreting function expression not yet implemented'}
 

test/js2tests/getfield.py

@@ -1,4 +1,4 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
 
 tests = [
     {

test/js2tests/label.py

@@ -1,4 +1,4 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
 
 skip = {'interpret': 'Interpreting label not yet implemented',
         'parse': 'Test not yet implemented: missing code and ast'}

test/js2tests/morespace.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS
+from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS
 
 tests = [
     {

test/js2tests/object_literal.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS, _OPERATORS
+from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS, _OPERATORS
 
 skip = {'interpret': 'Interpreting object literals not yet implemented'}
 

test/js2tests/operators.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _OPERATORS
+from youtube_dl.jsinterp2.tstream import _OPERATORS
 
 tests = [
     {

test/js2tests/parens.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _OPERATORS
+from youtube_dl.jsinterp2.tstream import _OPERATORS
 
 tests = [
     {

test/js2tests/precedence.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS, _OPERATORS
+from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS, _OPERATORS
 
 skip = {'interpret': 'Interpreting built-in fields not yet implemented'}
 

test/js2tests/strange_chars.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _OPERATORS
+from youtube_dl.jsinterp2.tstream import _OPERATORS
 
 tests = [
     {

test/js2tests/switch.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS
+from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS
 
 skip = {'interpret': 'Interpreting switch statement not yet implemented'}
 

test/js2tests/try_statement.py

@@ -1,4 +1,4 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
 
 skip = {'interpret': 'Interpreting try statement not yet implemented',
         'parse': 'Test not yet implemented: missing code and ast'}

test/js2tests/while_loop.py

@@ -1,5 +1,5 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
-from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS
+from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS
 
 skip = {'interpret': 'Interpreting while loop not yet implemented'}
 

test/js2tests/with_statement.py

@@ -1,4 +1,4 @@
-from youtube_dl.jsinterp.jsgrammar import Token
+from youtube_dl.jsinterp2.jsgrammar import Token
 
 skip = {'interpret': 'Interpreting with statement not yet implemented',
         'parse': 'Test not yet implemented: missing code and ast'}

test/test_jsinterp.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 """
-see: `jstests`
+see: `js2tests`
 """
 
 from __future__ import unicode_literals
@@ -17,8 +17,8 @@ else:
     import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.jsinterp import JSInterpreter
+from youtube_dl.jsinterp2 import JSInterpreter
-from .jstests import gettestcases
+from .js2tests import gettestcases
 
 defs = gettestcases()
 # set level to logging.DEBUG to see messages about missing assertions

test/test_jsinterp_parse.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 """
-see: `jstests`
+see: `js2tests`
 """
 
 from __future__ import unicode_literals
@@ -18,8 +18,8 @@ else:
     import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.jsinterp.jsparser import Parser
+from youtube_dl.jsinterp2.jsparser import Parser
-from .jstests import gettestcases
+from .js2tests import gettestcases
 
 
 def traverse(node, tree_types=(list, tuple)):
@@ -62,15 +62,15 @@ def generator(test_case, name):
 
 
 # And add them to TestJSInterpreterParse
-for n, tc in enumerate(defs):
+for testcase in defs:
-    reason = tc['skip'].get('parse', False)
+    reason = testcase['skip'].get('parse', False)
-    tname = 'test_' + str(tc['name'])
+    tname = 'test_' + str(testcase['name'])
     i = 1
     while hasattr(TestJSInterpreterParse, tname):
-        tname = 'test_%s_%d' % (tc['name'], i)
+        tname = 'test_%s_%d' % (testcase['name'], i)
         i += 1
     if reason is not True:
-        test_method = generator(tc, tname)
+        test_method = generator(testcase, tname)
         if reason is not False:
             test_method.__unittest_skip__ = True
             test_method.__unittest_skip_why__ = reason