diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-07-14 16:43:15 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-07-14 16:44:33 +0100 |
| commit | 6dcd530f0b6aa158330726d7a5cca9d6dd96eafb (patch) | |
| tree | 931ebd80450177407682ea1e902bf6b9d0c0b399 | |
| parent | 87a86d7d6033cbb61271a84f20d5d25c4b4182c0 (diff) | |
| download | dbus-python-6dcd530f0b6aa158330726d7a5cca9d6dd96eafb.tar.gz | |
Rename _dbus_bindings.Server to _dbus_bindings._Server
| -rw-r--r-- | _dbus_bindings/server.c | 9 | ||||
| -rw-r--r-- | dbus/server.py | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/_dbus_bindings/server.c b/_dbus_bindings/server.c index 6f86417..048ef63 100644 --- a/_dbus_bindings/server.c +++ b/_dbus_bindings/server.c @@ -47,7 +47,8 @@ PyDoc_STRVAR(Server_tp_doc, "\n" "::\n" "\n" -" Server(address, mainloop=None, auth_mechanisms=None) -> Server\n" +" Server(address, connection_subtype, mainloop=None, auth_mechanisms=None)\n" +" -> Server\n" ); /* D-Bus Server user data slot, containing an owned reference to either @@ -66,7 +67,7 @@ DBusPyServer_BorrowDBusServer(PyObject *self) TRACE(self); if (!DBusPyServer_Check(self)) { - PyErr_SetString(PyExc_TypeError, "A dbus.Server is required"); + PyErr_SetString(PyExc_TypeError, "A dbus.server.Server is required"); return NULL; } dbs = ((Server *)self)->server; @@ -499,7 +500,7 @@ struct PyMethodDef DBusPyServer_tp_methods[] = { PyTypeObject DBusPyServer_Type = { PyObject_HEAD_INIT(NULL) 0, /*ob_size*/ - "_dbus_bindings.Server",/*tp_name*/ + "_dbus_bindings._Server",/*tp_name*/ sizeof(Server), /*tp_basicsize*/ 0, /*tp_itemsize*/ /* methods */ @@ -558,7 +559,7 @@ dbus_py_init_server_types(void) dbus_bool_t dbus_py_insert_server_types(PyObject *this_module) { - if (PyModule_AddObject(this_module, "Server", + if (PyModule_AddObject(this_module, "_Server", (PyObject *)&DBusPyServer_Type) < 0) return FALSE; return TRUE; diff --git a/dbus/server.py b/dbus/server.py index 632e7cd..3e45b3c 100644 --- a/dbus/server.py +++ b/dbus/server.py @@ -24,7 +24,7 @@ __all__ = ('Server', ) __docformat__ = 'reStructuredText' -from _dbus_bindings import Server as _Server +from _dbus_bindings import _Server from dbus.connection import Connection class Server(_Server): |