[pyatspi2] Change the interface name from org.freedesktop to org.a11y.



commit 847aa3a6ae35596f9238f3bef439f3b40f3722ee
Author: Mark Doffman <mark doffman codethink co uk>
Date:   Thu Feb 11 18:27:58 2010 -0800

    Change the interface name from org.freedesktop to org.a11y.

 pyatspi/accessible.py  |    2 +-
 pyatspi/appevent.py    |   28 ++++++++++++------------
 pyatspi/cache.py       |    4 +-
 pyatspi/deviceevent.py |    2 +-
 pyatspi/interfaces.py  |   54 ++++++++++++++++++++++++------------------------
 pyatspi/utils.py       |    4 +-
 6 files changed, 47 insertions(+), 47 deletions(-)
---
diff --git a/pyatspi/accessible.py b/pyatspi/accessible.py
index 8a42f15..373d3ff 100644
--- a/pyatspi/accessible.py
+++ b/pyatspi/accessible.py
@@ -248,7 +248,7 @@ class Accessible(BaseProxy):
                 or raises a NotImplemented error if the given interface
                 is not supported.
                 """
-                if interface in self.interfaces or interface == "org.freedesktop.atspi.Collection":
+                if interface in self.interfaces or interface == "org.a11y.atspi.Collection":
                         return self._acc_factory (self.app_name, self.acc_path, interface,
                                                                   dbus_object=self._dbus_object)
                 else:
diff --git a/pyatspi/appevent.py b/pyatspi/appevent.py
index def2614..d530e8c 100644
--- a/pyatspi/appevent.py
+++ b/pyatspi/appevent.py
@@ -103,23 +103,23 @@ class EventType(str):
 #------------------------------------------------------------------------------
 
 _interface_to_klass = {
-                "org.freedesktop.atspi.Event.Object":"object",
-                "org.freedesktop.atspi.Event.Window":"window",
-                "org.freedesktop.atspi.Event.Mouse":"mouse",
-                "org.freedesktop.atspi.Event.Keyboard":"keyboard",
-                "org.freedesktop.atspi.Event.Terminal":"terminal",
-                "org.freedesktop.atspi.Event.Document":"document",
-                "org.freedesktop.atspi.Event.Focus":"focus",
+                "org.a11y.atspi.Event.Object":"object",
+                "org.a11y.atspi.Event.Window":"window",
+                "org.a11y.atspi.Event.Mouse":"mouse",
+                "org.a11y.atspi.Event.Keyboard":"keyboard",
+                "org.a11y.atspi.Event.Terminal":"terminal",
+                "org.a11y.atspi.Event.Document":"document",
+                "org.a11y.atspi.Event.Focus":"focus",
                 }
 
 _klass_to_interface = {
-                "object":"org.freedesktop.atspi.Event.Object",
-                "window":"org.freedesktop.atspi.Event.Window",
-                "mouse":"org.freedesktop.atspi.Event.Mouse",
-                "keyboard":"org.freedesktop.atspi.Event.Keyboard",
-                "terminal":"org.freedesktop.atspi.Event.Terminal",
-                "document":"org.freedesktop.atspi.Event.Document",
-                "focus":"org.freedesktop.atspi.Event.Focus",
+                "object":"org.a11y.atspi.Event.Object",
+                "window":"org.a11y.atspi.Event.Window",
+                "mouse":"org.a11y.atspi.Event.Mouse",
+                "keyboard":"org.a11y.atspi.Event.Keyboard",
+                "terminal":"org.a11y.atspi.Event.Terminal",
+                "document":"org.a11y.atspi.Event.Document",
+                "focus":"org.a11y.atspi.Event.Focus",
                 }
 
 #------------------------------------------------------------------------------
diff --git a/pyatspi/cache.py b/pyatspi/cache.py
index ebbbb80..29e9847 100644
--- a/pyatspi/cache.py
+++ b/pyatspi/cache.py
@@ -26,8 +26,8 @@ __all__ = [
           ]
 
 _ATSPI_CACHE_PATH = '/org/at_spi/cache'
-_ATSPI_CACHE_INTERFACE = 'org.freedesktop.atspi.Cache'
-_ATSPI_EVENT_OBJECT_INTERFACE = "org.freedesktop.atspi.Event.Object"
+_ATSPI_CACHE_INTERFACE = 'org.a11y.atspi.Cache'
+_ATSPI_EVENT_OBJECT_INTERFACE = "org.a11y.atspi.Event.Object"
 
 #------------------------------------------------------------------------------
 
diff --git a/pyatspi/deviceevent.py b/pyatspi/deviceevent.py
index c17e0fb..719af11 100644
--- a/pyatspi/deviceevent.py
+++ b/pyatspi/deviceevent.py
@@ -433,7 +433,7 @@ class KeyboardDeviceEventListener(_service.Object):
 
         def _get_unique_path (self):
                 KeyboardDeviceEventListener._next_listener_id += 1
-                return "/org/freedesktop/atspi/keyeventlistener/%d" % (KeyboardDeviceEventListener._next_listener_id,)
+                return "/org/a11y/atspi/keyeventlistener/%d" % (KeyboardDeviceEventListener._next_listener_id,)
 
         def __init__(self, registry, synchronous, preemptive, global_):
                 """
