fixed list.pop(index)

hartsantler · hartsantler · commit cbbdeb732984 · 2014-06-10T02:13:24.000-07:00
diff --git a/pythonjs/pythonjs.js b/pythonjs/pythonjs.js
@@ -848,7 +848,7 @@ __jsdict_pop = function(ob, key, _kwargs_) {
       if (( key ) === undefined) {
         return ob.pop();
       } else {
-        return ob.splice(ob.indexOf(key), 1)[0];
+        return ob.splice(key, 1)[0];
       }
     } else {
       throw new IndexError(key);
diff --git a/pythonjs/runtime/builtins.py b/pythonjs/runtime/builtins.py
@@ -203,7 +203,7 @@ def __jsdict_pop(ob, key, _default=None):
 				if key is undefined:
 					return inline("ob.pop()")
 				else:
-					return ob.splice( ob.indexOf(key), 1 )[0]
+					return ob.splice( key, 1 )[0]
 			else:
 				raise IndexError(key)
 
diff --git a/regtests/list/pop.py b/regtests/list/pop.py
@@ -7,3 +7,7 @@ def main():
 	TestError( b==9 )
 	c = a.pop(0)
 	TestError( c==0 )
+
+	d = ['A', 'B']
+	TestError( d.pop(1)=='B' )
+	TestError( len(d)==1 )

Original file line number	Diff line number	Diff line change
`@@ -848,7 +848,7 @@ __jsdict_pop = function(ob, key, _kwargs_) {`
`848`	`848`	`if (( key ) === undefined) {`
`849`	`849`	`return ob.pop();`
`850`	`850`	`} else {`
`851`		`- return ob.splice(ob.indexOf(key), 1)[0];`
	`851`	`+ return ob.splice(key, 1)[0];`
`852`	`852`	`}`
`853`	`853`	`} else {`
`854`	`854`	`throw new IndexError(key);`