summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2014-12-03 22:00:09 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-12-28 14:47:30 +0100
commitb3eda6ec3e577af9fc287a4f483fd3271a76683c (patch)
treef80b9a83f5a1a51b3cdf4754b843f6e3a8eee31b
parent3d0c3a0482496fc1914a40ec3c3eb70e67f0d643 (diff)
Simplified handling of a default value.
-rw-r--r--django/template/engine.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/django/template/engine.py b/django/template/engine.py
index 36991133f6..aa239f2148 100644
--- a/django/template/engine.py
+++ b/django/template/engine.py
@@ -20,7 +20,7 @@ class Engine(object):
def __init__(self, dirs=None, app_dirs=False,
allowed_include_roots=None, context_processors=None,
debug=False, loaders=None, string_if_invalid='',
- file_charset=None):
+ file_charset='utf-8'):
if dirs is None:
dirs = []
if allowed_include_roots is None:
@@ -35,8 +35,6 @@ class Engine(object):
if app_dirs:
raise ImproperlyConfigured(
"APP_DIRS must not be set when LOADERS is defined.")
- if file_charset is None:
- file_charset = 'utf-8'
self.dirs = dirs
self.app_dirs = app_dirs