mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-16 00:49:12 +00:00
Code Issues 32 Releases Wiki Activity

Replaced dict.setdefault() usage to avoid unnecessary object instantiations.

Browse Source
This commit is contained in:
Benjamin Bach 2015-12-26 21:11:53 +01:00 committed by Tim Graham
parent 2765adc8dc
commit 8ad18103a1
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/postgres/forms/ranges.py
View File

@ -15,8 +15,10 @@ class BaseRangeField(forms.MultiValueField):
} }
def __init__(self, **kwargs): def __init__(self, **kwargs):
kwargs.setdefault('widget', RangeWidget(self.base_field.widget)) if 'widget' not in kwargs:
kwargs.setdefault('fields', [self.base_field(required=False), self.base_field(required=False)]) kwargs['widget'] = RangeWidget(self.base_field.widget)
if 'fields' not in kwargs:
kwargs['fields'] = [self.base_field(required=False), self.base_field(required=False)]
kwargs.setdefault('required', False) kwargs.setdefault('required', False)
kwargs.setdefault('require_all_fields', False) kwargs.setdefault('require_all_fields', False)
super(BaseRangeField, self).__init__(**kwargs) super(BaseRangeField, self).__init__(**kwargs)

3
django/template/backends/jinja2.py
View File

@ -26,8 +26,9 @@ class Jinja2(BaseEngine):
environment = options.pop('environment', 'jinja2.Environment') environment = options.pop('environment', 'jinja2.Environment')
environment_cls = import_string(environment) environment_cls = import_string(environment)
if 'loader' not in options:
options['loader'] = jinja2.FileSystemLoader(self.template_dirs)
options.setdefault('autoescape', True) options.setdefault('autoescape', True)
options.setdefault('loader', jinja2.FileSystemLoader(self.template_dirs))
options.setdefault('auto_reload', settings.DEBUG) options.setdefault('auto_reload', settings.DEBUG)
options.setdefault('undefined', options.setdefault('undefined',
jinja2.DebugUndefined if settings.DEBUG else jinja2.Undefined) jinja2.DebugUndefined if settings.DEBUG else jinja2.Undefined)

4
django/test/client.py
View File

@ -146,7 +146,9 @@ def store_rendered_templates(store, signal, sender, template, context, **kwargs)
of rendering. of rendering.
""" """
store.setdefault('templates', []).append(template) store.setdefault('templates', []).append(template)
store.setdefault('context', ContextList()).append(copy(context)) if 'context' not in store:
store['context'] = ContextList()
store['context'].append(copy(context))
def encode_multipart(boundary, data): def encode_multipart(boundary, data):

4
django/utils/formats.py
View File

@ -94,7 +94,9 @@ def get_format_modules(lang=None, reverse=False):
""" """
if lang is None: if lang is None:
lang = get_language() lang = get_language()
modules = _format_modules_cache.setdefault(lang, list(iter_format_modules(lang, settings.FORMAT_MODULE_PATH))) if lang not in _format_modules_cache:
_format_modules_cache[lang] = list(iter_format_modules(lang, settings.FORMAT_MODULE_PATH))
modules = _format_modules_cache[lang]
if reverse: if reverse:
return list(reversed(modules)) return list(reversed(modules))
return modules return modules