summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/tevent/config.mk10
-rw-r--r--lib/tevent/pytevent.c6
-rw-r--r--lib/tevent/tests.py6
3 files changed, 13 insertions, 9 deletions
diff --git a/lib/tevent/config.mk b/lib/tevent/config.mk
index 5f9508a44f..7654f78ecc 100644
--- a/lib/tevent/config.mk
+++ b/lib/tevent/config.mk
@@ -47,13 +47,11 @@ PUBLIC_HEADERS += $(addprefix $(libteventsrcdir)/, tevent.h tevent_internal.h)
# TODO: Change python stuff to tevent
[PYTHON::swig_events]
-LIBRARY_REALNAME = samba/_events.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = LIBTEVENT LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL
+LIBRARY_REALNAME = tevent.$(SHLIBEXT)
+PRIVATE_DEPENDENCIES = LIBTEVENT PYTALLOC LIBSAMBA-UTIL
-swig_events_OBJ_FILES = $(libteventsrcdir)/events_wrap.o
+swig_events_OBJ_FILES = $(libteventsrcdir)/pytevent.o
-$(eval $(call python_py_module_template,samba/events.py,$(libteventsrcdir)/events.py))
-
-$(swig_events_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
+$(swig_events_OBJ_FILES): CFLAGS+=$(CFLAG_NO_CAST_QUAL)
PC_FILES += $(libteventsrcdir)/tevent.pc
diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c
index b379911b9c..02e0db3f84 100644
--- a/lib/tevent/pytevent.c
+++ b/lib/tevent/pytevent.c
@@ -103,8 +103,14 @@ void inittevent(void)
{
PyObject *m;
+ if (PyType_Ready(&PyEventContext) < 0)
+ return;
+
m = Py_InitModule3("tevent", tevent_methods, "Event management.");
if (m == NULL)
return;
+
+ Py_INCREF(&PyEventContext);
+ PyModule_AddObject(m, "EventContext", (PyObject *)&PyEventContext);
}
diff --git a/lib/tevent/tests.py b/lib/tevent/tests.py
index b14f7e6250..0ec736b359 100644
--- a/lib/tevent/tests.py
+++ b/lib/tevent/tests.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import events
+import tevent as events
import unittest
# Just test the bindings are there and that calling them doesn't crash
@@ -25,7 +25,7 @@ import unittest
class EventTestCase(unittest.TestCase):
def test_create(self):
- self.assertTrue(events.event() is not None)
+ self.assertTrue(events.EventContext() is not None)
def test_loop_wait(self):
- self.assertEquals(0, events.event().loop_wait())
+ self.assertEquals(0, events.EventContext().loop_wait())