diff options
Diffstat (limited to 'django/template')
| -rw-r--r-- | django/template/defaultfilters.py | 6 | ||||
| -rw-r--r-- | django/template/library.py | 6 | ||||
| -rw-r--r-- | django/template/response.py | 12 |
3 files changed, 13 insertions, 11 deletions
diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py index a7c9b718ff..fb473ec99d 100644 --- a/django/template/defaultfilters.py +++ b/django/template/defaultfilters.py @@ -168,8 +168,7 @@ def floatformat(text, arg=-1): # Avoid conversion to scientific notation by accessing `sign`, `digits` # and `exponent` from `Decimal.as_tuple()` directly. - sign, digits, exponent = d.quantize(exp, ROUND_HALF_UP, - Context(prec=prec)).as_tuple() + sign, digits, exponent = d.quantize(exp, ROUND_HALF_UP, Context(prec=prec)).as_tuple() digits = [six.text_type(digit) for digit in reversed(digits)] while len(digits) <= abs(exponent): digits.append('0') @@ -367,8 +366,7 @@ def urlizetrunc(value, limit, autoescape=True): Argument: Length to truncate URLs to. """ - return mark_safe(_urlize(value, trim_url_limit=int(limit), nofollow=True, - autoescape=autoescape)) + return mark_safe(_urlize(value, trim_url_limit=int(limit), nofollow=True, autoescape=autoescape)) @register.filter(is_safe=False) diff --git a/django/template/library.py b/django/template/library.py index 23364e8024..04f4a7322d 100644 --- a/django/template/library.py +++ b/django/template/library.py @@ -119,8 +119,10 @@ class Library(object): if len(bits) >= 2 and bits[-2] == 'as': target_var = bits[-1] bits = bits[:-2] - args, kwargs = parse_bits(parser, bits, params, - varargs, varkw, defaults, takes_context, function_name) + args, kwargs = parse_bits( + parser, bits, params, varargs, varkw, defaults, + takes_context, function_name + ) return SimpleNode(func, takes_context, args, kwargs, target_var) self.tag(function_name, compile_func) return func diff --git a/django/template/response.py b/django/template/response.py index e76cf9f5a6..944a1dcd17 100644 --- a/django/template/response.py +++ b/django/template/response.py @@ -119,15 +119,17 @@ class SimpleTemplateResponse(HttpResponse): def __iter__(self): if not self._is_rendered: - raise ContentNotRenderedError('The response content must be ' - 'rendered before it can be iterated over.') + raise ContentNotRenderedError( + 'The response content must be rendered before it can be iterated over.' + ) return super(SimpleTemplateResponse, self).__iter__() @property def content(self): if not self._is_rendered: - raise ContentNotRenderedError('The response content must be ' - 'rendered before it can be accessed.') + raise ContentNotRenderedError( + 'The response content must be rendered before it can be accessed.' + ) return super(SimpleTemplateResponse, self).content @content.setter @@ -142,7 +144,7 @@ class TemplateResponse(SimpleTemplateResponse): rendering_attrs = SimpleTemplateResponse.rendering_attrs + ['_request'] def __init__(self, request, template, context=None, content_type=None, - status=None, charset=None, using=None): + status=None, charset=None, using=None): super(TemplateResponse, self).__init__( template, context, content_type, status, charset, using) self._request = request |