diff -r 0d7ffb9b2c7f -r e6302069d772 iro/anbieter/smstrade.py --- a/iro/anbieter/smstrade.py Tue Nov 24 02:02:41 2009 +0100 +++ b/iro/anbieter/smstrade.py Fri Nov 27 01:05:48 2009 +0100 @@ -91,10 +91,8 @@ import logging logging.debug('smstrade.sendSMS(%s,%s)'%(sms, str(recipients))) sended = [] - key = self.key route = unicode(self.route) message = sms.content - from_ = unicode(self.from_) timestamp = None for recipient in recipients: try: @@ -107,7 +105,7 @@ route=unicode("basic") else: route=unicode("economy") - smsSendStatus = self.__send(key, route, to, message, from_, timestamp) + smsSendStatus = self.__send(route, to, message, timestamp) if int(smsSendStatus) in(100, 999): self.updateStatus(arranged=recipient) else: @@ -120,8 +118,8 @@ The function has to return a unicode formated string that will represent the answer of the sms service to the request.""" import logging - logging.debug('smstrade._send(%s,%s,%s,%s,%s,%s)'%( key, route, to, message, from_, timestamp)) - parameters= {"key": key, + logging.debug('smstrade._send(%s,%s,%s,%s)'%( route, to, message, timestamp)) + parameters= {"key": self.key, "route": route, "to": to, "message": message, @@ -129,8 +127,8 @@ "debug": self.debug, } - if from_ is not None: - parameters["from"] = from_ + if self.from_ is not None: + parameters["from"] = self.from_ if timestamp is not None: parameters["senddate"] = unicode(timestamp)