Moving super_archives stuff

Sergio Oliveira · Marcio Mazza
1 parent 156aa73a
Showing 6 changed files with 14 additions and 16 deletions Show diff stats
src/super_archives/admin.py
src/super_archives/forms.py
src/super_archives/management/commands/import_emails.py
src/super_archives/queries.py
src/super_archives/urls.py
src/super_archives/views.py
 from django.contrib import admin
-from colab.super_archives.models import Message, Thread, UserProfile
+from .models import Message, Thread, UserProfile
 class MessageAdmin(admin.ModelAdmin):
     list_filter = ('spam', 'thread__mailinglist', 'received_time', )
@@ -6,8 +6,8 @@ from django.contrib.auth.models import User
 from django.contrib.auth.forms import UserCreationForm as UserCreationForm_
 from django.utils.translation import ugettext_lazy as _
-from colab.super_archives.models import MailingList
-from colab.super_archives.validators import UniqueValidator    
+from .models import MailingList
+from .validators import UniqueValidator    
 # XXX: I know that this code does not look nice AT ALL.
 #   probably it should be implemented using formsets instead of 
@@ -13,10 +13,8 @@ from django.db import transaction
 from django.template.defaultfilters import slugify
 from django.core.management.base import BaseCommand, CommandError
-from colab.super_archives.models import MailingList, Message, \
-                                        Thread, EmailAddress
-from colab.super_archives.management.commands.message import Message as \
-                                                             CustomMessage
+from super_archives.models import MailingList, Message, Thread, EmailAddress
+from super_archives.management.commands.message import Message as CustomMessage
 class Command(BaseCommand, object):
 from django.core.exceptions import ObjectDoesNotExist
-from colab.super_archives.models import Thread, Vote, Message, PageHit
+from .models import Thread, Vote, Message, PageHit
 def get_messages_by_date():
 from django.conf.urls.defaults import patterns, include, url
-urlpatterns = patterns('',
-#    url(r'thread/(?P<thread>\d+)/$', 'super_archives.views.thread', name='thread'),
-    url(r'thread/(?P<mailinglist>[-\w]+)/(?P<thread_token>[-\w]+)$', 
-        'colab.super_archives.views.thread', name="thread_view"),
-    url(r'thread/$', 
-        'colab.super_archives.views.list_messages', name='thread_list')
+urlpatterns = patterns('super_archives.views',
+#    url(r'thread/(?P<thread>\d+)/$', 'thread', name='thread'),
+    url(r'thread/(?P<mailinglist>[-\w]+)/(?P<thread_token>[-\w]+)$', 'thread', 
+        name="thread_view"),
+    url(r'thread/$', 'list_messages', name='thread_list')
 )
 # -*- coding: utf-8 -*-
+import queries
+
 from django.http import Http404
 from django.template import RequestContext
 from django.core.paginator import Paginator
 from django.core.exceptions import ObjectDoesNotExist
 from django.shortcuts import render_to_response, get_list_or_404
-from colab.super_archives import queries
-from colab.super_archives.models import MailingList, Thread
+from .models import MailingList, Thread
 def thread(request, mailinglist, thread_token):
1		1
2	from django.contrib import admin	2	from django.contrib import admin
3	-from colab.super_archives.models import Message, Thread, UserProfile	3	+from .models import Message, Thread, UserProfile
4		4
5	class MessageAdmin(admin.ModelAdmin):	5	class MessageAdmin(admin.ModelAdmin):
6	list_filter = ('spam', 'thread__mailinglist', 'received_time', )	6	list_filter = ('spam', 'thread__mailinglist', 'received_time', )
1		1
2	from django.core.exceptions import ObjectDoesNotExist	2	from django.core.exceptions import ObjectDoesNotExist
3	-from colab.super_archives.models import Thread, Vote, Message, PageHit	3	+from .models import Thread, Vote, Message, PageHit
4		4
5		5
6	def get_messages_by_date():	6	def get_messages_by_date():