summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2005-07-13 18:22:35 +0000
committerJohn (J5) Palmieri <johnp@redhat.com>2005-07-13 18:22:35 +0000
commit2c413bf281cefde85209e5a3847735407bedaaa4 (patch)
tree1ef436afb3d96b2089b3e5a0fcffd035b12eca1b
parent9f92ac0ef5ae8ab5a325b15d0b3109143fe51f8c (diff)
* python/.cvsignore: remove dbus_bindings.pyx, add dbus_bindings.pxd
* python/service.py (class Name): renamed BusName to make it clearer what the object is for (a name on the bus) * python/examples/example-service.py, python/examples/example-signal-emitter.py: change the Name object to BusName
-rw-r--r--ChangeLog11
-rw-r--r--python/.cvsignore2
-rw-r--r--python/examples/example-service.py4
-rw-r--r--python/examples/example-signal-emitter.py2
-rw-r--r--python/service.py8
5 files changed, 16 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c397247..765314a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-07-13 John (J5) Palmieri <johnp@redhat.com>
+
+ * python/.cvsignore: remove dbus_bindings.pyx, add dbus_bindings.pxd
+
+ * python/service.py (class Name): renamed BusName to make it clearer
+ what the object is for (a name on the bus)
+
+ * python/examples/example-service.py,
+ python/examples/example-signal-emitter.py: change the Name object to
+ BusName
+
2005-07-12 Colin Walters <walters@verbum.org>
Patch from Jim Gettys <Jim.Gettys@hp.com>.
diff --git a/python/.cvsignore b/python/.cvsignore
index 4a73b5bc..9c73bb7a 100644
--- a/python/.cvsignore
+++ b/python/.cvsignore
@@ -1,7 +1,7 @@
.deps
Makefile.in
Makefile
-dbus_bindings.pyx
+dbus_bindings.pxd
*.lo
*.la
dbus_bindings.c
diff --git a/python/examples/example-service.py b/python/examples/example-service.py
index 9e2f193b..00f39935 100644
--- a/python/examples/example-service.py
+++ b/python/examples/example-service.py
@@ -2,8 +2,6 @@
import dbus
import dbus.service
-
-
import dbus.glib
import pygtk
import gtk
@@ -26,7 +24,7 @@ class SomeObject(dbus.service.Object):
return {"first": "Hello Dict", "second": " from example-service.py"}
session_bus = dbus.SessionBus()
-name = dbus.service.Name("org.designfu.SampleService", bus=session_bus)
+name = dbus.service.BusName("org.designfu.SampleService", bus=session_bus)
object = SomeObject(name)
gtk.main()
diff --git a/python/examples/example-signal-emitter.py b/python/examples/example-signal-emitter.py
index 64c7f177..64474e8f 100644
--- a/python/examples/example-signal-emitter.py
+++ b/python/examples/example-signal-emitter.py
@@ -21,7 +21,7 @@ class TestObject(dbus.service.Object):
return "Signal emitted"
session_bus = dbus.SessionBus()
-name = dbus.service.Name("org.designfu.TestService", bus=session_bus)
+name = dbus.service.BusName("org.designfu.TestService", bus=session_bus)
object = TestObject(name)
gtk.main()
diff --git a/python/service.py b/python/service.py
index fc044af0..b7504dca 100644
--- a/python/service.py
+++ b/python/service.py
@@ -2,11 +2,8 @@ from decorators import *
import dbus_bindings
-class Name:
+class BusName:
"""A base class for exporting your own Named Services across the Bus
-
- Just inherit from Name, providing the name of your service
- (e.g. org.designfu.SampleService).
"""
def __init__(self, named_service, bus=None):
self._named_service = named_service
@@ -150,8 +147,7 @@ class Object:
"""A base class for exporting your own Objects across the Bus.
Just inherit from Object and provide a list of methods to share
- across the Bus. These will appear as member functions of your
- ServiceObject.
+ across the Bus
"""
__metaclass__ = ObjectType