Fall back to intern if not valid CStr

Author: bschoenmaeckers

src/sync.rs

@@ -9,13 +9,7 @@
 //! interpreter.
 //!
 //! This module provides synchronization primitives which are able to synchronize under these conditions.
-use crate::{
-    internal::state::SuspendAttach,
-    sealed::Sealed,
-    types::{PyAny, PyString},
-    Borrowed, Bound, Py, Python,
-};
-use std::ffi::CStr;
+use crate::{internal::state::SuspendAttach, sealed::Sealed, types::PyAny, Bound, Python};
 use std::{
     cell::UnsafeCell,
     marker::PhantomData,
@@ -230,38 +224,27 @@ impl<T> Drop for GILOnceCell<T> {
 #[macro_export]
 macro_rules! intern {
     ($py: expr, $text: expr) => {{
-        const _CSTR: &::std::ffi::CStr = {
+        const STRING: ::std::result::Result<&::std::ffi::CStr, &str> = {
             match ::std::ffi::CStr::from_bytes_with_nul(concat!($text, "\0").as_bytes()) {
-                ::std::result::Result::Ok(s) => s,
-                ::std::result::Result::Err(_) => {
-                    ::std::panic!("interned string cannot contain interior null bytes")
-                }
+                ::std::result::Result::Ok(c_str) => ::std::result::Result::Ok(c_str),
+                ::std::result::Result::Err(_) => ::std::result::Result::Err($text),
             }
         };
-        static INTERNED: $crate::sync::Interned = $crate::sync::Interned::new(_CSTR);
-        INTERNED.get($py)
+        static INTERNED: $crate::sync::PyOnceLock<$crate::Py<$crate::types::PyString>> =
+            $crate::sync::PyOnceLock::new();
+        INTERNED
+            .get_or_init($py, || match STRING {
+                ::std::result::Result::Ok(c_str) => {
+                    $crate::types::PyString::intern_cstr($py, c_str).unbind()
+                }
+                ::std::result::Result::Err(string) => {
+                    $crate::types::PyString::intern($py, string).unbind()
+                }
+            })
+            .bind_borrowed($py)
     }};
 }
 
-/// Implementation detail for `intern!` macro.
-#[doc(hidden)]
-pub struct Interned(&'static CStr, PyOnceLock<Py<PyString>>);
-
-impl Interned {
-    /// Creates an empty holder for an interned `str`.
-    pub const fn new(value: &'static CStr) -> Self {
-        Interned(value, PyOnceLock::new())
-    }
-
-    /// Gets or creates the interned `str` value.
-    #[inline]
-    pub fn get<'py>(&self, py: Python<'py>) -> Borrowed<'_, 'py, PyString> {
-        self.1
-            .get_or_init(py, || PyString::intern_cstr(py, self.0).unbind())
-            .bind_borrowed(py)
-    }
-}
-
 /// Extension trait for [`Once`] to help avoid deadlocking when using a [`Once`] when attached to a
 /// Python thread.
 pub trait OnceExt: Sealed {
@@ -735,7 +718,10 @@ mod rwlock_ext_sealed {
 mod tests {
     use super::*;
 
-    use crate::types::{PyAnyMethods, PyDict, PyDictMethods};
+    use crate::{
+        types::{PyAnyMethods, PyDict, PyDictMethods},
+        Py,
+    };
     #[cfg(not(target_arch = "wasm32"))]
     #[cfg(feature = "macros")]
     use std::sync::atomic::{AtomicBool, Ordering};