From 919dbcafb33eb4e2bb595d7e607f525cf2d02178 Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Sat, 20 Apr 2019 17:20:58 -0400
Subject: Consistent use of __all__ to prevent merge conflicts.

---
 discord/enums.py | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'discord/enums.py')

diff --git a/discord/enums.py b/discord/enums.py
index 4c59dbf9..177f88ca 100644
--- a/discord/enums.py
+++ b/discord/enums.py
@@ -26,11 +26,27 @@ DEALINGS IN THE SOFTWARE.
 
 from enum import Enum
 
-__all__ = ['ChannelType', 'MessageType', 'VoiceRegion', 'SpeakingState',
-           'VerificationLevel', 'ContentFilter', 'Status', 'DefaultAvatar',
-           'RelationshipType', 'AuditLogAction', 'AuditLogActionCategory',
-           'UserFlags', 'ActivityType', 'HypeSquadHouse', 'NotificationLevel',
-           'PremiumType', 'UserContentFilter', 'FriendFlags', 'Theme']
+__all__ = (
+    'ChannelType',
+    'MessageType',
+    'VoiceRegion',
+    'SpeakingState',
+    'VerificationLevel',
+    'ContentFilter',
+    'Status',
+    'DefaultAvatar',
+    'RelationshipType',
+    'AuditLogAction',
+    'AuditLogActionCategory',
+    'UserFlags',
+    'ActivityType',
+    'HypeSquadHouse',
+    'NotificationLevel',
+    'PremiumType',
+    'UserContentFilter',
+    'FriendFlags',
+    'Theme',
+)
 
 def fast_lookup(cls):
     # NOTE: implies hashable
-- 
cgit v1.2.3