From 8133055bd691f31bf5b70c580ea1f5b405cc198e Mon Sep 17 00:00:00 2001 From: Stephen Burrows Date: Wed, 23 Feb 2011 17:03:59 -0500 Subject: [PATCH] Removed nodelist_crawl since nothing is using it and I'm starting to question its usefulness in general. --- models/pages.py | 2 +- utils.py | 32 +------------------------------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/models/pages.py b/models/pages.py index 4da5e99..8f6d3dc 100644 --- a/models/pages.py +++ b/models/pages.py @@ -12,7 +12,7 @@ from philo.models.base import TreeModel, register_value_model from philo.models.fields import TemplateField from philo.models.nodes import View from philo.templatetags.containers import ContainerNode -from philo.utils import fattr, nodelist_crawl +from philo.utils import fattr from philo.validators import LOADED_TEMPLATE_ATTR from philo.signals import page_about_to_render_to_string, page_finished_rendering_to_string diff --git a/utils.py b/utils.py index a968ac8..57f949e 100644 --- a/utils.py +++ b/utils.py @@ -121,34 +121,4 @@ def get_included(self): # We ignore the IncludeNode because it will never work in a blank context. setattr(ExtendsNode, LOADED_TEMPLATE_ATTR, property(get_extended)) -setattr(ConstantIncludeNode, LOADED_TEMPLATE_ATTR, property(get_included)) - - -def default_callback(node, result_list): - result_list.append(node) - - if hasattr(node, 'child_nodelists'): - for nodelist_name in node.child_nodelists: - if hasattr(node, nodelist_name): - nodelist_crawl(getattr(node, nodelist_name), default_callback) - - # LOADED_TEMPLATE_ATTR contains the name of an attribute philo uses to declare a - # node as rendering an additional template. Philo monkeypatches the attribute onto - # the relevant default nodes and declares it on any native nodes. - if hasattr(node, LOADED_TEMPLATE_ATTR): - loaded_template = getattr(node, LOADED_TEMPLATE_ATTR) - if loaded_template: - nodelist_crawl(loaded_template.nodelist, default_callback) - - -def nodelist_crawl(nodelist, callback=default_callback, *args, **kwargs): - """This function crawls through a template's nodelist and the - nodelists of any included or extended templates, as determined by - the presence and value of on a node. Each - node will also be passed to a callback function for additional - processing, along with any additional args and kwargs.""" - for node in nodelist: - try: - callback(node, *args, **kwargs) - except: - raise # fail for this node \ No newline at end of file +setattr(ConstantIncludeNode, LOADED_TEMPLATE_ATTR, property(get_included)) \ No newline at end of file -- 2.20.1