diff --git a/source/blender/freestyle/intern/python/BPy_BBox.cpp b/source/blender/freestyle/intern/python/BPy_BBox.cpp
index dcd710e223e..ad9199314a8 100644
--- a/source/blender/freestyle/intern/python/BPy_BBox.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BBox.cpp
@@ -37,8 +37,7 @@ PyDoc_STRVAR(
     "\n"
     ".. method:: __init__()\n"
     "\n"
-    "   Default constructor.");
-
+    "   Default constructor.\n");
 static int BBox_init(BPy_BBox *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
index 9d9ad3b1e2e..fdcaa74c618 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
@@ -56,7 +56,6 @@ PyDoc_STRVAR(
     "   :type inter2: :class:`Interface0D`\n"
     "   :return: True or false.\n"
     "   :rtype: bool\n");
-
 static int BinaryPredicate0D___init__(BPy_BinaryPredicate0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
@@ -114,8 +113,7 @@ PyDoc_STRVAR(
     BinaryPredicate0D_name_doc,
     "The name of the binary 0D predicate.\n"
     "\n"
-    ":type: str");
-
+    ":type: str\n");
 static PyObject *BinaryPredicate0D_name_get(BPy_BinaryPredicate0D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
index 10a7243dce6..bc25c518129 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
@@ -88,7 +88,6 @@ PyDoc_STRVAR(
     "   :type inter2: :class:`Interface1D`\n"
     "   :return: True or false.\n"
     "   :rtype: bool\n");
-
 static int BinaryPredicate1D___init__(BPy_BinaryPredicate1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
@@ -145,8 +144,7 @@ PyDoc_STRVAR(
     BinaryPredicate1D_name_doc,
     "The name of the binary 1D predicate.\n"
     "\n"
-    ":type: str");
-
+    ":type: str\n");
 static PyObject *BinaryPredicate1D_name_get(BPy_BinaryPredicate1D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
diff --git a/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp b/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp
index 08a23e29d80..f0702ad2a9d 100644
--- a/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp
+++ b/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp
@@ -28,7 +28,6 @@ PyDoc_STRVAR(
     "\n"
     "   :return: The system time stamp.\n"
     "   :rtype: int\n");
-
 static PyObject *ContextFunctions_get_time_stamp(PyObject * /*self*/)
 {
   return PyLong_FromLong(ContextFunctions::GetTimeStampCF());
@@ -43,7 +42,6 @@ PyDoc_STRVAR(
     "\n"
     "   :return: The canvas width.\n"
     "   :rtype: int\n");
-
 static PyObject *ContextFunctions_get_canvas_width(PyObject * /*self*/)
 {
   return PyLong_FromLong(ContextFunctions::GetCanvasWidthCF());
@@ -58,7 +56,6 @@ PyDoc_STRVAR(
     "\n"
     "   :return: The canvas height.\n"
     "   :rtype: int\n");
-
 static PyObject *ContextFunctions_get_canvas_height(PyObject * /*self*/)
 {
   return PyLong_FromLong(ContextFunctions::GetCanvasHeightCF());
@@ -73,7 +70,6 @@ PyDoc_STRVAR(
     "\n"
     "   :return: A tuple of 4 numbers (xmin, ymin, xmax, ymax).\n"
     "   :rtype: tuple[int, int, int, int]\n");
-
 static PyObject *ContextFunctions_get_border(PyObject * /*self*/)
 {
   BBox<Vec2i> border(ContextFunctions::GetBorderCF());
@@ -103,7 +99,6 @@ PyDoc_STRVAR(
     "   :type num_levels: int\n"
     "   :arg sigma: The sigma value of the gaussian function.\n"
     "   :type sigma: float\n");
-
 static PyObject *ContextFunctions_load_map(PyObject * /*self*/, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"file_name", "map_name", "num_levels", "sigma", nullptr};
@@ -140,7 +135,6 @@ PyDoc_STRVAR(
     "   :type y: int\n"
     "   :return: The floating-point value stored for that pixel.\n"
     "   :rtype: float\n");
-
 static PyObject *ContextFunctions_read_map_pixel(PyObject * /*self*/,
                                                  PyObject *args,
                                                  PyObject *kwds)
@@ -175,7 +169,6 @@ PyDoc_STRVAR(
     "   :type y: int\n"
     "   :return: The floating-point value stored for that pixel.\n"
     "   :rtype: float\n");
-
 static PyObject *ContextFunctions_read_complete_view_map_pixel(PyObject * /*self*/,
                                                                PyObject *args,
                                                                PyObject *kwds)
@@ -211,7 +204,6 @@ PyDoc_STRVAR(
     "   :type y: int\n"
     "   :return: The floating-point value stored for that pixel.\n"
     "   :rtype: float\n");
-
 static PyObject *ContextFunctions_read_directional_view_map_pixel(PyObject * /*self*/,
                                                                   PyObject *args,
                                                                   PyObject *kwds)
@@ -238,7 +230,6 @@ PyDoc_STRVAR(
     "\n"
     "   :return: The selected FEdge.\n"
     "   :rtype: :class:`FEdge`\n");
-
 static PyObject *ContextFunctions_get_selected_fedge(PyObject * /*self*/)
 {
   FEdge *fe = ContextFunctions::GetSelectedFEdgeCF();
@@ -255,7 +246,6 @@ PyDoc_STRVAR(
     module_docstring,
     "The Blender Freestyle.ContextFunctions submodule\n"
     "\n");
-
 /*-----------------------ContextFunctions module functions definitions-------------------*/
 
 #ifdef __GNUC__
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index 680cc6c86d0..e5060e07b06 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -59,7 +59,6 @@ PyDoc_STRVAR(
     "\n"
     "   :return: The current scene.\n"
     "   :rtype: :class:`bpy.types.Scene`\n");
-
 static PyObject *Freestyle_getCurrentScene(PyObject * /*self*/)
 {
   Scene *scene = g_freestyle.scene;
@@ -152,7 +151,6 @@ PyDoc_STRVAR(
     "   :type color2: :class:`mathutils.Vector` | tuple[float, float, float] | list[float]\n"
     "   :return: Blended color in RGB format.\n"
     "   :rtype: :class:`mathutils.Vector`\n");
-
 static PyObject *Freestyle_blendRamp(PyObject * /*self*/, PyObject *args)
 {
   PyObject *obj1, *obj2;
@@ -203,7 +201,6 @@ PyDoc_STRVAR(
     "   :type in: float\n"
     "   :return: color in RGBA format.\n"
     "   :rtype: :class:`mathutils.Vector`\n");
-
 static PyObject *Freestyle_evaluateColorRamp(PyObject * /*self*/, PyObject *args)
 {
   BPy_StructRNA *py_srna;
@@ -242,7 +239,6 @@ PyDoc_STRVAR(
     "   :type value: float\n"
     "   :return: Mapped output value.\n"
     "   :rtype: float\n");
-
 static PyObject *Freestyle_evaluateCurveMappingF(PyObject * /*self*/, PyObject *args)
 {
   BPy_StructRNA *py_srna;
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
index e4a4d960e1f..c6509eb2fa9 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
@@ -66,8 +66,7 @@ PyDoc_STRVAR(
     "   :arg shininess: The shininess coefficient.\n"
     "   :type shininess: float\n"
     "   :arg priority: The line color priority.\n"
-    "   :type priority: int");
-
+    "   :type priority: int\n");
 static int FrsMaterial_init(BPy_FrsMaterial *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"brother", nullptr};
@@ -305,8 +304,7 @@ PyDoc_STRVAR(
     FrsMaterial_line_doc,
     "RGBA components of the line color of the material.\n"
     "\n"
-    ":type: :class:`mathutils.Vector`");
-
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *FrsMaterial_line_get(BPy_FrsMaterial *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
@@ -328,8 +326,7 @@ PyDoc_STRVAR(
     FrsMaterial_diffuse_doc,
     "RGBA components of the diffuse color of the material.\n"
     "\n"
-    ":type: :class:`mathutils.Vector`");
-
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *FrsMaterial_diffuse_get(BPy_FrsMaterial *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
@@ -351,8 +348,7 @@ PyDoc_STRVAR(
     FrsMaterial_specular_doc,
     "RGBA components of the specular color of the material.\n"
     "\n"
-    ":type: :class:`mathutils.Vector`");
-
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *FrsMaterial_specular_get(BPy_FrsMaterial *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
@@ -374,8 +370,7 @@ PyDoc_STRVAR(
     FrsMaterial_ambient_doc,
     "RGBA components of the ambient color of the material.\n"
     "\n"
-    ":type: :class:`mathutils.Color`");
-
+    ":type: :class:`mathutils.Color`\n");
 static PyObject *FrsMaterial_ambient_get(BPy_FrsMaterial *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
@@ -397,8 +392,7 @@ PyDoc_STRVAR(
     FrsMaterial_emission_doc,
     "RGBA components of the emissive color of the material.\n"
     "\n"
-    ":type: :class:`mathutils.Color`");
-
+    ":type: :class:`mathutils.Color`\n");
 static PyObject *FrsMaterial_emission_get(BPy_FrsMaterial *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
@@ -420,8 +414,7 @@ PyDoc_STRVAR(
     FrsMaterial_shininess_doc,
     "Shininess coefficient of the material.\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *FrsMaterial_shininess_get(BPy_FrsMaterial *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->m->shininess());
@@ -444,8 +437,7 @@ PyDoc_STRVAR(
     FrsMaterial_priority_doc,
     "Line color priority of the material.\n"
     "\n"
-    ":type: int");
-
+    ":type: int\n");
 static PyObject *FrsMaterial_priority_get(BPy_FrsMaterial *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->m->priority());
diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
index b2e3d4e9646..5b75443af2f 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
@@ -48,8 +48,7 @@ PyDoc_STRVAR(
     "   otherwise, time is used as a seed.\n"
     "\n"
     "   :arg seed: Seed for random number generation.\n"
-    "   :type seed: int");
-
+    "   :type seed: int\n");
 static int FrsNoise_init(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"seed", nullptr};
@@ -91,8 +90,7 @@ PyDoc_STRVAR(
     "   :arg oct: Number of octaves.\n"
     "   :type oct: int\n"
     "   :return: A noise value.\n"
-    "   :rtype: float");
-
+    "   :rtype: float\n");
 static PyObject *FrsNoise_drand(BPy_FrsNoise * /*self*/, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"seed", nullptr};
@@ -148,8 +146,7 @@ PyDoc_STRVAR(
     "   :arg oct: Number of octaves.\n"
     "   :type oct: int\n"
     "   :return: A noise value.\n"
-    "   :rtype: float");
-
+    "   :rtype: float\n");
 static PyObject *FrsNoise_turbulence2(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"v", "freq", "amp", "oct", nullptr};
@@ -186,8 +183,7 @@ PyDoc_STRVAR(
     "   :arg oct: Number of octaves.\n"
     "   :type oct: int\n"
     "   :return: A noise value.\n"
-    "   :rtype: float");
-
+    "   :rtype: float\n");
 static PyObject *FrsNoise_turbulence3(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"v", "freq", "amp", "oct", nullptr};
@@ -218,8 +214,7 @@ PyDoc_STRVAR(
     "   :arg v: One-dimensional sample point.\n"
     "   :type v: float\n"
     "   :return: A smooth noise value.\n"
-    "   :rtype: float");
-
+    "   :rtype: float\n");
 static PyObject *FrsNoise_smoothNoise1(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"v", nullptr};
@@ -241,8 +236,7 @@ PyDoc_STRVAR(
     "   :arg v: Two-dimensional sample point.\n"
     "   :type v: :class:`mathutils.Vector` | tuple[float, float] | list[float]\n"
     "   :return: A smooth noise value.\n"
-    "   :rtype: float");
-
+    "   :rtype: float\n");
 static PyObject *FrsNoise_smoothNoise2(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"v", nullptr};
@@ -271,8 +265,7 @@ PyDoc_STRVAR(
     "   :arg v: Three-dimensional sample point.\n"
     "   :type v: :class:`mathutils.Vector` | tuple[float, float, float] | list[float]\n"
     "   :return: A smooth noise value.\n"
-    "   :rtype: float");
-
+    "   :rtype: float\n");
 static PyObject *FrsNoise_smoothNoise3(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"v", nullptr};
diff --git a/source/blender/freestyle/intern/python/BPy_Id.cpp b/source/blender/freestyle/intern/python/BPy_Id.cpp
index 69845104268..2860d81dae6 100644
--- a/source/blender/freestyle/intern/python/BPy_Id.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Id.cpp
@@ -47,7 +47,6 @@ PyDoc_STRVAR(
     "   :type first: int\n"
     "   :arg second: The second number.\n"
     "   :type second: int\n");
-
 static int Id_init(BPy_Id *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"brother", nullptr};
@@ -108,8 +107,7 @@ PyDoc_STRVAR(
     Id_first_doc,
     "The first number constituting the Id.\n"
     "\n"
-    ":type: int");
-
+    ":type: int\n");
 static PyObject *Id_first_get(BPy_Id *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->id->getFirst());
@@ -131,8 +129,7 @@ PyDoc_STRVAR(
     Id_second_doc,
     "The second number constituting the Id.\n"
     "\n"
-    ":type: int");
-
+    ":type: int\n");
 static PyObject *Id_second_get(BPy_Id *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->id->getSecond());
diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
index 02e6ee763d5..16241e8c633 100644
--- a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
+++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
@@ -47,8 +47,7 @@ PyDoc_STRVAR(
     "      value type is float if func is of the :class:`UnaryFunction0DDouble`\n"
     "      or :class:`UnaryFunction0DFloat` type, and int if func is of the\n"
     "      :class:`UnaryFunction0DUnsigned` type.\n"
-    "   :rtype: int | float");
-
+    "   :rtype: int | float\n");
 static PyObject *Integrator_integrate(PyObject * /*self*/, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"func", "it", "it_end", "integration_type", nullptr};
@@ -165,8 +164,7 @@ PyDoc_STRVAR(
     "* IntegrationType.FIRST: The value computed for the 1D element is the\n"
     "  first of the values obtained for the 0D elements.\n"
     "* IntegrationType.LAST: The value computed for the 1D element is the\n"
-    "  last of the values obtained for the 0D elements.");
-
+    "  last of the values obtained for the 0D elements.\n");
 PyTypeObject IntegrationType_Type = {
     /*ob_base*/ PyVarObject_HEAD_INIT(nullptr, 0)
     /*tp_name*/ "IntegrationType",
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
index 8c62f24deb0..7ce221aa513 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
@@ -79,8 +79,7 @@ PyDoc_STRVAR(
     "\n"
     ".. method:: __init__()\n"
     "\n"
-    "   Default constructor.");
-
+    "   Default constructor.\n");
 static int Interface0D_init(BPy_Interface0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
@@ -118,8 +117,7 @@ PyDoc_STRVAR(
     "   :arg inter: A 0D element.\n"
     "   :type inter: :class:`Interface0D`\n"
     "   :return: The FEdge lying between the two 0D elements.\n"
-    "   :rtype: :class:`FEdge`");
-
+    "   :rtype: :class:`FEdge`\n");
 static PyObject *Interface0D_get_fedge(BPy_Interface0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"inter", nullptr};
@@ -172,8 +170,7 @@ PyDoc_STRVAR(
     Interface0D_name_doc,
     "The string of the name of this 0D element.\n"
     "\n"
-    ":type: str");
-
+    ":type: str\n");
 static PyObject *Interface0D_name_get(BPy_Interface0D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
@@ -184,8 +181,7 @@ PyDoc_STRVAR(
     Interface0D_point_3d_doc,
     "The 3D point of this 0D element.\n"
     "\n"
-    ":type: :class:`mathutils.Vector`");
-
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *Interface0D_point_3d_get(BPy_Interface0D *self, void * /*closure*/)
 {
   Vec3f p(self->if0D->getPoint3D());
@@ -200,8 +196,7 @@ PyDoc_STRVAR(
     Interface0D_projected_x_doc,
     "The X coordinate of the projected 3D point of this 0D element.\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *Interface0D_projected_x_get(BPy_Interface0D *self, void * /*closure*/)
 {
   real x = self->if0D->getProjectedX();
@@ -216,8 +211,7 @@ PyDoc_STRVAR(
     Interface0D_projected_y_doc,
     "The Y coordinate of the projected 3D point of this 0D element.\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *Interface0D_projected_y_get(BPy_Interface0D *self, void * /*closure*/)
 {
   real y = self->if0D->getProjectedY();
@@ -232,8 +226,7 @@ PyDoc_STRVAR(
     Interface0D_projected_z_doc,
     "The Z coordinate of the projected 3D point of this 0D element.\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *Interface0D_projected_z_get(BPy_Interface0D *self, void * /*closure*/)
 {
   real z = self->if0D->getProjectedZ();
@@ -248,8 +241,7 @@ PyDoc_STRVAR(
     Interface0D_point_2d_doc,
     "The 2D point of this 0D element.\n"
     "\n"
-    ":type: :class:`mathutils.Vector`");
-
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *Interface0D_point_2d_get(BPy_Interface0D *self, void * /*closure*/)
 {
   Vec2f p(self->if0D->getPoint2D());
@@ -264,8 +256,7 @@ PyDoc_STRVAR(
     Interface0D_id_doc,
     "The Id of this 0D element.\n"
     "\n"
-    ":type: :class:`Id`");
-
+    ":type: :class:`Id`\n");
 static PyObject *Interface0D_id_get(BPy_Interface0D *self, void * /*closure*/)
 {
   Id id(self->if0D->getId());
@@ -280,8 +271,7 @@ PyDoc_STRVAR(
     Interface0D_nature_doc,
     "The nature of this 0D element.\n"
     "\n"
-    ":type: :class:`Nature`");
-
+    ":type: :class:`Nature`\n");
 static PyObject *Interface0D_nature_get(BPy_Interface0D *self, void * /*closure*/)
 {
   Nature::VertexNature nature = self->if0D->getNature();
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index cb3b052fb0b..2cf6e769e12 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -92,8 +92,7 @@ PyDoc_STRVAR(
     "\n"
     ".. method:: __init__()\n"
     "\n"
-    "   Default constructor.");
-
+    "   Default constructor.\n");
 static int Interface1D_init(BPy_Interface1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
@@ -129,8 +128,7 @@ PyDoc_STRVAR(
     "   first vertex.\n"
     "\n"
     "   :return: An Interface0DIterator pointing to the first vertex.\n"
-    "   :rtype: :class:`Interface0DIterator`");
-
+    "   :rtype: :class:`Interface0DIterator`\n");
 static PyObject *Interface1D_vertices_begin(BPy_Interface1D *self)
 {
   Interface0DIterator if0D_it(self->if1D->verticesBegin());
@@ -146,8 +144,7 @@ PyDoc_STRVAR(
     "   the last vertex.\n"
     "\n"
     "   :return: An Interface0DIterator pointing after the last vertex.\n"
-    "   :rtype: :class:`Interface0DIterator`");
-
+    "   :rtype: :class:`Interface0DIterator`\n");
 static PyObject *Interface1D_vertices_end(BPy_Interface1D *self)
 {
   Interface0DIterator if0D_it(self->if1D->verticesEnd());
@@ -168,8 +165,7 @@ PyDoc_STRVAR(
     "      this 1D element.\n"
     "   :type t: float\n"
     "   :return: An Interface0DIterator pointing to the first point.\n"
-    "   :rtype: :class:`Interface0DIterator`");
-
+    "   :rtype: :class:`Interface0DIterator`\n");
 static PyObject *Interface1D_points_begin(BPy_Interface1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"t", nullptr};
@@ -196,8 +192,7 @@ PyDoc_STRVAR(
     "      this 1D element.\n"
     "   :type t: float\n"
     "   :return: An Interface0DIterator pointing after the last point.\n"
-    "   :rtype: :class:`Interface0DIterator`");
-
+    "   :rtype: :class:`Interface0DIterator`\n");
 static PyObject *Interface1D_points_end(BPy_Interface1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"t", nullptr};
@@ -255,8 +250,7 @@ PyDoc_STRVAR(
     Interface1D_name_doc,
     "The string of the name of the 1D element.\n"
     "\n"
-    ":type: str");
-
+    ":type: str\n");
 static PyObject *Interface1D_name_get(BPy_Interface1D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
@@ -267,8 +261,7 @@ PyDoc_STRVAR(
     Interface1D_id_doc,
     "The Id of this Interface1D.\n"
     "\n"
-    ":type: :class:`Id`");
-
+    ":type: :class:`Id`\n");
 static PyObject *Interface1D_id_get(BPy_Interface1D *self, void * /*closure*/)
 {
   Id id(self->if1D->getId());
@@ -283,8 +276,7 @@ PyDoc_STRVAR(
     Interface1D_nature_doc,
     "The nature of this Interface1D.\n"
     "\n"
-    ":type: :class:`Nature`");
-
+    ":type: :class:`Nature`\n");
 static PyObject *Interface1D_nature_get(BPy_Interface1D *self, void * /*closure*/)
 {
   Nature::VertexNature nature = self->if1D->getNature();
@@ -299,8 +291,7 @@ PyDoc_STRVAR(
     Interface1D_length_2d_doc,
     "The 2D length of this Interface1D.\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *Interface1D_length_2d_get(BPy_Interface1D *self, void * /*closure*/)
 {
   real length = self->if1D->getLength2D();
@@ -315,8 +306,7 @@ PyDoc_STRVAR(
     Interface1D_time_stamp_doc,
     "The time stamp of the 1D element, mainly used for selection.\n"
     "\n"
-    ":type: int");
-
+    ":type: int\n");
 static PyObject *Interface1D_time_stamp_get(BPy_Interface1D *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->if1D->getTimeStamp());
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
index fd6f777078f..4fc1958b978 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
@@ -101,8 +101,7 @@ PyDoc_STRVAR(
     "\n"
     ".. method:: __init__()\n"
     "\n"
-    "   Default constructor.");
-
+    "   Default constructor.\n");
 static int Iterator_init(BPy_Iterator *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
@@ -130,8 +129,7 @@ PyDoc_STRVAR(
     Iterator_increment_doc,
     ".. method:: increment()\n"
     "\n"
-    "   Makes the iterator point the next element.");
-
+    "   Makes the iterator point the next element.\n");
 static PyObject *Iterator_increment(BPy_Iterator *self)
 {
   if (self->it->isEnd()) {
@@ -147,8 +145,7 @@ PyDoc_STRVAR(
     Iterator_decrement_doc,
     ".. method:: decrement()\n"
     "\n"
-    "   Makes the iterator point the previous element.");
-
+    "   Makes the iterator point the previous element.\n");
 static PyObject *Iterator_decrement(BPy_Iterator *self)
 {
   if (self->it->isBegin()) {
@@ -190,8 +187,7 @@ PyDoc_STRVAR(
     Iterator_name_doc,
     "The string of the name of this iterator.\n"
     "\n"
-    ":type: str");
-
+    ":type: str\n");
 static PyObject *Iterator_name_get(BPy_Iterator *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
@@ -202,8 +198,7 @@ PyDoc_STRVAR(
     Iterator_is_begin_doc,
     "True if the iterator points to the first element.\n"
     "\n"
-    ":type: bool");
-
+    ":type: bool\n");
 static PyObject *Iterator_is_begin_get(BPy_Iterator *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->it->isBegin());
@@ -214,8 +209,7 @@ PyDoc_STRVAR(
     Iterator_is_end_doc,
     "True if the iterator points to the last element.\n"
     "\n"
-    ":type: bool");
-
+    ":type: bool\n");
 static PyObject *Iterator_is_end_get(BPy_Iterator *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->it->isEnd());
diff --git a/source/blender/freestyle/intern/python/BPy_MediumType.cpp b/source/blender/freestyle/intern/python/BPy_MediumType.cpp
index c26e4d2490e..83896353b64 100644
--- a/source/blender/freestyle/intern/python/BPy_MediumType.cpp
+++ b/source/blender/freestyle/intern/python/BPy_MediumType.cpp
@@ -26,8 +26,7 @@ PyDoc_STRVAR(
     "\n"
     "* Stroke.DRY_MEDIUM: To simulate a dry medium such as Pencil or Charcoal.\n"
     "* Stroke.HUMID_MEDIUM: To simulate ink painting (color subtraction blending).\n"
-    "* Stroke.OPAQUE_MEDIUM: To simulate an opaque medium (oil, spray...).");
-
+    "* Stroke.OPAQUE_MEDIUM: To simulate an opaque medium (oil, spray...).\n");
 PyTypeObject MediumType_Type = {
     /*ob_base*/ PyVarObject_HEAD_INIT(nullptr, 0)
     /*tp_name*/ "MediumType",
diff --git a/source/blender/freestyle/intern/python/BPy_Nature.cpp b/source/blender/freestyle/intern/python/BPy_Nature.cpp
index 9a130302817..f4a0e39adcc 100644
--- a/source/blender/freestyle/intern/python/BPy_Nature.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Nature.cpp
@@ -59,7 +59,7 @@ static PyNumberMethods nature_as_number = {
     /*nb_inplace_matrix_multiply*/ nullptr,
 };
 
-/*-----------------------BPy_Nature doc-string -----------------------------------*/
+/*-----------------------BPy_Nature type definition ------------------------------*/
 
 PyDoc_STRVAR(
     /* Wrap. */
@@ -88,10 +88,7 @@ PyDoc_STRVAR(
     "* Nature.VALLEY: True for valleys.\n"
     "* Nature.SUGGESTIVE_CONTOUR: True for suggestive contours.\n"
     "* Nature.MATERIAL_BOUNDARY: True for edges at material boundaries.\n"
-    "* Nature.EDGE_MARK: True for edges having user-defined edge marks.");
-
-/*-----------------------BPy_Nature type definition ------------------------------*/
-
+    "* Nature.EDGE_MARK: True for edges having user-defined edge marks.\n");
 PyTypeObject Nature_Type = {
     /*ob_base*/ PyVarObject_HEAD_INIT(nullptr, 0)
     /*tp_name*/ "Nature",
diff --git a/source/blender/freestyle/intern/python/BPy_Operators.cpp b/source/blender/freestyle/intern/python/BPy_Operators.cpp
index 96c9f9b4f36..6401decad4b 100644
--- a/source/blender/freestyle/intern/python/BPy_Operators.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Operators.cpp
@@ -49,8 +49,7 @@ PyDoc_STRVAR(
     "Class defining the operators used in a style module. There are five\n"
     "types of operators: Selection, chaining, splitting, sorting and\n"
     "creation. All these operators are user controlled through functors,\n"
-    "predicates and shaders that are taken as arguments.");
-
+    "predicates and shaders that are taken as arguments.\n");
 static void Operators_dealloc(BPy_Operators *self)
 {
   Py_TYPE(self)->tp_free((PyObject *)self);
@@ -65,8 +64,7 @@ PyDoc_STRVAR(
     "   condition.\n"
     "\n"
     "   :arg pred: The predicate expressing this condition.\n"
-    "   :type pred: :class:`UnaryPredicate1D`");
-
+    "   :type pred: :class:`UnaryPredicate1D`\n");
 static PyObject *Operators_select(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"pred", nullptr};
@@ -114,7 +112,6 @@ PyDoc_STRVAR(
     "      timestamp incrementation is a typical illustration of such a modifier).\n"
     "      If this argument is not given, the time stamp is automatically managed.\n"
     "   :type modifier: :class:`UnaryFunction1DVoid`\n");
-
 static PyObject *Operators_chain(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"it", "pred", "modifier", nullptr};
@@ -197,7 +194,6 @@ PyDoc_STRVAR(
     "      This parameter is optional, you make not want to pass a stopping criterion\n"
     "      when the stopping criterion is already contained in the iterator definition.\n"
     "   :type pred: :class:`UnaryPredicate1D`\n");
-
 static PyObject *Operators_bidirectional_chain(BPy_Operators * /*self*/,
                                                PyObject *args,
                                                PyObject *kwds)
@@ -281,7 +277,6 @@ PyDoc_STRVAR(
     "      a virtual point only progresses along the curve using this\n"
     "      resolution.)\n"
     "   :type sampling: float\n");
-
 static PyObject *Operators_sequential_split(BPy_Operators * /*self*/,
                                             PyObject *args,
                                             PyObject *kwds)
@@ -384,7 +379,6 @@ PyDoc_STRVAR(
     "      virtual point only progresses along the curve using this\n"
     "      resolution.)\n"
     "   :type sampling: float\n");
-
 static PyObject *Operators_recursive_split(BPy_Operators * /*self*/,
                                            PyObject *args,
                                            PyObject *kwds)
@@ -485,8 +479,7 @@ PyDoc_STRVAR(
     "   comparison predicate given as argument.\n"
     "\n"
     "   :arg pred: The binary predicate used for the comparison.\n"
-    "   :type pred: :class:`BinaryPredicate1D`");
-
+    "   :type pred: :class:`BinaryPredicate1D`\n");
 static PyObject *Operators_sort(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"pred", nullptr};
@@ -523,8 +516,7 @@ PyDoc_STRVAR(
     "      transform as a stroke.\n"
     "   :type pred: :class:`UnaryPredicate1D`\n"
     "   :arg shaders: The list of shaders used to shade the strokes.\n"
-    "   :type shaders: list[:class:`StrokeShader`]");
-
+    "   :type shaders: list[:class:`StrokeShader`]\n");
 static PyObject *Operators_create(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"pred", "shaders", nullptr};
@@ -579,7 +571,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg delete_strokes: Delete the strokes that are currently stored.\n"
     "   :type delete_strokes: bool\n");
-
 static PyObject *Operators_reset(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"delete_strokes", nullptr};
@@ -605,8 +596,7 @@ PyDoc_STRVAR(
     "   :arg i: index (0 <= i < Operators.get_view_edges_size()).\n"
     "   :type i: int\n"
     "   :return: The ViewEdge object.\n"
-    "   :rtype: :class:`ViewEdge`");
-
+    "   :rtype: :class:`ViewEdge`\n");
 static PyObject *Operators_get_viewedge_from_index(BPy_Operators * /*self*/,
                                                    PyObject *args,
                                                    PyObject *kwds)
@@ -634,8 +624,7 @@ PyDoc_STRVAR(
     "   :arg i: index (0 <= i < Operators.get_chains_size()).\n"
     "   :type i: int\n"
     "   :return: The Chain object.\n"
-    "   :rtype: :class:`Chain`");
-
+    "   :rtype: :class:`Chain`\n");
 static PyObject *Operators_get_chain_from_index(BPy_Operators * /*self*/,
                                                 PyObject *args,
                                                 PyObject *kwds)
@@ -663,8 +652,7 @@ PyDoc_STRVAR(
     "   :arg i: index (0 <= i < Operators.get_strokes_size()).\n"
     "   :type i: int\n"
     "   :return: The Stroke object.\n"
-    "   :rtype: :class:`Stroke`");
-
+    "   :rtype: :class:`Stroke`\n");
 static PyObject *Operators_get_stroke_from_index(BPy_Operators * /*self*/,
                                                  PyObject *args,
                                                  PyObject *kwds)
@@ -690,8 +678,7 @@ PyDoc_STRVAR(
     "   Returns the number of ViewEdges.\n"
     "\n"
     "   :return: The number of ViewEdges.\n"
-    "   :rtype: int");
-
+    "   :rtype: int\n");
 static PyObject *Operators_get_view_edges_size(BPy_Operators * /*self*/)
 {
   return PyLong_FromLong(Operators::getViewEdgesSize());
@@ -705,8 +692,7 @@ PyDoc_STRVAR(
     "   Returns the number of Chains.\n"
     "\n"
     "   :return: The number of Chains.\n"
-    "   :rtype: int");
-
+    "   :rtype: int\n");
 static PyObject *Operators_get_chains_size(BPy_Operators * /*self*/)
 {
   return PyLong_FromLong(Operators::getChainsSize());
@@ -720,8 +706,7 @@ PyDoc_STRVAR(
     "   Returns the number of Strokes.\n"
     "\n"
     "   :return: The number of Strokes.\n"
-    "   :rtype: int");
-
+    "   :rtype: int\n");
 static PyObject *Operators_get_strokes_size(BPy_Operators * /*self*/)
 {
   return PyLong_FromLong(Operators::getStrokesSize());
diff --git a/source/blender/freestyle/intern/python/BPy_SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp
index 35cb2814721..6d355809e76 100644
--- a/source/blender/freestyle/intern/python/BPy_SShape.cpp
+++ b/source/blender/freestyle/intern/python/BPy_SShape.cpp
@@ -51,8 +51,7 @@ PyDoc_STRVAR(
     "   Creates a :class:`SShape` class using either a default constructor or copy constructor.\n"
     "\n"
     "   :arg brother: An SShape object.\n"
-    "   :type brother: :class:`SShape`");
-
+    "   :type brother: :class:`SShape`\n");
 static int SShape_init(BPy_SShape *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"brother", nullptr};
@@ -113,8 +112,7 @@ PyDoc_STRVAR(
     "   attribute of the SVertex is also set to this SShape.\n"
     "\n"
     "   :arg vertex: An SVertex object.\n"
-    "   :type vertex: :class:`SVertex`");
-
+    "   :type vertex: :class:`SVertex`\n");
 static PyObject *SShape_add_vertex(BPy_SShape *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"edge", nullptr};
@@ -132,8 +130,7 @@ PyDoc_STRVAR(
     SShape_compute_bbox_doc,
     ".. method:: compute_bbox()\n"
     "\n"
-    "   Compute the bbox of the SShape.");
-
+    "   Compute the bbox of the SShape.\n");
 static PyObject *SShape_compute_bbox(BPy_SShape *self)
 {
   self->ss->ComputeBBox();
@@ -179,8 +176,7 @@ PyDoc_STRVAR(
     SShape_id_doc,
     "The Id of this SShape.\n"
     "\n"
-    ":type: :class:`Id`");
-
+    ":type: :class:`Id`\n");
 static PyObject *SShape_id_get(BPy_SShape *self, void * /*closure*/)
 {
   Id id(self->ss->getId());
@@ -202,8 +198,7 @@ PyDoc_STRVAR(
     SShape_name_doc,
     "The name of the SShape.\n"
     "\n"
-    ":type: str");
-
+    ":type: str\n");
 static PyObject *SShape_name_get(BPy_SShape *self, void * /*closure*/)
 {
   return PyC_UnicodeFromStdStr(self->ss->getName());
@@ -225,8 +220,7 @@ PyDoc_STRVAR(
     SShape_bbox_doc,
     "The bounding box of the SShape.\n"
     "\n"
-    ":type: :class:`BBox`");
-
+    ":type: :class:`BBox`\n");
 static PyObject *SShape_bbox_get(BPy_SShape *self, void * /*closure*/)
 {
   BBox<Vec3r> bb(self->ss->bbox());
@@ -248,8 +242,7 @@ PyDoc_STRVAR(
     SShape_vertices_doc,
     "The list of vertices constituting this SShape.\n"
     "\n"
-    ":type: List of :class:`SVertex`");
-
+    ":type: List of :class:`SVertex`\n");
 static PyObject *SShape_vertices_get(BPy_SShape *self, void * /*closure*/)
 {
 
@@ -270,8 +263,7 @@ PyDoc_STRVAR(
     SShape_edges_doc,
     "The list of edges constituting this SShape.\n"
     "\n"
-    ":type: List of :class:`FEdge`");
-
+    ":type: List of :class:`FEdge`\n");
 static PyObject *SShape_edges_get(BPy_SShape *self, void * /*closure*/)
 {
 
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
index bfaa7bf755f..797fd10cc2b 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
@@ -70,7 +70,6 @@ PyDoc_STRVAR(
     "   :type attribute2: :class:`StrokeAttribute`\n"
     "   :arg t: The interpolation parameter (0 <= t <= 1).\n"
     "   :type t: float\n");
-
 static int StrokeAttribute_init(BPy_StrokeAttribute *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"brother", nullptr};
@@ -155,7 +154,6 @@ PyDoc_STRVAR(
     "   :type name: str\n"
     "   :return: The attribute value.\n"
     "   :rtype: float\n");
-
 static PyObject *StrokeAttribute_get_attribute_real(BPy_StrokeAttribute *self,
                                                     PyObject *args,
                                                     PyObject *kwds)
@@ -181,7 +179,6 @@ PyDoc_STRVAR(
     "   :type name: str\n"
     "   :return: The attribute value.\n"
     "   :rtype: :class:`mathutils.Vector`\n");
-
 static PyObject *StrokeAttribute_get_attribute_vec2(BPy_StrokeAttribute *self,
                                                     PyObject *args,
                                                     PyObject *kwds)
@@ -207,7 +204,6 @@ PyDoc_STRVAR(
     "   :type name: str\n"
     "   :return: The attribute value.\n"
     "   :rtype: :class:`mathutils.Vector`\n");
-
 static PyObject *StrokeAttribute_get_attribute_vec3(BPy_StrokeAttribute *self,
                                                     PyObject *args,
                                                     PyObject *kwds)
@@ -233,7 +229,6 @@ PyDoc_STRVAR(
     "   :type name: str\n"
     "   :return: True if the attribute is available.\n"
     "   :rtype: bool\n");
-
 static PyObject *StrokeAttribute_has_attribute_real(BPy_StrokeAttribute *self,
                                                     PyObject *args,
                                                     PyObject *kwds)
@@ -259,7 +254,6 @@ PyDoc_STRVAR(
     "   :type name: str\n"
     "   :return: True if the attribute is available.\n"
     "   :rtype: bool\n");
-
 static PyObject *StrokeAttribute_has_attribute_vec2(BPy_StrokeAttribute *self,
                                                     PyObject *args,
                                                     PyObject *kwds)
@@ -285,7 +279,6 @@ PyDoc_STRVAR(
     "   :type name: str\n"
     "   :return: True if the attribute is available.\n"
     "   :rtype: bool\n");
-
 static PyObject *StrokeAttribute_has_attribute_vec3(BPy_StrokeAttribute *self,
                                                     PyObject *args,
                                                     PyObject *kwds)
@@ -312,7 +305,6 @@ PyDoc_STRVAR(
     "   :type name: str\n"
     "   :arg value: The attribute value.\n"
     "   :type value: float\n");
-
 static PyObject *StrokeAttribute_set_attribute_real(BPy_StrokeAttribute *self,
                                                     PyObject *args,
                                                     PyObject *kwds)
@@ -341,7 +333,6 @@ PyDoc_STRVAR(
     "   :type name: str\n"
     "   :arg value: The attribute value.\n"
     "   :type value: :class:`mathutils.Vector` | tuple[float, float, float] | list[float]\n");
-
 static PyObject *StrokeAttribute_set_attribute_vec2(BPy_StrokeAttribute *self,
                                                     PyObject *args,
                                                     PyObject *kwds)
@@ -376,7 +367,6 @@ PyDoc_STRVAR(
     "   :type name: str\n"
     "   :arg value: The attribute value as a 3D vector.\n"
     "   :type value: :class:`mathutils.Vector` | tuple[float, float, float] | list[float]\n");
-
 static PyObject *StrokeAttribute_set_attribute_vec3(BPy_StrokeAttribute *self,
                                                     PyObject *args,
                                                     PyObject *kwds)
@@ -587,8 +577,7 @@ PyDoc_STRVAR(
     StrokeAttribute_alpha_doc,
     "Alpha component of the stroke color.\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *StrokeAttribute_alpha_get(BPy_StrokeAttribute *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sa->getAlpha());
@@ -613,8 +602,7 @@ PyDoc_STRVAR(
     StrokeAttribute_color_doc,
     "RGB components of the stroke color.\n"
     "\n"
-    ":type: :class:`mathutils.Color`");
-
+    ":type: :class:`mathutils.Color`\n");
 static PyObject *StrokeAttribute_color_get(BPy_StrokeAttribute *self, void * /*closure*/)
 {
   return Color_CreatePyObject_cb(
@@ -640,8 +628,7 @@ PyDoc_STRVAR(
     "The right (left) component is the thickness on the right (left) of the vertex\n"
     "when following the stroke.\n"
     "\n"
-    ":type: :class:`mathutils.Vector`");
-
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *StrokeAttribute_thickness_get(BPy_StrokeAttribute *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
@@ -665,8 +652,7 @@ PyDoc_STRVAR(
     StrokeAttribute_visible_doc,
     "The visibility flag. True if the StrokeVertex is visible.\n"
     "\n"
-    ":type: bool");
-
+    ":type: bool\n");
 static PyObject *StrokeAttribute_visible_get(BPy_StrokeAttribute *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->sa->isVisible());
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
index bb34a15369a..873b12a9836 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
@@ -168,7 +168,6 @@ PyDoc_STRVAR(
     ".. method:: __init__()\n"
     "\n"
     "   Default constructor.\n");
-
 static int StrokeShader___init__(BPy_StrokeShader *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
@@ -201,7 +200,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`Stroke`\n");
-
 static PyObject *StrokeShader_shade(BPy_StrokeShader *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"stroke", nullptr};
@@ -258,8 +256,7 @@ PyDoc_STRVAR(
     StrokeShader_name_doc,
     "The name of the stroke shader.\n"
     "\n"
-    ":type: str");
-
+    ":type: str\n");
 static PyObject *StrokeShader_name_get(BPy_StrokeShader *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
index 4deaba611d8..4dab9a4f99b 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
@@ -72,7 +72,6 @@ PyDoc_STRVAR(
     "* :class:`UnaryFunction0DVec3f`\n"
     "* :class:`UnaryFunction0DVectorViewShape`\n"
     "* :class:`UnaryFunction0DViewShape`\n");
-
 static void UnaryFunction0D___dealloc__(BPy_UnaryFunction0D *self)
 {
   Py_TYPE(self)->tp_free((PyObject *)self);
@@ -90,8 +89,7 @@ PyDoc_STRVAR(
     UnaryFunction0D_name_doc,
     "The name of the unary 0D function.\n"
     "\n"
-    ":type: str");
-
+    ":type: str\n");
 static PyObject *UnaryFunction0D_name_get(BPy_UnaryFunction0D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
index 47aa221ccee..e7708483f6d 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
@@ -66,7 +66,6 @@ PyDoc_STRVAR(
     "* :class:`UnaryFunction1DVec3f`\n"
     "* :class:`UnaryFunction1DVectorViewShape`\n"
     "* :class:`UnaryFunction1DVoid`\n");
-
 static void UnaryFunction1D___dealloc__(BPy_UnaryFunction1D *self)
 {
   Py_TYPE(self)->tp_free((PyObject *)self);
@@ -84,8 +83,7 @@ PyDoc_STRVAR(
     UnaryFunction1D_name_doc,
     "The name of the unary 1D function.\n"
     "\n"
-    ":type: str");
-
+    ":type: str\n");
 static PyObject *UnaryFunction1D_name_get(BPy_UnaryFunction1D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
index 542485f3dc0..a5453b286a5 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
@@ -67,7 +67,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`Interface0DIterator`\n"
     "   :return: True if the condition is satisfied, false otherwise.\n"
     "   :rtype: bool\n");
-
 static int UnaryPredicate0D___init__(BPy_UnaryPredicate0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
@@ -132,8 +131,7 @@ PyDoc_STRVAR(
     UnaryPredicate0D_name_doc,
     "The name of the unary 0D predicate.\n"
     "\n"
-    ":type: str");
-
+    ":type: str\n");
 static PyObject *UnaryPredicate0D_name_get(BPy_UnaryPredicate0D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
index 8945c01cf10..9272c5e9e38 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
@@ -118,7 +118,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`Interface1D`\n"
     "   :return: True if the condition is satisfied, false otherwise.\n"
     "   :rtype: bool\n");
-
 static int UnaryPredicate1D___init__(BPy_UnaryPredicate1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
@@ -182,8 +181,7 @@ PyDoc_STRVAR(
     UnaryPredicate1D_name_doc,
     "The name of the unary 1D predicate.\n"
     "\n"
-    ":type: str");
-
+    ":type: str\n");
 static PyObject *UnaryPredicate1D_name_get(BPy_UnaryPredicate1D *self, void * /*closure*/)
 {
   return PyUnicode_FromString(Py_TYPE(self)->tp_name);
diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
index 1c88b0c1998..76bfa7a37db 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
+++ b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
@@ -41,8 +41,7 @@ PyDoc_STRVAR(
     "\n"
     ".. method:: __init__()\n"
     "\n"
-    "   Default constructor.");
-
+    "   Default constructor.\n");
 static int ViewMap_init(BPy_ViewMap *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
@@ -77,8 +76,7 @@ PyDoc_STRVAR(
     "   :arg y: Y coordinate of a 2D point.\n"
     "   :type y: float\n"
     "   :return: The ViewEdge nearest to the specified 2D point.\n"
-    "   :rtype: :class:`ViewEdge`");
-
+    "   :rtype: :class:`ViewEdge`\n");
 static PyObject *ViewMap_get_closest_viewedge(BPy_ViewMap *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"x", "y", nullptr};
@@ -106,8 +104,7 @@ PyDoc_STRVAR(
     "   :arg y: Y coordinate of a 2D point.\n"
     "   :type y: float\n"
     "   :return: The FEdge nearest to the specified 2D point.\n"
-    "   :rtype: :class:`FEdge`");
-
+    "   :rtype: :class:`FEdge`\n");
 static PyObject *ViewMap_get_closest_fedge(BPy_ViewMap *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"x", "y", nullptr};
@@ -162,8 +159,7 @@ PyDoc_STRVAR(
     ViewMap_scene_bbox_doc,
     "The 3D bounding box of the scene.\n"
     "\n"
-    ":type: :class:`BBox`");
-
+    ":type: :class:`BBox`\n");
 static PyObject *ViewMap_scene_bbox_get(BPy_ViewMap *self, void * /*closure*/)
 {
   return BPy_BBox_from_BBox(self->vm->getScene3dBBox());
diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
index 2b155382116..db56204e9f3 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
+++ b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
@@ -55,8 +55,7 @@ PyDoc_STRVAR(
     "   :arg brother: A ViewShape object.\n"
     "   :type brother: :class:`ViewShape`\n"
     "   :arg sshape: An SShape object.\n"
-    "   :type sshape: :class:`SShape`");
-
+    "   :type sshape: :class:`SShape`\n");
 static int ViewShape_init(BPy_ViewShape *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"brother", nullptr};
@@ -115,7 +114,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg edge: A ViewEdge object.\n"
     "   :type edge: :class:`ViewEdge`\n");
-
 static PyObject *ViewShape_add_edge(BPy_ViewShape *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"edge", nullptr};
@@ -136,8 +134,7 @@ PyDoc_STRVAR(
     "   Adds a ViewVertex to the list of the ViewVertex objects.\n"
     "\n"
     "   :arg vertex: A ViewVertex object.\n"
-    "   :type vertex: :class:`ViewVertex`");
-
+    "   :type vertex: :class:`ViewVertex`\n");
 static PyObject *ViewShape_add_vertex(BPy_ViewShape *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"vertex", nullptr};
@@ -189,8 +186,7 @@ PyDoc_STRVAR(
     ViewShape_sshape_doc,
     "The SShape on top of which this ViewShape is built.\n"
     "\n"
-    ":type: :class:`SShape`");
-
+    ":type: :class:`SShape`\n");
 static PyObject *ViewShape_sshape_get(BPy_ViewShape *self, void * /*closure*/)
 {
   SShape *ss = self->vs->sshape();
@@ -223,8 +219,7 @@ PyDoc_STRVAR(
     ViewShape_vertices_doc,
     "The list of ViewVertex objects contained in this ViewShape.\n"
     "\n"
-    ":type: List of :class:`ViewVertex`");
-
+    ":type: List of :class:`ViewVertex`\n");
 static PyObject *ViewShape_vertices_get(BPy_ViewShape *self, void * /*closure*/)
 {
   vector<ViewVertex *> vertices = self->vs->vertices();
@@ -268,8 +263,7 @@ PyDoc_STRVAR(
     ViewShape_edges_doc,
     "The list of ViewEdge objects contained in this ViewShape.\n"
     "\n"
-    ":type: List of :class:`ViewEdge`");
-
+    ":type: List of :class:`ViewEdge`\n");
 static PyObject *ViewShape_edges_get(BPy_ViewShape *self, void * /*closure*/)
 {
   vector<ViewEdge *> edges = self->vs->edges();
@@ -313,8 +307,7 @@ PyDoc_STRVAR(
     ViewShape_name_doc,
     "The name of the ViewShape.\n"
     "\n"
-    ":type: str");
-
+    ":type: str\n");
 static PyObject *ViewShape_name_get(BPy_ViewShape *self, void * /*closure*/)
 {
   return PyC_UnicodeFromStdStr(self->vs->getName());
@@ -325,8 +318,7 @@ PyDoc_STRVAR(
     ViewShape_library_path_doc,
     "The library path of the ViewShape.\n"
     "\n"
-    ":type: str, or None if the ViewShape is not part of a library");
-
+    ":type: str, or None if the ViewShape is not part of a library.\n");
 static PyObject *ViewShape_library_path_get(BPy_ViewShape *self, void * /*closure*/)
 {
   return PyC_UnicodeFromStdStr(self->vs->getLibraryPath());
@@ -337,8 +329,7 @@ PyDoc_STRVAR(
     ViewShape_id_doc,
     "The Id of this ViewShape.\n"
     "\n"
-    ":type: :class:`Id`");
-
+    ":type: :class:`Id`\n");
 static PyObject *ViewShape_id_get(BPy_ViewShape *self, void * /*closure*/)
 {
   Id id(self->vs->getId());
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
index a18ee9cd147..e78c0a92609 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
@@ -29,7 +29,6 @@ PyDoc_STRVAR(
     "   :type inter2: :class:`freestyle.types.Interface1D`\n"
     "   :return: False.\n"
     "   :rtype: bool\n");
-
 static int FalseBP1D___init__(BPy_FalseBP1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
index 163c6b50bbb..234b3711baa 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
@@ -30,7 +30,6 @@ PyDoc_STRVAR(
     "   :type inter2: :class:`freestyle.types.Interface1D`\n"
     "   :return: True or false.\n"
     "   :rtype: bool\n");
-
 static int Length2DBP1D___init__(BPy_Length2DBP1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
index e675b69d7f2..a53e0fd36d5 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
@@ -29,7 +29,6 @@ PyDoc_STRVAR(
     "   :type inter2: :class:`freestyle.types.Interface1D`\n"
     "   :return: True or false.\n"
     "   :rtype: bool\n");
-
 static int SameShapeIdBP1D___init__(BPy_SameShapeIdBP1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
index cc27bf641b3..c1347b03f88 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
@@ -29,7 +29,6 @@ PyDoc_STRVAR(
     "   :type inter2: :class:`freestyle.types.Interface1D`\n"
     "   :return: True.\n"
     "   :rtype: bool\n");
-
 static int TrueBP1D___init__(BPy_TrueBP1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
index c004d847d69..2f1154f5e52 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
@@ -52,7 +52,6 @@ PyDoc_STRVAR(
     "   :type inter2: :class:`freestyle.types.Interface1D`\n"
     "   :return: True or false.\n"
     "   :rtype: bool\n");
-
 static int ViewMapGradientNormBP1D___init__(BPy_ViewMapGradientNormBP1D *self,
                                             PyObject *args,
                                             PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
index 0f3f5c5ff58..e3b2d63a615 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
@@ -54,7 +54,6 @@ PyDoc_STRVAR(
     "   :arg t2d: A 2D interpolation parameter used to linearly interpolate\n"
     "             first_vertex and second_vertex or first_point and second_point.\n"
     "   :type t2d: float\n");
-
 static int CurvePoint_init(BPy_CurvePoint *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"brother", nullptr};
@@ -125,8 +124,7 @@ PyDoc_STRVAR(
     CurvePoint_first_svertex_doc,
     "The first SVertex upon which the CurvePoint is built.\n"
     "\n"
-    ":type: :class:`SVertex`");
-
+    ":type: :class:`SVertex`\n");
 static PyObject *CurvePoint_first_svertex_get(BPy_CurvePoint *self, void * /*closure*/)
 {
   SVertex *A = self->cp->A();
@@ -151,8 +149,7 @@ PyDoc_STRVAR(
     CurvePoint_second_svertex_doc,
     "The second SVertex upon which the CurvePoint is built.\n"
     "\n"
-    ":type: :class:`SVertex`");
-
+    ":type: :class:`SVertex`\n");
 static PyObject *CurvePoint_second_svertex_get(BPy_CurvePoint *self, void * /*closure*/)
 {
   SVertex *B = self->cp->B();
@@ -178,8 +175,7 @@ PyDoc_STRVAR(
     "Gets the FEdge for the two SVertices that given CurvePoints consists out of.\n"
     "A shortcut for CurvePoint.first_svertex.get_fedge(CurvePoint.second_svertex).\n"
     "\n"
-    ":type: :class:`FEdge`");
-
+    ":type: :class:`FEdge`\n");
 static PyObject *CurvePoint_fedge_get(BPy_CurvePoint *self, void * /*closure*/)
 {
   SVertex *A = self->cp->A();
@@ -196,8 +192,7 @@ PyDoc_STRVAR(
     CurvePoint_t2d_doc,
     "The 2D interpolation parameter.\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *CurvePoint_t2d_get(BPy_CurvePoint *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->cp->t2d());
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
index b960cff63fb..34464999583 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
@@ -40,8 +40,7 @@ PyDoc_STRVAR(
     "   :arg point_3d: A three-dimensional vector.\n"
     "   :type point_3d: :class:`mathutils.Vector`\n"
     "   :arg id: An Id object.\n"
-    "   :type id: :class:`Id`");
-
+    "   :type id: :class:`Id`\n");
 static int SVertex_init(BPy_SVertex *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"brother", nullptr};
@@ -82,8 +81,7 @@ PyDoc_STRVAR(
     "   is already in the set, nothing changes.\n"
     "\n"
     "   :arg normal: A three-dimensional vector.\n"
-    "   :type normal: :class:`mathutils.Vector` | tuple[float, float, float] | list[float]");
-
+    "   :type normal: :class:`mathutils.Vector` | tuple[float, float, float] | list[float]\n");
 static PyObject *SVertex_add_normal(BPy_SVertex *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"normal", nullptr};
@@ -110,8 +108,7 @@ PyDoc_STRVAR(
     "   Add an FEdge to the list of edges emanating from this SVertex.\n"
     "\n"
     "   :arg fedge: An FEdge.\n"
-    "   :type fedge: :class:`FEdge`");
-
+    "   :type fedge: :class:`FEdge`\n");
 static PyObject *SVertex_add_fedge(BPy_SVertex *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"fedge", nullptr};
@@ -294,8 +291,7 @@ PyDoc_STRVAR(
     SVertex_point_3d_doc,
     "The 3D coordinates of the SVertex.\n"
     "\n"
-    ":type: :class:`mathutils.Vector`");
-
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *SVertex_point_3d_get(BPy_SVertex *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
@@ -318,8 +314,7 @@ PyDoc_STRVAR(
     SVertex_point_2d_doc,
     "The projected 3D coordinates of the SVertex.\n"
     "\n"
-    ":type: :class:`mathutils.Vector`");
-
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *SVertex_point_2d_get(BPy_SVertex *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
@@ -342,8 +337,7 @@ PyDoc_STRVAR(
     SVertex_id_doc,
     "The Id of this SVertex.\n"
     "\n"
-    ":type: :class:`Id`");
-
+    ":type: :class:`Id`\n");
 static PyObject *SVertex_id_get(BPy_SVertex *self, void * /*closure*/)
 {
   Id id(self->sv->getId());
@@ -367,8 +361,7 @@ PyDoc_STRVAR(
     "has exactly one normal. In a smooth surface, an SVertex can have any\n"
     "number of normals.\n"
     "\n"
-    ":type: list of :class:`mathutils.Vector`");
-
+    ":type: list of :class:`mathutils.Vector`\n");
 static PyObject *SVertex_normals_get(BPy_SVertex *self, void * /*closure*/)
 {
   PyObject *py_normals;
@@ -389,8 +382,7 @@ PyDoc_STRVAR(
     SVertex_normals_size_doc,
     "The number of different normals for this SVertex.\n"
     "\n"
-    ":type: int");
-
+    ":type: int\n");
 static PyObject *SVertex_normals_size_get(BPy_SVertex *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->sv->normalsSize());
@@ -402,8 +394,7 @@ PyDoc_STRVAR(
     "If this SVertex is also a ViewVertex, this property refers to the\n"
     "ViewVertex, and None otherwise.\n"
     "\n"
-    ":type: :class:`ViewVertex`");
-
+    ":type: :class:`ViewVertex`\n");
 static PyObject *SVertex_viewvertex_get(BPy_SVertex *self, void * /*closure*/)
 {
   ViewVertex *vv = self->sv->viewvertex();
@@ -426,8 +417,7 @@ PyDoc_STRVAR(
     "er and dKr are the radial curvature, radial direction, and the\n"
     "derivative of the radial curvature at this SVertex, respectively.\n"
     "\n"
-    ":type: tuple");
-
+    ":type: tuple\n");
 static PyObject *SVertex_curvatures_get(BPy_SVertex *self, void * /*closure*/)
 {
   const CurvatureInfo *info = self->sv->getCurvatureInfo();
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
index 5e0f05a50cd..398eba405cb 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
@@ -31,8 +31,7 @@ PyDoc_STRVAR(
     ":class:`NonTVertex` when it corresponds to a vertex of the initial\n"
     "input mesh (it is the case for vertices such as corners for example).\n"
     "Thus, this class can be specialized into two classes, the\n"
-    ":class:`TVertex` class and the :class:`NonTVertex` class.");
-
+    ":class:`TVertex` class and the :class:`NonTVertex` class.\n");
 static int ViewVertex_init(BPy_ViewVertex * /*self*/, PyObject * /*args*/, PyObject * /*kwds*/)
 {
   PyErr_SetString(PyExc_TypeError, "cannot instantiate abstract class");
@@ -51,8 +50,7 @@ PyDoc_STRVAR(
     "   (incoming/outgoing).\n"
     "\n"
     "   :return: An orientedViewEdgeIterator pointing to the first ViewEdge.\n"
-    "   :rtype: :class:`orientedViewEdgeIterator`");
-
+    "   :rtype: :class:`orientedViewEdgeIterator`\n");
 static PyObject *ViewVertex_edges_begin(BPy_ViewVertex *self)
 {
   ViewVertexInternal::orientedViewEdgeIterator ove_it(self->vv->edgesBegin());
@@ -68,8 +66,7 @@ PyDoc_STRVAR(
     "   ViewVertex, pointing after the last ViewEdge.\n"
     "\n"
     "   :return: An orientedViewEdgeIterator pointing after the last ViewEdge.\n"
-    "   :rtype: :class:`orientedViewEdgeIterator`");
-
+    "   :rtype: :class:`orientedViewEdgeIterator`\n");
 static PyObject *ViewVertex_edges_end(BPy_ViewVertex * /*self*/)
 {
 #if 0
@@ -92,8 +89,7 @@ PyDoc_STRVAR(
     "   :arg edge: A ViewEdge object.\n"
     "   :type edge: :class:`ViewEdge`\n"
     "   :return: An orientedViewEdgeIterator pointing to the given ViewEdge.\n"
-    "   :rtype: :class:`orientedViewEdgeIterator`");
-
+    "   :rtype: :class:`orientedViewEdgeIterator`\n");
 static PyObject *ViewVertex_edges_iterator(BPy_ViewVertex *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"edge", nullptr};
@@ -142,8 +138,7 @@ PyDoc_STRVAR(
     ViewVertex_nature_doc,
     "The nature of this ViewVertex.\n"
     "\n"
-    ":type: :class:`Nature`");
-
+    ":type: :class:`Nature`\n");
 static PyObject *ViewVertex_nature_get(BPy_ViewVertex *self, void * /*closure*/)
 {
   Nature::VertexNature nature = self->vv->getNature();
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
index dffcff1e869..c63e90672c4 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
@@ -53,8 +53,7 @@ PyDoc_STRVAR(
     "   :arg svertex: An SVertex object.\n"
     "   :type svertex: :class:`SVertex`\n"
     "   :arg attribute: A StrokeAttribute object.\n"
-    "   :type attribute: :class:`StrokeAttribute`");
-
+    "   :type attribute: :class:`StrokeAttribute`\n");
 static int StrokeVertex_init(BPy_StrokeVertex *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"brother", nullptr};
@@ -222,8 +221,7 @@ PyDoc_STRVAR(
     StrokeVertex_attribute_doc,
     "StrokeAttribute for this StrokeVertex.\n"
     "\n"
-    ":type: :class:`StrokeAttribute`");
-
+    ":type: :class:`StrokeAttribute`\n");
 static PyObject *StrokeVertex_attribute_get(BPy_StrokeVertex *self, void * /*closure*/)
 {
   return BPy_StrokeAttribute_from_StrokeAttribute(self->sv->attribute());
@@ -244,8 +242,7 @@ PyDoc_STRVAR(
     StrokeVertex_curvilinear_abscissa_doc,
     "Curvilinear abscissa of this StrokeVertex in the Stroke.\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *StrokeVertex_curvilinear_abscissa_get(BPy_StrokeVertex *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sv->curvilinearAbscissa());
@@ -270,8 +267,7 @@ PyDoc_STRVAR(
     StrokeVertex_point_doc,
     "2D point coordinates.\n"
     "\n"
-    ":type: :class:`mathutils.Vector`");
-
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *StrokeVertex_point_get(BPy_StrokeVertex *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb((PyObject *)self, 2, StrokeVertex_mathutils_cb_index, 0);
@@ -294,8 +290,7 @@ PyDoc_STRVAR(
     "Stroke length (it is only a value retained by the StrokeVertex,\n"
     "and it won't change the real stroke length).\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *StrokeVertex_stroke_length_get(BPy_StrokeVertex *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sv->strokeLength());
@@ -320,8 +315,7 @@ PyDoc_STRVAR(
     StrokeVertex_u_doc,
     "Curvilinear abscissa of this StrokeVertex in the Stroke.\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *StrokeVertex_u_get(BPy_StrokeVertex *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sv->u());
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
index 8ba5473966a..bb53d683cd7 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
@@ -31,7 +31,7 @@ PyDoc_STRVAR(
     "   Builds a :class:`NonTVertex` using the default constructor or a :class:`SVertex`.\n"
     "\n"
     "   :arg svertex: An SVertex object.\n"
-    "   :type svertex: :class:`SVertex`");
+    "   :type svertex: :class:`SVertex`\n");
 
 /* NOTE: No copy constructor in Python because the C++ copy constructor is 'protected'. */
 
@@ -62,8 +62,7 @@ PyDoc_STRVAR(
     NonTVertex_svertex_doc,
     "The SVertex on top of which this NonTVertex is built.\n"
     "\n"
-    ":type: :class:`SVertex`");
-
+    ":type: :class:`SVertex`\n");
 static PyObject *NonTVertex_svertex_get(BPy_NonTVertex *self, void * /*closure*/)
 {
   SVertex *v = self->ntv->svertex();
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
index b641d9dd455..537e95a1b09 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
@@ -33,7 +33,7 @@ PyDoc_STRVAR(
     "\n"
     ".. method:: __init__()\n"
     "\n"
-    "   Default constructor.");
+    "   Default constructor.\n");
 
 /* NOTE: No copy constructor in Python because the C++ copy constructor is 'protected'. */
 
@@ -61,8 +61,7 @@ PyDoc_STRVAR(
     "   :arg fedge: An FEdge object.\n"
     "   :type fedge: :class:`FEdge`\n"
     "   :return: The SVertex belonging to the given FEdge.\n"
-    "   :rtype: :class:`SVertex`");
-
+    "   :rtype: :class:`SVertex`\n");
 static PyObject *TVertex_get_svertex(BPy_TVertex *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"fedge", nullptr};
@@ -90,8 +89,7 @@ PyDoc_STRVAR(
     "   :arg viewedge: A ViewEdge object.\n"
     "   :type viewedge: :class:`ViewEdge`\n"
     "   :return: The mate edge of the given ViewEdge.\n"
-    "   :rtype: :class:`ViewEdge`");
-
+    "   :rtype: :class:`ViewEdge`\n");
 static PyObject *TVertex_get_mate(BPy_TVertex *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"viewedge", nullptr};
@@ -144,8 +142,7 @@ PyDoc_STRVAR(
     TVertex_front_svertex_doc,
     "The SVertex that is closer to the viewpoint.\n"
     "\n"
-    ":type: :class:`SVertex`");
-
+    ":type: :class:`SVertex`\n");
 static PyObject *TVertex_front_svertex_get(BPy_TVertex *self, void * /*closure*/)
 {
   SVertex *v = self->tv->frontSVertex();
@@ -170,8 +167,7 @@ PyDoc_STRVAR(
     TVertex_back_svertex_doc,
     "The SVertex that is further away from the viewpoint.\n"
     "\n"
-    ":type: :class:`SVertex`");
-
+    ":type: :class:`SVertex`\n");
 static PyObject *TVertex_back_svertex_get(BPy_TVertex *self, void * /*closure*/)
 {
   SVertex *v = self->tv->backSVertex();
@@ -196,8 +192,7 @@ PyDoc_STRVAR(
     TVertex_id_doc,
     "The Id of this TVertex.\n"
     "\n"
-    ":type: :class:`Id`");
-
+    ":type: :class:`Id`\n");
 static PyObject *TVertex_id_get(BPy_TVertex *self, void * /*closure*/)
 {
   Id id(self->tv->getId());
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
index d5d24b61614..10b408cc247 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
@@ -46,8 +46,7 @@ PyDoc_STRVAR(
     "   :arg first_vertex: The first SVertex.\n"
     "   :type first_vertex: :class:`SVertex`\n"
     "   :arg second_vertex: The second SVertex.\n"
-    "   :type second_vertex: :class:`SVertex`");
-
+    "   :type second_vertex: :class:`SVertex`\n");
 static int FEdge_init(BPy_FEdge *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"brother", nullptr};
@@ -120,8 +119,7 @@ PyDoc_STRVAR(
     FEdge_first_svertex_doc,
     "The first SVertex constituting this FEdge.\n"
     "\n"
-    ":type: :class:`SVertex`");
-
+    ":type: :class:`SVertex`\n");
 static PyObject *FEdge_first_svertex_get(BPy_FEdge *self, void * /*closure*/)
 {
   SVertex *A = self->fe->vertexA();
@@ -146,8 +144,7 @@ PyDoc_STRVAR(
     FEdge_second_svertex_doc,
     "The second SVertex constituting this FEdge.\n"
     "\n"
-    ":type: :class:`SVertex`");
-
+    ":type: :class:`SVertex`\n");
 static PyObject *FEdge_second_svertex_get(BPy_FEdge *self, void * /*closure*/)
 {
   SVertex *B = self->fe->vertexB();
@@ -173,8 +170,7 @@ PyDoc_STRVAR(
     "The FEdge following this one in the ViewEdge. The value is None if\n"
     "this FEdge is the last of the ViewEdge.\n"
     "\n"
-    ":type: :class:`FEdge`");
-
+    ":type: :class:`FEdge`\n");
 static PyObject *FEdge_next_fedge_get(BPy_FEdge *self, void * /*closure*/)
 {
   FEdge *fe = self->fe->nextEdge();
@@ -200,8 +196,7 @@ PyDoc_STRVAR(
     "The FEdge preceding this one in the ViewEdge. The value is None if\n"
     "this FEdge is the first one of the ViewEdge.\n"
     "\n"
-    ":type: :class:`FEdge`");
-
+    ":type: :class:`FEdge`\n");
 static PyObject *FEdge_previous_fedge_get(BPy_FEdge *self, void * /*closure*/)
 {
   FEdge *fe = self->fe->previousEdge();
@@ -226,8 +221,7 @@ PyDoc_STRVAR(
     FEdge_viewedge_doc,
     "The ViewEdge to which this FEdge belongs to.\n"
     "\n"
-    ":type: :class:`ViewEdge`");
-
+    ":type: :class:`ViewEdge`\n");
 static PyObject *FEdge_viewedge_get(BPy_FEdge *self, void * /*closure*/)
 {
   ViewEdge *ve = self->fe->viewedge();
@@ -252,8 +246,7 @@ PyDoc_STRVAR(
     FEdge_is_smooth_doc,
     "True if this FEdge is a smooth FEdge.\n"
     "\n"
-    ":type: bool");
-
+    ":type: bool\n");
 static PyObject *FEdge_is_smooth_get(BPy_FEdge *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->fe->isSmooth());
@@ -274,8 +267,7 @@ PyDoc_STRVAR(
     FEdge_id_doc,
     "The Id of this FEdge.\n"
     "\n"
-    ":type: :class:`Id`");
-
+    ":type: :class:`Id`\n");
 static PyObject *FEdge_id_get(BPy_FEdge *self, void * /*closure*/)
 {
   Id id(self->fe->getId());
@@ -297,8 +289,7 @@ PyDoc_STRVAR(
     FEdge_nature_doc,
     "The nature of this FEdge.\n"
     "\n"
-    ":type: :class:`Nature`");
-
+    ":type: :class:`Nature`\n");
 static PyObject *FEdge_nature_get(BPy_FEdge *self, void * /*closure*/)
 {
   return BPy_Nature_from_Nature(self->fe->getNature());
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
index de51912d33c..66084097ccb 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
@@ -38,8 +38,7 @@ PyDoc_STRVAR(
     "   :arg brother: A Curve object.\n"
     "   :type brother: :class:`Curve`\n"
     "   :arg id: An Id object.\n"
-    "   :type id: :class:`Id`");
-
+    "   :type id: :class:`Id`\n");
 static int FrsCurve_init(BPy_FrsCurve *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"brother", nullptr};
@@ -76,8 +75,7 @@ PyDoc_STRVAR(
     "   Adds a single vertex at the end of the Curve.\n"
     "\n"
     "   :arg vertex: A vertex object.\n"
-    "   :type vertex: :class:`SVertex` | :class:`CurvePoint`");
-
+    "   :type vertex: :class:`SVertex` | :class:`CurvePoint`\n");
 static PyObject *FrsCurve_push_vertex_back(BPy_FrsCurve *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"vertex", nullptr};
