Merge pull request #199 from timgraham/FILE_CHARSET

Remove usage of Django's FILE_CHARSET setting
evansd · Nov 19, 2018 · d220ae2 · d220ae2
2 parents d722b12 + 5d8dc85
commit d220ae2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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