From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Wed, 11 May 2011 21:23:41 +0000 (-0400)
Subject: Merge branch 'attribute_access' into release
X-Git-Tag: philo-0.9~12^2~18
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/7f6fa6595b4c558d7a97ed00cdb19469db4919df

Merge branch 'attribute_access' into release

Conflicts:
	philo/models/nodes.py
---

7f6fa6595b4c558d7a97ed00cdb19469db4919df
diff --cc philo/models/nodes.py
index a9b77fb,44a4d31..a225416
--- a/philo/models/nodes.py
+++ b/philo/models/nodes.py
@@@ -12,9 -12,10 +12,9 @@@ from django.template import add_to_buil
  from django.utils.encoding import smart_str
  
  from philo.exceptions import MIDDLEWARE_NOT_CONFIGURED, ViewCanNotProvideSubpath, ViewDoesNotProvideSubpaths
- from philo.models.base import TreeEntity, Entity, QuerySetMapper, register_value_model
+ from philo.models.base import TreeEntity, Entity, register_value_model
  from philo.models.fields import JSONField
- from philo.utils import ContentTypeSubclassLimiter
+ from philo.utils import ContentTypeSubclassLimiter, LazyPassthroughAttributeMapper
 -from philo.validators import RedirectValidator
  from philo.signals import view_about_to_render, view_finished_rendering