remove 'knesset.' from imports. move project files to dir knesset. re…

…name template tag libraries of important apps to *_tags.

buildout.cfg

@@ -141,12 +141,11 @@ wsgi = true
 project = knesset
 projectegg = knesset
 settings = settings
-testsettings = testsettings
-eggs = ${buildout:eggs} 
+eggs = ${buildout:eggs}
 test =
-    knesset.mks knesset.user knesset.laws knesset.links knesset.committees
-    knesset.agendas knesset.auxiliary knesset.simple knesset.api knesset.events
-    knesset.video
+    mks user laws links committees
+    agendas auxiliary simple apis events
+    video
 
 extra-paths =
     ${django-piston:location}
@@ -202,7 +201,7 @@ recipe = collective.recipe.cmd
 on_install = true
 on_update = true
 cmds =
-    git log --pretty=format:"Code Commit: %H <br>Last Update: %cd" -n 1 > src/knesset/templates/last_build.txt
+    git log --pretty=format:"Code Commit: %H <br>Last Update: %cd" -n 1 > src/knesset/knesset/templates/last_build.txt
 
 [sphinx]
 recipe = zc.recipe.egg

src/knesset/agendas/admin.py

@@ -1,4 +1,4 @@
-from knesset.agendas.models import *
+from models import Agenda, AgendaVote
 
 from django.contrib import admin
 

src/knesset/agendas/api.py

@@ -5,9 +5,9 @@
 from avatar.templatetags.avatar_tags import avatar_url
 from django.contrib.auth.models import User
 
-from knesset.agendas.models import Agenda, AgendaVote
-from knesset.api.resources.base import BaseResource
-from knesset.mks.models import Member, Party
+from models import Agenda, AgendaVote
+from apis.resources.base import BaseResource
+from mks.models import Member, Party
 
 
 class UserResource(BaseResource):

src/knesset/agendas/listeners.py

@@ -6,9 +6,8 @@
 from actstream import action
 from actstream.models import Follow
 from knesset.utils import cannonize, disable_for_loaddata
-from knesset.agendas.models import AgendaVote, AgendaMeeting, AgendaBill
-from knesset.agendas.models import Agenda
-from knesset.links.models import Link, LinkType
+from agendas.models import AgendaVote, AgendaMeeting, AgendaBill, Agenda
+from links.models import Link, LinkType
 
 @disable_for_loaddata
 def record_agenda_ascription_action(sender, created, instance, **kwargs):

src/knesset/agendas/templatetags/agendas.py → src/knesset/agendas/templatetags/agendas_tags.py

@@ -2,12 +2,12 @@
 
 from django import template
 from django.conf import settings
-from knesset.links.models import Link
-from knesset.agendas.models import (Agenda, AgendaVote, AgendaMeeting,
-                                    AgendaBill, Party,
-                                    UserSuggestedVote)
-from knesset.agendas.forms import (VoteLinkingForm, VoteLinkingFormSet,
-                                   MeetingLinkingFormSet)
+from links.models import Link
+from agendas.models import (Agenda, AgendaVote, AgendaMeeting,
+                            AgendaBill, Party,
+                            UserSuggestedVote)
+from agendas.forms import (VoteLinkingForm, VoteLinkingFormSet,
+                           MeetingLinkingFormSet)
 from django.core.cache import cache
 
 register = template.Library()

src/knesset/agendas/tests.py

@@ -9,9 +9,9 @@
 from django.conf import settings
 
 from models import Agenda, AgendaVote
-from knesset.laws.models import Vote, VoteAction
-from knesset.mks.models import Party, Member
-from knesset.committees.models import Committee, CommitteeMeeting
+from laws.models import Vote, VoteAction
+from mks.models import Party, Member
+from committees.models import Committee, CommitteeMeeting
 just_id = lambda x: x.id
 
 class SimpleTest(TestCase):

src/knesset/agendas/views.py

