Merge 9c74b29 into 88e05df

.gitignore

@@ -1,12 +1,66 @@
-*.swp
-*.pyc
-*.egg-info
-ve/
-*_priv.py
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
 .coverage
+.coverage.*
 coverage-html/
-coverage.xml
+.cache
 nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Custom
+*.swp
+ve/
+*_priv.py
 pep8.txt
-dist/
-build/

credentials_test.py

@@ -1,7 +1,7 @@
 
 logica = {
-        'host':'localhost',
-        'port':2775,
-        'system_id':'test id',
-        'password':'abc 123',
+        'host': 'localhost',
+        'port': 2775,
+        'system_id': 'test id',
+        'password': 'abc 123',
 }

smpp/clickatell.py

@@ -1,7 +1,6 @@
 
 clickatell_defaults = {
-        'interface_version':'34',
-        'dest_addr_ton':1,
-        'dest_addr_npi':1,
+    'interface_version': '34',
+    'dest_addr_ton': 1,
+    'dest_addr_npi': 1,
 }
-

smpp/esme.py

@@ -10,117 +10,104 @@ def __init__(self):
         self.sequence_number = 1
         self.conn = None
         self.defaults = {
-                'host':'127.0.0.1',
-                'port':2775,
-                'dest_addr_ton':0,
-                'dest_addr_npi':0,
-                }
-
+            'host': '127.0.0.1',
+            'port': 2775,
+            'dest_addr_ton': 0,
+            'dest_addr_npi': 0,
+        }
 
     def loadDefaults(self, defaults):
         self.defaults = dict(self.defaults, **defaults)
 
-
     def connect(self):
         if self.state in ['CLOSED']:
             self.conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             self.conn.connect((self.defaults['host'], self.defaults['port']))
             self.state = 'OPEN'
 
-
     def disconnect(self):
         if self.state in ['BOUND_TX', 'BOUND_RX', 'BOUND_TRX']:
             self.__unbind()
         if self.state in ['OPEN']:
             self.conn.close()
             self.state = 'CLOSED'
 
-
     def __recv(self):
         pdu = None
         length_bin = self.conn.recv(4)
         if not length_bin:
             return None
         else:
-            #print 'length_bin', len(length_bin), length_bin
+            # print 'length_bin', len(length_bin), length_bin
             if len(length_bin) == 4:
-                length = int(binascii.b2a_hex(length_bin),16)
+                length = int(binascii.b2a_hex(length_bin), 16)
                 rest_bin = self.conn.recv(length-4)
                 pdu = unpack_pdu(length_bin + rest_bin)
                 print '...', pdu['header']['sequence_number'],
                 print '>',   pdu['header']['command_id'],
                 print '...', pdu['header']['command_status']
             return pdu
 
-
     def __is_ok(self, pdu, id_check=None):
-        if (isinstance(pdu, dict)
-                and pdu.get('header',{}).get('command_status') == 'ESME_ROK'
-                and (id_check == None
-                    or id_check == pdu['header'].get('command_id'))):
+        if (isinstance(pdu, dict) and
+            pdu.get('header', {}).get('command_status') == 'ESME_ROK' and
+                (id_check is None or id_check == pdu['header'].get('command_id'))):
             return True
         else:
             return False
 
-
     def bind_transmitter(self):
         if self.state in ['CLOSED']:
             self.connect()
         if self.state in ['OPEN']:
             pdu = BindTransmitter(self.sequence_number, **self.defaults)
             self.conn.send(pdu.get_bin())
-            self.sequence_number +=1
+            self.sequence_number += 1
             if self.__is_ok(self.__recv(), 'bind_transmitter_resp'):
                 self.state = 'BOUND_TX'
 
-
     def __unbind(self):
         if self.state in ['BOUND_TX', 'BOUND_RX', 'BOUND_TRX']:
             pdu = Unbind(self.sequence_number)
             self.conn.send(pdu.get_bin())
-            self.sequence_number +=1
+            self.sequence_number += 1
             if self.__is_ok(self.__recv(), 'unbind_resp'):
                 self.state = 'OPEN'
 
-
-    #def unbind(self): # will probably be deprecated
-        #self.__unbind()
-
+    # def unbind(self): # will probably be deprecated
+    #     self.__unbind()
 
     def submit_sm(self, **kwargs):
         if self.state in ['BOUND_TX', 'BOUND_TRX']:
             print dict(self.defaults, **kwargs)
             pdu = SubmitSM(self.sequence_number, **dict(self.defaults, **kwargs))
             self.conn.send(pdu.get_bin())
-            self.sequence_number +=1
+            self.sequence_number += 1
             submit_sm_resp = self.__recv()
-            #print self.__is_ok(submit_sm_resp, 'submit_sm_resp')
-
+            # print self.__is_ok(submit_sm_resp, 'submit_sm_resp')
 
     def submit_multi(self, dest_address=[], **kwargs):
         if self.state in ['BOUND_TX', 'BOUND_TRX']:
             pdu = SubmitMulti(self.sequence_number, **dict(self.defaults, **kwargs))
             for item in dest_address:
-                if isinstance(item, str): # assume strings are addresses not lists
+                if isinstance(item, str):  # assume strings are addresses not lists
                     pdu.addDestinationAddress(
                             item,
-                            dest_addr_ton = self.defaults['dest_addr_ton'],
-                            dest_addr_npi = self.defaults['dest_addr_npi'],
+                            dest_addr_ton=self.defaults['dest_addr_ton'],
+                            dest_addr_npi=self.defaults['dest_addr_npi'],
                             )
                 elif isinstance(item, dict):
                     if item.get('dest_flag') == 1:
                         pdu.addDestinationAddress(
                                 item.get('destination_addr', ''),
-                                dest_addr_ton = item.get('dest_addr_ton',
+                                dest_addr_ton=item.get('dest_addr_ton',
                                     self.defaults['dest_addr_ton']),
-                                dest_addr_npi = item.get('dest_addr_npi',
+                                dest_addr_npi=item.get('dest_addr_npi',
                                     self.defaults['dest_addr_npi']),
                                 )
                     elif item.get('dest_flag') == 2:
                         pdu.addDistributionList(item.get('dl_name'))
             self.conn.send(pdu.get_bin())
-            self.sequence_number +=1
+            self.sequence_number += 1
             submit_multi_resp = self.__recv()
-            #print self.__is_ok(submit_multi_resp, 'submit_multi_resp')
-
-
+            # print self.__is_ok(submit_multi_resp, 'submit_multi_resp')