From d7096041022f6c98358fbfd74544435cfd993d80 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 10 Feb 2010 00:29:27 -0600 Subject: Remove archweb prefix from all imports Unnecessary, and lets us standardize on not using it everywhere. Signed-off-by: Dan McGee --- urls.py | 94 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 77b7b56..ec04edc 100644 --- a/urls.py +++ b/urls.py @@ -6,9 +6,9 @@ from django.views.generic.create_update import delete_object from django.views.generic.simple import direct_to_template from django.contrib.auth.decorators import permission_required -from archweb.main.models import Todolist -from archweb.feeds import PackageFeed, NewsFeed -from archweb.sitemaps import NewsSitemap, PackagesSitemap +from main.models import Todolist +from feeds import PackageFeed, NewsFeed +from sitemaps import NewsSitemap, PackagesSitemap feeds = { @@ -24,61 +24,61 @@ sitemaps = { admin.autodiscover() urlpatterns = patterns('', - (r'^packages/flag/(\d+)/$', 'archweb.packages.views.flag'), - (r'^packages/flaghelp/$', 'archweb.packages.views.flaghelp'), - (r'^packages/unflag/(\d+)/$', 'archweb.packages.views.unflag'), - (r'^packages/files/(\d+)/$', 'archweb.packages.views.files'), - (r'^packages/signoffs/$', 'archweb.packages.views.signoffs'), + (r'^packages/flag/(\d+)/$', 'packages.views.flag'), + (r'^packages/flaghelp/$', 'packages.views.flaghelp'), + (r'^packages/unflag/(\d+)/$', 'packages.views.unflag'), + (r'^packages/files/(\d+)/$', 'packages.views.files'), + (r'^packages/signoffs/$', 'packages.views.signoffs'), (r'^packages/signoff_package/(?P[A-z0-9]+)/(?P[A-z0-9\-+.]+)/$', - 'archweb.packages.views.signoff_package'), - (r'^packages/update/$', 'archweb.packages.views.update'), + 'packages.views.signoff_package'), + (r'^packages/update/$', 'packages.views.update'), # Preference is for the packages/ url below, but search is kept # because other projects link to it - (r'^packages/search/$', 'archweb.packages.views.search'), - (r'^packages/search/(?P\d+)/$', 'archweb.packages.views.search'), - (r'^packages/$', 'archweb.packages.views.search'), - (r'^packages/(?P\d+)/$', 'archweb.packages.views.search'), + (r'^packages/search/$', 'packages.views.search'), + (r'^packages/search/(?P\d+)/$', 'packages.views.search'), + (r'^packages/$', 'packages.views.search'), + (r'^packages/(?P\d+)/$', 'packages.views.search'), (r'^packages/(?P[A-z0-9\-+.]+)/$', - 'archweb.packages.views.details'), + 'packages.views.details'), (r'^packages/(?P[A-z0-9\-]+)/(?P[A-z0-9\-+.]+)/$', - 'archweb.packages.views.details'), + 'packages.views.details'), (r'^packages/(?P[A-z0-9\-]+)/(?P[A-z0-9]+)/(?P[A-z0-9\-+.]+)/$', - 'archweb.packages.views.details'), + 'packages.views.details'), (r'^packages/(?P[A-z0-9\-]+)/(?P[A-z0-9]+)/(?P[A-z0-9\-+.]+)/maintainer/$', - 'archweb.packages.views.getmaintainer'), + 'packages.views.getmaintainer'), - (r'^todo/(\d+)/$', 'archweb.todolists.views.view'), - (r'^todo/add/$', 'archweb.todolists.views.add'), - (r'^todo/edit/(?P\d+)/$', 'archweb.todolists.views.edit'), - (r'^todo/flag/(\d+)/(\d+)/$', 'archweb.todolists.views.flag'), + (r'^todo/(\d+)/$', 'todolists.views.view'), + (r'^todo/add/$', 'todolists.views.add'), + (r'^todo/edit/(?P\d+)/$', 'todolists.views.edit'), + (r'^todo/flag/(\d+)/(\d+)/$', 'todolists.views.flag'), (r'^todo/delete/(?P\d+)/$', - 'archweb.todolists.views.delete_todolist'), - (r'^todo/$', 'archweb.todolists.views.list'), + 'todolists.views.delete_todolist'), + (r'^todo/$', 'todolists.views.list'), - (r'^news/(\d+)/$', 'archweb.news.views.view'), - (r'^news/add/$', 'archweb.news.views.add'), - (r'^news/edit/(\d+)/$', 'archweb.news.views.edit'), - (r'^news/delete/(\d+)/$', 'archweb.news.views.delete'), - (r'^news/$', 'archweb.news.views.list'), + (r'^news/(\d+)/$', 'news.views.view'), + (r'^news/add/$', 'news.views.add'), + (r'^news/edit/(\d+)/$', 'news.views.edit'), + (r'^news/delete/(\d+)/$', 'news.views.delete'), + (r'^news/$', 'news.views.list'), - (r'^mirrors/$', 'archweb.devel.views.mirrorlist'), + (r'^mirrors/$', 'devel.views.mirrorlist'), - (r'^mirrorlist/$', 'archweb.mirrors.views.choose'), + (r'^mirrorlist/$', 'mirrors.views.choose'), (r'^mirrorlist/(?P[\S]+)/(?P[A-z0-9 ]+)/$', - 'archweb.mirrors.views.generate'), + 'mirrors.views.generate'), (r'^mirrorlist/(?P[\S]+)/$', - 'archweb.mirrors.views.generate'), + 'mirrors.views.generate'), - (r'^devel/$', 'archweb.devel.views.index'), - (r'^devel/notify/$', 'archweb.devel.views.change_notify'), - (r'^devel/profile/$', 'archweb.devel.views.change_profile'), + (r'^devel/$', 'devel.views.index'), + (r'^devel/notify/$', 'devel.views.change_notify'), + (r'^devel/profile/$', 'devel.views.change_profile'), - (r'^devel/newuser/$', 'archweb.devel.views.new_user_form'), + (r'^devel/newuser/$', 'devel.views.new_user_form'), # Feeds and sitemaps - (r'^feeds/$', 'archweb.public.views.feeds'), + (r'^feeds/$', 'public.views.feeds'), (r'^feeds/(?P.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}), (r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', @@ -96,19 +96,19 @@ urlpatterns = patterns('', (r'^admin/(.*)', admin.site.root), # (mostly) Static Pages - (r'^$', 'archweb.public.views.index'), + (r'^$', 'public.views.index'), (r'^about/$', direct_to_template, {'template': 'public/about.html'}), (r'^art/$', direct_to_template, {'template': 'public/art.html'}), (r'^svn/$', direct_to_template, {'template': 'public/svn.html'}), - (r'^developers/$', 'archweb.public.views.userlist', { 'type':'Developers' }), - (r'^trustedusers/$', 'archweb.public.views.userlist', { 'type':'Trusted Users' }), - (r'^fellows/$', 'archweb.public.views.userlist', { 'type':'Fellows' }), - (r'^donate/$', 'archweb.public.views.donate'), - (r'^download/$', 'archweb.public.views.download'), + (r'^developers/$', 'public.views.userlist', { 'type':'Developers' }), + (r'^trustedusers/$', 'public.views.userlist', { 'type':'Trusted Users' }), + (r'^fellows/$', 'public.views.userlist', { 'type':'Fellows' }), + (r'^donate/$', 'public.views.donate'), + (r'^download/$', 'public.views.download'), (r'^irc/$', direct_to_template, {'template': 'public/irc.html'}), - (r'^moreforums/$', 'archweb.public.views.moreforums'), - (r'^projects/$', 'archweb.public.views.projects'), - (r'^opensearch/packages/$', 'archweb.packages.views.opensearch'), + (r'^moreforums/$', 'public.views.moreforums'), + (r'^projects/$', 'public.views.projects'), + (r'^opensearch/packages/$', 'packages.views.opensearch'), # Some django internals we use (r'^jsi18n/$', 'django.views.i18n.null_javascript_catalog'), -- cgit v1.2.3-24-g4f1b