Move the 'hooks' module from wagtailadmin to wagtailcore

Conflicts:
	wagtail/tests/wagtail_hooks.py
	wagtail/wagtailadmin/views/pages.py

wagtail/tests/wagtail_hooks.py

@@ -1,4 +1,4 @@
-from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore import hooks
 from wagtail.wagtailcore.whitelist import attribute_rule, check_url, allow_without_attributes
 
 def editor_css():

wagtail/wagtailadmin/hooks.py

@@ -1,38 +1,4 @@
-from django.conf import settings
-try:
-    from importlib import import_module
-except ImportError:
-    # for Python 2.6, fall back on django.utils.importlib (deprecated as of Django 1.7)
-    from django.utils.importlib import import_module
+# The 'hooks' module is now part of wagtailcore.
+# Imports are provided here for backwards compatibility
 
-_hooks = {}
-
-# TODO: support 'register' as a decorator:
-#    @hooks.register('construct_main_menu')
-#    def construct_main_menu(menu_items):
-#        ...
-
-
-def register(hook_name, fn):
-    if hook_name not in _hooks:
-        _hooks[hook_name] = []
-    _hooks[hook_name].append(fn)
-
-_searched_for_hooks = False
-
-
-def search_for_hooks():
-    global _searched_for_hooks
-    if not _searched_for_hooks:
-        for app_module in settings.INSTALLED_APPS:
-            try:
-                import_module('%s.wagtail_hooks' % app_module)
-            except ImportError:
-                continue
-
-        _searched_for_hooks = True
-
-
-def get_hooks(hook_name):
-    search_for_hooks()
-    return _hooks.get(hook_name, [])
+from wagtail.wagtailcore.hooks import register, get_hooks

wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py

@@ -2,9 +2,9 @@ from django import template
 from django.core import urlresolvers
 from django.utils.translation import ugettext_lazy as _
 
-from wagtail.wagtailadmin import hooks
 from wagtail.wagtailadmin.menu import MenuItem
 
+from wagtail.wagtailcore import hooks
 from wagtail.wagtailcore.models import get_navigation_menu_items, UserPagePermissionsProxy
 from wagtail.wagtailcore.utils import camelcase_to_underscore
 

wagtail/wagtailadmin/urls.py

@@ -3,7 +3,7 @@ from django.conf import settings
 
 from wagtail.wagtailadmin.forms import LoginForm, PasswordResetForm
 from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar
