[bug 872538] Move apps from apps/ to kitsune/

.gitmodules

@@ -139,6 +139,6 @@
 [submodule "vendor/src/premailer"]
 	path = vendor/src/premailer
 	url = git://github.com/peterbe/premailer.git
-[submodule "apps/sumo/static/js/libs/ace"]
-	path = apps/sumo/static/js/libs/ace
+[submodule "kitsune/sumo/static/js/libs/ace"]
+	path = kitsune/sumo/static/js/libs/ace
 	url = git://github.com/ajaxorg/ace-builds.git

docs/localization.rst

@@ -301,7 +301,7 @@ Then, all you need to do is run the ``extract_db`` management command::
 
 *Be sure to have a recent database from production when running the command.*
 
-By default, this will write all the strings to `apps/sumo/db_strings.py`
+By default, this will write all the strings to `kitsune/sumo/db_strings.py`
 and they will get picked up during the normal string extraction (see below).
 
 

docs/searchchapter.rst

@@ -251,7 +251,7 @@ Kitsune uses `elasticutils <https://github.com/mozilla/elasticutils>`_
 and `pyelasticsearch
 <http://pyelasticsearch.readthedocs.org/en/latest/>`_.
 
-Most of our code is in the ``search`` app in ``apps/search/``.
+Most of our code is in the ``search`` app in ``kitsune/search/``.
 
 Models in Kitsune that are indexable use ``SearchMixin`` defined in
 ``models.py``.
@@ -355,4 +355,4 @@ Link to the Elastic Search code
 
 Here's a link to the search view in the master branch:
 
-https://github.com/mozilla/kitsune/blob/master/apps/search/views.py
+https://github.com/mozilla/kitsune/blob/master/kitsune/search/views.py

docs/sop.rst

@@ -9,7 +9,7 @@ Occasionally, the localized strings cause the site to break.
 
 For example, this causes the site to break::
 
-    #: apps/questions/templates/questions/includes/answer.html:19
+    #: kitsune/questions/templates/questions/includes/answer.html:19
     msgid "{num} answers"
     msgstr "{0} antwoorden"
 

apps/access/decorators.py → kitsune/access/decorators.py

@@ -8,8 +8,8 @@
 from django.utils.decorators import available_attrs
 from django.utils.http import urlquote
 
