added special "property" keyword to getattr and setattr, for setting or getting an attribute on an instance that should have been exposed using property decorators.

hartsantler · hartsantler · commit bab6ac57b30d · 2013-11-05T17:55:03.000-08:00
diff --git a/pythonjs.js b/pythonjs.js
@@ -1,4 +1,4 @@
-// PythonScript Runtime - regenerated on: Mon Nov  4 21:44:15 2013
+// PythonScript Runtime - regenerated on: Tue Nov  5 17:54:04 2013
 var jsrange = function(num) {
 "Emulates Python's range function";
 var i, r;
@@ -575,19 +575,33 @@ kwargs = Object();
 }
 
 var signature, arguments;
-signature = {"kwargs": Object(), "args": create_array("ob", "attr")};
+signature = {"kwargs": {"property": false}, "args": create_array("ob", "attr", "property")};
 signature["function_name"] = "getattr";
 arguments = get_arguments(signature, args, kwargs);
 var ob = arguments['ob'];
 var attr = arguments['attr'];
+var property = arguments['property'];
+if(property) {
+prop = _get_upstream_property( ob.__class__,attr );
+if(prop && prop["get"]) {
+return prop[ "get" ]( [ob],{  } );
+}
+else {
+console.log("ERROR: getattr property error", prop);
+}
+
+}
+else {
 return get_attribute( ob,attr );
+}
+
 }
 window["getattr"] = getattr 
 
 getattr.NAME = "getattr";
-getattr.args_signature = ["ob", "attr"];
-getattr.kwargs_signature = {  };
-getattr.types_signature = {  };
+getattr.args_signature = ["ob", "attr", "property"];
+getattr.kwargs_signature = { property:false };
+getattr.types_signature = { property:"False" };
 getattr.pythonscript_function = true;
 var setattr = function(args, kwargs) {
 if(args instanceof Array && {}.toString.call(kwargs) === '[object Object]' && arguments.length == 2) {
@@ -599,20 +613,34 @@ kwargs = Object();
 }
 
 var signature, arguments;
-signature = {"kwargs": Object(), "args": create_array("ob", "attr", "value")};
+signature = {"kwargs": {"property": false}, "args": create_array("ob", "attr", "value", "property")};
 signature["function_name"] = "setattr";
 arguments = get_arguments(signature, args, kwargs);
 var ob = arguments['ob'];
 var attr = arguments['attr'];
 var value = arguments['value'];
-return set_attribute( ob,attr,value );
+var property = arguments['property'];
+if(property) {
+prop = _get_upstream_property( ob.__class__,attr );
+if(prop && prop["set"]) {
+prop[ "set" ]( [ob, value],{  } );
+}
+else {
+console.log("ERROR: setattr property error", prop);
+}
+
+}
+else {
+set_attribute( ob,attr,value );
+}
+
 }
 window["setattr"] = setattr 
 
 setattr.NAME = "setattr";
-setattr.args_signature = ["ob", "attr", "value"];
-setattr.kwargs_signature = {  };
-setattr.types_signature = {  };
+setattr.args_signature = ["ob", "attr", "value", "property"];
+setattr.kwargs_signature = { property:false };
+setattr.types_signature = { property:"False" };
 setattr.pythonscript_function = true;
 var issubclass = function(args, kwargs) {
 var i, bases;
diff --git a/runtime/builtins.py b/runtime/builtins.py
@@ -16,13 +16,27 @@ def type(ob_or_class_name, bases=None, class_dict=None):
         else:
             return create_class(ob_or_class_name, bases, class_dict)  ## TODO rename create_class to _pyjs_create_class
 
-def getattr(ob, attr):
+def getattr(ob, attr, property=False):
     with javascript:
-        return get_attribute(ob, attr)  ## TODO rename to _pyjs_get_attribute
+        if property:
+            prop = _get_upstream_property( ob.__class__, attr )
+            if prop and prop['get']:
+                return prop['get']( [ob], {} )
+            else:
+                print "ERROR: getattr property error", prop
+        else:
+            return get_attribute(ob, attr)  ## TODO rename to _pyjs_get_attribute
 
-def setattr(ob, attr, value):
+def setattr(ob, attr, value, property=False):
     with javascript:
-        return set_attribute(ob, attr, value)
+        if property:
+            prop = _get_upstream_property( ob.__class__, attr )
+            if prop and prop['set']:
+                prop['set']( [ob, value], {} )
+            else:
+                print "ERROR: setattr property error", prop
+        else:
+            set_attribute(ob, attr, value)
 
 def issubclass(C, B):
     if C is B:
diff --git a/tests/property_decorator.html b/tests/property_decorator.html
@@ -17,6 +17,7 @@
 		return self._x
 	@x.setter
 	def x(self,value):
+		print '--calling x setter: ', value
 		self._x = value + 1000
 
 	@property
@@ -69,7 +70,15 @@
 	print 'unknown get_attribute is OK'
 	
 	c.x = 101	## TODO fix setters on unknown types
-	print( c.x )
+	print( c.x )  ## this prints 101 but the setter was not called
+	with javascript:
+		print c.__dict__._x
+
+	print 'testing setattr(c,"x", property=True)'
+	setattr( c, 'x', 10, property=True )
+	with javascript:
+		print c.__dict__._x
+	print getattr( c, 'x', property=True )
 
 </script>
 </head>
