Fixed new_attribute_error and added more tests for property

RustPython · cthulahoops · Mar 10, 2019 · Mar 8, 2019 · Mar 8, 2019 · Mar 9, 2019
commit 3c3c1f2b6f6fd8e1938b63153554f90cfa611ac9
diff --git a/tests/snippets/class.py b/tests/snippets/class.py
@@ -16,22 +16,6 @@ def square(self):
 assert foo.square() == 25
 
 
-class Fubar:
-    def __init__(self):
-        self.x = 100
-
-    @property
-    def foo(self):
-        value = self.x
-        self.x += 1
-        return value
-
-
-f = Fubar()
-assert f.foo == 100
-assert f.foo == 101
-
-
 class Bar:
     """ W00t """
     def __init__(self, x):

diff --git a/tests/snippets/property.py b/tests/snippets/property.py
@@ -0,0 +1,32 @@
+from testutils import assertRaises
+
+
+class Fubar:
+    def __init__(self):
+        self.x = 100
+
+    @property
+    def foo(self):
+        value = self.x
+        self.x += 1
+        return value
+
+
+f = Fubar()
+assert f.foo == 100
+assert f.foo == 101
+
+
+null_property = property()
+assert type(null_property) is property
+
+p = property(lambda x: x[0])
+assert p.__get__((2,), tuple) == 2
+# TODO owner parameter is optional
+# assert p.__get__((2,)) == 2
+
+with assertRaises(AttributeError):
+    null_property.__get__((), tuple)
+
+with assertRaises(TypeError):
+    property.__new__(object)
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -135,7 +135,7 @@ impl VirtualMachine {
     }
 
     pub fn new_attribute_error(&mut self, msg: String) -> PyObjectRef {
-        let type_error = self.ctx.exceptions.arithmetic_error.clone();
+        let type_error = self.ctx.exceptions.attribute_error.clone();
         self.new_exception(type_error, msg)
     }