registry root shouldn't import any models

tendenci/apps/accountings/app_registry.py

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

tendenci/apps/accounts/app_registry.py

@@ -1,5 +1,5 @@
 from django.contrib.auth.models import User
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import LogRegistry, lazy_reverse
 
 class AccountRegistry(LogRegistry):

tendenci/apps/articles/app_registry.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.articles.models import Article
 

tendenci/apps/boxes/app_registry.py

@@ -1,4 +1,4 @@
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.boxes.models import Box
 from django.utils.translation import ugettext_lazy as _

tendenci/apps/campaign_monitor/app_registry.py

@@ -1,29 +0,0 @@
-from tendenci.apps.registry import site
-from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
-from tendenci.apps.campaign_monitor.models import Template, Campaign
-
-
-# class TemplateRegistry(CoreRegistry):
-#     version = '1.0'
-#     author = 'Schipul - The Web Marketing Company'
-#     author_email = 'programmers@schipul.com'
-#     description = 'Create templates via the Campaign Monitor API'
-#
-#     url = {
-#         'add': lazy_reverse('campaign_monitor.template_add'),
-#         'search': lazy_reverse('campaign_monitor.template_index'),
-#     }
-#
-# class CampaignRegistry(CoreRegistry):
-#     version = '1.0'
-#     author = 'Schipul - The Web Marketing Company'
-#     author_email = 'programmers@schipul.com'
-#     description = 'Create campaigns via the Campaign Monitor API'
-#
-#     url = {
-#         'add': lazy_reverse('campaign_monitor.campaign_add'),
-#         'search': lazy_reverse('campaign_monitor.campaign_index'),
-#     }
-#
-# site.register(Template, TemplateRegistry)
-# site.register(Campaign, CampaignRegistry)

tendenci/apps/contacts/app_registry.py

@@ -1,4 +1,4 @@
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import LogRegistry, lazy_reverse
 from tendenci.apps.contacts.models import Contact
 

tendenci/apps/corporate_memberships/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import PeopleRegistry, lazy_reverse
 from tendenci.apps.corporate_memberships.models import CorpMembership
 

tendenci/apps/directories/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.directories.models import Directory
 

tendenci/apps/discounts/app_registry.py

@@ -1,4 +1,4 @@
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.discounts.models import Discount
 from django.utils.translation import ugettext_lazy as _

tendenci/apps/email_blocks/app_registry.py

@@ -1,4 +1,4 @@
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import LogRegistry, lazy_reverse
 from tendenci.apps.email_blocks.models import EmailBlock
 

tendenci/apps/emails/app_registry.py

@@ -1,4 +1,4 @@
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import LogRegistry, lazy_reverse
 from tendenci.apps.emails.models import Email
 

tendenci/apps/entities/app_registry.py

@@ -1,4 +1,4 @@
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import LogRegistry, lazy_reverse
 from tendenci.apps.entities.models import Entity
 

tendenci/apps/event_logs/colors.py

@@ -20,7 +20,7 @@ def generate_colors():
     have to iterate over the apps in the event registry
     for every event id.
     """
-    from tendenci.apps.registry import site
+    from tendenci.apps.registry.sites import site
     d = {}
     apps = site.get_registered_apps().all_apps
     for app in apps:

tendenci/apps/event_logs/views.py

@@ -15,7 +15,7 @@
 from tendenci.apps.base.http import Http403
 from tendenci.apps.perms.utils import has_perm
 from tendenci.apps.perms.decorators import superuser_required
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 
 from tendenci.apps.event_logs.utils import day_bars, month_days,\
     request_month_range

tendenci/apps/events/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.events.models import Event
 

tendenci/apps/explorer_extensions/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 """
 from tendenci.apps.newsletters.models import Newsletter

tendenci/apps/files/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.files.models import File
 

tendenci/apps/files/signals.py

@@ -78,7 +78,7 @@ def delete_files(sender, **kwargs):
 
 
 def init_signals():
-    from tendenci.apps.registry import site
+    from tendenci.apps.registry.sites import site
     apps = site.get_registered_apps()
 
     for app in apps:

tendenci/apps/forms_builder/forms/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.forms_builder.forms.models import Form
 

tendenci/apps/help_files/app_registry.py

@@ -1,6 +1,6 @@
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.help_files.models import HelpFile
 

tendenci/apps/industries/app_registry.py

@@ -1,4 +1,4 @@
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.industries.models import Industry
 

tendenci/apps/invoices/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.invoices.models import Invoice
 

tendenci/apps/jobs/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.site_settings.utils import get_setting
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.jobs.models import Job

