Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-11-17 08:09:57 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-11-17 08:09:57 +0400
commit85bbef0f4ea2e7cacf2f681367f34fb6037d1df1 (patch)
tree1534722e133923a7abc500bb389d822f51ad9c1d /source
parentc9209de573ad680dbad6b560c05a90b02b780267 (diff)
python api internals: no need to set the stop-iter exception string.
Diffstat (limited to 'source')
-rw-r--r--source/blender/python/bmesh/bmesh_py_types.c3
-rw-r--r--source/blender/python/bmesh/bmesh_py_types_select.c3
-rw-r--r--source/blender/python/generic/idprop_py_api.c2
-rw-r--r--source/blender/python/intern/bpy_rna.c2
-rw-r--r--source/gameengine/Ketsji/KX_PythonSeq.cpp2
5 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c
index 448f02a3772..97d88c5d189 100644
--- a/source/blender/python/bmesh/bmesh_py_types.c
+++ b/source/blender/python/bmesh/bmesh_py_types.c
@@ -2879,8 +2879,7 @@ static PyObject *bpy_bmiter_next(BPy_BMIter *self)
{
BMHeader *ele = BM_iter_step(&self->iter);
if (ele == NULL) {
- PyErr_SetString(PyExc_StopIteration,
- "bpy_bmiter_next stop");
+ PyErr_SetNone(PyExc_StopIteration);
return NULL;
}
else {
diff --git a/source/blender/python/bmesh/bmesh_py_types_select.c b/source/blender/python/bmesh/bmesh_py_types_select.c
index 5069670a665..1906fc8c90e 100644
--- a/source/blender/python/bmesh/bmesh_py_types_select.c
+++ b/source/blender/python/bmesh/bmesh_py_types_select.c
@@ -341,8 +341,7 @@ static PyObject *bpy_bmeditseliter_next(BPy_BMEditSelIter *self)
{
BMEditSelection *ese = self->ese;
if (ese == NULL) {
- PyErr_SetString(PyExc_StopIteration,
- "bpy_bmiter_next stop");
+ PyErr_SetNone(PyExc_StopIteration);
return NULL;
}
else {
diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c
index da136675e1d..c3cbe7ddbf9 100644
--- a/source/blender/python/generic/idprop_py_api.c
+++ b/source/blender/python/generic/idprop_py_api.c
@@ -1397,7 +1397,7 @@ static PyObject *BPy_Group_Iter_Next(BPy_IDGroup_Iter *self)
}
}
else {
- PyErr_SetString(PyExc_StopIteration, "iterator at end");
+ PyErr_SetNone(PyExc_StopIteration);
return NULL;
}
}
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 4d4d4873390..5a87870d198 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -6044,7 +6044,7 @@ static PyObject *pyrna_prop_collection_iter(BPy_PropertyRNA *self)
static PyObject *pyrna_prop_collection_iter_next(BPy_PropertyCollectionIterRNA *self)
{
if (self->iter.valid == false) {
- PyErr_SetString(PyExc_StopIteration, "pyrna_prop_collection_iter stop");
+ PyErr_SetNone(PyExc_StopIteration);
return NULL;
}
else {
diff --git a/source/gameengine/Ketsji/KX_PythonSeq.cpp b/source/gameengine/Ketsji/KX_PythonSeq.cpp
index 247f4173d1d..ab4f2c2d2c9 100644
--- a/source/gameengine/Ketsji/KX_PythonSeq.cpp
+++ b/source/gameengine/Ketsji/KX_PythonSeq.cpp
@@ -383,7 +383,7 @@ static PyObject *KX_PythonSeq_nextIter(KX_PythonSeq *self)
self->iter++;
if ( object==NULL ) {
self->iter= -1; /* for reuse */
- PyErr_SetString(PyExc_StopIteration, "iterator at end");
+ PyErr_SetNone(PyExc_StopIteration);
}
return object; /* can be NULL for end of iterator */
}