remove addons and core directories - all apps go to apps

tendenci/apps/accountings/app_registry.py

@@ -1,5 +1,5 @@
-from tendenci.core.registry import site
-from tendenci.core.registry.base import LogRegistry, lazy_reverse
+from tendenci.apps.registry import site
+from tendenci.apps.registry.base import LogRegistry, lazy_reverse
 from tendenci.apps.accountings.models import Acct
 
 

tendenci/apps/accountings/management/commands/correct_membership_acct_number.py

@@ -11,7 +11,7 @@ class Command(BaseCommand):
     """
 
     def handle(self, *args, **options):
-        from tendenci.addons.memberships.models import MembershipDefault
+        from tendenci.apps.memberships.models import MembershipDefault
         from tendenci.apps.invoices.models import Invoice
         from tendenci.apps.accountings.models import Acct, AcctEntry
 

tendenci/apps/accounts/app_registry.py

@@ -1,6 +1,6 @@
 from django.contrib.auth.models import User
-from tendenci.core.registry import site
-from tendenci.core.registry.base import LogRegistry, lazy_reverse
+from tendenci.apps.registry import site
+from tendenci.apps.registry.base import LogRegistry, lazy_reverse
 
 class AccountRegistry(LogRegistry):
     """User related logs

tendenci/apps/accounts/forms.py

@@ -17,9 +17,9 @@
 from tendenci.apps.registration.forms import RegistrationForm
 from tendenci.apps.profiles.models import Profile
 from tendenci.apps.registration.models import RegistrationProfile
-from tendenci.core.site_settings.utils import get_setting
+from tendenci.apps.site_settings.utils import get_setting
 from tendenci.apps.accounts.utils import send_registration_activation_email
-from tendenci.core.base.utils import create_salesforce_contact
+from tendenci.apps.base.utils import create_salesforce_contact
 
 
 class SetPasswordCustomForm(SetPasswordForm):

tendenci/apps/accounts/utils.py

@@ -8,7 +8,7 @@ def send_registration_activation_email(user, registration_profile, **kwargs):
     from django.core.mail import send_mail
     from django.template.loader import render_to_string
     from django.conf import settings
-    from tendenci.core.site_settings.utils import get_setting
+    from tendenci.apps.site_settings.utils import get_setting
 
     event = kwargs.pop('event', None)
     event_url = None

tendenci/apps/accounts/views.py

@@ -10,9 +10,9 @@
 from django.contrib.auth.models import User
 from tendenci.apps.registration.forms import RegistrationForm
 from forms import LoginForm
-from tendenci.core.event_logs.models import EventLog
-from tendenci.core.site_settings.utils import get_setting
-from tendenci.core.base.decorators import ssl_required
+from tendenci.apps.event_logs.models import EventLog
+from tendenci.apps.site_settings.utils import get_setting
+from tendenci.apps.base.decorators import ssl_required
 from tendenci.apps.accounts.forms import PasswordResetForm
 
 
@@ -140,7 +140,7 @@ class as the ``form_class`` keyword argument. The form class you
             # This is for including a link in the reg email back to the event viewed
             event = None
             if event_id: # the user signed up via an event
-                from tendenci.addons.events.models import Event
+                from tendenci.apps.events.models import Event
                 event = get_object_or_404(Event, pk=event_id)
 
             new_user = form.save(profile_callback=profile_callback, event=event)

tendenci/addons/announcements/admin.py → tendenci/apps/announcements/admin.py

@@ -1,9 +1,9 @@
 from django.contrib import admin
 
-from tendenci.core.perms.admin import TendenciBaseModelAdmin
+from tendenci.apps.perms.admin import TendenciBaseModelAdmin
 
-from tendenci.addons.announcements.forms import EmergencyAnnouncementAdminForm
-from tendenci.addons.announcements.models import EmergencyAnnouncement
+from tendenci.apps.announcements.forms import EmergencyAnnouncementAdminForm
+from tendenci.apps.announcements.models import EmergencyAnnouncement
 
 
 class EmergencyAnnouncementAdmin(TendenciBaseModelAdmin):

