# HG changeset patch # User Sandro Knauß # Date 1332516152 -3600 # Node ID 48fba7b4afe9af60a0b2ae9c006ce245f9bacca7 # Parent b348d8f15b0ae282fec307dd79b280ccf1fa919e all magic utf-8 stuff is now in iro.model.message diff -r b348d8f15b0a -r 48fba7b4afe9 iro/model/message.py --- a/iro/model/message.py Fri Mar 23 16:21:22 2012 +0100 +++ b/iro/model/message.py Fri Mar 23 16:22:32 2012 +0100 @@ -21,16 +21,12 @@ class SMS(Message): def __init__(self, cont, from_ = None): - Message.__init__(self, cont, typ="sms") + Message.__init__(self, cont.encode("utf-8"), typ="sms") self.from_ = from_ - def sendto(self,anbieter,recipients): - anbieter.sendSMS(self,recipients) - - class Fax(Message): def __init__(self,header,cont,attachments=[]): - Message.__init__(self,cont, typ="fax") + Message.__init__(self,cont.encode("utf-8"),typ="fax") self.header=header self.attachments=attachments diff -r b348d8f15b0a -r 48fba7b4afe9 iro/offer/smstrade.py --- a/iro/offer/smstrade.py Fri Mar 23 16:21:22 2012 +0100 +++ b/iro/offer/smstrade.py Fri Mar 23 16:22:32 2012 +0100 @@ -112,7 +112,7 @@ parameters= {"key": self.key, "route": route, "to": to, - "message": sms.content.encode("utf-8"), + "message": sms.content, "charset":"utf-8", "debug": self.testmode, "message_id":True, @@ -127,7 +127,7 @@ length=len(sms.content) for s in doubleChar: - length += sms.content.encode("utf-8").count(s) + length += sms.content.count(s) parameters["concat_sms"] = True if length > 160 else False ps={}