-import access
-from sumo.urlresolvers import reverse
+from kitsune import access
+from kitsune.sumo.urlresolvers import reverse
 
 
 def user_access_decorator(redirect_func, redirect_url_func, deny_func=None,

apps/access/helpers.py → kitsune/access/helpers.py

@@ -1,7 +1,7 @@
 import jinja2
 from jingo import register
 
-import access
+from kitsune import access
 
 
 @register.function

apps/access/tests/__init__.py → kitsune/access/tests/__init__.py

@@ -1,13 +1,13 @@
 from django.contrib.auth.models import User
 
-from nose.tools import eq_
 import test_utils
-
-import access
 from authority.models import Permission
-from forums.models import Forum, Thread
-from sumo.tests import TestCase, with_save
-from sumo.urlresolvers import reverse
+from nose.tools import eq_
+
+from kitsune import access
+from kitsune.forums.models import Forum, Thread
+from kitsune.sumo.tests import TestCase, with_save
+from kitsune.sumo.urlresolvers import reverse
 
 
 @with_save

apps/access/tests/test_decorators.py → kitsune/access/tests/test_decorators.py

@@ -1,12 +1,12 @@
 from django.contrib.auth.models import User, AnonymousUser
 from django.http import HttpResponse
 
-from nose.tools import eq_
 import test_utils
+from nose.tools import eq_
 
-from access.decorators import (logout_required, login_required,
-                               permission_required)
-from sumo.tests import TestCase
+from kitsune.access.decorators import (
+    logout_required, login_required, permission_required)
+from kitsune.sumo.tests import TestCase
 
 
 def simple_view(request):

apps/activity/models.py → kitsune/activity/models.py

@@ -5,7 +5,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 
-from sumo.models import ModelBase
+from kitsune.sumo.models import ModelBase
 
 
 class Action(ModelBase):

apps/announcements/admin.py → kitsune/announcements/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from announcements.models import Announcement
+from kitsune.announcements.models import Announcement
 
 
 class AnnouncementAdmin(admin.ModelAdmin):

apps/announcements/models.py → kitsune/announcements/models.py

@@ -5,9 +5,9 @@
 from django.db.models import Q
 from django.db.models.signals import post_save
 
-from sumo.models import ModelBase
-from wiki.models import Locale
-from sumo.helpers import wiki_to_html
+from kitsune.sumo.helpers import wiki_to_html
+from kitsune.sumo.models import ModelBase
+from kitsune.wiki.models import Locale
 
 
 class Announcement(ModelBase):
@@ -75,7 +75,7 @@ def _visible_query(cls, **query_kwargs):
 def connector(sender, instance, created, **kw):
     # Only email new announcements in a group. We don't want to email everyone.
     if created and instance.group:
-        from announcements.tasks import send_group_email
+        from kitsune.announcements.tasks import send_group_email
         now = datetime.now()
         if instance.is_visible():
             send_group_email.delay(instance.pk)

apps/announcements/tasks.py → kitsune/announcements/tasks.py

@@ -7,9 +7,9 @@
 from celery.task import task
 from tower import ugettext as _
 
-from announcements.models import Announcement
-from sumo.email_utils import (make_mail, render_email, safe_translation,
-                              send_messages)
+from kitsune.announcements.models import Announcement
+from kitsune.sumo.email_utils import (
+    make_mail, render_email, safe_translation, send_messages)
 
 
 @task

apps/announcements/tests/__init__.py → kitsune/announcements/tests/__init__.py

@@ -1,8 +1,8 @@
 from datetime import datetime, timedelta
 
-from announcements.models import Announcement
-from sumo.tests import with_save
-from users.tests import user
+from kitsune.announcements.models import Announcement
+from kitsune.sumo.tests import with_save
+from kitsune.users.tests import user
 
 
 @with_save

apps/announcements/tests/test_models.py → kitsune/announcements/tests/test_models.py

@@ -2,11 +2,11 @@
 
 from nose.tools import eq_
 
-from announcements.models import Announcement
-from announcements.tests import announcement
-from sumo.tests import TestCase
-from users.tests import user, group, profile
-from wiki.tests import locale
+from kitsune.announcements.models import Announcement
+from kitsune.announcements.tests import announcement
+from kitsune.sumo.tests import TestCase
+from kitsune.users.tests import user, group, profile
+from kitsune.wiki.tests import locale
 
 
 class AnnouncementModelTests(TestCase):

apps/announcements/tests/test_tasks.py → kitsune/announcements/tests/test_tasks.py

@@ -4,10 +4,10 @@
 import mock
 from nose.tools import eq_
 
-from announcements.tasks import send_group_email
-from announcements.tests import announcement
-from sumo.tests import TestCase
-from users.tests import user, group, profile
+from kitsune.announcements.tasks import send_group_email
+from kitsune.announcements.tests import announcement
+from kitsune.sumo.tests import TestCase
+from kitsune.users.tests import user, group, profile
 
 
 class AnnouncementSaveTests(TestCase):

apps/announcements/tests/test_views.py → kitsune/announcements/tests/test_views.py

@@ -2,12 +2,12 @@
 
 from nose.tools import eq_
 
-from announcements.models import Announcement
-from announcements.tests import announcement
-from sumo.tests import TestCase
-from sumo.urlresolvers import reverse
-from users.tests import user, add_permission
-from wiki.tests import locale
+from kitsune.announcements.models import Announcement
+from kitsune.announcements.tests import announcement
+from kitsune.sumo.tests import TestCase
+from kitsune.sumo.urlresolvers import reverse
+from kitsune.users.tests import user, add_permission
+from kitsune.wiki.tests import locale
 
 
 class TestCreateLocaleAnnouncement(TestCase):

apps/announcements/urls.py → kitsune/announcements/urls.py

@@ -1,7 +1,7 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns('announcements.views',
+urlpatterns = patterns('kitsune.announcements.views',
     url(r'^/create/locale$', 'create_for_locale',
         name='announcements.create_for_locale'),
     url(r'^/(?P<announcement_id>\d+)/delete$', 'delete',

apps/announcements/views.py → kitsune/announcements/views.py

@@ -3,11 +3,11 @@
 from django.http import HttpResponse, HttpResponseForbidden
 from django.shortcuts import get_object_or_404
 from django.views.decorators.http import require_POST
-from access.decorators import login_required
 
-from announcements.forms import AnnouncementForm
-from announcements.models import Announcement
-from wiki.models import Locale
+from kitsune.access.decorators import login_required
+from kitsune.announcements.forms import AnnouncementForm
+from kitsune.announcements.models import Announcement
+from kitsune.wiki.models import Locale
 
 
 @require_POST

apps/customercare/admin.py → kitsune/customercare/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from customercare.models import Tweet, Reply
+from kitsune.customercare.models import Tweet, Reply
 
 
 class TweetAdmin(admin.ModelAdmin):

apps/customercare/cron.py → kitsune/customercare/cron.py

@@ -9,13 +9,13 @@
 from django.db.utils import IntegrityError
 
 import cronjobs
-from multidb.pinning import pin_this_thread
 import tweepy
-from tweepy.parsers import RawParser
-from sumo.redis_utils import redis_client, RedisError
+from multidb.pinning import pin_this_thread
 from statsd import statsd
+from tweepy.parsers import RawParser
 
-from customercare.models import Tweet, Reply
+from kitsune.customercare.models import Tweet, Reply
+from kitsune.sumo.redis_utils import redis_client, RedisError
 
 
 LINK_REGEX = re.compile('https?\:', re.IGNORECASE)

apps/customercare/helpers.py → kitsune/customercare/helpers.py

@@ -2,10 +2,10 @@
 
 from django.conf import settings
 
-from jingo import register
 import pytz
+from jingo import register
 
-from sumo.helpers import timesince
+from kitsune.sumo.helpers import timesince
 
 
 @register.filter

apps/customercare/models.py → kitsune/customercare/models.py

@@ -4,7 +4,7 @@
 from django.contrib.auth.models import User
 from django.db import models
 
-from sumo.models import ModelBase
+from kitsune.sumo.models import ModelBase
 
 
 class Tweet(ModelBase):

apps/customercare/replies.py → kitsune/customercare/replies.py

@@ -2,7 +2,7 @@
 
 from pyquery import PyQuery
 
-from wiki.models import Document
+from kitsune.wiki.models import Document
 
 
 REPLIES_DOCUMENT_SLUG = 'army-of-awesome-common-replies'

apps/customercare/tests/__init__.py → kitsune/customercare/tests/__init__.py

@@ -1,8 +1,8 @@
 import json
 from datetime import datetime
 
-from customercare.models import Tweet, Reply
-from sumo.tests import with_save
+from kitsune.customercare.models import Tweet, Reply
+from kitsune.sumo.tests import with_save
 
 
 next_tweet_id = 1

apps/customercare/tests/test_cron.py → kitsune/customercare/tests/test_cron.py

@@ -10,12 +10,13 @@
 from nose import SkipTest
 from nose.tools import eq_
 
-from customercare.tests import tweet, reply
-from customercare.cron import (_filter_tweet, _get_oldest_tweet, purge_tweets,
-                               get_customercare_stats)
-from customercare.models import Tweet, Reply
-from sumo.tests import TestCase
-from sumo.redis_utils import redis_client, RedisError
+from kitsune.customercare.cron import (
+    _filter_tweet, _get_oldest_tweet, purge_tweets, get_customercare_stats)
+from kitsune.customercare.models import Tweet, Reply
+from kitsune.customercare.tests import tweet, reply
+from kitsune.sumo.redis_utils import redis_client, RedisError
+from kitsune.sumo.tests import TestCase
+
 
 
 class TwitterCronTestCase(TestCase):

apps/customercare/tests/test_helpers.py → kitsune/customercare/tests/test_helpers.py

@@ -2,8 +2,8 @@
 
 from nose.tools import eq_
 
-from customercare.helpers import isotime, round_percent, utctimesince
-from sumo.tests import TestCase
+from kitsune.customercare.helpers import isotime, round_percent, utctimesince
+from kitsune.sumo.tests import TestCase
 
 
 def test_isotime():

apps/customercare/tests/test_models.py → kitsune/customercare/tests/test_models.py

@@ -1,8 +1,8 @@
 from nose.tools import eq_, raises
 
-from customercare.models import Tweet
-from customercare.tests import tweet
-from sumo.tests import TestCase
+from kitsune.customercare.models import Tweet
+from kitsune.customercare.tests import tweet
+from kitsune.sumo.tests import TestCase
 
 
 class TweetTests(TestCase):

apps/customercare/tests/test_templates.py → kitsune/customercare/tests/test_templates.py

@@ -6,10 +6,10 @@
 from nose.tools import eq_
 from pyquery import PyQuery as pq
 
-from customercare.replies import REPLIES_DOCUMENT_SLUG
-from sumo.urlresolvers import reverse
-from sumo.tests import TestCase
-from wiki.tests import document, revision
+from kitsune.customercare.replies import REPLIES_DOCUMENT_SLUG
+from kitsune.sumo.tests import TestCase
+from kitsune.sumo.urlresolvers import reverse
+from kitsune.wiki.tests import document, revision
 
 
 CANNED_RESPONSES_WIKI = """
@@ -133,7 +133,7 @@ class StatsTests(TestCase):
 
     def test_contributors(self):
         """Only contributors stats are set."""
-        with open('apps/customercare/tests/stats.json') as f:
+        with open('kitsune/customercare/tests/stats.json') as f:
             json_data = json.load(f)
 
         cache.set(settings.CC_TOP_CONTRIB_CACHE_KEY,