Move apps outside of the django_website package.

django · Feb 5, 2013 · 4bdbb80 · 4bdbb80
1 parent f379356
commit 4bdbb80
Show file tree

Hide file tree

Showing 103 changed files with 37 additions and 27 deletions.
diff --git a/TODO b/TODO
@@ -1,2 +1,4 @@
 * allow users to "claim" legacy feeds (might do this by hand.)
 * get rid of wsgi-scripts, move useful functions to django_*.wsgi
+* the aggregator templatetags are dead code and have an import error
+* remove django_website.shortcuts
diff --git a/django_website/accounts/__init__.py → accounts/__init__.py b/django_website/accounts/__init__.py → accounts/__init__.py
diff --git a/django_website/accounts/forms.py → accounts/forms.py b/django_website/accounts/forms.py → accounts/forms.py
diff --git a/...bsite/accounts/migrations/0001_initial.py → accounts/migrations/0001_initial.py b/...bsite/accounts/migrations/0001_initial.py → accounts/migrations/0001_initial.py
diff --git a/...o_website/accounts/migrations/__init__.py → accounts/migrations/__init__.py b/...o_website/accounts/migrations/__init__.py → accounts/migrations/__init__.py
diff --git a/django_website/accounts/models.py → accounts/models.py b/django_website/accounts/models.py → accounts/models.py
diff --git a/django_website/accounts/profile_urls.py → accounts/profile_urls.py b/django_website/accounts/profile_urls.py → accounts/profile_urls.py
diff --git a/django_website/accounts/urls.py → accounts/urls.py b/django_website/accounts/urls.py → accounts/urls.py
diff --git a/django_website/accounts/views.py → accounts/views.py b/django_website/accounts/views.py → accounts/views.py
@@ -8,10 +8,12 @@
 from django.conf import settings
 from django.core import cache
 from django.http import HttpResponse
+
+from cla.models import find_agreements
+from tracdb import stats as trac_stats
+
 from .forms import ProfileForm
 from .models import Profile
-from ..trac import stats as trac_stats
-from ..cla.models import find_agreements
 
 def user_profile(request, username):
     u = get_object_or_404(User, username=username)

diff --git a/django_website/aggregator/__init__.py → aggregator/__init__.py b/django_website/aggregator/__init__.py → aggregator/__init__.py
diff --git a/django_website/aggregator/admin.py → aggregator/admin.py b/django_website/aggregator/admin.py → aggregator/admin.py
diff --git a/django_website/aggregator/feeds.py → aggregator/feeds.py b/django_website/aggregator/feeds.py → aggregator/feeds.py
diff --git a/django_website/aggregator/forms.py → aggregator/forms.py b/django_website/aggregator/forms.py → aggregator/forms.py
diff --git a/...website/aggregator/management/__init__.py → aggregator/management/__init__.py b/...website/aggregator/management/__init__.py → aggregator/management/__init__.py
diff --git a/...ggregator/management/commands/__init__.py → aggregator/management/commands/__init__.py b/...ggregator/management/commands/__init__.py → aggregator/management/commands/__init__.py
diff --git a/...t/commands/send_pending_approval_email.py → ...t/commands/send_pending_approval_email.py b/...t/commands/send_pending_approval_email.py → ...t/commands/send_pending_approval_email.py
diff --git a/...ite/aggregator/migrations/0001_initial.py → aggregator/migrations/0001_initial.py b/...ite/aggregator/migrations/0001_initial.py → aggregator/migrations/0001_initial.py
diff --git a/...gregator/migrations/0002_rename_tables.py → aggregator/migrations/0002_rename_tables.py b/...gregator/migrations/0002_rename_tables.py → aggregator/migrations/0002_rename_tables.py
diff --git a/...regator/migrations/0003_add_feed_owner.py → aggregator/migrations/0003_add_feed_owner.py b/...regator/migrations/0003_add_feed_owner.py → aggregator/migrations/0003_add_feed_owner.py
diff --git a/...rations/0004_add_approval_status_field.py → ...rations/0004_add_approval_status_field.py b/...rations/0004_add_approval_status_field.py → ...rations/0004_add_approval_status_field.py
diff --git a/...ions/0005_add_feed_approver_auth_group.py → ...ions/0005_add_feed_approver_auth_group.py b/...ions/0005_add_feed_approver_auth_group.py → ...ions/0005_add_feed_approver_auth_group.py
diff --git a/...website/aggregator/migrations/__init__.py → aggregator/migrations/__init__.py b/...website/aggregator/migrations/__init__.py → aggregator/migrations/__init__.py
diff --git a/django_website/aggregator/models.py → aggregator/models.py b/django_website/aggregator/models.py → aggregator/models.py
diff --git a/...bsite/aggregator/templatetags/__init__.py → aggregator/templatetags/__init__.py b/...bsite/aggregator/templatetags/__init__.py → aggregator/templatetags/__init__.py
diff --git a/...ite/aggregator/templatetags/aggregator.py → aggregator/templatetags/aggregator.py b/...ite/aggregator/templatetags/aggregator.py → aggregator/templatetags/aggregator.py
diff --git a/django_website/aggregator/tests.py → aggregator/tests.py b/django_website/aggregator/tests.py → aggregator/tests.py
@@ -9,9 +9,11 @@
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.client import Client
+
+from docs.models import DocumentRelease
+
 from .management.commands import send_pending_approval_email
 from . import models
