Just quit it with this relative import stuff.

While I think these relative imports seem to be valid for the running
application, I am having trouble with the django-admin applications
regarding them.  I don't see this syntactic sugar as absolutely
essential, so I'm just going to change it now.

www/conservancy/apps/blog/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import EntryTag, Entry
+from conservancy.apps.blog.models import EntryTag, Entry
 
 class EntryTagAdmin(admin.ModelAdmin):
     prepopulated_fields = {'slug': ('label',)}

www/conservancy/apps/blog/urls.py

@@ -1,8 +1,8 @@
 from django.conf.urls import patterns, url, include
-from models import Entry, EntryTag # relative import
+from conservancy.apps.blog.models import Entry, EntryTag # relative import
 from conservancy.apps.staff.models import Person
 from datetime import datetime
-from views import last_name, BlogYearArchiveView, BlogMonthArchiveView, BlogDayArchiveView, BlogDateDetailView
+from conservancy.apps.blog.views import last_name, BlogYearArchiveView, BlogMonthArchiveView, BlogDayArchiveView, BlogDateDetailView
 
 extra_context = {}
 

www/conservancy/apps/blog/views.py

@@ -1,4 +1,4 @@
-from models import Entry, EntryTag # relative import
+from conservancy.apps.blog.models import Entry, EntryTag # relative import
 # from django.views.generic.list_detail import object_list
 from django.views.generic import ListView
 from django.views.generic.dates import YearArchiveView, MonthArchiveView, DayArchiveView, DateDetailView

www/conservancy/apps/contacts/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import ContactEntry
+from conservancy.apps.contacts.models import ContactEntry
 
 class ContactEntryAdmin(admin.ModelAdmin):
     list_display = ('email', 'subscribe_conservancy')

www/conservancy/apps/contacts/views.py

@@ -1,6 +1,6 @@
 from django.shortcuts import render_to_response
 from django import forms
-from models import ContactEntry
+from conservancy.app.contacts.models import ContactEntry
 from django.forms import ModelForm
 
 def subscribe(request):

www/conservancy/apps/events/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import EventTag, Event, EventMedia
+from conservancy.apps.event.models import EventTag, Event, EventMedia
 
 admin.site.register(EventTag)
 

www/conservancy/apps/events/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import patterns, url, include
-from models import Event # relative import
+from conservancy.apps.events.models import Event
 
 info_dict = {
     'queryset': Event.objects.all(),

www/conservancy/apps/events/views.py

@@ -3,7 +3,7 @@ from django.shortcuts import render_to_response
 from django.http import Http404, HttpResponse
 from django.template import loader
 from django.core.exceptions import ObjectDoesNotExist
-from models import Event # relative import
+from conservancy.apps.events.models import Event
 # for debugging...
 from django.http import HttpResponse
 

www/conservancy/apps/fundgoal/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import FundraisingGoal
+from conservancy.apps.fundgoal.models import FundraisingGoal
 
 class FundraisingGoalAdmin(admin.ModelAdmin):
     list_display = ('display_name', 'display_until_date')

www/conservancy/apps/fundgoal/views.py

@@ -1,2 +1,2 @@
-from models import FundraisingGoal # relative import
+from conservancy.apps.fundgoal.models import FundraisingGoal
 from django.shortcuts import get_object_or_404, render_to_response

www/conservancy/apps/news/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import PressRelease, ExternalArticleTag, ExternalArticle
+from conservancy.apps.news.models import PressRelease, ExternalArticleTag, ExternalArticle
 
 class PressReleaseAdmin(admin.ModelAdmin):
     list_display = ("headline", "pub_date")

www/conservancy/apps/news/urls.py

@@ -19,8 +19,8 @@
 
 from django.conf.urls import patterns, url, include
 from django.conf import settings
-from models import PressRelease, ExternalArticle # relative import
-from views import NewsYearArchiveView, NewsMonthArchiveView, NewsDayArchiveView, NewsDateDetailView
+from conservancy.app.news.models import PressRelease, ExternalArticle
+from conservancy.apps.news.views import NewsYearArchiveView, NewsMonthArchiveView, NewsDayArchiveView, NewsDateDetailView
 
 info_dict = {
     'queryset': PressRelease.objects.all().filter(sites__id__exact=settings.SITE_ID),

www/conservancy/apps/staff/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import Person
+from conservancy.apps.staff.models import Person
 
 class PersonAdmin(admin.ModelAdmin):
     list_display = ("username", "formal_name", "casual_name",

www/conservancy/apps/summit_registration/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import SummitRegistration
+from conservancy.apps.summit_registration.models import SummitRegistration
 
 class SummitRegistrationAdmin(admin.ModelAdmin):
     list_display = ('name', 'email', 'affiliation', 'cle_credit')

www/conservancy/apps/summit_registration/views.py

@@ -1,6 +1,6 @@
 from django.shortcuts import render_to_response
 from django import forms
-from models import SummitRegistration
+from conervancy.apps.summit_registration.models import SummitRegistration
 
 def register(request):
     """Summit registration form view

www/conservancy/apps/supporters/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import Supporter
+from conservancy.app.Supporter.models import Supporter
 
 class SupporterAdmin(admin.ModelAdmin):
     list_display = ('display_name', 'display_until_date')

www/conservancy/apps/supporters/views.py

@@ -1,3 +1,3 @@
-from models import Supporter # relative import
+from conservancy.apps.supporters.models import Supporter
 from django.shortcuts import get_object_or_404, render_to_response
 

www/conservancy/apps/worldmap/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import EarthLocation
+from conservancy.apps.worldmap.models import EarthLocation
 
 class EarthLocationAdmin(admin.ModelAdmin):
     list_display = ("label", "html_map_link")