fixed setting class attribute from an instance (now updates the variable on the instance, not the class)

hartsantler · hartsantler · commit 7acfd396bf26 · 2014-05-04T01:03:46.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -1434,21 +1434,23 @@ def _visit_assign_helper(self, node, target):
 			elif typedef and target.attr in typedef.properties and 'set' in typedef.properties[ target.attr ]:
 				setter = typedef.properties[ target.attr ]['set']
 				writer.write( '%s( [%s, %s], JSObject() )' %(setter, target_value, self.visit(node.value)) )
-			elif typedef and target.attr in typedef.class_attributes:
-				writer.write( '''%s['__class__']['%s'] = %s''' %(target_value, target.attr, self.visit(node.value)))
+
+			#elif typedef and target.attr in typedef.class_attributes:
+			#	writer.write( '''%s['__class__']['%s'] = %s''' %(target_value, target.attr, self.visit(node.value)))
+
 			elif typedef and target.attr in typedef.attributes:
 				writer.write( '%s.%s = %s' %(target_value, target.attr, self.visit(node.value)))
 
 			elif typedef and typedef.parents:
 				parent_prop = typedef.check_for_parent_with( property=target.attr )
-				parent_classattr = typedef.check_for_parent_with( class_attribute=target.attr )
+				#parent_classattr = typedef.check_for_parent_with( class_attribute=target.attr )
 				parent_setattr = typedef.check_for_parent_with( method='__setattr__' )
 				if parent_prop and 'set' in parent_prop.properties[target.attr]:
 					setter = parent_prop.properties[target.attr]['set']
 					writer.write( '%s( [%s, %s], JSObject() )' %(setter, target_value, self.visit(node.value)) )
 
-				elif parent_classattr:
-					writer.write( "__%s_attrs.%s = %s" %(parent_classattr.name, target.attr, self.visit(node.value)) )
+				#elif parent_classattr:
+				#	writer.write( "__%s_attrs.%s = %s" %(parent_classattr.name, target.attr, self.visit(node.value)) )
 
 				elif parent_setattr:
 					func = parent_setattr.get_pythonjs_function_name( '__setattr__' )
diff --git a/regtests/class/attr.py b/regtests/class/attr.py
@@ -23,4 +23,7 @@ def main():
         getattr(b, 'c')
         TestError(not 'No exception: getattr on undefined attribute')
     except AttributeError:
-        pass
+        pass
+
+    b.g = 100
+    TestError( A.g == 6)
