From 78e8d18ef3be93b971ddae1e0f65e2acf48b1e94 Mon Sep 17 00:00:00 2001
From: Aastha Gupta <aastha.gupta4104@gmail.com>
Date: Wed, 6 Dec 2017 16:08:24 +0530
Subject: [PATCH] integrations: Rename HUBOT_INTEGRATIONS_LEGACY.

It is now simply called HUBOT_INTEGRATIONS.

Fixes #7402
---
 zerver/lib/integrations.py | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/zerver/lib/integrations.py b/zerver/lib/integrations.py
index 80782ffac0..d39c4ea73e 100644
--- a/zerver/lib/integrations.py
+++ b/zerver/lib/integrations.py
@@ -444,28 +444,22 @@ BOT_INTEGRATIONS = [
     BotIntegration('xkcd', ['bots', 'misc'], display_name='xkcd'),
 ]  # type: List[BotIntegration]
 
-# Note: These are not actually displayed anywhere; we're keeping them
-# around so they can be migrated into the newer HUBOT_INTEGRATIONS
-HUBOT_INTEGRATIONS_LEGACY = {
-    'bonusly': HubotIntegration('bonusly', ['hr']),
-    'chartbeat': HubotIntegration('chartbeat', ['marketing']),
-    'darksky': HubotIntegration('darksky', ['misc'], display_name='Dark Sky',
-                                logo_alt='Dark Sky logo'),
-    'hangouts': HubotIntegration('google-hangouts', ['communication'], display_name="Hangouts"),
-    'instagram': HubotIntegration('instagram', ['misc'],
-                                  logo='static/images/integrations/logos/instagram.png'),
-    'mailchimp': HubotIntegration('mailchimp', ['communication', 'marketing'],
-                                  display_name='MailChimp', logo_alt='MailChimp logo'),
-    'translate': HubotIntegration('google-translate', ['misc'],
-                                  display_name="Translate", logo_alt='Google Translate logo'),
-    'youtube': HubotIntegration('youtube', ['misc'], display_name='YouTube',
-                                logo_alt='YouTube logo')
-}
-
-HUBOT_INTEGRATIONS = {
+HUBOT_INTEGRATIONS = [
     HubotIntegration('assembla', ['version-control', 'project-management'],
                      display_name='Assembla', logo_alt='Assembla'),
-}
+    HubotIntegration('bonusly', ['hr']),
+    HubotIntegration('chartbeat', ['marketing'], display_name='Chartbeat'),
+    HubotIntegration('darksky', ['misc'], display_name='Dark Sky',
+                     logo_alt='Dark Sky logo'),
+    HubotIntegration('google-hangouts', ['communication'], display_name='Google Hangouts',
+                     logo_alt='Google Hangouts logo'),
+    HubotIntegration('instagram', ['misc'], display_name='Instagram'),
+    HubotIntegration('mailchimp', ['communication', 'marketing'],
+                     display_name='MailChimp'),
+    HubotIntegration('google-translate', ['misc'],
+                     display_name="Google Translate", logo_alt='Google Translate logo'),
+    HubotIntegration('youtube', ['misc'], display_name='YouTube'),
+]  # type: List[HubotIntegration]
 
 for hubot_integration in HUBOT_INTEGRATIONS:
     INTEGRATIONS[hubot_integration.name] = hubot_integration