p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplified handling of a default value.

This commit is contained in:
Aymeric Augustin 2014-12-03 22:00:09 +01:00
parent 3d0c3a0482
commit b3eda6ec3e
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/template/engine.py
View File

@ -20,7 +20,7 @@ class Engine(object):
def __init__(self, dirs=None, app_dirs=False, def __init__(self, dirs=None, app_dirs=False,
allowed_include_roots=None, context_processors=None, allowed_include_roots=None, context_processors=None,
debug=False, loaders=None, string_if_invalid='', debug=False, loaders=None, string_if_invalid='',
file_charset=None): file_charset='utf-8'):
if dirs is None: if dirs is None:
dirs = [] dirs = []
if allowed_include_roots is None: if allowed_include_roots is None:
@ -35,8 +35,6 @@ class Engine(object):
if app_dirs: if app_dirs:
raise ImproperlyConfigured( raise ImproperlyConfigured(
"APP_DIRS must not be set when LOADERS is defined.") "APP_DIRS must not be set when LOADERS is defined.")
if file_charset is None:
file_charset = 'utf-8'
self.dirs = dirs self.dirs = dirs
self.app_dirs = app_dirs self.app_dirs = app_dirs