90: Renamed plugable.Abstract to ProxyTarget, which now subclasses from ReadOnly; updated unit tests

1 files changed, 55 insertions, 49 deletions

diff --git a/ipalib/plugable.py b/ipalib/plugable.py
index 092e3bdd7..3f53fd4ad 100644
--- a/ipalib/plugable.py
+++ b/ipalib/plugable.py
@@ -43,7 +43,11 @@ class ReadOnly(object):
     __locked = False
 
     def __lock__(self):
-        assert self.__locked is False
+        """
+        Puts this instance into a read-only state, after which attempting to
+        set or delete an attribute will raise AttributeError.
+        """
+        assert self.__locked is False, '__lock__() can only be called once'
         self.__locked = True
 
     def __setattr__(self, name, value):
@@ -69,7 +73,7 @@ class ReadOnly(object):
         return object.__delattr__(self, name)
 
 
-class Abstract(object):
+class ProxyTarget(ReadOnly):
     __public__ = frozenset()
 
     @classmethod
@@ -86,52 +90,6 @@ class Abstract(object):
         )
 
 
-class Plugin(object):
-    """
-    Base class for all plugins.
-    """
-
-    __api = None
-
-    def __get_api(self):
-        """
-        Returns the plugable.API instance passed to Plugin.finalize(), or
-        or returns None if finalize() has not yet been called.
-        """
-        return self.__api
-    api = property(__get_api)
-
-    def finalize(self, api):
-        """
-        After all the plugins are instantiated, the plugable.API calls this
-        method, passing itself as the only argument. This is where plugins
-        should check that other plugins they depend upon have actually be
-        loaded.
-        """
-        assert self.__api is None, 'finalize() can only be called once'
-        assert api is not None, 'finalize() argument cannot be None'
-        self.__api = api
-
-    def __get_name(self):
-        """
-        Returns the class name of this instance.
-        """
-        return self.__class__.__name__
-    name = property(__get_name)
-
-    def __repr__(self):
-        """
-        Returns a fully qualified <module><name> representation of the class.
-        """
-        return '%s.%s()' % (
-            self.__class__.__module__,
-            self.__class__.__name__
-        )
-
-
-
-
-
 class Proxy(ReadOnly):
     __slots__ = (
         '__base',
@@ -155,7 +113,6 @@ class Proxy(ReadOnly):
         check_identifier(self.name)
         self.__lock__()
 
-
     def __iter__(self):
         for name in sorted(self.__public__):
             yield name
@@ -185,6 +142,55 @@ class Proxy(ReadOnly):
         )
 
 
+class Plugin(object):
+    """
+    Base class for all plugins.
+    """
+
+    __api = None
+
+    def __get_api(self):
+        """
+        Returns the plugable.API instance passed to Plugin.finalize(), or
+        or returns None if finalize() has not yet been called.
+        """
+        return self.__api
+    api = property(__get_api)
+
+    def finalize(self, api):
+        """
+        After all the plugins are instantiated, the plugable.API calls this
+        method, passing itself as the only argument. This is where plugins
+        should check that other plugins they depend upon have actually be
+        loaded.
+        """
+        assert self.__api is None, 'finalize() can only be called once'
+        assert api is not None, 'finalize() argument cannot be None'
+        self.__api = api
+
+    def __get_name(self):
+        """
+        Returns the class name of this instance.
+        """
+        return self.__class__.__name__
+    name = property(__get_name)
+
+    def __repr__(self):
+        """
+        Returns a fully qualified <module><name> representation of the class.
+        """
+        return '%s.%s()' % (
+            self.__class__.__module__,
+            self.__class__.__name__
+        )
+
+
+
+
+
+
+
+
 class NameSpace(ReadOnly):
     """
     A read-only namespace of (key, value) pairs that can be accessed