Merge branch 'attribute_access' into release
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 11 May 2011 21:23:41 +0000 (17:23 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 11 May 2011 21:23:41 +0000 (17:23 -0400)
Conflicts:
philo/models/nodes.py

1  2 
philo/models/base.py
philo/models/nodes.py

Simple merge
@@@ -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