Skip to content

Commit 04754cf

Browse files
author
hartsantler
committed
fixed dict.get default value
1 parent d2f260d commit 04754cf

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

pythonjs.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// PythonJS Runtime - regenerated on: Sat Mar 22 00:21:03 2014
1+
// PythonJS Runtime - regenerated on: Tue Apr 22 23:29:54 2014
22
__NULL_OBJECT__ = Object.create(null);
33
if (( "window" ) in this && ( "document" ) in this) {
44
__WEBWORKER__ = false;
@@ -563,8 +563,7 @@ __jsdict.NAME = "__jsdict";
563563
__jsdict.args_signature = ["items"];
564564
__jsdict.kwargs_signature = { };
565565
__jsdict.types_signature = { };
566-
__jsdict_get = function(ob, key, _kwargs_) {
567-
if (_kwargs_ === undefined || _kwargs_.default_value === undefined) {var default_value = null} else {var default_value=_kwargs_.default_value};
566+
__jsdict_get = function(ob, key, default_value) {
568567
if (ob instanceof Object) {
569568
if (key in ob) {
570569
return ob[ (key.__uid__) ? key.__uid__ : key];
@@ -577,8 +576,8 @@ __jsdict_get = function(ob, key, _kwargs_) {
577576

578577
__jsdict_get.NAME = "__jsdict_get";
579578
__jsdict_get.args_signature = ["ob", "key", "default_value"];
580-
__jsdict_get.kwargs_signature = { default_value:null };
581-
__jsdict_get.types_signature = { default_value:"None" };
579+
__jsdict_get.kwargs_signature = { };
580+
__jsdict_get.types_signature = { };
582581
__jsdict_set = function(ob, key, value) {
583582
if (ob instanceof Object) {
584583
ob[ (key.__uid__) ? key.__uid__ : key] = value;

regtests/dict/item.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ def main():
1717
TestError(a[G] == 55)
1818
TestError(a[g] == 66)
1919

20+
TestError(a.get('none', 'default') == 'default')
21+

runtime/builtins.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def __jsdict( items ):
7777
d[ key ] = item[1]
7878
return d
7979

80-
def __jsdict_get(ob, key, default_value=None):
80+
def __jsdict_get(ob, key, default_value):
8181
if instanceof(ob, Object):
8282
if JS("key in ob"): return ob[key]
8383
return default_value

0 commit comments

Comments
 (0)