@@ -108,8 +106,7 @@ PyDoc_STRVAR(
     "   Adds a single vertex at the front of the Curve.\n"
     "\n"
     "   :arg vertex: A vertex object.\n"
-    "   :type vertex: :class:`SVertex` | :class:`CurvePoint`");
-
+    "   :type vertex: :class:`SVertex` | :class:`CurvePoint`\n");
 static PyObject *FrsCurve_push_vertex_front(BPy_FrsCurve *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"vertex", nullptr};
@@ -169,8 +166,7 @@ PyDoc_STRVAR(
     FrsCurve_is_empty_doc,
     "True if the Curve doesn't have any Vertex yet.\n"
     "\n"
-    ":type: bool");
-
+    ":type: bool\n");
 static PyObject *FrsCurve_is_empty_get(BPy_FrsCurve *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->c->empty());
@@ -181,8 +177,7 @@ PyDoc_STRVAR(
     FrsCurve_segments_size_doc,
     "The number of segments in the polyline constituting the Curve.\n"
     "\n"
-    ":type: int");
-
+    ":type: int\n");
 static PyObject *FrsCurve_segments_size_get(BPy_FrsCurve *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->c->nSegments());
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
index 43b586cc366..71ce74695cb 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
@@ -43,7 +43,6 @@ PyDoc_STRVAR(
     "            Stroke(brother)\n"
     "\n"
     "   Creates a :class:`Stroke` using the default constructor or copy constructor\n");
