From f6bbcc7ee32868a328836af6601bdaea1c562a6d 2015-03-09 00:54:05
From: Bradley M. Kuhn <bkuhn@ebb.org>
Date: 2015-03-09 00:54:05
Subject: [PATCH] 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.

---

diff --git a/www/conservancy/apps/blog/admin.py b/www/conservancy/apps/blog/admin.py
index e1e68d8579d1611132abd854ce58739c2cc083f1..18a4aa93f709fe0c8774d35ebfbfa96309b88d61 100644
--- a/www/conservancy/apps/blog/admin.py
+++ b/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',)}
diff --git a/www/conservancy/apps/blog/urls.py b/www/conservancy/apps/blog/urls.py
index e5efc3046d0a3952fb40ddf9d830fb11e4f02008..d4d11cb0eb0981ccfb7656d5aa0e85de71846edd 100644
--- a/www/conservancy/apps/blog/urls.py
+++ b/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 = {}
 
diff --git a/www/conservancy/apps/blog/views.py b/www/conservancy/apps/blog/views.py
index 7a7a818a800fec75a28fe495fde962ce026501d9..bfbee9fc5d1346346f8e8fac0c5cedd3a4e76b48 100644
--- a/www/conservancy/apps/blog/views.py
+++ b/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
diff --git a/www/conservancy/apps/contacts/admin.py b/www/conservancy/apps/contacts/admin.py
index 2f8ad313acebb55132e5e3ccb8371d450da5a7ae..e52b6aa5b94904e8cb3fe1e10ea90d3c113cfd7b 100644
--- a/www/conservancy/apps/contacts/admin.py
+++ b/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')
diff --git a/www/conservancy/apps/contacts/views.py b/www/conservancy/apps/contacts/views.py
index 6bc12099438f830c3eddaa718a63145ec0880711..25f28be9f50d2a4b3a1373b7e08f4ec4e1c82fc8 100644
--- a/www/conservancy/apps/contacts/views.py
+++ b/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):
diff --git a/www/conservancy/apps/events/admin.py b/www/conservancy/apps/events/admin.py
index 0860a16bf6f4f78dbc0315eaec772087f8fc2595..32c75d7d300d579c5cf60a0bb55bdb0b80fdf369 100644
--- a/www/conservancy/apps/events/admin.py
+++ b/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)
 
diff --git a/www/conservancy/apps/events/urls.py b/www/conservancy/apps/events/urls.py
index 650d8b0cdcdd185d49609fe32d7662e0e8d8cf85..e6802e4861b0a439c43f20d786b28cb1460d5487 100644
--- a/www/conservancy/apps/events/urls.py
+++ b/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(),
diff --git a/www/conservancy/apps/events/views.py b/www/conservancy/apps/events/views.py
index f78832c0f7df6eed3b28be3bc1218baff730261b..d9f9be447a45bb5085e0d038985fa651746b5f63 100644
--- a/www/conservancy/apps/events/views.py
+++ b/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
 
diff --git a/www/conservancy/apps/fundgoal/admin.py b/www/conservancy/apps/fundgoal/admin.py
index 2b2e1704d376f5ff11cb755423e1b5bac710a0ac..825dc205bfcd4932ea6b4eafc8687f07742e4d65 100644
--- a/www/conservancy/apps/fundgoal/admin.py
+++ b/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')
diff --git a/www/conservancy/apps/fundgoal/views.py b/www/conservancy/apps/fundgoal/views.py
index d737af6afc59445eaa8bf28963d78fe1ba91dd00..17c40cf3e02f72c7b3ee6789bec980569862ef57 100644
--- a/www/conservancy/apps/fundgoal/views.py
+++ b/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
diff --git a/www/conservancy/apps/news/admin.py b/www/conservancy/apps/news/admin.py
index da275ea23ec95f370ec98421d3ff6b640b5d5f22..7c554b4cc62152bd0d071d93e66bd1f1f368564c 100644
--- a/www/conservancy/apps/news/admin.py
+++ b/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")
diff --git a/www/conservancy/apps/news/urls.py b/www/conservancy/apps/news/urls.py
index cb48e89e08138910ae99e4a795b81796cbaccf8b..2b20bbe985794bc7539a4614a7d8e003cba9331d 100644
--- a/www/conservancy/apps/news/urls.py
+++ b/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),
diff --git a/www/conservancy/apps/staff/admin.py b/www/conservancy/apps/staff/admin.py
index bdd062958792f437c4129779e1b902e27c3716b7..a661b7e9cab3dba69d6430bd896b05517999553e 100644
--- a/www/conservancy/apps/staff/admin.py
+++ b/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",
diff --git a/www/conservancy/apps/summit_registration/admin.py b/www/conservancy/apps/summit_registration/admin.py
index 0e33adb62e93bc0eeba6f64e78b2444df34a6a57..84d4f8e7e2723133a8b4e4a592f3d617a968bf27 100644
--- a/www/conservancy/apps/summit_registration/admin.py
+++ b/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')
diff --git a/www/conservancy/apps/summit_registration/views.py b/www/conservancy/apps/summit_registration/views.py
index 1a1b9e7d8955246e73459989261f4a8a51c85b1c..59629696f3f99310095b71aeeff11cfe48b4937b 100644
--- a/www/conservancy/apps/summit_registration/views.py
+++ b/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
diff --git a/www/conservancy/apps/supporters/admin.py b/www/conservancy/apps/supporters/admin.py
index 9654d68f0bb1732447c73d3b7cdb54ebae1438aa..04ddb44b14cf31afc2a7f190bff3841ac7d0303c 100644
--- a/www/conservancy/apps/supporters/admin.py
+++ b/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')
diff --git a/www/conservancy/apps/supporters/views.py b/www/conservancy/apps/supporters/views.py
index b6c60aa48b9eef9d20b4fd101b57c85e49a76d90..c02e34835673e7caa0ba89240bc5b7f14eaf046a 100644
--- a/www/conservancy/apps/supporters/views.py
+++ b/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
 
diff --git a/www/conservancy/apps/worldmap/admin.py b/www/conservancy/apps/worldmap/admin.py
index e505eae59603b829c3fef6e23a384ef1ec264734..11e238d31032d9c835970222ed57193b410b2e46 100644
--- a/www/conservancy/apps/worldmap/admin.py
+++ b/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")