tendenci/addons/announcements/forms.py → tendenci/apps/announcements/forms.py

@@ -1,8 +1,8 @@
 from django import forms
 from tinymce.widgets import TinyMCE
 
-from tendenci.addons.announcements.models import EmergencyAnnouncement
-from tendenci.core.perms.forms import TendenciBaseForm
+from tendenci.apps.announcements.models import EmergencyAnnouncement
+from tendenci.apps.perms.forms import TendenciBaseForm
 
 
 class EmergencyAnnouncementAdminForm(TendenciBaseForm):

tendenci/addons/announcements/managers.py → tendenci/apps/announcements/managers.py

@@ -1,4 +1,4 @@
-from tendenci.core.perms.managers import TendenciBaseManager
+from tendenci.apps.perms.managers import TendenciBaseManager
 
 class EmergencyAnnouncementManager(TendenciBaseManager):
     """

tendenci/addons/announcements/models.py → tendenci/apps/announcements/models.py

@@ -2,9 +2,9 @@
 from django.db import models
 from tinymce import models as tinymce_models
 
-from tendenci.addons.announcements.managers import EmergencyAnnouncementManager
-from tendenci.core.perms.models import TendenciBaseModel
-from tendenci.core.perms.object_perms import ObjectPermission
+from tendenci.apps.announcements.managers import EmergencyAnnouncementManager
+from tendenci.apps.perms.models import TendenciBaseModel
+from tendenci.apps.perms.object_perms import ObjectPermission
 
 
 class EmergencyAnnouncement(TendenciBaseModel):

tendenci/addons/announcements/templatetags/announcement_tags.py → tendenci/apps/announcements/templatetags/announcement_tags.py

@@ -1,8 +1,8 @@
 from django.template import Library
 
-from tendenci.addons.announcements.models import EmergencyAnnouncement
-from tendenci.core.perms.utils import get_query_filters
-from tendenci.core.site_settings.utils import get_setting
+from tendenci.apps.announcements.models import EmergencyAnnouncement
+from tendenci.apps.perms.utils import get_query_filters
+from tendenci.apps.site_settings.utils import get_setting
 
 register = Library()
 

tendenci/core/api/views.py → tendenci/apps/api/views.py

@@ -48,19 +48,19 @@ def api_rp(request):
 
     method = data.get('api_method', '')
     if method == 'api_rp_setup':
-        from tendenci.addons.recurring_payments.utils import api_rp_setup
+        from tendenci.apps.recurring_payments.utils import api_rp_setup
         success, ret_data = api_rp_setup(data)
     else:
         return  HttpResponse('')
 
 #    if method == 'api_add_rp':
-#        from tendenci.addons.recurring_payments.utils import api_add_rp
+#        from tendenci.apps.recurring_payments.utils import api_add_rp
 #        success, ret_data = api_add_rp(data)
 #    elif method == 'api_get_rp_token':
-#        from tendenci.addons.recurring_payments.utils import api_get_rp_token
+#        from tendenci.apps.recurring_payments.utils import api_get_rp_token
 #        success, ret_data = api_get_rp_token(data)
 #    elif method == 'api_verify_rp_payment_profile':
-#        from tendenci.addons.recurring_payments.utils import api_verify_rp_payment_profile
+#        from tendenci.apps.recurring_payments.utils import api_verify_rp_payment_profile
 #        success, ret_data = api_verify_rp_payment_profile(data)
 #    else:
 #        return  HttpResponse('')

tendenci/core/api_tasty/api.py → tendenci/apps/api_tasty/api.py

@@ -3,7 +3,7 @@
 from tastypie.utils.mime import determine_format, build_content_type
 from tastypie.api import Api
 from tastypie.exceptions import BadRequest
-from tendenci.core.api_tasty.serializers import SafeSerializer
+from tendenci.apps.api_tasty.serializers import SafeSerializer
 
 class SafeApi(Api):
     """

tendenci/core/api_tasty/discounts/resources.py → tendenci/apps/api_tasty/discounts/resources.py

