Documentation updates: Replaced "string" with "str".

33 files changed, 43 insertions, 43 deletions

diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
index c693bb0ca3b..693d35b1f60 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
@@ -77,7 +77,7 @@ static char BinaryPredicate0D_getName___doc__[] =
 "   Returns the name of the binary 0D predicate.\n"
 "\n"
 "   :return: The name of the binary 0D predicate.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * BinaryPredicate0D_getName( BPy_BinaryPredicate0D *self, PyObject *args)
 {
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
index ebbd9714e46..e690a6d51c1 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
@@ -106,7 +106,7 @@ static char BinaryPredicate1D_getName___doc__[] =
 "   Returns the name of the binary 1D predicate.\n"
 "\n"
 "   :return: The name of the binary 1D predicate.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject *BinaryPredicate1D_getName( BPy_BinaryPredicate1D *self, PyObject *args)
 {
diff --git a/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp b/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp
index 1d290b486f9..5c824981aa3 100644
--- a/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp
+++ b/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp
@@ -59,9 +59,9 @@ static char ContextFunctions_LoadMapCF___doc__[] =
 "   Loads an image map for further reading.\n"
 "\n"
 "   :arg iFileName: The name of the image file.\n"
-"   :type iFileName: string\n"
+"   :type iFileName: str\n"
 "   :arg iMapName: The name that will be used to access this image.\n"
-"   :type iMapName: string\n"
+"   :type iMapName: str\n"
 "   :arg iNbLevels: The number of levels in the map pyramid\n"
 "      (default = 4).  If iNbLevels == 0, the complete pyramid is\n"
 "      built.\n"
@@ -90,7 +90,7 @@ static char ContextFunctions_ReadMapPixelCF___doc__[] =
 "   Reads a pixel in a user-defined map.\n"
 "\n"
 "   :arg iMapName: The name of the map.\n"
-"   :type iMapName: string\n"
+"   :type iMapName: str\n"
 "   :arg level: The level of the pyramid in which we wish to read the\n"
 "      pixel.\n"
 "   :type level: int\n"
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
index 114d9bfa10a..11af30439cf 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
@@ -96,7 +96,7 @@ static char Interface0D_getExactTypeName___doc__[] =
 "   Returns the name of the 0D element.\n"
 "\n"
 "   :return: Name of the interface.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject *Interface0D_getExactTypeName( BPy_Interface0D *self ) {
 	return PyUnicode_FromString( self->if0D->getExactTypeName().c_str() );	
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index 6e2d8c65d1a..7b4bdddf70c 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -106,7 +106,7 @@ static char Interface1D_getExactTypeName___doc__[] =
 "   Returns the string of the name of the 1D element.\n"
 "\n"
 "   :return: The name of the 1D element.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject *Interface1D_getExactTypeName( BPy_Interface1D *self ) {
 	return PyUnicode_FromString( self->if1D->getExactTypeName().c_str() );	
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
index 2fe5a3010d2..dd7d3783d81 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
@@ -107,7 +107,7 @@ static char Iterator_getExactTypeName___doc__[] =
 "   Returns the name of the iterator.\n"
 "\n"
 "   :return: The name of the iterator.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * Iterator_getExactTypeName(BPy_Iterator* self) {
 	return PyUnicode_FromString( self->it->getExactTypeName().c_str() );	
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
index 3d4ec47c6f7..e68cc3fd28b 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
@@ -250,7 +250,7 @@ static char StrokeAttribute_getAttributeReal___doc__[] =
 "   Returns an attribute of float type.\n"
 "\n"
 "   :arg iName: The name of the attribute.\n"
-"   :type iName: string\n"
+"   :type iName: str\n"
 "   :return: The attribute value.\n"
 "   :rtype: float\n";
 
@@ -270,7 +270,7 @@ static char StrokeAttribute_getAttributeVec2f___doc__[] =
 "   Returns an attribute of two-dimensional vector type.\n"
 "\n"
 "   :arg iName: The name of the attribute.\n"
-"   :type iName: string\n"
+"   :type iName: str\n"
 "   :return: The attribute value.\n"
 "   :rtype: :class:`mathutils.Vector`\n";
 
@@ -290,7 +290,7 @@ static char StrokeAttribute_getAttributeVec3f___doc__[] =
 "   Returns an attribute of three-dimensional vector type.\n"
 "\n"
 "   :arg iName: The name of the attribute.\n"
-"   :type iName: string\n"
+"   :type iName: str\n"
 "   :return: The attribute value.\n"
 "   :rtype: :class:`mathutils.Vector`\n";
 
@@ -310,7 +310,7 @@ static char StrokeAttribute_isAttributeAvailableReal___doc__[] =
 "   Checks whether the attribute iName of float type is available.\n"
 "\n"
 "   :arg iName: The name of the attribute.\n"
-"   :type iName: string\n"
+"   :type iName: str\n"
 "   :return: True if the attribute is availbale.\n"
 "   :rtype: bool\n";
 
@@ -330,7 +330,7 @@ static char StrokeAttribute_isAttributeAvailableVec2f___doc__[] =
 "   is available.\n"
 "\n"
 "   :arg iName: The name of the attribute.\n"
-"   :type iName: string\n"
+"   :type iName: str\n"
 "   :return: True if the attribute is availbale.\n"
 "   :rtype: bool\n";
 
@@ -350,7 +350,7 @@ static char StrokeAttribute_isAttributeAvailableVec3f___doc__[] =
 "   type is available.\n"
 "\n"
 "   :arg iName: The name of the attribute.\n"
-"   :type iName: string\n"
+"   :type iName: str\n"
 "   :return: True if the attribute is availbale.\n"
 "   :rtype: bool\n";
 
@@ -507,7 +507,7 @@ static char StrokeAttribute_setAttributeReal___doc__[] =
 "   replaces the old one.\n"
 "\n"
 "   :arg iName: The name of the attribute.\n"
-"   :type iName: string\n"
+"   :type iName: str\n"
 "   :arg att: The attribute value.\n"
 "   :type att: float\n";
 
@@ -530,7 +530,7 @@ static char StrokeAttribute_setAttributeVec2f___doc__[] =
 "   the new value replaces the old one.\n"
 "\n"
 "   :arg iName: The name of the attribute.\n"
-"   :type iName: string\n"
+"   :type iName: str\n"
 "   :arg att: The attribute value.\n"
 "   :type att: :class:`mathutils.Vector`, list or tuple of 2 real numbers\n";
 
@@ -559,7 +559,7 @@ static char StrokeAttribute_setAttributeVec3f___doc__[] =
 "   Otherwise, the new value replaces the old one.\n"
 "\n"
 "   :arg iName: The name of the attribute.\n"
-"   :type iName: string\n"
+"   :type iName: str\n"
 "   :arg att: The attribute value.\n"
 "   :type att: :class:`mathutils.Vector`, list or tuple of 3 real numbers\n";
 
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
index c28025227ff..202e33c3231 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
@@ -205,7 +205,7 @@ static char StrokeShader_getName___doc__[] =
 "   Returns the name of this stroke shader.\n"
 "\n"
 "   :return: The name of this stroke shader.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * StrokeShader_getName( BPy_StrokeShader *self, PyObject *args)
 {
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
index 6796919a032..81f39ef7ab7 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
@@ -86,7 +86,7 @@ static char UnaryPredicate0D_getName___doc__[] =
 "   Returns the name of the UnaryPredicate0D.\n"
 "\n"
 "   :return: The name of the UnaryPredicate0D.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryPredicate0D_getName( BPy_UnaryPredicate0D *self )
 {
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
index ba69f407689..095963fb3af 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
@@ -132,7 +132,7 @@ static char UnaryPredicate1D_getName___doc__[] =
 "   EqualToChainingTimeStampUP1D, ShapeUP1D, and DensityLowerThanUP1D.\n"
 "\n"
 "   :return: \n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryPredicate1D_getName( BPy_UnaryPredicate1D *self, PyObject *args)
 {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp
index 4e64e7d6c51..9c0817fa1a2 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp
@@ -20,7 +20,7 @@ static char ColorVariationPatternShader___doc__[] =
 "\n"
 "   :arg pattern_name: The file name of the texture file to use as\n"
 "      pattern.\n"
-"   :type pattern_name: string\n"
+"   :type pattern_name: str\n"
 "   :arg stretch: Tells whether the texture must be strecthed or\n"
 "      repeted to fit the stroke.\n"
 "   :type stretch: bool\n"
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp
index ed42a64eed0..77f82790c23 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp
@@ -20,7 +20,7 @@ static char StrokeTextureShader___doc__[] =
 "   Builds a StrokeTextureShader object.\n"
 "\n"
 "   :arg textureFile: \n"
-"   :type textureFile: string\n"
+"   :type textureFile: str\n"
 "   :arg mediumType: The medium type and therefore, the blending mode\n"
 "      that must be used for the rendering of this stroke.\n"
 "   :type mediumType: :class:`MediumType`\n"
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp
index f9472ae3444..097de7a432c 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp
@@ -19,7 +19,7 @@ static char ThicknessVariationPatternShader___doc__[] =
 "   Builds a ThicknessVariationPatternShader object.\n"
 "\n"
 "   :arg pattern_name: The texture file name.\n"
-"   :type pattern_name: string\n"
+"   :type pattern_name: str\n"
 "   :arg iMinThickness: The minimum thickness we don't want to exceed.\n"
 "   :type iMinThickness: float\n"
 "   :arg iMaxThickness: The maximum thickness we don't want to exceed.\n"
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp
index 03881533ef6..806f4e8f9a5 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp
@@ -18,7 +18,7 @@ static char fstreamShader___doc__[] =
 "   Builds a fstreamShader object.\n"
 "\n"
 "   :arg iFileName: The output file name.\n"
-"   :type iFileName: string\n"
+"   :type iFileName: str\n"
 "\n"
 ".. method:: shade(s)\n"
 "\n"
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
index fc906475694..27651e3fd08 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
@@ -124,7 +124,7 @@ static char UnaryFunction0DDouble_getName___doc__[] =
 "   Returns the name of the unary 0D predicate.\n"
 "\n"
 "   :return: The name of the unary 0D predicate.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction0DDouble_getName( BPy_UnaryFunction0DDouble *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
index 5ecaa5730f6..b02776d9b82 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
@@ -68,7 +68,7 @@ static char UnaryFunction0DEdgeNature_getName___doc__[] =
 "   Returns the name of the unary 0D predicate.\n"
 "\n"
 "   :return: The name of the unary 0D predicate.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction0DEdgeNature_getName( BPy_UnaryFunction0DEdgeNature *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
index 89ad444b832..978293ca88a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
@@ -98,7 +98,7 @@ static char UnaryFunction0DFloat_getName___doc__[] =
 "   Returns the name of the unary 0D predicate.\n"
 "\n"
 "   :return: The name of the unary 0D predicate.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction0DFloat_getName( BPy_UnaryFunction0DFloat *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
index fbf97baa0e4..2d80997ec22 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
@@ -68,7 +68,7 @@ static char UnaryFunction0DId_getName___doc__[] =
 "   Returns the name of the unary 0D predicate.\n"
 "\n"
 "   :return: The name of the unary 0D predicate.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction0DId_getName( BPy_UnaryFunction0DId *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
index a07da518c41..221cfc4f4ee 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
@@ -69,7 +69,7 @@ static char UnaryFunction0DMaterial_getName___doc__[] =
 "   Returns the name of the unary 0D predicate.\n"
 "\n"
 "   :return: The name of the unary 0D predicate.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction0DMaterial_getName( BPy_UnaryFunction0DMaterial *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
index 73ece629639..a106761585c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
@@ -68,7 +68,7 @@ static char UnaryFunction0DUnsigned_getName___doc__[] =
 "   Returns the name of the unary 0D predicate.\n"
 "\n"
 "   :return: The name of the unary 0D predicate.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction0DUnsigned_getName( BPy_UnaryFunction0DUnsigned *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
index bdd9ca5db2b..a11805a9e88 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
@@ -74,7 +74,7 @@ static char UnaryFunction0DVec2f_getName___doc__[] =
 "   Returns the name of the unary 0D predicate.\n"
 "\n"
 "   :return: The name of the unary 0D predicate.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction0DVec2f_getName( BPy_UnaryFunction0DVec2f *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
index 0f99299b47e..1d47f18bafd 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
@@ -68,7 +68,7 @@ static char UnaryFunction0DVec3f_getName___doc__[] =
 "   Returns the name of the unary 0D predicate.\n"
 "\n"
 "   :return: The name of the unary 0D predicate.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction0DVec3f_getName( BPy_UnaryFunction0DVec3f *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
index 7d9026a6c78..aaa3fa9198d 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
@@ -69,7 +69,7 @@ static char UnaryFunction0DVectorViewShape_getName___doc__[] =
 "   Returns the name of the unary 0D predicate.\n"
 "\n"
 "   :return: The name of the unary 0D predicate.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction0DVectorViewShape_getName( BPy_UnaryFunction0DVectorViewShape *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
index a51969dedc6..e43808697c4 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
@@ -74,7 +74,7 @@ static char UnaryFunction0DViewShape_getName___doc__[] =
 "   Returns the name of the unary 0D predicate.\n"
 "\n"
 "   :return: The name of the unary 0D predicate.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction0DViewShape_getName( BPy_UnaryFunction0DViewShape *self )
 {
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 6826bda4c09..6c727a86887 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
@@ -16,7 +16,7 @@ static char ReadMapPixelF0D___doc__[] =
 "   Builds a ReadMapPixelF0D object.\n"
 "\n"
 "   :arg iMapName: The name of the map to be read.\n"
-"   :type iMapName: string\n"
+"   :type iMapName: str\n"
 "   :arg level: The level of the pyramid from which the pixel must be\n"
 "      read.\n"
 "   :type level: int\n"
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
index ce9f28719f1..ac61161f65c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
@@ -165,7 +165,7 @@ static char UnaryFunction1DDouble_getName___doc__[] =
 "   Returns the name of the unary 1D function.\n"
 "\n"
 "   :return: The name of the unary 1D function.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction1DDouble_getName( BPy_UnaryFunction1DDouble *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
index 08f78e2f83e..be58cbdaa35 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
@@ -86,7 +86,7 @@ static char UnaryFunction1DEdgeNature_getName___doc__[] =
 "   Returns the name of the unary 1D function.\n"
 "\n"
 "   :return: The name of the unary 1D function.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction1DEdgeNature_getName( BPy_UnaryFunction1DEdgeNature *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
index f7086335038..04e98e683d1 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
@@ -79,7 +79,7 @@ static char UnaryFunction1DFloat_getName___doc__[] =
 "   Returns the name of the unary 1D function.\n"
 "\n"
 "   :return: The name of the unary 1D function.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction1DFloat_getName( BPy_UnaryFunction1DFloat *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
index 7cd37c25552..74d9a858efa 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
@@ -86,7 +86,7 @@ static char UnaryFunction1DUnsigned_getName___doc__[] =
 "   Returns the name of the unary 1D function.\n"
 "\n"
 "   :return: The name of the unary 1D function.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction1DUnsigned_getName( BPy_UnaryFunction1DUnsigned *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
index fd3e4c9ea91..4bbe40cfdef 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
@@ -92,7 +92,7 @@ static char UnaryFunction1DVec2f_getName___doc__[] =
 "   Returns the name of the unary 1D function.\n"
 "\n"
 "   :return: The name of the unary 1D function.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction1DVec2f_getName( BPy_UnaryFunction1DVec2f *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
index 55c8f3c7926..6682dbb7904 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
@@ -86,7 +86,7 @@ static char UnaryFunction1DVec3f_getName___doc__[] =
 "   Returns the name of the unary 1D function.\n"
 "\n"
 "   :return: The name of the unary 1D function.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 PyObject * UnaryFunction1DVec3f_getName( BPy_UnaryFunction1DVec3f *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
index e59aeefff52..54827871861 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
@@ -99,7 +99,7 @@ static char UnaryFunction1DVectorViewShape_getName___doc__[] =
 "   Returns the name of the unary 1D function.\n"
 "\n"
 "   :return: The name of the unary 1D function.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction1DVectorViewShape_getName( BPy_UnaryFunction1DVectorViewShape *self )
 {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
index ceb20f512aa..8bfb5dde6eb 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
@@ -99,7 +99,7 @@ static char UnaryFunction1DVoid_getName___doc__[] =
 "   Returns the name of the unary 1D function.\n"
 "\n"
 "   :return: The name of the unary 1D function.\n"
-"   :rtype: string\n";
+"   :rtype: str\n";
 
 static PyObject * UnaryFunction1DVoid_getName( BPy_UnaryFunction1DVoid *self )
 {