From a1d6ff82dd5b6d1788c0f3bf9ad0643e0f516d16 Mon Sep 17 00:00:00 2001
From: Xua <17090652+XuaTheGrate@users.noreply.github.com>
Date: Wed, 5 Aug 2020 21:48:42 +1200
Subject: [PATCH] Fix NameError and AttributeError in Template and Integrations

---
 discord/integrations.py | 5 +++--
 discord/template.py     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/discord/integrations.py b/discord/integrations.py
index b7dd43996..91b39d0d5 100644
--- a/discord/integrations.py
+++ b/discord/integrations.py
@@ -86,7 +86,8 @@ class Integration:
 
     __slots__ = ('id', '_state', 'guild', 'name', 'enabled', 'type',
                  'syncing', 'role', 'expire_behaviour', 'expire_behavior',
-                 'expire_grace_period', 'synced_at', 'user', 'account')
+                 'expire_grace_period', 'synced_at', 'user', 'account',
+                 'enable_emoticons', '_role_id')
 
     def __init__(self, *, data, guild):
         self.guild = guild
@@ -161,7 +162,7 @@ class Integration:
 
         await self._state.http.edit_integration(self.guild.id, self.id, **payload)
 
-        self.expire_behaviour = expire_behavior
+        self.expire_behaviour = expire_behaviour
         self.expire_behavior = self.expire_behaviour
         self.expire_grace_period = expire_grace_period
         self.enable_emoticons = enable_emoticons
diff --git a/discord/template.py b/discord/template.py
index cff6ebce0..db2d5731d 100644
--- a/discord/template.py
+++ b/discord/template.py
@@ -24,7 +24,7 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
 
-from .utils import parse_time, _get_as_snowflake
+from .utils import parse_time, _get_as_snowflake, _bytes_to_base64_data
 from .enums import VoiceRegion
 from .guild import Guild