Added a SimpleBunch C extension type for speeding the most common operations up

bunch/__init__.py

@@ -401,6 +401,12 @@ def fromYAML(*args, **kwargs):
     pass
 
 
+# SimpleBunch might now be available, fall back on regular Bunch in that case.
+try:
+    from _bunch import Bunch as SimpleBunch
+except ImportError:
+    SimpleBunch = Bunch
+
 if __name__ == "__main__":
     import doctest
     doctest.testmod()

bunch/_bunchmodule.c

@@ -0,0 +1,231 @@
+/*
+    MIT License
+    (c) 2012 Dariusz Suchojad <dsuch at gefira.pl>
+*/
+
+#include <Python.h>
+
+typedef struct {
+    PyDictObject HEAD;
+    PyObject *object__getattribute__;
+    PyObject *object__setattr__;
+} Bunch;
+
+static PyMethodDef Bunch_methods[] = {
+    {NULL,	NULL},
+};
+
+static int
+Bunch_init(Bunch *self, PyObject *args, PyObject *kwds)
+{
+    if (PyDict_Type.tp_init((PyObject *)self, args, kwds) < 0) {
+        return -1;
+    }
+
+    PyObject *__builtin__ = PyImport_AddModule("__builtin__");
+
+    PyObject *object = PyObject_GetAttrString(__builtin__, "object"); /* New ref */
+    if(object == NULL) {
+        return -1;
+    }
+
+    PyObject *__getattribute__ = PyObject_GetAttrString(object, "__getattribute__"); /* New ref */
+    if(__getattribute__ == NULL) {
+        Py_XDECREF(object);
+        return -1;
+    }
+
+    PyObject *__setattr__ = PyObject_GetAttrString(object, "__setattr__"); /* New ref */
+    if(__setattr__ == NULL) {
+        Py_XDECREF(object);
+        Py_XDECREF(__getattribute__);
+        return -1;
+    }
+
+    self->object__getattribute__ = __getattribute__;
+    self->object__setattr__ = __setattr__;
+
+    Py_XDECREF(object);
+    return 0;
+};
+
+static void
+Bunch_dealloc(Bunch *self)
+{
+    Py_XDECREF(self->object__getattribute__);
+    Py_XDECREF(self->object__setattr__);
+    ((PyObject *)self)->ob_type->tp_free(self);
+}
+
+/* 
+    __setattr__
+*/
+static int
+Bunch_setattro(PyObject *self, PyObject *_k, PyObject *_v)
+{
+    /* Python code is:
+
+        try:
+            object.__getattribute__(self, k)                 # 1)
+        except AttributeError:
+            try:
+                self[k] = v                                  # 2)
+            except:
+                raise AttributeError(k)                      # 3)
+        else:
+            object.__setattr__(self, k, v)                   # 4)
+    */
+
+    PyObject *ret = NULL;
+    PyObject *err_occurred = NULL;
+
+    /* 1) Try getting ahold of an attribute first ..
+    */
+    ret = PyObject_CallFunctionObjArgs(((Bunch *)self)->object__getattribute__, self, _k, NULL);
+    err_occurred = PyErr_Occurred();
+
+    if(err_occurred) {
+        Py_XDECREF(ret);
+        if(PyErr_ExceptionMatches(PyExc_AttributeError)) {
+
+            /* 2) .. ignore AttributeError and attempt to insert a key .. */
+            PyErr_Clear();
+            int set_item_result = PyDict_SetItem(self, _k, _v);
+            if(set_item_result == 0) {
+                return 0;
+            }
+            else {
+                /* 3) .. give up with an AttributeError .. */
+                (void)PyErr_Format(PyExc_AttributeError, "\%s", PyString_AsString(_k));
+                return -1;
+            }
+        }
+        else {
+            /* Some exception but not an AttributeError */
+            return -1;
+        }
+    }
+    else {
+        /* 4) .. no error so we actually have an atrribute of the name we tried in 1) */
+        ret = PyObject_CallFunctionObjArgs(((Bunch *)self)->object__setattr__, self, _k, _v, NULL);
+        err_occurred = PyErr_Occurred();        
+
+        if(err_occurred) {
+            Py_XDECREF(ret);
+            return -1;
+        }
+        return 0;
+    }
+}
+
+/* 
+    __getattr__
+*/
+static PyObject *
+Bunch_getattro(PyObject *self, PyObject *_k)
+{
+    /* Python code is:
+
+        try:
+            return object.__getattribute__(self, k)          # 1)
+        except AttributeError:
+            try:
+                return self[k]                               # 2)
+            except KeyError:
+                raise AttributeError(k)                      # 3)
+    */
+
+    /* 1) Try getting ahold of an attribute first ..
+    */
+    PyObject *ret = PyObject_CallFunctionObjArgs(((Bunch *)self)->object__getattribute__, self, _k, NULL);
+    PyObject *err_occurred = PyErr_Occurred();
+
+    if(err_occurred) {
+        Py_XDECREF(ret);
+        if(PyErr_ExceptionMatches(PyExc_AttributeError)) {
+
+            /* 2) .. ignore AttributeError and see if there's a key of that name .. */
+            PyErr_Clear();
+            PyObject *item = PyDict_GetItem(self, _k); /* Borrowed ref */
+            if(item != NULL) {
+                Py_INCREF(item);
+                return item;
+            }
+            else {
+                /* 3) .. give up with an AttributeError */
+                (void)PyErr_Format(PyExc_AttributeError, "\%s", PyString_AsString(_k));
+                return NULL;
+            }
+        }
+        else {
+            return NULL;
+        }
+    }
+    else {
+        return ret;
+    }
+
+}
+
+
+static PyTypeObject BunchType = {
+    PyObject_HEAD_INIT(NULL)
+    0,                       /* ob_size */
+    "bunch._bunch.Bunch",           /* tp_name */
+    sizeof(Bunch),           /* tp_basicsize */
+    0,                       /* tp_itemsize */
+    (destructor)Bunch_dealloc,           /* tp_dealloc */
+    0,                       /* tp_print */
+    0,                       /* tp_getattr */
+    0,                       /* tp_setattr */
+    0,                       /* tp_compare */
+    0,                       /* tp_repr */
+    0,                       /* tp_as_number */
+    0,                       /* tp_as_sequence */
+    0,                       /* tp_as_mapping */
+    0,                       /* tp_hash */
+    0,                       /* tp_call */
+    0,                       /* tp_str */
+    (getattrofunc)Bunch_getattro,                       /* tp_getattro */
+    (setattrofunc)Bunch_setattro,                       /* tp_setattro */
+    0,                       /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT |
+      Py_TPFLAGS_BASETYPE | Py_TPFLAGS_DICT_SUBCLASS,   /* tp_flags */
+    0,                       /* tp_doc */
+    0,                       /* tp_traverse */
+    0,                       /* tp_clear */
+    0,                       /* tp_richcompare */
+    0,                       /* tp_weaklistoffset */
+    0,                       /* tp_iter */
+    0,                       /* tp_iternext */
+    Bunch_methods,           /* tp_methods */
+    0,                       /* tp_members */
+    0,                       /* tp_getset */
+    0,                       /* tp_base */
+    0,                       /* tp_dict */
+    0,                       /* tp_descr_get */
+    0,                       /* tp_descr_set */
+    0,                       /* tp_dictoffset */
+    (initproc)Bunch_init,    /* tp_init */
+    0,                       /* tp_alloc */
+    0,                       /* tp_new */
+};
+
+PyMODINIT_FUNC
+init_bunch(void)
+{
+    PyObject *m;
+
+    BunchType.tp_base = &PyDict_Type;
+    if (PyType_Ready(&BunchType) < 0) {
+        return;
+    }
+
+    m = Py_InitModule3("_bunch", NULL, "Bunch module (C implementation)");
+    if (m == NULL) {
+        return;
+    }
+
+    Py_INCREF(&BunchType);
+    PyModule_AddObject(m, "Bunch", (PyObject *) &BunchType);
+}

setup.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 import sys, os, re
 from os.path import dirname, abspath, join
-from setuptools import setup
+from setuptools import setup, Extension
 
 
 HERE = abspath(dirname(__file__))
@@ -15,6 +15,17 @@
     [ line.strip() for line in package_file if '__version__' in line ].pop(0)
 )
 
+_simple_bunch_systems = ['linux']
+for system in _simple_bunch_systems:
+    if system in sys.platform:
+        kw = dict(
+            ext_modules = [
+                Extension('_bunch', sources = ['bunch/_bunchmodule.c'])
+            ],
+        )
+    break
+else:
+    kw = {}
 
 setup(
     name             = "bunch",
@@ -44,4 +55,6 @@
     ],
     # download_url     = "http://pypi.python.org/packages/source/b/bunch/bunch-%s.tar.gz" % __version__,
     license          = 'MIT',
+
+    **kw
 )