asn1: Use PyStringMethods::to_str when possible

Signed-off-by: Facundo Tuesca <[email protected]>

Author: facutuesca

src/rust/src/declarative_asn1/encode.rs

@@ -138,27 +138,33 @@ impl asn1::Asn1Writable for AnnotatedTypeObject<'_> {
                 let val: &pyo3::Bound<'_, PrintableString> = value
                     .cast()
                     .map_err(|_| asn1::WriteError::AllocationError)?;
-                let inner_str = val
-                    .get()
-                    .inner
-                    .to_cow(py)
-                    .map_err(|_| asn1::WriteError::AllocationError)?;
+                let inner_str = &val.get().inner;
+
+                #[cfg(Py_3_10)]
+                let rust_str = inner_str.to_str(py);
+                #[cfg(not(Py_3_10))]
+                let rust_str = inner_str.to_cow(py);
+
+                let rust_str = rust_str.map_err(|_| asn1::WriteError::AllocationError)?;
                 let printable_string: asn1::PrintableString<'_> =
-                    asn1::PrintableString::new(&inner_str)
+                    asn1::PrintableString::new(&rust_str)
                         .ok_or(asn1::WriteError::AllocationError)?;
                 write_value(writer, &printable_string, encoding)
             }
             Type::IA5String() => {
                 let val: &pyo3::Bound<'_, IA5String> = value
                     .cast()
                     .map_err(|_| asn1::WriteError::AllocationError)?;
-                let inner_str = val
-                    .get()
-                    .inner
-                    .to_cow(py)
-                    .map_err(|_| asn1::WriteError::AllocationError)?;
+                let inner_str = &val.get().inner;
+
+                #[cfg(Py_3_10)]
+                let rust_str = inner_str.to_str(py);
+                #[cfg(not(Py_3_10))]
+                let rust_str = inner_str.to_cow(py);
+
+                let rust_str = rust_str.map_err(|_| asn1::WriteError::AllocationError)?;
                 let ia5_string: asn1::IA5String<'_> =
-                    asn1::IA5String::new(&inner_str).ok_or(asn1::WriteError::AllocationError)?;
+                    asn1::IA5String::new(&rust_str).ok_or(asn1::WriteError::AllocationError)?;
                 write_value(writer, &ia5_string, encoding)
             }
             Type::UtcTime() => {

src/rust/src/declarative_asn1/types.rs

@@ -143,7 +143,12 @@ impl PrintableString {
     #[new]
     #[pyo3(signature = (inner,))]
     fn new(py: pyo3::Python<'_>, inner: pyo3::Py<pyo3::types::PyString>) -> pyo3::PyResult<Self> {
-        if Asn1PrintableString::new(&inner.to_cow(py)?).is_none() {
+        #[cfg(Py_3_10)]
+        let rust_str = &inner.to_str(py)?;
+        #[cfg(not(Py_3_10))]
+        let rust_str = &inner.to_cow(py)?;
+
+        if Asn1PrintableString::new(rust_str).is_none() {
             return Err(pyo3::exceptions::PyValueError::new_err(format!(
                 "invalid PrintableString: {inner}"
             )));
@@ -176,7 +181,12 @@ impl IA5String {
     #[new]
     #[pyo3(signature = (inner,))]
     fn new(py: pyo3::Python<'_>, inner: pyo3::Py<pyo3::types::PyString>) -> pyo3::PyResult<Self> {
-        if Asn1IA5String::new(&inner.to_cow(py)?).is_none() {
+        #[cfg(Py_3_10)]
+        let rust_str = &inner.to_str(py)?;
+        #[cfg(not(Py_3_10))]
+        let rust_str = &inner.to_cow(py)?;
+
+        if Asn1IA5String::new(rust_str).is_none() {
             return Err(pyo3::exceptions::PyValueError::new_err(format!(
                 "invalid IA5String: {inner}"
             )));