From 5d8dc85a59c87adb76e5328bfbdba1dca063e77c Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Mon, 15 Oct 2018 09:55:18 -0400
Subject: [PATCH] Remove usage of Django's FILE_CHARSET setting

The setting is deprecated in Django 2.2.
---
 docs/django.rst          | 2 +-
 whitenoise/middleware.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/django.rst b/docs/django.rst
index 612d7307..68d1889e 100644
--- a/docs/django.rst
+++ b/docs/django.rst
@@ -317,7 +317,7 @@ arguments upper-cased with a 'WHITENOISE\_' prefix.
 
 .. attribute:: WHITENOISE_CHARSET
 
-    :default: ``settings.FILE_CHARSET`` (utf-8)
+    :default: ``'utf-8'``
 
     Charset to add as part of the ``Content-Type`` header for all files whose
     mimetype allows a charset.
diff --git a/whitenoise/middleware.py b/whitenoise/middleware.py
index fce72593..d278b3c7 100644
--- a/whitenoise/middleware.py
+++ b/whitenoise/middleware.py
@@ -70,7 +70,6 @@ def serve(static_file, request):
 
     def configure_from_settings(self, settings):
         # Default configuration
-        self.charset = settings.FILE_CHARSET
         self.autorefresh = settings.DEBUG
         self.use_finders = settings.DEBUG
         self.static_prefix = urlparse(settings.STATIC_URL or '').path