Merge branch 'django' into django+200/wiki

# Conflicts:
#	Pipfile.lock
#	pydis_site/apps/home/tests.py

2 files changed, 11 insertions, 12 deletions

diff --git a/pydis_site/apps/api/tests/test_models.py b/pydis_site/apps/api/tests/test_models.py
index 43d1eb41..a958419d 100644
--- a/pydis_site/apps/api/tests/test_models.py
+++ b/pydis_site/apps/api/tests/test_models.py
@@ -3,14 +3,14 @@ from datetime import datetime as dt, timezone
 from django.test import SimpleTestCase
 
 from ..models import (
-    BotSetting, DeletedMessage,
-    DocumentationLink, Infraction,
-    Message, MessageDeletionContext,
-    ModelReprMixin, OffTopicChannelName,
-    Reminder, Role,
-    SnakeFact, SnakeIdiom,
-    SnakeName, SpecialSnake,
-    Tag, User
+    DeletedMessage, DocumentationLink,
+    Infraction, Message,
+    MessageDeletionContext, ModelReprMixin,
+    OffTopicChannelName, Reminder,
+    Role, SnakeFact,
+    SnakeIdiom, SnakeName,
+    SpecialSnake, Tag,
+    User
 )
 
 
diff --git a/pydis_site/apps/api/tests/test_validators.py b/pydis_site/apps/api/tests/test_validators.py
index d2c0a136..ffa2f61e 100644
--- a/pydis_site/apps/api/tests/test_validators.py
+++ b/pydis_site/apps/api/tests/test_validators.py
@@ -1,10 +1,8 @@
 from django.core.exceptions import ValidationError
 from django.test import TestCase
 
-from ..validators import (
-    validate_bot_setting_name,
-    validate_tag_embed
-)
+from ..models.bot.bot_setting import validate_bot_setting_name
+from ..models.bot.tag import validate_tag_embed
 
 
 REQUIRED_KEYS = (
@@ -20,6 +18,7 @@ class BotSettingValidatorTests(TestCase):
         with self.assertRaises(ValidationError):
             validate_bot_setting_name('bad name')
 
+
 class TagEmbedValidatorTests(TestCase):
     def test_rejects_non_mapping(self):
         with self.assertRaises(ValidationError):