[pyatspi2] Only catch AttributeError for _get_accessibility_bus_address

[Mike Gorse <mgorse src gnome org>]

commit c4e727a7512d7af3fbb5d632a0611652ce32c457
Author: Mike Gorse <mgorse novell com>
Date:   Tue Aug 24 07:52:52 2010 -0400

    Only catch AttributeError for _get_accessibility_bus_address
    
    For _get_accessibility_bus_address(), only catch the exception that is thrown
    if the accessibility bus is not present.  Do not, for instance, atch an
    ImportError that is caused by python-xlib not being present, since this causes
    the session bus to be used when the accessibility bus is present.

 pyatspi/busutils/bus.py |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/pyatspi/busutils/bus.py b/pyatspi/busutils/bus.py
index d0ee289..6d84c50 100644
--- a/pyatspi/busutils/bus.py
+++ b/pyatspi/busutils/bus.py
@@ -123,7 +123,7 @@ class AsyncAccessibilityBus (_AccessibilityBus):
                 if realAddress is None:
                         try:
                                 realAddress = _get_accessibility_bus_address()
-                        except:
+                        except AttributeError:
                                 realAddress = _bus.BusConnection.TYPE_SESSION
 
                 try:
@@ -139,11 +139,11 @@ class AsyncAccessibilityBus (_AccessibilityBus):
                 if address is None:
                         try:
                                 address = _get_accessibility_bus_address()
-                        except:
+                        except AttributeError:
                                 address = _bus.BusConnection.TYPE_SESSION
 		try:
 			_AccessibilityBus.__init__ (self, _get_accessibility_bus_address(), None)
-		except Exception:
+		except AttributeError:
 			_AccessibilityBus.__init__ (self, _bus.BusConnection.TYPE_SESSION, None)
                 self.registry = registry
 
@@ -161,7 +161,7 @@ class SyncAccessibilityBus (_bus.BusConnection):
 			try:
 				SyncAccessibilityBus._shared_instance = \
                                         _bus.BusConnection.__new__ (cls, _get_accessibility_bus_address(), None)
-			except Exception:
+			except AttributeError:
 				SyncAccessibilityBus._shared_instance = \
                                         _bus.BusConnection.__new__ (cls, _bus.BusConnection.TYPE_SESSION, None)
 			
@@ -170,6 +170,6 @@ class SyncAccessibilityBus (_bus.BusConnection):
 	def __init__ (self, registry):
 		try:
 			_bus.BusConnection.__init__ (self, _get_accessibility_bus_address(), None)
-		except Exception:
+		except AttributeError:
 			_bus.BusConnection.__init__ (self, _bus.BusConnection.TYPE_SESSION, None)
                 self.registry = registry