modified import paths from archweb_dev to archweb

8 files changed, 48 insertions, 48 deletions

diff --git a/devel/views.py b/devel/views.py
index 402ed26c..0a4074e0 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -4,10 +4,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_dev.main.models import Package, Todolist
-from archweb_dev.main.models import Arch, Repo
-from archweb_dev.main.models import UserProfile, News
-from archweb_dev.main.models import Mirror
+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
 import random
 from string import ascii_letters, digits
 pwletters = ascii_letters + digits
diff --git a/main/admin.py b/main/admin.py
index 11d95c7a..cd1ffda7 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_dev.main.models import (AltForum, Arch, Donor,
+from archweb.main.models import (AltForum, Arch, Donor,
         Mirror, MirrorProtocol, MirrorUrl, MirrorRsync,
         Package, Press, Repo, UserProfile, ExternalProject)
 
diff --git a/main/models.py b/main/models.py
index f645804b..d65c8470 100644
--- a/main/models.py
+++ b/main/models.py
@@ -1,7 +1,7 @@
 from django.db import models
 from django.db.models import Q
 from django.contrib.auth.models import User
-from archweb_dev.main.middleware import get_user
+from archweb.main.middleware import get_user
 
 ###########################
 ### User Profile Class ####
diff --git a/news/views.py b/news/views.py
index 66e00578..2f960674 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_dev.main.models import News
+from archweb.main.models import News
 
 from django.views.generic import list_detail, create_update
 
diff --git a/packages/views.py b/packages/views.py
index 2390bd97..a839ca6b 100644
--- a/packages/views.py
+++ b/packages/views.py
@@ -9,9 +9,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_dev.main.models import Package, PackageFile
-from archweb_dev.main.models import Arch, Repo, Signoff
-from archweb_dev.main.utils import make_choice
+from archweb.main.models import Package, PackageFile
+from archweb.main.models import Arch, Repo, Signoff
+from archweb.main.utils import make_choice
 
 def update(request):
     ids = request.POST.getlist('pkgid')
diff --git a/settings.py b/settings.py
index 478dd3b9..e0ca4d0b 100644
--- a/settings.py
+++ b/settings.py
@@ -1,5 +1,5 @@
 import os
-# Django settings for archweb_dev project.
+# Django settings for archweb project.
 
 # setup some var defaults
 DEBUG = True
@@ -49,11 +49,11 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.http.ConditionalGetMiddleware',
     "django.middleware.common.CommonMiddleware",
     "django.middleware.doc.XViewMiddleware",
-    "archweb_dev.main.middleware.RequireLoginMiddleware",
-    "archweb_dev.main.middleware.AutoUserMiddleware",
+    "archweb.main.middleware.RequireLoginMiddleware",
+    "archweb.main.middleware.AutoUserMiddleware",
 )
 
-ROOT_URLCONF = 'archweb_dev.urls'
+ROOT_URLCONF = 'archweb.urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates".
@@ -71,11 +71,11 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
-    'archweb_dev.main', # contains shared models and libs
-    'archweb_dev.news',
-    'archweb_dev.packages',
-    'archweb_dev.todolists',
-    'archweb_dev.devel',
+    'archweb.main', # contains shared models and libs
+    'archweb.news',
+    'archweb.packages',
+    'archweb.todolists',
+    'archweb.devel',
 )
 
 # vim: set ts=4 sw=4 et:
diff --git a/todolists/views.py b/todolists/views.py
index 3c03b308..9654582b 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 permission_required
 from django.views.generic.create_update import delete_object
 from django.template import Context, loader
-from archweb_dev.main.models import Todolist, TodolistPkg, Package
+from archweb.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 c9f0c6e9..3fc450f3 100644
--- a/urls.py
+++ b/urls.py
@@ -5,50 +5,50 @@ from django.contrib import admin
 from django.views.generic.create_update import delete_object
 from django.contrib.auth.decorators import permission_required
 
-from archweb_dev.main.models import Todolist
+from archweb.main.models import Todolist
 
 admin.autodiscover()
 
 urlpatterns = patterns('',
-    (r'^packages/unflag/(\d+)/$',        'archweb_dev.packages.views.unflag'),
-    (r'^packages/files/(\d+)/$',         'archweb_dev.packages.views.files'),
-    (r'^packages/signoffs/$',              'archweb_dev.packages.views.signoffs'),
+    (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/signoff_package/(?P<arch>[A-z0-9]+)/(?P<pkgname>[A-z0-9\-+.]+)/$',
-        'archweb_dev.packages.views.signoff_package'),
-    (r'^packages/update/$',              'archweb_dev.packages.views.update'),
+        'archweb.packages.views.signoff_package'),
+    (r'^packages/update/$',              'archweb.packages.views.update'),
 
-    (r'^packages/$',                     'archweb_dev.packages.views.search'),
-    (r'^packages/(?P<page>\d+)/$',        'archweb_dev.packages.views.search'),
+    (r'^packages/$',                     'archweb.packages.views.search'),
+    (r'^packages/(?P<page>\d+)/$',        'archweb.packages.views.search'),
 
     (r'^packages/(?P<name>[A-z0-9\-+.]+)/$',
-        'archweb_dev.packages.views.details'),
+        'archweb.packages.views.details'),
     (r'^packages/(?P<repo>[A-z0-9\-]+)/(?P<name>[A-z0-9\-+.]+)/$',
-        'archweb_dev.packages.views.details'),
+        'archweb.packages.views.details'),
     (r'^packages/(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/$',
-        'archweb_dev.packages.views.details'),
+        'archweb.packages.views.details'),
 
-    (r'^todo/(\d+)/$',              'archweb_dev.todolists.views.view'),
-    (r'^todo/add/$',                'archweb_dev.todolists.views.add'),
-    (r'^todo/edit/(?P<list_id>\d+)/$',  'archweb_dev.todolists.views.edit'),
-    (r'^todo/flag/(\d+)/(\d+)/$',   'archweb_dev.todolists.views.flag'),
+    (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/delete/(?P<object_id>\d+)/$',
-        'archweb_dev.todolists.views.delete_todolist'),
-    (r'^todo/$',                    'archweb_dev.todolists.views.list'),
+        'archweb.todolists.views.delete_todolist'),
+    (r'^todo/$',                    'archweb.todolists.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'^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'^mirrors/$',        'archweb_dev.devel.views.mirrorlist'),
+    (r'^mirrors/$',        'archweb.devel.views.mirrorlist'),
 
-    (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'^$',                'archweb_dev.devel.views.siteindex'),
+    (r'^devel/$',          'archweb.devel.views.index'),
+    (r'^devel/notify/$',   'archweb.devel.views.change_notify'),
+    (r'^devel/profile/$',  'archweb.devel.views.change_profile'),
+    (r'^$',                'archweb.devel.views.siteindex'),
 
-    (r'^devel/newuser/$', 'archweb_dev.devel.views.new_user_form'),
+    (r'^devel/newuser/$', 'archweb.devel.views.new_user_form'),
 
 # Authentication / Admin
     (r'^login/$',           'django.contrib.auth.views.login',  {