equal
deleted
inserted
replaced
110 to the request.""" |
110 to the request.""" |
111 #logger.debug('smstrade._send(%s,%s,%s)'%( route, to, sms)) |
111 #logger.debug('smstrade._send(%s,%s,%s)'%( route, to, sms)) |
112 parameters= {"key": self.key, |
112 parameters= {"key": self.key, |
113 "route": route, |
113 "route": route, |
114 "to": to, |
114 "to": to, |
115 "message": sms.content.encode("utf-8"), |
115 "message": sms.content, |
116 "charset":"utf-8", |
116 "charset":"utf-8", |
117 "debug": self.testmode, |
117 "debug": self.testmode, |
118 "message_id":True, |
118 "message_id":True, |
119 "count":True, |
119 "count":True, |
120 "cost":True, |
120 "cost":True, |
125 if sms.from_ is not None: |
125 if sms.from_ is not None: |
126 parameters["from"] = sms.from_ |
126 parameters["from"] = sms.from_ |
127 |
127 |
128 length=len(sms.content) |
128 length=len(sms.content) |
129 for s in doubleChar: |
129 for s in doubleChar: |
130 length += sms.content.encode("utf-8").count(s) |
130 length += sms.content.count(s) |
131 parameters["concat_sms"] = True if length > 160 else False |
131 parameters["concat_sms"] = True if length > 160 else False |
132 |
132 |
133 ps={} |
133 ps={} |
134 for p in parameters: |
134 for p in parameters: |
135 if p in self.params.keys(): |
135 if p in self.params.keys(): |