tendenci/apps/locations/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.locations.models import Location
 

tendenci/apps/make_payments/app_registry.py

@@ -1,4 +1,4 @@
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import LogRegistry, lazy_reverse
 from tendenci.apps.make_payments.models import MakePayment
 

tendenci/apps/memberships/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import PeopleRegistry, lazy_reverse
 from tendenci.apps.memberships.models import MembershipDefault
 

tendenci/apps/navs/app_registry.py

@@ -1,4 +1,4 @@
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.navs.models import Nav
 from django.utils.translation import ugettext_lazy as _

tendenci/apps/news/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.news.models import News
 

tendenci/apps/newsletters/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.newsletters.models import Newsletter
 

tendenci/apps/pages/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.pages.models import Page
 

tendenci/apps/payments/app_registry.py

@@ -1,4 +1,4 @@
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import LogRegistry, lazy_reverse
 from tendenci.apps.payments.models import Payment
 

tendenci/apps/photos/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.photos.models import PhotoSet, Image
 

tendenci/apps/profiles/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import PeopleRegistry, lazy_reverse
 from tendenci.apps.profiles.models import Profile
 

tendenci/apps/recurring_payments/app_registry.py

@@ -1,4 +1,4 @@
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import LogRegistry, lazy_reverse
 from tendenci.apps.recurring_payments.models import RecurringPayment
 

tendenci/apps/redirects/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.redirects.models import Redirect
 

tendenci/apps/redirects/forms.py

@@ -3,7 +3,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from tendenci.apps.redirects.models import Redirect
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 
 class RedirectForm(forms.ModelForm):
 

tendenci/apps/regions/app_registry.py

@@ -1,6 +1,6 @@
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.regions.models import Region
 

tendenci/apps/registry/__init__.py

@@ -1,34 +0,0 @@
-from django.utils import importlib
-
-from tendenci.apps.registry.sites import site
-
-
-def autodiscover():
-    """
-    Auto-discover INSTALLED_APPS app_registry.py modules and fail silently when
-    not present. This forces an import on them to register any admin bits they
-    may want.
-    """
-    import copy
-    from django.conf import settings
-    from django.utils.importlib import import_module
-    from django.utils.module_loading import module_has_submodule
-
-    for app in settings.INSTALLED_APPS:
-        mod = import_module(app)
-        # Attempt to import the app's admin module.
-        try:
-            before_import_registry = copy.copy(site._registry)
-            import_module('%s.app_registry' % app)
-        except:
-            # Reset the model registry to the state before the last import as
-            # this import will have to reoccur on the next request and this
-            # could raise NotRegistered and AlreadyRegistered exceptions
-            # (see #8245).
-            site._registry = before_import_registry
-
-            # Decide whether to bubble up this error. If the app just
-            # doesn't have an admin module, we can ignore the error
-            # attempting to import it, otherwise we want it to bubble up.
-            if module_has_submodule(mod, 'app_registry'):
-                raise

tendenci/apps/registry/context_processors.py

@@ -1,4 +1,4 @@
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 
 
 def registered_apps(request):

tendenci/apps/registry/register.py

@@ -0,0 +1,34 @@
+import copy
+from django.conf import settings
+from django.utils.importlib import import_module
+from django.utils.module_loading import module_has_submodule
+
+from tendenci.apps.registry.sites import site
+
+
+def autodiscover():
+    """
+    Auto-discover INSTALLED_APPS app_registry.py modules and fail silently when
+    not present. This forces an import on them to register any admin bits they
+    may want.
+    """
+
+
+    for app in settings.INSTALLED_APPS:
+        mod = import_module(app)
+        # Attempt to import the app's admin module.
+        try:
+            before_import_registry = copy.copy(site._registry)
+            import_module('%s.app_registry' % app)
+        except:
+            # Reset the model registry to the state before the last import as
+            # this import will have to reoccur on the next request and this
+            # could raise NotRegistered and AlreadyRegistered exceptions
+            # (see #8245).
+            site._registry = before_import_registry
+
+            # Decide whether to bubble up this error. If the app just
+            # doesn't have an admin module, we can ignore the error
+            # attempting to import it, otherwise we want it to bubble up.
+            if module_has_submodule(mod, 'app_registry'):
+                raise

tendenci/apps/resumes/app_registry.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
-from tendenci.apps.registry import site
+from tendenci.apps.registry.sites import site
 from tendenci.apps.registry.base import CoreRegistry, lazy_reverse
 from tendenci.apps.resumes.models import Resume