From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Thu, 24 Feb 2011 16:31:56 +0000 (-0500)
Subject: Minor LazyContainerFinder cleanup. It's not really that lazy in practice...
X-Git-Tag: philo-0.9~17^2~8^2
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/88ec598bc660ede54b3d472de8b12046d16745cf

Minor LazyContainerFinder cleanup. It's not really that lazy in practice...
---

diff --git a/models/pages.py b/models/pages.py
index 8f6d3dc..39125ef 100644
--- a/models/pages.py
+++ b/models/pages.py
@@ -18,11 +18,7 @@ from philo.signals import page_about_to_render_to_string, page_finished_renderin
 
 
 class LazyContainerFinder(object):
-	_created = 0
-	_initialized = 0
-	
 	def __init__(self, nodes):
-		self.__class__._created += 1
 		self.nodes = nodes
 		self.initialized = False
 		self.contentlet_specs = set()
@@ -41,11 +37,9 @@ class LazyContainerFinder(object):
 				continue
 			
 			if isinstance(node, BlockNode):
-				#if nodelist == self.nodes: Necessary?
 				self.blocks[node.name] = block = LazyContainerFinder(node.nodelist)
-				if block.nodes.get_nodes_by_type(BlockNode): # Is this faster?
-					block.initialize()
-					self.blocks.update(block.blocks)
+				block.initialize()
+				self.blocks.update(block.blocks)
 				continue
 			
 			if isinstance(node, ExtendsNode):
@@ -74,7 +68,6 @@ class LazyContainerFinder(object):
 		if not self.initialized:
 			self.process(self.nodes)
 			self.initialized = True
-			self.__class__._initialized += 1
 
 
 class Template(TreeModel):