zeroc-ice 3.8.0__tar.gz → 3.8.0.post1__tar.gz

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zeroc-ice
-Version: 3.8.0
+Version: 3.8.0.post1
 Summary: Ice is a comprehensive RPC framework with support for Python, C++, .NET, Java, JavaScript and more.
 Author-email: "ZeroC, Inc." <info@zeroc.com>
 License-Expression: GPL-2.0-only

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/include/Ice/Communicator.h

@@ -36,8 +36,8 @@ namespace Ice
     public:
         ~Communicator();
 
-        /// Destroys this communicator. This function calls #shutdown implicitly. Calling #destroy destroys all
-        /// object adapters, and closes all outgoing connections. This method waits for all outstanding dispatches to
+        /// Destroys this communicator. This function calls #shutdown implicitly. Calling this function destroys all
+        /// object adapters, and closes all outgoing connections. This function waits for all outstanding dispatches to
         /// complete before returning. This includes "bidirectional dispatches" that execute on outgoing connections.
         /// @see CommunicatorHolder
         void destroy() noexcept;
@@ -277,14 +277,14 @@ namespace Ice
         [[nodiscard]] std::future<void> flushBatchRequestsAsync(CompressBatch compress);
 
         /// Adds the Admin object with all its facets to the provided object adapter. If `Ice.Admin.ServerId`
-        /// is set and the provided object adapter has a Locator, #createAdmin registers the Admin's Process facet with
+        /// is set and the provided object adapter has a Locator, this function registers the Admin's Process facet with
         /// the Locator's LocatorRegistry.
         /// @param adminAdapter The object adapter used to host the Admin object; if it is null and
         /// `Ice.Admin.Endpoints` is set, this function uses the `Ice.Admin` object adapter, after creating and
         /// activating this adapter.
         /// @param adminId The identity of the Admin object.
         /// @return A proxy to the main ("") facet of the Admin object.
-        /// @throws InitializationException Thrown when #createAdmin is called more than once.
+        /// @throws InitializationException Thrown when this function is called more than once.
         /// @see #getAdmin
         ObjectPrx createAdmin(const ObjectAdapterPtr& adminAdapter, const Identity& adminId);
 

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/include/Ice/Connection.h

