renamed imports

devel/views.py

@@ -2,12 +2,12 @@
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from django.core import validators
-from archlinux.utils import render_template
-from archlinux.packages.models import Package
-from archlinux.todolists.models import Todolist, TodolistPkg
-from archlinux.settings import DATA_DIR
-from archlinux.utils import validate
-from archlinux.common.models import UserProfile
+from archweb_dev.utils import render_template
+from archweb_dev.packages.models import Package
+from archweb_dev.todolists.models import Todolist, TodolistPkg
+from archweb_dev.settings import DATA_DIR
+from archweb_dev.utils import validate
+from archweb_dev.common.models import UserProfile
 
 @login_required
 def index(request):

feeds.py

 from django.contrib.syndication.feeds import Feed
-from archlinux.packages.models import Package
-from archlinux.news.models import News
+from archweb_dev.packages.models import Package
+from archweb_dev.news.models import News
 #from datetime import datetime
 
 class PackageFeed(Feed):

news/models.py

 from django.db import models
 from django.contrib.auth.models import User
 import re
-from archlinux.utils import Stripper
+from archweb_dev.utils import Stripper
 
 class News(models.Model):
 	id = models.AutoField(primary_key=True)

news/views.py

@@ -3,8 +3,8 @@
 from django.contrib.auth.decorators import user_passes_test
 from django.contrib.auth.models import User
 from django import forms
-from archlinux.utils import render_template
-from archlinux.news.models import News
+from archweb_dev.utils import render_template
+from archweb_dev.news.models import News
 from datetime import date
 
 def view(request, newsid):

packages/views.py

@@ -5,9 +5,9 @@
 from django.core import validators
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
-from archlinux.utils import validate, render_template
+from archweb_dev.utils import validate, render_template
 from datetime import datetime
-from archlinux.packages.models import Package, PackageFile, Repo, Category
+from archweb_dev.packages.models import Package, PackageFile, Repo, Category
 
 def update(request):
 	if request.POST.has_key('adopt'):

public/views.py

 from django.http import HttpResponse
-from archlinux.utils import render_template
+from archweb_dev.utils import render_template
 from django.contrib.auth.models import User
-from archlinux.packages.models import Package, Repo
-from archlinux.news.models import News
-from archlinux.settings import DATA_DIR
-from archlinux.common.models import Donator, Mirror
+from archweb_dev.packages.models import Package, Repo
+from archweb_dev.news.models import News
+from archweb_dev.settings import DATA_DIR
+from archweb_dev.common.models import Donator, Mirror
 
 def index(request):
 	# get the most recent 10 news items

settings.py

-# Django settings for archlinux project.
+# Django settings for archweb_dev project.
 
 ## Import local settings
 from local_settings import *
@@ -60,7 +60,7 @@
     "django.middleware.doc.XViewMiddleware",
 )
 
-ROOT_URLCONF = 'archlinux.urls'
+ROOT_URLCONF = 'archweb_dev.urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates".
@@ -78,12 +78,12 @@
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
-    'archlinux.common',
-    'archlinux.news',
-    'archlinux.packages',
-    'archlinux.public',
-    'archlinux.todolists',
-    'archlinux.devel',
-    'archlinux.wiki'
+    'archweb_dev.common',
+    'archweb_dev.news',
+    'archweb_dev.packages',
+    'archweb_dev.public',
+    'archweb_dev.todolists',
+    'archweb_dev.devel',
+    'archweb_dev.wiki'
 )
 

todolists/models.py

 from django.db import models
 from django.contrib.auth.models import User
-from archlinux.packages.models import Package
+from archweb_dev.packages.models import Package
 
 class TodolistManager(models.Manager):
 	def get_incomplete(self):

todolists/views.py

@@ -2,9 +2,9 @@
 from django.shortcuts import get_object_or_404
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.contrib.auth.models import User
-from archlinux.utils import render_template
-from archlinux.todolists.models import Todolist, TodolistPkg
-from archlinux.packages.models import Package
+from archweb_dev.utils import render_template
+from archweb_dev.todolists.models import Todolist, TodolistPkg
+from archweb_dev.packages.models import Package
 
 # FIXME: ugly hackery. http://code.djangoproject.com/ticket/3450
 import django.db

urls.py

 from django.conf.urls.defaults import *
