Fix zephyr mirror unicode issues, hopefully once and for all.

This code successfully sends every message in our corpus of past
zephyrs.

(imported from commit 14d42ca9288e2a218eaad880691d6bd213a045ce)
This commit is contained in:
Tim Abbott 2012-10-03 17:53:34 -04:00
parent f2a73985c9
commit abd97578c0
2 changed files with 2 additions and 6 deletions

View File

@ -24,7 +24,7 @@ class HumbugAPI():
def send_message(self, submit_hash):
submit_hash["email"] = self.email
submit_hash["api-key"] = self.api_key
submit_data = urllib.urlencode([(k, v.encode('utf-8')) for k,v in submit_hash.items()])
submit_data = urllib.urlencode([(k, v) for k,v in submit_hash.items()])
res = self.browser.open(self.base_url + "/api/v1/send_message", submit_data)
return simplejson.loads(res.read())

View File

@ -208,12 +208,8 @@ class Zephyr(models.Model):
@cache_with_key(lambda self, apply_markdown: 'zephyr_dict:%d:%d' % (self.id, apply_markdown))
def to_dict(self, apply_markdown):
try:
content = self.content.decode("utf-8")
except:
content = self.content
if apply_markdown:
content = md_engine.convert(content)
content = md_engine.convert(self.content)
return {'id' : self.id,
'sender_email' : self.sender.user.email,
'sender_name' : self.sender.full_name,