-from ..docs.models import DocumentRelease
 
 class AggregatorTests(TestCase):
 

diff --git a/django_website/aggregator/urls.py → aggregator/urls.py b/django_website/aggregator/urls.py → aggregator/urls.py
diff --git a/django_website/aggregator/utils.py → aggregator/utils.py b/django_website/aggregator/utils.py → aggregator/utils.py
diff --git a/django_website/aggregator/views.py → aggregator/views.py b/django_website/aggregator/views.py → aggregator/views.py
@@ -8,9 +8,11 @@
 from django.http import HttpResponseRedirect
 from django.core.urlresolvers import reverse
 from django.views.generic.list_detail import object_list
+
+from django_website.shortcuts import render
+
 from .models import FeedItem, Feed, FeedType, APPROVED_FEED
 from .forms import FeedModelForm
-from ..shortcuts import render
 
 def index(request):
     """

diff --git a/django_website/blog/__init__.py → blog/__init__.py b/django_website/blog/__init__.py → blog/__init__.py
diff --git a/django_website/blog/admin.py → blog/admin.py b/django_website/blog/admin.py → blog/admin.py
diff --git a/django_website/blog/feeds.py → blog/feeds.py b/django_website/blog/feeds.py → blog/feeds.py
diff --git a/...o_website/blog/migrations/0001_initial.py → blog/migrations/0001_initial.py b/...o_website/blog/migrations/0001_initial.py → blog/migrations/0001_initial.py
diff --git a/...s/0002_auto__add_field_entry_is_active.py → ...s/0002_auto__add_field_entry_is_active.py b/...s/0002_auto__add_field_entry_is_active.py → ...s/0002_auto__add_field_entry_is_active.py
diff --git a/...rations/0003_activate_existing_entries.py → ...rations/0003_activate_existing_entries.py b/...rations/0003_activate_existing_entries.py → ...rations/0003_activate_existing_entries.py
diff --git a/...ummary_html__add_field_entry_body_html.py → ...ummary_html__add_field_entry_body_html.py b/...ummary_html__add_field_entry_body_html.py → ...ummary_html__add_field_entry_body_html.py
diff --git a/...05_copy_entry_summary_and_body_to_html.py → ...05_copy_entry_summary_and_body_to_html.py b/...05_copy_entry_summary_and_body_to_html.py → ...05_copy_entry_summary_and_body_to_html.py
diff --git a/...006_auto__add_field_entry_use_raw_html.py → ...006_auto__add_field_entry_use_raw_html.py b/...006_auto__add_field_entry_use_raw_html.py → ...006_auto__add_field_entry_use_raw_html.py
diff --git a/...ons/0007_existing_entries_are_raw_html.py → ...ons/0007_existing_entries_are_raw_html.py b/...ons/0007_existing_entries_are_raw_html.py → ...ons/0007_existing_entries_are_raw_html.py
diff --git a/...008_auto__del_field_entry_use_raw_html.py → ...008_auto__del_field_entry_use_raw_html.py b/...008_auto__del_field_entry_use_raw_html.py → ...008_auto__del_field_entry_use_raw_html.py
diff --git a/...9_auto__add_field_entry_content_format.py → ...9_auto__add_field_entry_content_format.py b/...9_auto__add_field_entry_content_format.py → ...9_auto__add_field_entry_content_format.py
diff --git a/django_website/blog/migrations/__init__.py → blog/migrations/__init__.py b/django_website/blog/migrations/__init__.py → blog/migrations/__init__.py
diff --git a/django_website/blog/models.py → blog/models.py b/django_website/blog/models.py → blog/models.py
diff --git a/django_website/blog/templatetags/__init__.py → blog/templatetags/__init__.py b/django_website/blog/templatetags/__init__.py → blog/templatetags/__init__.py
diff --git a/django_website/blog/templatetags/weblog.py → blog/templatetags/weblog.py b/django_website/blog/templatetags/weblog.py → blog/templatetags/weblog.py
diff --git a/django_website/blog/urls.py → blog/urls.py b/django_website/blog/urls.py → blog/urls.py
diff --git a/django_website/blog/views.py → blog/views.py b/django_website/blog/views.py → blog/views.py
diff --git a/django_website/cla/__init__.py → cla/__init__.py b/django_website/cla/__init__.py → cla/__init__.py
diff --git a/django_website/cla/admin.py → cla/admin.py b/django_website/cla/admin.py → cla/admin.py
diff --git a/...go_website/cla/migrations/0001_initial.py → cla/migrations/0001_initial.py b/...go_website/cla/migrations/0001_initial.py → cla/migrations/0001_initial.py
diff --git a/django_website/cla/migrations/__init__.py → cla/migrations/__init__.py b/django_website/cla/migrations/__init__.py → cla/migrations/__init__.py
diff --git a/django_website/cla/models.py → cla/models.py b/django_website/cla/models.py → cla/models.py
diff --git a/django_website/contact/__init__.py → contact/__init__.py b/django_website/contact/__init__.py → contact/__init__.py
diff --git a/django_website/contact/forms.py → contact/forms.py b/django_website/contact/forms.py → contact/forms.py
diff --git a/django_website/svntogit/models.py → contact/models.py b/django_website/svntogit/models.py → contact/models.py
diff --git a/django_website/contact/urls.py → contact/urls.py b/django_website/contact/urls.py → contact/urls.py
diff --git a/django_docs/settings.py b/django_docs/settings.py
@@ -10,7 +10,7 @@
 # Keep around debug_toolbar and raven if the parent settings module installed
 # them.
 _new_apps = [
-    'django_website.docs',
+    'docs',
     'haystack',
 ]
 if 'debug_toolbar' in INSTALLED_APPS:
@@ -26,7 +26,7 @@
     DOCS_BUILD_ROOT = '/tmp/djangodocs'
 
 # Haystack settings
-HAYSTACK_SITECONF = 'django_website.docs.search_sites'
+HAYSTACK_SITECONF = 'docs.search_sites'
 if PRODUCTION:
     HAYSTACK_SEARCH_ENGINE = 'xapian'
     HAYSTACK_XAPIAN_PATH = BASE.ancestor(2).child('djangodocs.index')

diff --git a/django_docs/urls.py b/django_docs/urls.py
@@ -2,7 +2,7 @@
 from django.conf.urls.defaults import *
 from haystack.views import search_view_factory
 
-from django_website.docs import views
+from docs import views
 
 urlpatterns = patterns('',
     url(

diff --git a/django_website/context_processors.py b/django_website/context_processors.py
@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.core.cache import cache
 
-from django_website.docs.models import DocumentRelease
+from docs.models import DocumentRelease
 
 def recent_release(request):
     recent_release = cache.get('recent_release')

diff --git a/django_website/sitemaps.py b/django_website/sitemaps.py
@@ -3,7 +3,8 @@
 import datetime
 from django.contrib.sitemaps import Sitemap
 from django.contrib.flatpages.models import FlatPage
-from .blog.models import Entry
+
+from blog.models import Entry
 
 class FlatPageSitemap(Sitemap):
     """

