Changeset 578

Timestamp:

08/30/05 16:33:12 (3 years ago)

Author:

adrian

Message:

Refactored comment templatetags to remove redundant 'tag_name' parameter. Also added an 'extra_kwargs' hook to CommentListNode?

Files:

• django/trunk/django/contrib/comments/templatetags/comments.py (modified) (15 diffs)

django/trunk/django/contrib/comments/templatetags/comments.py

@@ -129 +129 @@
-
-class CommentListNode(template.Node):
-
+, extra_kwargs=None
-        self.package, self.module = package, module
-        self.context_var_name, self.obj_id = context_var_name, obj_id
-        self.var_name, self.free = var_name, free
-        self.ordering = ordering
+        self.extra_kwargs = extra_kwargs or {}
-
-    def render(self, context):
@@ -151 +152 @@
-            'order_by': (self.ordering + 'submit_date',),
-        }
+        kwargs.update(self.extra_kwargs)
-        if not self.free and COMMENTS_BANNED_USERS_GROUP:
-            kwargs['select'] = {'is_hidden': 'user_id IN (SELECT user_id FROM auth_users_groups WHERE group_id = %s)' % COMMENTS_BANNED_USERS_GROUP}
@@ -183 +185 @@
-    ``[context_var_containing_obj_id]`` can be a hard-coded integer or a variable containing the ID.
-    """
-, tag_name
-, self.tag_name = free, tag_nam
+
+ = fre
-
-    def __call__(self, parser, token):
-        tokens = token.contents.split()
-        if len(tokens) < 4:
-'%s' tag requires at least 3 arguments" % self.tag_name
+%r tag requires at least 3 arguments" % tokens[0]
-        if tokens[1] != 'for':
-'%s' tag must be 'for'" % self.tag_name
+%r tag must be 'for'" % tokens[0]
-        try:
-            package, module = tokens[2].split('.')
-        except ValueError: # unpack list of wrong size
-'%s' tag must be in the format 'package.module'" % self.tag_name
+%r tag must be in the format 'package.module'" % tokens[0]
-        try:
-            content_type = contenttypes.get_object(package__label__exact=package, python_module_name__exact=module)
-        except contenttypes.ContentTypeDoesNotExist:
-'%s' tag has invalid content-type '%s.%s'" % (self.tag_name
+%r tag has invalid content-type '%s.%s'" % (tokens[0]
-        obj_id_lookup_var, obj_id = None, None
-        if tokens[3].isdigit():
@@ -206 +208 @@
-                content_type.get_object_for_this_type(pk=obj_id)
-            except ObjectDoesNotExist:
-'%s' tag refers to %s object with ID %s, which doesn't exist" % (self.tag_name
+%r tag refers to %s object with ID %s, which doesn't exist" % (tokens[0]
-        else:
-            obj_id_lookup_var = tokens[3]
@@ -212 +214 @@
-        if len(tokens) > 4:
-            if tokens[4] != 'with':
-'%s' tag must be 'with'" % self.tag_name
+%r tag must be 'with'" % tokens[0]
-            for option, args in zip(tokens[5::2], tokens[6::2]):
-                if option in ('photos_optional', 'photos_required') and not self.free:
@@ -218 +220 @@
-                    option_list = args.split(',')
-                    if len(option_list) % 3 != 0:
-'%s' tag" % self.tag_name
+%r tag" % tokens[0]
-                    for opt in option_list[::3]:
-                        if not opt.isalnum():
-'%s' tag: '%s'" % (self.tag_name
+%r tag: '%s'" % (tokens[0]
-                    for opt in option_list[1::3] + option_list[2::3]:
-                        if not opt.isdigit() or not (comments.MIN_PHOTO_DIMENSION <= int(opt) <= comments.MAX_PHOTO_DIMENSION):
-'%s' tag: '%s'. Only values between %s and %s are allowed." % (self.tag_name
+%r tag: '%s'. Only values between %s and %s are allowed." % (tokens[0]
-                    # VALIDATION ENDS #########################################
-                    kwargs[option] = True
@@ -231 +233 @@
-                    # VALIDATION ##############################################
-                    if 2 < len(args.split('|')) > 9:
-'%s' tag. Use between 2 and 8." % (option, self.tag_name
+%r tag. Use between 2 and 8." % (option, tokens[0]
-                    if re.match('^scale:\d+\-\d+\:$', args.split('|')[0]):
-'%s' tag's '%s' options" % (self.tag_name
+%r tag's '%s' options" % (tokens[0]
-                    # VALIDATION ENDS #########################################
-                    kwargs[option] = True
@@ -240 +242 @@
-                    kwargs[option] = (args == 'true')
-                else:
-'%s' tag got invalid parameter '%s'" % (self.tag_name
+%r tag got invalid parameter '%s'" % (tokens[0]
-        return CommentFormNode(content_type, obj_id_lookup_var, obj_id, self.free, **kwargs)
-
@@ -261 +263 @@
-        {% get_comment_count for lcom.eventtimes 23 as comment_count %}
-    """
-, tag_name
-, self.tag_name = free, tag_nam
+
+ = fre
-
-    def __call__(self, parser, token):
@@ -269 +271 @@
-        # ['get_comment_list', 'for', 'lcom.eventtimes', 'event.id', 'as', 'comment_list']
-        if len(tokens) != 6:
-s block tag requires 5 arguments" % self.tag_name
+r tag requires 5 arguments" % tokens[0]
-        if tokens[1] != 'for':
-'%s' tag must be 'for'" % self.tag_name
+%r tag must be 'for'" % tokens[0]
-        try:
-            package, module = tokens[2].split('.')
-        except ValueError: # unpack list of wrong size
-'%s' tag must be in the format 'package.module'" % self.tag_name
+%r tag must be in the format 'package.module'" % tokens[0]
-        try:
-            content_type = contenttypes.get_object(package__label__exact=package, python_module_name__exact=module)
-        except contenttypes.ContentTypeDoesNotExist:
-'%s' tag has invalid content-type '%s.%s'" % (self.tag_name
+%r tag has invalid content-type '%s.%s'" % (tokens[0]
-        var_name, obj_id = None, None
-        if tokens[3].isdigit():
@@ -286 +288 @@
-                content_type.get_object_for_this_type(pk=obj_id)
-            except ObjectDoesNotExist:
-'%s' tag refers to %s object with ID %s, which doesn't exist" % (self.tag_name
+%r tag refers to %s object with ID %s, which doesn't exist" % (tokens[0]
-        else:
-            var_name = tokens[3]
-        if tokens[4] != 'as':
-'%s' must be 'as'" % self.tag_name
+%r must be 'as'" % tokens[0]
-        return CommentCountNode(package, module, var_name, obj_id, tokens[5], self.free)
-
@@ -316 +318 @@
-        {% get_comment_list for lcom.eventtimes event.id as comment_list reversed %}
-    """
-, tag_name
-, self.tag_name = free, tag_nam
+
+ = fre
-
-    def __call__(self, parser, token):
@@ -323 +325 @@
-        # Now tokens is a list like this:
-        # ['get_comment_list', 'for', 'lcom.eventtimes', 'event.id', 'as', 'comment_list']
-6 <= len(tokens) <= 7
-s block tag requires 5 or 6 arguments" % self.tag_name
+len(tokens) in (6, 7)
+r tag requires 5 or 6 arguments" % tokens[0]
-        if tokens[1] != 'for':
-'%s' tag must be 'for'" % self.tag_name
+%r tag must be 'for'" % tokens[0]
-        try:
-            package, module = tokens[2].split('.')
-        except ValueError: # unpack list of wrong size
-'%s' tag must be in the format 'package.module'" % self.tag_name
+%r tag must be in the format 'package.module'" % tokens[0]
-        try:
-            content_type = contenttypes.get_object(package__label__exact=package, python_module_name__exact=module)
-        except contenttypes.ContentTypeDoesNotExist:
-'%s' tag has invalid content-type '%s.%s'" % (self.tag_name
+%r tag has invalid content-type '%s.%s'" % (tokens[0]
-        var_name, obj_id = None, None
-        if tokens[3].isdigit():
@@ -341 +343 @@
-                content_type.get_object_for_this_type(pk=obj_id)
-            except ObjectDoesNotExist:
-'%s' tag refers to %s object with ID %s, which doesn't exist" % (self.tag_name
+%r tag refers to %s object with ID %s, which doesn't exist" % (tokens[0]
-        else:
-            var_name = tokens[3]
-        if tokens[4] != 'as':
-'%s' must be 'as'" % self.tag_name
+%r must be 'as'" % tokens[0]
-        if len(tokens) == 7:
-            if tokens[6] != 'reversed':
-'%s' must be 'reversed' if given" % self.tag_name
+%r must be 'reversed' if given" % tokens[0]
-            ordering = "-"
-        else:
@@ -355 +357 @@
-
-# registration comments
-      DoGetCommentList(free=False, tag_name='get_comment_list'
-          DoCommentForm(free=False, tag_name='comment_form'
-     DoCommentCount(free=False, tag_name='get_comment_count'
+DoGetCommentList(False
+DoCommentForm(False
+DoCommentCount(False
-# free comments
- DoGetCommentList(free=True, tag_name='get_free_comment_list'
-     DoCommentForm(free=True, tag_name='free_comment_form'
-free=True, tag_name='get_free_comment_count'
+DoGetCommentList(True
+DoCommentForm(True
+True