-
 static int Stroke_init(BPy_Stroke *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"brother", nullptr};
@@ -101,8 +100,7 @@ PyDoc_STRVAR(
     "   :type n: int\n"
     "   :return: The sampling that must be used in the Resample(float)\n"
     "      method.\n"
-    "   :rtype: float");
-
+    "   :rtype: float\n");
 static PyObject *Stroke_compute_sampling(BPy_Stroke *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"n", nullptr};
@@ -130,8 +128,7 @@ PyDoc_STRVAR(
     "   :type n: int\n"
     "   :arg sampling: Resamples the stroke with a given sampling value. If the\n"
     "      sampling is smaller than the actual sampling value, no resampling is done.\n"
-    "   :type sampling: float");
-
+    "   :type sampling: float\n");
 static PyObject *Stroke_resample(BPy_Stroke *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"n", nullptr};
@@ -173,8 +170,7 @@ PyDoc_STRVAR(
     "   :type vertex: :class:`StrokeVertex`\n"
     "   :arg next: A StrokeVertexIterator pointing to the StrokeVertex\n"
     "      before which vertex must be inserted.\n"
-    "   :type next: :class:`StrokeVertexIterator`");
-
+    "   :type next: :class:`StrokeVertexIterator`\n");
 static PyObject *Stroke_insert_vertex(BPy_Stroke *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"vertex", "next", nullptr};
@@ -210,8 +206,7 @@ PyDoc_STRVAR(
     "   and curvilinear abscissa are updated consequently.\n"
     "\n"
     "   :arg vertex: the StrokeVertex to remove from the Stroke.\n"
-    "   :type vertex: :class:`StrokeVertex`");
-
+    "   :type vertex: :class:`StrokeVertex`\n");
 static PyObject *Stroke_remove_vertex(BPy_Stroke *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"vertex", nullptr};
@@ -236,8 +231,7 @@ PyDoc_STRVAR(
     Stroke_remove_all_vertices_doc,
     ".. method:: remove_all_vertices()\n"
     "\n"
-    "   Removes all vertices from the Stroke.");
-
+    "   Removes all vertices from the Stroke.\n");
 static PyObject *Stroke_remove_all_vertices(BPy_Stroke *self)
 {
   self->s->RemoveAllVertices();
@@ -249,8 +243,7 @@ PyDoc_STRVAR(
     Stroke_update_length_doc,
     ".. method:: update_length()\n"
     "\n"
-    "   Updates the 2D length of the Stroke.");
-
+    "   Updates the 2D length of the Stroke.\n");
 static PyObject *Stroke_update_length(BPy_Stroke *self)
 {
   self->s->UpdateLength();
@@ -270,8 +263,7 @@ PyDoc_STRVAR(
     "      resampled. If 0 is specified, no resampling is done.\n"
     "   :type t: float\n"
     "   :return: A StrokeVertexIterator pointing on the first StrokeVertex.\n"
-    "   :rtype: :class:`StrokeVertexIterator`");
-
+    "   :rtype: :class:`StrokeVertexIterator`\n");
 static PyObject *Stroke_stroke_vertices_begin(BPy_Stroke *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"t", nullptr};
@@ -293,8 +285,7 @@ PyDoc_STRVAR(
     "   of the Stroke.\n"
     "\n"
     "   :return: A StrokeVertexIterator pointing after the last StrokeVertex.\n"
-    "   :rtype: :class:`StrokeVertexIterator`");
-
+    "   :rtype: :class:`StrokeVertexIterator`\n");
 static PyObject *Stroke_stroke_vertices_end(BPy_Stroke *self)
 {
   StrokeInternal::StrokeVertexIterator sv_it(self->s->strokeVerticesEnd());
@@ -310,8 +301,7 @@ PyDoc_STRVAR(
     "   in the reversed order (from the last to the first).\n"
     "\n"
     "   :return: A StrokeVertexIterator pointing after the last StrokeVertex.\n"
-    "   :rtype: :class:`StrokeVertexIterator`");
-
+    "   :rtype: :class:`StrokeVertexIterator`\n");
 static PyObject *Stroke_reversed(BPy_Stroke *self)
 {
   StrokeInternal::StrokeVertexIterator sv_it(self->s->strokeVerticesEnd());
@@ -326,8 +316,7 @@ PyDoc_STRVAR(
     "   Returns the number of StrokeVertex constituting the Stroke.\n"
     "\n"
     "   :return: The number of stroke vertices.\n"
-    "   :rtype: int");
-
+    "   :rtype: int\n");
 static PyObject *Stroke_stroke_vertices_size(BPy_Stroke *self)
 {
   return PyLong_FromLong(self->s->strokeVerticesSize());
@@ -393,8 +382,7 @@ PyDoc_STRVAR(
     Stroke_medium_type_doc,
     "The MediumType used for this Stroke.\n"
     "\n"
-    ":type: :class:`MediumType`");
-
+    ":type: :class:`MediumType`\n");
 static PyObject *Stroke_medium_type_get(BPy_Stroke *self, void * /*closure*/)
 {
   return BPy_MediumType_from_MediumType(self->s->getMediumType());
@@ -415,8 +403,7 @@ PyDoc_STRVAR(
     Stroke_texture_id_doc,
     "The ID of the texture used to simulate th marks system for this Stroke.\n"
     "\n"
-    ":type: int");
-
+    ":type: int\n");
 static PyObject *Stroke_texture_id_get(BPy_Stroke *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->s->getTextureId());
@@ -437,8 +424,7 @@ PyDoc_STRVAR(
     Stroke_tips_doc,
     "True if this Stroke uses a texture with tips, and false otherwise.\n"
     "\n"
-    ":type: bool");
-
+    ":type: bool\n");
 static PyObject *Stroke_tips_get(BPy_Stroke *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->s->hasTips());
@@ -458,8 +444,7 @@ PyDoc_STRVAR(
     Stroke_length_2d_doc,
     "The 2D length of the Stroke.\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *Stroke_length_2d_get(BPy_Stroke *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->s->getLength2D());
@@ -482,8 +467,7 @@ PyDoc_STRVAR(
     Stroke_id_doc,
     "The Id of this Stroke.\n"
     "\n"
-    ":type: :class:`Id`");
-
+    ":type: :class:`Id`\n");
 static PyObject *Stroke_id_get(BPy_Stroke *self, void * /*closure*/)
 {
   Id id(self->s->getId());
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
index 6eb13297a3b..ca2c57ffdc7 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
@@ -37,8 +37,7 @@ PyDoc_STRVAR(
     "   Builds a :class:`ViewEdge` using the default constructor or the copy constructor.\n"
     "\n"
     "   :arg brother: A ViewEdge object.\n"
-    "   :type brother: :class:`ViewEdge`");
-
+    "   :type brother: :class:`ViewEdge`\n");
 static int ViewEdge_init(BPy_ViewEdge *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"brother", nullptr};
@@ -64,7 +63,6 @@ PyDoc_STRVAR(
     ".. method:: update_fedges()\n"
     "\n"
     "   Sets Viewedge to this for all embedded fedges.\n");
-
 static PyObject *ViewEdge_update_fedges(BPy_ViewEdge *self)
 {
   self->ve->UpdateFEdges();
@@ -104,8 +102,7 @@ PyDoc_STRVAR(
     ViewEdge_first_viewvertex_doc,
     "The first ViewVertex.\n"
     "\n"
-    ":type: :class:`ViewVertex`");
-
+    ":type: :class:`ViewVertex`\n");
 static PyObject *ViewEdge_first_viewvertex_get(BPy_ViewEdge *self, void * /*closure*/)
 {
   ViewVertex *v = self->ve->A();
@@ -129,8 +126,7 @@ PyDoc_STRVAR(
     ViewEdge_last_viewvertex_doc,
     "The second ViewVertex.\n"
     "\n"
-    ":type: :class:`ViewVertex`");
-
+    ":type: :class:`ViewVertex`\n");
 static PyObject *ViewEdge_last_viewvertex_get(BPy_ViewEdge *self, void * /*closure*/)
 {
   ViewVertex *v = self->ve->B();
@@ -154,8 +150,7 @@ PyDoc_STRVAR(
     ViewEdge_first_fedge_doc,
     "The first FEdge that constitutes this ViewEdge.\n"
     "\n"
-    ":type: :class:`FEdge`");
-
+    ":type: :class:`FEdge`\n");
 static PyObject *ViewEdge_first_fedge_get(BPy_ViewEdge *self, void * /*closure*/)
 {
   FEdge *fe = self->ve->fedgeA();
@@ -179,8 +174,7 @@ PyDoc_STRVAR(
     ViewEdge_last_fedge_doc,
     "The last FEdge that constitutes this ViewEdge.\n"
     "\n"
-    ":type: :class:`FEdge`");
-
+    ":type: :class:`FEdge`\n");
 static PyObject *ViewEdge_last_fedge_get(BPy_ViewEdge *self, void * /*closure*/)
 {
   FEdge *fe = self->ve->fedgeB();
@@ -204,8 +198,7 @@ PyDoc_STRVAR(
     ViewEdge_viewshape_doc,
     "The ViewShape to which this ViewEdge belongs to.\n"
     "\n"
-    ":type: :class:`ViewShape`");
-
+    ":type: :class:`ViewShape`\n");
 static PyObject *ViewEdge_viewshape_get(BPy_ViewEdge *self, void * /*closure*/)
 {
   ViewShape *vs = self->ve->viewShape();
@@ -230,8 +223,7 @@ PyDoc_STRVAR(
     "The shape that is occluded by the ViewShape to which this ViewEdge\n"
     "belongs to. If no object is occluded, this property is set to None.\n"
     "\n"
-    ":type: :class:`ViewShape`");
-
+    ":type: :class:`ViewShape`\n");
 static PyObject *ViewEdge_occludee_get(BPy_ViewEdge *self, void * /*closure*/)
 {
   ViewShape *vs = self->ve->aShape();
@@ -255,8 +247,7 @@ PyDoc_STRVAR(
     ViewEdge_is_closed_doc,
     "True if this ViewEdge forms a closed loop.\n"
     "\n"
-    ":type: bool");
-
+    ":type: bool\n");
 static PyObject *ViewEdge_is_closed_get(BPy_ViewEdge *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->ve->isClosed());
