* accessible.py: Narrow queried interfaces (bug #478124). Narrow

objects returned from Relation.getTarget() to
Accessibility.Accessible (bug #478129).

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@951 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/pyatspi/ChangeLog b/pyatspi/ChangeLog
index 6de46681ad10094d8f03e14de034c83e6935c541..2e63af4883b988539a9f6f358844e3c62cad8b5c 100644 (file)
--- a/pyatspi/ChangeLog
+++ b/pyatspi/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-12  Eitan Isaacson  <eitan@ascender.com>
+
+       * accessible.py: Narrow queried interfaces (bug #478124). Narrow
+       objects returned from Relation.getTarget() to
+       Accessibility.Accessible (bug #478129).
+
 2007-10-06  Eitan Isaacson  <eitan@ascender.com>
 
        * utils.py (StateSet.add): Fixed type (bug #484201).

diff --git a/pyatspi/accessible.py b/pyatspi/accessible.py
index a1c953f003c7622ff133569a54495b4600325cc4..89715ca02815ef3664610da627738802fdcfa301 100644 (file)
--- a/pyatspi/accessible.py
+++ b/pyatspi/accessible.py
@@ -115,12 +115,12 @@ def _updateCache(event):
   except KeyError:
     return
 
-def _makeQuery(iid):
+def _makeQuery(interface):
   '''
   Builds a function querying to a specific interface and returns it.
   
-  @param iid: Interface identifier to use when querying
-  @type iid: string
+  @param interface: Class representing an AT-SPI interface
+  @type interface: class
   @return: Function querying to the given interface
   @rtype: function
   '''
@@ -132,6 +132,7 @@ def _makeQuery(iid):
     @rtype: object
     @raise NotImplementedError: When the desired interface is not supported    
     '''
+    iid = utils.getInterfaceIID(interface)
     try:
       i = self._icache[iid]
     except KeyError:
@@ -154,8 +155,10 @@ def _makeQuery(iid):
     try:
       # do the query remotely
       i = self.queryInterface(iid)
+      if i is not None:
+        i = i._narrow(interface)
     except Exception, e:
-      raise LookupError(e)
+      raise LookupError(e)      
     if i is None:
       # cache that the interface is not supported
       if caching:
@@ -204,7 +207,7 @@ def _mixInterfaces(cls, interfaces):
     # build name of converter from the name of the interface
     name = 'query%s' % utils.getInterfaceName(interface)
     # build a function that queries to the given interface
-    func = _makeQuery(utils.getInterfaceIID(interface))
+    func = _makeQuery(interface)
     # build a new method that is a clone of the original function
     method = new.function(func.func_code, func.func_globals, name, 
                           func.func_defaults, func.func_closure)
@@ -566,6 +569,25 @@ class _AccessibleMixin(object):
     # return None if the application isn't reachable for any reason
     return None
 
+class _RelationMixin(object):
+  '''
+  Defines methods to be added to the Relation class. At this time it only
+  overrides L{_RelationMixin.getTarget} which by the IDL's standard is
+  supposed to return CORBA.Objects but we expect LAccessibility.Accessible
+  objects (see http://bugzilla.gnome.org/show_bug.cgi?id=435833). 
+  This seems to be a problem especially with the Java implementation of CORBA.
+  '''
+  def getTarget(self, index):
+    '''
+    Overrides the regular getTarget to return Accessibility.Accessible
+    objects.
+
+    @return: The 'nth' target of this Relation.
+    @rtype: Accessibility.Accessible
+    '''
+    target = self._mix_getTarget(index)
+    return target._narrow(Accessibility.Accessible)
+
 # 1. mix the exception handlers into all queryable interfaces
 map(_mixExceptions, constants.ALL_INTERFACES)
 # 2. mix the exception handlers into other Accessibility objects
@@ -575,3 +597,5 @@ _mixClass(Accessibility.Accessible, _AccessibleMixin,
           ['_get_name', '_get_description'])
 # 4. mix queryInterface convenience methods
 _mixInterfaces(Accessibility.Accessible, constants.ALL_INTERFACES)
+# 5. mix Relation class
+_mixClass(Accessibility.Relation, _RelationMixin)