@@ -12,10 +12,10 @@
 from django.core.urlresolvers import reverse
 from django.core.cache import cache
 
-from knesset.hashnav import DetailView, ListView, method_decorator
-from knesset.laws.models import Vote
-from knesset.mks.models import Member, Party
-from knesset.api.urls import vote_handler
+from hashnav import DetailView, ListView, method_decorator
+from laws.models import Vote
+from mks.models import Member, Party
+from apis.urls import vote_handler
 
 from forms import (EditAgendaForm, AddAgendaForm, VoteLinkingFormSet,
                    MeetingLinkingFormSet)

src/knesset/api/handlers.py → src/knesset/apis/handlers.py

@@ -1,5 +1,4 @@
-import datetime
-import urllib
+import datetime, urllib, math
 from operator import attrgetter
 from django.db.models import Q
 from django.contrib.contenttypes.models import ContentType
@@ -8,14 +7,13 @@
 from django.db.models import Count
 from piston.handler import BaseHandler
 from piston.utils import rc
-from knesset.mks.models import Member, Party, Membership
-from knesset.laws.models import Vote, VoteAction, Bill, KnessetProposal, GovProposal
-from knesset.agendas.models import Agenda
-from knesset.committees.models import Committee, CommitteeMeeting
-from knesset.links.models import Link
+from mks.models import Member, Party, Membership
+from laws.models import Vote, VoteAction, Bill, KnessetProposal, GovProposal
+from agendas.models import Agenda
+from committees.models import Committee, CommitteeMeeting
+from links.models import Link
 from tagging.models import Tag, TaggedItem
-from knesset.events.models import Event
-import math
+from events.models import Event
 from django.forms import model_to_dict
 
 DEFAULT_PAGE_LEN = 20

src/knesset/api/tests.py → src/knesset/apis/tests.py

@@ -4,11 +4,11 @@
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.models import User, Group, Permission
 from tagging.models import Tag, TaggedItem
-from knesset.laws.models import Vote, VoteAction, Bill, Law
-from knesset.mks.models import Member,Party,WeeklyPresence
-from knesset.agendas.models import Agenda
-from knesset.committees.models import Committee
-from knesset.events.models import Event
+from laws.models import Vote, VoteAction, Bill, Law
+from mks.models import Member,Party,WeeklyPresence
+from agendas.models import Agenda
+from committees.models import Committee
+from events.models import Event
 from django.utils import simplejson as json
 from django.core import cache
 

src/knesset/api/urls.py → src/knesset/apis/urls.py

@@ -2,7 +2,7 @@
 from piston.resource import Resource
 from django.views.decorators.cache import cache_page
 
-from knesset.api.handlers import *
+from handlers import *
 
 from resources import v2_api
 
@@ -38,8 +38,8 @@
       url(r'^event/$', event_handler, name='event-handler'),
       url(r'^event/(?P<id>[0-9]+)/$', event_handler, name='event-handler'),
       # NOTE: this view is not in the api application, but in the events application
-      url(r'^event/icalendar/$', 'knesset.events.views.icalendar', name='event-icalendar'),
-      url(r'^event/icalendar/(?P<summary_length>\d+)/$', 'knesset.events.views.icalendar', name='event-icalendar'),
+      url(r'^event/icalendar/$', 'events.views.icalendar', name='event-icalendar'),
+      url(r'^event/icalendar/(?P<summary_length>\d+)/$', 'events.views.icalendar', name='event-icalendar'),
       (r'^', include(v2_api.urls)),
       )
 

src/knesset/auxiliary/templatetags/search.py

@@ -1,7 +1,7 @@
 from django import template
 from django.core import urlresolvers
 from django.conf import settings
-from knesset.auxiliary.forms import SearchForm
+from auxiliary.forms import SearchForm
 
 register = template.Library()
 

src/knesset/auxiliary/tests.py

@@ -7,12 +7,12 @@
 from django.utils import translation
 from django.conf import settings
 from tagging.models import Tag,TaggedItem