@@ -1,4 +1,4 @@
-from tendenci.core.api_tasty.resources import TendenciResource
+from tendenci.apps.api_tasty.resources import TendenciResource
 from tendenci.apps.discounts.models import Discount
 
 class DiscountResource(TendenciResource):

tendenci/core/api_tasty/entities/resources.py → tendenci/apps/api_tasty/entities/resources.py

@@ -1,6 +1,6 @@
 from tastypie import fields
 from tendenci.apps.entities.models import Entity
-from tendenci.core.api_tasty.resources import TendenciResource
+from tendenci.apps.api_tasty.resources import TendenciResource
 
 class EntityResource(TendenciResource):
     class Meta(TendenciResource.Meta):

tendenci/core/api_tasty/events/forms.py → tendenci/apps/api_tasty/events/forms.py

@@ -1,6 +1,6 @@
 from django import forms
-from tendenci.addons.events.models import Event
-from tendenci.core.api_tasty.forms import TendenciForm
+from tendenci.apps.events.models import Event
+from tendenci.apps.api_tasty.forms import TendenciForm
 
 class EventForm(TendenciForm):
     """Profile Form

tendenci/core/api_tasty/events/resources.py → tendenci/apps/api_tasty/events/resources.py

@@ -1,9 +1,9 @@
 from tastypie import fields
 from tastypie.resources import ModelResource
-from tendenci.core.api_tasty.resources import TendenciResource
-from tendenci.core.api_tasty.validation import TendenciValidation
-from tendenci.core.api_tasty.entities.resources import EntityResource
-from tendenci.addons.events.models import Event, Place, Type
+from tendenci.apps.api_tasty.resources import TendenciResource
+from tendenci.apps.api_tasty.validation import TendenciValidation
+from tendenci.apps.api_tasty.entities.resources import EntityResource
+from tendenci.apps.events.models import Event, Place, Type
 
 class PlaceResource(ModelResource):
     class Meta:

tendenci/core/api_tasty/forms.py → tendenci/apps/api_tasty/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.contrib.auth.models import User
 from tastypie.models import ApiKey
-from tendenci.core.perms.models import TendenciBaseModel
+from tendenci.apps.perms.models import TendenciBaseModel
 
 class ApiKeyForm(forms.ModelForm):
     """

tendenci/core/api_tasty/memberships/forms.py → tendenci/apps/api_tasty/memberships/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.contrib.auth.models import User
-from tendenci.addons.memberships.models import MembershipDefault
-from tendenci.core.api_tasty.forms import TendenciForm
+from tendenci.apps.memberships.models import MembershipDefault
+from tendenci.apps.api_tasty.forms import TendenciForm
 
 class MembershipForm(TendenciForm):
     create_user = forms.BooleanField(required=False)

tendenci/core/api_tasty/memberships/resources.py → tendenci/apps/api_tasty/memberships/resources.py

@@ -1,11 +1,11 @@
 from django.contrib.auth.models import User
 from tastypie import fields
-from tendenci.core.api_tasty.resources import TendenciResource
-from tendenci.core.api_tasty.validation import TendenciValidation
-from tendenci.core.api_tasty.users.resources import UserResource
-from tendenci.core.api_tasty.payments.resources import PaymentMethodResource
-from tendenci.core.api_tasty.memberships.forms import MembershipForm
-from tendenci.addons.memberships.models import MembershipDefault, MembershipType, MembershipApp
+from tendenci.apps.api_tasty.resources import TendenciResource
+from tendenci.apps.api_tasty.validation import TendenciValidation
+from tendenci.apps.api_tasty.users.resources import UserResource
+from tendenci.apps.api_tasty.payments.resources import PaymentMethodResource
+from tendenci.apps.api_tasty.memberships.forms import MembershipForm
+from tendenci.apps.memberships.models import MembershipDefault, MembershipType, MembershipApp
 
 
 class MembershipTypeResource(TendenciResource):

tendenci/core/api_tasty/payments/resources.py → tendenci/apps/api_tasty/payments/resources.py

