Merged changes in the trunk up to revision 43881.

source/blender/python/intern/bpy_rna.c

@@ -6298,6 +6298,8 @@ static struct PyMethodDef pyrna_basetype_methods[] = {
 	{NULL, NULL, 0, NULL}
 };
 
+/* used to call ..._keys() direct, but we need to filter out operator subclasses */
+#if 0
 static PyObject *pyrna_basetype_dir(BPy_BaseTypeRNA *self)
 {
 	PyObject *list;
@@ -6318,6 +6320,34 @@ static PyObject *pyrna_basetype_dir(BPy_BaseTypeRNA *self)
 	return list;
 }
 
+#else
+
+static PyObject *pyrna_basetype_dir(BPy_BaseTypeRNA *self)
+{
+	PyObject *ret = PyList_New(0);
+	PyObject *item;
+
+	RNA_PROP_BEGIN(&self->ptr, itemptr, self->prop) {
+		StructRNA *srna = itemptr.data;
+		StructRNA *srna_base = RNA_struct_base(itemptr.data);
+		/* skip own operators, these double up [#29666] */
+		if (srna_base == &RNA_Operator) {
+			/* do nothing */
+		}
+		else {
+			/* add to python list */
+			item = PyUnicode_FromString(RNA_struct_identifier(srna));
+			PyList_Append(ret, item);
+			Py_DECREF(item);
+		}
+	}
+	RNA_PROP_END;
+
+	return ret;
+}
+
+#endif
+
 static PyTypeObject pyrna_basetype_Type = BLANK_PYTHON_TYPE;
 
 PyObject *BPY_rna_types(void)

source/blender/python/mathutils/mathutils_Matrix.c

@@ -1562,7 +1562,7 @@ static PyObject *Matrix_str(MatrixObject *self)
 	int maxsize[MATRIX_MAX_DIM];
 	int row, col;
 
-	char dummy_buf[1];
+	char dummy_buf[64];
 
 	if (BaseMath_ReadCallback(self) == -1)
 		return NULL;
@@ -1584,7 +1584,7 @@ static PyObject *Matrix_str(MatrixObject *self)
 		for (col = 0; col < self->num_col; col++) {
 			BLI_dynstr_appendf(ds, col ? ", %*.4f" : "%*.4f", maxsize[col], MATRIX_ITEM(self, row, col));
 		}
-		BLI_dynstr_append(ds, row + 1 != self->num_row ? ")\n             " : ")");
+		BLI_dynstr_append(ds, row + 1 != self->num_row ? ")\n            (" : ")");
 	}
 	BLI_dynstr_append(ds, ">");
 

source/blender/python/mathutils/mathutils_Vector.c

@@ -174,7 +174,7 @@ static PyObject *C_Vector_Range(PyObject *cls, PyObject *args)
 	case 2:
 		if (start >= stop) {
 			PyErr_SetString(PyExc_RuntimeError,
-			                "Start value is larger"
+			                "Start value is larger "
 			                "than the stop value");
 			return NULL;
 		}
@@ -184,16 +184,27 @@ static PyObject *C_Vector_Range(PyObject *cls, PyObject *args)
 	default:
 		if (start >= stop) {
 			PyErr_SetString(PyExc_RuntimeError,
-			                "Start value is larger"
+			                "Start value is larger "
 			                "than the stop value");
 			return NULL;
 		}
-		size = (stop - start)/step;
-		if (size%step)
-			size++;
+
+		size = (stop - start);
+
+		if ((size % step) != 0)
+			size += step;
+
+		size /= step;
+
 		break;
 	}
 
+	if (size < 2) {
+		PyErr_SetString(PyExc_RuntimeError,
+		                "Vector(): invalid size");
+		return NULL;
+	}
+
 	vec = PyMem_Malloc(size * sizeof(float));
 
 	if (vec == NULL) {

source/blender/python/rna_dump.py

@@ -79,7 +79,7 @@ def seek(r, txt, recurs):
     except:
         keys = None
 
-    if keys != None:
+    if keys is not None:
         if PRINT_DATA:
             print(txt + '.keys() - ' + str(r.keys()))