Fixes #951 : assignment to object's __dict__ gets corrupted

brython-dev · Oct 24, 2018 · cfb2d52 · cfb2d52
1 parent 03a1327
commit cfb2d52
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 19 deletions.
diff --git a/www/src/brython.js b/www/src/brython.js
@@ -73,8 +73,8 @@ $B.regexIdentifier=/^(?:[\$A-Z_a-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C
 __BRYTHON__.implementation=[3,7,0,'rc',2]
 __BRYTHON__.__MAGIC__="3.7.0"
 __BRYTHON__.version_info=[3,7,0,'final',0]
-__BRYTHON__.compiled_date="2018-10-24 08:41:59.831063"
-__BRYTHON__.timestamp=1540363319831
+__BRYTHON__.compiled_date="2018-10-24 09:13:23.172864"
+__BRYTHON__.timestamp=1540365203172
 __BRYTHON__.builtin_module_names=["_ajax","_base64","_jsre","_locale","_multiprocessing","_posixsubprocess","_profile","_sre_utils","_strptime","_svg","_sys","_warnings","array","builtins","dis","hashlib","json","long_int","marshal","math","modulefinder","posix","random","zlib"]
 
 ;(function($B){Number.isInteger=Number.isInteger ||function(value){return typeof value==='number' &&
@@ -7915,7 +7915,7 @@ JSObject.bind=function(self,evt,func){var js_func=function(ev){return func(jsobj
 self.js.addEventListener(evt,js_func)
 return _b_.None}
 JSObject.to_dict=function(self){
-return $B.obj_dict(self.js)}
+return $B.obj_dict(self.js,true)}
 JSObject.$factory=function(obj){if(obj===null){return _b_.None}
 if(typeof obj=='function'){return{__class__: JSObject,js: obj,js_func: obj}}
 var klass=$B.get_class(obj)
@@ -11092,9 +11092,11 @@ items.forEach(function(item){if((!self.$jsobj && item[1]===self)||
 return "{" + res.join(", ")+ "}"}
 dict.__setitem__=function(self,key,value){var $=$B.args("__setitem__",3,{self: null,key: null,value: null},["self","key","value"],arguments,{},null,null)
 return dict.$setitem($.self,$.key,$.value)}
-dict.$setitem=function(self,key,value){if(self.$jsobj){if(self.$jsobj.__class__===_b_.type){self.$jsobj[key]=$B.pyobj2jsobj(value)
+dict.$setitem=function(self,key,value){if(self.$jsobj){if(self.$from_js){
+value=$B.pyobj2jsobj(value)}
+if(self.$jsobj.__class__===_b_.type){self.$jsobj[key]=value
 if(key=="__init__" ||key=="__new__"){
-self.$jsobj.$factory=$B.$instance_creator(self.$jsobj)}}else{self.$jsobj[key]=$B.pyobj2jsobj(value)}
+self.$jsobj.$factory=$B.$instance_creator(self.$jsobj)}}else{self.$jsobj[key]=value}
 return $N}
 switch(typeof key){case "string":
 self.$string_dict[key]=value
@@ -11201,11 +11203,12 @@ $B.set_func_names(mappingproxy,"builtins")
 function jsobj2dict(x){var d=dict.$factory()
 for(var attr in x){if(attr.charAt(0)!="$" && attr !=="__class__"){if(x[attr]===undefined){continue}else if(x[attr].$jsobj===x){d.$string_dict[attr]=d}else{d.$string_dict[attr]=x[attr]}}}
 return d}
-$B.obj_dict=function(obj){var klass=$B.get_class(obj)
+$B.obj_dict=function(obj,from_js){var klass=$B.get_class(obj)
 if(klass !==undefined && klass.$native){throw _b_.AttributeError.$factory(klass.__name__ +
 " has no attribute '__dict__'")}
 var res=dict.$factory()
 res.$jsobj=obj
+res.$from_js=from_js 
 return res}})(__BRYTHON__)
 ;(function($B){var _b_=$B.builtins,object=_b_.object,$N=_b_.None
 function create_type(obj){return $B.get_class(obj).$factory()}

diff --git a/www/src/brython_dist.js b/www/src/brython_dist.js
@@ -73,8 +73,8 @@ $B.regexIdentifier=/^(?:[\$A-Z_a-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C
 __BRYTHON__.implementation=[3,7,0,'rc',2]
 __BRYTHON__.__MAGIC__="3.7.0"
 __BRYTHON__.version_info=[3,7,0,'final',0]
-__BRYTHON__.compiled_date="2018-10-24 08:41:59.831063"
-__BRYTHON__.timestamp=1540363319831
+__BRYTHON__.compiled_date="2018-10-24 09:13:23.172864"
+__BRYTHON__.timestamp=1540365203172
 __BRYTHON__.builtin_module_names=["_ajax","_base64","_jsre","_locale","_multiprocessing","_posixsubprocess","_profile","_sre_utils","_strptime","_svg","_sys","_warnings","array","builtins","dis","hashlib","json","long_int","marshal","math","modulefinder","posix","random","zlib"]
 
 ;(function($B){Number.isInteger=Number.isInteger ||function(value){return typeof value==='number' &&
@@ -7915,7 +7915,7 @@ JSObject.bind=function(self,evt,func){var js_func=function(ev){return func(jsobj
 self.js.addEventListener(evt,js_func)
 return _b_.None}
 JSObject.to_dict=function(self){
-return $B.obj_dict(self.js)}
+return $B.obj_dict(self.js,true)}
 JSObject.$factory=function(obj){if(obj===null){return _b_.None}
 if(typeof obj=='function'){return{__class__: JSObject,js: obj,js_func: obj}}
 var klass=$B.get_class(obj)
@@ -11092,9 +11092,11 @@ items.forEach(function(item){if((!self.$jsobj && item[1]===self)||
 return "{" + res.join(", ")+ "}"}
 dict.__setitem__=function(self,key,value){var $=$B.args("__setitem__",3,{self: null,key: null,value: null},["self","key","value"],arguments,{},null,null)
 return dict.$setitem($.self,$.key,$.value)}
-dict.$setitem=function(self,key,value){if(self.$jsobj){if(self.$jsobj.__class__===_b_.type){self.$jsobj[key]=$B.pyobj2jsobj(value)
+dict.$setitem=function(self,key,value){if(self.$jsobj){if(self.$from_js){
+value=$B.pyobj2jsobj(value)}
+if(self.$jsobj.__class__===_b_.type){self.$jsobj[key]=value
 if(key=="__init__" ||key=="__new__"){
-self.$jsobj.$factory=$B.$instance_creator(self.$jsobj)}}else{self.$jsobj[key]=$B.pyobj2jsobj(value)}
+self.$jsobj.$factory=$B.$instance_creator(self.$jsobj)}}else{self.$jsobj[key]=value}
 return $N}
 switch(typeof key){case "string":
 self.$string_dict[key]=value
@@ -11201,11 +11203,12 @@ $B.set_func_names(mappingproxy,"builtins")
 function jsobj2dict(x){var d=dict.$factory()
 for(var attr in x){if(attr.charAt(0)!="$" && attr !=="__class__"){if(x[attr]===undefined){continue}else if(x[attr].$jsobj===x){d.$string_dict[attr]=d}else{d.$string_dict[attr]=x[attr]}}}
 return d}
-$B.obj_dict=function(obj){var klass=$B.get_class(obj)
+$B.obj_dict=function(obj,from_js){var klass=$B.get_class(obj)
 if(klass !==undefined && klass.$native){throw _b_.AttributeError.$factory(klass.__name__ +
 " has no attribute '__dict__'")}
 var res=dict.$factory()
 res.$jsobj=obj
+res.$from_js=from_js 
 return res}})(__BRYTHON__)
 ;(function($B){var _b_=$B.builtins,object=_b_.object,$N=_b_.None
 function create_type(obj){return $B.get_class(obj).$factory()}

diff --git a/www/src/js_objects.js b/www/src/js_objects.js
@@ -465,7 +465,7 @@ JSObject.bind = function(self, evt, func){
 
 JSObject.to_dict = function(self){
     // Returns a Python dictionary based on the underlying Javascript object
-    return $B.obj_dict(self.js)
+    return $B.obj_dict(self.js, true)
 }
 
 JSObject.$factory = function(obj){

diff --git a/www/src/py_dict.js b/www/src/py_dict.js
@@ -457,23 +457,26 @@ dict.__repr__ = function(self){
 }
 
 dict.__setitem__ = function(self, key, value){
-
     var $ = $B.args("__setitem__", 3, {self: null, key: null, value: null},
         ["self", "key", "value"], arguments, {}, null, null)
     return dict.$setitem($.self, $.key, $.value)
 }
 
 dict.$setitem = function(self, key, value){
     if(self.$jsobj){
+        if(self.$from_js){
+            // dictionary created by method to_dict of JSObject instances
+            value = $B.pyobj2jsobj(value)
+        }
         if(self.$jsobj.__class__ === _b_.type){
-            self.$jsobj[key] = $B.pyobj2jsobj(value)
+            self.$jsobj[key] = value
             if(key == "__init__" || key == "__new__"){
                 // If class attribute __init__ or __new__ are reset,
                 // the factory function has to change
                 self.$jsobj.$factory = $B.$instance_creator(self.$jsobj)
             }
         }else{
-            self.$jsobj[key] = $B.pyobj2jsobj(value)
+            self.$jsobj[key] = value
         }
         return $N
     }
@@ -774,13 +777,14 @@ function jsobj2dict(x){
     }
     return d
 }
-$B.obj_dict = function(obj){
+$B.obj_dict = function(obj, from_js){
     var klass = $B.get_class(obj)
     if(klass !== undefined && klass.$native){
         throw _b_.AttributeError.$factory(klass.__name__ +
             " has no attribute '__dict__'")}
     var res = dict.$factory()
     res.$jsobj = obj
+    res.$from_js = from_js // set to true if created by JSObject.to_dict()
     return res
 }
 

diff --git a/www/src/version_info.js b/www/src/version_info.js
@@ -1,8 +1,8 @@
 __BRYTHON__.implementation = [3, 7, 0, 'rc', 2]
 __BRYTHON__.__MAGIC__ = "3.7.0"
 __BRYTHON__.version_info = [3, 7, 0, 'final', 0]
-__BRYTHON__.compiled_date = "2018-10-24 08:41:59.831063"
-__BRYTHON__.timestamp = 1540363319831
+__BRYTHON__.compiled_date = "2018-10-24 09:13:23.172864"
+__BRYTHON__.timestamp = 1540365203172
 __BRYTHON__.builtin_module_names = ["_ajax",
     "_base64",
     "_jsre",

diff --git a/www/tests/issues.py b/www/tests/issues.py
@@ -2144,6 +2144,14 @@ def __getattr__(self, name):
 except AttributeError:
     pass
 
+# issue 951
+class A(object):
+        pass
+
+a = A()
+a.__dict__['_x'] = {1: 2}
+a._x[3] = 4
+assert len(a._x) == 2
 
 # ==========================================
 # Finally, report that all tests have passed