summaryrefslogtreecommitdiffstats
path: root/libdimension-python/dimension.c
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2011-05-16 15:30:23 -0600
committerTavian Barnes <tavianator@gmail.com>2011-05-16 15:30:23 -0600
commit065846d055c9c0956fe4bf1762d81a4b72b5d5a8 (patch)
treee607f8a761324f8a333a9cfc4151fe1ea34d4725 /libdimension-python/dimension.c
parent87bc3cb4fcaf0e3ead4c41e8c56a06cf481875c0 (diff)
downloaddimension-065846d055c9c0956fe4bf1762d81a4b72b5d5a8.tar.xz
Split python Scenes into a new source file, add python tests.
Diffstat (limited to 'libdimension-python/dimension.c')
-rw-r--r--libdimension-python/dimension.c50
1 files changed, 10 insertions, 40 deletions
diff --git a/libdimension-python/dimension.c b/libdimension-python/dimension.c
index 35b9f4c..81174a7 100644
--- a/libdimension-python/dimension.c
+++ b/libdimension-python/dimension.c
@@ -1,15 +1,15 @@
/*************************************************************************
* Copyright (C) 2009-2011 Tavian Barnes <tavianator@tavianator.com> *
* *
- * This file is part of The Dimension Python Extension. *
+ * This file is part of The Dimension Python Module. *
* *
- * The Dimension Python Extension is free software; you can redistribute *
- * it and/ or modify it under the terms of the GNU Lesser General Public *
+ * The Dimension Python Module is free software; you can redistribute it *
+ * and/ or modify it under the terms of the GNU Lesser General Public *
* License as published by the Free Software Foundation; either version *
* 3 of the License, or (at your option) any later version. *
* *
- * The Dimension Python Extension is distributed in the hope that it *
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * The Dimension Python Module is distributed in the hope that it will *
+ * be useful, but WITHOUT ANY WARRANTY; without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See *
* the GNU Lesser General Public License for more details. *
* *
@@ -19,39 +19,13 @@
*************************************************************************/
#include <Python.h>
+#include <structmember.h>
#include "dimension.h"
-typedef struct {
- PyObject_HEAD
- dmnsn_scene *scene;
-} dmnsn_SceneObject;
-
-static PyTypeObject dmnsn_SceneType = {
- PyVarObject_HEAD_INIT(NULL, 0)
- "dimension.Scene", /* tp_name */
- sizeof(dmnsn_SceneObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- 0, /* tp_dealloc */
- 0, /* tp_print */
- 0, /* tp_getattr */
- 0, /* tp_setattr */
- 0, /* tp_reserved */
- 0, /* tp_repr */
- 0, /* tp_as_number */
- 0, /* tp_as_sequence */
- 0, /* tp_as_mapping */
- 0, /* tp_hash */
- 0, /* tp_call */
- 0, /* tp_str */
- 0, /* tp_getattro */
- 0, /* tp_setattro */
- 0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT, /* tp_flags */
- "Dimension scene", /* tp_doc */
-};
+#include "scene.c"
static PyMethodDef DimensionMethods[] = {
- { NULL, NULL, 0, NULL } /* Sentinel */
+ { NULL, NULL, 0, NULL }
};
static struct PyModuleDef dimensionmodule = {
@@ -65,17 +39,13 @@ static struct PyModuleDef dimensionmodule = {
PyMODINIT_FUNC
PyInit_dimension(void)
{
- dmnsn_SceneType.tp_new = PyType_GenericNew;
- if (PyType_Ready(&dmnsn_SceneType) < 0) {
+ if (!dmnsn_init_SceneType())
return NULL;
- }
PyObject *m = PyModule_Create(&dimensionmodule);
- if (!m) {
+ if (!m)
return NULL;
- }
- Py_INCREF(&dmnsn_SceneType);
PyModule_AddObject(m, "Scene", (PyObject *)&dmnsn_SceneType);
return m;
}