[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777
Chris Lamb
lamby at debian.org
Fri Jul 30 02:52:35 UTC 2010
The following commit has been merged in the master branch:
commit 2f5c57faa8a796dc16b6d8d700428c7cccc50418
Author: Chris Lamb <lamby at debian.org>
Date: Thu Jul 29 11:16:08 2010 -0400
Rename live_studio_www to live_studio.s
diff --git a/config/debian/control b/config/debian/control
index c1d4af5..4b24bd9 100644
--- a/config/debian/control
+++ b/config/debian/control
@@ -3,7 +3,7 @@ Section: web
Priority: optional
Maintainer: debian-live <debian-live at lists.debian.org>
-Package: live-studio-www
+Package: live-studio
Architecture: all
Depends: python-django (>= 1.2), python-psycopg2, python-memcache
Description: Web pages etc. for live-studio
diff --git a/config/settings/defaults/apps.py b/config/settings/defaults/apps.py
index b05ef0e..fcd3b41 100644
--- a/config/settings/defaults/apps.py
+++ b/config/settings/defaults/apps.py
@@ -6,13 +6,13 @@ INSTALLED_APPS = [
'django.contrib.admin',
'django.contrib.messages',
- 'live_studio_www.auth',
- 'live_studio_www.utils',
- 'live_studio_www.debug',
- 'live_studio_www.queue',
- 'live_studio_www.config',
- 'live_studio_www.static',
- 'live_studio_www.templatetags',
+ 'live_studio.auth',
+ 'live_studio.utils',
+ 'live_studio.debug',
+ 'live_studio.queue',
+ 'live_studio.config',
+ 'live_studio.static',
+ 'live_studio.templatetags',
]
try:
diff --git a/config/settings/defaults/middleware.py b/config/settings/defaults/middleware.py
index e2077c5..357f820 100644
--- a/config/settings/defaults/middleware.py
+++ b/config/settings/defaults/middleware.py
@@ -4,6 +4,6 @@ MIDDLEWARE_CLASSES = (
'django.contrib.messages.middleware.MessageMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'live_studio_www.auth.middleware.RequireLoginMiddleware',
+ 'live_studio.auth.middleware.RequireLoginMiddleware',
'django.middleware.transaction.TransactionMiddleware',
)
diff --git a/config/settings/defaults/misc.py b/config/settings/defaults/misc.py
index 1b61447..c574419 100644
--- a/config/settings/defaults/misc.py
+++ b/config/settings/defaults/misc.py
@@ -1,4 +1,4 @@
-# Django settings for live_studio_www project.
+# Django settings for live_studio project.
DEBUG = False
TEMPLATE_DEBUG = DEBUG
@@ -56,4 +56,4 @@ TEMPLATE_LOADERS = (
'django.template.loaders.app_directories.load_template_source',
)
-ROOT_URLCONF = 'live_studio_www.urls'
+ROOT_URLCONF = 'live_studio.urls'
diff --git a/live_studio_www/__init__.py b/live_studio/__init__.py
similarity index 100%
rename from live_studio_www/__init__.py
rename to live_studio/__init__.py
diff --git a/live_studio_www/auth/__init__.py b/live_studio/auth/__init__.py
similarity index 100%
rename from live_studio_www/auth/__init__.py
rename to live_studio/auth/__init__.py
diff --git a/live_studio_www/auth/decorators.py b/live_studio/auth/decorators.py
similarity index 100%
rename from live_studio_www/auth/decorators.py
rename to live_studio/auth/decorators.py
diff --git a/live_studio_www/auth/middleware.py b/live_studio/auth/middleware.py
similarity index 100%
rename from live_studio_www/auth/middleware.py
rename to live_studio/auth/middleware.py
diff --git a/live_studio_www/auth/models.py b/live_studio/auth/models.py
similarity index 100%
rename from live_studio_www/auth/models.py
rename to live_studio/auth/models.py
diff --git a/live_studio_www/config/__init__.py b/live_studio/config/__init__.py
similarity index 100%
rename from live_studio_www/config/__init__.py
rename to live_studio/config/__init__.py
diff --git a/live_studio_www/config/admin.py b/live_studio/config/admin.py
similarity index 100%
rename from live_studio_www/config/admin.py
rename to live_studio/config/admin.py
diff --git a/live_studio_www/config/forms.py b/live_studio/config/forms.py
similarity index 100%
rename from live_studio_www/config/forms.py
rename to live_studio/config/forms.py
diff --git a/live_studio_www/config/models.py b/live_studio/config/models.py
similarity index 98%
rename from live_studio_www/config/models.py
rename to live_studio/config/models.py
index b843577..b30568e 100644
--- a/live_studio_www/config/models.py
+++ b/live_studio/config/models.py
@@ -3,7 +3,7 @@ import datetime
from django.db import models
from django.contrib.auth.models import User
-from live_studio_www import data
+from live_studio import data
class Config(models.Model):
user = models.ForeignKey(User, related_name='configs')
diff --git a/live_studio_www/config/urls.py b/live_studio/config/urls.py
similarity index 82%
rename from live_studio_www/config/urls.py
rename to live_studio/config/urls.py
index 872c5af..9f37ad7 100644
--- a/live_studio_www/config/urls.py
+++ b/live_studio/config/urls.py
@@ -1,6 +1,6 @@
from django.conf.urls.defaults import *
-urlpatterns = patterns('live_studio_www.config.views',
+urlpatterns = patterns('live_studio.config.views',
url(r'config/add$', 'add', name='add'),
url(r'configs$', 'configs', name='configs'),
url(r'config/(?P<config_id>\d+)$', 'view', name='view'),
diff --git a/live_studio_www/config/views.py b/live_studio/config/views.py
similarity index 96%
rename from live_studio_www/config/views.py
rename to live_studio/config/views.py
index 34d5907..3aca798 100644
--- a/live_studio_www/config/views.py
+++ b/live_studio/config/views.py
@@ -3,7 +3,7 @@ from django.contrib import messages
from django.shortcuts import get_object_or_404
from django.contrib.formtools.wizard import FormWizard
-from live_studio_www.utils import render_response
+from live_studio.utils import render_response
from .forms import ConfigForm, WIZARD_FORMS
from .models import Config
diff --git a/live_studio_www/data/__init__.py b/live_studio/data/__init__.py
similarity index 100%
rename from live_studio_www/data/__init__.py
rename to live_studio/data/__init__.py
diff --git a/live_studio_www/data/keyboard_layouts.py b/live_studio/data/keyboard_layouts.py
similarity index 100%
rename from live_studio_www/data/keyboard_layouts.py
rename to live_studio/data/keyboard_layouts.py
diff --git a/live_studio_www/data/locales.py b/live_studio/data/locales.py
similarity index 100%
rename from live_studio_www/data/locales.py
rename to live_studio/data/locales.py
diff --git a/live_studio_www/debug/__init__.py b/live_studio/debug/__init__.py
similarity index 100%
rename from live_studio_www/debug/__init__.py
rename to live_studio/debug/__init__.py
diff --git a/live_studio_www/debug/models.py b/live_studio/debug/models.py
similarity index 100%
rename from live_studio_www/debug/models.py
rename to live_studio/debug/models.py
diff --git a/live_studio_www/debug/urls.py b/live_studio/debug/urls.py
similarity index 86%
rename from live_studio_www/debug/urls.py
rename to live_studio/debug/urls.py
index 2ed4e93..84049a6 100644
--- a/live_studio_www/debug/urls.py
+++ b/live_studio/debug/urls.py
@@ -1,7 +1,7 @@
from django.conf import settings
from django.conf.urls.defaults import *
-urlpatterns = patterns('live_studio_www.debug.views',
+urlpatterns = patterns('live_studio.debug.views',
)
if settings.DEBUG:
diff --git a/live_studio_www/manage.py b/live_studio/manage.py
similarity index 100%
rename from live_studio_www/manage.py
rename to live_studio/manage.py
diff --git a/live_studio_www/queue/__init__.py b/live_studio/queue/__init__.py
similarity index 100%
rename from live_studio_www/queue/__init__.py
rename to live_studio/queue/__init__.py
diff --git a/live_studio_www/queue/management/__init__.py b/live_studio/queue/management/__init__.py
similarity index 100%
rename from live_studio_www/queue/management/__init__.py
rename to live_studio/queue/management/__init__.py
diff --git a/live_studio_www/queue/management/commands/__init__.py b/live_studio/queue/management/commands/__init__.py
similarity index 100%
rename from live_studio_www/queue/management/commands/__init__.py
rename to live_studio/queue/management/commands/__init__.py
diff --git a/live_studio_www/queue/management/commands/queue_runner.py b/live_studio/queue/management/commands/queue_runner.py
similarity index 91%
rename from live_studio_www/queue/management/commands/queue_runner.py
rename to live_studio/queue/management/commands/queue_runner.py
index 88b1c5f..5697729 100644
--- a/live_studio_www/queue/management/commands/queue_runner.py
+++ b/live_studio/queue/management/commands/queue_runner.py
@@ -2,7 +2,7 @@ import time
from django.core.management.base import NoArgsCommand
-from live_studio_www.queue.models import Entry
+from live_studio.queue.models import Entry
class Command(NoArgsCommand):
def handle_noargs(self, **options):
diff --git a/live_studio_www/queue/models.py b/live_studio/queue/models.py
similarity index 100%
rename from live_studio_www/queue/models.py
rename to live_studio/queue/models.py
diff --git a/live_studio_www/queue/urls.py b/live_studio/queue/urls.py
similarity index 69%
rename from live_studio_www/queue/urls.py
rename to live_studio/queue/urls.py
index 1e8c353..ea2af09 100644
--- a/live_studio_www/queue/urls.py
+++ b/live_studio/queue/urls.py
@@ -1,6 +1,6 @@
from django.conf.urls.defaults import *
-urlpatterns = patterns('live_studio_www.queue.views',
+urlpatterns = patterns('live_studio.queue.views',
url('config/(?P<config_id>\d+)/enqueue', 'enqueue',
name='enqueue'),
)
diff --git a/live_studio_www/queue/views.py b/live_studio/queue/views.py
similarity index 100%
rename from live_studio_www/queue/views.py
rename to live_studio/queue/views.py
diff --git a/live_studio_www/settings b/live_studio/settings
similarity index 100%
rename from live_studio_www/settings
rename to live_studio/settings
diff --git a/live_studio_www/static/__init__.py b/live_studio/static/__init__.py
similarity index 100%
rename from live_studio_www/static/__init__.py
rename to live_studio/static/__init__.py
diff --git a/live_studio_www/static/models.py b/live_studio/static/models.py
similarity index 100%
rename from live_studio_www/static/models.py
rename to live_studio/static/models.py
diff --git a/live_studio_www/static/urls.py b/live_studio/static/urls.py
similarity index 60%
rename from live_studio_www/static/urls.py
rename to live_studio/static/urls.py
index 1fadf3a..0709126 100644
--- a/live_studio_www/static/urls.py
+++ b/live_studio/static/urls.py
@@ -1,5 +1,5 @@
from django.conf.urls.defaults import *
-urlpatterns = patterns('live_studio_www.static.views',
+urlpatterns = patterns('live_studio.static.views',
url(r'^$', 'welcome', name='welcome'),
)
diff --git a/live_studio/static/views.py b/live_studio/static/views.py
new file mode 100644
index 0000000..d8cc6c6
--- /dev/null
+++ b/live_studio/static/views.py
@@ -0,0 +1,6 @@
+from live_studio.utils import render_response
+from live_studio.auth.decorators import login_not_required
+
+ at login_not_required
+def welcome(request):
+ return render_response(request, 'static/welcome.html', {})
diff --git a/live_studio_www/templatetags/__init__.py b/live_studio/templatetags/__init__.py
similarity index 65%
rename from live_studio_www/templatetags/__init__.py
rename to live_studio/templatetags/__init__.py
index 1f22112..1ac47a2 100644
--- a/live_studio_www/templatetags/__init__.py
+++ b/live_studio/templatetags/__init__.py
@@ -4,4 +4,4 @@ from .library import register
import media
-add_to_builtins('live_studio_www.templatetags')
+add_to_builtins('live_studio.templatetags')
diff --git a/live_studio_www/templatetags/library.py b/live_studio/templatetags/library.py
similarity index 100%
rename from live_studio_www/templatetags/library.py
rename to live_studio/templatetags/library.py
diff --git a/live_studio_www/templatetags/media.py b/live_studio/templatetags/media.py
similarity index 100%
rename from live_studio_www/templatetags/media.py
rename to live_studio/templatetags/media.py
diff --git a/live_studio_www/templatetags/models.py b/live_studio/templatetags/models.py
similarity index 100%
rename from live_studio_www/templatetags/models.py
rename to live_studio/templatetags/models.py
diff --git a/live_studio/urls.py b/live_studio/urls.py
new file mode 100644
index 0000000..298ebe8
--- /dev/null
+++ b/live_studio/urls.py
@@ -0,0 +1,12 @@
+from django.conf.urls.defaults import *
+
+from django.contrib import admin
+admin.autodiscover()
+
+urlpatterns = patterns('',
+ (r'^admin/', include(admin.site.urls)),
+ (r'', include('live_studio.debug.urls', namespace='debug')),
+ (r'', include('live_studio.queue.urls', namespace='queue')),
+ (r'', include('live_studio.config.urls', namespace='config')),
+ (r'', include('live_studio.static.urls', namespace='static')),
+)
diff --git a/live_studio_www/utils/__init__.py b/live_studio/utils/__init__.py
similarity index 100%
rename from live_studio_www/utils/__init__.py
rename to live_studio/utils/__init__.py
diff --git a/live_studio_www/utils/models.py b/live_studio/utils/models.py
similarity index 100%
rename from live_studio_www/utils/models.py
rename to live_studio/utils/models.py
diff --git a/live_studio_www/utils/rendering.py b/live_studio/utils/rendering.py
similarity index 100%
rename from live_studio_www/utils/rendering.py
rename to live_studio/utils/rendering.py
diff --git a/live_studio_www/static/views.py b/live_studio_www/static/views.py
deleted file mode 100644
index efc9c18..0000000
--- a/live_studio_www/static/views.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from live_studio_www.utils import render_response
-from live_studio_www.auth.decorators import login_not_required
-
- at login_not_required
-def welcome(request):
- return render_response(request, 'static/welcome.html', {})
diff --git a/live_studio_www/urls.py b/live_studio_www/urls.py
deleted file mode 100644
index f4ae84e..0000000
--- a/live_studio_www/urls.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from django.conf.urls.defaults import *
-
-from django.contrib import admin
-admin.autodiscover()
-
-urlpatterns = patterns('',
- (r'^admin/', include(admin.site.urls)),
- (r'', include('live_studio_www.debug.urls', namespace='debug')),
- (r'', include('live_studio_www.queue.urls', namespace='queue')),
- (r'', include('live_studio_www.config.urls', namespace='config')),
- (r'', include('live_studio_www.static.urls', namespace='static')),
-)
--
live-studio
More information about the debian-live-changes
mailing list