Remove PoolElement redefinition

PoolElement class is defined twice:
* sardana.pool.poolelement.PoolElement
* sardana.pool.poolbaseelement.PoolElement
and these classes are identical.

Remove the sardana.pool.poolbaseelement.PoolElement definition.

1 files changed, 1 insertions, 115 deletions

diff --git a/src/sardana/pool/poolbaseelement.py b/src/sardana/pool/poolbaseelement.py
index f5b593b3..e6a0029c 100644
--- a/src/sardana/pool/poolbaseelement.py
+++ b/src/sardana/pool/poolbaseelement.py
@@ -357,118 +357,4 @@ class PoolBaseElement(PoolObject):
         self._operation = operation
 
     def clear_operation(self):
-        return self.set_operation(None)
-
-
-class PoolElement(PoolBaseElement):
-    """A Pool element is an Pool object which is controlled by a controller.
-       Therefore it contains a _ctrl_id and a _axis (the id of the element in
-       the controller)."""
-
-    def __init__(self, **kwargs):
-        ctrl = kwargs.pop('ctrl')
-        self._ctrl = weakref.ref(ctrl)
-        self._axis = kwargs.pop('axis')
-        self._ctrl_id = ctrl.get_id()
-        try:
-            instrument = kwargs.pop('instrument')
-            self.set_instrument(instrument)
-        except KeyError:
-            self._instrument = None
-        super(PoolElement, self).__init__(**kwargs)
-
-    def serialize(self, *args, **kwargs):
-        kwargs = PoolBaseElement.serialize(self, *args, **kwargs)
-        kwargs['controller'] = self.controller.full_name
-        kwargs['unit'] = '0'  #TODO: hardcoded unit to 0
-        kwargs['axis'] = self.axis
-        if self.instrument is not None:
-            kwargs['instrument'] = self.instrument.full_name
-        else:
-            kwargs['instrument'] = None
-        kwargs['source'] = self.get_source()
-        return kwargs
-
-    def get_parent(self):
-        return self.get_controller()
-
-    def get_controller(self):
-        if self._ctrl is None:
-            return None
-        return self._ctrl()
-
-    def get_controller_id(self):
-        return self._ctrl_id
-
-    def get_axis(self):
-        return self._axis
-
-    def set_action_cache(self, action_cache):
-        self._action_cache = action_cache
-        action_cache.add_element(self)
-
-    def get_source(self):
-        return "{0}/{1}".format(self.full_name, self.get_default_acquisition_channel())
-
-    # --------------------------------------------------------------------------
-    # instrument
-    # --------------------------------------------------------------------------
-
-    def get_instrument(self):
-        if self._instrument is None:
-            return None
-        return self._instrument()
-
-    def set_instrument(self, instrument, propagate=1):
-        self._set_instrument(instrument, propagate=propagate)
-
-    def _set_instrument(self, instrument, propagate=1):
-        if self._instrument is not None:
-            self._instrument().remove_element(self)
-        new_instrument_name = ""
-        if instrument is None:
-            self._instrument = None
-        else:
-            self._instrument = weakref.ref(instrument)
-            new_instrument_name = instrument.full_name
-            instrument.add_element(self)
-        if not propagate:
-            return
-        self.fire_event(EventType("instrument", priority=propagate),
-                        new_instrument_name)
-
-    # --------------------------------------------------------------------------
-    # stop
-    # --------------------------------------------------------------------------
-
-    def stop(self):
-        self.info("Stop!")
-        PoolBaseElement.stop(self)
-        self.controller.stop_one(self.axis)
-
-    # --------------------------------------------------------------------------
-    # abort
-    # --------------------------------------------------------------------------
-
-    def abort(self):
-        self.info("Abort!")
-        PoolBaseElement.abort(self)
-        self.controller.abort_one(self.axis)
-
-    def get_par(self, name):
-        return self.controller.get_axis_par(self.axis, name)
-
-    def set_par(self, name, value):
-        return self.controller.set_axis_par(self.axis, name, value)
-
-    def get_extra_par(self, name):
-        return self.controller.get_axis_attr(self.axis, name)
-
-    def set_extra_par(self, name, value):
-        return self.controller.set_axis_attr(self.axis, name, value)
-
-    axis = property(get_axis, doc="element axis")
-    controller = property(get_controller, doc="element controller")
-    controller_id = property(get_controller_id, doc="element controller id")
-    instrument = property(get_instrument, set_instrument,
-                          doc="element instrument")
+        return self.set_operation(None)
\ No newline at end of file