From ad66253854a4425dee0ebe51519e4ff79af3a662 Mon Sep 17 00:00:00 2001
From: David Belais <david@belais.me>
Date: Mon, 11 May 2026 15:54:27 -0700
Subject: [PATCH] *

---
 pyproject.toml                 | 10 +++++-----
 scripts/remodel.py             |  4 +++-
 src/oapi/_multipart_request.py |  1 +
 src/oapi/client.py             |  4 +++-
 src/oapi/model.py              |  4 ++--
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 5d8c0d1..61d52e6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "oapi"
-version = "2.8.6"
+version = "2.8.7"
 description = "A library for generating web API clients from OpenAPI documents"
 readme = "README.md"
 license = "MIT"
@@ -66,7 +66,7 @@ python = "3.10"
 dependencies = [
     "pytest",
     "mypy",
-    "dependence~=1.2",
+    "dependence~=1.4",
     "gittable~=0.2",
     "pyyaml>2",
     "types-PyYAML",
@@ -83,7 +83,7 @@ features = [
 
 [tool.hatch.envs.hatch-static-analysis]
 extra-dependencies = [
-    "dependence~=1.2",
+    "dependence~=1.4",
 ]
 
 [tool.hatch.envs.docs]
@@ -93,12 +93,12 @@ dependencies = [
     "mkdocs-material",
     "mkdocstrings[python]",
     "black",
-    "dependence~=1.2",
+    "dependence~=1.4",
 ]
 
 [tool.hatch.envs.hatch-test]
 extra-dependencies = [
-    "dependence~=1.2",
+    "dependence~=1.4",
     "pyyaml>2",
 ]
 extra-args = [
diff --git a/scripts/remodel.py b/scripts/remodel.py
index 1d9ac13..d3fa61a 100644
--- a/scripts/remodel.py
+++ b/scripts/remodel.py
@@ -56,7 +56,9 @@ def get_name_metadata(
             meta,
             "\n".join(
                 line.removeprefix("    ")
-                for line in (item[1].__doc__ or "").strip().split("\n")
+                for line in re.split(
+                    r"(?:\r\n|\r|\n)", (item[1].__doc__ or "").strip()
+                )
             ),
             sob.utilities.get_source(item[1])
             .partition("super().__init__(_data)")[2]
diff --git a/src/oapi/_multipart_request.py b/src/oapi/_multipart_request.py
index 574471b..1c743d5 100644
--- a/src/oapi/_multipart_request.py
+++ b/src/oapi/_multipart_request.py
@@ -274,6 +274,7 @@ def __str__(self) -> str:
             repr(bytes(self))[2:-1]
             .replace("\\r\\n", "\r\n")
             .replace("\\n", "\n")
+            .replace("\\r", "\r")
         )
 
 
diff --git a/src/oapi/client.py b/src/oapi/client.py
index 7a81d9b..838acdd 100644
--- a/src/oapi/client.py
+++ b/src/oapi/client.py
@@ -3354,7 +3354,9 @@ def _iter_operation_method_docstring(
                 parameter_docstring: str
                 if parameter.description:
                     description: str = re.sub(
-                        r"\n[\s\n]*\n+", "\n", parameter.description.strip()
+                        r"(?:\s*(?:\r\n|\r|\n)\s*)+",
+                        " ",
+                        parameter.description.strip(),
                     )
                     parameter_docstring = (
                         sob.utilities.split_long_docstring_lines(
diff --git a/src/oapi/model.py b/src/oapi/model.py
index 16e5ab2..5e6497d 100644
--- a/src/oapi/model.py
+++ b/src/oapi/model.py
@@ -1274,8 +1274,8 @@ def get_docstring(self, schema: Schema | Parameter | Items) -> str | None:
                 property_docstring: str
                 if property_schema.description:
                     description: str = re.sub(
-                        r"\n[\s\n]*\n+",
-                        "\n",
+                        r"(?:\s*(?:\r\n|\r|\n)\s*)+",
+                        " ",
                         property_schema.description.strip(),
                     )
                     property_docstring = (