From 7b17322843c9e777f619e499889691b84ccc973f Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Fri, 12 Jul 2013 18:47:53 -0300
Subject: [PATCH] Moving super_archives stuff

---
 src/super_archives/admin.py                             |  2 +-
 src/super_archives/forms.py                             |  4 ++--
 src/super_archives/management/commands/import_emails.py |  6 ++----
 src/super_archives/queries.py                           |  2 +-
 src/super_archives/urls.py                              | 11 +++++------
 src/super_archives/views.py                             |  5 +++--
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/super_archives/admin.py b/src/super_archives/admin.py
index 12d9c15..113a6ff 100644
--- a/src/super_archives/admin.py
+++ b/src/super_archives/admin.py
@@ -1,6 +1,6 @@
 
 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', )
diff --git a/src/super_archives/forms.py b/src/super_archives/forms.py
index d061cda..bfad8ec 100644
--- a/src/super_archives/forms.py
+++ b/src/super_archives/forms.py
@@ -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 
diff --git a/src/super_archives/management/commands/import_emails.py b/src/super_archives/management/commands/import_emails.py
index cfffb5a..c2807f1 100644
--- a/src/super_archives/management/commands/import_emails.py
+++ b/src/super_archives/management/commands/import_emails.py
@@ -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):
diff --git a/src/super_archives/queries.py b/src/super_archives/queries.py
index 2ef00ff..810f19c 100644
--- a/src/super_archives/queries.py
+++ b/src/super_archives/queries.py
@@ -1,6 +1,6 @@
 
 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():
diff --git a/src/super_archives/urls.py b/src/super_archives/urls.py
index 3676ac1..3bf6cbc 100644
--- a/src/super_archives/urls.py
+++ b/src/super_archives/urls.py
@@ -1,9 +1,8 @@
 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')
 )
diff --git a/src/super_archives/views.py b/src/super_archives/views.py
index db169ef..759469d 100644
--- a/src/super_archives/views.py
+++ b/src/super_archives/views.py
@@ -1,13 +1,14 @@
 # -*- 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):
--
libgit2 0.21.2