@@ -2,9 +2,9 @@
 from tastypie.resources import ModelResource
 from tastypie import fields
 
-from tendenci.core.api_tasty.auth import DeveloperApiKeyAuthentication
-from tendenci.core.api_tasty.serializers import SafeSerializer
-from tendenci.core.payments.models import PaymentMethod
+from tendenci.apps.api_tasty.auth import DeveloperApiKeyAuthentication
+from tendenci.apps.api_tasty.serializers import SafeSerializer
+from tendenci.apps.payments.models import PaymentMethod
 
 class PaymentMethodResource(ModelResource):
     class Meta:

tendenci/core/api_tasty/profiles/forms.py → tendenci/apps/api_tasty/profiles/forms.py

@@ -1,6 +1,6 @@
 from django import forms
 from tendenci.apps.profiles.models import Profile
-from tendenci.core.api_tasty.forms import TendenciForm
+from tendenci.apps.api_tasty.forms import TendenciForm
 
 class ProfileForm(TendenciForm):
     """Profile Form

tendenci/core/api_tasty/profiles/resources.py → tendenci/apps/api_tasty/profiles/resources.py

@@ -1,11 +1,11 @@
 from tastypie import fields
 from tendenci.apps.profiles.models import Profile
 from tendenci.apps.entities.models import Entity
-from tendenci.core.api_tasty.validation import TendenciValidation
-from tendenci.core.api_tasty.resources import TendenciResource
-from tendenci.core.api_tasty.users.resources import UserResource
-from tendenci.core.api_tasty.entities.resources import EntityResource
-from tendenci.core.api_tasty.profiles.forms import ProfileForm
+from tendenci.apps.api_tasty.validation import TendenciValidation
+from tendenci.apps.api_tasty.resources import TendenciResource
+from tendenci.apps.api_tasty.users.resources import UserResource
+from tendenci.apps.api_tasty.entities.resources import EntityResource
+from tendenci.apps.api_tasty.profiles.forms import ProfileForm
 
 class ProfileResource(TendenciResource):
     """Profile API

tendenci/core/api_tasty/resources.py → tendenci/apps/api_tasty/resources.py

@@ -4,9 +4,9 @@
 from tastypie.resources import ModelResource
 from tastypie import fields
 
-from tendenci.core.api_tasty.serializers import SafeSerializer
-from tendenci.core.api_tasty.auth import DeveloperApiKeyAuthentication
-from tendenci.core.api_tasty.users.resources import UserResource
+from tendenci.apps.api_tasty.serializers import SafeSerializer
+from tendenci.apps.api_tasty.auth import DeveloperApiKeyAuthentication
+from tendenci.apps.api_tasty.users.resources import UserResource
 
 class TendenciResource(ModelResource):
     owner = fields.ForeignKey(UserResource, 'owner')

tendenci/core/api_tasty/settings/forms.py → tendenci/apps/api_tasty/settings/forms.py

@@ -1,5 +1,5 @@
 from django import forms
-from tendenci.core.site_settings.models import Setting
+from tendenci.apps.site_settings.models import Setting
 
 class SettingForm(forms.ModelForm):
     """
@@ -49,7 +49,7 @@ def __init__(self, *args, **kwargs):
 
     def clean(self):
         """
-        Clean method is based on clean_settings_form from tendenci.core.site_settings.forms.
+        Clean method is based on clean_settings_form from tendenci.apps.site_settings.forms.
         """
         setting = self.instance
         cleaned_data = super(SettingForm, self).clean()
@@ -74,7 +74,7 @@ def clean(self):
                         raise forms.ValidationError("'%s' must be a File pk" % setting.label)
 
                     #if the value is an int use it as pk to get a File
-                    from tendenci.core.files.models import File as TendenciFile
+                    from tendenci.apps.files.models import File as TendenciFile
                     try:
                         tfile = TendenciFile.objects.get(pk=field_value)
                     except TendenciFile.DoesNotExist:

tendenci/core/api_tasty/settings/resources.py → tendenci/apps/api_tasty/settings/resources.py

@@ -1,9 +1,9 @@
 from tastypie import fields
-from tendenci.core.site_settings.models import Setting
+from tendenci.apps.site_settings.models import Setting
 
-from tendenci.core.api_tasty.resources import TendenciResource
-from tendenci.core.api_tasty.validation import TendenciValidation
-from tendenci.core.api_tasty.settings.forms import SettingForm
+from tendenci.apps.api_tasty.resources import TendenciResource
+from tendenci.apps.api_tasty.validation import TendenciValidation
+from tendenci.apps.api_tasty.settings.forms import SettingForm
 
 class SettingResource(TendenciResource):
     """This resource will clean the given data based on the generated