-from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore import hooks
 
 
 urlpatterns = [

wagtail/wagtailadmin/views/home.py

@@ -4,9 +4,9 @@ from django.conf import settings
 from django.template import RequestContext
 from django.template.loader import render_to_string
 
-from wagtail.wagtailadmin import hooks
 from wagtail.wagtailadmin.forms import SearchForm
 
+from wagtail.wagtailcore import hooks
 from wagtail.wagtailcore.models import Page, PageRevision, UserPagePermissionsProxy
 
 from wagtail.wagtaildocs.models import Document

wagtail/wagtailadmin/views/pages.py

@@ -11,8 +11,9 @@ from django.views.decorators.vary import vary_on_headers
 
 from wagtail.wagtailadmin.edit_handlers import TabbedInterface, ObjectList
 from wagtail.wagtailadmin.forms import SearchForm
-from wagtail.wagtailadmin import tasks, hooks, signals
+from wagtail.wagtailadmin import tasks, signals
 
+from wagtail.wagtailcore import hooks
 from wagtail.wagtailcore.models import Page, PageRevision
 from wagtail.wagtailcore.signals import page_published
 

wagtail/wagtailadmin/views/userbar.py

@@ -2,7 +2,7 @@ from django.shortcuts import render
 from django.contrib.auth.decorators import permission_required
 
 from wagtail.wagtailadmin.userbar import EditPageItem, AddPageItem, ApproveModerationEditPageItem, RejectModerationEditPageItem
-from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore import hooks
 from wagtail.wagtailcore.models import Page, PageRevision
 
 

wagtail/wagtailcore/hooks.py

@@ -0,0 +1,38 @@
+from django.conf import settings
+try:
+    from importlib import import_module
+except ImportError:
+    # for Python 2.6, fall back on django.utils.importlib (deprecated as of Django 1.7)
+    from django.utils.importlib import import_module
+
+_hooks = {}
+
+# TODO: support 'register' as a decorator:
+#    @hooks.register('construct_main_menu')
+#    def construct_main_menu(menu_items):
+#        ...
+
+
+def register(hook_name, fn):
+    if hook_name not in _hooks:
+        _hooks[hook_name] = []
+    _hooks[hook_name].append(fn)
+
+_searched_for_hooks = False
+
+
+def search_for_hooks():
+    global _searched_for_hooks
+    if not _searched_for_hooks:
+        for app_module in settings.INSTALLED_APPS:
+            try:
+                import_module('%s.wagtail_hooks' % app_module)
+            except ImportError:
+                continue
+
+        _searched_for_hooks = True
+
+
+def get_hooks(hook_name):
+    search_for_hooks()
+    return _hooks.get(hook_name, [])

wagtail/wagtaildocs/wagtail_hooks.py

@@ -4,7 +4,7 @@ from django.core import urlresolvers
 from django.utils.html import format_html, format_html_join
 from django.utils.translation import ugettext_lazy as _
 
-from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore import hooks
 from wagtail.wagtailadmin.menu import MenuItem
 
 from wagtail.wagtaildocs import admin_urls

wagtail/wagtailembeds/wagtail_hooks.py

@@ -3,7 +3,7 @@ from django.conf.urls import include, url
 from django.core import urlresolvers
 from django.utils.html import format_html
 
-from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore import hooks
 from wagtail.wagtailembeds import urls
 
 

wagtail/wagtailforms/wagtail_hooks.py

@@ -3,7 +3,7 @@ from django.conf import settings
 from django.conf.urls import include, url
 from django.utils.translation import ugettext_lazy as _
 
-from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore import hooks
 from wagtail.wagtailadmin.menu import MenuItem
 
 from wagtail.wagtailforms import urls

wagtail/wagtailimages/wagtail_hooks.py

@@ -4,7 +4,7 @@ from django.core import urlresolvers
 from django.utils.html import format_html, format_html_join
 from django.utils.translation import ugettext_lazy as _
 
-from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore import hooks
 from wagtail.wagtailadmin.menu import MenuItem
 
 from wagtail.wagtailimages import urls

wagtail/wagtailredirects/wagtail_hooks.py

@@ -2,7 +2,7 @@ from django.core import urlresolvers
 from django.conf.urls import include, url
 from django.utils.translation import ugettext_lazy as _
 
-from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore import hooks
 from wagtail.wagtailredirects import urls
 
 from wagtail.wagtailadmin.menu import MenuItem

wagtail/wagtailsearch/wagtail_hooks.py

@@ -2,7 +2,7 @@ from django.core import urlresolvers
 from django.conf.urls import include, url
 from django.utils.translation import ugettext_lazy as _
 
-from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore import hooks
 from wagtail.wagtailsearch.urls import admin as admin_urls
 
 from wagtail.wagtailadmin.menu import MenuItem

wagtail/wagtailsnippets/wagtail_hooks.py

@@ -4,7 +4,7 @@ from django.core import urlresolvers
 from django.utils.html import format_html
 from django.utils.translation import ugettext_lazy as _
 
-from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore import hooks
 from wagtail.wagtailadmin.menu import MenuItem
 
 from wagtail.wagtailsnippets import urls

wagtail/wagtailusers/wagtail_hooks.py

@@ -2,7 +2,7 @@ from django.conf.urls import include, url
 from django.core import urlresolvers
 from django.utils.translation import ugettext_lazy as _
 
-from wagtail.wagtailadmin import hooks
+from wagtail.wagtailcore import hooks
 from wagtail.wagtailadmin.menu import MenuItem
 
 from wagtail.wagtailusers import urls