Renamed wagtailcore.util to wagtailcore.utils

wagtail/wagtailadmin/edit_handlers.py

@@ -19,7 +19,7 @@ from django.utils.translation import ugettext as _
 from django.utils.translation import ugettext_lazy
 
 from wagtail.wagtailcore.models import Page
-from wagtail.wagtailcore.util import camelcase_to_underscore
+from wagtail.wagtailcore.utils import camelcase_to_underscore
 from wagtail.wagtailcore.fields import RichTextArea
 
 

wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py

@@ -6,7 +6,7 @@ from wagtail.wagtailadmin import hooks
 from wagtail.wagtailadmin.menu import MenuItem
 
 from wagtail.wagtailcore.models import get_navigation_menu_items, UserPagePermissionsProxy
-from wagtail.wagtailcore.util import camelcase_to_underscore
+from wagtail.wagtailcore.utils import camelcase_to_underscore
 
 
 register = template.Library()

wagtail/wagtailcore/models.py

@@ -18,7 +18,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from treebeard.mp_tree import MP_Node
 
-from wagtail.wagtailcore.util import camelcase_to_underscore
+from wagtail.wagtailcore.utils import camelcase_to_underscore
 from wagtail.wagtailcore.query import PageQuerySet
 
 from wagtail.wagtailsearch import Indexed, get_search_backend

wagtail/wagtailcore/util.py

@@ -1,6 +1,7 @@
-import re
+import warnings
 
+warnings.warn(
+    "The wagtail.wagtailcore.util module has been renamed. "
+    "Use wagtail.wagtailcore.utils instead.", DeprecationWarning)
 
-def camelcase_to_underscore(str):
-    # http://djangosnippets.org/snippets/585/
-    return re.sub('(((?<=[a-z])[A-Z])|([A-Z](?![A-Z]|$)))', '_\\1', str).lower().strip('_')
+from .utils import *

wagtail/wagtailcore/utils.py

@@ -0,0 +1,6 @@
+import re
+
+
+def camelcase_to_underscore(str):
+    # http://djangosnippets.org/snippets/585/
+    return re.sub('(((?<=[a-z])[A-Z])|([A-Z](?![A-Z]|$)))', '_\\1', str).lower().strip('_')