@@ -25,7 +25,7 @@
 
 namespace Ice
 {
-    /// Represents batch compression options when flushing queued batch requests.
+    /// Represents batch compression options for flushing queued batch requests.
     enum class CompressBatch : std::uint8_t
     {
         /// Compress the batch requests.
@@ -124,8 +124,8 @@ namespace Ice
         /// @return A future that becomes available when the flush completes.
         [[nodiscard]] std::future<void> flushBatchRequestsAsync(CompressBatch compress);
 
-        /// Sets a close callback on the connection. The callback is called by the connection when it's closed. The
-        /// callback is called from the Ice thread pool associated with the connection.
+        /// Sets a close callback on the connection. The callback is called by the connection when it's closed.
+        /// The callback is called from the Ice thread pool associated with the connection.
         /// @param callback The close callback object.
         virtual void setCloseCallback(CloseCallback callback) = 0;
 

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/include/Ice/Endpoint.h

@@ -20,8 +20,8 @@
 
 namespace Ice
 {
-    /// An endpoint specifies the address of the server-end of an Ice connection: an object adapter listens on one or
-    /// more endpoints and a client establishes a connection to an endpoint.
+    /// An endpoint specifies the address of the server-end of an Ice connection.
+    /// An object adapter listens on one or more endpoints and a client establishes a connection to an endpoint.
     /// @headerfile Ice/Ice.h
     class ICE_API Endpoint
     {

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/include/Ice/Exception.h

@@ -34,7 +34,7 @@ namespace Ice
         /// Returns the type ID of this exception. This corresponds to the Slice type ID for Slice-defined exceptions,
         /// and to a fully scoped name for other exceptions. For example
         /// "::Ice::CommunicatorDestroyedException".
-        /// @return The type ID of this exception
+        /// @return The type ID of this exception.
         [[nodiscard]] virtual const char* ice_id() const noexcept = 0;
 
         /// Outputs a description of this exception to a stream.

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/include/Ice/Initialize.h

@@ -124,7 +124,7 @@ namespace Ice
 
     /// Converts a stringified identity into an Identity.
     /// @param str The stringified identity.
-    /// @return An Identity containing the name and category components.
+    /// @return An Identity created from the provided string.
     ICE_API Identity stringToIdentity(std::string_view str);
 
     /// Converts an Identity into a string using the specified mode.

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/include/Ice/LocalExceptions.h

@@ -785,7 +785,7 @@ namespace Ice
         [[nodiscard]] const char* ice_id() const noexcept final;
     };
 
-    /// The exception that is thrown when an ObjectAdapter cannot be activated. This can happen when the locator
+    /// The exception that is thrown when an ObjectAdapter cannot be activated. This can happen when a Locator
     /// implementation detects another active ObjectAdapter with the same adapter ID.
     /// @headerfile Ice/Ice.h
     class ICE_API ObjectAdapterIdInUseException final : public LocalException

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/include/Ice/Logger.h

@@ -28,8 +28,8 @@ namespace Ice
         // send the message to C APIs that require null-terminated strings.
         // The message itself is also often constructed from a string produced by an ostringstream.
 
-        /// Prints a message. The message is printed literally, without any decorations such as executable name or
-        /// timestamp.
+        /// Prints a message.
+        /// The message is printed literally, without any decorations such as executable name or timestamp.
         /// @param message The message to log.
         virtual void print(const std::string& message) = 0;
 
@@ -54,7 +54,7 @@ namespace Ice
 
         /// Returns a clone of the logger with a new prefix.
         /// @param prefix The new prefix for the logger.
-        /// @return A logger instance.
+        /// @return A new logger instance with the specified prefix.
         virtual LoggerPtr cloneWithPrefix(std::string prefix) = 0;
     };
 }

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/include/Ice/NativePropertiesAdmin.h

@@ -38,6 +38,8 @@ namespace Ice
         std::function<void()> addUpdateCallback(std::function<void(const PropertyDict&)> cb);
 
     private:
+        /// Removes a previously registered update callback.
+        /// @param p An iterator which points to the callback to remove.
         void removeUpdateCallback(std::list<std::function<void(const PropertyDict&)>>::iterator p);
 
         const PropertiesPtr _properties;

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/include/Ice/ObjectAdapter.h

@@ -56,7 +56,7 @@ namespace Ice
         virtual void hold() = 0;
 
         /// Waits until the object adapter is in the holding state (see #hold) and the dispatch of requests received
-        /// over incoming connection has completed.
+        /// over incoming connections has completed.
         /// @remark This function is provided for backward compatibility with older versions of Ice. Don't use it in
         /// new applications.
         virtual void waitForHold() = 0;
@@ -234,7 +234,7 @@ namespace Ice
         /// Removes a ServantLocator from this object adapter.
         /// @param category The category.
         /// @return The servant locator.
-        /// @throws NotRegisteredException Thrown when no ServantLocator with the given category is registered.
+        /// @throws NotRegisteredException Thrown when no servant locator with the given category is registered.
         virtual ServantLocatorPtr removeServantLocator(std::string_view category) = 0;
 
         /// Finds a ServantLocator registered with this object adapter.
@@ -267,7 +267,7 @@ namespace Ice
         /// Creates a direct proxy from an Ice identity.
         /// @tparam Prx The type of the proxy to return.
         /// @param id An Ice identity.
-        /// @return A proxy with the given identity and this published endpoints of this object adapter.
+        /// @return A proxy with the given identity and the published endpoints of this object adapter.
         template<typename Prx = ObjectPrx, std::enable_if_t<std::is_base_of_v<ObjectPrx, Prx>, bool> = true>
         Prx createDirectProxy(Identity id)
         {

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/include/Ice/ObserverHelper.h

@@ -6,6 +6,7 @@
 #include "InstanceF.h"
 #include "Instrumentation.h"
 
+#include <exception>
 #include <string_view>
 
 #if defined(_MSC_VER)

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/include/Ice/Properties.h

@@ -196,7 +196,7 @@ namespace Ice
 
         /// Gets an Ice property as a list of strings. The strings must be separated by whitespace or comma. The strings
         /// in the list can contain whitespace and commas if they are enclosed in single or double quotes. If quotes are
-        /// mismatched, the default list is returned.  Within single quotes or double quotes, you can escape the quote
+        /// mismatched, the default list is returned. Within single quotes or double quotes, you can escape the quote
         /// in question with a backslash, e.g. O'Reilly can be written as O'Reilly, "O'Reilly" or 'O\'Reilly'.
         /// @param key The property key.
         /// @return The property value interpreted as a list of strings, or the default value if the property is not
@@ -216,8 +216,8 @@ namespace Ice
         /// @see #setProperty
         StringSeq getPropertyAsListWithDefault(std::string_view key, const StringSeq& value);
 
-        /// Gets all properties whose keys begin with @p prefix. If @p prefix is the empty string, then all properties
-        /// are returned.
+        /// Gets all properties whose keys begin with the given prefix. If @p prefix is the empty string,
+        /// then all properties are returned.
         /// @param prefix The prefix to search for.
         /// @return The matching property set.
         PropertyDict getPropertiesForPrefix(std::string_view prefix);

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/include/Ice/Proxy.h

@@ -623,7 +623,7 @@ namespace Ice
         [[nodiscard]] bool ice_isBatchDatagram() const noexcept;
 
         /// Gets the compression override setting of this proxy.
-        /// @return The compression override setting. If nullopt is returned, no override is set. Otherwise, true
+        /// @return The compression override setting. If nullopt is returned, no override is set. Otherwise, `true`
         /// if compression is enabled, `false` otherwise.
         [[nodiscard]] std::optional<bool> ice_getCompress() const noexcept;
 

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/src/Ice/ConnectionFactory.h

@@ -88,11 +88,11 @@ namespace IceInternal
                 std::function<void(Ice::ConnectionIPtr, bool)>,
                 std::function<void(std::exception_ptr)>);
 
-            virtual void connectionStartCompleted(const Ice::ConnectionIPtr&);
-            virtual void connectionStartFailed(const Ice::ConnectionIPtr&, std::exception_ptr);
+            void connectionStartCompleted(const Ice::ConnectionIPtr&);
+            void connectionStartFailed(const Ice::ConnectionIPtr&, std::exception_ptr);
 
-            virtual void connectors(const std::vector<ConnectorPtr>&);
-            virtual void exception(std::exception_ptr);
+            void connectors(const std::vector<ConnectorPtr>&);
+            void exception(std::exception_ptr);
 
             void getConnectors();
             void nextEndpoint();
@@ -193,8 +193,8 @@ namespace IceInternal
         //
 
 #if defined(ICE_USE_IOCP)
-        virtual bool startAsync(SocketOperation);
-        virtual bool finishAsync(SocketOperation);
+        bool startAsync(SocketOperation) final;
+        bool finishAsync(SocketOperation) final;
 #endif
 
         void message(ThreadPoolCurrent&) override;
@@ -205,8 +205,8 @@ namespace IceInternal
         [[nodiscard]] std::string toString() const override;
         NativeInfoPtr getNativeInfo() override;
 
-        virtual void connectionStartCompleted(const Ice::ConnectionIPtr&);
-        virtual void connectionStartFailed(const Ice::ConnectionIPtr&, std::exception_ptr);
+        void connectionStartCompleted(const Ice::ConnectionIPtr&);
+        void connectionStartFailed(const Ice::ConnectionIPtr&, std::exception_ptr);
         void initialize();
         ~IncomingConnectionFactory() override;
 

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/src/Ice/Demangle.cpp

@@ -3,6 +3,7 @@
 #include "Ice/Demangle.h"
 
 #if defined(__GNUC__) || defined(__clang__)
+#    include <cstdlib>
 #    include <cxxabi.h>
 #endif
 

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/src/Ice/LocalException.cpp

@@ -48,7 +48,7 @@
 #        endif
 #    endif
 
-#    if !defined(__FreeBSD__)
+#    if __has_include(<execinfo.h>)
 #        include <cstdint>
 #        include <execinfo.h>
 #        define ICE_BACKTRACE

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/src/Ice/ServantManager.h

@@ -19,7 +19,7 @@ namespace Ice
 
 namespace IceInternal
 {
-    // A dispatcher that manages servants and servant locators for an object adapter.
+    /// A dispatcher that manages servants and servant locators for an object adapter.
     class ServantManager final : public Ice::Object
     {
     public:

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/src/Ice/StringConverter.cpp

@@ -6,6 +6,10 @@
 #    define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
 #elif (__cplusplus >= 201703L)
 #    include "DisableWarnings.h"
+#    if defined(__clang__)                                   // for clang in C++26 mode
+#        define _LIBCPP_ENABLE_CXX26_REMOVED_CODECVT         // NOLINT(cert-dcl37-c,cert-dcl51-cpp)
+#        define _LIBCPP_ENABLE_CXX26_REMOVED_WSTRING_CONVERT // NOLINT(cert-dcl37-c,cert-dcl51-cpp)
+#    endif
 #endif
 
 #include "Ice/StringConverter.h"

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/src/Slice/FileTracker.h

@@ -7,6 +7,7 @@
 #include <map>
 #include <memory>
 #include <stdexcept>
+#include <string>
 
 namespace Slice
 {

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/src/slice2py/PythonUtil.cpp

@@ -1211,7 +1211,7 @@ Slice::Python::CodeVisitor::writeOperations(const InterfaceDefPtr& p, Output& ou
         out << epar << operationReturnTypeHint(operation, MethodKind::Dispatch) << ":";
         out.inc();
 
-        writeDocstring(operation, MethodKind::Dispatch, out);
+        writeOpDocstring(operation, MethodKind::Dispatch, out);
 
         out << nl << "pass";
         out.dec();
@@ -1640,7 +1640,7 @@ Slice::Python::CodeVisitor::visitInterfaceDefStart(const InterfaceDefPtr& p)
         out << ", " << contextParamName << ": dict[str, str] | None = None)"
             << operationReturnTypeHint(operation, MethodKind::SyncInvocation) << ":";
         out.inc();
-        writeDocstring(operation, MethodKind::SyncInvocation, out);
+        writeOpDocstring(operation, MethodKind::SyncInvocation, out);
         out << nl << "return " << className << "._op_" << opName << ".invoke(self, ((" << inParams;
         if (!inParams.empty() && inParams.find(',') == string::npos)
         {
@@ -1659,7 +1659,7 @@ Slice::Python::CodeVisitor::visitInterfaceDefStart(const InterfaceDefPtr& p)
         out << ", " << contextParamName << ": dict[str, str] | None = None)"
             << operationReturnTypeHint(operation, MethodKind::AsyncInvocation) << ":";
         out.inc();
-        writeDocstring(operation, MethodKind::AsyncInvocation, out);
+        writeOpDocstring(operation, MethodKind::AsyncInvocation, out);
         out << nl << "return " << className << "._op_" << opName << ".invokeAsync(self, ((" << inParams;
         if (!inParams.empty() && inParams.find(',') == string::npos)
         {
@@ -1989,12 +1989,13 @@ Slice::Python::CodeVisitor::visitEnum(const EnumPtr& p)
     out << nl << "class " << name << "(" << getImportAlias(p, "enum", "Enum") << "):";
     out.inc();
 
-    writeDocstring(p, out);
+    writeDocstring(p, out, "enum class");
 
-    out << nl;
     for (const auto& enumerator : enumerators)
     {
+        out << sp;
         out << nl << enumerator->mappedName() << " = " << enumerator->value();
+        writeEnumeratorDocstring(enumerator, out);
     }
 
     out.dec();
@@ -2029,11 +2030,13 @@ Slice::Python::CodeVisitor::visitEnum(const EnumPtr& p)
 void
 Slice::Python::CodeVisitor::visitConst(const ConstPtr& p)
 {
-    string name = p->mappedName();
     BufferedOutput out;
     out << sp;
+
+    string name = p->mappedName();
     out << nl << name << " = ";
     writeConstantValue(p, p->type(), p->valueType(), p->value(), out);
+    writeDocstring(p, out, "constant");
 
     out << sp;
     out << nl << "__all__ = [\"" << name << "\"]";
@@ -2276,7 +2279,7 @@ Slice::Python::CodeVisitor::writeSeeAlso(const StringList& seeAlso, bool needsNe
 }
 
 void
-Slice::Python::CodeVisitor::writeDocstring(const ContainedPtr& p, Output& out, const optional<string>& generatedType)
+Slice::Python::CodeVisitor::writeDocstring(const ContainedPtr& p, Output& out, const string& generatedType)
 {
     const optional<DocComment>& comment = p->docComment();
 
@@ -2308,36 +2311,29 @@ Slice::Python::CodeVisitor::writeDocstring(const ContainedPtr& p, Output& out, c
         }
     }
 
-    if (!comment && !generatedType && fieldDocs.empty())
-    {
-        return;
-    }
-
-    out << nl << tripleQuotes;
-
     StringList overview;
     StringList remarks;
     StringList seeAlso;
     if (comment)
     {
         overview = comment->overview();
-        for (const auto& line : overview)
-        {
-            out << nl << line;
-        }
         remarks = comment->remarks();
         seeAlso = comment->seeAlso();
     }
 
-    if (generatedType)
+    if (!remarks.empty())
     {
-        if (!remarks.empty())
-        {
-            remarks.emplace_back(""); // empty line
-        }
-        remarks.push_back(
-            "The Slice compiler generated this " + *generatedType + " from Slice " + p->kindOf() + " ``" + p->scoped() +
-            "``.");
+        remarks.emplace_back(""); // empty line
+    }
+    remarks.push_back(
+        "The Slice compiler generated this " + generatedType + " from Slice " + p->kindOf() + " ``" + p->scoped() +
+        "``.");
+
+    out << nl << tripleQuotes;
+
+    for (const auto& line : overview)
+    {
+        out << nl << line;
     }
 
     // Only emit Attributes if there's a docstring for at least one field.
@@ -2365,84 +2361,36 @@ Slice::Python::CodeVisitor::writeDocstring(const ContainedPtr& p, Output& out, c
     }
 
     writeRemarksDocComment(remarks, !overview.empty() || !fieldDocs.empty(), out);
-    writeSeeAlso(seeAlso, !overview.empty() || !fieldDocs.empty() || !remarks.empty(), out);
+    writeSeeAlso(seeAlso, true, out); // Always add a newline because 'remarks' is always present.
     out << nl << tripleQuotes;
 }
 
 void
-Slice::Python::CodeVisitor::writeDocstring(const EnumPtr& p, Output& out)
+Slice::Python::CodeVisitor::writeEnumeratorDocstring(const EnumeratorPtr& p, Output& out)
 {
     const optional<DocComment>& comment = p->docComment();
-
-    // Collect docstrings (if any) for the enumerators.
-    const EnumeratorList& enumerators = p->enumerators();
-    map<string, list<string>> docs;
-    for (const auto& enumerator : enumerators)
-    {
-        if (const auto& enumeratorDoc = enumerator->docComment())
-        {
-            const StringList& enumeratorOverview = enumeratorDoc->overview();
-            if (!enumeratorOverview.empty())
-            {
-                docs[enumerator->name()] = enumeratorOverview;
-            }
-        }
-    }
-
-    StringList overview;
-    StringList remarks;
-    StringList seeAlso;
-
-    if (comment)
-    {
-        overview = comment->overview();
-        remarks = comment->remarks();
-        seeAlso = comment->seeAlso();
-    }
-    if (!remarks.empty())
+    if (!comment)
     {
-        remarks.emplace_back(""); // empty line
+        return;
     }
-    remarks.push_back(
-        "The Slice compiler generated this enum class from Slice " + p->kindOf() + " ``" + p->scoped() + "``.");
 
     out << nl << tripleQuotes;
 
+    StringList overview = comment->overview();
+    StringList remarks = comment->remarks();
+    StringList seeAlso = comment->seeAlso();
+
     for (const auto& line : overview)
     {
         out << nl << line;
     }
-
-    // Only emit enumerators if there's a docstring for at least one enumerator.
-    if (!docs.empty())
-    {
-        if (!overview.empty())
-        {
-            out << nl;
-        }
-        out << nl << "Enumerators:";
-        for (const auto& enumerator : enumerators)
-        {
-            out << nl << nl << "- " << enumerator->mappedName();
-            auto q = docs.find(enumerator->name());
-            if (q != docs.end())
-            {
-                out << ":"; // Only emit a trailing ':' if there's documentation to emit for it.
-                for (const auto& line : q->second)
-                {
-                    out << nl << "    " << line;
-                }
-            }
-        }
-    }
-
-    writeRemarksDocComment(remarks, !overview.empty() || !docs.empty(), out);
-    writeSeeAlso(seeAlso, !overview.empty() || !docs.empty() || !remarks.empty(), out);
+    writeRemarksDocComment(remarks, !overview.empty(), out);
+    writeSeeAlso(seeAlso, !overview.empty() || !remarks.empty(), out);
     out << nl << tripleQuotes;
 }
 
 void
-Slice::Python::CodeVisitor::writeDocstring(const OperationPtr& op, MethodKind methodKind, Output& out)
+Slice::Python::CodeVisitor::writeOpDocstring(const OperationPtr& op, MethodKind methodKind, Output& out)
 {
     const optional<DocComment>& comment = op->docComment();
     if (!comment)

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/cpp/src/slice2py/PythonUtil.h

@@ -456,14 +456,11 @@ namespace Slice::Python
         /// Writes the provided @p seeAlso in its own subheading in the current comment (if @p seeAlso is non-empty).
         void writeSeeAlso(const StringList& seeAlso, bool needsNewline, IceInternal::Output& out);
 
-        void writeDocstring(
-            const ContainedPtr& p,
-            IceInternal::Output& out,
-            const std::optional<std::string>& generatedType = std::nullopt);
+        void writeDocstring(const ContainedPtr& p, IceInternal::Output& out, const std::string& generatedType);
 
-        void writeDocstring(const EnumPtr&, IceInternal::Output&);
+        void writeEnumeratorDocstring(const EnumeratorPtr& p, IceInternal::Output& out);
 
-        void writeDocstring(const OperationPtr&, MethodKind, IceInternal::Output&);
+        void writeOpDocstring(const OperationPtr&, MethodKind, IceInternal::Output&);
 
         std::string getImportAlias(const ContainedPtr& source, const SyntaxTreeBasePtr& definition);
         std::string

{zeroc_ice-3.8.0 → zeroc_ice-3.8.0.post1}/dist/ice/python/modules/IcePy/Connection.cpp

@@ -85,20 +85,23 @@ Ice.ObjectPrx
 
 Disables the inactivity check on this connection.
 
-By default, Ice will close connections that remain idle for a
-certain period. This method disables that behavior for this connection.)";
+By default, Ice will close connections that remain inactive for a certain period.
+This function disables that behavior for this connection.)";
 
     constexpr const char* connectionSetAdapter_doc = R"(setAdapter(adapter: Ice.ObjectAdapter | None) -> None
 
 Associates an object adapter with this connection.
 
-When a connection receives a request, it dispatches this request using
-its associated object adapter. If the associated object adapter is None,
-the connection rejects any incoming request with an ObjectNotExistException.
+When a connection receives a request, it dispatches this request using its associated object adapter.
+If the associated object adapter is ``None``, the connection rejects any incoming request with an
+:class:`ObjectNotExistException`.
+
+The default object adapter of an incoming connection is the object adapter that created this connection;
+the default object adapter of an outgoing connection is the communicator's default object adapter.
 
 Parameters
 ----------
-adapter : Ice.ObjectAdapter or None
+adapter : Ice.ObjectAdapter | None
     The object adapter to associate with this connection.)";
 
     constexpr const char* connectionGetAdapter_doc = R"(getAdapter() -> Ice.ObjectAdapter | None
@@ -107,35 +110,31 @@ Gets the object adapter associated with this connection.
 
 Returns
 -------
-Ice.ObjectAdapter or None
+Ice.ObjectAdapter | None
     The object adapter associated with this connection.)";
 
     constexpr const char* connectionFlushBatchRequests_doc = R"(flushBatchRequests(compress: Ice.CompressBatch) -> None
 
 Flushes any pending batch requests for this connection.
 
-This corresponds to all batch requests invoked on fixed proxies
-associated with the connection.
+This corresponds to all batch requests invoked on fixed proxies associated with the connection.
 
 Parameters
 ----------
 compress : Ice.CompressBatch
-    Specifies whether or not the queued batch requests should be
-    compressed before being sent over the wire.)";
+    Specifies whether or not the queued batch requests should be compressed before being sent over the wire.)";
 
     constexpr const char* connectionFlushBatchRequestsAsync_doc =
         R"(flushBatchRequestsAsync(compress: Ice.CompressBatch) -> Awaitable[None]
 
 Flushes any pending batch requests for this connection asynchronously.
 
-This corresponds to all batch requests invoked on fixed proxies
-associated with the connection.
+This corresponds to all batch requests invoked on fixed proxies associated with the connection.
 
 Parameters
 ----------
 compress : Ice.CompressBatch
-    Specifies whether or not the queued batch requests should be
-    compressed before being sent over the wire.
+    Specifies whether or not the queued batch requests should be compressed before being sent over the wire.
 
 Returns
 -------
@@ -145,21 +144,17 @@ Awaitable[None]
     constexpr const char* connectionSetCloseCallback_doc =
         R"(setCloseCallback(callback: Callable[[Connection], None]) -> None
 
-Sets a close callback on the connection.
-
-The callback is called by the connection when it's closed. The callback
-is called from the Ice thread pool associated with the connection.
+Sets a close callback on the connection. The callback is called by the connection when it's closed.
+The callback is called from the Ice thread pool associated with the connection.
 
 Parameters
 ----------
-callback : Callable
-    The close callback function.)";
+callback : Callable[[Connection], None]
+    The close callback callable.)";
 
     constexpr const char* connectionType_doc = R"(type() -> str
 
