Merge pull request #876 from cmft/remove_subs_api

 Remove _{un,}subscribeEvents API in TaurusAttribute

CHANGELOG.md

@@ -13,6 +13,8 @@ develop branch) won't be reflected in this file.
 - `TaurusModelSelector` and `TaurusModelSelectorItem` classes and the
   (experimental) `"taurus.qt.qtgui.panel.TaurusModelSelector.items"` entry point (#869)
 
+### Deprecated
+- `TaurusAttribute._(un)subscribeEvents` API
 
 ## [4.5.1] - 2019-02-15
 

lib/taurus/core/epics/epicsattribute.py

@@ -226,14 +226,6 @@ def poll(self):
 
     def isUsingEvents(self):
         return True  # TODO: implement this
-
-    def _subscribeEvents(self):
-        raise NotImplementedError("Not allowed to call AbstractClass" +
-                                  " TaurusAttribute._subscribeEvents")
-
-    def _unsubscribeEvents(self):
-        raise NotImplementedError("Not allowed to call AbstractClass" +
-                                  " TaurusAttribute._unsubscribeEvents")
 # ------------------------------------------------------------------------------
 
     def factory(self):

lib/taurus/core/evaluation/evalattribute.py

@@ -445,12 +445,6 @@ def poll(self):
         v = self.read(cache=False)
         self.fireEvent(TaurusEventType.Periodic, v)
 
-    def _subscribeEvents(self):
-        pass
-
-    def _unsubscribeEvents(self):
-        pass
-
     def isUsingEvents(self):
         # if this attributes depends from others, then we consider it uses
         # events

lib/taurus/core/tango/tangoattribute.py

@@ -324,6 +324,7 @@ def __del__(self):
     def cleanUp(self):
         self.trace("[TangoAttribute] cleanUp")
         self._unsubscribeConfEvents()
+        self._unsubscribeChangeEvents()
         TaurusAttribute.cleanUp(self)
         self.__dev_hw_obj = None
         self._pytango_attrinfoex = None
@@ -600,7 +601,7 @@ def addListener(self, listener):
         assert len(listeners) >= 1
 
         if self.__subscription_state == SubscriptionState.Unsubscribed and len(listeners) == 1:
-            self._subscribeEvents()
+            self._subscribeChangeEvents()
 
         # if initial_subscription_state == SubscriptionState.Subscribed:
         if (len(listeners) > 1
@@ -630,7 +631,7 @@ def removeListener(self, listener):
             return ret
 
         if self.__subscription_state != SubscriptionState.Unsubscribed:
-            self._unsubscribeEvents()
+            self._unsubscribeChangeEvents()
 
         return ret
 
@@ -654,7 +655,7 @@ def getSubscriptionState(self):
     def _process_event_exception(self, ex):
         pass
 
-    def _subscribeEvents(self):
+    def _subscribeChangeEvents(self):
         """ Enable subscription to the attribute events. If change events are
             not supported polling is activated """
 
@@ -705,7 +706,7 @@ def _call_dev_hw_subscribe_event(self, stateless=True):
 
         return self.__chg_evt_id
 
-    def _unsubscribeEvents(self):
+    def _unsubscribeChangeEvents(self):
         # Careful in this method: This is intended to be executed in the cleanUp
         # so we should not access external objects from the factory, like the
         # parent object

lib/taurus/core/taurusattribute.py

@@ -79,7 +79,11 @@ def __init__(self, name='', parent=None, **kwargs):
 
     def cleanUp(self):
         self.trace("[TaurusAttribute] cleanUp")
-        self._unsubscribeEvents()
+        if hasattr(self, '_unsuscribeEvents'):
+            self.deprecated(
+                dep='TaurusAttribute._unsuscribeEvents API',
+                alt='If you need it called in cleanUp, re-implement cleanUp')
+            self._unsuscribeEvents()
         TaurusModel.cleanUp(self)
 
     #-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-
@@ -146,14 +150,6 @@ def poll(self):
         raise NotImplementedError("Not allowed to call AbstractClass" +
                                   " TaurusAttribute.poll")
 
-    def _subscribeEvents(self):
-        raise NotImplementedError("Not allowed to call AbstractClass" +
-                                  " TaurusAttribute._subscribeEvents")
-
-    def _unsubscribeEvents(self):
-        raise NotImplementedError("Not allowed to call AbstractClass" +
-                                  " TaurusAttribute._unsubscribeEvents")
-
     def isUsingEvents(self):
         raise NotImplementedError("Not allowed to call AbstractClass" +
                                   " TaurusAttribute.isUsingEvents")