@@ -267,8 +258,7 @@ PyDoc_STRVAR(
     ViewEdge_id_doc,
     "The Id of this ViewEdge.\n"
     "\n"
-    ":type: :class:`Id`");
-
+    ":type: :class:`Id`\n");
 static PyObject *ViewEdge_id_get(BPy_ViewEdge *self, void * /*closure*/)
 {
   Id id(self->ve->getId());
@@ -290,8 +280,7 @@ PyDoc_STRVAR(
     ViewEdge_nature_doc,
     "The nature of this ViewEdge.\n"
     "\n"
-    ":type: :class:`Nature`");
-
+    ":type: :class:`Nature`\n");
 static PyObject *ViewEdge_nature_get(BPy_ViewEdge *self, void * /*closure*/)
 {
   return BPy_Nature_from_Nature(self->ve->getNature());
@@ -312,8 +301,7 @@ PyDoc_STRVAR(
     ViewEdge_qi_doc,
     "The quantitative invisibility.\n"
     "\n"
-    ":type: int");
-
+    ":type: int\n");
 static PyObject *ViewEdge_qi_get(BPy_ViewEdge *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->ve->qi());
@@ -335,8 +323,7 @@ PyDoc_STRVAR(
     ViewEdge_chaining_time_stamp_doc,
     "The time stamp of this ViewEdge.\n"
     "\n"
-    ":type: int");
-
+    ":type: int\n");
 static PyObject *ViewEdge_chaining_time_stamp_get(BPy_ViewEdge *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->ve->getChainingTimeStamp());
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
index 8a58347100f..fc99e902ba9 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
@@ -37,8 +37,7 @@ PyDoc_STRVAR(
     "   :arg brother: A Chain object.\n"
     "   :type brother: :class:`Chain`\n"
     "   :arg id: An Id object.\n"
-    "   :type id: :class:`Id`");
-
+    "   :type id: :class:`Id`\n");
 static int Chain_init(BPy_Chain *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"brother", nullptr};
@@ -77,10 +76,8 @@ PyDoc_STRVAR(
     "\n"
     "   :arg viewedge: The ViewEdge that must be added.\n"
     "   :type viewedge: :class:`ViewEdge`\n"
-    "   :arg orientation: The orientation with which the ViewEdge must be\n"
-    "      processed.\n"
-    "   :type orientation: bool");
-
+    "   :arg orientation: The orientation with which the ViewEdge must be processed.\n"
+    "   :type orientation: bool\n");
 static PyObject *Chain_push_viewedge_back(BPy_Chain *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"viewedge", "orientation", nullptr};
@@ -108,8 +105,7 @@ PyDoc_STRVAR(
     "   :type viewedge: :class:`ViewEdge`\n"
     "   :arg orientation: The orientation with which the ViewEdge must be\n"
     "      processed.\n"
-    "   :type orientation: bool");
-
+    "   :type orientation: bool\n");
 static PyObject *Chain_push_viewedge_front(BPy_Chain *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"viewedge", "orientation", nullptr};
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
index f357e759712..064022b38e7 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
@@ -43,8 +43,7 @@ PyDoc_STRVAR(
     "   :arg first_vertex: The first SVertex object.\n"
     "   :type first_vertex: :class:`SVertex`\n"
     "   :arg second_vertex: The second SVertex object.\n"
-    "   :type second_vertex: :class:`SVertex`");
-
+    "   :type second_vertex: :class:`SVertex`\n");
 static int FEdgeSharp_init(BPy_FEdgeSharp *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"brother", nullptr};
@@ -198,8 +197,7 @@ PyDoc_STRVAR(
     "The normal to the face lying on the right of the FEdge. If this FEdge\n"
     "is a border, it has no Face on its right and therefore no normal.\n"
     "\n"
-    ":type: :class:`mathutils.Vector`");
-
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *FEdgeSharp_normal_right_get(BPy_FEdgeSharp *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
@@ -222,8 +220,7 @@ PyDoc_STRVAR(
     FEdgeSharp_normal_left_doc,
     "The normal to the face lying on the left of the FEdge.\n"
     "\n"
-    ":type: :class:`mathutils.Vector`");
-
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *FEdgeSharp_normal_left_get(BPy_FEdgeSharp *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb(
@@ -248,8 +245,7 @@ PyDoc_STRVAR(
     "If this FEdge is a border, it has no Face on its right and therefore\n"
     "no material.\n"
     "\n"
-    ":type: int");
-
+    ":type: int\n");
 static PyObject *FEdgeSharp_material_index_right_get(BPy_FEdgeSharp *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->fes->aFrsMaterialIndex());
@@ -272,8 +268,7 @@ PyDoc_STRVAR(
     FEdgeSharp_material_index_left_doc,
     "The index of the material of the face lying on the left of the FEdge.\n"
     "\n"
-    ":type: int");
-
+    ":type: int\n");
 static PyObject *FEdgeSharp_material_index_left_get(BPy_FEdgeSharp *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->fes->bFrsMaterialIndex());
@@ -297,8 +292,7 @@ PyDoc_STRVAR(
     "The material of the face lying on the right of the FEdge. If this FEdge\n"
     "is a border, it has no Face on its right and therefore no material.\n"
     "\n"
-    ":type: :class:`Material`");
-
+    ":type: :class:`Material`\n");
 static PyObject *FEdgeSharp_material_right_get(BPy_FEdgeSharp *self, void * /*closure*/)
 {
   return BPy_FrsMaterial_from_FrsMaterial(self->fes->aFrsMaterial());
@@ -309,8 +303,7 @@ PyDoc_STRVAR(
     FEdgeSharp_material_left_doc,
     "The material of the face lying on the left of the FEdge.\n"
     "\n"
-    ":type: :class:`Material`");
-
+    ":type: :class:`Material`\n");
 static PyObject *FEdgeSharp_material_left_get(BPy_FEdgeSharp *self, void * /*closure*/)
 {
   return BPy_FrsMaterial_from_FrsMaterial(self->fes->bFrsMaterial());
@@ -323,8 +316,7 @@ PyDoc_STRVAR(
     "is a border, it has no face on the right and thus this property is set to\n"
     "false.\n"
     "\n"
-    ":type: bool");
-
+    ":type: bool\n");
 static PyObject *FEdgeSharp_face_mark_right_get(BPy_FEdgeSharp *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->fes->aFaceMark());
@@ -346,8 +338,7 @@ PyDoc_STRVAR(
     FEdgeSharp_face_mark_left_doc,
     "The face mark of the face lying on the left of the FEdge.\n"
     "\n"
-    ":type: bool");
-
+    ":type: bool\n");
 static PyObject *FEdgeSharp_face_mark_left_get(BPy_FEdgeSharp *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->fes->bFaceMark());
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
index 077878fe48e..7b5431120a5 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
@@ -40,8 +40,7 @@ PyDoc_STRVAR(
     "   :arg first_vertex: The first SVertex object.\n"
     "   :type first_vertex: :class:`SVertex`\n"
     "   :arg second_vertex: The second SVertex object.\n"
-    "   :type second_vertex: :class:`SVertex`");
-
+    "   :type second_vertex: :class:`SVertex`\n");
 static int FEdgeSmooth_init(BPy_FEdgeSmooth *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"brother", nullptr};
@@ -140,8 +139,7 @@ PyDoc_STRVAR(
     FEdgeSmooth_normal_doc,
     "The normal of the face that this FEdge is running across.\n"
     "\n"
-    ":type: :class:`mathutils.Vector`");
-
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *FEdgeSmooth_normal_get(BPy_FEdgeSmooth *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_cb((PyObject *)self, 3, FEdgeSmooth_mathutils_cb_index, 0);
@@ -163,8 +161,7 @@ PyDoc_STRVAR(
     FEdgeSmooth_material_index_doc,
     "The index of the material of the face that this FEdge is running across.\n"
     "\n"
-    ":type: int");
-
+    ":type: int\n");
 static PyObject *FEdgeSmooth_material_index_get(BPy_FEdgeSmooth *self, void * /*closure*/)
 {
   return PyLong_FromLong(self->fes->frs_materialIndex());
@@ -187,8 +184,7 @@ PyDoc_STRVAR(
     FEdgeSmooth_material_doc,
     "The material of the face that this FEdge is running across.\n"
     "\n"
-    ":type: :class:`Material`");
-
+    ":type: :class:`Material`\n");
 static PyObject *FEdgeSmooth_material_get(BPy_FEdgeSmooth *self, void * /*closure*/)
 {
   return BPy_FrsMaterial_from_FrsMaterial(self->fes->frs_material());
@@ -199,8 +195,7 @@ PyDoc_STRVAR(
     FEdgeSmooth_face_mark_doc,
     "The face mark of the face that this FEdge is running across.\n"
     "\n"
-    ":type: bool");
-
+    ":type: bool\n");
 static PyObject *FEdgeSmooth_face_mark_get(BPy_FEdgeSmooth *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->fes->faceMark());
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
index cd06db8af9d..f40fd25a457 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
@@ -43,8 +43,7 @@ PyDoc_STRVAR(
     "   :type restrict_to_selection: bool\n"
     "   :arg restrict_to_unvisited: Indicates whether a ViewEdge that has\n"
     "      already been chained must be ignored ot not.\n"
-    "   :type restrict_to_unvisited: bool");
-
+    "   :type restrict_to_unvisited: bool\n");
 static int AdjacencyIterator_init(BPy_AdjacencyIterator *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"brother", nullptr};