diff --git a/django_www/settings.py b/django_www/settings.py
@@ -35,7 +35,7 @@
         'USER': 'code.djangoproject'
     }
 }
-DATABASE_ROUTERS = ['django_website.trac.db_router.TracRouter']
+DATABASE_ROUTERS = ['tracdb.db_router.TracRouter']
 
 USE_I18N = False
 USE_L10N = False
@@ -72,13 +72,13 @@
     'django.contrib.sessions',
     'django.contrib.sitemaps',
     'django_push.subscriber',
-    'django_website.blog',
-    'django_website.accounts',
-    'django_website.aggregator',
-    'django_website.cla',
-    'django_website.docs',
-    'django_website.svntogit',
-    'django_website.trac',
+    'blog',
+    'accounts',
+    'aggregator',
+    'cla',
+    'docs',
+    'svntogit',
+    'tracdb',
     'registration',
     'south',
     'djangosecure',
@@ -179,7 +179,7 @@
 
 # PubSubHubbub settings
 PUSH_HUB = 'https://superfeedr.com/hubbub'
-PUSH_CREDENTIALS = 'django_website.aggregator.utils.push_credentials'
+PUSH_CREDENTIALS = 'aggregator.utils.push_credentials'
 PUSH_SSL_CALLBACK = PRODUCTION
 
 # Lock down some security stuff