tendenci/core/api_tasty/urls.py → tendenci/apps/api_tasty/urls.py

@@ -1,15 +1,15 @@
 from django.conf.urls.defaults import *
 
-from tendenci.core.api_tasty.api import SafeApi
-from tendenci.core.api_tasty.settings.resources import SettingResource
-from tendenci.core.api_tasty.users.resources import UserResource
-from tendenci.core.api_tasty.profiles.resources import ProfileResource
-from tendenci.core.api_tasty.discounts.resources import DiscountResource
-from tendenci.core.api_tasty.entities.resources import EntityResource
-from tendenci.core.api_tasty.payments.resources import PaymentMethodResource
-from tendenci.core.api_tasty.memberships.resources import (MembershipResource,
+from tendenci.apps.api_tasty.api import SafeApi
+from tendenci.apps.api_tasty.settings.resources import SettingResource
+from tendenci.apps.api_tasty.users.resources import UserResource
+from tendenci.apps.api_tasty.profiles.resources import ProfileResource
+from tendenci.apps.api_tasty.discounts.resources import DiscountResource
+from tendenci.apps.api_tasty.entities.resources import EntityResource
+from tendenci.apps.api_tasty.payments.resources import PaymentMethodResource
+from tendenci.apps.api_tasty.memberships.resources import (MembershipResource,
     MembershipTypeResource, AppResource)
-from tendenci.core.api_tasty.events.resources import (EventResource, TypeResource,
+from tendenci.apps.api_tasty.events.resources import (EventResource, TypeResource,
     PlaceResource)
 
 api = SafeApi(api_name='v1')

tendenci/core/api_tasty/users/resources.py → tendenci/apps/api_tasty/users/resources.py

@@ -7,9 +7,9 @@
 from tastypie.validation import CleanedDataFormValidation
 from tastypie import fields
 
-from tendenci.core.api_tasty.auth import DeveloperApiKeyAuthentication
-from tendenci.core.api_tasty.serializers import SafeSerializer
-from tendenci.core.api_tasty.users.forms import UserForm
+from tendenci.apps.api_tasty.auth import DeveloperApiKeyAuthentication
+from tendenci.apps.api_tasty.serializers import SafeSerializer
+from tendenci.apps.api_tasty.users.forms import UserForm
 
 class UserResource(ModelResource):
     class Meta:

tendenci/addons/articles/admin.py → tendenci/apps/articles/admin.py

@@ -1,9 +1,9 @@
 from django.contrib import admin
 from django.template.defaultfilters import striptags, truncatewords
 
-from tendenci.core.perms.admin import TendenciBaseModelAdmin, TagsFilter
-from tendenci.addons.articles.models import Article
-from tendenci.addons.articles.forms import ArticleForm
+from tendenci.apps.perms.admin import TendenciBaseModelAdmin, TagsFilter
+from tendenci.apps.articles.models import Article
+from tendenci.apps.articles.forms import ArticleForm
 
 
 class ArticleAdmin(TendenciBaseModelAdmin):

tendenci/addons/articles/app_registry.py → tendenci/apps/articles/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
-from tendenci.core.registry import site
-from tendenci.core.registry.base import CoreRegistry, lazy_reverse
-from tendenci.addons.articles.models import Article
+from tendenci.apps.registry import site
+from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
+from tendenci.apps.articles.models import Article
 
 
 class ArticleRegistry(CoreRegistry):