Merge pull request RustPython#4170 from youknowone/pygetset

pyproperty -> pygetset

Author: youknowone

derive/src/pyclass.rs

@@ -33,7 +33,7 @@ impl std::fmt::Display for AttrName {
             Self::Method => "pymethod",
             Self::ClassMethod => "pyclassmethod",
             Self::StaticMethod => "pystaticmethod",
-            Self::GetSet => "pyproperty",
+            Self::GetSet => "pygetset",
             Self::Slot => "pyslot",
             Self::Attr => "pyattr",
             Self::ExtendClass => "extend_class",
@@ -50,7 +50,7 @@ impl FromStr for AttrName {
             "pymethod" => Self::Method,
             "pyclassmethod" => Self::ClassMethod,
             "pystaticmethod" => Self::StaticMethod,
-            "pyproperty" => Self::GetSet,
+            "pygetset" => Self::GetSet,
             "pyslot" => Self::Slot,
             "pyattr" => Self::Attr,
             "extend_class" => Self::ExtendClass,
@@ -406,7 +406,7 @@ struct MethodItem {
     inner: ContentItemInner<AttrName>,
 }
 
-/// #[pyproperty]
+/// #[pygetset]
 struct GetSetItem {
     inner: ContentItemInner<AttrName>,
 }

derive/src/util.rs

@@ -15,7 +15,7 @@ pub(crate) const ALL_ALLOWED_NAMES: &[&str] = &[
     "pymethod",
     "pyclassmethod",
     "pystaticmethod",
-    "pyproperty",
+    "pygetset",
     "pyfunction",
     "pyclass",
     "pyexception",

stdlib/src/array.rs

@@ -686,14 +686,14 @@ mod array {
             self.array.write()
         }
 
-        #[pyproperty]
+        #[pygetset]
         fn typecode(&self, vm: &VirtualMachine) -> PyStrRef {
             vm.ctx
                 .intern_str(self.read().typecode().to_string())
                 .to_owned()
         }
 
-        #[pyproperty]
+        #[pygetset]
         fn itemsize(&self) -> usize {
             self.read().itemsize()
         }

stdlib/src/bz2.rs

@@ -126,13 +126,13 @@ mod _bz2 {
             Ok(vm.ctx.new_bytes(buf.to_vec()))
         }
 
-        #[pyproperty]
+        #[pygetset]
         fn eof(&self) -> bool {
             let state = self.state.lock();
             state.eof
         }
 
-        #[pyproperty]
+        #[pygetset]
         fn unused_data(&self, vm: &VirtualMachine) -> PyBytesRef {
             // Data found after the end of the compressed stream.
             // If this attribute is accessed before the end of the stream
@@ -152,7 +152,7 @@ mod _bz2 {
             // }
         }
 
-        #[pyproperty]
+        #[pygetset]
         fn needs_input(&self) -> bool {
             // False if the decompress() method can provide more
             // decompressed data before requiring new uncompressed input.

stdlib/src/contextvars.rs

@@ -101,7 +101,7 @@ mod _contextvars {
 
     #[pyclass(with(Initializer))]
     impl ContextVar {
-        #[pyproperty]
+        #[pygetset]
         fn name(&self) -> String {
             self.name.clone()
         }
@@ -174,12 +174,12 @@ mod _contextvars {
 
     #[pyclass(with(Initializer))]
     impl ContextToken {
-        #[pyproperty]
+        #[pygetset]
         fn var(&self, _vm: &VirtualMachine) -> PyObjectRef {
             unimplemented!("Token.var() is currently under construction")
         }
 
-        #[pyproperty]
+        #[pygetset]
         fn old_value(&self, _vm: &VirtualMachine) -> PyObjectRef {
             unimplemented!("Token.old_value() is currently under construction")
         }

stdlib/src/hashlib.rs

@@ -80,12 +80,12 @@ mod hashlib {
             Ok(PyHasher::new("md5", HashWrapper::md5()).into_pyobject(vm))
         }
 
-        #[pyproperty]
+        #[pygetset]
         fn name(&self) -> String {
             self.name.clone()
         }
 
-        #[pyproperty]
+        #[pygetset]
         fn digest_size(&self) -> usize {
             self.read().digest_size()
         }

stdlib/src/mmap.rs

@@ -541,7 +541,7 @@ mod mmap {
             ))
         }
 
-        #[pyproperty]
+        #[pygetset]
         fn closed(&self) -> bool {
             self.closed.load()
         }

stdlib/src/pystruct.rs

@@ -258,12 +258,12 @@ pub(crate) mod _struct {
 
     #[pyclass(with(Constructor))]
     impl PyStruct {
-        #[pyproperty]
+        #[pygetset]
         fn format(&self) -> PyStrRef {
             self.format.clone()
         }
 
-        #[pyproperty]
+        #[pygetset]
         #[inline]
         fn size(&self) -> usize {
             self.spec.size

stdlib/src/re.rs

@@ -343,7 +343,7 @@ mod re {
             self.sub(repl, text, vm)
         }
 
-        #[pyproperty]
+        #[pygetset]
         fn pattern(&self, vm: &VirtualMachine) -> PyResult<PyStrRef> {
             Ok(vm.ctx.new_str(self.pattern.clone()))
         }

stdlib/src/socket.rs

@@ -1504,15 +1504,15 @@ mod _socket {
             Ok(self.sock()?.shutdown(how)?)
         }
 
-        #[pyproperty(name = "type")]
+        #[pygetset(name = "type")]
         fn kind(&self) -> i32 {
             self.kind.load()
         }
-        #[pyproperty]
+        #[pygetset]
         fn family(&self) -> i32 {
             self.family.load()
         }
-        #[pyproperty]
+        #[pygetset]
         fn proto(&self) -> i32 {
             self.proto.load()
         }