diff --git a/django_www/urls.py b/django_www/urls.py
@@ -9,9 +9,10 @@
 from django.contrib.sitemaps import views as sitemap_views
 from django.views.decorators.cache import cache_page
 from django.views.generic.simple import redirect_to
-from django_website.accounts import views as account_views
-from django_website.aggregator.feeds import CommunityAggregatorFeed, CommunityAggregatorFirehoseFeed
-from django_website.blog.feeds import WeblogEntryFeed
+
+from accounts import views as account_views
+from aggregator.feeds import CommunityAggregatorFeed, CommunityAggregatorFirehoseFeed
+from blog.feeds import WeblogEntryFeed
 from django_website.sitemaps import FlatPageSitemap, WeblogSitemap
 
 admin.autodiscover()
@@ -31,12 +32,12 @@
 
 urlpatterns = patterns('',
     url(r'^$', 'django.views.generic.simple.direct_to_template', {'template': 'homepage.html'}, name="homepage"),
-    url(r'^accounts/', include('django_website.accounts.urls')),
+    url(r'^accounts/', include('accounts.urls')),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^comments/$', 'django.views.generic.list_detail.object_list', comments_info_dict),
     url(r'^comments/', include('django.contrib.comments.urls')),
-    url(r'^community/', include('django_website.aggregator.urls')),
-    url(r'^contact/', include('django_website.contact.urls')),
+    url(r'^community/', include('aggregator.urls')),
+    url(r'^contact/', include('contact.urls')),
     url(r'^r/', include('django.conf.urls.shortcut')),
 
     # There's no school like the old school.
@@ -57,11 +58,11 @@
     url(r'^subscriber/', include('django_push.subscriber.urls')),
 
     url(r'^sitemap\.xml$', cache_page(sitemap_views.sitemap, 60 * 60 * 6), {'sitemaps': sitemaps}),
-    url(r'^weblog/', include('django_website.blog.urls')),
+    url(r'^weblog/', include('blog.urls')),
     url(r'^freenode\.9xJY7YIUWtwn\.html$', 'django.views.generic.simple.direct_to_template', {'template': 'freenode_tmp.html'}),
     url(r'^download$', flatpage, {'url': 'download'}, name="download"),
-    url(r'^svntogit/', include('django_website.svntogit.urls')),
-    url(r'', include('django_website.legacy.urls')),
+    url(r'^svntogit/', include('svntogit.urls')),
+    url(r'', include('legacy.urls')),
 )
 
 if not settings.PRODUCTION:

diff --git a/django_website/docs/__init__.py → docs/__init__.py b/django_website/docs/__init__.py → docs/__init__.py
diff --git a/django_website/docs/admin.py → docs/admin.py b/django_website/docs/admin.py → docs/admin.py
diff --git a/...o_website/docs/fixtures/doc_releases.json → docs/fixtures/doc_releases.json b/...o_website/docs/fixtures/doc_releases.json → docs/fixtures/doc_releases.json
diff --git a/django_website/docs/forms.py → docs/forms.py b/django_website/docs/forms.py → docs/forms.py
diff --git a/django_website/docs/management/__init__.py → docs/management/__init__.py b/django_website/docs/management/__init__.py → docs/management/__init__.py
diff --git a/...site/docs/management/commands/__init__.py → docs/management/commands/__init__.py b/...site/docs/management/commands/__init__.py → docs/management/commands/__init__.py
diff --git a/...e/docs/management/commands/update_docs.py → docs/management/commands/update_docs.py b/...e/docs/management/commands/update_docs.py → docs/management/commands/update_docs.py
diff --git a/...o_website/docs/migrations/0001_initial.py → docs/migrations/0001_initial.py b/...o_website/docs/migrations/0001_initial.py → docs/migrations/0001_initial.py
diff --git a/...ocs/migrations/0002_add_document_model.py → docs/migrations/0002_add_document_model.py b/...ocs/migrations/0002_add_document_model.py → docs/migrations/0002_add_document_model.py
diff --git a/...ocs/migrations/0003_fix_document_model.py → docs/migrations/0003_fix_document_model.py b/...ocs/migrations/0003_fix_document_model.py → docs/migrations/0003_fix_document_model.py
diff --git a/...e/docs/migrations/0004_add_git_support.py → docs/migrations/0004_add_git_support.py b/...e/docs/migrations/0004_add_git_support.py → docs/migrations/0004_add_git_support.py
diff --git a/django_website/docs/migrations/__init__.py → docs/migrations/__init__.py b/django_website/docs/migrations/__init__.py → docs/migrations/__init__.py
diff --git a/django_website/docs/models.py → docs/models.py b/django_website/docs/models.py → docs/models.py
diff --git a/django_website/docs/search_indexes.py → docs/search_indexes.py b/django_website/docs/search_indexes.py → docs/search_indexes.py
diff --git a/django_website/docs/search_sites.py → docs/search_sites.py b/django_website/docs/search_sites.py → docs/search_sites.py
diff --git a/django_website/docs/templates/docs/doc.html → docs/templates/docs/doc.html b/django_website/docs/templates/docs/doc.html → docs/templates/docs/doc.html
diff --git a/...website/docs/templates/docs/genindex.html → docs/templates/docs/genindex.html b/...website/docs/templates/docs/genindex.html → docs/templates/docs/genindex.html
diff --git a/...go_website/docs/templates/docs/index.html → docs/templates/docs/index.html b/...go_website/docs/templates/docs/index.html → docs/templates/docs/index.html
diff --git a/...site/docs/templates/docs/py-modindex.html → docs/templates/docs/py-modindex.html b/...site/docs/templates/docs/py-modindex.html → docs/templates/docs/py-modindex.html
diff --git a/...o_website/docs/templates/docs/search.html → docs/templates/docs/search.html b/...o_website/docs/templates/docs/search.html → docs/templates/docs/search.html
diff --git a/...site/docs/templates/docs/search_form.html → docs/templates/docs/search_form.html b/...site/docs/templates/docs/search_form.html → docs/templates/docs/search_form.html
diff --git a/django_website/docs/templatetags/__init__.py → docs/templatetags/__init__.py b/django_website/docs/templatetags/__init__.py → docs/templatetags/__init__.py
diff --git a/django_website/docs/templatetags/docs.py → docs/templatetags/docs.py b/django_website/docs/templatetags/docs.py → docs/templatetags/docs.py
diff --git a/django_website/docs/utils.py → docs/utils.py b/django_website/docs/utils.py → docs/utils.py
diff --git a/django_website/docs/views.py → docs/views.py b/django_website/docs/views.py → docs/views.py
diff --git a/django_website/legacy/__init__.py → legacy/__init__.py b/django_website/legacy/__init__.py → legacy/__init__.py
diff --git a/django_website/svntogit/__init__.py → legacy/models.py b/django_website/svntogit/__init__.py → legacy/models.py
diff --git a/django_website/legacy/urls.py → legacy/urls.py b/django_website/legacy/urls.py → legacy/urls.py
diff --git a/django_website/legacy/views.py → legacy/views.py b/django_website/legacy/views.py → legacy/views.py
diff --git a/django_website/trac/__init__.py → svntogit/__init__.py b/django_website/trac/__init__.py → svntogit/__init__.py
diff --git a/django_website/svntogit/mapping.py → svntogit/mapping.py b/django_website/svntogit/mapping.py → svntogit/mapping.py
diff --git a/django_website/trac/migrations/__init__.py → svntogit/models.py b/django_website/trac/migrations/__init__.py → svntogit/models.py
diff --git a/django_website/svntogit/urls.py → svntogit/urls.py b/django_website/svntogit/urls.py → svntogit/urls.py
diff --git a/django_website/svntogit/views.py → svntogit/views.py b/django_website/svntogit/views.py → svntogit/views.py
diff --git a/tracdb/__init__.py b/tracdb/__init__.py
diff --git a/django_website/trac/db_router.py → tracdb/db_router.py b/django_website/trac/db_router.py → tracdb/db_router.py
diff --git a/...o_website/trac/migrations/0001_initial.py → tracdb/migrations/0001_initial.py b/...o_website/trac/migrations/0001_initial.py → tracdb/migrations/0001_initial.py
diff --git a/tracdb/migrations/__init__.py b/tracdb/migrations/__init__.py
diff --git a/django_website/trac/models.py → tracdb/models.py b/django_website/trac/models.py → tracdb/models.py
diff --git a/django_website/trac/stats.py → tracdb/stats.py b/django_website/trac/stats.py → tracdb/stats.py
diff --git a/django_website/trac/trac.sql → tracdb/trac.sql b/django_website/trac/trac.sql → tracdb/trac.sql