@@ -125,8 +124,7 @@ PyDoc_STRVAR(
     AdjacencyIterator_object_doc,
     "The ViewEdge object currently pointed to by this iterator.\n"
     "\n"
-    ":type: :class:`ViewEdge`");
-
+    ":type: :class:`ViewEdge`\n");
 static PyObject *AdjacencyIterator_object_get(BPy_AdjacencyIterator *self, void * /*closure*/)
 {
   if (self->a_it->isEnd()) {
@@ -146,8 +144,7 @@ PyDoc_STRVAR(
     "True if the current ViewEdge is coming towards the iteration vertex, and\n"
     "False otherwise.\n"
     "\n"
-    ":type: bool");
-
+    ":type: bool\n");
 static PyObject *AdjacencyIterator_is_incoming_get(BPy_AdjacencyIterator *self, void * /*closure*/)
 {
   if (self->a_it->isEnd()) {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
index a89ed365a91..37272264b70 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
@@ -65,8 +65,7 @@ PyDoc_STRVAR(
     "      ViewVertex of begin.\n"
     "   :type orientation: bool\n"
     "   :arg brother: A ChainPredicateIterator object.\n"
-    "   :type brother: :class:`ChainPredicateIterator`");
-
+    "   :type brother: :class:`ChainPredicateIterator`\n");
 static int check_begin(PyObject *obj, void *v)
 {
   if (obj != nullptr && obj != Py_None && !BPy_ViewEdge_Check(obj)) {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
index 6c0a929d0f0..d0f75c2d725 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
@@ -52,8 +52,7 @@ PyDoc_STRVAR(
     "      ViewVertex of begin.\n"
     "   :type orientation: bool\n"
     "   :arg brother: A ChainSilhouetteIterator object.\n"
-    "   :type brother: :class:`ChainSilhouetteIterator`");
-
+    "   :type brother: :class:`ChainSilhouetteIterator`\n");
 static int check_begin(PyObject *obj, void *v)
 {
   if (obj != nullptr && obj != Py_None && !BPy_ViewEdge_Check(obj)) {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
index a0cbf22ba32..96c65079ab3 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
@@ -52,8 +52,7 @@ PyDoc_STRVAR(
     "      true, the direction indicated by the first ViewEdge is used.\n"
     "   :type orientation: bool\n"
     "   :arg brother: \n"
-    "   :type brother: ChainingIterator");
-
+    "   :type brother: ChainingIterator\n");
 static int check_begin(PyObject *obj, void *v)
 {
   if (obj != nullptr && obj != Py_None && !BPy_ViewEdge_Check(obj)) {
@@ -116,8 +115,7 @@ PyDoc_STRVAR(
     "\n"
     "   Initializes the iterator context. This method is called each\n"
     "   time a new chain is started. It can be used to reset some\n"
-    "   history information that you might want to keep.");
-
+    "   history information that you might want to keep.\n");
 static PyObject *ChainingIterator_init(BPy_ChainingIterator *self)
 {
   if (typeid(*(self->c_it)) == typeid(ChainingIterator)) {
@@ -142,8 +140,7 @@ PyDoc_STRVAR(
     "      restriction rules by only iterating over the valid ViewEdges.\n"
     "   :type it: :class:`AdjacencyIterator`\n"
     "   :return: Returns the next ViewEdge to follow, or None if chaining ends.\n"
-    "   :rtype: :class:`ViewEdge` | None");
-
+    "   :rtype: :class:`ViewEdge` | None\n");
 static PyObject *ChainingIterator_traverse(BPy_ChainingIterator *self,
                                            PyObject *args,
                                            PyObject *kwds)
@@ -200,8 +197,7 @@ PyDoc_STRVAR(
     ChainingIterator_object_doc,
     "The ViewEdge object currently pointed by this iterator.\n"
     "\n"
-    ":type: :class:`ViewEdge`");
-
+    ":type: :class:`ViewEdge`\n");
 static PyObject *ChainingIterator_object_get(BPy_ChainingIterator *self, void * /*closure*/)
 {
   if (self->c_it->isEnd()) {
@@ -221,8 +217,7 @@ PyDoc_STRVAR(
     ChainingIterator_next_vertex_doc,
     "The ViewVertex that is the next crossing.\n"
     "\n"
-    ":type: :class:`ViewVertex`");
-
+    ":type: :class:`ViewVertex`\n");
 static PyObject *ChainingIterator_next_vertex_get(BPy_ChainingIterator *self, void * /*closure*/)
 {
   ViewVertex *v = self->c_it->getVertex();
@@ -238,8 +233,7 @@ PyDoc_STRVAR(
     ChainingIterator_is_incrementing_doc,
     "True if the current iteration is an incrementation.\n"
     "\n"
-    ":type: bool");
-
+    ":type: bool\n");
 static PyObject *ChainingIterator_is_incrementing_get(BPy_ChainingIterator *self,
                                                       void * /*closure*/)
 {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
index a21f20600dc..4eeac8765cb 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
@@ -38,8 +38,7 @@ PyDoc_STRVAR(
     "   :arg step: A resampling resolution with which the curve is resampled.\n"
     "      If zero, no resampling is done (i.e., the iterator iterates over\n"
     "      initial vertices).\n"
-    "   :type step: float");
-
+    "   :type step: float\n");
 static int CurvePointIterator_init(BPy_CurvePointIterator *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"brother", nullptr};
@@ -78,8 +77,7 @@ PyDoc_STRVAR(
     CurvePointIterator_object_doc,
     "The CurvePoint object currently pointed by this iterator.\n"
     "\n"
-    ":type: :class:`CurvePoint`");
-
+    ":type: :class:`CurvePoint`\n");
 static PyObject *CurvePointIterator_object_get(BPy_CurvePointIterator *self, void * /*closure*/)
 {
   if (self->cp_it->isEnd()) {
@@ -94,8 +92,7 @@ PyDoc_STRVAR(
     CurvePointIterator_t_doc,
     "The curvilinear abscissa of the current point.\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *CurvePointIterator_t_get(BPy_CurvePointIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->cp_it->t());
@@ -106,8 +103,7 @@ PyDoc_STRVAR(
     CurvePointIterator_u_doc,
     "The point parameter at the current point in the stroke (0 <= u <= 1).\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *CurvePointIterator_u_get(BPy_CurvePointIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->cp_it->u());
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
index eb634cd48d5..2d8642909ca 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
@@ -34,9 +34,8 @@ PyDoc_STRVAR(
     "   :arg brother: An Interface0DIterator object.\n"
     "   :type brother: :class:`Interface0DIterator`\n"
     "   :arg it: An iterator object to be nested.\n"
-    "   :type it: :class:`SVertexIterator`, :class:`CurvePointIterator`, or\n"
-    "      :class:`StrokeVertexIterator`");
-
+    "   :type it: :class:`SVertexIterator` | :class:`CurvePointIterator` | "
+    ":class:`StrokeVertexIterator`\n");
 static int convert_nested_it(PyObject *obj, void *v)
 {
   if (!obj || !BPy_Iterator_Check(obj)) {
@@ -136,8 +135,7 @@ PyDoc_STRVAR(
     "has been created from the `vertices_begin()` method of the :class:`Stroke`\n"
     "class, the .object property refers to a :class:`StrokeVertex` object.\n"
     "\n"
-    ":type: :class:`Interface0D` or one of its subclasses.");
-
+    ":type: :class:`Interface0D` or one of its subclasses.\n");
 static PyObject *Interface0DIterator_object_get(BPy_Interface0DIterator *self, void * /*closure*/)
 {
   if (self->if0D_it->isEnd()) {
@@ -152,8 +150,7 @@ PyDoc_STRVAR(
     Interface0DIterator_t_doc,
     "The curvilinear abscissa of the current point.\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *Interface0DIterator_t_get(BPy_Interface0DIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->if0D_it->t());
@@ -164,8 +161,7 @@ PyDoc_STRVAR(
     Interface0DIterator_u_doc,
     "The point parameter at the current point in the 1D element (0 <= u <= 1).\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *Interface0DIterator_u_get(BPy_Interface0DIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->if0D_it->u());
@@ -177,8 +173,7 @@ PyDoc_STRVAR(
     "True if the iterator points to the last valid element.\n"
     "For its counterpart (pointing to the first valid element), use it.is_begin.\n"
     "\n"
-    ":type: bool");
-
+    ":type: bool\n");
 static PyObject *Interface0DIterator_at_last_get(BPy_Interface0DIterator *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->if0D_it->atLast());
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
index b958ba09420..b2a927f825b 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
@@ -45,8 +45,7 @@ PyDoc_STRVAR(
     "   :arg next_edge: The next FEdge going out from vertex.\n"
     "   :type next_edge: :class:`FEdge`\n"
     "   :arg t: The curvilinear abscissa at vertex.\n"
-    "   :type t: float");
-
+    "   :type t: float\n");
 static int SVertexIterator_init(BPy_SVertexIterator *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist_1[] = {"brother", nullptr};
@@ -100,8 +99,7 @@ PyDoc_STRVAR(
     SVertexIterator_object_doc,
     "The SVertex object currently pointed by this iterator.\n"
     "\n"
-    ":type: :class:`SVertex`");
-
+    ":type: :class:`SVertex`\n");
 static PyObject *SVertexIterator_object_get(BPy_SVertexIterator *self, void * /*closure*/)
 {
   if (self->sv_it->isEnd()) {
@@ -120,8 +118,7 @@ PyDoc_STRVAR(
     SVertexIterator_t_doc,
     "The curvilinear abscissa of the current point.\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *SVertexIterator_t_get(BPy_SVertexIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sv_it->t());
@@ -132,8 +129,7 @@ PyDoc_STRVAR(
     SVertexIterator_u_doc,
     "The point parameter at the current point in the 1D element (0 <= u <= 1).\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *SVertexIterator_u_get(BPy_SVertexIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sv_it->u());
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
index f928d8bf788..04a2da6e477 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
@@ -42,8 +42,7 @@ PyDoc_STRVAR(
     "   default constructor or the copy constructor.\n"
     "\n"
     "   :arg brother: A StrokeVertexIterator object.\n"
-    "   :type brother: :class:`StrokeVertexIterator`");
-
+    "   :type brother: :class:`StrokeVertexIterator`\n");
 static int StrokeVertexIterator_init(BPy_StrokeVertexIterator *self,
                                      PyObject *args,
                                      PyObject *kwds)
@@ -140,8 +139,7 @@ PyDoc_STRVAR(
     "   Returns a copy of an incremented StrokeVertexIterator.\n"
     "\n"
     "   :return: A StrokeVertexIterator pointing the next StrokeVertex.\n"
-    "   :rtype: :class:`StrokeVertexIterator`");
-
+    "   :rtype: :class:`StrokeVertexIterator`\n");
 static PyObject *StrokeVertexIterator_incremented(BPy_StrokeVertexIterator *self)
 {
   if (self->sv_it->isEnd()) {
@@ -161,8 +159,7 @@ PyDoc_STRVAR(
     "   Returns a copy of a decremented StrokeVertexIterator.\n"
     "\n"
     "   :return: A StrokeVertexIterator pointing the previous StrokeVertex.\n"
-    "   :rtype: :class:`StrokeVertexIterator`");
-
+    "   :rtype: :class:`StrokeVertexIterator`\n");
 static PyObject *StrokeVertexIterator_decremented(BPy_StrokeVertexIterator *self)
 {
   if (self->sv_it->isBegin()) {
@@ -183,8 +180,7 @@ PyDoc_STRVAR(
     "   reversed order.\n"
     "\n"
     "   :return: A StrokeVertexIterator traversing stroke vertices backward.\n"
-    "   :rtype: :class:`StrokeVertexIterator`");
-
+    "   :rtype: :class:`StrokeVertexIterator`\n");
 static PyObject *StrokeVertexIterator_reversed(BPy_StrokeVertexIterator *self)
 {
   return BPy_StrokeVertexIterator_from_StrokeVertexIterator(*self->sv_it, !self->reversed);
@@ -231,8 +227,7 @@ PyDoc_STRVAR(
     StrokeVertexIterator_object_doc,
     "The StrokeVertex object currently pointed to by this iterator.\n"
     "\n"
-    ":type: :class:`StrokeVertex`");
-
+    ":type: :class:`StrokeVertex`\n");
 static PyObject *StrokeVertexIterator_object_get(BPy_StrokeVertexIterator *self,
                                                  void * /*closure*/)
 {
@@ -252,8 +247,7 @@ PyDoc_STRVAR(
     StrokeVertexIterator_t_doc,
     "The curvilinear abscissa of the current point.\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *StrokeVertexIterator_t_get(BPy_StrokeVertexIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sv_it->t());
@@ -264,8 +258,7 @@ PyDoc_STRVAR(
     StrokeVertexIterator_u_doc,
     "The point parameter at the current point in the stroke (0 <= u <= 1).\n"
     "\n"
-    ":type: float");
-
+    ":type: float\n");
 static PyObject *StrokeVertexIterator_u_get(BPy_StrokeVertexIterator *self, void * /*closure*/)
 {
   return PyFloat_FromDouble(self->sv_it->u());
@@ -277,8 +270,7 @@ PyDoc_STRVAR(
     "True if the iterator points to the last valid element.\n"
     "For its counterpart (pointing to the first valid element), use it.is_begin.\n"
     "\n"
-    ":type: bool");
-
+    ":type: bool\n");
 static PyObject *StrokeVertexIterator_at_last_get(BPy_StrokeVertexIterator *self)
 {
   return PyBool_from_bool(self->sv_it->atLast());
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
index acbee7bdf59..32a58b8e31d 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
@@ -41,8 +41,7 @@ PyDoc_STRVAR(
     "      ViewVertex of begin.\n"
     "   :type orientation: bool\n"
     "   :arg brother: A ViewEdgeIterator object.\n"
-    "   :type brother: :class:`ViewEdgeIterator`");
-
+    "   :type brother: :class:`ViewEdgeIterator`\n");
 static int check_begin(PyObject *obj, void *v)
 {
   if (obj != nullptr && obj != Py_None && !BPy_ViewEdge_Check(obj)) {
@@ -85,8 +84,7 @@ PyDoc_STRVAR(
     ViewEdgeIterator_change_orientation_doc,
     ".. method:: change_orientation()\n"
     "\n"
-    "   Changes the current orientation.");
-
+    "   Changes the current orientation.\n");
 static PyObject *ViewEdgeIterator_change_orientation(BPy_ViewEdgeIterator *self)
 {
   self->ve_it->changeOrientation();
@@ -126,8 +124,7 @@ PyDoc_STRVAR(
     ViewEdgeIterator_object_doc,
     "The ViewEdge object currently pointed by this iterator.\n"
     "\n"
-    ":type: :class:`ViewEdge`");
-
+    ":type: :class:`ViewEdge`\n");
 static PyObject *ViewEdgeIterator_object_get(BPy_ViewEdgeIterator *self, void * /*closure*/)
 {
   if (!self->ve_it->isEnd()) {
@@ -146,8 +143,7 @@ PyDoc_STRVAR(
     ViewEdgeIterator_current_edge_doc,
     "The ViewEdge object currently pointed by this iterator.\n"
     "\n"
-    ":type: :class:`ViewEdge`");
-
+    ":type: :class:`ViewEdge`\n");
 static PyObject *ViewEdgeIterator_current_edge_get(BPy_ViewEdgeIterator *self, void * /*closure*/)
 {
   ViewEdge *ve = self->ve_it->getCurrentEdge();
@@ -178,8 +174,7 @@ PyDoc_STRVAR(
     "the iterator searches over the ViewEdges surrounding the ending ViewVertex\n"
     "of the \"begin\" ViewEdge.\n"
     "\n"
-    ":type: bool");
-
+    ":type: bool\n");
 static PyObject *ViewEdgeIterator_orientation_get(BPy_ViewEdgeIterator *self, void * /*closure*/)
 {
   return PyBool_from_bool(self->ve_it->getOrientation());
@@ -202,8 +197,7 @@ PyDoc_STRVAR(
     ViewEdgeIterator_begin_doc,
     "The first ViewEdge used for the iteration.\n"
     "\n"
-    ":type: :class:`ViewEdge`");
-
+    ":type: :class:`ViewEdge`\n");
 static PyObject *ViewEdgeIterator_begin_get(BPy_ViewEdgeIterator *self, void * /*closure*/)
 {
   ViewEdge *ve = self->ve_it->getBegin();
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
index dd5ad609c0d..3ba81946cb2 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
@@ -33,8 +33,7 @@ PyDoc_STRVAR(
     "   default constructor or the copy constructor.\n"
     "\n"
     "   :arg iBrother: An orientedViewEdgeIterator object.\n"
-    "   :type iBrother: :class:`orientedViewEdgeIterator`");
-
+    "   :type iBrother: :class:`orientedViewEdgeIterator`\n");
 static int orientedViewEdgeIterator_init(BPy_orientedViewEdgeIterator *self,
                                          PyObject *args,
                                          PyObject *kwds)
@@ -107,8 +106,7 @@ PyDoc_STRVAR(
     "value) currently pointed to by this iterator. If the boolean value is true,\n"
     "the ViewEdge is incoming.\n"
     "\n"
-    ":type: (:class:`ViewEdge`, bool)");
-
+    ":type: tuple[:class:`ViewEdge`, bool]\n");
 static PyObject *orientedViewEdgeIterator_object_get(BPy_orientedViewEdgeIterator *self,
                                                      void * /*closure*/)
 {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
index 0de882cb103..d346b6a7911 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
@@ -37,7 +37,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int BackboneStretcherShader___init__(BPy_BackboneStretcherShader *self,
                                             PyObject *args,
                                             PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp
index 78b4b82aca0..aa219863811 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp
@@ -39,7 +39,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int BezierCurveShader___init__(BPy_BezierCurveShader *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"error", nullptr};
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp
index e6d692aa781..49a23b5061d 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp
@@ -29,10 +29,10 @@ PyDoc_STRVAR(
     "\n"
     "   Builds a BlenderTextureShader object.\n"
     "\n"
-    "   :arg texture: A line style texture slot or a shader node tree to define\n"
-    "       a set of textures.\n"
-    "   :type texture: :class:`bpy.types.LineStyleTextureSlot` or\n"
-    "       :class:`bpy.types.ShaderNodeTree`\n"
+    "   :arg texture: A line style texture slot or a shader node tree to define "
+    "a set of textures.\n"
+    "   :type texture: :class:`bpy.types.LineStyleTextureSlot` | "
+    ":class:`bpy.types.ShaderNodeTree`\n"
     "\n"
     ".. method:: shade(stroke)\n"
     "\n"
@@ -41,7 +41,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int BlenderTextureShader___init__(BPy_BlenderTextureShader *self,
                                          PyObject *args,
                                          PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
index cf6258d9de0..60a93b885fe 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
@@ -50,7 +50,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int CalligraphicShader___init__(BPy_CalligraphicShader *self,
                                        PyObject *args,
                                        PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp
index 07d5aeb488f..bf0fef3d13a 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp
@@ -38,7 +38,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int ColorNoiseShader___init__(BPy_ColorNoiseShader *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"amplitude", "period", nullptr};
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp
index f2389f756e4..80c4fb84b54 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp
@@ -42,7 +42,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int ConstantColorShader___init__(BPy_ConstantColorShader *self,
                                         PyObject *args,
                                         PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp
index a45639f195c..da29c07fee3 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp
@@ -36,7 +36,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int ConstantThicknessShader___init__(BPy_ConstantThicknessShader *self,
                                             PyObject *args,
                                             PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp
index d29f996d0e6..19e35d3dcd2 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp
@@ -43,7 +43,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int ConstrainedIncreasingThicknessShader___init__(
     BPy_ConstrainedIncreasingThicknessShader *self, PyObject *args, PyObject *kwds)
 {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp
index 7101998df12..ab155907f2e 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp
@@ -44,7 +44,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int GuidingLinesShader___init__(BPy_GuidingLinesShader *self,
                                        PyObject *args,
                                        PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp
index 534b62a4093..4a4556f54c4 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp
@@ -53,7 +53,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int IncreasingColorShader___init__(BPy_IncreasingColorShader *self,
                                           PyObject *args,
                                           PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp
index 41a26008dd8..504b688171f 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp
@@ -42,7 +42,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int IncreasingThicknessShader___init__(BPy_IncreasingThicknessShader *self,
                                               PyObject *args,
                                               PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp
index 31bfb07529f..59fd14098ec 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp
@@ -43,7 +43,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int PolygonalizationShader___init__(BPy_PolygonalizationShader *self,
                                            PyObject *args,
                                            PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp
index 096ab7ce3fa..9d87b424b8d 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp
@@ -36,7 +36,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int SamplingShader___init__(BPy_SamplingShader *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"sampling", nullptr};
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp
index e97c14a66c3..0358f647d8f 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp
@@ -56,7 +56,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int SmoothingShader___init__(BPy_SmoothingShader *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp
index b33908c92b7..170d7d65fbd 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp
@@ -46,7 +46,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int SpatialNoiseShader___init__(BPy_SpatialNoiseShader *self,
                                        PyObject *args,
                                        PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.cpp
index 9d85de71dad..254bffeb473 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.cpp
@@ -36,7 +36,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int StrokeTextureStepShader___init__(BPy_StrokeTextureStepShader *self,
                                             PyObject *args,
                                             PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp
index 8591e278429..653fd2704ea 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp
@@ -38,7 +38,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int ThicknessNoiseShader___init__(BPy_ThicknessNoiseShader *self,
                                          PyObject *args,
                                          PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp
index 78eb9791b7c..2b7c03e5156 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp
@@ -37,7 +37,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg stroke: A Stroke object.\n"
     "   :type stroke: :class:`freestyle.types.Stroke`\n");
-
 static int TipRemoverShader___init__(BPy_TipRemoverShader *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"tip_length", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
index 3c36bf10149..e08b7db9e29 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
@@ -105,7 +105,6 @@ PyDoc_STRVAR(
     ".. method:: __init__()\n"
     "\n"
     "   Default constructor.\n");
-
 static int UnaryFunction0DDouble___init__(BPy_UnaryFunction0DDouble *self,
                                           PyObject *args,
                                           PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
index 9b7e75aba6b..cb7adb9e2e4 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
@@ -52,7 +52,6 @@ PyDoc_STRVAR(
     ".. method:: __init__()\n"
     "\n"
     "   Default constructor.\n");
-
 static int UnaryFunction0DEdgeNature___init__(BPy_UnaryFunction0DEdgeNature *self,
                                               PyObject *args,
                                               PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
index 214c2a3c999..cbb079b8491 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
@@ -85,7 +85,6 @@ PyDoc_STRVAR(
     ".. method:: __init__()\n"
     "\n"
     "   Default constructor.\n");
-
 static int UnaryFunction0DFloat___init__(BPy_UnaryFunction0DFloat *self,
                                          PyObject *args,
                                          PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
index bcbe1b14acd..75f7da9358e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
@@ -51,7 +51,6 @@ PyDoc_STRVAR(
     ".. method:: __init__()\n"
     "\n"
     "   Default constructor.\n");
-
 static int UnaryFunction0DId___init__(BPy_UnaryFunction0DId *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
index 372a1ebed93..4530d204b7d 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
@@ -52,7 +52,6 @@ PyDoc_STRVAR(
     ".. method:: __init__()\n"
     "\n"
     "   Default constructor.\n");
-
 static int UnaryFunction0DMaterial___init__(BPy_UnaryFunction0DMaterial *self,
                                             PyObject *args,
                                             PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
index 2700aae0613..db522c0043d 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
@@ -55,7 +55,6 @@ PyDoc_STRVAR(
     ".. method:: __init__()\n"
     "\n"
     "   Default constructor.\n");
-
 static int UnaryFunction0DUnsigned___init__(BPy_UnaryFunction0DUnsigned *self,
                                             PyObject *args,
                                             PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
index 00068862645..742005330ee 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
@@ -58,7 +58,6 @@ PyDoc_STRVAR(
     ".. method:: __init__()\n"
     "\n"
     "   Default constructor.\n");
-
 static int UnaryFunction0DVec2f___init__(BPy_UnaryFunction0DVec2f *self,
                                          PyObject *args,
                                          PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
index 8d9b7d5fdaf..5f00c282d5e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
@@ -52,7 +52,6 @@ PyDoc_STRVAR(
     ".. method:: __init__()\n"
     "\n"
     "   Default constructor.\n");
-
 static int UnaryFunction0DVec3f___init__(BPy_UnaryFunction0DVec3f *self,
                                          PyObject *args,
                                          PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
index b6977aa528d..9a29aef1a21 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
@@ -55,7 +55,6 @@ PyDoc_STRVAR(
     ".. method:: __init__()\n"
     "\n"
     "   Default constructor.\n");
-
 static int UnaryFunction0DVectorViewShape___init__(BPy_UnaryFunction0DVectorViewShape *self,
                                                    PyObject *args,
                                                    PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
index 47b3c2f3de3..b0530fee264 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
@@ -58,7 +58,6 @@ PyDoc_STRVAR(
     ".. method:: __init__()\n"
     "\n"
     "   Default constructor.\n");
-
 static int UnaryFunction0DViewShape___init__(BPy_UnaryFunction0DViewShape *self,
                                              PyObject *args,
                                              PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp
index 09121d67efd..374280df4c0 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp
@@ -42,7 +42,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: The Id of the Shape the pointed Interface0D belongs to.\n"
     "   :rtype: :class:`freestyle.types.Id`\n");
-
 static int ShapeIdF0D___init__(BPy_ShapeIdF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
index 26120fc022a..6a7ce6d4423 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
@@ -45,7 +45,6 @@ PyDoc_STRVAR(
     "   :return: The material of the object evaluated at the pointed\n"
     "      Interface0D.\n"
     "   :rtype: :class:`freestyle.types.Material`\n");
-
 static int MaterialF0D___init__(BPy_MaterialF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp
index b3a9b57fbf6..bd877bf6889 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp
@@ -36,7 +36,6 @@ PyDoc_STRVAR(
     "   :return: The nature of the 1D element to which the pointed Interface0D\n"
     "      belongs.\n"
     "   :rtype: :class:`freestyle.types.Nature`\n");
-
 static int CurveNatureF0D___init__(BPy_CurveNatureF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp
index e954335e3be..316d6af3a03 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp
@@ -38,7 +38,6 @@ PyDoc_STRVAR(
     "   :return: The 2D normal of the 1D element evaluated at the pointed\n"
     "      Interface0D.\n"
     "   :rtype: :class:`mathutils.Vector`\n");
-
 static int Normal2DF0D___init__(BPy_Normal2DF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp
index e3369a3ede2..f323ab23fd4 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp
@@ -38,7 +38,6 @@ PyDoc_STRVAR(
     "   :return: The 2D oriented tangent to the 1D element evaluated at the\n"
     "      pointed Interface0D.\n"
     "   :rtype: :class:`mathutils.Vector`\n");
-
 static int VertexOrientation2DF0D___init__(BPy_VertexOrientation2DF0D *self,
                                            PyObject *args,
                                            PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp
index e8f039f1b6d..a7b2a41531f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp
@@ -38,7 +38,6 @@ PyDoc_STRVAR(
     "   :return: The 3D oriented tangent to the 1D element evaluated at the\n"
     "      pointed Interface0D.\n"
     "   :rtype: :class:`mathutils.Vector`\n");
-
 static int VertexOrientation3DF0D___init__(BPy_VertexOrientation3DF0D *self,
                                            PyObject *args,
                                            PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp
index a480aa5853a..6c631783a1e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp
@@ -35,7 +35,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: The ViewShape occluded by the pointed Interface0D.\n"
     "   :rtype: :class:`freestyle.types.ViewShape`\n");
-
 static int GetOccludeeF0D___init__(BPy_GetOccludeeF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp
index e907c01c53f..f2357159e84 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp
@@ -35,7 +35,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: The ViewShape containing the pointed Interface0D.\n"
     "   :rtype: :class:`freestyle.types.ViewShape`\n");
-
 static int GetShapeF0D___init__(BPy_GetShapeF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp
index c464eeb9ecd..0f860e857f7 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp
@@ -38,7 +38,6 @@ PyDoc_STRVAR(
     "   :return: The 2D curvature of the 1D element evaluated at the\n"
     "      pointed Interface0D.\n"
     "   :rtype: float\n");
-
 static int Curvature2DAngleF0D___init__(BPy_Curvature2DAngleF0D *self,
                                         PyObject *args,
                                         PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp
index 438a18c8498..37e0d66acc4 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp
@@ -44,7 +44,6 @@ PyDoc_STRVAR(
     "   :return: The density of the image evaluated at the pointed\n"
     "      Interface0D.\n"
     "   :rtype: float\n");
-
 static int DensityF0D___init__(BPy_DensityF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"sigma", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp
index bf6adfdf38d..d84cef60f40 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp
@@ -35,7 +35,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: The X 3D projected coordinate of the pointed Interface0D.\n"
     "   :rtype: float\n");
-
 static int GetProjectedXF0D___init__(BPy_GetProjectedXF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp
index d9e2e93f416..a7fc6ba036a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp
@@ -35,7 +35,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: The Y 3D projected coordinate of the pointed Interface0D.\n"
     "   :rtype: float\n");
-
 static int GetProjectedYF0D___init__(BPy_GetProjectedYF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp
index bcb64acce8b..72b360c5dd1 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp
@@ -35,7 +35,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: The Z 3D projected coordinate of the pointed Interface0D.\n"
     "   :rtype: float\n");
-
 static int GetProjectedZF0D___init__(BPy_GetProjectedZF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp
index 4b134515608..1c06695fbf9 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp
@@ -35,7 +35,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: The X 3D coordinate of the pointed Interface0D.\n"
     "   :rtype: float\n");
-
 static int GetXF0D___init__(BPy_GetXF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp
index 8227fdc363a..5fe699481ce 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp
@@ -35,7 +35,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: The Y 3D coordinate of the pointed Interface0D.\n"
     "   :rtype: float\n");
-
 static int GetYF0D___init__(BPy_GetYF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp
index 7d95737319d..a9451802c66 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp
@@ -35,7 +35,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: The Z 3D coordinate of the pointed Interface0D.\n"
     "   :rtype: float\n");
-
 static int GetZF0D___init__(BPy_GetZF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp
index e9c07bd83c4..d8ce106177b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: The average depth around the pointed Interface0D.\n"
     "   :rtype: float\n");
-
 static int LocalAverageDepthF0D___init__(BPy_LocalAverageDepthF0D *self,
                                          PyObject *args,
                                          PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
index 4c9d4e63315..90803d0888b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :return: The normalized distance between the pointed Interface0D\n"
     "      and the occludee.\n"
     "   :rtype: float\n");
-
 static int ZDiscontinuityF0D___init__(BPy_ZDiscontinuityF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp
index 1dd6e1cd42c..9c8ce1862d2 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp
@@ -36,7 +36,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: The curvilinear abscissa of the pointed Interface0D.\n"
     "   :rtype: float\n");
-
 static int GetCurvilinearAbscissaF0D___init__(BPy_GetCurvilinearAbscissaF0D *self,
                                               PyObject *args,
                                               PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp
index 1351bc6210b..4954093eddc 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp
@@ -35,7 +35,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: The parameter of an Interface0D.\n"
     "   :rtype: float\n");
-
 static int GetParameterF0D___init__(BPy_GetParameterF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp
index 7bfba6de2bd..f04508f859a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :return: The norm of the gradient of the global viewmap density\n"
     "      image.\n"
     "   :rtype: float\n");
-
 static int GetViewMapGradientNormF0D___init__(BPy_GetViewMapGradientNormF0D *self,
                                               PyObject *args,
                                               PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp
index d1dcbcd05cb..18981ec908c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp
@@ -38,7 +38,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: A pixel in one of the level of the complete viewmap.\n"
     "   :rtype: float\n");
-
 static int ReadCompleteViewMapPixelF0D___init__(BPy_ReadCompleteViewMapPixelF0D *self,
                                                 PyObject *args,
                                                 PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp
index 6cea96a2b21..02f51b4c1d8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: A pixel in a map.\n"
     "   :rtype: float\n");
-
 static int ReadMapPixelF0D___init__(BPy_ReadMapPixelF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"map_name", "level", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp
index 09d72bf2928..d1e62e36edb 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp
@@ -43,7 +43,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: A pixel in one of the level of one of the steerable viewmaps.\n"
     "   :rtype: float\n");
-
 static int ReadSteerableViewMapPixelF0D___init__(BPy_ReadSteerableViewMapPixelF0D *self,
                                                  PyObject *args,
                                                  PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp
index 08019cbbdac..669b6282bec 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp
@@ -41,7 +41,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: The quantitative invisibility of the pointed Interface0D.\n"
     "   :rtype: int\n");
-
 static int QuantitativeInvisibilityF0D___init__(BPy_QuantitativeInvisibilityF0D *self,
                                                 PyObject *args,
                                                 PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp
index 3cc22566777..d6f03a43b98 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp
@@ -36,7 +36,6 @@ PyDoc_STRVAR(
     "   :return: A list of ViewShape objects occluding the pointed\n"
     "      Interface0D.\n"
     "   :rtype: list[:class:`freestyle.types.ViewShape`]\n");
-
 static int GetOccludersF0D___init__(BPy_GetOccludersF0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
index 34d958cf0aa..f890517ed50 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
@@ -140,7 +140,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg integration_type: An integration method.\n"
     "   :type integration_type: :class:`IntegrationType`\n");
-
 static int UnaryFunction1DDouble___init__(BPy_UnaryFunction1DDouble *self,
                                           PyObject *args,
                                           PyObject *kwds)
@@ -209,8 +208,7 @@ PyDoc_STRVAR(
     integration_type_doc,
     "The integration method.\n"
     "\n"
-    ":type: :class:`IntegrationType`");
-
+    ":type: :class:`IntegrationType`\n");
 static PyObject *integration_type_get(BPy_UnaryFunction1DDouble *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(self->uf1D_double->getIntegrationType());
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
index 6d97032e77e..07837a874f3 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
@@ -58,7 +58,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg integration_type: An integration method.\n"
     "   :type integration_type: :class:`IntegrationType`\n");
-
 static int UnaryFunction1DEdgeNature___init__(BPy_UnaryFunction1DEdgeNature *self,
                                               PyObject *args,
                                               PyObject *kwds)
@@ -129,8 +128,7 @@ PyDoc_STRVAR(
     integration_type_doc,
     "The integration method.\n"
     "\n"
-    ":type: :class:`IntegrationType`");
-
+    ":type: :class:`IntegrationType`\n");
 static PyObject *integration_type_get(BPy_UnaryFunction1DEdgeNature *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(self->uf1D_edgenature->getIntegrationType());
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
index 0dea3f08ed8..b95c27cfea2 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
@@ -50,7 +50,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg integration_type: An integration method.\n"
     "   :type integration_type: :class:`IntegrationType`\n");
-
 static int UnaryFunction1DFloat___init__(BPy_UnaryFunction1DFloat *self,
                                          PyObject *args,
                                          PyObject *kwds)
@@ -119,8 +118,7 @@ PyDoc_STRVAR(
     integration_type_doc,
     "The integration method.\n"
     "\n"
-    ":type: :class:`IntegrationType`");
-
+    ":type: :class:`IntegrationType`\n");
 static PyObject *integration_type_get(BPy_UnaryFunction1DFloat *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(self->uf1D_float->getIntegrationType());
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
index 6c413268b95..bcc75051ac0 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
@@ -61,7 +61,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg integration_type: An integration method.\n"
     "   :type integration_type: :class:`IntegrationType`\n");
-
 static int UnaryFunction1DUnsigned___init__(BPy_UnaryFunction1DUnsigned *self,
                                             PyObject *args,
                                             PyObject *kwds)
@@ -131,8 +130,7 @@ PyDoc_STRVAR(
     integration_type_doc,
     "The integration method.\n"
     "\n"
-    ":type: :class:`IntegrationType`");
-
+    ":type: :class:`IntegrationType`\n");
 static PyObject *integration_type_get(BPy_UnaryFunction1DUnsigned *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(self->uf1D_unsigned->getIntegrationType());
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
index b816e838710..e4c7cc4253e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
@@ -63,7 +63,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg integration_type: An integration method.\n"
     "   :type integration_type: :class:`IntegrationType`\n");
-
 static int UnaryFunction1DVec2f___init__(BPy_UnaryFunction1DVec2f *self,
                                          PyObject *args,
                                          PyObject *kwds)
@@ -132,8 +131,7 @@ PyDoc_STRVAR(
     integration_type_doc,
     "The integration method.\n"
     "\n"
-    ":type: :class:`IntegrationType`");
-
+    ":type: :class:`IntegrationType`\n");
 static PyObject *integration_type_get(BPy_UnaryFunction1DVec2f *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(self->uf1D_vec2f->getIntegrationType());
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
index 9befedf5dc4..cc99a715137 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
@@ -57,7 +57,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg integration_type: An integration method.\n"
     "   :type integration_type: :class:`IntegrationType`\n");
-
 static int UnaryFunction1DVec3f___init__(BPy_UnaryFunction1DVec3f *self,
                                          PyObject *args,
                                          PyObject *kwds)
@@ -126,8 +125,7 @@ PyDoc_STRVAR(
     integration_type_doc,
     "The integration method.\n"
     "\n"
-    ":type: :class:`IntegrationType`");
-
+    ":type: :class:`IntegrationType`\n");
 static PyObject *integration_type_get(BPy_UnaryFunction1DVec3f *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(self->uf1D_vec3f->getIntegrationType());
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
index c82d2224597..1d1d2192381 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
@@ -73,7 +73,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg integration_type: An integration method.\n"
     "   :type integration_type: :class:`IntegrationType`\n");
-
 static int UnaryFunction1DVectorViewShape___init__(BPy_UnaryFunction1DVectorViewShape *self,
                                                    PyObject *args,
                                                    PyObject *kwds)
@@ -152,8 +151,7 @@ PyDoc_STRVAR(
     integration_type_doc,
     "The integration method.\n"
     "\n"
-    ":type: :class:`IntegrationType`");
-
+    ":type: :class:`IntegrationType`\n");
 static PyObject *integration_type_get(BPy_UnaryFunction1DVectorViewShape *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
index b386e493c80..824993bbb36 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
@@ -70,7 +70,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg integration_type: An integration method.\n"
     "   :type integration_type: :class:`IntegrationType`\n");
-
 static int UnaryFunction1DVoid___init__(BPy_UnaryFunction1DVoid *self,
                                         PyObject *args,
                                         PyObject *kwds)
@@ -139,8 +138,7 @@ PyDoc_STRVAR(
     integration_type_doc,
     "The integration method.\n"
     "\n"
-    ":type: :class:`IntegrationType`");
-
+    ":type: :class:`IntegrationType`\n");
 static PyObject *integration_type_get(BPy_UnaryFunction1DVoid *self, void * /*closure*/)
 {
   return BPy_IntegrationType_from_IntegrationType(self->uf1D_void->getIntegrationType());
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp
index 047740bdfa1..1d26e2beb27 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp
@@ -46,7 +46,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The nature of the Interface1D.\n"
     "   :rtype: :class:`freestyle.types.Nature`\n");
-
 static int CurveNatureF1D___init__(BPy_CurveNatureF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"integration_type", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp
index 98ded1114a6..03e156332db 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The 2D normal for the Interface1D.\n"
     "   :rtype: :class:`mathutils.Vector`\n");
-
 static int Normal2DF1D___init__(BPy_Normal2DF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"integration_type", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp
index 4e1fc1d9857..ae9dc52df6d 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The 2D orientation of the Interface1D.\n"
     "   :rtype: :class:`mathutils.Vector`\n");
-
 static int Orientation2DF1D___init__(BPy_Orientation2DF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"integration_type", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp
index cb1ee285ec2..82f92d6285b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The 3D orientation of the Interface1D.\n"
     "   :rtype: :class:`mathutils.Vector`\n");
-
 static int Orientation3DF1D___init__(BPy_Orientation3DF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"integration_type", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp
index ddf07344404..3d9b2912880 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The 2D curvature as an angle.\n"
     "   :rtype: float\n");
-
 static int Curvature2DAngleF1D___init__(BPy_Curvature2DAngleF1D *self,
                                         PyObject *args,
                                         PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp
index c4e5cf698e7..b94027aa6e2 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp
@@ -52,7 +52,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The density evaluated for an Interface1D.\n"
     "   :rtype: float\n");
-
 static int DensityF1D___init__(BPy_DensityF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"sigma", "integration_type", "sampling", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp
index 107366deb32..b33ee19e044 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp
@@ -54,7 +54,6 @@ PyDoc_STRVAR(
     "   :return: The density evaluated for the Interface1D in the complete\n"
     "      viewmap image.\n"
     "   :rtype: float\n");
-
 static int GetCompleteViewMapDensityF1D___init__(BPy_GetCompleteViewMapDensityF1D *self,
                                                  PyObject *args,
                                                  PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
index d4f2faf9163..ff0ef0ab328 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
@@ -62,7 +62,6 @@ PyDoc_STRVAR(
     "   :return: the density evaluated for an Interface1D in of the\n"
     "      steerable viewmaps image.\n"
     "   :rtype: float\n");
-
 static int GetDirectionalViewMapDensityF1D___init__(BPy_GetDirectionalViewMapDensityF1D *self,
                                                     PyObject *args,
                                                     PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp
index 848a902d7fe..b8ed7248ceb 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The projected X 3D coordinate of an Interface1D.\n"
     "   :rtype: float\n");
-
 static int GetProjectedXF1D___init__(BPy_GetProjectedXF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"integration_type", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp
index 6ead3c986c4..a84c96d1a2a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The projected Y 3D coordinate of an Interface1D.\n"
     "   :rtype: float\n");
-
 static int GetProjectedYF1D___init__(BPy_GetProjectedYF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"integration_type", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp
index fdf66524b70..0e736a3f4e9 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The projected Z 3D coordinate of an Interface1D.\n"
     "   :rtype: float\n");
-
 static int GetProjectedZF1D___init__(BPy_GetProjectedZF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"integration_type", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp
index c1debd41fdf..9dbe6009c71 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp
@@ -51,7 +51,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The density of the ViewMap for a given Interface1D.\n"
     "   :rtype: float\n");
-
 static int GetSteerableViewMapDensityF1D___init__(BPy_GetSteerableViewMapDensityF1D *self,
                                                   PyObject *args,
                                                   PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp
index 73a012dd224..df7bf970e56 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp
@@ -51,7 +51,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The density of the ViewMap for a given Interface1D.\n"
     "   :rtype: float\n");
-
 static int GetViewMapGradientNormF1D___init__(BPy_GetViewMapGradientNormF1D *self,
                                               PyObject *args,
                                               PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp
index ed603b813aa..75b8eb7594e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The X 3D coordinate of the Interface1D.\n"
     "   :rtype: float\n");
-
 static int GetXF1D___init__(BPy_GetXF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"integration_type", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp
index 33c9c2bb330..d4e0f9d3d2e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The Y 3D coordinate of the Interface1D.\n"
     "   :rtype: float\n");
-
 static int GetYF1D___init__(BPy_GetYF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"integration_type", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp
index fea134d04c6..5f7ffae9a2e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The Z 3D coordinate of the Interface1D.\n"
     "   :rtype: float\n");
-
 static int GetZF1D___init__(BPy_GetZF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"integration_type", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp
index dff3cfcd54a..77e317df186 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp
@@ -47,7 +47,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The average depth evaluated for the Interface1D.\n"
     "   :rtype: float\n");
-
 static int LocalAverageDepthF1D___init__(BPy_LocalAverageDepthF1D *self,
                                          PyObject *args,
                                          PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
index cd36a856c15..34a243ad368 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
@@ -44,7 +44,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The normalized distance between the Interface1D and the occludee.\n"
     "   :rtype: float\n");
-
 static int ZDiscontinuityF1D___init__(BPy_ZDiscontinuityF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"integration_type", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp
index f9601e11060..26a627a860f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp
@@ -44,7 +44,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: The Quantitative Invisibility of the Interface1D.\n"
     "   :rtype: int\n");
-
 static int QuantitativeInvisibilityF1D___init__(BPy_QuantitativeInvisibilityF1D *self,
                                                 PyObject *args,
                                                 PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp
index 986ab16be1f..e58bf3766bd 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp
@@ -36,7 +36,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: A list of occluded shapes covered by the Interface1D.\n"
     "   :rtype: list[:class:`freestyle.types.ViewShape`]\n");
-
 static int GetOccludeeF1D___init__(BPy_GetOccludeeF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp
index bc643c29918..cc131435603 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp
@@ -36,7 +36,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: A list of occluding shapes that cover the Interface1D.\n"
     "   :rtype: list[:class:`freestyle.types.ViewShape`]\n");
-
 static int GetOccludersF1D___init__(BPy_GetOccludersF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp
index 1fa117e2a02..6027529745a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp
@@ -36,7 +36,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: A list of shapes covered by the Interface1D.\n"
     "   :rtype: list[:class:`freestyle.types.ViewShape`]\n");
-
 static int GetShapeF1D___init__(BPy_GetShapeF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp
index 8b3f6b5cbba..99872c248c0 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp
@@ -34,7 +34,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg inter: An Interface1D object.\n"
     "   :type inter: :class:`freestyle.types.Interface1D`\n");
-
 static int ChainingTimeStampF1D___init__(BPy_ChainingTimeStampF1D *self,
                                          PyObject *args,
                                          PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp
index c9af98cf3b9..31da81d9e54 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp
@@ -34,7 +34,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg inter: An Interface1D object.\n"
     "   :type inter: :class:`freestyle.types.Interface1D`\n");
-
 static int IncrementChainingTimeStampF1D___init__(BPy_IncrementChainingTimeStampF1D *self,
                                                   PyObject *args,
                                                   PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp
index 57747fd9459..cbd4bacbef4 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp
@@ -34,7 +34,6 @@ PyDoc_STRVAR(
     "\n"
     "   :arg inter: An Interface1D object.\n"
     "   :type inter: :class:`freestyle.types.Interface1D`\n");
-
 static int TimeStampF1D___init__(BPy_TimeStampF1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp
index 0674bef54cd..da68eedd505 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp
@@ -27,7 +27,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: False.\n"
     "   :rtype: bool\n");
-
 static int FalseUP0D___init__(BPy_FalseUP0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp
index eb02c22a754..2eac495bb66 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp
@@ -27,7 +27,6 @@ PyDoc_STRVAR(
     "   :type it: :class:`freestyle.types.Interface0DIterator`\n"
     "   :return: True.\n"
     "   :rtype: bool\n");
-
 static int TrueUP0D___init__(BPy_TrueUP0D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
index 04ef1fd98ab..79dfd15e2fb 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
@@ -28,7 +28,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: True if the Interface1D is a contour, false otherwise.\n"
     "   :rtype: bool\n");
-
 static int ContourUP1D___init__(BPy_ContourUP1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
index 6e3532957a2..9b688f9fcb1 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
@@ -41,7 +41,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: True if the density is lower than a threshold.\n"
     "   :rtype: bool\n");
-
 static int DensityLowerThanUP1D___init__(BPy_DensityLowerThanUP1D *self,
                                          PyObject *args,
                                          PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
index 872996bf214..0bbcec62c89 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
@@ -38,7 +38,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: True if the time stamp is equal to a user-defined value.\n"
     "   :rtype: bool\n");
-
 static int EqualToChainingTimeStampUP1D___init__(BPy_EqualToChainingTimeStampUP1D *self,
                                                  PyObject *args,
                                                  PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
index bc7c3ee766b..7431899d4a7 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
@@ -37,7 +37,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: True if the time stamp is equal to a user-defined value.\n"
     "   :rtype: bool\n");
-
 static int EqualToTimeStampUP1D___init__(BPy_EqualToTimeStampUP1D *self,
                                          PyObject *args,
                                          PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
index f05143f10aa..2bf53cf8ae2 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
@@ -30,7 +30,6 @@ PyDoc_STRVAR(
     "   :return: True if the Interface1D is an external contour, false\n"
     "      otherwise.\n"
     "   :rtype: bool\n");
-
 static int ExternalContourUP1D___init__(BPy_ExternalContourUP1D *self,
                                         PyObject *args,
                                         PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
index f994373d772..2b59a0f583c 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
@@ -27,7 +27,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: False.\n"
     "   :rtype: bool\n");
-
 static int FalseUP1D___init__(BPy_FalseUP1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
index fd961dd6268..86e49b5ae76 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :return: True if Quantitative Invisibility equals a user-defined\n"
     "      value.\n"
     "   :rtype: bool\n");
-
 static int QuantitativeInvisibilityUP1D___init__(BPy_QuantitativeInvisibilityUP1D *self,
                                                  PyObject *args,
                                                  PyObject *kwds)
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
index dd5e0e4ae7e..aa0e2926bd9 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :return: True if Interface1D belongs to the shape of the\n"
     "      user-specified Id.\n"
     "   :rtype: bool\n");
-
 static int ShapeUP1D___init__(BPy_ShapeUP1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {"first", "second", nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
index ee2678f8572..d62be84c59f 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
@@ -27,7 +27,6 @@ PyDoc_STRVAR(
     "   :type inter: :class:`freestyle.types.Interface1D`\n"
     "   :return: True.\n"
     "   :rtype: bool\n");
-
 static int TrueUP1D___init__(BPy_TrueUP1D *self, PyObject *args, PyObject *kwds)
 {
   static const char *kwlist[] = {nullptr};
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp
index 2d1385e1abe..8db30075b0a 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp
@@ -36,7 +36,6 @@ PyDoc_STRVAR(
     ".. method:: __call__(inter)\n"
     "\n"
     "   Returns true if the Interface1D intersects with image boundary.\n");
-
 static int WithinImageBoundaryUP1D___init__(BPy_WithinImageBoundaryUP1D *self,
                                             PyObject *args,
                                             PyObject *kwds)
diff --git a/source/blender/python/bmesh/bmesh_py_api.cc b/source/blender/python/bmesh/bmesh_py_api.cc
index 88ec4f4a60e..da1e5402b5c 100644
--- a/source/blender/python/bmesh/bmesh_py_api.cc
+++ b/source/blender/python/bmesh/bmesh_py_api.cc
@@ -40,7 +40,6 @@ PyDoc_STRVAR(
     "   :type use_operators: bool\n"
     "   :return: Return a new, empty BMesh.\n"
     "   :rtype: :class:`bmesh.types.BMesh`\n");
-
 static PyObject *bpy_bm_new(PyObject * /*self*/, PyObject *args, PyObject *kw)
 {
   static const char *kwlist[] = {"use_operators", nullptr};
diff --git a/source/blender/python/bmesh/bmesh_py_geometry.cc b/source/blender/python/bmesh/bmesh_py_geometry.cc
index ce03568ed64..00daf6f59ce 100644
--- a/source/blender/python/bmesh/bmesh_py_geometry.cc
+++ b/source/blender/python/bmesh/bmesh_py_geometry.cc
@@ -62,7 +62,7 @@ static PyMethodDef BPy_BM_geometry_methods[] = {
 PyDoc_STRVAR(
     /* Wrap. */
     BPy_BM_utils_doc,
-    "This module provides access to bmesh geometry evaluation functions.");
+    "This module provides access to bmesh geometry evaluation functions.\n");
 static PyModuleDef BPy_BM_geometry_module_def = {
     /*m_base*/ PyModuleDef_HEAD_INIT,
     /*m_name*/ "bmesh.geometry",
diff --git a/source/blender/python/bmesh/bmesh_py_ops.cc b/source/blender/python/bmesh/bmesh_py_ops.cc
index 68855cedce1..4ec3b508d67 100644
--- a/source/blender/python/bmesh/bmesh_py_ops.cc
+++ b/source/blender/python/bmesh/bmesh_py_ops.cc
@@ -253,7 +253,7 @@ static PyMethodDef BPy_BM_ops_methods[] = {
 PyDoc_STRVAR(
     /* Wrap. */
     BPy_BM_ops_doc,
-    "Access to BMesh operators");
+    "Access to BMesh operators.");
 static PyModuleDef BPy_BM_ops_module_def = {
     /*m_base*/ PyModuleDef_HEAD_INIT,
     /*m_name*/ "bmesh.ops",
diff --git a/source/blender/python/bmesh/bmesh_py_types.cc b/source/blender/python/bmesh/bmesh_py_types.cc
index c1f0438a1b4..848773b21ad 100644
--- a/source/blender/python/bmesh/bmesh_py_types.cc
+++ b/source/blender/python/bmesh/bmesh_py_types.cc
@@ -96,31 +96,31 @@ PyDoc_STRVAR(
     bpy_bm_elem_select_doc,
     "Selected state of this element.\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bm_elem_hide_doc,
     "Hidden state of this element.\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bm_elem_tag_doc,
     "Generic attribute scripts can use for own logic\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bm_elem_smooth_doc,
     "Smooth state of this element.\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bm_elem_seam_doc,
     "Seam for UV unwrapping.\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 
 static PyObject *bpy_bm_elem_hflag_get(BPy_BMElem *self, void *flag)
 {
@@ -204,7 +204,7 @@ PyDoc_STRVAR(
     bpy_bmvertseq_doc,
     "This meshes vert sequence (read-only).\n"
     "\n"
-    ":type: :class:`BMVertSeq`");
+    ":type: :class:`BMVertSeq`\n");
 static PyObject *bpy_bmvertseq_get(BPy_BMesh *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -216,7 +216,7 @@ PyDoc_STRVAR(
     bpy_bmedgeseq_doc,
     "This meshes edge sequence (read-only).\n"
     "\n"
-    ":type: :class:`BMEdgeSeq`");
+    ":type: :class:`BMEdgeSeq`\n");
 static PyObject *bpy_bmedgeseq_get(BPy_BMesh *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -228,7 +228,7 @@ PyDoc_STRVAR(
     bpy_bmfaceseq_doc,
     "This meshes face sequence (read-only).\n"
     "\n"
-    ":type: :class:`BMFaceSeq`");
+    ":type: :class:`BMFaceSeq`\n");
 static PyObject *bpy_bmfaceseq_get(BPy_BMesh *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -252,18 +252,24 @@ static PyObject *bpy_bmloopseq_get(BPy_BMesh *self, void * /*closure*/)
 }
 
 /* vert */
-PyDoc_STRVAR(bpy_bmvert_link_edges_doc,
-             "Edges connected to this vertex (read-only).\n"
-             "\n"
-             ":type: :class:`BMElemSeq` of :class:`BMEdge`");
-PyDoc_STRVAR(bpy_bmvert_link_faces_doc,
-             "Faces connected to this vertex (read-only).\n"
-             "\n"
-             ":type: :class:`BMElemSeq` of :class:`BMFace`");
-PyDoc_STRVAR(bpy_bmvert_link_loops_doc,
-             "Loops that use this vertex (read-only).\n"
-             "\n"
-             ":type: :class:`BMElemSeq` of :class:`BMLoop`");
+PyDoc_STRVAR(
+    /* Wrap. */
+    bpy_bmvert_link_edges_doc,
+    "Edges connected to this vertex (read-only).\n"
+    "\n"
+    ":type: :class:`BMElemSeq` of :class:`BMEdge`\n");
+PyDoc_STRVAR(
+    /* Wrap. */
+    bpy_bmvert_link_faces_doc,
+    "Faces connected to this vertex (read-only).\n"
+    "\n"
+    ":type: :class:`BMElemSeq` of :class:`BMFace`\n");
+PyDoc_STRVAR(
+    /* Wrap. */
+    bpy_bmvert_link_loops_doc,
+    "Loops that use this vertex (read-only).\n"
+    "\n"
+    ":type: :class:`BMElemSeq` of :class:`BMLoop`\n");
 /* edge */
 PyDoc_STRVAR(
     /* Wrap. */
@@ -271,39 +277,45 @@ PyDoc_STRVAR(
     "Verts this edge uses (always 2), (read-only).\n"
     "\n"
     ":type: :class:`BMElemSeq` of "
-    ":class:`BMVert`");
-PyDoc_STRVAR(bpy_bmedge_link_faces_doc,
-             "Faces connected to this edge, (read-only).\n"
-             "\n"
-             ":type: :class:`BMElemSeq` of :class:`BMFace`");
-PyDoc_STRVAR(bpy_bmedge_link_loops_doc,
-             "Loops connected to this edge, (read-only).\n"
-             "\n"
-             ":type: :class:`BMElemSeq` of :class:`BMLoop`");
+    ":class:`BMVert`\n");
+PyDoc_STRVAR(
+    /* Wrap. */
+    bpy_bmedge_link_faces_doc,
+    "Faces connected to this edge, (read-only).\n"
+    "\n"
+    ":type: :class:`BMElemSeq` of :class:`BMFace`\n");
+PyDoc_STRVAR(
+    /* Wrap. */
+    bpy_bmedge_link_loops_doc,
+    "Loops connected to this edge, (read-only).\n"
+    "\n"
+    ":type: :class:`BMElemSeq` of :class:`BMLoop`\n");
 /* face */
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmface_verts_doc,
     "Verts of this face, (read-only).\n"
     "\n"
-    ":type: :class:`BMElemSeq` of :class:`BMVert`");
+    ":type: :class:`BMElemSeq` of :class:`BMVert`\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmface_edges_doc,
     "Edges of this face, (read-only).\n"
     "\n"
-    ":type: :class:`BMElemSeq` of :class:`BMEdge`");
+    ":type: :class:`BMElemSeq` of :class:`BMEdge`\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmface_loops_doc,
     "Loops of this face, (read-only).\n"
     "\n"
-    ":type: :class:`BMElemSeq` of :class:`BMLoop`");
+    ":type: :class:`BMElemSeq` of :class:`BMLoop`\n");
 /* loop */
-PyDoc_STRVAR(bpy_bmloops_link_loops_doc,
-             "Loops connected to this loop, (read-only).\n"
-             "\n"
-             ":type: :class:`BMElemSeq` of :class:`BMLoop`");
+PyDoc_STRVAR(
+    /* Wrap. */
+    bpy_bmloops_link_loops_doc,
+    "Loops connected to this loop, (read-only).\n"
+    "\n"
+    ":type: :class:`BMElemSeq` of :class:`BMLoop`\n");
 
 static PyObject *bpy_bmelemseq_elem_get(BPy_BMElem *self, void *itype)
 {
@@ -316,16 +328,18 @@ PyDoc_STRVAR(
     bpy_bm_is_valid_doc,
     "True when this element is valid (hasn't been removed).\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 static PyObject *bpy_bm_is_valid_get(BPy_BMGeneric *self, void * /*closure*/)
 {
   return PyBool_FromLong(BPY_BM_IS_VALID(self));
 }
 
-PyDoc_STRVAR(bpy_bmesh_is_wrapped_doc,
-             "True when this mesh is owned by blender (typically the editmode BMesh).\n"
-             "\n"
-             ":type: bool");
+PyDoc_STRVAR(
+    /* Wrap. */
+    bpy_bmesh_is_wrapped_doc,
+    "True when this mesh is owned by blender (typically the editmode BMesh).\n"
+    "\n"
+    ":type: bool\n");
 static PyObject *bpy_bmesh_is_wrapped_get(BPy_BMesh *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -339,7 +353,7 @@ PyDoc_STRVAR(
     "The selection mode, values can be {'VERT', 'EDGE', 'FACE'}, cannot be assigned an empty "
     "set.\n"
     "\n"
-    ":type: set");
+    ":type: set\n");
 static PyObject *bpy_bmesh_select_mode_get(BPy_BMesh *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -372,7 +386,7 @@ PyDoc_STRVAR(
     "Sequence of selected items (the last is displayed as active).\n"
     "\n"
     ":type: "
-    ":class:`BMEditSelSeq`");
+    ":class:`BMEditSelSeq`\n");
 static PyObject *bpy_bmesh_select_history_get(BPy_BMesh *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -396,7 +410,7 @@ PyDoc_STRVAR(
     "The coordinates for this vertex as a 3D, wrapped vector.\n"
     "\n"
     ":type: "
-    ":class:`mathutils.Vector`");
+    ":class:`mathutils.Vector`\n");
 static PyObject *bpy_bmvert_co_get(BPy_BMVert *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -414,10 +428,12 @@ static int bpy_bmvert_co_set(BPy_BMVert *self, PyObject *value, void * /*closure
   return -1;
 }
 
-PyDoc_STRVAR(bpy_bmvert_normal_doc,
-             "The normal for this vertex as a 3D, wrapped vector.\n"
-             "\n"
-             ":type: :class:`mathutils.Vector`");
+PyDoc_STRVAR(
+    /* Wrap. */
+    bpy_bmvert_normal_doc,
+    "The normal for this vertex as a 3D, wrapped vector.\n"
+    "\n"
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *bpy_bmvert_normal_get(BPy_BMVert *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -440,7 +456,7 @@ PyDoc_STRVAR(
     bpy_bmvert_is_manifold_doc,
     "True when this vertex is manifold (read-only).\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 static PyObject *bpy_bmvert_is_manifold_get(BPy_BMVert *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -452,17 +468,19 @@ PyDoc_STRVAR(
     bpy_bmvert_is_wire_doc,
     "True when this vertex is not connected to any faces (read-only).\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 static PyObject *bpy_bmvert_is_wire_get(BPy_BMVert *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
   return PyBool_FromLong(BM_vert_is_wire(self->v));
 }
 
-PyDoc_STRVAR(bpy_bmvert_is_boundary_doc,
-             "True when this vertex is connected to boundary edges (read-only).\n"
-             "\n"
-             ":type: bool");
+PyDoc_STRVAR(
+    /* Wrap. */
+    bpy_bmvert_is_boundary_doc,
+    "True when this vertex is connected to boundary edges (read-only).\n"
+    "\n"
+    ":type: bool\n");
 static PyObject *bpy_bmvert_is_boundary_get(BPy_BMVert *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -477,7 +495,7 @@ PyDoc_STRVAR(
     bpy_bmedge_is_manifold_doc,
     "True when this edge is manifold (read-only).\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 static PyObject *bpy_bmedge_is_manifold_get(BPy_BMEdge *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -490,7 +508,7 @@ PyDoc_STRVAR(
     "True when this edge is manifold, between two faces with the same winding "
     "(read-only).\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 static PyObject *bpy_bmedge_is_contiguous_get(BPy_BMEdge *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -502,7 +520,7 @@ PyDoc_STRVAR(
     bpy_bmedge_is_convex_doc,
     "True when this edge joins two convex faces, depends on a valid face normal (read-only).\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 static PyObject *bpy_bmedge_is_convex_get(BPy_BMEdge *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -514,7 +532,7 @@ PyDoc_STRVAR(
     bpy_bmedge_is_wire_doc,
     "True when this edge is not connected to any faces (read-only).\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 static PyObject *bpy_bmedge_is_wire_get(BPy_BMEdge *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -526,7 +544,7 @@ PyDoc_STRVAR(
     bpy_bmedge_is_boundary_doc,
     "True when this edge is at the boundary of a face (read-only).\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 static PyObject *bpy_bmedge_is_boundary_get(BPy_BMEdge *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -536,10 +554,12 @@ static PyObject *bpy_bmedge_is_boundary_get(BPy_BMEdge *self, void * /*closure*/
 /* Face
  * ^^^^ */
 
-PyDoc_STRVAR(bpy_bmface_normal_doc,
-             "The normal for this face as a 3D, wrapped vector.\n"
-             "\n"
-             ":type: :class:`mathutils.Vector`");
+PyDoc_STRVAR(
+    /* Warp. */
+    bpy_bmface_normal_doc,
+    "The normal for this face as a 3D, wrapped vector.\n"
+    "\n"
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *bpy_bmface_normal_get(BPy_BMFace *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -562,7 +582,7 @@ PyDoc_STRVAR(
     bpy_bmface_material_index_doc,
     "The face's material index.\n"
     "\n"
-    ":type: int");
+    ":type: int\n");
 static PyObject *bpy_bmface_material_index_get(BPy_BMFace *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -598,17 +618,19 @@ PyDoc_STRVAR(
     bpy_bmloop_vert_doc,
     "The loop's vertex (read-only).\n"
     "\n"
-    ":type: :class:`BMVert`");
+    ":type: :class:`BMVert`\n");
 static PyObject *bpy_bmloop_vert_get(BPy_BMLoop *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
   return BPy_BMVert_CreatePyObject(self->bm, self->l->v);
 }
 
-PyDoc_STRVAR(bpy_bmloop_edge_doc,
-             "The loop's edge (between this loop and the next), (read-only).\n"
-             "\n"
-             ":type: :class:`BMEdge`");
+PyDoc_STRVAR(
+    /* Wrap. */
+    bpy_bmloop_edge_doc,
+    "The loop's edge (between this loop and the next), (read-only).\n"
+    "\n"
+    ":type: :class:`BMEdge`\n");
 static PyObject *bpy_bmloop_edge_get(BPy_BMLoop *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -620,7 +642,7 @@ PyDoc_STRVAR(
     bpy_bmloop_face_doc,
     "The face this loop makes (read-only).\n"
     "\n"
-    ":type: :class:`BMFace`");
+    ":type: :class:`BMFace`\n");
 static PyObject *bpy_bmloop_face_get(BPy_BMLoop *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -632,7 +654,7 @@ PyDoc_STRVAR(
     bpy_bmloop_link_loop_next_doc,
     "The next face corner (read-only).\n"
     "\n"
-    ":type: :class:`BMLoop`");
+    ":type: :class:`BMLoop`\n");
 static PyObject *bpy_bmloop_link_loop_next_get(BPy_BMLoop *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -644,7 +666,7 @@ PyDoc_STRVAR(
     bpy_bmloop_link_loop_prev_doc,
     "The previous face corner (read-only).\n"
     "\n"
-    ":type: :class:`BMLoop`");
+    ":type: :class:`BMLoop`\n");
 static PyObject *bpy_bmloop_link_loop_prev_get(BPy_BMLoop *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -656,7 +678,7 @@ PyDoc_STRVAR(
     bpy_bmloop_link_loop_radial_next_doc,
     "The next loop around the edge (read-only).\n"
     "\n"
-    ":type: :class:`BMLoop`");
+    ":type: :class:`BMLoop`\n");
 static PyObject *bpy_bmloop_link_loop_radial_next_get(BPy_BMLoop *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -668,7 +690,7 @@ PyDoc_STRVAR(
     bpy_bmloop_link_loop_radial_prev_doc,
     "The previous loop around the edge (read-only).\n"
     "\n"
-    ":type: :class:`BMLoop`");
+    ":type: :class:`BMLoop`\n");
 static PyObject *bpy_bmloop_link_loop_radial_prev_get(BPy_BMLoop *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -681,7 +703,7 @@ PyDoc_STRVAR(
     "True when this loop is at the convex corner of a face, depends on a valid face "
     "normal (read-only).\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 static PyObject *bpy_bmloop_is_convex_get(BPy_BMLoop *self, void * /*closure*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -697,25 +719,25 @@ PyDoc_STRVAR(
     bpy_bmelemseq_layers_vert_doc,
     "custom-data layers (read-only).\n"
     "\n"
-    ":type: :class:`BMLayerAccessVert`");
+    ":type: :class:`BMLayerAccessVert`\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmelemseq_layers_edge_doc,
     "custom-data layers (read-only).\n"
     "\n"
-    ":type: :class:`BMLayerAccessEdge`");
+    ":type: :class:`BMLayerAccessEdge`\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmelemseq_layers_face_doc,
     "custom-data layers (read-only).\n"
     "\n"
-    ":type: :class:`BMLayerAccessFace`");
+    ":type: :class:`BMLayerAccessFace`\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmelemseq_layers_loop_doc,
     "custom-data layers (read-only).\n"
     "\n"
-    ":type: :class:`BMLayerAccessLoop`");
+    ":type: :class:`BMLayerAccessLoop`\n");
 static PyObject *bpy_bmelemseq_layers_get(BPy_BMElemSeq *self, void *htype)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -731,7 +753,7 @@ PyDoc_STRVAR(
     bpy_bmfaceseq_active_doc,
     "active face.\n"
     "\n"
-    ":type: :class:`BMFace` or None");
+    ":type: :class:`BMFace` | None\n");
 static PyObject *bpy_bmfaceseq_active_get(BPy_BMElemSeq *self, void * /*closure*/)
 {
   BMesh *bm = self->bm;
@@ -1471,7 +1493,6 @@ PyDoc_STRVAR(
     "   .. note::\n"
     "\n"
     "      The normal of any vertex where :attr:`is_wire` is True will be a zero vector.\n");
-
 static PyObject *bpy_bmesh_normal_update(BPy_BMesh *self)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -2899,7 +2920,7 @@ PyDoc_STRVAR(
     "   Ensure internal data needed for int subscription is initialized with "
     "verts/edges/faces, eg ``bm.verts[index]``.\n"
     "\n"
-    "   This needs to be called again after adding/removing data in this sequence.");
+    "   This needs to be called again after adding/removing data in this sequence.\n");
 static PyObject *bpy_bmelemseq_ensure_lookup_table(BPy_BMElemSeq *self)
 {
   BPY_BM_CHECK_OBJ(self);
diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.cc b/source/blender/python/bmesh/bmesh_py_types_customdata.cc
index c9a10a1a736..2e4cb4db60d 100644
--- a/source/blender/python/bmesh/bmesh_py_types_customdata.cc
+++ b/source/blender/python/bmesh/bmesh_py_types_customdata.cc
@@ -73,47 +73,47 @@ PyDoc_STRVAR(
     bpy_bmlayeraccess_collection__float_doc,
     "Generic float custom-data layer.\n"
     "\n"
-    ":type: :class:`BMLayerCollection` of float");
+    ":type: :class:`BMLayerCollection` of float\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmlayeraccess_collection__int_doc,
     "Generic int custom-data layer.\n"
     "\n"
-    ":type: :class:`BMLayerCollection` of int");
+    ":type: :class:`BMLayerCollection` of int\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmlayeraccess_collection__bool_doc,
     "Generic boolean custom-data layer.\n"
     "\n"
-    ":type: :class:`BMLayerCollection` of boolean");
+    ":type: :class:`BMLayerCollection` of boolean\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmlayeraccess_collection__float_vector_doc,
     "Generic 3D vector with float precision custom-data layer.\n"
     "\n"
     ":type: "
-    ":class:`BMLayerCollection` of :class:`mathutils.Vector`");
+    ":class:`BMLayerCollection` of :class:`mathutils.Vector`\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmlayeraccess_collection__float_color_doc,
     "Generic RGBA color with float precision custom-data layer.\n"
     "\n"
     ":type: "
-    ":class:`BMLayerCollection` of :class:`mathutils.Vector`");
+    ":class:`BMLayerCollection` of :class:`mathutils.Vector`\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmlayeraccess_collection__color_doc,
     "Generic RGBA color with 8-bit precision custom-data layer.\n"
     "\n"
     ":type: "
-    ":class:`BMLayerCollection` of :class:`mathutils.Vector`");
+    ":class:`BMLayerCollection` of :class:`mathutils.Vector`\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmlayeraccess_collection__string_doc,
     "Generic string custom-data layer (exposed as bytes, 255 max length).\n"
     "\n"
     ":type: "
-    ":class:`BMLayerCollection` of bytes");
+    ":class:`BMLayerCollection` of bytes\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmlayeraccess_collection__deform_doc,
@@ -127,19 +127,19 @@ PyDoc_STRVAR(
     bpy_bmlayeraccess_collection__shape_doc,
     "Vertex shape-key absolute location (as a 3D Vector).\n"
     "\n"
-    ":type: :class:`BMLayerCollection` of :class:`mathutils.Vector`");
+    ":type: :class:`BMLayerCollection` of :class:`mathutils.Vector`\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmlayeraccess_collection__uv_doc,
     "Accessor for :class:`BMLoopUV` UV (as a 2D Vector).\n"
     "\n"
-    ":type: :class:`BMLayerCollection` of :class:`bmesh.types.BMLoopUV`");
+    ":type: :class:`BMLayerCollection` of :class:`bmesh.types.BMLoopUV`\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmlayeraccess_collection__skin_doc,
     "Accessor for skin layer.\n"
     "\n"
-    ":type: :class:`BMLayerCollection` of :class:`bmesh.types.BMVertSkin`");
+    ":type: :class:`BMLayerCollection` of :class:`bmesh.types.BMVertSkin`\n");
 
 static PyObject *bpy_bmlayeraccess_collection_get(BPy_BMLayerAccess *self, void *flag)
 {
@@ -155,7 +155,7 @@ PyDoc_STRVAR(
     bpy_bmlayercollection_active_doc,
     "The active layer of this type (read-only).\n"
     "\n"
-    ":type: :class:`BMLayerItem`");
+    ":type: :class:`BMLayerItem`\n");
 static PyObject *bpy_bmlayercollection_active_get(BPy_BMLayerItem *self, void * /*flag*/)
 {
   CustomData *data;
@@ -173,10 +173,12 @@ static PyObject *bpy_bmlayercollection_active_get(BPy_BMLayerItem *self, void *
   Py_RETURN_NONE;
 }
 
-PyDoc_STRVAR(bpy_bmlayercollection_is_singleton_doc,
-             "True if there can exists only one layer of this type (read-only).\n"
-             "\n"
-             ":type: bool");
+PyDoc_STRVAR(
+    /* Wrap. */
+    bpy_bmlayercollection_is_singleton_doc,
+    "True if there can exists only one layer of this type (read-only).\n"
+    "\n"
+    ":type: bool\n");
 static PyObject *bpy_bmlayercollection_is_singleton_get(BPy_BMLayerItem *self, void * /*flag*/)
 {
   BPY_BM_CHECK_OBJ(self);
@@ -189,7 +191,7 @@ PyDoc_STRVAR(
     bpy_bmlayercollection_name_doc,
     "The layers unique name (read-only).\n"
     "\n"
-    ":type: str");
+    ":type: str\n");
 static PyObject *bpy_bmlayeritem_name_get(BPy_BMLayerItem *self, void * /*flag*/)
 {
   CustomDataLayer *layer;
@@ -980,21 +982,19 @@ static PyObject *bpy_bmlayercollection_iter(BPy_BMLayerCollection *self)
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmlayeraccess_type_doc,
-    "Exposes custom-data layer attributes.");
-
+    "Exposes custom-data layer attributes.\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmlayercollection_type_doc,
     "Gives access to a collection of custom-data layers of the same type and behaves "
     "like Python dictionaries, "
-    "except for the ability to do list like index access.");
-
+    "except for the ability to do list like index access.\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmlayeritem_type_doc,
     "Exposes a single custom data layer, "
     "their main purpose is for use as item accessors to custom-data when used with "
-    "vert/edge/face/loop data.");
+    "vert/edge/face/loop data.\n");
 
 PyTypeObject BPy_BMLayerAccessVert_Type; /* bm.verts.layers */
 PyTypeObject BPy_BMLayerAccessEdge_Type; /* bm.edges.layers */
diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.cc b/source/blender/python/bmesh/bmesh_py_types_meshdata.cc
index 9855a01016b..7e993ba9e39 100644
--- a/source/blender/python/bmesh/bmesh_py_types_meshdata.cc
+++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.cc
@@ -63,7 +63,7 @@ PyDoc_STRVAR(
     bpy_bmloopuv_uv_doc,
     "Loops UV (as a 2D Vector).\n"
     "\n"
-    ":type: :class:`mathutils.Vector`");
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *bpy_bmloopuv_uv_get(BPy_BMLoopUV *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_wrap(self->uv, 2, nullptr);
@@ -85,19 +85,19 @@ PyDoc_STRVAR(
     bpy_bmloopuv_pin_uv_doc,
     "UV pin state.\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmloopuv_select_doc,
     "UV select state.\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmloopuv_select_edge_doc,
     "UV edge select state.\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 
 static PyObject *bpy_bmloopuv_pin_uv_get(BPy_BMLoopUV *self, void * /*closure*/)
 {
@@ -262,7 +262,7 @@ PyDoc_STRVAR(
     bpy_bmvertskin_radius_doc,
     "Vert skin radii (as a 2D Vector).\n"
     "\n"
-    ":type: :class:`mathutils.Vector`");
+    ":type: :class:`mathutils.Vector`\n");
 static PyObject *bpy_bmvertskin_radius_get(BPy_BMVertSkin *self, void * /*closure*/)
 {
   return Vector_CreatePyObject_wrap(self->data->radius, 2, nullptr);
@@ -284,13 +284,13 @@ PyDoc_STRVAR(
     bpy_bmvertskin_flag__use_root_doc,
     "Use as root vertex. Setting this flag does not clear other roots in the same mesh island.\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_bmvertskin_flag__use_loose_doc,
     "Use loose vertex.\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 
 static PyObject *bpy_bmvertskin_flag_get(BPy_BMVertSkin *self, void *flag_p)
 {
diff --git a/source/blender/python/bmesh/bmesh_py_types_select.cc b/source/blender/python/bmesh/bmesh_py_types_select.cc
index 9a1c4b589ad..b8dc3f9dbe0 100644
--- a/source/blender/python/bmesh/bmesh_py_types_select.cc
+++ b/source/blender/python/bmesh/bmesh_py_types_select.cc
@@ -30,7 +30,7 @@ PyDoc_STRVAR(
     "The last selected element or None (read-only).\n"
     "\n"
     ":type: :class:`BMVert`, "
-    ":class:`BMEdge` or :class:`BMFace`");
+    ":class:`BMEdge` or :class:`BMFace`\n");
 static PyObject *bpy_bmeditselseq_active_get(BPy_BMEditSelSeq *self, void * /*closure*/)
 {
   BMEditSelection *ese;
diff --git a/source/blender/python/generic/bl_math_py_api.cc b/source/blender/python/generic/bl_math_py_api.cc
index 0eaaadff385..5d7a8f358a2 100644
--- a/source/blender/python/generic/bl_math_py_api.cc
+++ b/source/blender/python/generic/bl_math_py_api.cc
@@ -15,17 +15,6 @@
 
 #include "bl_math_py_api.hh"
 
-/* -------------------------------------------------------------------- */
-/** \name Module Doc String
- * \{ */
-
-PyDoc_STRVAR(
-    /* Wrap. */
-    M_bl_math_doc,
-    "Miscellaneous math utilities module");
-
-/** \} */
-
 /* -------------------------------------------------------------------- */
 /** \name Python Functions
  * \{ */
@@ -135,6 +124,10 @@ static PyMethodDef M_bl_math_methods[] = {
     {nullptr, nullptr, 0, nullptr},
 };
 
+PyDoc_STRVAR(
+    /* Wrap. */
+    M_bl_math_doc,
+    "Miscellaneous math utilities module.");
 static PyModuleDef M_bl_math_module_def = {
     /*m_base*/ PyModuleDef_HEAD_INIT,
     /*m_name*/ "bl_math",
diff --git a/source/blender/python/generic/blf_py_api.cc b/source/blender/python/generic/blf_py_api.cc
index 51e08b6d3b9..2dd2b0dc03f 100644
--- a/source/blender/python/generic/blf_py_api.cc
+++ b/source/blender/python/generic/blf_py_api.cc
@@ -55,7 +55,6 @@ PyDoc_STRVAR(
     "   :type y: float\n"
     "   :arg z: Z axis position to draw the text.\n"
     "   :type z: float\n");
-
 static PyObject *py_blf_position(PyObject * /*self*/, PyObject *args)
 {
   int fontid;
diff --git a/source/blender/python/generic/idprop_py_api.cc b/source/blender/python/generic/idprop_py_api.cc
index db266b47113..1c8f01477ea 100644
--- a/source/blender/python/generic/idprop_py_api.cc
+++ b/source/blender/python/generic/idprop_py_api.cc
@@ -1609,7 +1609,6 @@ PyDoc_STRVAR(
     /* Wrap. */
     BPy_IDGroup_View_reversed_doc,
     "Return a reverse iterator over the ID Property keys values or items.");
-
 static PyObject *BPy_IDGroup_View_reversed(BPy_IDGroup_View *self, PyObject * /*ignored*/)
 {
   BPy_IDGroup_View *result = IDGroup_View_New_WithType(self->group, Py_TYPE(self));
diff --git a/source/blender/python/generic/idprop_py_ui_api.cc b/source/blender/python/generic/idprop_py_ui_api.cc
index dc80c9c79ee..bd3e253f0cc 100644
--- a/source/blender/python/generic/idprop_py_ui_api.cc
+++ b/source/blender/python/generic/idprop_py_ui_api.cc
@@ -647,7 +647,7 @@ PyDoc_STRVAR(
     "\n"
     "   Update the RNA information of the IDProperty used for interaction and\n"
     "   display in the user interface. The required types for many of the keyword\n"
-    "   arguments depend on the type of the property.\n ");
+    "   arguments depend on the type of the property.\n");
 static PyObject *BPy_IDPropertyUIManager_update(BPy_IDPropertyUIManager *self,
                                                 PyObject *args,
                                                 PyObject *kwargs)
diff --git a/source/blender/python/generic/imbuf_py_api.cc b/source/blender/python/generic/imbuf_py_api.cc
index 46c75b935f3..386f3099d4b 100644
--- a/source/blender/python/generic/imbuf_py_api.cc
+++ b/source/blender/python/generic/imbuf_py_api.cc
@@ -257,7 +257,7 @@ PyDoc_STRVAR(
     py_imbuf_size_doc,
     "size of the image in pixels.\n"
     "\n"
-    ":type: pair of ints");
+    ":type: tuple[int, int]\n");
 static PyObject *py_imbuf_size_get(Py_ImBuf *self, void * /*closure*/)
 {
   PY_IMBUF_CHECK_OBJ(self);
@@ -270,7 +270,7 @@ PyDoc_STRVAR(
     py_imbuf_ppm_doc,
     "pixels per meter.\n"
     "\n"
-    ":type: pair of floats");
+    ":type: tuple[float, float]\n");
 static PyObject *py_imbuf_ppm_get(Py_ImBuf *self, void * /*closure*/)
 {
   PY_IMBUF_CHECK_OBJ(self);
@@ -303,7 +303,7 @@ PyDoc_STRVAR(
     py_imbuf_filepath_doc,
     "filepath associated with this image.\n"
     "\n"
-    ":type: str");
+    ":type: str\n");
 static PyObject *py_imbuf_filepath_get(Py_ImBuf *self, void * /*closure*/)
 {
   PY_IMBUF_CHECK_OBJ(self);
@@ -340,7 +340,7 @@ PyDoc_STRVAR(
     py_imbuf_planes_doc,
     "Number of bits associated with this image.\n"
     "\n"
-    ":type: int");
+    ":type: int\n");
 static PyObject *py_imbuf_planes_get(Py_ImBuf *self, void * /*closure*/)
 {
   PY_IMBUF_CHECK_OBJ(self);
@@ -353,7 +353,7 @@ PyDoc_STRVAR(
     py_imbuf_channels_doc,
     "Number of bit-planes.\n"
     "\n"
-    ":type: int");
+    ":type: int\n");
 static PyObject *py_imbuf_channels_get(Py_ImBuf *self, void * /*closure*/)
 {
   PY_IMBUF_CHECK_OBJ(self);
@@ -784,7 +784,6 @@ PyDoc_STRVAR(
     "\n"
     "   Image buffer is also the structure used by :class:`bpy.types.Image`\n"
     "   ID type to store and manipulate image data at runtime.\n");
-
 static PyModuleDef IMB_types_module_def = {
     /*m_base*/ PyModuleDef_HEAD_INIT,
     /*m_name*/ "imbuf.types",
diff --git a/source/blender/python/gpu/gpu_py.cc b/source/blender/python/gpu/gpu_py.cc
index 543cc554ddd..1e986f8e6b1 100644
--- a/source/blender/python/gpu/gpu_py.cc
+++ b/source/blender/python/gpu/gpu_py.cc
@@ -58,7 +58,6 @@ bool bpygpu_is_init_or_error()
   if (!GPU_is_init()) {
     PyErr_SetString(PyExc_SystemError,
                     "GPU functions for drawing are not available in background mode");
-
     return false;
   }
 
diff --git a/source/blender/python/gpu/gpu_py_api.cc b/source/blender/python/gpu/gpu_py_api.cc
index 3ab7e059a68..389fa432b3d 100644
--- a/source/blender/python/gpu/gpu_py_api.cc
+++ b/source/blender/python/gpu/gpu_py_api.cc
@@ -32,7 +32,7 @@ PyDoc_STRVAR(
     /* Wrap. */
     pygpu_doc,
     "This module provides Python wrappers for the GPU implementation in Blender.\n"
-    "Some higher level functions can be found in the :mod:`gpu_extras` module.");
+    "Some higher level functions can be found in the :mod:`gpu_extras` module.\n");
 static PyModuleDef pygpu_module_def = {
     /*m_base*/ PyModuleDef_HEAD_INIT,
     /*m_name*/ "gpu",
diff --git a/source/blender/python/gpu/gpu_py_compute.cc b/source/blender/python/gpu/gpu_py_compute.cc
index 142301226d9..948e2e60639 100644
--- a/source/blender/python/gpu/gpu_py_compute.cc
+++ b/source/blender/python/gpu/gpu_py_compute.cc
@@ -135,7 +135,7 @@ static PyMethodDef pygpu_compute__tp_methods[] = {
 PyDoc_STRVAR(
     /* Wrap. */
     pygpu_compute__tp_doc,
-    "This module provides access to the global GPU compute functions");
+    "This module provides access to the global GPU compute functions.");
 static PyModuleDef pygpu_compute_module_def = {
     /*m_base*/ PyModuleDef_HEAD_INIT,
     /*m_name*/ "gpu.compute",
diff --git a/source/blender/python/gpu/gpu_py_framebuffer.cc b/source/blender/python/gpu/gpu_py_framebuffer.cc
index 106ace3ff87..01a739c4f99 100644
--- a/source/blender/python/gpu/gpu_py_framebuffer.cc
+++ b/source/blender/python/gpu/gpu_py_framebuffer.cc
@@ -407,7 +407,7 @@ static PyObject *pygpu_framebuffer__tp_new(PyTypeObject * /*self*/, PyObject *ar
 PyDoc_STRVAR(
     /* Wrap. */
     pygpu_framebuffer_is_bound_doc,
-    "Checks if this is the active framebuffer in the context.");
+    "Checks if this is the active frame-buffer in the context.");
 static PyObject *pygpu_framebuffer_is_bound(BPyGPUFrameBuffer *self, void * /*type*/)
 {
   PYGPU_FRAMEBUFFER_CHECK_OBJ(self);
diff --git a/source/blender/python/gpu/gpu_py_offscreen.cc b/source/blender/python/gpu/gpu_py_offscreen.cc
index 5c092f5766d..1e795834fde 100644
--- a/source/blender/python/gpu/gpu_py_offscreen.cc
+++ b/source/blender/python/gpu/gpu_py_offscreen.cc
@@ -333,7 +333,7 @@ PyDoc_STRVAR(
     pygpu_offscreen_width_doc,
     "Width of the texture.\n"
     "\n"
-    ":type: int");
+    ":type: int\n");
 static PyObject *pygpu_offscreen_width_get(BPyGPUOffScreen *self, void * /*type*/)
 {
   BPY_GPU_OFFSCREEN_CHECK_OBJ(self);
@@ -345,7 +345,7 @@ PyDoc_STRVAR(
     pygpu_offscreen_height_doc,
     "Height of the texture.\n"
     "\n"
-    ":type: int");
+    ":type: int\n");
 static PyObject *pygpu_offscreen_height_get(BPyGPUOffScreen *self, void * /*type*/)
 {
   BPY_GPU_OFFSCREEN_CHECK_OBJ(self);
@@ -357,7 +357,7 @@ PyDoc_STRVAR(
     pygpu_offscreen_texture_color_doc,
     "The color texture attached.\n"
     "\n"
-    ":type: :class:`gpu.types.GPUTexture`");
+    ":type: :class:`gpu.types.GPUTexture`\n");
 static PyObject *pygpu_offscreen_texture_color_get(BPyGPUOffScreen *self, void * /*type*/)
 {
   BPY_GPU_OFFSCREEN_CHECK_OBJ(self);
diff --git a/source/blender/python/gpu/gpu_py_shader.cc b/source/blender/python/gpu/gpu_py_shader.cc
index 57818aeec9b..928bad85143 100644
--- a/source/blender/python/gpu/gpu_py_shader.cc
+++ b/source/blender/python/gpu/gpu_py_shader.cc
@@ -802,7 +802,7 @@ PyDoc_STRVAR(
     pygpu_shader_name_doc,
     "The name of the shader object for debugging purposes (read-only).\n"
     "\n"
-    ":type: str");
+    ":type: str\n");
 static PyObject *pygpu_shader_name(BPyGPUShader *self, void * /*closure*/)
 {
   return PyUnicode_FromString(GPU_shader_get_name(self->shader));
@@ -814,7 +814,7 @@ PyDoc_STRVAR(
     "The name of the program object for use by the OpenGL API (read-only).\n"
     "This is deprecated and will always return -1.\n"
     "\n"
-    ":type: int");
+    ":type: int\n");
 static PyObject *pygpu_shader_program_get(BPyGPUShader * /*self*/, void * /*closure*/)
 {
   PyErr_WarnEx(
diff --git a/source/blender/python/gpu/gpu_py_shader_create_info.cc b/source/blender/python/gpu/gpu_py_shader_create_info.cc
index 388f0a590dc..cedcde84b0e 100644
--- a/source/blender/python/gpu/gpu_py_shader_create_info.cc
+++ b/source/blender/python/gpu/gpu_py_shader_create_info.cc
@@ -353,7 +353,7 @@ PyDoc_STRVAR(
     pygpu_interface_info_name_doc,
     "Name of the interface block.\n"
     "\n"
-    ":type: str");
+    ":type: str\n");
 static PyObject *pygpu_interface_info_name_get(BPyGPUStageInterfaceInfo *self, void * /*closure*/)
 {
   StageInterfaceInfo *interface = reinterpret_cast<StageInterfaceInfo *>(self->interface);
@@ -1373,7 +1373,6 @@ PyDoc_STRVAR(
     ".. class:: GPUShaderCreateInfo()\n"
     "\n"
     "   Stores and describes types and variables that are used in shader sources.\n");
-
 PyTypeObject BPyGPUShaderCreateInfo_Type = {
     /*ob_base*/ PyVarObject_HEAD_INIT(nullptr, 0)
     /*tp_name*/ "GPUShaderCreateInfo",
diff --git a/source/blender/python/gpu/gpu_py_texture.cc b/source/blender/python/gpu/gpu_py_texture.cc
index 2bd64910cae..e17a3f6e354 100644
--- a/source/blender/python/gpu/gpu_py_texture.cc
+++ b/source/blender/python/gpu/gpu_py_texture.cc
@@ -313,7 +313,7 @@ PyDoc_STRVAR(
     pygpu_texture_width_doc,
     "Width of the texture.\n"
     "\n"
-    ":type: int");
+    ":type: int\n");
 static PyObject *pygpu_texture_width_get(BPyGPUTexture *self, void * /*type*/)
 {
   BPYGPU_TEXTURE_CHECK_OBJ(self);
@@ -325,7 +325,7 @@ PyDoc_STRVAR(
     pygpu_texture_height_doc,
     "Height of the texture.\n"
     "\n"
-    ":type: int");
+    ":type: int\n");
 static PyObject *pygpu_texture_height_get(BPyGPUTexture *self, void * /*type*/)
 {
   BPYGPU_TEXTURE_CHECK_OBJ(self);
@@ -337,7 +337,7 @@ PyDoc_STRVAR(
     pygpu_texture_format_doc,
     "Format of the texture.\n"
     "\n"
-    ":type: str");
+    ":type: str\n");
 static PyObject *pygpu_texture_format_get(BPyGPUTexture *self, void * /*type*/)
 {
   BPYGPU_TEXTURE_CHECK_OBJ(self);
@@ -718,7 +718,7 @@ static PyMethodDef pygpu_texture__m_methods[] = {
 PyDoc_STRVAR(
     /* Wrap. */
     pygpu_texture__m_doc,
-    "This module provides utils for textures.");
+    "This module provides utilities for textures.");
 static PyModuleDef pygpu_texture_module_def = {
     /*m_base*/ PyModuleDef_HEAD_INIT,
     /*m_name*/ "gpu.texture",
diff --git a/source/blender/python/intern/bpy_app.cc b/source/blender/python/intern/bpy_app.cc
index b95d3de15ce..bab643ecd5f 100644
--- a/source/blender/python/intern/bpy_app.cc
+++ b/source/blender/python/intern/bpy_app.cc
@@ -131,8 +131,7 @@ static PyStructSequence_Field app_info_fields[] = {
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_app_doc,
-    "This module contains application values that remain unchanged during runtime.");
-
+    "This module contains application values that remain unchanged during runtime.\n");
 static PyStructSequence_Desc app_info_desc = {
     /*name*/ "bpy.app",
     /*doc*/ bpy_app_doc,
@@ -242,7 +241,7 @@ PyDoc_STRVAR(
     /* Wrap. */
     bpy_app_debug_doc,
     "Boolean, for debug info "
-    "(started with ``--debug`` / ``--debug-*`` matching this attribute name)");
+    "(started with ``--debug`` / ``--debug-*`` matching this attribute name).");
 static PyObject *bpy_app_debug_get(PyObject * /*self*/, void *closure)
 {
   const int flag = POINTER_AS_INT(closure);
@@ -272,17 +271,19 @@ static int bpy_app_debug_set(PyObject * /*self*/, PyObject *value, void *closure
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_app_internet_offline_doc,
-    "Boolean, true when internet access is allowed by Blender & 3rd party scripts (read-only)");
+    "Boolean, true when internet access is allowed by Blender & 3rd party scripts "
+    "(read-only).");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_app_internet_offline_override_doc,
-    "Boolean, true when internet access preference is overridden by the command line (read-only)");
-
+    "Boolean, true when internet access preference is overridden by the command line "
+    "(read-only).");
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_app_global_flag_doc,
     "Boolean, for application behavior "
     "(started with ``--enable-*`` matching this attribute name)");
+
 static PyObject *bpy_app_global_flag_get(PyObject * /*self*/, void *closure)
 {
   const int flag = POINTER_AS_INT(closure);
@@ -324,7 +325,7 @@ static int bpy_app_global_flag_set__only_disable(PyObject * /*self*/,
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_app_debug_value_doc,
-    "Short, number which can be set to non-zero values for testing purposes");
+    "Short, number which can be set to non-zero values for testing purposes.");
 static PyObject *bpy_app_debug_value_get(PyObject * /*self*/, void * /*closure*/)
 {
   return PyLong_FromLong(G.debug_value);
@@ -350,7 +351,7 @@ static int bpy_app_debug_value_set(PyObject * /*self*/, PyObject *value, void *
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_app_tempdir_doc,
-    "String, the temp directory used by blender (read-only)");
+    "String, the temp directory used by blender (read-only).");
 static PyObject *bpy_app_tempdir_get(PyObject * /*self*/, void * /*closure*/)
 {
   return PyC_UnicodeFromBytes(BKE_tempdir_session());
@@ -359,7 +360,7 @@ static PyObject *bpy_app_tempdir_get(PyObject * /*self*/, void * /*closure*/)
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_app_driver_dict_doc,
-    "Dictionary for drivers namespace, editable in-place, reset on file load (read-only)");
+    "Dictionary for drivers namespace, editable in-place, reset on file load (read-only).");
 static PyObject *bpy_app_driver_dict_get(PyObject * /*self*/, void * /*closure*/)
 {
   if (bpy_pydriver_Dict == nullptr) {
@@ -375,7 +376,7 @@ static PyObject *bpy_app_driver_dict_get(PyObject * /*self*/, void * /*closure*/
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_app_preview_render_size_doc,
-    "Reference size for icon/preview renders (read-only)");
+    "Reference size for icon/preview renders (read-only).");
 static PyObject *bpy_app_preview_render_size_get(PyObject * /*self*/, void *closure)
 {
   return PyLong_FromLong(
@@ -571,7 +572,7 @@ PyDoc_STRVAR(
     "   :arg job_type: job type in :ref:`rna_enum_wm_job_type_items`.\n"
     "   :type job_type: str\n"
     "   :return: Whether a job of the given type is currently running.\n"
-    "   :rtype: bool.\n");
+    "   :rtype: bool\n");
 static PyObject *bpy_app_is_job_running(PyObject * /*self*/, PyObject *args, PyObject *kwds)
 {
   BPy_EnumProperty_Parse job_type_enum{};
diff --git a/source/blender/python/intern/bpy_app_translations.cc b/source/blender/python/intern/bpy_app_translations.cc
index 2e0d74104e9..f83fd1d1aea 100644
--- a/source/blender/python/intern/bpy_app_translations.cc
+++ b/source/blender/python/intern/bpy_app_translations.cc
@@ -474,11 +474,10 @@ PyDoc_STRVAR(
     "   Never use a (new) context starting with \"" BLT_I18NCONTEXT_DEFAULT_BPYRNA
     "\", it would be internally\n"
     "   assimilated as the default one!\n");
-
 PyDoc_STRVAR(
     /* Wrap. */
     app_translations_contexts_C_to_py_doc,
-    "A readonly dict mapping contexts' C-identifiers to their py-identifiers.");
+    "A readonly dict mapping contexts' C-identifiers to their py-identifiers.\n");
 
 static PyMemberDef app_translations_members[] = {
     {"contexts",
@@ -616,21 +615,23 @@ static PyObject *app_translations_pgettext(BlenderAppTranslations * /*self*/,
   return _py_pgettext(args, kw, BLT_pgettext);
 }
 
-PyDoc_STRVAR(app_translations_pgettext_n_doc,
-             ".. method:: pgettext_n(msgid, msgctxt=None)\n"
-             "\n"
-             "   Extract the given msgid to translation files. This is a no-op function that will "
-             "only mark the string to extract, but not perform the actual translation.\n"
-             "\n"
-             "   .. note::\n"
-             "      See :func:`pgettext` notes.\n"
-             "\n"
-             "   :arg msgid: The string to extract.\n"
-             "   :type msgid: str\n"
-             "   :arg msgctxt: The translation context (defaults to BLT_I18NCONTEXT_DEFAULT).\n"
-             "   :type msgctxt: str | None\n"
-             "   :return: The original string.\n"
-             "\n");
+PyDoc_STRVAR(
+    /* Wrap. */
+    app_translations_pgettext_n_doc,
+    ".. method:: pgettext_n(msgid, msgctxt=None)\n"
+    "\n"
+    "   Extract the given msgid to translation files. This is a no-op function that will "
+    "only mark the string to extract, but not perform the actual translation.\n"
+    "\n"
+    "   .. note::\n"
+    "      See :func:`pgettext` notes.\n"
+    "\n"
+    "   :arg msgid: The string to extract.\n"
+    "   :type msgid: str\n"
+    "   :arg msgctxt: The translation context (defaults to BLT_I18NCONTEXT_DEFAULT).\n"
+    "   :type msgctxt: str | None\n"
+    "   :return: The original string.\n"
+    "\n");
 static PyObject *app_translations_pgettext_n(BlenderAppTranslations * /*self*/,
                                              PyObject *args,
                                              PyObject *kw)
diff --git a/source/blender/python/intern/bpy_props.cc b/source/blender/python/intern/bpy_props.cc
index ad5db8f62dd..271c20b87fa 100644
--- a/source/blender/python/intern/bpy_props.cc
+++ b/source/blender/python/intern/bpy_props.cc
@@ -284,8 +284,7 @@ PyDoc_STRVAR(
     "\n"
     ".. note::\n"
     "\n"
-    "   This is not part of the stable API and may change between releases.");
-
+    "   This is not part of the stable API and may change between releases.\n");
 PyTypeObject bpy_prop_deferred_Type = {
     /*ob_base*/ PyVarObject_HEAD_INIT(nullptr, 0)
     /*tp_name*/ "_PropertyDeferred",
@@ -4560,7 +4559,6 @@ PyDoc_STRVAR(
     "directly.\n"
     "\n"
     ".. note:: All parameters to these functions must be passed as keywords.\n");
-
 static PyModuleDef props_module = {
     /*m_base*/ PyModuleDef_HEAD_INIT,
     /*m_name*/ "bpy.props",
diff --git a/source/blender/python/intern/bpy_rna.cc b/source/blender/python/intern/bpy_rna.cc
index 11d037c57fd..09e1cd54bab 100644
--- a/source/blender/python/intern/bpy_rna.cc
+++ b/source/blender/python/intern/bpy_rna.cc
@@ -3079,7 +3079,6 @@ static PyObject *prop_subscript_ass_array_slice__as_seq_fast(PyObject *value, in
     PyErr_SetString(PyExc_ValueError,
                     "bpy_prop_array[slice] = value: "
                     "re-sizing bpy_struct element in arrays isn't supported");
-
     return nullptr;
   }
 
@@ -5183,7 +5182,7 @@ static PyObject *pyrna_struct_get_data(BPy_DummyPointerRNA *self, void * /*closu
 PyDoc_STRVAR(
     /* Wrap. */
     pyrna_struct_get_rna_type_doc,
-    "The property type for introspection");
+    "The property type for introspection.");
 static PyObject *pyrna_struct_get_rna_type(BPy_PropertyRNA *self, void * /*closure*/)
 {
   PointerRNA tptr = RNA_pointer_create_discrete(nullptr, &RNA_Property, self->prop);
@@ -8776,7 +8775,7 @@ static void bpy_types_module_free(void *self)
 PyDoc_STRVAR(
     /* Wrap. */
     bpy_types_module_doc,
-    "Access to internal Blender types");
+    "Access to internal Blender types.");
 static PyModuleDef bpy_types_module_def = {
     /*m_base*/ PyModuleDef_HEAD_INIT,
     /*m_name*/ "bpy.types",
diff --git a/source/blender/python/intern/bpy_rna_data.cc b/source/blender/python/intern/bpy_rna_data.cc
index 5d235ef0797..420c526501c 100644
--- a/source/blender/python/intern/bpy_rna_data.cc
+++ b/source/blender/python/intern/bpy_rna_data.cc
@@ -147,7 +147,6 @@ PyDoc_STRVAR(
     "\n"
     "   :return: Blend file data which is freed once the context exists.\n"
     "   :rtype: :class:`bpy.types.BlendData`\n");
-
 static PyObject *bpy_rna_data_temp_data(PyObject * /*self*/, PyObject *args, PyObject *kw)
 {
   PyC_UnicodeAsBytesAndSize_Data filepath_data = {nullptr};
diff --git a/source/blender/python/intern/bpy_rna_id_collection.cc b/source/blender/python/intern/bpy_rna_id_collection.cc
index fc4cf307773..bde2841c065 100644
--- a/source/blender/python/intern/bpy_rna_id_collection.cc
+++ b/source/blender/python/intern/bpy_rna_id_collection.cc
@@ -368,7 +368,7 @@ PyDoc_STRVAR(
     "   :type subset: sequence\n"
     "   :arg key_types: When given, filter the keys mapped by ID types. Ignored if ``subset`` is "
     "also given.\n"
-    "   :type key_types: set of strings\n"
+    "   :type key_types: set[str]\n"
     "   :arg include_libraries: Include library file paths of linked data. False by default.\n"
     "   :type include_libraries: bool\n"
     "   :return: dictionary of :class:`bpy.types.ID` instances, with sets of file path "
diff --git a/source/blender/python/intern/bpy_rna_operator.cc b/source/blender/python/intern/bpy_rna_operator.cc
index 400b9739622..487e0b41dac 100644
--- a/source/blender/python/intern/bpy_rna_operator.cc
+++ b/source/blender/python/intern/bpy_rna_operator.cc
@@ -96,7 +96,6 @@ PyDoc_STRVAR(
     "   :arg args: A sequence of arguments to pass to ``message``, if it's a callable, "
     "otherwise argument is not available.\n"
     "   :type args: Any\n");
-
 static PyObject *BPY_rna_operator_poll_message_set(PyObject * /*self*/, PyObject *args)
 {
   const Py_ssize_t args_len = PyTuple_GET_SIZE(args);
diff --git a/source/blender/python/intern/bpy_rna_text.cc b/source/blender/python/intern/bpy_rna_text.cc
index be92cae76ee..191ebe47ba3 100644
--- a/source/blender/python/intern/bpy_rna_text.cc
+++ b/source/blender/python/intern/bpy_rna_text.cc
@@ -56,7 +56,7 @@ PyDoc_STRVAR(
     "(negative values count backwards from the end, the end value is not inclusive).\n"
     "   :type range: tuple[tuple[int, int], tuple[int, int]]\n"
     "   :return: The specified region as a string.\n"
-    "   :rtype: str.\n");
+    "   :rtype: str\n");
 /* Receive a Python Tuple as parameter to represent the region range. */
 static PyObject *bpy_rna_region_as_string(PyObject *self, PyObject *args, PyObject *kwds)
 {
diff --git a/source/blender/python/intern/bpy_rna_types_capi.cc b/source/blender/python/intern/bpy_rna_types_capi.cc
index d82ef8e4b49..32117d56f88 100644
--- a/source/blender/python/intern/bpy_rna_types_capi.cc
+++ b/source/blender/python/intern/bpy_rna_types_capi.cc
@@ -112,7 +112,7 @@ PyDoc_STRVAR(
     pyrna_WindowManager_clipboard_doc,
     "Clipboard text storage.\n"
     "\n"
-    ":type: str");
+    ":type: str\n");
 static PyObject *pyrna_WindowManager_clipboard_get(PyObject * /*self*/, void * /*flag*/)
 {
   int text_len = 0;
@@ -168,7 +168,6 @@ PyDoc_STRVAR(
     "   :type region_type: str\n"
     "   :return: Handler that can be removed later on.\n"
     "   :rtype: object\n");
-
 PyDoc_STRVAR(
     /* Wrap. */
     pyrna_draw_cursor_remove_doc,
@@ -240,8 +239,7 @@ PyDoc_STRVAR(
     "editor.\n"
     "   :type draw_type: str\n"
     "   :return: Handler that can be removed later on.\n"
-    "   :rtype: object");
-
+    "   :rtype: object\n");
 PyDoc_STRVAR(
     /* Wrap. */
     pyrna_draw_handler_remove_doc,
diff --git a/source/blender/python/intern/bpy_utils_previews.cc b/source/blender/python/intern/bpy_utils_previews.cc
index 080a6c90032..43f65703764 100644
--- a/source/blender/python/intern/bpy_utils_previews.cc
+++ b/source/blender/python/intern/bpy_utils_previews.cc
@@ -39,9 +39,9 @@ PyDoc_STRVAR(
     "   :type name: str\n"
     "   :return: The Preview matching given name, or a new empty one.\n"
     "   :rtype: :class:`bpy.types.ImagePreview`\n"
-    /* This is only true when accessed via 'bpy.utils.previews.ImagePreviewCollection.load',
+    /* This is only true when accessed via `bpy.utils.previews.ImagePreviewCollection.load`,
      * however this is the public API, allow this minor difference to the internal version here. */
-    "   :raises KeyError: if ``name`` already exists.");
+    "   :raises KeyError: if ``name`` already exists.\n");
 static PyObject *bpy_utils_previews_new(PyObject * /*self*/, PyObject *args)
 {
   char *name;
@@ -78,7 +78,7 @@ PyDoc_STRVAR(
     "   :rtype: :class:`bpy.types.ImagePreview`\n"
     /* This is only true when accessed via 'bpy.utils.previews.ImagePreviewCollection.load',
      * however this is the public API, allow this minor difference to the internal version here. */
-    "   :raises KeyError: if ``name`` already exists.");
+    "   :raises KeyError: if ``name`` already exists.\n");
 static PyObject *bpy_utils_previews_load(PyObject * /*self*/, PyObject *args)
 {
   char *name;
@@ -180,7 +180,7 @@ PyDoc_STRVAR(
     /* Wrap. */
     bpy_utils_previews_doc,
     "This object contains basic static methods to handle cached (non-ID) previews in Blender\n"
-    "(low-level API, not exposed to final users).");
+    "(low-level API, not exposed to final users).\n");
 static PyModuleDef bpy_utils_previews_module = {
     /*m_base*/ PyModuleDef_HEAD_INIT,
     /*m_name*/ "bpy._utils_previews",
diff --git a/source/blender/python/intern/bpy_utils_units.cc b/source/blender/python/intern/bpy_utils_units.cc
index c0bc5742cfb..04e73ba648d 100644
--- a/source/blender/python/intern/bpy_utils_units.cc
+++ b/source/blender/python/intern/bpy_utils_units.cc
@@ -366,8 +366,7 @@ static PyMethodDef bpyunits_methods[] = {
 PyDoc_STRVAR(
     /* Wrap. */
     bpyunits_doc,
-    "This module contains some data/methods regarding units handling.");
-
+    "This module contains some data/methods regarding units handling.\n");
 static PyModuleDef bpyunits_module = {
     /*m_base*/ PyModuleDef_HEAD_INIT,
     /*m_name*/ "bpy.utils.units",
diff --git a/source/blender/python/mathutils/mathutils_Color.cc b/source/blender/python/mathutils/mathutils_Color.cc
index e945073c603..935f3495b5a 100644
--- a/source/blender/python/mathutils/mathutils_Color.cc
+++ b/source/blender/python/mathutils/mathutils_Color.cc
@@ -971,19 +971,19 @@ PyDoc_STRVAR(
     Color_channel_r_doc,
     "Red color channel.\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 PyDoc_STRVAR(
     /* Wrap. */
     Color_channel_g_doc,
     "Green color channel.\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 PyDoc_STRVAR(
     /* Wrap. */
     Color_channel_b_doc,
     "Blue color channel.\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 
 static PyObject *Color_channel_get(ColorObject *self, void *type)
 {
@@ -1002,19 +1002,19 @@ PyDoc_STRVAR(
     Color_channel_hsv_h_doc,
     "HSV Hue component in [0, 1].\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 PyDoc_STRVAR(
     /* Wrap. */
     Color_channel_hsv_s_doc,
     "HSV Saturation component in [0, 1].\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 PyDoc_STRVAR(
     /* Wrap. */
     Color_channel_hsv_v_doc,
     "HSV Value component in [0, 1].\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 
 static PyObject *Color_channel_hsv_get(ColorObject *self, void *type)
 {
@@ -1064,7 +1064,7 @@ PyDoc_STRVAR(
     Color_hsv_doc,
     "HSV Values in [0, 1].\n"
     "\n"
-    ":type: float triplet");
+    ":type: tuple[float, float, float]\n");
 /** Color channel HSV (get): `x = color.hsv`. */
 static PyObject *Color_hsv_get(ColorObject *self, void * /*closure*/)
 {
diff --git a/source/blender/python/mathutils/mathutils_Euler.cc b/source/blender/python/mathutils/mathutils_Euler.cc
index a33a25b31bb..18b6157be5d 100644
--- a/source/blender/python/mathutils/mathutils_Euler.cc
+++ b/source/blender/python/mathutils/mathutils_Euler.cc
@@ -741,7 +741,7 @@ PyDoc_STRVAR(
     Euler_axis_doc,
     "Euler axis angle in radians.\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 static PyObject *Euler_axis_get(EulerObject *self, void *type)
 {
   return Euler_item(self, POINTER_AS_INT(type));
@@ -759,7 +759,7 @@ PyDoc_STRVAR(
     Euler_order_doc,
     "Euler rotation order.\n"
     "\n"
-    ":type: Literal['XYZ', 'XZY', 'YXZ', 'YZX', 'ZXY', 'ZYX']");
+    ":type: Literal['XYZ', 'XZY', 'YXZ', 'YZX', 'ZXY', 'ZYX']\n");
 static PyObject *Euler_order_get(EulerObject *self, void * /*closure*/)
 {
   if (BaseMath_ReadCallback(self) == -1) {
diff --git a/source/blender/python/mathutils/mathutils_Matrix.cc b/source/blender/python/mathutils/mathutils_Matrix.cc
index e00d0a449b3..4eb81351e86 100644
--- a/source/blender/python/mathutils/mathutils_Matrix.cc
+++ b/source/blender/python/mathutils/mathutils_Matrix.cc
@@ -1915,7 +1915,7 @@ PyDoc_STRVAR(
     "   Return the translation, rotation, and scale components of this matrix.\n"
     "\n"
     "   :return: Tuple of translation, rotation, and scale.\n"
-    "   :rtype: tuple[:class:`Vector`, :class:`Quaternion`, :class:`Vector`]");
+    "   :rtype: tuple[:class:`Vector`, :class:`Quaternion`, :class:`Vector`]\n");
 static PyObject *Matrix_decompose(MatrixObject *self)
 {
   PyObject *ret;
@@ -3165,7 +3165,7 @@ PyDoc_STRVAR(
     Matrix_translation_doc,
     "The translation component of the matrix.\n"
     "\n"
-    ":type: :class:`Vector`");
+    ":type: :class:`Vector`\n");
 static PyObject *Matrix_translation_get(MatrixObject *self, void * /*closure*/)
 {
   PyObject *ret;
@@ -3219,16 +3219,18 @@ PyDoc_STRVAR(
     Matrix_row_doc,
     "Access the matrix by rows (default), (read-only).\n"
     "\n"
-    ":type: Matrix Access");
+    ":type: Matrix Access\n");
 static PyObject *Matrix_row_get(MatrixObject *self, void * /*closure*/)
 {
   return MatrixAccess_CreatePyObject(self, MAT_ACCESS_ROW);
 }
 
-PyDoc_STRVAR(Matrix_col_doc,
-             "Access the matrix by columns, 3x3 and 4x4 only, (read-only).\n"
-             "\n"
-             ":type: Matrix Access");
+PyDoc_STRVAR(
+    /* Wrap. */
+    Matrix_col_doc,
+    "Access the matrix by columns, 3x3 and 4x4 only, (read-only).\n"
+    "\n"
+    ":type: Matrix Access\n");
 static PyObject *Matrix_col_get(MatrixObject *self, void * /*closure*/)
 {
   return MatrixAccess_CreatePyObject(self, MAT_ACCESS_COL);
@@ -3239,7 +3241,7 @@ PyDoc_STRVAR(
     Matrix_median_scale_doc,
     "The average scale applied to each axis (read-only).\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 static PyObject *Matrix_median_scale_get(MatrixObject *self, void * /*closure*/)
 {
   float mat[3][3];
@@ -3266,7 +3268,7 @@ PyDoc_STRVAR(
     Matrix_is_identity_doc,
     "True if this is an identity matrix (read-only).\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 static PyObject *Matrix_is_identity_get(MatrixObject *self, void * /*closure*/)
 {
   if (BaseMath_ReadCallback(self) == -1) {
@@ -3281,7 +3283,7 @@ PyDoc_STRVAR(
     "True if this matrix results in a negative scale, 3x3 and 4x4 only, "
     "(read-only).\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 static PyObject *Matrix_is_negative_get(MatrixObject *self, void * /*closure*/)
 {
   if (BaseMath_ReadCallback(self) == -1) {
@@ -3307,7 +3309,7 @@ PyDoc_STRVAR(
     Matrix_is_orthogonal_doc,
     "True if this matrix is orthogonal, 3x3 and 4x4 only, (read-only).\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 static PyObject *Matrix_is_orthogonal_get(MatrixObject *self, void * /*closure*/)
 {
   if (BaseMath_ReadCallback(self) == -1) {
@@ -3334,7 +3336,7 @@ PyDoc_STRVAR(
     "True if this matrix has got orthogonal axis vectors, 3x3 and 4x4 only, "
     "(read-only).\n"
     "\n"
-    ":type: bool");
+    ":type: bool\n");
 static PyObject *Matrix_is_orthogonal_axis_vectors_get(MatrixObject *self, void * /*closure*/)
 {
   if (BaseMath_ReadCallback(self) == -1) {
diff --git a/source/blender/python/mathutils/mathutils_Quaternion.cc b/source/blender/python/mathutils/mathutils_Quaternion.cc
index 2b8941423c3..4487fde56eb 100644
--- a/source/blender/python/mathutils/mathutils_Quaternion.cc
+++ b/source/blender/python/mathutils/mathutils_Quaternion.cc
@@ -1514,7 +1514,7 @@ PyDoc_STRVAR(
     Quaternion_axis_doc,
     "Quaternion axis value.\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 static PyObject *Quaternion_axis_get(QuaternionObject *self, void *type)
 {
   return Quaternion_item(self, POINTER_AS_INT(type));
@@ -1530,7 +1530,7 @@ PyDoc_STRVAR(
     Quaternion_magnitude_doc,
     "Size of the quaternion (read-only).\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 static PyObject *Quaternion_magnitude_get(QuaternionObject *self, void * /*closure*/)
 {
   if (BaseMath_ReadCallback(self) == -1) {
@@ -1545,7 +1545,7 @@ PyDoc_STRVAR(
     Quaternion_angle_doc,
     "Angle of the quaternion.\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 static PyObject *Quaternion_angle_get(QuaternionObject *self, void * /*closure*/)
 {
   float tquat[4];
@@ -1605,7 +1605,7 @@ PyDoc_STRVAR(
     Quaternion_axis_vector_doc,
     "Quaternion axis as a vector.\n"
     "\n"
-    ":type: :class:`Vector`");
+    ":type: :class:`Vector`\n");
 static PyObject *Quaternion_axis_vector_get(QuaternionObject *self, void * /*closure*/)
 {
   float tquat[4];
diff --git a/source/blender/python/mathutils/mathutils_Vector.cc b/source/blender/python/mathutils/mathutils_Vector.cc
index 9a489453f89..9d2576cf6c7 100644
--- a/source/blender/python/mathutils/mathutils_Vector.cc
+++ b/source/blender/python/mathutils/mathutils_Vector.cc
@@ -2550,25 +2550,25 @@ PyDoc_STRVAR(
     Vector_axis_x_doc,
     "Vector X axis.\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 PyDoc_STRVAR(
     /* Wrap. */
     Vector_axis_y_doc,
     "Vector Y axis.\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 PyDoc_STRVAR(
     /* Wrap. */
     Vector_axis_z_doc,
     "Vector Z axis (3D Vectors only).\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 PyDoc_STRVAR(
     /* Wrap. */
     Vector_axis_w_doc,
     "Vector W axis (4D Vectors only).\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 
 static PyObject *Vector_axis_get(VectorObject *self, void *type)
 {
@@ -2587,7 +2587,7 @@ PyDoc_STRVAR(
     Vector_length_doc,
     "Vector Length.\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 static PyObject *Vector_length_get(VectorObject *self, void * /*closure*/)
 {
   if (BaseMath_ReadCallback(self) == -1) {
@@ -2647,7 +2647,7 @@ PyDoc_STRVAR(
     Vector_length_squared_doc,
     "Vector length squared (v.dot(v)).\n"
     "\n"
-    ":type: float");
+    ":type: float\n");
 static PyObject *Vector_length_squared_get(VectorObject *self, void * /*closure*/)
 {
   if (BaseMath_ReadCallback(self) == -1) {
@@ -2662,7 +2662,6 @@ PyDoc_STRVAR(
     /* Wrap. */
     Vector_swizzle_doc,
     ":type: :class:`Vector`");
-
 /**
  * Python script used to make swizzle array:
  *
diff --git a/source/blender/python/mathutils/mathutils_geometry.cc b/source/blender/python/mathutils/mathutils_geometry.cc
index dbcbe1a1f17..a880d6c4d2f 100644
--- a/source/blender/python/mathutils/mathutils_geometry.cc
+++ b/source/blender/python/mathutils/mathutils_geometry.cc
@@ -31,12 +31,6 @@
 #include "../generic/py_capi_utils.hh"
 #include "../generic/python_utildefines.hh"
 
-/*-------------------------DOC STRINGS ---------------------------*/
-PyDoc_STRVAR(
-    /* Wrap. */
-    M_Geometry_doc,
-    "The Blender geometry module");
-
 /* ---------------------------------INTERSECTION FUNCTIONS-------------------- */
 
 PyDoc_STRVAR(
@@ -246,8 +240,8 @@ PyDoc_STRVAR(
     "   :arg radius_b: Radius of the second circle\n"
     "   :type radius_b: float\n"
     "   :return: 2 points on between intersecting circles or None when there is no intersection.\n"
-    "   :rtype: tuple[:class:`mathutils.Vector`, :class:`mathutils.Vector`] | tuple[None, "
-    "None]\n");
+    "   :rtype: tuple[:class:`mathutils.Vector`, :class:`mathutils.Vector`] | "
+    "tuple[None, None]\n");
 static PyObject *M_Geometry_intersect_sphere_sphere_2d(PyObject * /*self*/, PyObject *args)
 {
   const char *error_prefix = "intersect_sphere_sphere_2d";
@@ -579,8 +573,8 @@ PyDoc_STRVAR(
     "   :type plane_b_no: :class:`mathutils.Vector`\n"
     "   :return: The line of the intersection represented as a point and a vector or None if the "
     "intersection can't be calculated\n"
-    "   :rtype: tuple[:class:`mathutils.Vector`, :class:`mathutils.Vector`] | tuple[None, "
-    "None]\n");
+    "   :rtype: tuple[:class:`mathutils.Vector`, :class:`mathutils.Vector`] | "
+    "tuple[None, None]\n");
 static PyObject *M_Geometry_intersect_plane_plane(PyObject * /*self*/, PyObject *args)
 {
   const char *error_prefix = "intersect_plane_plane";
@@ -1660,8 +1654,7 @@ PyDoc_STRVAR(
     "list[list[int]], "
     "list[list[int]], "
     "list[list[int]], "
-    "list[list[int]]]\n"
-    "\n");
+    "list[list[int]]]\n");
 static PyObject *M_Geometry_delaunay_2d_cdt(PyObject * /*self*/, PyObject *args)
 {
   using namespace blender;
@@ -1872,6 +1865,10 @@ static PyMethodDef M_Geometry_methods[] = {
     {nullptr, nullptr, 0, nullptr},
 };
 
+PyDoc_STRVAR(
+    /* Wrap. */
+    M_Geometry_doc,
+    "The Blender geometry module.");
 static PyModuleDef M_Geometry_module_def = {
     /*m_base*/ PyModuleDef_HEAD_INIT,
     /*m_name*/ "mathutils.geometry",
diff --git a/source/blender/python/mathutils/mathutils_interpolate.cc b/source/blender/python/mathutils/mathutils_interpolate.cc
index b9f5f640e1d..661923739dc 100644
--- a/source/blender/python/mathutils/mathutils_interpolate.cc
+++ b/source/blender/python/mathutils/mathutils_interpolate.cc
@@ -17,12 +17,6 @@
 #  include "MEM_guardedalloc.h"
 #endif
 
-/*-------------------------DOC STRINGS ---------------------------*/
-PyDoc_STRVAR(
-    /* Wrap. */
-    M_Interpolate_doc,
-    "The Blender interpolate module");
-
 /* ---------------------------------WEIGHT CALCULATION ----------------------- */
 
 #ifndef MATH_STANDALONE
@@ -97,6 +91,10 @@ static PyMethodDef M_Interpolate_methods[] = {
     {nullptr, nullptr, 0, nullptr},
 };
 
+PyDoc_STRVAR(
+    /* Wrap. */
+    M_Interpolate_doc,
+    "The Blender interpolate module.");
 static PyModuleDef M_Interpolate_module_def = {
     /*m_base*/ PyModuleDef_HEAD_INIT,
     /*m_name*/ "mathutils.interpolate",
diff --git a/source/blender/python/mathutils/mathutils_kdtree.cc b/source/blender/python/mathutils/mathutils_kdtree.cc
index c4e9ef9106a..47eb5eb5b32 100644
--- a/source/blender/python/mathutils/mathutils_kdtree.cc
+++ b/source/blender/python/mathutils/mathutils_kdtree.cc
@@ -409,7 +409,6 @@ PyDoc_STRVAR(
     "\n"
     "   :class:`KDTree.balance` must have been called before using any of the ``find`` "
     "methods.\n");
-
 PyTypeObject PyKDTree_Type = {
     /*ob_base*/ PyVarObject_HEAD_INIT(nullptr, 0)
     /*tp_name*/ "KDTree",
diff --git a/source/blender/python/mathutils/mathutils_noise.cc b/source/blender/python/mathutils/mathutils_noise.cc
index aed73f5e5e5..0d46827f101 100644
--- a/source/blender/python/mathutils/mathutils_noise.cc
+++ b/source/blender/python/mathutils/mathutils_noise.cc
@@ -274,12 +274,6 @@ static void vTurb(float x,
   }
 }
 
-/*-------------------------DOC STRINGS ---------------------------*/
-PyDoc_STRVAR(
-    /* Wrap. */
-    M_Noise_doc,
-    "The Blender noise module");
-
 /*------------------------------------------------------------*/
 /* Python Functions */
 /*------------------------------------------------------------*/
@@ -1150,6 +1144,10 @@ static PyMethodDef M_Noise_methods[] = {
 #  endif
 #endif
 
+PyDoc_STRVAR(
+    /* Wrap. */
+    M_Noise_doc,
+    "The Blender noise module.");
 static PyModuleDef M_Noise_module_def = {
     /*m_base*/ PyModuleDef_HEAD_INIT,
     /*m_name*/ "mathutils.noise",