[pyatspi2] Remove support for relocated pyatspi-corba, per a11y meeting discussion



commit 086edbbf2b4c67d593386226f1d1bd08e605b1f1
Author: Mike Gorse <mgorse novell com>
Date:   Thu Jul 28 14:41:35 2011 -0500

    Remove support for relocated pyatspi-corba, per a11y meeting discussion

 pyatspi/__init__.py |   33 ++++++++-------------------------
 1 files changed, 8 insertions(+), 25 deletions(-)
---
diff --git a/pyatspi/__init__.py b/pyatspi/__init__.py
index 86a68b8..0bf00b6 100644
--- a/pyatspi/__init__.py
+++ b/pyatspi/__init__.py
@@ -12,31 +12,14 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-# Do not replace yourself if you've been imported explicitly by name
-# already.
-#
-import sys
-if not sys.modules.has_key('pyatspi_dbus'):
-    try:
-        import subprocess
-        o = subprocess.check_output (("gconftool-2", "--get", "/desktop/gnome/interface/at-spi-corba"))
-        useCorba = (o == "true\n")
-    except:
-        useCorba = False
-else:
-    useCorba = False
-
-if useCorba:
-    import pyatspi_corba
-    sys.modules['pyatspi'] = pyatspi_corba
-else:
-    __version__ = (1, 9, 0)
+__version__ = (1, 9, 0)
 
-    from gi.repository import Atspi
+from gi.repository import Atspi
 
-    from Accessibility import *
+from Accessibility import *
 
-    #This is a re-creation of the namespace pollution implemented
-    #by PyORBit.
-    import Accessibility
-    sys.modules['Accessibility'] = Accessibility
+#This is a re-creation of the namespace pollution implemented
+#by PyORBit.
+import sys
+import Accessibility
+sys.modules['Accessibility'] = Accessibility



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