Corrected various imports after adding limiting __all__ entries to philo.models.*

diff --git a/philo/contrib/julian/models.py b/philo/contrib/julian/models.py
index 550513c..62b938a 100644 (file)
--- a/philo/contrib/julian/models.py
+++ b/philo/contrib/julian/models.py
@@ -17,7 +17,8 @@ from django.utils.encoding import force_unicode
 from philo.contrib.julian.feedgenerator import ICalendarFeed
 from philo.contrib.penfield.models import FeedView, FEEDS
 from philo.exceptions import ViewCanNotProvideSubpath
-from philo.models import Tag, Entity, Page, TemplateField
+from philo.models import Tag, Entity, Page
+from philo.models.fields import TemplateField
 from philo.utils import ContentTypeRegistryLimiter
 
 

diff --git a/philo/contrib/penfield/models.py b/philo/contrib/penfield/models.py
index a3e3186..b12a34b 100644 (file)
--- a/philo/contrib/penfield/models.py
+++ b/philo/contrib/penfield/models.py
@@ -16,7 +16,8 @@ from philo.contrib.penfield.exceptions import HttpNotAcceptable
 from philo.contrib.penfield.middleware import http_not_acceptable
 from philo.contrib.penfield.validators import validate_pagination_count
 from philo.exceptions import ViewCanNotProvideSubpath
-from philo.models import Tag, Entity, MultiView, Page, register_value_model, TemplateField, Template
+from philo.models import Tag, Entity, MultiView, Page, register_value_model, Template
+from philo.models.fields import TemplateField
 from philo.utils import paginate
 
 try:

diff --git a/philo/contrib/shipherd/models.py b/philo/contrib/shipherd/models.py
index a09f385..7554595 100644 (file)
--- a/philo/contrib/shipherd/models.py
+++ b/philo/contrib/shipherd/models.py
@@ -7,7 +7,8 @@ from django.core.validators import RegexValidator, MinValueValidator
 from django.db import models
 from django.forms.models import model_to_dict
 
-from philo.models import TreeEntity, Node, TreeManager, Entity, TargetURLModel
+from philo.models.base import TreeEntity, TreeManager, Entity
+from philo.models.nodes import Node, TargetURLModel
 
 
 DEFAULT_NAVIGATION_DEPTH = 3