From acb321f3a4efa3c66f3e8dda94c3e0b88acc56d2 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@humbughq.com>
Date: Wed, 3 Oct 2012 15:34:39 -0400
Subject: [PATCH] Rename 'zephyrs' => 'messages' when formatting a message list
 to send to clients.

(imported from commit bfbb556f2444aca8277f54c363eccb678b6bf2dc)
---
 common.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.py b/common.py
index 36d1377..3ce67d1 100644
--- a/common.py
+++ b/common.py
@@ -33,7 +33,7 @@ class HumbugAPI():
         options["api-key"] = self.api_key
         submit_data = urllib.urlencode([(k, v.encode('utf-8')) for k,v in options.items()])
         res = self.browser.open(self.base_url + "/api/v1/get_messages", submit_data)
-        return simplejson.loads(res.read())['zephyrs']
+        return simplejson.loads(res.read())['messages']
 
     def call_on_each_message(self, callback, options = {}):
         max_message_id = None
@@ -48,7 +48,7 @@ class HumbugAPI():
                 # a bit, then try again
                 if self.verbose:
                     print e
-                    print "Error getting zephyrs (probably server restart); retrying..."
+                    print "Error getting messages (probably server restart); retrying..."
                 time.sleep(1)
                 continue
             except Exception, e: