From 661ca38b58b3f99855f991728f57fa32f78414b3 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@humbughq.com>
Date: Tue, 6 Aug 2013 16:20:02 -0400
Subject: [PATCH] Change humbug => zulip in some local variables.

(imported from commit 88caa4a87ea0fd269ab741645c124c5d07d69c0a)
---
 zerver/management/commands/analyze_mit.py | 6 +++---
 zerver/tests.py                           | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/zerver/management/commands/analyze_mit.py b/zerver/management/commands/analyze_mit.py
index 10da937f19..c1757c17b7 100644
--- a/zerver/management/commands/analyze_mit.py
+++ b/zerver/management/commands/analyze_mit.py
@@ -48,15 +48,15 @@ def compute_stats(log_level):
         top_percents[size] = 0
     for i, email in enumerate(sorted(total_user_counts.keys(),
                                      key=lambda x: -total_user_counts[x])):
-        percent_humbug = round(100 - (user_counts[email].get("zephyr_mirror", 0)) * 100. /
+        percent_zulip = round(100 - (user_counts[email].get("zephyr_mirror", 0)) * 100. /
                                total_user_counts[email], 1)
         for size in top_percents.keys():
             top_percents.setdefault(size, 0)
             if i < size:
-                top_percents[size] += (percent_humbug * 1.0 / size)
+                top_percents[size] += (percent_zulip * 1.0 / size)
 
         logging.debug("%40s | %10s | %s%%" % (email, total_user_counts[email],
-                                              percent_humbug))
+                                              percent_zulip))
 
     logging.info("")
     for size in sorted(top_percents.keys()):
diff --git a/zerver/tests.py b/zerver/tests.py
index 051082c7fe..d6e7b0bbe3 100644
--- a/zerver/tests.py
+++ b/zerver/tests.py
@@ -1678,8 +1678,8 @@ class S3Test(AuthedTestCase):
         A call to /json/upload_file should return a uri and actually create an object.
         """
         self.login("hamlet@zulip.com")
-        fp = StringIO("humbug!")
-        fp.name = "humbug.txt"
+        fp = StringIO("zulip!")
+        fp.name = "zulip.txt"
 
         result = self.client.post("/json/upload_file", {'file': fp})
         self.assert_json_success(result)
@@ -1687,7 +1687,7 @@ class S3Test(AuthedTestCase):
         self.assertIn("uri", json)
         uri = json["uri"]
         self.test_uris.append(uri)
-        self.assertEquals("humbug!", urllib2.urlopen(uri).read().strip())
+        self.assertEquals("zulip!", urllib2.urlopen(uri).read().strip())
 
     def test_multiple_upload_failure(self):
         """