Merge pull request #5341 from dojutsu-user/update-code

Remove deprecated code

Author: ericholscher

readthedocs/core/utils/__init__.py

@@ -11,7 +11,7 @@
 import re
 
 from django.conf import settings
-from django.utils.functional import allow_lazy
+from django.utils.functional import keep_lazy
 from django.utils.safestring import SafeText, mark_safe
 from django.utils.text import slugify as slugify_base
 from celery import group, chord
@@ -197,6 +197,7 @@ def send_email(
     )
 
 
+@keep_lazy(str, SafeText)
 def slugify(value, *args, **kwargs):
     """
     Add a DNS safe option to slugify.
@@ -210,9 +211,6 @@ def slugify(value, *args, **kwargs):
     return value
 
 
-slugify = allow_lazy(slugify, str, SafeText)
-
-
 def safe_makedirs(directory_name):
     """
     Safely create a directory.

readthedocs/urls.py

@@ -87,7 +87,7 @@
 ]
 
 admin_urls = [
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 ]
 
 dnt_urls = [