Merge branch 'master' into sh_merge_master

.github/workflows/ci.yml

@@ -10,6 +10,8 @@ on:
       - smart_holder
       - v*
 
+permissions: read-all
+
 concurrency:
   group: test-sh-avl${{ github.ref }}
   cancel-in-progress: true

.github/workflows/configure.yml

@@ -10,6 +10,9 @@ on:
       - smart_holder
       - v*
 
+permissions:
+  contents: read
+
 env:
   # For cmake:
   VERBOSE: 1

.github/workflows/format.yml

@@ -13,6 +13,9 @@ on:
     - smart_holder
     - "v*"
 
+permissions:
+  contents: read
+
 env:
   FORCE_COLOR: 3
   # For cmake:

.github/workflows/labeler.yml

@@ -3,10 +3,15 @@ on:
   pull_request_target:
     types: [closed]
 
+permissions: {}
+
 jobs:
   label:
     name: Labeler
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
     steps:
 
     - uses: actions/labeler@main

.github/workflows/pip.yml

@@ -13,6 +13,9 @@ on:
     types:
     - published
 
+permissions:
+  contents: read
+
 env:
   PIP_ONLY_BINARY: numpy
 

.github/workflows/upstream.yml

@@ -5,6 +5,9 @@ on:
   workflow_dispatch:
   pull_request:
 
+permissions:
+  contents: read
+
 concurrency:
   group: upstream-${{ github.ref }}
   cancel-in-progress: true

docs/advanced/cast/strings.rst

@@ -101,8 +101,11 @@ conversion has the same overhead as implicit conversion.
     m.def("str_output",
         []() {
             std::string s = "Send your r\xe9sum\xe9 to Alice in HR"; // Latin-1
-            py::str py_s = PyUnicode_DecodeLatin1(s.data(), s.length());
+            py::handle py_s = PyUnicode_DecodeLatin1(s.data(), s.length(), nullptr);
-            return py_s;
+            if (!py_s) {
+                throw py::error_already_set();
+            }
+            return py::reinterpret_steal<py::str>(py_s);
         }
     );
 
@@ -113,7 +116,8 @@ conversion has the same overhead as implicit conversion.
 
 The `Python C API
 <https://docs.python.org/3/c-api/unicode.html#built-in-codecs>`_ provides
-several built-in codecs.
+several built-in codecs. Note that these all return *new* references, so
+use :cpp:func:`reinterpret_steal` when converting them to a :cpp:class:`str`.
 
 
 One could also use a third party encoding library such as libiconv to transcode