-from knesset.laws.models import Vote, VoteAction, Bill
-from knesset.mks.models import Member,Party,WeeklyPresence
-from knesset.agendas.models import Agenda
+from laws.models import Vote, VoteAction, Bill
+from mks.models import Member,Party,WeeklyPresence
+from agendas.models import Agenda
 from knesset.sitemap import sitemaps
 from django.utils import simplejson as json
-from knesset.auxiliary.views import CsvView
+from auxiliary.views import CsvView
 
 class InternalLinksTest(TestCase):
 

src/knesset/auxiliary/views.py

@@ -1,5 +1,4 @@
-import csv
-import random
+import csv, random, tagging, logging
 from operator import attrgetter
 from django.template import RequestContext
 from django.shortcuts import render_to_response, get_object_or_404
@@ -11,25 +10,21 @@
     HttpResponse, HttpResponseNotAllowed, HttpResponseBadRequest, Http404
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.contenttypes.models import ContentType
-import tagging
-from actstream import action
-from actstream.models import Action
-from knesset.mks.models import Member
-from knesset.laws.models import Vote,Bill
-from knesset.committees.models import Topic, CommitteeMeeting
-from tagging.models import Tag, TaggedItem
-from annotatetext.views import post_annotation as annotatetext_post_annotation
-from annotatetext.models import Annotation
 from django.views.generic.base import TemplateView
 from django.views.generic.detail import DetailView
 from django.views.generic.list import BaseListView
 from django.views.generic.list import ListView
 from django.contrib.comments.models import Comment
+from actstream import action
+from actstream.models import Action
+from mks.models import Member
+from laws.models import Vote, Bill, get_debated_bills
+from committees.models import Topic, CommitteeMeeting, PUBLIC_TOPIC_STATUS
+from tagging.models import Tag, TaggedItem
+from annotatetext.views import post_annotation as annotatetext_post_annotation
+from annotatetext.models import Annotation
 from knesset.utils import notify_responsible_adult, main_actions
-from knesset.committees.models import PUBLIC_TOPIC_STATUS
-from knesset.laws.models import get_debated_bills
 
-import logging
 logger = logging.getLogger("open-knesset.auxiliary.views")
 
 def help_page(request):

src/knesset/badges/__init__.py

@@ -1 +0,0 @@
-from handlers import *

src/knesset/badges/handlers.py

@@ -5,28 +5,28 @@
 from actstream import action
 from actstream.models import Follow
 
-from knesset.user.models import UserProfile
-from knesset.mks.models import Member
-from knesset.badges.models import Badge, BadgeType
+from user.models import UserProfile
+from mks.models import Member
+from models import Badge, BadgeType
 
 class BadgeHandler(object):
     def __init__(self, badge_name, badge_description):
         self.badge_name = badge_name
         self.badge_description = badge_description
-    
+
     def __call__(self, sender, **kwargs):
         if self.test(sender, **kwargs):
             profile = self.get_profile(sender, **kwargs)
-            self.create_badge(profile)  
-    
+            self.create_badge(profile)
+
     def test(self, sender, **kwargs):
         """Has user reached achivment criteria for this badge"""
         return False
 
     def get_profile(self, sender, **kwargs):
         """Get user profile"""
         return None
-        
+
     def create_badge(self, profile):
         """Create badge, if not exist"""
         try:
@@ -37,29 +37,29 @@ def create_badge(self, profile):
         except BadgeType.DoesNotExist:
             badge_type = BadgeType.objects.create(name=self.badge_name, description=self.badge_description)
         if Badge.objects.filter(profile = profile, badge_type = badge_type).count()==0:
-            badge = Badge.objects.create(profile = profile, badge_type = badge_type)        
+            badge = Badge.objects.create(profile = profile, badge_type = badge_type)
             action.send(profile.user, verb='got badge', target=badge)
             ugettext('got badge') # so we'll have a translation for this
 
 class PostFollowSaveHandler(BadgeHandler):
     def get_profile(self, sender, **kwargs):
         instance = kwargs.get('instance',None)
         return instance.user.profiles.all()[0]