-Returns the connection type.
-
-This corresponds to the endpoint type, such as 'tcp', 'udp', etc.
+Returns the connection type. This corresponds to the endpoint type, such as 'tcp', 'udp', etc.
 
 Returns
 -------
@@ -168,10 +163,11 @@ str
 
     constexpr const char* connectionToString_doc = R"(toString() -> str
 
-Returns a description of the connection as human readable text.
+Returns a description of the connection as human readable text, suitable for logging or error messages.
 
-This function is suitable for logging or error messages and remains
-usable after the connection is closed or aborted.
+Notes
+-----
+This function remains usable after the connection is closed or aborted.
 
 Returns
 -------
@@ -209,12 +205,10 @@ sndSize : int
 
     constexpr const char* connectionThrowException_doc = R"(throwException() -> None
 
-Throws an exception that provides the reason for the closure of this connection.
-
-For example, this function throws CloseConnectionException when the connection
-was closed gracefully by the peer; it throws ConnectionAbortedException when
-the connection is aborted. This function does nothing if the connection is
-not yet closed.)";
+Raises an exception that provides the reason for the closure of this connection. For example,
+this function raises :class:`CloseConnectionException` when the connection was closed gracefully by the peer;
+it raises :class:`ConnectionAbortedException` when the connection is aborted with :func:`abort`.
+This function does nothing if the connection is not yet closed.)";
 }
 
 namespace IcePy