Partial re-refactor of the accessibles registration code.

[platform/core/uifw/at-spi2-atk.git] / pyatspi / __init__.py

diff --git a/pyatspi/__init__.py b/pyatspi/__init__.py
index 727e652..510e65b 100644 (file)
--- a/pyatspi/__init__.py
+++ b/pyatspi/__init__.py
@@ -1,67 +1,23 @@
-'''
-Wraps the Gnome Assistive Technology Service Provider Interface for use in
-Python. Imports the bonobo and ORBit modules. Initializes the ORBit ORB.
-Activates the bonobo Accessibility Registry. Loads the Accessibility typelib
-and imports the classes implementing the AT-SPI interfaces.
+#Copyright (C) 2008 Codethink Ltd
 
-@var Registry: Reference to the AT-SPI registry daemon intialized on successful
-  import
-@type Registry: registry.Registry
+#This library is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public
+#License version 2 as published by the Free Software Foundation.
 
-@author: Peter Parente
-@organization: IBM Corporation
-@copyright: Copyright (c) 2005, 2007 IBM Corporation
-@license: LGPL
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#You should have received a copy of the GNU Lesser General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
+__version__ = (1, 9, 0)
 
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-
-Portions of this code originally licensed and copyright (c) 2005, 2007
-IBM Corporation under the BSD license, available at
-U{http://www.opensource.org/licenses/bsd-license.php}
-'''
-
-REGISTRY_IID = "OAFIID:Accessibility_Registry:1.0"
-TYPELIB_NAME = "Accessibility"
-
-# import ORBit and bonobo first (required)
-import ORBit, bonobo
-# initialize the ORB
-orb = ORBit.CORBA.ORB_init()
-# get a reference to the gnome Accessibility registry
-reg = bonobo.activation.activate_from_id(REGISTRY_IID, 0, 0)
-if reg is None:
-  raise RuntimeError('could not activate:', REGISTRY_IID)
-# generate Python code for the Accessibility module from the IDL
-ORBit.load_typelib(TYPELIB_NAME)
-
-# import our registry module
 import registry
-# wrap the raw registry object in our convenience singleton
-Registry = registry.Registry(reg)
-# now throw the module away immediately
+Registry = registry._Registry()
+registry._Registry = Registry
 del registry
 
-# pull the cache level functions into this namespace, but nothing else
-from accessible import setCacheLevel, getCacheLevel
-
-# pull constants and utilities directly into this namespace; rest of code
-# never has to be touched externally
-from constants import *
-from utils import *
-
-# throw away extra references
-del reg
-del orb
+import constants
+from Accessibility import *