Skip to content

Commit 2c34e4c

Browse files
author
Jaap Roes
committed
Use the parse_bits implementation from Django
1 parent dbbfa45 commit 2c34e4c

File tree

2 files changed

+4
-165
lines changed

2 files changed

+4
-165
lines changed

imagekit/compat.py

Lines changed: 0 additions & 161 deletions
This file was deleted.

imagekit/templatetags/imagekit.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from django import template
2+
from django.template.library import parse_bits
23
from django.utils.encoding import force_str
34
from django.utils.html import escape
45
from django.utils.safestring import mark_safe
56

6-
from ..compat import parse_bits
77
from ..cachefiles import ImageCacheFile
88
from ..registry import generator_registry
99

@@ -167,7 +167,7 @@ def parse_ik_tag_bits(parser, bits):
167167
' setting html attributes.' % HTML_ATTRS_DELIMITER)
168168

169169
args, html_attrs = parse_bits(parser, html_bits, [], 'args',
170-
'kwargs', None, False, tag_name)
170+
'kwargs', None, [], None, False, tag_name)
171171
if len(args):
172172
raise template.TemplateSyntaxError('All "%s" tag arguments after'
173173
' the "%s" token must be named.' % (tag_name,
@@ -209,7 +209,7 @@ def generateimage(parser, token):
209209
tag_name, bits, html_attrs, varname = parse_ik_tag_bits(parser, bits)
210210

211211
args, kwargs = parse_bits(parser, bits, ['generator_id'], 'args', 'kwargs',
212-
None, False, tag_name)
212+
None, [], None, False, tag_name)
213213

214214
if len(args) != 1:
215215
raise template.TemplateSyntaxError('The "%s" tag requires exactly one'
@@ -257,7 +257,7 @@ def thumbnail(parser, token):
257257
tag_name, bits, html_attrs, varname = parse_ik_tag_bits(parser, bits)
258258

259259
args, kwargs = parse_bits(parser, bits, [], 'args', 'kwargs',
260-
None, False, tag_name)
260+
None, [], None, False, tag_name)
261261

262262
if len(args) < 2:
263263
raise template.TemplateSyntaxError('The "%s" tag requires at least two'

0 commit comments

Comments
 (0)