diff --git a/pyatspi/interfaces.py b/pyatspi/interfaces.py
index 43859af..c385f64 100644
--- a/pyatspi/interfaces.py
+++ b/pyatspi/interfaces.py
@@ -12,33 +12,33 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-ATSPI_ACCESSIBLE = 'org.freedesktop.atspi.Accessible'
-ATSPI_ACTION = 'org.freedesktop.atspi.Action'
-ATSPI_APPLICATION = 'org.freedesktop.atspi.Application'
-ATSPI_COMPONENT = 'org.freedesktop.atspi.Component'
-ATSPI_COLLECTION = 'org.freedesktop.atspi.Collection'
-ATSPI_DESKTOP = 'org.freedesktop.atspi.Desktop'
-ATSPI_DOCUMENT = 'org.freedesktop.atspi.Document'
-ATSPI_EDITABLE_TEXT = 'org.freedesktop.atspi.EditableText'
-ATSPI_HYPERLINK = 'org.freedesktop.atspi.Hyperlink'
-ATSPI_HYPERTEXT = 'org.freedesktop.atspi.Hypertext'
-ATSPI_IMAGE = 'org.freedesktop.atspi.Image'
-ATSPI_LOGIN_HELPER = 'org.freedesktop.atspi.LoginHelper'
-ATSPI_SELECTION = 'org.freedesktop.atspi.Selection'
-ATSPI_SELECTOR = 'org.freedesktop.atspi.Selector'
-ATSPI_STREAMABLE_CONTENT = 'org.freedesktop.atspi.StreamableContent'
-ATSPI_TABLE = 'org.freedesktop.atspi.Table'
-ATSPI_TEXT = 'org.freedesktop.atspi.Text'
-ATSPI_VALUE = 'org.freedesktop.atspi.Value'
+ATSPI_ACCESSIBLE = 'org.a11y.atspi.Accessible'
+ATSPI_ACTION = 'org.a11y.atspi.Action'
+ATSPI_APPLICATION = 'org.a11y.atspi.Application'
+ATSPI_COMPONENT = 'org.a11y.atspi.Component'
+ATSPI_COLLECTION = 'org.a11y.atspi.Collection'
+ATSPI_DESKTOP = 'org.a11y.atspi.Desktop'
+ATSPI_DOCUMENT = 'org.a11y.atspi.Document'
+ATSPI_EDITABLE_TEXT = 'org.a11y.atspi.EditableText'
+ATSPI_HYPERLINK = 'org.a11y.atspi.Hyperlink'
+ATSPI_HYPERTEXT = 'org.a11y.atspi.Hypertext'
+ATSPI_IMAGE = 'org.a11y.atspi.Image'
+ATSPI_LOGIN_HELPER = 'org.a11y.atspi.LoginHelper'
+ATSPI_SELECTION = 'org.a11y.atspi.Selection'
+ATSPI_SELECTOR = 'org.a11y.atspi.Selector'
+ATSPI_STREAMABLE_CONTENT = 'org.a11y.atspi.StreamableContent'
+ATSPI_TABLE = 'org.a11y.atspi.Table'
+ATSPI_TEXT = 'org.a11y.atspi.Text'
+ATSPI_VALUE = 'org.a11y.atspi.Value'
 
-ATSPI_REGISTRY_INTERFACE = 'org.freedesktop.atspi.Registry'
-ATSPI_REGISTRY_PATH = '/org/freedesktop/atspi/registry'
-ATSPI_REGISTRY_NAME = 'org.freedesktop.atspi.Registry'
+ATSPI_REGISTRY_INTERFACE = 'org.a11y.atspi.Registry'
+ATSPI_REGISTRY_PATH = '/org/a11y/atspi/registry'
+ATSPI_REGISTRY_NAME = 'org.a11y.atspi.Registry'
 
-ATSPI_ROOT_PATH = '/org/freedesktop/atspi/accessible/root'
-ATSPI_NULL_PATH = '/org/freedesktop/atspi/null'
+ATSPI_ROOT_PATH = '/org/a11y/atspi/accessible/root'
+ATSPI_NULL_PATH = '/org/a11y/atspi/null'
 
-ATSPI_DEVICE_EVENT_LISTENER_INTERFACE = 'org.freedesktop.atspi.DeviceEventListener'
-ATSPI_DEVICE_EVENT_CONTROLLER_INTERFACE = 'org.freedesktop.atspi.DeviceEventController'
-ATSPI_DEVICE_EVENT_CONTROLLER_PATH = '/org/freedesktop/atspi/registry/deviceeventcontroller'
-ATSPI_DEVICE_EVENT_CONTROLLER_NAME = 'org.freedesktop.atspi.Registry'
+ATSPI_DEVICE_EVENT_LISTENER_INTERFACE = 'org.a11y.atspi.DeviceEventListener'
+ATSPI_DEVICE_EVENT_CONTROLLER_INTERFACE = 'org.a11y.atspi.DeviceEventController'
+ATSPI_DEVICE_EVENT_CONTROLLER_PATH = '/org/a11y/atspi/registry/deviceeventcontroller'
+ATSPI_DEVICE_EVENT_CONTROLLER_NAME = 'org.a11y.atspi.Registry'
diff --git a/pyatspi/utils.py b/pyatspi/utils.py
index f77d9cd..199ae32 100644
--- a/pyatspi/utils.py
+++ b/pyatspi/utils.py
@@ -83,7 +83,7 @@ def getInterfaceName(obj):
         @rtype: string
         @raise AttributeError: When the parameter does not provide typecode info
         """
-        return obj._dbus_interface.lstrip("org.freedesktop.atspi.")
+        return obj._dbus_interface.lstrip("org.a11y.atspi.")
 
 def listInterfaces(obj):
         """
@@ -99,7 +99,7 @@ def listInterfaces(obj):
         @raise AttributeError: If the object provide does not implement
         queryInterface
         """
-        return [itf.lstrip("org.freedesktop.atspi.") for itf in obj.interfaces]
+        return [itf.lstrip("org.a11y.atspi.") for itf in obj.interfaces]
 
 def stringToConst(prefix, suffix):
         """



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]