Moving super_archives stuff

Sergio Oliveira
1 parent 5df4e81c
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	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	5	class MessageAdmin(admin.ModelAdmin):
6	6	list_filter = ('spam', 'thread__mailinglist', 'received_time', )
...	...
...	...	@@ -6,8 +6,8 @@ from django.contrib.auth.models import User
6	6	from django.contrib.auth.forms import UserCreationForm as UserCreationForm_
7	7	from django.utils.translation import ugettext_lazy as _
8	8
9		-from colab.super_archives.models import MailingList
10		-from colab.super_archives.validators import UniqueValidator
	9	+from .models import MailingList
	10	+from .validators import UniqueValidator
11	11
12	12	# XXX: I know that this code does not look nice AT ALL.
13	13	# probably it should be implemented using formsets instead of
...	...
...	...	@@ -13,10 +13,8 @@ from django.db import transaction
13	13	from django.template.defaultfilters import slugify
14	14	from django.core.management.base import BaseCommand, CommandError
15	15
16		-from colab.super_archives.models import MailingList, Message, \
17		- Thread, EmailAddress
18		-from colab.super_archives.management.commands.message import Message as \
19		- CustomMessage
	16	+from super_archives.models import MailingList, Message, Thread, EmailAddress
	17	+from super_archives.management.commands.message import Message as CustomMessage
20	18
21	19
22	20	class Command(BaseCommand, object):
...	...
1	1
2	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	6	def get_messages_by_date():
...	...
1	1	from django.conf.urls.defaults import patterns, include, url
2	2
3		-urlpatterns = patterns('',
4		-# url(r'thread/(?P<thread>\d+)/$', 'super_archives.views.thread', name='thread'),
5		- url(r'thread/(?P<mailinglist>[-\w]+)/(?P<thread_token>[-\w]+)$',
6		- 'colab.super_archives.views.thread', name="thread_view"),
7		- url(r'thread/$',
8		- 'colab.super_archives.views.list_messages', name='thread_list')
	3	+urlpatterns = patterns('super_archives.views',
	4	+# url(r'thread/(?P<thread>\d+)/$', 'thread', name='thread'),
	5	+ url(r'thread/(?P<mailinglist>[-\w]+)/(?P<thread_token>[-\w]+)$', 'thread',
	6	+ name="thread_view"),
	7	+ url(r'thread/$', 'list_messages', name='thread_list')
9	8	)
...	...
1	1	# -- coding: utf-8 --
2	2
	3	+import queries
	4	+
3	5	from django.http import Http404
4	6	from django.template import RequestContext
5	7	from django.core.paginator import Paginator
6	8	from django.core.exceptions import ObjectDoesNotExist
7	9	from django.shortcuts import render_to_response, get_list_or_404
8	10
9		-from colab.super_archives import queries
10		-from colab.super_archives.models import MailingList, Thread
	11	+from .models import MailingList, Thread
11	12
12	13
13	14	def thread(request, mailinglist, thread_token):
...	...