Merge branch 'master' of git.neuf.no:dusken

dusken/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from main.models import Member
+from dusken.models import Member
 
 class MemberAdmin(admin.ModelAdmin):
     fieldsets = [

dusken/api/group.py

@@ -1,6 +1,6 @@
 from tastypie.authorization import Authorization
 from tastypie.resources import ModelResource, ALL
-from main.models import Group
+from dusken.models import Group
 
 
 class GroupResource(ModelResource):

dusken/api/groupsbymember.py

@@ -2,7 +2,7 @@ from tastypie import fields
 from tastypie.authorization import Authorization
 from tastypie.bundle import Bundle
 from tastypie.resources import Resource
-from main.models import Member, Group
+from dusken.models import Member, Group
 
 class GroupsByMemberObject(object):
     def __init__(self):

dusken/api/member.py

@@ -4,7 +4,7 @@ from tastypie.authorization import Authorization
 from tastypie.exceptions import ImmediateHttpResponse
 from tastypie.http import HttpForbidden
 from tastypie.resources import ModelResource, ALL
-from main.models import *
+from dusken.models import *
 
 
 class MemberResource(ModelResource):

dusken/api/membersbygroup.py

@@ -2,7 +2,7 @@ from tastypie import fields
 from tastypie.authorization import Authorization
 from tastypie.bundle import Bundle
 from tastypie.resources import Resource
-from main.models import Member, Group
+from dusken.models import Member, Group
 
 class MembersByGroupObject(object):
     def __init__(self):

dusken/api/membership.py

@@ -1,8 +1,8 @@
 from tastypie import fields
 from tastypie.resources import ModelResource, ALL, ALL_WITH_RELATIONS
 from tastypie.authorization import Authorization
-from main.api.member import MemberResource
-from main.models import *
+from dusken.api.member import MemberResource
+from dusken.models import *
 
 
 class MembershipResource(ModelResource):

dusken/dusken/urls.py

@@ -1,10 +0,0 @@
-from django.conf.urls import patterns, include, url
-from django.contrib import admin
-admin.autodiscover()
-
-urlpatterns = patterns('',
-    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    url(r'^admin/', include(admin.site.urls)),
-
-    url(r'^', include('main.urls')),
-)

dusken/main/urls.py

@@ -1,18 +0,0 @@
-from django.conf.urls.defaults import *
-from tastypie.api import Api
-from main.api.member import MemberResource
-from main.api.membership import MembershipResource
-from main.api.group import GroupResource
-from main.api.groupsbymember import GroupsByMemberResource
-from main.api.membersbygroup import MembersByGroupResource
-
-v1_api = Api(api_name='v1')
-v1_api.register(MemberResource())
-v1_api.register(MembershipResource())
-v1_api.register(GroupResource())
-v1_api.register(GroupsByMemberResource())
-v1_api.register(MembersByGroupResource())
-
-urlpatterns = patterns('',
-    (r'^api/', include(v1_api.urls)),
-)

dusken/settings-sample.py

@@ -117,12 +117,12 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'django.contrib.admindocs',
-    'main',
+    'dusken',
     'tastypie'
 )
 
 # Profile of the User class used for authentication.
-AUTH_PROFILE_MODULE = 'main.Member'
+AUTH_PROFILE_MODULE = 'dusken.Member'
 
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to

dusken/tests/group.py

@@ -1,7 +1,7 @@
 import logging
 
 from support.test import ResourceTestCase
-from main.models import Group
+from dusken.models import Group
 
 class GroupTest(ResourceTestCase):
 	fixtures = [ 'testdata.json' ]

dusken/tests/member.py

@@ -1,7 +1,7 @@
 import logging
 
 from support.test import ResourceTestCase
-from main.models import Member
+from dusken.models import Member
 
 class MemberTest(ResourceTestCase):
     def assertValidMemberData(self, member):

dusken/tests/membersbygroup.py

@@ -1,7 +1,7 @@
 import logging
 
 from support.test import ResourceTestCase
-from main.models import Group, Member
+from dusken.models import Group, Member
 
 class MembersByGroupTest(ResourceTestCase):
 	def setUp(self):

dusken/urls.py

@@ -0,0 +1,25 @@
+from django.conf.urls.defaults import *
+from django.conf.urls import patterns, include, url
+from django.contrib import admin
+from tastypie.api import Api
+
+from dusken.api.member import MemberResource
+from dusken.api.membership import MembershipResource
+from dusken.api.group import GroupResource
+from dusken.api.groupsbymember import GroupsByMemberResource
+from dusken.api.membersbygroup import MembersByGroupResource
+
+admin.autodiscover()
+
+v1_api = Api(api_name='v1')
+v1_api.register(MemberResource())
+v1_api.register(MembershipResource())
+v1_api.register(GroupResource())
+v1_api.register(GroupsByMemberResource())
+v1_api.register(MembersByGroupResource())
+
+urlpatterns = patterns('',
+    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+    url(r'^admin/', include(admin.site.urls)),
+    url(r'^api/', include(v1_api.urls)),
+)

requirements.txt

@@ -1,10 +1,7 @@
 Django==1.5
 MySQL-python==1.2.4
 South==0.7.6
-argparse==1.2.1
-distribute==0.6.34
 django-tastypie==0.9.14
-mimeparse==0.1.3
 psycopg2==2.4.5
 python-dateutil==1.5
-wsgiref==0.1.2
+django-extensions==1.1.1