neorpython - fixed if @Property get method had the same name as property

Hart · Hart · commit 8d92f17890df · 2012-04-28T11:56:59.000+08:00
diff --git a/examples-rpython/test9-llvm-vectors.py b/examples-rpython/test9-llvm-vectors.py
@@ -55,6 +55,10 @@ def run_test(x1,y1,z1, x2,y2,z2):
 		global G
 		res = test(x1,y1,z1, x2,y2,z2)
 		G.append( res )
+		if len( G ) == 4:
+			print('end of llvm benchmark:', time.time()-start)
+			print('test result:', G)
+
 	for i in range(10):
 		G = []
 		start = time.time()
@@ -63,10 +67,8 @@ def run_test(x1,y1,z1, x2,y2,z2):
 		threading._start_new_thread( run_test, (0.3, 0.3, 0.3,  0.3, 0.3, 0.3) )
 		threading._start_new_thread( run_test, (0.3, 0.3, 0.3,  0.3, 0.3, 0.3) )
 		while len(G) != 4:
-			time.sleep(0.01)
-		print('end of llvm benchmark:', time.time()-start)
-		print('test result:', G)
-
+			time.sleep(1.0)
+	print('thread test done')
 
 
 else:
diff --git a/rpythonic/neorpython.py b/rpythonic/neorpython.py
@@ -379,6 +379,7 @@ def make_rpython_compatible( translator, delete_class_properties=True, debug=Tru
 
 						if op.opname == 'setattr':
 							func_name = prop.fset.func_name
+							assert func_name != prop.fget.func_name
 						elif op.opname == 'getattr':
 							func_name = prop.fget.func_name
 
@@ -395,7 +396,12 @@ def make_rpython_compatible( translator, delete_class_properties=True, debug=Tru
 	if delete_class_properties:
 		## this is required to avoid "degenerate to SomeObject" error by the annotation phase
 		for cls in class_props:
-			for name in class_props[ cls ]: delattr( cls, name )
+			for name in class_props[ cls ]:
+				prop = getattr(cls, name)
+				assert type(prop) is property
+				delattr( cls, name )
+				if prop.fget.func_name == name:
+					setattr( cls, name, prop.fget )
 
 	return class_props		# returns class props to be removed before annotation
 
diff --git a/rpythonic/rpythonic.py b/rpythonic/rpythonic.py
@@ -2,7 +2,7 @@
 # RPythonic - April, 2012
 # By Brett, bhartsho@yahoo.com
 # License: BSD
-VERSION = '0.4.7a'
+VERSION = '0.4.7b'
 
 _doc_ = '''
 NAME
