summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/views.py8
-rw-r--r--feeds.py2
-rw-r--r--main/admin.py2
-rw-r--r--main/migrations/0002_make_maintainer_nullable.py2
-rw-r--r--main/migrations/0003_migrate_maintainer.py2
-rw-r--r--mirrors/views.py4
-rw-r--r--news/views.py2
-rw-r--r--packages/views.py6
-rw-r--r--public/utils.py2
-rw-r--r--public/views.py4
-rw-r--r--sitemaps.py2
-rw-r--r--todolists/views.py2
-rw-r--r--urls.py94
13 files changed, 66 insertions, 66 deletions
diff --git a/devel/views.py b/devel/views.py
index 582df764..4b278d16 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -5,10 +5,10 @@ from django.contrib.auth.models import User
from django.shortcuts import render_to_response
from django.template import RequestContext
from django.core.mail import send_mail
-from archweb.main.models import Package, Todolist
-from archweb.main.models import Arch, Repo
-from archweb.main.models import UserProfile, News
-from archweb.main.models import Mirror
+from main.models import Package, Todolist
+from main.models import Arch, Repo
+from main.models import UserProfile, News
+from main.models import Mirror
import random
from string import ascii_letters, digits
pwletters = ascii_letters + digits
diff --git a/feeds.py b/feeds.py
index e2fe36a6..47ef4b1d 100644
--- a/feeds.py
+++ b/feeds.py
@@ -2,7 +2,7 @@ import datetime
from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
from django.db.models import Q
-from archweb.main.models import Arch, Repo, Package, News
+from main.models import Arch, Repo, Package, News
class PackageFeed(Feed):
def get_object(self, bits):
diff --git a/main/admin.py b/main/admin.py
index 0ca2c38d..1de07c88 100644
--- a/main/admin.py
+++ b/main/admin.py
@@ -3,7 +3,7 @@ from django import forms
from django.contrib import admin
from django.contrib.auth.models import User
from django.contrib.auth.admin import UserAdmin
-from archweb.main.models import (AltForum, Arch, Donor,
+from main.models import (AltForum, Arch, Donor,
Mirror, MirrorProtocol, MirrorUrl, MirrorRsync,
Package, Press, Repo, UserProfile, ExternalProject)
diff --git a/main/migrations/0002_make_maintainer_nullable.py b/main/migrations/0002_make_maintainer_nullable.py
index fa77d9d2..138b103b 100644
--- a/main/migrations/0002_make_maintainer_nullable.py
+++ b/main/migrations/0002_make_maintainer_nullable.py
@@ -1,7 +1,7 @@
from south.db import db
from django.db import models
-from archweb.main.models import *
+from main.models import *
class Migration:
diff --git a/main/migrations/0003_migrate_maintainer.py b/main/migrations/0003_migrate_maintainer.py
index 8d3e1771..a3a4793f 100644
--- a/main/migrations/0003_migrate_maintainer.py
+++ b/main/migrations/0003_migrate_maintainer.py
@@ -1,7 +1,7 @@
from south.db import db
from django.db import models
-from archweb.main.models import *
+from main.models import *
class Migration:
diff --git a/mirrors/views.py b/mirrors/views.py
index 45ac5738..28297929 100644
--- a/mirrors/views.py
+++ b/mirrors/views.py
@@ -4,8 +4,8 @@ from django.db.models import Q
from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404, render_to_response
from django.template import RequestContext
-from archweb.main.models import Arch, Mirror, MirrorUrl
-from archweb.main.utils import make_choice
+from main.models import Arch, Mirror, MirrorUrl
+from main.utils import make_choice
class MirrorlistForm(forms.Form):
arch = forms.ChoiceField(required=True)
diff --git a/news/views.py b/news/views.py
index 2f960674..7aa78c46 100644
--- a/news/views.py
+++ b/news/views.py
@@ -1,6 +1,6 @@
from django import forms
from django.contrib.auth.decorators import permission_required
-from archweb.main.models import News
+from main.models import News
from django.views.generic import list_detail, create_update
diff --git a/packages/views.py b/packages/views.py
index 910af94a..e828c263 100644
--- a/packages/views.py
+++ b/packages/views.py
@@ -11,9 +11,9 @@ from django.contrib.admin.widgets import AdminDateWidget
from django.views.generic import list_detail
from django.db.models import Q
import datetime
-from archweb.main.models import Package, PackageFile
-from archweb.main.models import Arch, Repo, Signoff
-from archweb.main.utils import make_choice
+from main.models import Package, PackageFile
+from main.models import Arch, Repo, Signoff
+from main.utils import make_choice
def opensearch(request):
if request.is_secure():
diff --git a/public/utils.py b/public/utils.py
index 3a604037..a7e37323 100644
--- a/public/utils.py
+++ b/public/utils.py
@@ -1,4 +1,4 @@
-from archweb.main.models import Arch, Repo, Package
+from main.models import Arch, Repo, Package
def get_recent_updates():
# This is a bit of magic. We are going to show 15 on the front page, but we
diff --git a/public/views.py b/public/views.py
index 560f9bb0..79dae55c 100644
--- a/public/views.py
+++ b/public/views.py
@@ -1,5 +1,5 @@
-from archweb.main.models import AltForum, Arch, Donor, MirrorUrl, News
-from archweb.main.models import Package, Repo, ExternalProject
+from main.models import AltForum, Arch, Donor, MirrorUrl, News
+from main.models import Package, Repo, ExternalProject
from . import utils
from django.contrib.auth.models import User
diff --git a/sitemaps.py b/sitemaps.py
index aab2009d..256f7101 100644
--- a/sitemaps.py
+++ b/sitemaps.py
@@ -1,5 +1,5 @@
from django.contrib.sitemaps import Sitemap
-from archweb.main.models import Package, News
+from main.models import Package, News
class PackagesSitemap(Sitemap):
changefreq = "monthly"
diff --git a/todolists/views.py b/todolists/views.py
index 9b64c25c..9ebe6f3a 100644
--- a/todolists/views.py
+++ b/todolists/views.py
@@ -7,7 +7,7 @@ from django.shortcuts import get_object_or_404, render_to_response
from django.contrib.auth.decorators import login_required, permission_required
from django.views.generic.create_update import delete_object
from django.template import Context, loader
-from archweb.main.models import Todolist, TodolistPkg, Package
+from main.models import Todolist, TodolistPkg, Package
class TodoListForm(forms.Form):
name = forms.CharField(max_length=255,
diff --git a/urls.py b/urls.py
index 77b7b569..ec04edce 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<arch>[A-z0-9]+)/(?P<pkgname>[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<page>\d+)/$', 'archweb.packages.views.search'),
- (r'^packages/$', 'archweb.packages.views.search'),
- (r'^packages/(?P<page>\d+)/$', 'archweb.packages.views.search'),
+ (r'^packages/search/$', 'packages.views.search'),
+ (r'^packages/search/(?P<page>\d+)/$', 'packages.views.search'),
+ (r'^packages/$', 'packages.views.search'),
+ (r'^packages/(?P<page>\d+)/$', 'packages.views.search'),
(r'^packages/(?P<name>[A-z0-9\-+.]+)/$',
- 'archweb.packages.views.details'),
+ 'packages.views.details'),
(r'^packages/(?P<repo>[A-z0-9\-]+)/(?P<name>[A-z0-9\-+.]+)/$',
- 'archweb.packages.views.details'),
+ 'packages.views.details'),
(r'^packages/(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/$',
- 'archweb.packages.views.details'),
+ 'packages.views.details'),
(r'^packages/(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[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<list_id>\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<list_id>\d+)/$', 'todolists.views.edit'),
+ (r'^todo/flag/(\d+)/(\d+)/$', 'todolists.views.flag'),
(r'^todo/delete/(?P<object_id>\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<arch>[\S]+)/(?P<country>[A-z0-9 ]+)/$',
- 'archweb.mirrors.views.generate'),
+ 'mirrors.views.generate'),
(r'^mirrorlist/(?P<arch>[\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<url>.*)/$',
'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'),