Cleanup after rebase.

unioslo · Aug 28, 2023 · a01293e · a01293e
1 parent ef4e928
commit a01293e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 22 deletions.
diff --git a/mreg/api/v1/views_zones.py b/mreg/api/v1/views_zones.py
@@ -344,7 +344,7 @@ class PlainTextRenderer(renderers.TemplateHTMLRenderer):
 
     def render(self, data, media_type=None, renderer_context=None):
         # Utilize TemplateHTMLRenderer's exception handling
-        if type(data) is dict:
+        if isinstance(data, dict):
             return super().render(data, accepted_media_type=None,
                                   renderer_context=renderer_context)
         return data.encode(self.charset)

diff --git a/mregsite/settings.py b/mregsite/settings.py
@@ -92,19 +92,6 @@
 # Application definition
 
 INSTALLED_APPS = [
-<<<<<<< HEAD
-    "django.contrib.admin",
-    "django.contrib.auth",
-    "django.contrib.contenttypes",
-    "django.contrib.sessions",
-    "django.contrib.messages",
-    "django.contrib.staticfiles",
-    "rest_framework",
-    "rest_framework.authtoken",
-    "netfields",
-    "mreg",
-    "hostpolicy",
-=======
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -113,12 +100,10 @@
     'django.contrib.staticfiles',
     'rest_framework',
     'rest_framework.authtoken',
-    'django_logging',
     'django_filters',
     'netfields',
     'mreg',
     'hostpolicy',
->>>>>>> acde594 (Fixes #487 by implementing option 5 in the issue.)
 ]
 
 MIDDLEWARE = [
@@ -213,11 +198,6 @@
     "DEFAULT_AUTHENTICATION_CLASSES": (
         "mreg.authentication.ExpiringTokenAuthentication",
     ),
-<<<<<<< HEAD
-    "DEFAULT_PAGINATION_CLASS": "mreg.api.v1.pagination.StandardResultsSetPagination",
-    "DEFAULT_PERMISSION_CLASSES": ("mreg.api.permissions.IsAuthenticatedAndReadOnly",),
-    "DEFAULT_SCHEMA_CLASS": "rest_framework.schemas.openapi.AutoSchema",
-=======
     'DEFAULT_FILTER_BACKENDS': (
         'django_filters.rest_framework.DjangoFilterBackend',
     ),
@@ -227,7 +207,6 @@
         'mreg.api.permissions.IsAuthenticatedAndReadOnly',
     ),
     'DEFAULT_SCHEMA_CLASS': 'rest_framework.schemas.openapi.AutoSchema',
->>>>>>> acde594 (Fixes #487 by implementing option 5 in the issue.)
 }
 
 REST_FRAMEWORK_EXTENSIONS = {

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -4,6 +4,8 @@ django-auth-ldap==4.0.0
 django-logging-json==1.15
 django-netfields==1.2.4
 django-filter==23.1
+structlog==23.1.0
+rich==13.4.2
 gunicorn==20.1.0
 idna==3.4
 psycopg2-binary==2.9.5