-from archlinux.news.models import News
-from archlinux.feeds import PackageFeed, NewsFeed
+from archweb_dev.news.models import News
+from archweb_dev.feeds import PackageFeed, NewsFeed
 from django.views.decorators.cache import cache_page
 
 feeds = {
@@ -12,58 +12,58 @@
 	#(r'^media/(.*)$',      'django.views.static.serve', {'document_root': '/home/jvinet/shared/work/archlinux/media'}),
 
 # Dynamic Stuff
-	(r'^packages/flag/(\d+)/$',          'archlinux.packages.views.flag'),
-	(r'^packages/flaghelp/$',            'archlinux.packages.views.flaghelp'),
-	(r'^packages/unflag/(\d+)/$',        'archlinux.packages.views.unflag'),
-	(r'^packages/files/(\d+)/$',         'archlinux.packages.views.files'),
-	(r'^packages/search/$',              'archlinux.packages.views.search'),
-	(r'^packages/search/([A-z0-9]+)/$',  'archlinux.packages.views.search'),
-	(r'^packages/update/$',              'archlinux.packages.views.update'),
-	(r'^packages/(?P<pkgid>\d+)/$',      'archlinux.packages.views.details'),
-	(r'^packages/(?P<name>[A-z0-9]+)/$', 'archlinux.packages.views.details'),
-	(r'^packages/(?P<repo>[A-z0-9]+)/(?P<name>[A-z0-9]+)/$', 'archlinux.packages.views.details'),
-	(r'^packages/$',                     'archlinux.packages.views.search'),
+	(r'^packages/flag/(\d+)/$',          'archweb_dev.packages.views.flag'),
+	(r'^packages/flaghelp/$',            'archweb_dev.packages.views.flaghelp'),
+	(r'^packages/unflag/(\d+)/$',        'archweb_dev.packages.views.unflag'),
+	(r'^packages/files/(\d+)/$',         'archweb_dev.packages.views.files'),
+	(r'^packages/search/$',              'archweb_dev.packages.views.search'),
+	(r'^packages/search/([A-z0-9]+)/$',  'archweb_dev.packages.views.search'),
+	(r'^packages/update/$',              'archweb_dev.packages.views.update'),
+	(r'^packages/(?P<pkgid>\d+)/$',      'archweb_dev.packages.views.details'),
+	(r'^packages/(?P<name>[A-z0-9]+)/$', 'archweb_dev.packages.views.details'),
+	(r'^packages/(?P<repo>[A-z0-9]+)/(?P<name>[A-z0-9]+)/$', 'archweb_dev.packages.views.details'),
+	(r'^packages/$',                     'archweb_dev.packages.views.search'),
 
-	(r'^todo/(\d+)/$',            'archlinux.todolists.views.view'),
-	(r'^todo/add/$',              'archlinux.todolists.views.add'),
-	(r'^todo/flag/(\d+)/(\d+)/$', 'archlinux.todolists.views.flag'),
-	(r'^todo/$',                  'archlinux.todolists.views.list'),
+	(r'^todo/(\d+)/$',            'archweb_dev.todolists.views.view'),
+	(r'^todo/add/$',              'archweb_dev.todolists.views.add'),
+	(r'^todo/flag/(\d+)/(\d+)/$', 'archweb_dev.todolists.views.flag'),
+	(r'^todo/$',                  'archweb_dev.todolists.views.list'),
 
-	(r'^news/(\d+)/$',         'archlinux.news.views.view'),
-	(r'^news/add/$',           'archlinux.news.views.add'),
-	(r'^news/edit/(\d+)/$',    'archlinux.news.views.edit'),
-	(r'^news/delete/(\d+)/$',  'archlinux.news.views.delete'),
-	(r'^news/$',               'archlinux.news.views.list'),
+	(r'^news/(\d+)/$',         'archweb_dev.news.views.view'),
+	(r'^news/add/$',           'archweb_dev.news.views.add'),
+	(r'^news/edit/(\d+)/$',    'archweb_dev.news.views.edit'),
+	(r'^news/delete/(\d+)/$',  'archweb_dev.news.views.delete'),
+	(r'^news/$',               'archweb_dev.news.views.list'),
 
-	(r'^devel/$',          'archlinux.devel.views.index'),
-	(r'^devel/notify/$',   'archlinux.devel.views.change_notify'),
-	(r'^devel/profile/$',  'archlinux.devel.views.change_profile'),
-	(r'^devel/guide/$',    'archlinux.devel.views.guide'),
+	(r'^devel/$',          'archweb_dev.devel.views.index'),
+	(r'^devel/notify/$',   'archweb_dev.devel.views.change_notify'),
+	(r'^devel/profile/$',  'archweb_dev.devel.views.change_profile'),
+	(r'^devel/guide/$',    'archweb_dev.devel.views.guide'),
 
-	(r'^wiki/([A-Z]+[A-z0-9 :/-]+)/$',      'archlinux.wiki.views.page'),
-	(r'^wiki/edit/([A-Z]+[A-z0-9 :/-]+)/$', 'archlinux.wiki.views.edit'),
-	(r'^wiki/delete/$',                     'archlinux.wiki.views.delete'),
-	(r'^wiki/index/$',                      'archlinux.wiki.views.index'),
-	(r'^wiki/$',                            'archlinux.wiki.views.main'),
+	(r'^wiki/([A-Z]+[A-z0-9 :/-]+)/$',      'archweb_dev.wiki.views.page'),
+	(r'^wiki/edit/([A-Z]+[A-z0-9 :/-]+)/$', 'archweb_dev.wiki.views.edit'),
+	(r'^wiki/delete/$',                     'archweb_dev.wiki.views.delete'),
+	(r'^wiki/index/$',                      'archweb_dev.wiki.views.index'),
+	(r'^wiki/$',                            'archweb_dev.wiki.views.main'),
 
 # Feeds
 	(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
 
 # (mostly) Static Pages
-	(r'^$',                'archlinux.public.views.index'),
-	(r'^about/$',          'archlinux.public.views.about'),
-	(r'^art/$',            'archlinux.public.views.art'),
-	(r'^cvs/$',            'archlinux.public.views.cvs'),
-	(r'^developers/$',     'archlinux.public.views.developers'),
-	(r'^donate/$',         'archlinux.public.views.donate'),
-	(r'^download/$',       'archlinux.public.views.download'),
-	(r'^irc/$',            'archlinux.public.views.irc'),
-	(r'^moreforums/$',     'archlinux.public.views.moreforums'),
-	(r'^press/$',          'archlinux.public.views.press'),
-	(r'^projects/$',       'archlinux.public.views.projects'),
+	(r'^$',                'archweb_dev.public.views.index'),
+	(r'^about/$',          'archweb_dev.public.views.about'),
+	(r'^art/$',            'archweb_dev.public.views.art'),
+	(r'^cvs/$',            'archweb_dev.public.views.cvs'),
+	(r'^developers/$',     'archweb_dev.public.views.developers'),
+	(r'^donate/$',         'archweb_dev.public.views.donate'),
+	(r'^download/$',       'archweb_dev.public.views.download'),
+	(r'^irc/$',            'archweb_dev.public.views.irc'),
+	(r'^moreforums/$',     'archweb_dev.public.views.moreforums'),
+	(r'^press/$',          'archweb_dev.public.views.press'),
+	(r'^projects/$',       'archweb_dev.public.views.projects'),
 
 # Authentication / Admin
-	(r'^denied/$',          'archlinux.public.views.denied'),
+	(r'^denied/$',          'archweb_dev.public.views.denied'),
 	(r'^login/$',           'django.contrib.auth.views.login',  {'template_name': 'registration/login.html'}),
 	(r'^accounts/login/$',  'django.contrib.auth.views.login',  {'template_name': 'registration/login.html'}),
 	(r'^logout/$',          'django.contrib.auth.views.logout', {'template_name': 'registration/logout.html'}),

utils.py

@@ -5,8 +5,8 @@
 from string import *
 import sgmllib
 
-#from archlinux.packages.models import Maintainer
-#from archlinux.settings import BADPRIVS_URL
+#from archweb_dev.packages.models import Maintainer
+#from archweb_dev.settings import BADPRIVS_URL
 #def is_maintainer(view_func, badprivs_url=BADPRIVS_URL):
 #	"""
 #	Decorator for views that checks that the logged-in user has a corresponding

wiki/templatetags/wikitags.py

 from django.template import Library
 from django.conf import settings
-from archlinux.lib import markdown
+from archweb_dev.lib import markdown
 import re
 
 register = Library()

wiki/views.py

@@ -3,8 +3,8 @@
 #
 from django.http import HttpResponse, HttpResponseRedirect
 from django.contrib.auth.decorators import login_required
-from archlinux.utils import render_template
-from archlinux.wiki.models import Wikipage
+from archweb_dev.utils import render_template
+from archweb_dev.wiki.models import Wikipage
 
 @login_required
 def index(request):