-        
+
 class FirstFollowHandler(PostFollowSaveHandler):
     """
     First Follow Badge is a badge you get when you follow something for the first time
-    """    
+    """
     def __init__(self):
-        name = u'FirstFollow' 
-        description = u'You are following something' 
+        name = u'FirstFollow'
+        description = u'You are following something'
         super(FirstFollowHandler, self).__init__(badge_name=name, badge_description=description)
 
-        # These two lines make sure translation identifies these strings        
+        # These two lines make sure translation identifies these strings
         ugettext(u'FirstFollow')
         ugettext(u'You are following something')
-                
-        
+
+
     def test(self, sender, **kwargs):
         return True # on each follow, this achivment is granted
 
@@ -70,18 +70,18 @@ def first_follow_handler(sender, **kwargs):
 class FirstFollowMKHandler(FirstFollowHandler):
     """
     First Follow Badge is a badge you get when you follow an MK.
-    """   
+    """
     def __init__(self):
-        
+
         name = u'FirstMKFollow'
         description = u'You are following an MK'
         super(FirstFollowHandler, self).__init__(badge_name=name, badge_description=description)
-        
+
         # These two lines make sure translation identifies these strings
         ugettext(u'FirstMKFollow')
         ugettext(u'You are following an MK')
-        
-    
+
+
     def test(self, sender, **kwargs):
         instance = kwargs.get('instance',None)
         return instance is not None and isinstance(instance.actor, Member)

src/knesset/badges/models.py

@@ -3,7 +3,7 @@
 from django.db import models
 from django.utils.translation import ugettext as _
 
-from knesset.user.models import UserProfile
+from user.models import UserProfile
 
 class BadgeType(models.Model):
     name = models.CharField(max_length=100, unique=True)
@@ -31,3 +31,5 @@ def __unicode__(self):
     class Meta:
         unique_together=('profile','badge_type')
         ordering = ('profile', 'badge_type')
+
+from handlers import *

src/knesset/badges/urls.py

@@ -1,10 +1,10 @@
 from django.conf.urls.defaults import *
-from knesset.badges.views import *
+from views import BadgeTypeDetailView, BadgeTypeListView
 
 detail_view = BadgeTypeDetailView.as_view()
 list_view = BadgeTypeListView()
 
 urlpatterns = patterns('',
-    url(r'^$',list_view,name='all-badge-list'),
-    url(r'^(?P<pk>\d+)/$',detail_view,name='badge-detail'),
+    url(r'^$', list_view, name='all-badge-list'),
+    url(r'^(?P<pk>\d+)/$', detail_view, name='badge-detail'),
 )

src/knesset/badges/views.py

@@ -1,9 +1,8 @@
 from django.views.generic.list_detail import object_list
 from django.db.models import Count
 
-from knesset.hashnav import DetailView, ListView
-from knesset.badges.models import Badge, BadgeType
-
+from hashnav import DetailView, ListView
+from models import Badge, BadgeType
 
 class BadgeTypeDetailView(DetailView):
     model = BadgeType
@@ -17,4 +16,3 @@ def get_context_data(self, *args, **kwargs):
 class BadgeTypeListView(ListView):
     queryset = BadgeType.objects.all().annotate(amount=Count('badges')).order_by('-amount')
     template_name = 'badges/all_badge_list.html'
-

src/knesset/committees/admin.py

@@ -1,9 +1,8 @@
 from django.contrib.contenttypes.generic import GenericTabularInline
-from knesset.committees.models import *
-from knesset.video.models import Video
 from django.db.models import Q
-
 from django.contrib import admin
+from video.models import Video
+from models import *
 
 class CommitteeRelatedVideosInline(generic.GenericTabularInline):
     model = Video