Cleaning up imports.

diff --git a/__init__.py b/__init__.py
index 8ad7212..9fc18ae 100644 (file)
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,4 @@
-from models import Template
+from philo.models import Template

 
 
 load_template_source = Template.loader
 
 
 load_template_source = Template.loader

diff --git a/admin.py b/admin.py
index fa62647..1ed5586 100644 (file)
--- a/admin.py
+++ b/admin.py
@@ -7,7 +7,7 @@ from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.html import escape
 from django.utils.text import truncate_words
 from django.utils.safestring import mark_safe
 from django.utils.html import escape
 from django.utils.text import truncate_words

-from models import *
+from philo.models import *

 
 
 class AttributeInline(generic.GenericTabularInline):
 
 
 class AttributeInline(generic.GenericTabularInline):

diff --git a/models.py b/models.py
index bf11cb5..ecd1c1f 100644 (file)
--- a/models.py
+++ b/models.py
@@ -5,7 +5,7 @@ from django.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.contrib.sites.models import Site
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.contrib.sites.models import Site

-from utils import fattr
+from philo.utils import fattr

 from django.template import add_to_builtins as register_templatetags
 from django.template import Template as DjangoTemplate
 from django.template import TemplateDoesNotExist
 from django.template import add_to_builtins as register_templatetags
 from django.template import Template as DjangoTemplate
 from django.template import TemplateDoesNotExist


@@ -13,7 +13,7 @@ from django.template import Context, RequestContext
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils import simplejson as json
 from UserDict import DictMixin
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils import simplejson as json
 from UserDict import DictMixin

-from templatetags.containers import ContainerNode
+from philo.templatetags.containers import ContainerNode

 from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode
 from django.template.loader import get_template
 from django.http import Http404, HttpResponse, HttpResponseServerError, HttpResponseRedirect
 from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode
 from django.template.loader import get_template
 from django.http import Http404, HttpResponse, HttpResponseServerError, HttpResponseRedirect

diff --git a/views.py b/views.py
index c03f687..f086bfd 100644 (file)
--- a/views.py
+++ b/views.py
@@ -1,7 +1,7 @@
 from django.http import Http404, HttpResponse
 from django.template import RequestContext
 from django.contrib.sites.models import Site
 from django.http import Http404, HttpResponse
 from django.template import RequestContext
 from django.contrib.sites.models import Site

-from models import Node
+from philo.models import Node

 
 
 def node_view(request, path=None, **kwargs):
 
 
 def node_view(request, path=None, **kwargs):