Merge pull request python-smpplib#13 from podshumok/revert-5-master

Revert "Add ALERT_NOTIFICATION PDU"

Author: Konstantin Podshumok

smpplib/client.py

@@ -231,15 +231,6 @@ def accept(self, obj):
         """Accept an object"""
         raise NotImplementedError('not implemented')
 
-    def _alert_received(self, p):
-        """Handler for received alert_notification event"""
-        self.alert_handler(pdu=p)
-
-    def alert_handler(self, pdu, **kwargs):
-        """Called when SMPP server sends an alert (ALERT_NOTIFICATION).
-        May be overridden"""
-        logger.warning('Alert handler (Override me)')
-
     def _message_received(self, p):
         """Handler for received message event"""
         self.message_received_handler(pdu=p)
@@ -248,22 +239,33 @@ def _message_received(self, p):
         dsmr.sequence = p.sequence
         self.send_pdu(dsmr)
 
-    def message_received_handler(self, pdu, **kwargs):
-        """Custom handler to process received message. May be overridden"""
-        logger.warning('Message received handler (Override me)')
-
-    def message_sent_handler(self, pdu, **kwargs):
-        """Called when SMPP server accept message (SUBMIT_SM_RESP).
-        May be overridden"""
-        logger.warning('Message sent handler (Override me)')
-
     def _enquire_link_received(self):
         """Response to enquire_link"""
         ler = smpp.make_pdu('enquire_link_resp', client=self)
         #, message_id=args['pdu'].sm_default_msg_id)
         self.send_pdu(ler)
         logger.debug("Link Enquiry...")
 
+    def set_message_received_handler(self, func):
+        """Set new function to handle message receive event"""
+        self.message_received_handler = func
+
+    def set_message_sent_handler(self, func):
+        """Set new function to handle message sent event"""
+        self.message_sent_handler = func
+
+    @staticmethod
+    def message_received_handler(pdu, **kwargs):
+        """Custom handler to process received message. May be overridden"""
+
+        logger.warning('Message received handler (Override me)')
+
+    @staticmethod
+    def message_sent_handler(pdu, **kwargs):
+        """Called when SMPP server accept message (SUBMIT_SM_RESP).
+        May be overridden"""
+        logger.warning('Message sent handler (Override me)')
+
     def listen(self, ignore_error_codes=None):
         """Listen for PDUs and act"""
 
@@ -293,8 +295,6 @@ def listen(self, ignore_error_codes=None):
                     self._enquire_link_received()
                 elif p.command == 'enquire_link_resp':
                     pass
-                elif p.command == 'alert_notification':
-                    self._alert_received(p)
                 else:
                     logger.warning('Unhandled SMPP command "%s"', p.command)
             except exceptions.PDUError, e:

smpplib/command.py

@@ -55,7 +55,6 @@ def factory(command_name, **kwargs):
             'unbind_resp': UnbindResp,
             'enquire_link': EnquireLink,
             'enquire_link_resp': EnquireLinkResp,
-            'alert_notification': AlertNotification,
         }[command_name](command_name, **kwargs)
     except KeyError:
         raise exceptions.UnknownCommandError(
@@ -898,38 +897,3 @@ def __init__(self, command, **kwargs):
         """Initialize"""
         super(EnquireLinkResp, self).__init__(command, need_sequence=False,
             **kwargs)
-
-
-class AlertNotification(Command):
-    """Alert notification command response"""
-    params = {
-        'source_addr_ton': Param(type=int, size=1),
-        'source_addr_npi': Param(type=int, size=1),
-        'source_addr': Param(type=str, max=65),
-        'esme_addr_ton': Param(type=int, size=1),
-        'esme_addr_npi': Param(type=int, size=1),
-        'esme_addr': Param(type=str, max=65),
-
-        # Optional params
-        'ms_availability_status': Param(type=int, size=1),
-    }
-    params_order = (
-        'source_addr_ton',
-        'source_addr_npi',
-        'source_addr',
-        'esme_addr_ton',
-        'esme_addr_npi',
-        'esme_addr',
-
-        # Optional params
-        'ms_availability_status',
-    )
-
-    def __init__(self, command, **kwargs):
-        """Initialize"""
-        super(AlertNotification, self).__init__(
-            command,
-            need_sequence=False,
-            **kwargs
-        )
-        self._set_vars(**(dict.fromkeys(self.params)))